Skip to content

feat(actiongroup)!: migrate to S2 #2453

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
pfulton merged 1 commit into from
Feb 2, 2024
Merged

feat(actiongroup)!: migrate to S2 #2453

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
26 changes: 2 additions & 24 deletions components/actiongroup/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ governing permissions and limitations under the License.
--spectrum-actiongroup-button-spacing-reset: 0;
--spectrum-actiongroup-border-radius-reset: 0;
--spectrum-actiongroup-border-radius: var(--spectrum-corner-radius-100);
--spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);
}

.spectrum-ActionGroup--sizeXS,
Expand All @@ -36,7 +37,7 @@ governing permissions and limitations under the License.

.spectrum-ActionGroup-item {
flex-shrink: 0;

/* Focus indicator should appear above hovered and selected borders */
&:focus-visible {
z-index: 3;
Expand Down Expand Up @@ -74,15 +75,6 @@ governing permissions and limitations under the License.

border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
}

& + .spectrum-ActionGroup-item {
/* Action button passthrough styling */
--mod-actionbutton-focus-indicator-border-radius: 0px;

margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
margin-inline-end: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
}

&:last-child {
Expand All @@ -91,8 +83,6 @@ governing permissions and limitations under the License.

border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
margin-inline-end: var(--mod-actiongroup-border-radius-reset, var(--spectrum-actiongroup-border-radius-reset));
}

&.is-selected {
Expand Down Expand Up @@ -126,16 +116,6 @@ governing permissions and limitations under the License.

border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
}

& + .spectrum-ActionGroup-item {
margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
margin-block-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
}

&:last-child {
Expand All @@ -144,8 +124,6 @@ governing permissions and limitations under the License.

border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
margin-block-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions components/actiongroup/metadata/mods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
| ---------------------------------------------- |
| `--mod-actiongroup-border-radius` |
| `--mod-actiongroup-border-radius-reset` |
| `--mod-actiongroup-button-spacing-reset` |
| `--mod-actiongroup-gap-size-compact` |
| `--mod-actiongroup-horizontal-spacing-compact` |
| `--mod-actiongroup-horizontal-spacing-regular` |
| `--mod-actiongroup-vertical-spacing-compact` |
Comment on lines -5 to -9
Copy link
Copy Markdown
Collaborator Author

@mdt2 mdt2 Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok to remove these mods since this is a breaking change, or is there a different way we need to do this?

Copy link
Copy Markdown
Collaborator

@pfulton pfulton Feb 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think this is an ok change to make!

| `--mod-actiongroup-vertical-spacing-regular` |
14 changes: 14 additions & 0 deletions components/actiongroup/stories/actiongroup.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,22 @@ Justified.args = {
content: items
};

export const JustifiedCompact = Template.bind({});
JustifiedCompact.args = {
justified: true,
compact: true,
content: items,
};

export const Quiet = Template.bind({});
Quiet.args = {
areQuiet: true,
content: items
};

export const QuietCompact = Template.bind({});
QuietCompact.args = {
areQuiet: true,
compact: true,
content: items,
};
7 changes: 0 additions & 7 deletions components/actiongroup/themes/express.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,4 @@ governing permissions and limitations under the License.
*/

@container (--system: express) {
.spectrum-ActionGroup {
--spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);

/* account for button border */
--spectrum-actiongroup-horizontal-spacing-compact: calc(-1px * var(--spectrum-spacing-50));
--spectrum-actiongroup-vertical-spacing-compact: calc(-1px * var(--spectrum-spacing-50));
}
}
7 changes: 0 additions & 7 deletions components/actiongroup/themes/spectrum.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,4 @@ governing permissions and limitations under the License.
*/

@container (--system: spectrum) {
.spectrum-ActionGroup {
--spectrum-actiongroup-gap-size-compact: 0;

/* account for button border */
--spectrum-actiongroup-horizontal-spacing-compact: -1px;
--spectrum-actiongroup-vertical-spacing-compact: -1px;
}
}