Skip to content

Commit 71ae67a

Browse files
castastrophejawinn
andauthored
chore: merge latest from main (#3671)
* chore: merge latest from main * docs(button): restore autodocs page after mdx removal * docs(icon): adjust story visibility and order In the switch back to autodocs from a custom MDX, some newly added stories for S2 needed to be hidden for the Docs page, and some story titles needing renaming to keep related stories in order. --------- Co-authored-by: Josh Winn <[email protected]>
1 parent 8b4511e commit 71ae67a

File tree

10 files changed

+130
-211
lines changed

10 files changed

+130
-211
lines changed

components/button/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,27 @@
1515
- Updated dependencies [[`a25e0a9`](https://github.com/adobe/spectrum-css/commit/a25e0a99e5a4736ab4e607e00739343101a2633b)]:
1616
- @spectrum-css/icon@10.0.0-next.0
1717

18+
## 14.1.6
19+
20+
### Patch Changes
21+
22+
📝 [#3665](https://github.com/adobe/spectrum-css/pull/3665) [`56e143a`](https://github.com/adobe/spectrum-css/commit/56e143a6ac9efda0eaec7a4d1cde01319985b2e2) Thanks [@rise-erpelding](https://github.com/rise-erpelding)!
23+
24+
Adjust S1/Express static outline variant content color (from transparent-black/white to solid black/white) to fix unintentional regression.
25+
26+
## 14.1.5
27+
28+
### Patch Changes
29+
30+
📝 [#3662](https://github.com/adobe/spectrum-css/pull/3662) [`79e3363`](https://github.com/adobe/spectrum-css/commit/79e336369700b9eded8fb7154995abee3789b545) Thanks [@castastrophe](https://github.com/castastrophe)!
31+
32+
This update aims to simplify `--mod-*` access by ensuring local variants and states aren't hooking into those custom properties for overrides. This updates all local variants and states to override the `--spectrum-button-*` properties instead and adjusts the specificity to ensure no regressions in rendered results.
33+
34+
Other changes of note:
35+
36+
- Removes the `.spectrum-Button--sizeM` as unnecessary and duplicate as these styles are applied in the base class.
37+
- Reduces the use of the `:not()` pseudo-class in theme overrides as these selectors are more complex to remap for web component projects.
38+
1839
## 14.1.4
1940

2041
### Patch Changes

components/button/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ a.spectrum-Button {
552552
--highcontrast-button-border-color-disabled: GrayText;
553553
--highcontrast-button-background-color-disabled: ButtonFace;
554554

555+
/* @passthrough start -- progress circle highcontrast overrides */
555556
--mod-progress-circle-track-border-color: ButtonText;
556557
--mod-progress-circle-track-border-color-over-background: ButtonText;
557558
--mod-progress-circle-thickness: var(--spectrum-progress-circle-thickness-medium);

components/button/stories/button.mdx

Lines changed: 0 additions & 101 deletions
This file was deleted.

components/button/stories/button.stories.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import { ButtonsWithIconOptions, TextOverflowTemplate, TextWrapTemplate, Treatme
99

1010
/**
1111
* Buttons allow users to perform an action or to navigate to another page. They have multiple styles for various needs, and are ideal for calling attention to where a user needs to do something in order to move forward in a flow.
12+
*
13+
* There are four available variants that are used for different levels of emphasis and different
14+
* types of actions. By default, a button uses the fill style with a solid background. The primary
15+
* and secondary variants also have an outline option.
1216
*/
1317
export default {
1418
title: "Button",
@@ -101,11 +105,12 @@ export default {
101105
decorators: [
102106
withDownStateDimensionCapture,
103107
],
104-
tags: ["!autodocs", "migrated"],
108+
tags: ["migrated"],
105109
};
106110

107111
export const Default = ButtonGroups.bind({});
108112
Default.args = {};
113+
Default.tags = ["!autodocs"];
109114

110115
// ********* VRT ONLY ********* //
111116
export const WithForcedColors = ButtonGroups.bind({});
@@ -197,6 +202,9 @@ Negative.parameters = {
197202
chromatic: { disableSnapshot: true },
198203
};
199204

205+
/**
206+
* When a button needs to be placed on top of a dark color background or a visual, use the static white options. Static color buttons do not change shades or values depending upon the color theme.
207+
*/
200208
export const StaticWhitePrimary = TreatmentTemplate.bind({});
201209
StaticWhitePrimary.tags = ["!dev"];
202210
StaticWhitePrimary.args = {
@@ -207,6 +215,7 @@ StaticWhitePrimary.args = {
207215
StaticWhitePrimary.parameters = {
208216
chromatic: { disableSnapshot: true },
209217
};
218+
StaticWhitePrimary.storyName = "Static white - primary";
210219

211220
export const StaticWhiteSecondary = TreatmentTemplate.bind({});
212221
StaticWhiteSecondary.tags = ["!dev"];
@@ -218,7 +227,11 @@ StaticWhiteSecondary.args = {
218227
StaticWhiteSecondary.parameters = {
219228
chromatic: { disableSnapshot: true },
220229
};
230+
StaticWhiteSecondary.storyName = "Static white - secondary";
221231

232+
/**
233+
* When a button needs to be placed on top of a light color background or a visual, use the static black options. Static color buttons do not change shades or values depending upon the color theme.
234+
*/
222235
export const StaticBlackPrimary = TreatmentTemplate.bind({});
223236
StaticBlackPrimary.tags = ["!dev"];
224237
StaticBlackPrimary.args = {
@@ -229,6 +242,7 @@ StaticBlackPrimary.args = {
229242
StaticBlackPrimary.parameters = {
230243
chromatic: { disableSnapshot: true },
231244
};
245+
StaticBlackPrimary.storyName = "Static black - primary";
232246

233247
export const StaticBlackSecondary = TreatmentTemplate.bind({});
234248
StaticBlackSecondary.tags = ["!dev"];
@@ -240,6 +254,8 @@ StaticBlackSecondary.args = {
240254
StaticBlackSecondary.parameters = {
241255
chromatic: { disableSnapshot: true },
242256
};
257+
StaticBlackSecondary.storyName = "Static black - secondary";
258+
243259

244260
/**
245261
* The pending button is for indicating that a quick progress action is taking place. In this case, the
@@ -282,7 +298,7 @@ Disabled.parameters = {
282298
*/
283299
export const WithWrapping = TextOverflowTemplate.bind({});
284300
WithWrapping.tags = ["!dev"];
285-
WithWrapping.storyName = "Text overflow behavior";
301+
WithWrapping.storyName = "Text overflow";
286302
WithWrapping.args = {
287303
variant: "primary",
288304
};
@@ -298,7 +314,7 @@ WithWrapping.parameters = {
298314

299315
export const DisableWrapping = TextWrapTemplate.bind({});
300316
DisableWrapping.tags = ["!dev"];
301-
DisableWrapping.storyName = "Disable label wrap";
317+
DisableWrapping.storyName = "Text overflow - disabled text wrap";
302318
DisableWrapping.args = {
303319
variant: "primary",
304320
};

components/icon/stories/icon.mdx

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)