Skip to content

Commit e850fdc

Browse files
Melissa Thompsonpfulton
Melissa Thompson
authored andcommitted
feat(actiongroup)!: migrate to S2 (#2453)
BREAKING CHANGE: migrates `Action Group` to Spectrum 2, Removes some mod properties
1 parent be983a9 commit e850fdc

File tree

5 files changed

+16
-41
lines changed

5 files changed

+16
-41
lines changed

components/actiongroup/index.css

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ governing permissions and limitations under the License.
1414
--spectrum-actiongroup-button-spacing-reset: 0;
1515
--spectrum-actiongroup-border-radius-reset: 0;
1616
--spectrum-actiongroup-border-radius: var(--spectrum-corner-radius-100);
17+
--spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);
1718
}
1819

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

3738
.spectrum-ActionGroup-item {
3839
flex-shrink: 0;
39-
40+
4041
/* Focus indicator should appear above hovered and selected borders */
4142
&:focus-visible {
4243
z-index: 3;
@@ -74,15 +75,6 @@ governing permissions and limitations under the License.
7475

7576
border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
7677
border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
77-
margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
78-
}
79-
80-
& + .spectrum-ActionGroup-item {
81-
/* Action button passthrough styling */
82-
--mod-actionbutton-focus-indicator-border-radius: 0px;
83-
84-
margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
85-
margin-inline-end: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
8678
}
8779

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

9284
border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
9385
border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
94-
margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
95-
margin-inline-end: var(--mod-actiongroup-border-radius-reset, var(--spectrum-actiongroup-border-radius-reset));
9686
}
9787

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

127117
border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
128118
border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
129-
margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
130-
margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
131-
margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
132-
}
133-
134-
& + .spectrum-ActionGroup-item {
135-
margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
136-
margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
137-
margin-block-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
138-
margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
139119
}
140120

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

145125
border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
146126
border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
147-
margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
148-
margin-block-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
149127
}
150128
}
151129
}

components/actiongroup/metadata/mods.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
| ---------------------------------------------- |
33
| `--mod-actiongroup-border-radius` |
44
| `--mod-actiongroup-border-radius-reset` |
5-
| `--mod-actiongroup-button-spacing-reset` |
65
| `--mod-actiongroup-gap-size-compact` |
7-
| `--mod-actiongroup-horizontal-spacing-compact` |
86
| `--mod-actiongroup-horizontal-spacing-regular` |
9-
| `--mod-actiongroup-vertical-spacing-compact` |
107
| `--mod-actiongroup-vertical-spacing-regular` |

components/actiongroup/stories/actiongroup.stories.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,22 @@ Justified.args = {
119119
content: items
120120
};
121121

122+
export const JustifiedCompact = Template.bind({});
123+
JustifiedCompact.args = {
124+
justified: true,
125+
compact: true,
126+
content: items,
127+
};
128+
122129
export const Quiet = Template.bind({});
123130
Quiet.args = {
124131
areQuiet: true,
125132
content: items
126133
};
134+
135+
export const QuietCompact = Template.bind({});
136+
QuietCompact.args = {
137+
areQuiet: true,
138+
compact: true,
139+
content: items,
140+
};

components/actiongroup/themes/express.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,4 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
@container (--system: express) {
14-
.spectrum-ActionGroup {
15-
--spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);
16-
17-
/* account for button border */
18-
--spectrum-actiongroup-horizontal-spacing-compact: calc(-1px * var(--spectrum-spacing-50));
19-
--spectrum-actiongroup-vertical-spacing-compact: calc(-1px * var(--spectrum-spacing-50));
20-
}
2114
}

components/actiongroup/themes/spectrum.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,4 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
@container (--system: spectrum) {
14-
.spectrum-ActionGroup {
15-
--spectrum-actiongroup-gap-size-compact: 0;
16-
17-
/* account for button border */
18-
--spectrum-actiongroup-horizontal-spacing-compact: -1px;
19-
--spectrum-actiongroup-vertical-spacing-compact: -1px;
20-
}
2114
}

0 commit comments

Comments
 (0)