diff --git a/src/annotations/components/AnnotationEditable.tsx b/src/annotations/components/AnnotationEditable.tsx index f67cebafdd..b9d024ef87 100644 --- a/src/annotations/components/AnnotationEditable.tsx +++ b/src/annotations/components/AnnotationEditable.tsx @@ -352,10 +352,7 @@ export default class AnnotationEditable extends React.Component { 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 { )} {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 index 5170c102b3..7094f15f26 100644 --- a/src/dashboard-refactor/logic.ts +++ b/src/dashboard-refactor/logic.ts @@ -1043,6 +1043,10 @@ export class DashboardLogic extends UILogic { }) } 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