Skip to content

Commit 583b1eb

Browse files
committed
feat(commons): remove need for commons package
1 parent 79f77f7 commit 583b1eb

39 files changed

+707
-1047
lines changed

.changeset/pre.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@spectrum-css/colorslider": "8.0.1",
3333
"@spectrum-css/colorwheel": "6.0.1",
3434
"@spectrum-css/combobox": "4.0.1",
35-
"@spectrum-css/commons": "11.0.0",
3635
"@spectrum-css/contextualhelp": "5.0.1",
3736
"@spectrum-css/datepicker": "4.0.1",
3837
"@spectrum-css/dial": "5.0.1",

.storybook/foundations/corner-rounding/action-button-corner-rounding.stories.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,6 @@ const ActionButtonTable = (args, context) => {
9696

9797
export const ActionButtonExamples = ActionButtonTable.bind({});
9898
ActionButtonExamples.args = {};
99+
ActionButtonExamples.parameters = {
100+
chromatic: { disableSnapshot: true },
101+
};

.storybook/foundations/corner-rounding/checkbox-corner-rounding.stories.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ const CheckboxTable = (args, context) => {
8686

8787
export const CheckboxExamples = CheckboxTable.bind({});
8888
CheckboxExamples.args = {};
89+
CheckboxExamples.parameters = {
90+
chromatic: { disableSnapshot: true },
91+
};

.storybook/foundations/corner-rounding/corner-rounding.stories.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ const CornerRadiusGroup = (args = {}, context = {}) => html`
8686

8787
export const CornerRounding = CornerRadiusGroup.bind({});
8888
CornerRounding.args = {};
89+
CornerRounding.parameters = {
90+
chromatic: { disableSnapshot: true },
91+
};

.storybook/foundations/down-state/button-down-state.stories.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ ButtonDownState.args = {
2525
"--spectrum-downstate-height": "32px"
2626
}
2727
};
28+
ButtonDownState.parameters = {
29+
chromatic: { disableSnapshot: true },
30+
};

.storybook/foundations/down-state/checkbox-down-state.stories.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ export const CheckboxDownState = Template.bind({});
2020
CheckboxDownState.args = {
2121
label: "Checkbox",
2222
};
23+
CheckboxDownState.parameters = {
24+
chromatic: { disableSnapshot: true },
25+
};

.storybook/foundations/drop-shadow/drop-shadow.stories.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,33 +57,51 @@ DropShadowEmphasizedDefault.args = {
5757
variant: "emphasized-default",
5858
isDropShadow: true,
5959
};
60+
DropShadowEmphasizedDefault.parameters = {
61+
chromatic: { disableSnapshot: true },
62+
};
6063

6164
export const DropShadowEmphasizedHover = DropShadowVariant.bind({});
6265
DropShadowEmphasizedHover.args = {
6366
variant: "emphasized-hover",
6467
isDropShadow: true,
6568
};
69+
DropShadowEmphasizedHover.parameters = {
70+
chromatic: { disableSnapshot: true },
71+
};
6672

6773
export const DropShadowElevated = DropShadowVariant.bind({});
6874
DropShadowElevated.args = {
6975
variant: "elevated",
7076
isDropShadow: true,
7177
};
78+
DropShadowElevated.parameters = {
79+
chromatic: { disableSnapshot: true },
80+
};
7281

7382
export const BoxShadowEmphasizedDefault = DropShadowVariant.bind({});
7483
BoxShadowEmphasizedDefault.args = {
7584
variant: "emphasized-default",
7685
isDropShadow: false,
7786
};
87+
BoxShadowEmphasizedDefault.parameters = {
88+
chromatic: { disableSnapshot: true },
89+
};
7890

7991
export const BoxShadowEmphasizedHover = DropShadowVariant.bind({});
8092
BoxShadowEmphasizedHover.args = {
8193
variant: "emphasized-hover",
8294
isDropShadow: false,
8395
};
96+
BoxShadowEmphasizedHover.parameters = {
97+
chromatic: { disableSnapshot: true },
98+
};
8499

85100
export const BoxShadowElevated = DropShadowVariant.bind({});
86101
BoxShadowElevated.args = {
87102
variant: "elevated",
88103
isDropShadow: false,
89104
};
105+
BoxShadowElevated.parameters = {
106+
chromatic: { disableSnapshot: true },
107+
};

components/accordion/index.css

Lines changed: 200 additions & 228 deletions
Large diffs are not rendered by default.

components/actionbar/index.css

Lines changed: 29 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11,50 +11,10 @@
1111
* governing permissions and limitations under the License.
1212
*/
1313

14-
.spectrum-ActionBar {
15-
/* Layout */
16-
--spectrum-actionbar-height: var(--spectrum-action-bar-height);
17-
--spectrum-actionbar-minimum-width: var(--spectrum-action-bar-minimum-width);
18-
--spectrum-actionbar-corner-radius: var(--spectrum-corner-radius-medium-size-extra-large);
19-
--spectrum-actionbar-spacing-label-to-action-group: var(--spectrum-action-bar-label-to-action-group-area);
20-
--spectrum-actionbar-spacing-padding-inline: var(--spectrum-action-bar-edge-to-content-area);
21-
--spectrum-actionbar-spacing-top-area: var(--spectrum-action-bar-top-to-content-area);
22-
--spectrum-actionbar-spacing-bottom-area: var(--spectrum-action-bar-bottom-to-content-area);
23-
--spectrum-actionbar-close-button-to-counter: var(--spectrum-action-bar-close-button-to-counter);
24-
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- defines the field label mod */
25-
--spectrum-actionbar-item-counter-line-height: var(--spectrum-line-height-100);
26-
--spectrum-actionbar-item-counter-color: var(--spectrum-neutral-content-color-default);
27-
28-
/* colors - applied to popover */
29-
--spectrum-actionbar-popover-background-color: var(--spectrum-background-elevated-color);
30-
--spectrum-actionbar-popover-border-color: var(--spectrum-action-bar-border-color);
31-
32-
/* spacing of action bar bottom and horizontal outer edge */
33-
--spectrum-actionbar-spacing-outer-edge: var(--spectrum-spacing-300);
34-
35-
/* drop shadow */
36-
--spectrum-actionbar-shadow-horizontal: var(--spectrum-drop-shadow-elevated-x);
37-
--spectrum-actionbar-shadow-vertical: var(--spectrum-drop-shadow-elevated-y);
38-
--spectrum-actionbar-shadow-blur: var(--spectrum-drop-shadow-elevated-blur);
39-
--spectrum-actionbar-shadow-color: var(--spectrum-drop-shadow-elevated-color);
40-
41-
&.spectrum-ActionBar--emphasized {
42-
--spectrum-actionbar-item-counter-color: var(--spectrum-gray-25);
43-
--spectrum-actionbar-popover-background-color: var(--spectrum-neutral-content-color-default);
44-
}
45-
46-
/* cjk language support for item counter */
47-
&:lang(ja),
48-
&:lang(zh),
49-
&:lang(ko) {
50-
--spectrum-actionbar-item-counter-line-height-cjk: var(--spectrum-cjk-line-height-100);
51-
}
52-
}
53-
5414
/* ActionBar is outer wrapper with nested popover component within */
5515
.spectrum-ActionBar {
5616
/* creates horizontal spacing to edge */
57-
padding: 0 var(--spectrum-actionbar-spacing-outer-edge);
17+
padding: 0 var(--spectrum-spacing-300);
5818
inset-block-end: 0;
5919
z-index: 1;
6020

@@ -68,30 +28,30 @@
6828
block-size: 0;
6929
opacity: 0;
7030

71-
&.is-open {
31+
&:where(.is-open) {
7232
/* add ActionBar bottom margin to height for correct spacing even when sticky */
73-
block-size: calc(var(--spectrum-actionbar-spacing-outer-edge) + var(--spectrum-actionbar-height));
33+
block-size: calc(var(--spectrum-spacing-300) + var(--spectrum-action-bar-height));
7434
opacity: 1;
7535
}
7636

7737
.spectrum-ActionBar-popover {
7838
/* popover is ActionBar height */
79-
block-size: var(--spectrum-actionbar-height);
80-
min-inline-size: var(--spectrum-actionbar-minimum-width);
39+
block-size: var(--spectrum-action-bar-height);
40+
min-inline-size: var(--spectrum-action-bar-minimum-width);
8141
box-sizing: border-box;
8242
inline-size: 100%;
8343
margin: auto;
84-
padding-inline: var(--spectrum-actionbar-spacing-padding-inline);
85-
padding-block: var(--spectrum-actionbar-spacing-top-area) var(--spectrum-actionbar-spacing-bottom-area);
44+
padding-inline: var(--spectrum-action-bar-edge-to-content-area);
45+
padding-block: var(--spectrum-action-bar-top-to-content-area) var(--spectrum-action-bar-bottom-to-content-area);
8646

8747
/* Be relative so our width can be restricted */
8848
position: relative;
8949

90-
border-radius: var(--spectrum-actionbar-corner-radius);
91-
border-color: var(--highcontrast-actionbar-popover-border-color, var(--spectrum-actionbar-popover-border-color));
92-
background-color: var(--spectrum-actionbar-popover-background-color);
50+
border-radius: var(--spectrum-corner-radius-medium-size-extra-large);
51+
border-color: var(--spectrum-action-bar-border-color);
52+
background-color: var(--spectrum-background-elevated-color);
9353

94-
filter: drop-shadow(var(--spectrum-actionbar-shadow-horizontal) var(--spectrum-actionbar-shadow-vertical) var(--spectrum-actionbar-shadow-blur) var(--spectrum-actionbar-shadow-color));
54+
filter: drop-shadow(var(--spectrum-drop-shadow-elevated-x) var(--spectrum-drop-shadow-elevated-y) var(--spectrum-drop-shadow-elevated-blur) var(--spectrum-drop-shadow-elevated-color));
9555

9656
/* Let clicks do their thing */
9757
pointer-events: auto;
@@ -104,25 +64,35 @@
10464

10565
/* item counter */
10666
.spectrum-FieldLabel {
107-
--spectrum-fieldlabel-font-size: var(--spectrum-action-bar-counter-font-size);
108-
--spectrum-fieldlabel-line-height: var(--spectrum-actionbar-item-counter-line-height);
67+
font-size: var(--spectrum-action-bar-counter-font-size);
68+
line-height: var(--spectrum-line-height-100);
10969

110-
color: var(--spectrum-actionbar-item-counter-color);
111-
padding-inline-start: var(--spectrum-actionbar-close-button-to-counter);
70+
color: var(--spectrum-neutral-content-color-default);
71+
padding-inline-start: var(--spectrum-action-bar-close-button-to-counter);
11272

11373
/* cjk language support */
11474
&:lang(ja),
11575
&:lang(zh),
11676
&:lang(ko) {
117-
line-height: var(--spectrum-actionbar-item-counter-line-height-cjk);
77+
line-height: var(--spectrum-cjk-line-height-100);
11878
}
11979
}
12080

12181
/* action group */
12282
.spectrum-ActionGroup {
12383
/* align to end by default */
12484
margin-inline-start: auto;
125-
padding-inline-start: var(--spectrum-actionbar-spacing-label-to-action-group); /* space between label and action group */
85+
padding-inline-start: var(--spectrum-action-bar-label-to-action-group-area);
86+
}
87+
88+
&:where(.spectrum-ActionBar--emphasized) {
89+
.spectrum-FieldLabel {
90+
color: var(--spectrum-gray-25);
91+
}
92+
93+
.spectrum-ActionBar-popover {
94+
background-color: var(--spectrum-neutral-content-color-default);
95+
}
12696
}
12797
}
12898

@@ -143,7 +113,7 @@
143113

144114
/* windows high contrast mode */
145115
@media (forced-colors: active) {
146-
.spectrum-ActionBar {
147-
--highcontrast-actionbar-popover-border-color: CanvasText;
116+
.spectrum-ActionBar-popover {
117+
border-color: CanvasText;
148118
}
149119
}

0 commit comments

Comments
 (0)