{canAnnotateAndDelete && (
-
+
)}
{canComment && (
-
+
)}
@@ -52,7 +52,7 @@ const HighlightControls = ({
HighlightControls.defaultProps = {
canAnnotateAndDelete: false,
- isPending: false
+ isPending: false,
};
export default HighlightControls;
diff --git a/src/components/ActionControls/HighlightControls.scss b/src/components/ActionControls/HighlightControls.scss
index 297b1135b..16f490014 100644
--- a/src/components/ActionControls/HighlightControls.scss
+++ b/src/components/ActionControls/HighlightControls.scss
@@ -1,4 +1,4 @@
-@import '../../variables';
+@import "../../variables";
.ba {
.ba-action-controls-highlight {
@@ -45,15 +45,15 @@
// MOBILE & TABLET CSS
@media #{$mobile}, #{$tablet} {
.ba-inline-popover .ba-action-controls-highlight {
- background: white;
- border-top: 1px solid $seesee;
+ position: fixed;
bottom: 0;
- box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .1);
left: 0;
+ width: 100%;
margin: 0;
padding: 15px;
- position: fixed;
- width: 100%;
+ background: white;
+ border-top: 1px solid $seesee;
+ box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .1);
}
.ba-action-controls-highlight .btn-plain,
diff --git a/src/components/ActionControls/__tests__/ActionControls-test.js b/src/components/ActionControls/__tests__/ActionControls-test.js
index 08e0d062f..1ff94ee8a 100644
--- a/src/components/ActionControls/__tests__/ActionControls-test.js
+++ b/src/components/ActionControls/__tests__/ActionControls-test.js
@@ -10,22 +10,22 @@ const onDelete = jest.fn();
const event = {
stopPropagation: jest.fn(),
- preventDefault: jest.fn()
+ preventDefault: jest.fn(),
};
describe('components/ActionControls', () => {
const render = (props = {}) =>
shallow(
+ />,
);
test('should render no controls if the type does not match a valid type', () => {
diff --git a/src/components/ActionControls/__tests__/DrawingControls-test.js b/src/components/ActionControls/__tests__/DrawingControls-test.js
index 3df58993c..e1b198427 100644
--- a/src/components/ActionControls/__tests__/DrawingControls-test.js
+++ b/src/components/ActionControls/__tests__/DrawingControls-test.js
@@ -7,12 +7,12 @@ const onDelete = jest.fn();
describe('components/ActionControls/DrawingControls', () => {
test('should correctly render pending drawing controls', () => {
- const wrapper = shallow();
+ const wrapper = shallow();
expect(wrapper).toMatchSnapshot();
});
test('should correctly render saved drawing controls', () => {
- const wrapper = shallow();
+ const wrapper = shallow();
expect(wrapper).toMatchSnapshot();
});
});
diff --git a/src/components/ActionControls/__tests__/HighlightControls-test.js b/src/components/ActionControls/__tests__/HighlightControls-test.js
index 485bc0dc6..9bfadb9cf 100644
--- a/src/components/ActionControls/__tests__/HighlightControls-test.js
+++ b/src/components/ActionControls/__tests__/HighlightControls-test.js
@@ -8,13 +8,13 @@ const onCommentClick = jest.fn();
describe('components/ActionControls/HighlightControls', () => {
const render = (props = {}) =>
- shallow();
+ shallow();
test('should correctly render pending plain highlight controls', () => {
const wrapper = render({
canAnnotateAndDelete: true,
canComment: false,
- isPending: true
+ isPending: true,
});
expect(wrapper).toMatchSnapshot();
});
@@ -23,7 +23,7 @@ describe('components/ActionControls/HighlightControls', () => {
const wrapper = render({
canAnnotateAndDelete: true,
canComment: true,
- isPending: true
+ isPending: true,
});
expect(wrapper).toMatchSnapshot();
});
@@ -31,7 +31,7 @@ describe('components/ActionControls/HighlightControls', () => {
test('should correctly render saved plain highlight controls', () => {
const wrapper = render({
canAnnotateAndDelete: true,
- canComment: false
+ canComment: false,
});
expect(wrapper).toMatchSnapshot();
expect(wrapper.find('.ba-saved-highlight').length).toEqual(1);
@@ -40,7 +40,7 @@ describe('components/ActionControls/HighlightControls', () => {
test('should correctly render saved highlight comment controls', () => {
const wrapper = render({
canAnnotateAndDelete: true,
- canComment: true
+ canComment: true,
});
expect(wrapper).toMatchSnapshot();
expect(wrapper.find('.ba-saved-highlight').length).toEqual(1);
diff --git a/src/components/AnnotationPopover/AnnotationPopover.js b/src/components/AnnotationPopover/AnnotationPopover.js
index a262d188b..c67eb0817 100644
--- a/src/components/AnnotationPopover/AnnotationPopover.js
+++ b/src/components/AnnotationPopover/AnnotationPopover.js
@@ -24,17 +24,17 @@ const CLASS_MOBILE_CLOSE_BTN = 'ba-mobile-close-btn';
const CLASS_POPOVER_OVERLAY = 'ba-popover-overlay';
type Props = {
- isMobile: boolean,
canComment: boolean,
- position: Function,
- onDelete: Function,
- onCancel: Function,
- onCreate: Function,
- onCommentClick: Function,
+ headerHeight?: number,
+ isMobile: boolean,
isPending: boolean,
language?: string,
messages?: StringMap,
- headerHeight?: number
+ onCancel: Function,
+ onCommentClick: Function,
+ onCreate: Function,
+ onDelete: Function,
+ position: Function,
} & Annotation;
class AnnotationPopover extends React.PureComponent {
@@ -47,7 +47,7 @@ class AnnotationPopover extends React.PureComponent {
onCommentClick: noop,
onDelete: noop,
onCreate: noop,
- comments: []
+ comments: [],
};
componentDidMount() {
@@ -78,7 +78,7 @@ class AnnotationPopover extends React.PureComponent {
onCommentClick,
language,
messages: intlMessages,
- headerHeight
+ headerHeight,
} = this.props;
const hasComments = comments.length > 0;
const isInline = !hasComments && (type === TYPES.highlight || type === TYPES.draw);
@@ -87,8 +87,8 @@ class AnnotationPopover extends React.PureComponent {
description: ,
key: 'esc',
handler: onCancel,
- type: 'Close'
- })
+ type: 'Close',
+ }),
];
return (
@@ -98,7 +98,7 @@ class AnnotationPopover extends React.PureComponent {
className={classNames(CLASS_ANNOTATION_POPOVER, {
[CLASS_INLINE_POPOVER]: isInline,
[CLASS_ANIMATE_POPOVER]: isMobile,
- [CLASS_CREATE_POPOVER]: isPending
+ [CLASS_CREATE_POPOVER]: isPending,
})}
>
{isMobile ? (
@@ -114,22 +114,22 @@ class AnnotationPopover extends React.PureComponent {
{hasComments ? (
) : (
-
+
)}
{canAnnotate && (
)}