Skip to content

Commit 9255469

Browse files
committed
refactor: Use footerAction instead of confirmAction
1 parent b376ffe commit 9255469

File tree

2 files changed

+20
-31
lines changed

2 files changed

+20
-31
lines changed

src/editors/containers/EditorContainer/components/CancelConfirmModal.tsx

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,6 @@ interface CancelConfirmModalProps {
99
onCloseEditor: (() => void) | null,
1010
}
1111

12-
interface ActionButtonsProps {
13-
closeCancelConfirmModal: () => void,
14-
onCloseEditor: (() => void) | null,
15-
}
16-
17-
const ActionButtons = ({
18-
closeCancelConfirmModal,
19-
onCloseEditor,
20-
}: ActionButtonsProps) => (
21-
<div className="w-100 d-flex justify-content-between">
22-
<Button
23-
variant="outline-brand"
24-
onClick={() => onCloseEditor?.()}
25-
>
26-
<FormattedMessage {...messages.discardChangesButtonlabel} />
27-
</Button>
28-
<Button
29-
variant="primary"
30-
onClick={closeCancelConfirmModal}
31-
>
32-
<FormattedMessage {...messages.keepEditingButtonLabel} />
33-
</Button>
34-
</div>
35-
);
36-
3712
const CancelConfirmModal = ({
3813
isOpen,
3914
closeCancelConfirmModal,
@@ -43,11 +18,21 @@ const CancelConfirmModal = ({
4318
return (
4419
<BaseModal
4520
size="lg"
21+
footerAction={(
22+
<Button
23+
variant="outline-brand"
24+
onClick={() => onCloseEditor?.()}
25+
>
26+
<FormattedMessage {...messages.discardChangesButtonlabel} />
27+
</Button>
28+
)}
4629
confirmAction={(
47-
<ActionButtons
48-
closeCancelConfirmModal={closeCancelConfirmModal}
49-
onCloseEditor={onCloseEditor}
50-
/>
30+
<Button
31+
variant="primary"
32+
onClick={closeCancelConfirmModal}
33+
>
34+
<FormattedMessage {...messages.keepEditingButtonLabel} />
35+
</Button>
5136
)}
5237
isOpen={isOpen}
5338
close={closeCancelConfirmModal}

src/editors/sharedComponents/BaseModal/index.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@ const BaseModal = ({
4848
</Scrollable>
4949
<ModalDialog.Footer>
5050
<ActionRow>
51-
{footerAction}
52-
<ActionRow.Spacer />
51+
{footerAction && (
52+
<>
53+
{footerAction}
54+
<ActionRow.Spacer />
55+
</>
56+
)}
5357
{!hideCancelButton && (
5458
<ModalDialog.CloseButton variant="tertiary" onClick={close}>
5559
<FormattedMessage {...messages.cancelButtonLabel} />

0 commit comments

Comments
 (0)