Skip to content

Commit d2bdd33

Browse files
committed
Fix auto-focus in bulk update and delete modals
1 parent f28fd33 commit d2bdd33

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

packages/compass-crud/src/components/bulk-delete-modal.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@ const BulkDeleteModal: React.FunctionComponent<BulkDeleteModalProps> = ({
9494

9595
const exportButtonId = useId();
9696
return (
97-
<Modal setOpen={onCancel} open={open} data-testid="bulk-delete-modal">
97+
<Modal
98+
setOpen={onCancel}
99+
open={open}
100+
data-testid="bulk-delete-modal"
101+
initialFocus={`#${exportButtonId}`}
102+
>
98103
<ModalHeader
99104
title={`Delete ${documentCount ?? ''} document${
100105
documentCount === 1 ? '' : 's'

packages/compass-crud/src/components/bulk-update-modal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ export default function BulkUpdateModal({
405405
setOpen={closeBulkUpdateModal}
406406
data-testid="bulk-update-modal"
407407
className={enablePreview ? modalContentStyles : undefined}
408+
initialFocus={`#${bulkUpdateUpdateId} .cm-content`}
408409
>
409410
<ModalHeader title={modalTitleAndButtonText} subtitle={ns} />
410411
<ModalBody>
@@ -439,8 +440,6 @@ export default function BulkUpdateModal({
439440
onBlur={() => ({})}
440441
annotations={annotations}
441442
minLines={12}
442-
// eslint-disable-next-line jsx-a11y/no-autofocus
443-
autoFocus
444443
/>
445444

446445
<div className={bannerContainerStyles}>

0 commit comments

Comments
 (0)