Skip to content

feat(actiongroup): remove modifiers [SWC-1264] #4253

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
merged 1 commit into from
Oct 16, 2025
Merged

feat(actiongroup): remove modifiers [SWC-1264] #4253

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
43 changes: 11 additions & 32 deletions components/actiongroup/dist/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@
"sourceFile": "index.css",
"selectors": [
".spectrum-ActionGroup",
".spectrum-ActionGroup .spectrum-ActionGroup-item",
".spectrum-ActionGroup .spectrum-ActionGroup-item:focus-visible",
".spectrum-ActionGroup--compact",
".spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet)",
".spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item",
".spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item + .spectrum-ActionGroup-item",
".spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item:first-child",
".spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item:last-child",
".spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet)",
".spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item",
".spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item + .spectrum-ActionGroup-item",
".spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item .spectrum-ActionButton-label",
Expand All @@ -20,39 +15,23 @@
".spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item:hover",
".spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) .spectrum-ActionGroup-item:last-child",
".spectrum-ActionGroup--justified .spectrum-ActionGroup-item",
".spectrum-ActionGroup--sizeL",
".spectrum-ActionGroup--sizeM",
".spectrum-ActionGroup--sizeS",
".spectrum-ActionGroup--sizeXL",
".spectrum-ActionGroup--sizeXS",
".spectrum-ActionGroup--vertical",
".spectrum-ActionGroup-item",
".spectrum-ActionGroup-item:focus-visible",
".spectrum-ActionGroup.spectrum-ActionGroup--compact",
".spectrum-ActionGroup.spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet)",
".spectrum-ActionGroup.spectrum-ActionGroup--sizeS",
".spectrum-ActionGroup.spectrum-ActionGroup--sizeXS",
".spectrum-ActionGroup.spectrum-ActionGroup--vertical",
".spectrum-ActionGroup:not(.spectrum-ActionGroup--vertical, .spectrum-ActionGroup--compact) .spectrum-ActionGroup-item"
],
"modifiers": [
"--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",
"--mod-actiongroup-vertical-spacing-regular"
],
"component": [
"--spectrum-actiongroup-border-radius",
"--spectrum-actiongroup-border-radius-reset",
"--spectrum-actiongroup-button-spacing-reset",
"--spectrum-actiongroup-gap-size-compact",
"--spectrum-actiongroup-horizontal-spacing-compact",
"--spectrum-actiongroup-horizontal-spacing-regular",
"--spectrum-actiongroup-vertical-spacing-compact",
"--spectrum-actiongroup-vertical-spacing-regular"
],
"modifiers": [],
"component": ["--spectrum-actiongroup-spacing"],
"global": [
"--spectrum-actionbutton-focus-indicator-border-radius",
"--spectrum-corner-radius-100",
"--spectrum-spacing-100",
"--spectrum-spacing-75"
],
"passthroughs": ["--mod-actionbutton-focus-indicator-border-radius"],
"passthroughs": [],
"high-contrast": []
}
142 changes: 61 additions & 81 deletions components/actiongroup/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,94 +12,78 @@
*/

.spectrum-ActionGroup {
--spectrum-actiongroup-gap-size-compact: 0;
--spectrum-actiongroup-spacing: var(--spectrum-spacing-100);

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

--spectrum-actiongroup-button-spacing-reset: 0;
--spectrum-actiongroup-border-radius-reset: 0;
--spectrum-actiongroup-border-radius: var(--spectrum-corner-radius-100);
}

.spectrum-ActionGroup--sizeXS,
.spectrum-ActionGroup--sizeS {
--spectrum-actiongroup-horizontal-spacing-regular: var(--spectrum-spacing-75);
--spectrum-actiongroup-vertical-spacing-regular: var(--spectrum-spacing-75);
}
&.spectrum-ActionGroup--sizeXS,
&.spectrum-ActionGroup--sizeS {
--spectrum-actiongroup-spacing: var(--spectrum-spacing-75);
}

.spectrum-ActionGroup--sizeM,
.spectrum-ActionGroup--sizeL,
.spectrum-ActionGroup--sizeXL {
--spectrum-actiongroup-horizontal-spacing-regular: var(--spectrum-spacing-100);
--spectrum-actiongroup-vertical-spacing-regular: var(--spectrum-spacing-100);
}
&.spectrum-ActionGroup--compact {
/* account for button border */
--spectrum-actiongroup-spacing: -1px;
}

