Skip to content

Don't render Modal footer when no actions and no close handler are provided #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2020
Merged

Don't render Modal footer when no actions and no close handler are provided #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions src/lib/components/ui/Modal/Modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,35 +179,37 @@ class Modal extends React.Component {
)}
</div>
{modalBody()}
<div className={styles.footer}>
<Toolbar justify="center" dense>
{actions.map((action) => (
<ToolbarItem key={action.label}>
<Button
{...transferProps(action)}
clickHandler={action.clickHandler}
disabled={action.disabled}
id={action.id || undefined}
label={action.label}
loadingIcon={action.loadingIcon}
ref={this.submitButtonRef}
type="button"
variant={action.variant}
/>
</ToolbarItem>
))}
{closeHandler && (
<ToolbarItem>
<Button
clickHandler={closeHandler}
label={translations.close}
priority="flat"
{...(id && { id: `${id}__closeModalFooterButton` })}
/>
</ToolbarItem>
)}
</Toolbar>
</div>
{(actions.length || closeHandler) && (
<div className={styles.footer}>
<Toolbar justify="center" dense>
{actions.map((action) => (
<ToolbarItem key={action.label}>
<Button
{...transferProps(action)}
clickHandler={action.clickHandler}
disabled={action.disabled}
id={action.id || undefined}
label={action.label}
loadingIcon={action.loadingIcon}
ref={this.submitButtonRef}
type="button"
variant={action.variant}
/>
</ToolbarItem>
))}
{closeHandler && (
<ToolbarItem>
<Button
clickHandler={closeHandler}
label={translations.close}
priority="flat"
{...(id && { id: `${id}__closeModalFooterButton` })}
/>
</ToolbarItem>
)}
</Toolbar>
</div>
)}
</div>
</div>
);
Expand Down
35 changes: 0 additions & 35 deletions src/lib/components/ui/Modal/__tests__/__snapshots__/Modal.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,20 +823,6 @@ exports[`rendering renders correctly with mandatory props only 1`] = `
</ScrollView>
</WithTranslationContextComponent>
</div>
<div
className="footer"
>
<Toolbar
align="top"
dense={true}
justify="center"
nowrap={false}
>
<div
className="toolbar isDense isAlignedToTop isJustifiedToCenter"
/>
</Toolbar>
</div>
</div>
</div>
</Modal>
Expand Down Expand Up @@ -923,13 +909,6 @@ exports[`rendering renders correctly with portal id 1`] = `
/>
</div>
</div>
<div
class="footer"
>
<div
class="toolbar isDense isAlignedToTop isJustifiedToCenter"
/>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1041,20 +1020,6 @@ exports[`rendering renders correctly with portal id 1`] = `
</ScrollView>
</WithTranslationContextComponent>
</div>
<div
className="footer"
>
<Toolbar
align="top"
dense={true}
justify="center"
nowrap={false}
>
<div
className="toolbar isDense isAlignedToTop isJustifiedToCenter"
/>
</Toolbar>
</div>
</div>
</div>
</Portal>
Expand Down