Skip to content

Commit f239818

Browse files
committed
fix(swatch+swatchgroup): split medium + large sizing back out
1 parent e13dbc4 commit f239818

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

.changeset/proud-schools-reply.md

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ An `Add Swatch` variant has been added with the required color tokens and the sp
2424
`--spectrum-swatch-icon-color`
2525
`--spectrum-swatch-rectangle-width-multiplier`
2626
`--spectrum-swatchgroup-border-color`
27-
`--spectrum-swatchgroup-spacing-mediumLarge`
2827

2928
##### New mods
3029

components/swatchgroup/dist/metadata.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".spectrum-SwatchGroup",
5-
".spectrum-SwatchGroup--mediumLarge",
5+
".spectrum-SwatchGroup--sizeL",
6+
".spectrum-SwatchGroup--sizeM",
67
".spectrum-SwatchGroup--spacious"
78
],
89
"modifiers": [
910
"--mod-swatch-group-spacing-spacious",
10-
"--mod-swatchgroup-spacing",
11-
"--mod-swatchgroup-spacing-mediumLarge"
11+
"--mod-swatchgroup-spacing"
1212
],
1313
"component": [
1414
"--spectrum-swatch-group-spacing-spacious",
15-
"--spectrum-swatchgroup-spacing",
16-
"--spectrum-swatchgroup-spacing-mediumLarge"
15+
"--spectrum-swatchgroup-spacing"
1716
],
1817
"global": ["--spectrum-spacing-100", "--spectrum-spacing-75"],
1918
"passthroughs": [],

components/swatchgroup/index.css

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
.spectrum-SwatchGroup {
1515
--spectrum-swatchgroup-spacing: var(--spectrum-spacing-75);
16-
--spectrum-swatchgroup-spacing-mediumLarge: var(--spectrum-spacing-100);
1716
}
1817

1918
.spectrum-SwatchGroup {
@@ -29,7 +28,12 @@
2928
--mod-swatchgroup-spacing: var(--mod-swatch-group-spacing-spacious, var(--spectrum-swatch-group-spacing-spacious));
3029
}
3130

32-
/* Medium/large */
33-
.spectrum-SwatchGroup--mediumLarge {
31+
/* Medium */
32+
.spectrum-SwatchGroup--sizeM {
33+
--spectrum-swatchgroup-spacing: var(--spectrum-spacing-100);
34+
}
35+
36+
/* Large */
37+
.spectrum-SwatchGroup--sizeL {
3438
--spectrum-swatchgroup-spacing: var(--spectrum-spacing-100);
3539
}

components/swatchgroup/stories/swatchgroup.stories.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { RoundingTemplate, Template } from "./template.js";
1919
*
2020
* ### Density
2121
*
22-
* Swatch groups come in 3 densities: regular (default), compact, and spacious. Compact and spacious densities retain the same swatch size as regular density, but have less or more padding between each swatch, respectively.
22+
* Swatch groups come in several densities: regular (default), spacious, medium and large. Each density retains the same swatch size, but have less or more padding between each swatch, respectively.
2323
*/
2424
export default {
2525
title: "Swatch group",
@@ -42,7 +42,7 @@ export default {
4242
type: { summary: "string" },
4343
category: "Component",
4444
},
45-
options: ["regular", "spacious", "mediumLarge"],
45+
options: ["regular", "spacious", "sizeM", "sizeL"],
4646
control: "select",
4747
},
4848
items: {
@@ -124,15 +124,15 @@ export const Default = SwatchgroupGroup.bind({});
124124
Default.args = {};
125125

126126
// ********* DOCS ONLY ********* //
127-
export const MediumLarge = Template.bind({});
128-
MediumLarge.args = {
129-
density: "mediumLarge",
127+
export const Medium = Template.bind({});
128+
Medium.args = {
129+
density: "sizeM",
130130
};
131-
MediumLarge.tags = ["!dev"];
132-
MediumLarge.parameters = {
131+
Medium.tags = ["!dev"];
132+
Medium.parameters = {
133133
chromatic: { disableSnapshot: true },
134134
};
135-
MediumLarge.storyName = "Density - medium/large";
135+
Medium.storyName = "Density - Medium";
136136

137137
export const Spacious = Template.bind({});
138138
Spacious.args = {

components/swatchgroup/stories/swatchgroup.test.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ export const SwatchgroupGroup = Variants({
1212
density: "spacious",
1313
},
1414
{
15-
testHeading: "Medium/large",
16-
density: "mediumLarge",
15+
testHeading: "Medium",
16+
density: "sizeM",
17+
},
18+
{
19+
testHeading: "Large",
20+
density: "sizeL",
1721
},
1822
{
1923
testHeading: "Full rounding",

0 commit comments

Comments
 (0)