Skip to content

Commit 35d8b40

Browse files
committed
fix focus
1 parent 5b75d6b commit 35d8b40

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

packages/compass-components/src/components/modals/error-details-modal.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ import { Modal } from './modal';
66
import { Button, Code, ModalFooter } from '../leafygreen';
77
import { ModalBody } from './modal-body';
88
import { ModalHeader } from './modal-header';
9-
import { ModalFooterButton } from './modal-footer-button';
109

11-
const backButtonStyles = css({
12-
float: 'left',
10+
const leftDirectionFooter = css({
11+
justifyContent: 'left',
1312
});
1413

1514
type ModalProps = React.ComponentProps<typeof Modal>;
@@ -33,22 +32,24 @@ function ErrorDetailsModal({
3332
return JSON.stringify(details, undefined, 2);
3433
}, [details]);
3534
return (
36-
<Modal setOpen={onClose} {...modalProps}>
35+
<Modal setOpen={onClose} initialFocus="#error-details-json" {...modalProps}>
3736
<ModalHeader title={title} subtitle={subtitle} />
3837
<ModalBody>
39-
<Code language="json" data-testid="error-details-json">
38+
<Code
39+
language="json"
40+
data-testid="error-details-json"
41+
id="error-details-json"
42+
>
4043
{prettyDetails}
4144
</Code>
4245
</ModalBody>
43-
<ModalFooter>
46+
<ModalFooter
47+
className={cx(closeAction === 'back' && leftDirectionFooter)}
48+
>
4449
<Button
4550
data-testid={`error-details-${closeAction}-button`}
46-
onClick={() => {
47-
console.log('onClick');
48-
onClose();
49-
}}
51+
onClick={onClose}
5052
variant="default"
51-
className={cx(closeAction === 'back' && backButtonStyles)}
5253
>
5354
{closeAction === 'back' ? 'Back' : 'Close'}
5455
</Button>

packages/compass-crud/src/components/document-list.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,7 @@ const DocumentList: React.FunctionComponent<DocumentListProps> = (props) => {
606606
/>
607607
<ErrorDetailsModal
608608
open={!!errorDetailsOpen}
609-
onClose={() => {
610-
console.log('is closing');
611-
setErrorDetailsOpen(undefined);
612-
}}
609+
onClose={() => setErrorDetailsOpen(undefined)}
613610
details={errorDetailsOpen?.details}
614611
closeAction={errorDetailsOpen?.closeAction || 'close'}
615612
/>

packages/compass-import-export/src/components/export-code-view.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ function ExportCodeView({
7474
<Code
7575
className={codeStyles}
7676
data-testid="export-collection-code-preview-wrapper"
77+
id="export-collection-code-preview-wrapper"
7778
language="javascript"
7879
copyable
7980
>

packages/compass-import-export/src/components/export-modal.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,12 @@ function ExportModal({
246246
}, [isOpen, resetExportFormState]);
247247

248248
return (
249-
<Modal open={isOpen} setOpen={closeExport} data-testid="export-modal">
249+
<Modal
250+
open={isOpen}
251+
setOpen={closeExport}
252+
data-testid="export-modal"
253+
initialFocus="#export-collection-code-preview-wrapper"
254+
>
250255
<ModalHeader
251256
title="Export"
252257
subtitle={aggregation ? `Aggregation on ${ns}` : `Collection ${ns}`}

0 commit comments

Comments
 (0)