Skip to content
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

Jump to bottom

feat(modal): introduce size variants #4657

Merged
merged 9 commits into from
Nov 14, 2019
Merged

feat(modal): introduce size variants #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5454471
feat(modal): introduce size variants
asudoh Nov 11, 2019
fd00d63
Update packages/react/src/components/Modal/Modal.js
asudoh Nov 12, 2019
f270fdf
Update packages/react/src/components/Modal/Modal.js
asudoh Nov 12, 2019
164817e
fix(modal): align spacing pattern to other code
asudoh Nov 13, 2019
53a437b
Merge branch 'master' into modal-sizes
asudoh Nov 13, 2019
ee79a1c
fix(modal): address review comments
asudoh Nov 13, 2019
e1868cc
Merge branch 'master' into modal-sizes
asudoh Nov 14, 2019
23bd574
chore(modal): switch to spacing token for paddings
asudoh Nov 14, 2019
d7d00f7
Merge branch 'master' into modal-sizes
asudoh Nov 14, 2019
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
162 changes: 148 additions & 14 deletions packages/components/src/components/modal/_modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@

.#{$prefix}--modal-container {
position: relative;
display: flex;
flex-direction: column;
display: grid;
grid-template-rows: auto 1fr auto;
grid-template-columns: auto;
background-color: $ui-01;
width: 100%;
height: 100%;
Expand All @@ -83,31 +84,138 @@
transition: transform $duration--moderate-02 motion(exit, expressive);

@include carbon--breakpoint(md) {
width: 50%;
max-width: 768px;
width: 84%;
max-height: 90%;
height: auto;

.#{$prefix}--modal-header,
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content {
padding-right: 20%;
}
}

@include carbon--breakpoint(lg) {
max-height: 80%;
width: 60%;
max-height: 84%;
}

@include carbon--breakpoint(xlg) {
width: 48%;
}
}

.#{$prefix}--modal-header,
.#{$prefix}--modal-content {
padding-right: 25%;
padding-left: 1rem;
padding-left: $carbon--spacing-05;
}

.#{$prefix}--modal-header,
.#{$prefix}--modal-footer {
flex-shrink: 0;
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content {
padding-right: $carbon--spacing-05;
}

.#{$prefix}--modal-content--with-form {
padding-right: $carbon--spacing-05;

@include carbon--breakpoint(md) {
padding-right: $carbon--spacing-05; // Override for `.#{$prefix}--modal-content`
}
}

.#{$prefix}--modal-container--xs {
.#{$prefix}--modal-header,
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content,
.#{$prefix}--modal-content--with-form {
padding-right: $carbon--spacing-05;
}

@include carbon--breakpoint(md) {
width: 48%;
}

@include carbon--breakpoint(lg) {
width: 32%;
max-height: 48%;
}

@include carbon--breakpoint(xlg) {
width: 24%;
}
}

.#{$prefix}--modal-container--sm {
.#{$prefix}--modal-header,
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content,
.#{$prefix}--modal-content--with-form {
padding-right: $carbon--spacing-05;
}

@include carbon--breakpoint(md) {
width: 60%;
}

@include carbon--breakpoint(lg) {
width: 42%;
max-height: 72%;
}

@include carbon--breakpoint(xlg) {
width: 36%;

.#{$prefix}--modal-header,
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content {
padding-right: 20%;
}

.#{$prefix}--modal-content--with-form {
padding-right: $carbon--spacing-05; // Override for `.#{$prefix}--modal-content`
}
}
}

.#{$prefix}--modal-container--lg {
.#{$prefix}--modal-header,
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content,
.#{$prefix}--modal-content--with-form {
padding-right: $carbon--spacing-05;
}

@include carbon--breakpoint(md) {
width: 96%;

.#{$prefix}--modal-header,
.#{$prefix}--modal-content,
.#{$prefix}--modal-content__regular-content {
padding-right: 20%;
}

.#{$prefix}--modal-content--with-form {
padding-right: $carbon--spacing-05; // Override for `.#{$prefix}--modal-content`
}
}

@include carbon--breakpoint(lg) {
width: 84%;
max-height: 96%;
}

@include carbon--breakpoint(xlg) {
width: 72%;
}
}

.#{$prefix}--modal-header {
padding-top: 1rem;
padding-top: $carbon--spacing-05;
margin-bottom: $carbon--spacing-03;

grid-row: 1/1;
grid-column: 1/-1;
}

.#{$prefix}--modal-header__label {
Expand All @@ -126,6 +234,9 @@
.#{$prefix}--modal-content {
@include type-style('body-long-01');

grid-row: 2/-2;
grid-column: 1/-1;

overflow-y: auto;
margin-bottom: $carbon--spacing-08;
color: $text-01;
Expand All @@ -140,8 +251,28 @@
}
}

.#{$prefix}--modal-content > * {
@include type-style('body-long-01');
.#{$prefix}--modal-content {
> * {
@include type-style('body-long-01');
emyarod marked this conversation as resolved.
Show resolved Hide resolved
}
}

.#{$prefix}--modal-content--overflow-indicator {
grid-row: 2/-2;
grid-column: 1/-1;
width: 100%;
height: rem(32px);
content: '';
position: absolute;
left: 0;
bottom: $carbon--spacing-08;
background-image: linear-gradient(to bottom, transparent, $ui-01);
}

