Skip to content

feat(dialog): add padding to default slot #9871

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
driskull merged 3 commits into from
Jul 29, 2024
Merged

feat(dialog): add padding to default slot #9871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d4427c
fix(dialog): add padding to default slot #9869
driskull Jul 27, 2024
c7bb786
cleanup
driskull Jul 27, 2024
f1ea61a
review fixes
driskull Jul 29, 2024
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
8 changes: 8 additions & 0 deletions packages/calcite-components/src/components/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @prop --calcite-dialog-scrim-background-color: Specifies the background color of the component's scrim.
* @prop --calcite-dialog-size-x: Specifies the width of the component, using `px`, `em`, `rem`, `vw`, or `%`. Does not exceed the viewport's width - applies when `placement="cover"` is set.
* @prop --calcite-dialog-size-y: Specifies the height of the component, using `px`, `em`, `rem`, `vh`, or `%`. Does not exceed the viewport's height - applies when `placement="cover"` is set.
* @prop --calcite-dialog-content-space: Specifies the padding of the component's content.
Comment thread
driskull marked this conversation as resolved.
* @prop --calcite-dialog-footer-space: Specifies the padding of the component's footer.
* @prop --calcite-dialog-border-color: Specifies the component's border color.
*/
Expand Down Expand Up @@ -75,20 +76,23 @@
}

:host([scale="s"]) {
--calcite-internal-dialog-content-padding: var(--calcite-spacing-sm);
--calcite-internal-dialog-padding: theme("spacing.3");
--calcite-internal-dialog-padding-large: theme("spacing.4");
--calcite-internal-dialog-title-text: theme("fontSize.1h");
--calcite-internal-dialog-content-text: theme("fontSize.n1");
}

:host([scale="m"]) {
--calcite-internal-dialog-content-padding: var(--calcite-spacing-md);
--calcite-internal-dialog-padding: theme("spacing.4");
--calcite-internal-dialog-padding-large: theme("spacing.5");
--calcite-internal-dialog-title-text: theme("fontSize.2h");
--calcite-internal-dialog-content-text: theme("fontSize.0");
}

:host([scale="l"]) {
--calcite-internal-dialog-content-padding: var(--calcite-spacing-lg);
--calcite-internal-dialog-padding: theme("spacing.5");
--calcite-internal-dialog-padding-large: theme("spacing.6");
--calcite-internal-dialog-title-text: theme("fontSize.3h");
Expand All @@ -113,6 +117,10 @@ calcite-panel {
--calcite-panel-header-border-block-end: var(--calcite-border-width-sm) solid var(--calcite-dialog-border-color);
}

.content {
padding: var(--calcite-dialog-content-space, var(--calcite-internal-dialog-content-padding));
}

.dialog {
@apply pointer-events-none
float-none
Expand Down
6 changes: 4 additions & 2 deletions packages/calcite-components/src/components/dialog/dialog.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,8 @@ export const footerSlot = (): string => html`
`;

const themedStyle = html` --calcite-dialog-scrim-background-color: purple; --calcite-dialog-size-x: 400px;
--calcite-dialog-size-y: 400px; --calcite-dialog-footer-space: 50px; --calcite-dialog-border-color: pink;`;
--calcite-dialog-size-y: 400px; --calcite-dialog-footer-space: 50px; --calcite-dialog-border-color: pink;
--calcite-dialog-content-space: 50px;`;

export const themed = (): string =>
html`<calcite-dialog
Expand All @@ -363,6 +364,7 @@ export const themed = (): string =>
scale="m"
width-scale="s"
>
<p>Slotted content!</p>
Slotted content!
<div slot="footer">Footer!</div>
<calcite-fab slot="${SLOTS.fab}"></calcite-fab>
</calcite-dialog>`;
4 changes: 3 additions & 1 deletion packages/calcite-components/src/components/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ export class Dialog
<slot name={SLOTS.footerStart} slot={PANEL_SLOTS.footerStart} />
<slot name={SLOTS.footer} slot={PANEL_SLOTS.footer} />
<slot name={SLOTS.footerEnd} slot={PANEL_SLOTS.footerEnd} />
<slot />
<div class={CSS.content}>
<slot />
</div>
</calcite-panel>
</slot>
</div>
Expand Down
1 change: 1 addition & 0 deletions packages/calcite-components/src/components/dialog/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const CSS = {
container: "container",
containerOpen: "container--open",
containerEmbedded: "container--embedded",
content: "content",

// these classes help apply the animation in phases to only set transform on open/close
// this helps avoid a positioning issue for any floating-ui-owning children
Expand Down