fix shift+enter to select anntoation into bulk edit

WorldBrain · Jun 14, 2024 · 76ef1c2 · 76ef1c2
1 parent 7379707
commit 76ef1c2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/annotations/components/AnnotationEditable.tsx b/src/annotations/components/AnnotationEditable.tsx
@@ -1255,17 +1255,16 @@ export default class AnnotationEditable extends React.Component<Props, State> {
                         onClick={(
                             event: React.MouseEvent<HTMLInputElement>,
                         ) => {
+                            event.preventDefault()
+                            event.stopPropagation()
                             if (
                                 event.nativeEvent.shiftKey &&
                                 this.props.shiftSelectItem
                             ) {
+                                console.log('shift select item')
                                 this.props.shiftSelectItem()
-                                event.preventDefault()
-                                event.stopPropagation()
                             } else {
                                 this.props.bulkSelectAnnotation()
-                                event.preventDefault()
-                                event.stopPropagation()
                             }
                         }}
                         size={16}
@@ -1287,7 +1286,7 @@ export default class AnnotationEditable extends React.Component<Props, State> {
     }
 
     handleMouseLeave = () => {
-        if (!this.props.focusLockUntilMouseStart) {
+        if (!this.props.focusLockUntilMouseStart && !this.isAnyModalOpen()) {
             this.setState({ hoverCard: false })
             if (this.hoverTimeout) {
                 clearTimeout(this.hoverTimeout)

diff --git a/src/dashboard-refactor/search-results/components/page-result.tsx b/src/dashboard-refactor/search-results/components/page-result.tsx
@@ -143,6 +143,13 @@ export default class PageResultView extends PureComponent<Props> {
         this.getMatches(this.props.text)
     }
 
+    private isAnyModalOpen() {
+        const isOpen =
+            this.props.listPickerShowStatus != 'hide' ||
+            this.props.isCopyPasterShown
+        return isOpen
+    }
+
     updateMatchingTextContainerHeight = async () => {
         await sleepPromise(50)
 
@@ -333,6 +340,7 @@ export default class PageResultView extends PureComponent<Props> {
                     }}
                     strategy={'fixed'}
                     getPortalRoot={this.props.getRootElement}
+                    instaClose
                 >
                     {this.props.renderSpacePicker()}
                 </PopoutBox>
@@ -352,6 +360,7 @@ export default class PageResultView extends PureComponent<Props> {
                     }}
                     strategy={'fixed'}
                     getPortalRoot={this.props.getRootElement}
+                    instaClose
                 >
                     {this.props.renderSpacePicker()}
                 </PopoutBox>
@@ -948,7 +957,7 @@ export default class PageResultView extends PureComponent<Props> {
     }
 
     onUnhover = (event) => {
-        if (!this.props.focusLockUntilMouseStart) {
+        if (!this.props.focusLockUntilMouseStart && !this.isAnyModalOpen()) {
             this.setState({ hoveredMouse: false })
             if (this.hoverTimeout) {
                 clearTimeout(this.hoverTimeout)