.#{$prefix}--modal-content:focus
~ .#{$prefix}--modal-content--overflow-indicator {
width: calc(100% - 4px);
margin: 0 2px 2px 2px;
}

.#{$prefix}--modal-footer {
Expand All @@ -150,13 +281,16 @@
height: 4rem;
background-color: $modal-footer-background-color;

grid-row: -1/-1;
grid-column: 1/-1;

button.#{$prefix}--btn {
max-width: none;
flex: 1;
height: 4rem;
margin: 0;
padding-top: 1rem;
padding-bottom: 2rem;
padding-top: $carbon--spacing-05;
padding-bottom: $carbon--spacing-07;
}
}

Expand Down
78 changes: 78 additions & 0 deletions packages/components/src/components/modal/modal.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,45 @@ module.exports = {
classCloseButton: `${prefix}--btn--secondary`,
},
},
{
name: 'xs',
label: 'Transactional Modal (XS)',
context: {
idSuffix: Math.random()
.toString(36)
.substr(2),
hasFooter: true,
classPrimaryButton: `${prefix}--btn--primary`,
classCloseButton: `${prefix}--btn--secondary`,
size: 'xs',
},
},
{
name: 'sm',
label: 'Transactional Modal (Small)',
context: {
idSuffix: Math.random()
.toString(36)
.substr(2),
hasFooter: true,
classPrimaryButton: `${prefix}--btn--primary`,
classCloseButton: `${prefix}--btn--secondary`,
size: 'sm',
},
},
{
name: 'lg',
label: 'Transactional Modal (Large)',
context: {
idSuffix: Math.random()
.toString(36)
.substr(2),
hasFooter: true,
classPrimaryButton: `${prefix}--btn--primary`,
classCloseButton: `${prefix}--btn--secondary`,
size: 'lg',
},
},
{
name: 'nofooter',
label: 'Passive Modal',
Expand All @@ -42,6 +81,45 @@ module.exports = {
classCloseButton: `${prefix}--btn--secondary`,
},
},
{
name: 'nofooter-xs',
label: 'Passive Modal (XS)',
context: {
idSuffix: Math.random()
.toString(36)
.substr(2),
hasFooter: false,
classPrimaryButton: `${prefix}--btn--primary`,
classCloseButton: `${prefix}--btn--secondary`,
size: 'xs',
},
},
{
name: 'nofooter-sm',
label: 'Passive Modal (Small)',
context: {
idSuffix: Math.random()
.toString(36)
.substr(2),
hasFooter: false,
classPrimaryButton: `${prefix}--btn--primary`,
classCloseButton: `${prefix}--btn--secondary`,
size: 'sm',
},
},
{
name: 'nofooter-lg',
label: 'Passive Modal (Large)',
context: {
idSuffix: Math.random()
.toString(36)
.substr(2),
hasFooter: false,
classPrimaryButton: `${prefix}--btn--primary`,
classCloseButton: `${prefix}--btn--secondary`,
size: 'lg',
},
},
{
name: 'danger',
label: 'Danger Modal',
Expand Down
8 changes: 5 additions & 3 deletions packages/components/src/components/modal/modal.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<div data-modal id="modal-{{idSuffix}}" class="{{@root.prefix}}--modal {{classModalSupplemental}}" role="dialog"
aria-modal="true" aria-labelledby="modal-{{idSuffix}}-label" aria-describedby="modal-{{idSuffix}}-heading" tabindex="-1">
<div class="{{@root.prefix}}--modal-container">
<div class="{{@root.prefix}}--modal-container{{#if size}} {{@root.prefix}}--modal-container--{{size}}{{/if}}">
<div class="{{@root.prefix}}--modal-header">
<p class="{{@root.prefix}}--modal-header__label {{@root.prefix}}--type-delta" id="modal-{{idSuffix}}-label">Optional label</p>
<p class="{{@root.prefix}}--modal-header__heading {{@root.prefix}}--type-beta" id="modal-{{idSuffix}}-heading">Modal heading</p>
Expand All @@ -20,7 +20,8 @@
</div>

<!-- Note: Modals with content that scrolls, at any viewport, requires `tabindex="0"` on the `bx--modal-content` element -->
<div class="{{@root.prefix}}--modal-content" {{#if hasScrollingContent}}tabindex="0"{{/if}}>

<div class="{{@root.prefix}}--modal-content{{#if hasInput}} {{@root.prefix}}--modal-content--with-form{{/if}}" {{#if hasScrollingContent}}tabindex="0"{{/if}}>
{{#if hasInput}}
<div class="{{@root.prefix}}--form-item">
<label for="text-input-{{idSuffix}}" class="{{@root.prefix}}--label">Text Input label</label>
Expand Down Expand Up @@ -71,9 +72,10 @@
tellus tincidunt posuere. Curabitur justo urna, consectetur vel elit iaculis, ultrices condimentum risus. Nulla
facilisi.
Etiam venenatis molestie tellus. Quisque consectetur non risus eu rutrum. </p>
{{/if}}
{{/if}}
{{/if}}
</div>
<div class="{{@root.prefix}}--modal-content--overflow-indicator"></div>

{{#if hasFooter}}
<div class="{{@root.prefix}}--modal-footer">
Expand Down
Loading