Skip to content

fix(dialog): allow shell to be slotted inside #10118

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 8 commits into from
Aug 22, 2024
Merged

fix(dialog): allow shell to be slotted inside #10118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cf4764
feat(panel): add '--calcite-panel-content-space' style.
driskull Aug 20, 2024
6ef131f
screenshot test
driskull Aug 20, 2024
5ca3bf9
fix(dialog): allow shell to be slotted inside #10095
driskull Aug 20, 2024
abde42a
Merge branch 'dev' into dris0000/dialog-panel-content-space
driskull Aug 21, 2024
1bc0d18
Merge branch 'dev' into dris0000/panel-content-space
driskull Aug 21, 2024
e6801a7
review fixes
driskull Aug 21, 2024
0aa907d
Merge branch 'dris0000/panel-content-space' into dris0000/dialog-pane…
driskull Aug 21, 2024
aba1938
Merge branch 'dev' into dris0000/dialog-panel-content-space
driskull Aug 21, 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
5 changes: 1 addition & 4 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 @@ -115,14 +115,11 @@
}

calcite-panel {
--calcite-panel-content-space: var(--calcite-dialog-content-space, var(--calcite-internal-dialog-content-padding));
--calcite-panel-footer-padding: var(--calcite-dialog-footer-space);
--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
21 changes: 21 additions & 0 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 @@ -360,6 +360,27 @@ const themedStyle = html`--calcite-dialog-scrim-background-color: purple; --calc
--calcite-dialog-size-y: 400px; --calcite-dialog-footer-space: 50px; --calcite-dialog-border-color: pink;
--calcite-dialog-content-space: 50px; --calcite-dialog-offset-x: 50px; --calcite-dialog-offset-y: -30px;`;

export const withShellInside = (): string =>
html`<calcite-dialog open modal heading="heading" description="description" scale="m" width-scale="l">
<calcite-shell>
<calcite-shell-panel slot="panel-start">
<calcite-action-bar slot="action-bar" expanded>
<calcite-action-group>
<calcite-action text-enabled text="Action 1"></calcite-action>
<calcite-action text-enabled text="Action 2"></calcite-action>
<calcite-action text-enabled text="Action 3"></calcite-action>
<calcite-action text-enabled text="Action 4"></calcite-action>
</calcite-action-group>
</calcite-action-bar>
</calcite-shell-panel>
<calcite-shell-center-row>
<calcite-button>button</calcite-button>
</calcite-shell-center-row>
</calcite-shell>
<calcite-button slot="footer-end" appearance="outline"> Cancel </calcite-button>
<calcite-button slot="footer-end"> Save </calcite-button>
</calcite-dialog>`;

export const themed = (): string =>
html`<calcite-dialog
style="${themedStyle}"
Expand Down
4 changes: 1 addition & 3 deletions 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 @@ -275,9 +275,7 @@ 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} />
<div class={CSS.content}>
<slot />
</div>
<slot />
</calcite-panel>
</slot>
</div>
Expand Down
1 change: 0 additions & 1 deletion 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,7 +7,6 @@ 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