.spectrum-ActionGroup {
display: flex;
flex-wrap: wrap;
gap: var(--mod-actiongroup-horizontal-spacing-regular, var(--spectrum-actiongroup-horizontal-spacing-regular));

.spectrum-ActionGroup-item {
flex-shrink: 0;
gap: var(--spectrum-actiongroup-spacing);

/* Focus indicator should appear above hovered and selected borders */
&:focus-visible {
z-index: 3;
}
&.spectrum-ActionGroup--vertical {
display: inline-flex;
flex-direction: column;
}

&:not(.spectrum-ActionGroup--vertical, .spectrum-ActionGroup--compact) {
.spectrum-ActionGroup-item {
flex-shrink: 0;
&.spectrum-ActionGroup--compact {
gap: 0;

&:not(.spectrum-ActionGroup--quiet) {
flex-wrap: nowrap;
}
}
}

.spectrum-ActionGroup--vertical {
gap: var(--mod-actiongroup-vertical-spacing-regular, var(--spectrum-actiongroup-vertical-spacing-regular));
display: inline-flex;
flex-direction: column;
}
.spectrum-ActionGroup-item {
flex-shrink: 0;

.spectrum-ActionGroup--compact {
gap: var(--mod-actiongroup-gap-size-compact, var(--spectrum-actiongroup-gap-size-compact));
}
/* Focus indicator should appear above hovered and selected borders */
&:focus-visible {
z-index: 3;
}

.spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) {
flex-wrap: nowrap;
.spectrum-ActionGroup:not(.spectrum-ActionGroup--vertical, .spectrum-ActionGroup--compact) & {
flex-shrink: 0;
}

.spectrum-ActionGroup-item {
.spectrum-ActionGroup--compact:not(.spectrum-ActionGroup--quiet) & {
position: relative;
border-radius: var(--mod-actiongroup-border-radius-reset, var(--spectrum-actiongroup-border-radius-reset));
border-radius: 0;
z-index: 0;

&:first-child {
/* @passthrough -- Action button styling */
--mod-actionbutton-focus-indicator-border-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius)) 0px 0px var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
--spectrum-actionbutton-focus-indicator-border-radius: var(--spectrum-corner-radius-100) 0px 0px var(--spectrum-corner-radius-100);

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));
border-start-start-radius: var(--spectrum-corner-radius-100);
border-end-start-radius: var(--spectrum-corner-radius-100);
margin-inline-start: 0;
}

& + .spectrum-ActionGroup-item {
/* @passthrough -- Action button styling */
--mod-actionbutton-focus-indicator-border-radius: 0px;
--spectrum-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));
margin-inline-start: var(--spectrum-actiongroup-spacing);
margin-inline-end: var(--spectrum-actiongroup-spacing);
}

&:last-child {
/* @passthrough -- Action button styling */
--mod-actionbutton-focus-indicator-border-radius: 0px var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius)) var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius)) 0px;
--spectrum-actionbutton-focus-indicator-border-radius: 0px var(--spectrum-corner-radius-100) var(--spectrum-corner-radius-100) 0px;

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));
border-start-end-radius: var(--spectrum-corner-radius-100);
border-end-end-radius: var(--spectrum-corner-radius-100);
margin-inline-start: var(--spectrum-actiongroup-spacing);
margin-inline-end: 0;
}

&.is-selected {
Expand All @@ -119,44 +103,40 @@
inline-size: auto;
}
}
}

.spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet) {
gap: var(--mod-actiongroup-gap-size-compact, var(--spectrum-actiongroup-gap-size-compact));

.spectrum-ActionGroup-item {
border-radius: var(--mod-actiongroup-border-radius-reset, var(--spectrum-actiongroup-border-radius-reset));
.spectrum-ActionGroup--compact.spectrum-ActionGroup--vertical:not(.spectrum-ActionGroup--quiet) & {
border-radius: 0;

&:first-child {
/* @passthrough -- Action button styling */
--mod-actionbutton-focus-indicator-border-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius)) var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius)) 0px 0px;
--spectrum-actionbutton-focus-indicator-border-radius: var(--spectrum-corner-radius-100) var(--spectrum-corner-radius-100) 0px 0px;

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));
border-start-start-radius: var(--spectrum-corner-radius-100);
border-start-end-radius: var(--spectrum-corner-radius-100);
margin-inline-end: 0;
margin-block-start: var(--spectrum-actiongroup-spacing);
margin-block-end: var(--spectrum-actiongroup-spacing);
}

& + .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));
margin-inline-start: 0;
margin-inline-end: 0;
margin-block-start: 0;
margin-block-end: var(--spectrum-actiongroup-spacing);
}

&:last-child {
/* @passthrough -- Action button styling */
--mod-actionbutton-focus-indicator-border-radius: 0px 0px var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius)) var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
--spectrum-actionbutton-focus-indicator-border-radius: 0px 0px var(--spectrum-corner-radius-100) var(--spectrum-corner-radius-100);

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));
border-end-start-radius: var(--spectrum-corner-radius-100);
border-end-end-radius: var(--spectrum-corner-radius-100);
margin-block-start: var(--spectrum-actiongroup-spacing);
margin-block-end: 0;
}
}
}

.spectrum-ActionGroup--justified .spectrum-ActionGroup-item {
flex-grow: 1;
.spectrum-ActionGroup--justified & {
flex-grow: 1;
}
}
Loading