make annotation shift enter selectable, blur search when new result i…

…n focus
WorldBrain · Jun 14, 2024 · 7379707 · 7379707
1 parent 656bedb
commit 7379707
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/annotations/components/AnnotationEditable.tsx b/src/annotations/components/AnnotationEditable.tsx
@@ -352,10 +352,7 @@ export default class AnnotationEditable extends React.Component<Props, State> {
                 case 'Enter':
                     if (!this.props.isEditing) {
                         if (event.shiftKey && this.props.shiftSelectItem) {
-                            this.props.shiftSelectItem()
-                            event.preventDefault()
-                            event.stopPropagation()
-                        } else {
+                            // this.props.shiftSelectItem()
                             this.props.bulkSelectAnnotation()
                             event.preventDefault()
                             event.stopPropagation()
@@ -1370,7 +1367,9 @@ export default class AnnotationEditable extends React.Component<Props, State> {
                     </>
                 )}
                 {bulkSelectAnnotation &&
-                    (this.props.isBulkSelected || this.state.hoverCard) &&
+                    (this.props.isBulkSelected ||
+                        this.state.hoverCard ||
+                        this.props.isInFocus) &&
                     this.props.currentUserId === this.props.creatorId &&
                     bulkSelectAnnotation &&
                     this.renderBulkSelectBtn()}

diff --git a/src/dashboard-refactor/logic.ts b/src/dashboard-refactor/logic.ts
@@ -1043,6 +1043,10 @@ export class DashboardLogic extends UILogic<State, Events> {
             })
         }
         if (event.item?.id != null) {
+            const searchBarElement = document.getElementById('search-bar')
+            if (searchBarElement) {
+                searchBarElement.blur()
+            }
             const itemPos = event.item?.id?.split('-')[0]
             if (parseFloat(itemPos) === currentFocusElementIndex) {
                 return