Skip to content

feat: add x-large and xx-large sizes to modal #4240

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

Draft
amanabiy wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add x-large and xx-large sizes to modal #4240

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
6 changes: 4 additions & 2 deletions src/__tests__/snapshot-tests/__snapshots__/documenter.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17506,8 +17506,8 @@ of the most recent getModalRoot call as an argument.",
{
"defaultValue": "'medium'",
"description": "Sets the width of the modal. \`max\` uses variable width up to the
largest size allowed by the design guidelines. Other sizes
(\`small\`/\`medium\`/\`large\`) have fixed widths.",
largest size allowed by the design guidelines. Other sizes:
\`small\` (320px), \`medium\` (600px), \`large\` (820px), \`x-large\` (1024px), \`xx-large\` (1280px).",
"inlineType": {
"name": "ModalProps.Size",
"type": "union",
Expand All @@ -17516,6 +17516,8 @@ largest size allowed by the design guidelines. Other sizes
"max",
"medium",
"large",
"x-large",
"xx-large",
],
},
"name": "size",
Expand Down
2 changes: 1 addition & 1 deletion src/modal/__tests__/modal.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe('Modal component', () => {

describe('size property', () => {
it('displays correct size', () => {
(['small', 'medium', 'large', 'max'] as ModalProps.Size[]).forEach(size => {
(['small', 'medium', 'large', 'x-large', 'xx-large', 'max'] as ModalProps.Size[]).forEach(size => {
const wrapper = renderModal({ size });
expect(wrapper.findDialog().getElement()).toHaveClass(styles[size]);
});
Expand Down
6 changes: 3 additions & 3 deletions src/modal/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export interface BaseModalProps {
export interface ModalProps extends BaseComponentProps, BaseModalProps {
/**
* Sets the width of the modal. `max` uses variable width up to the
* largest size allowed by the design guidelines. Other sizes
* (`small`/`medium`/`large`) have fixed widths.
* largest size allowed by the design guidelines. Other sizes:
* `small` (320px), `medium` (600px), `large` (820px), `x-large` (1024px), `xx-large` (1280px).
*/
size?: ModalProps.Size;
/**
Expand Down Expand Up @@ -81,7 +81,7 @@ export interface ModalProps extends BaseComponentProps, BaseModalProps {
}

export namespace ModalProps {
export type Size = 'small' | 'medium' | 'large' | 'max';
export type Size = 'small' | 'medium' | 'large' | 'x-large' | 'xx-large' | 'max';

export interface DismissDetail {
reason: string;
Expand Down
39 changes: 33 additions & 6 deletions src/modal/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ $modal-z-index: 5000;
z-index: $modal-z-index;
pointer-events: all;

// viewport - (closed app layout panel widths + 20px on each side)
$max-modal-size: calc(100vw - (2 * 4 * #{styles.$base-size} + #{awsui.$space-xxxl}));
$size-large: 820px;
$size-x-large: 1024px;
$size-xx-large: 1280px;

&.small {
max-inline-size: 320px;
}
Expand All @@ -63,14 +69,35 @@ $modal-z-index: 5000;
}

&.large {
max-inline-size: 820px;
max-inline-size: $size-large;
}

&.x-large {
max-inline-size: $size-x-large;
}

&.xx-large {
max-inline-size: $size-xx-large;
}

&.max.breakpoint-xs {
// viewport - (closed app layout panel widths + 20px on each side)
max-inline-size: calc(100vw - (2 * 4 * #{styles.$base-size} + #{awsui.$space-xxxl}));
margin-block: auto;
margin-inline: auto;
&.breakpoint-xs {
&.large {
max-inline-size: min($size-large, $max-modal-size);
}

&.x-large {
max-inline-size: min($size-x-large, $max-modal-size);
}

&.xx-large {
max-inline-size: min($size-xx-large, $max-modal-size);
}

&.max {
max-inline-size: $max-modal-size;
margin-block: auto;
margin-inline: auto;
}
}
}

Expand Down
Loading