Skip to content

Commit 4a67966

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

File tree

5 files changed

+15
-40
lines changed

5 files changed

+15
-40
lines changed

components/actiongroup/index.css

+1-23
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ governing permissions and limitations under the License.
1616
--spectrum-actiongroup-button-spacing-reset: 0;
1717
--spectrum-actiongroup-border-radius-reset: 0;
1818
--spectrum-actiongroup-border-radius: var(--spectrum-corner-radius-100);
19+
--spectrum-actiongroup-gap-size-compact: var(--spectrum-spacing-50);
1920
}
2021

2122
.spectrum-ActionGroup--sizeXS,
@@ -76,15 +77,6 @@ governing permissions and limitations under the License.
7677

7778
border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
7879
border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
79-
margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
80-
}
81-
82-
& + .spectrum-ActionGroup-item {
83-
/* Action button passthrough styling */
84-
--mod-actionbutton-focus-indicator-border-radius: 0px;
85-
86-
margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
87-
margin-inline-end: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
8880
}
8981

9082
&:last-child {
@@ -93,8 +85,6 @@ governing permissions and limitations under the License.
9385

9486
border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
9587
border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
96-
margin-inline-start: var(--mod-actiongroup-horizontal-spacing-compact, var(--spectrum-actiongroup-horizontal-spacing-compact));
97-
margin-inline-end: var(--mod-actiongroup-border-radius-reset, var(--spectrum-actiongroup-border-radius-reset));
9888
}
9989

10090
&.is-selected {
@@ -128,16 +118,6 @@ governing permissions and limitations under the License.
128118

129119
border-start-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
130120
border-start-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
131-
margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
132-
margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
133-
margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
134-
}
135-
136-
& + .spectrum-ActionGroup-item {
137-
margin-inline-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
138-
margin-inline-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
139-
margin-block-start: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
140-
margin-block-end: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
141121
}
142122

143123
&:last-child {
@@ -146,8 +126,6 @@ governing permissions and limitations under the License.
146126

147127
border-end-start-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
148128
border-end-end-radius: var(--mod-actiongroup-border-radius, var(--spectrum-actiongroup-border-radius));
149-
margin-block-start: var(--mod-actiongroup-vertical-spacing-compact, var(--spectrum-actiongroup-vertical-spacing-compact));
150-
margin-block-end: var(--mod-actiongroup-button-spacing-reset, var(--spectrum-actiongroup-button-spacing-reset));
151129
}
152130
}
153131
}

components/actiongroup/metadata/mods.md

-3
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

+14
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,22 @@ Justified.args = {
117117
content: items
118118
};
119119

120+
export const JustifiedCompact = Template.bind({});
121+
JustifiedCompact.args = {
122+
justified: true,
123+
compact: true,
124+
content: items,
125+
};
126+
120127
export const Quiet = Template.bind({});
121128
Quiet.args = {
122129
areQuiet: true,
123130
content: items
124131
};
132+
133+
export const QuietCompact = Template.bind({});
134+
QuietCompact.args = {
135+
areQuiet: true,
136+
compact: true,
137+
content: items,
138+
};

components/actiongroup/themes/express.css

-7
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,4 @@ governing permissions and limitations under the License.
1313
@import "./spectrum.css";
1414

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

components/actiongroup/themes/spectrum.css

-7
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)