Skip to content

Commit f8a4d6a

Browse files
committed
chore: merge remote-tracking branch 'origin/spectrum-two' into background-layers-class-based-approach
2 parents b6ab87c + 3af1bd4 commit f8a4d6a

File tree

322 files changed

+6961
-5876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+6961
-5876
lines changed

.changeset/big-glasses-check.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"@spectrum-css/accordion": major
3+
"@spectrum-css/actionbar": major
4+
"@spectrum-css/actiongroup": major
5+
---
6+
7+
This update removes `--mod-*` custom property hooks per SWC-1264, see also the RFC for extensible styling.
8+
9+
- Remove all `--mod-*` custom property hooks.
10+
- Keep existing class selectors and variants unchanged.
11+
- Update stories to reflect the removal of the `--mod-*` override layer.
12+
13+
Breaking change: the `--mod-*` override layer is removed. Consumers should set `--spectrum-*` variables directly where customization is needed.

.changeset/brave-bikes-teach.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
"@spectrum-css/actionmenu": major
3+
"@spectrum-css/actionbutton": minor
4+
"@spectrum-css/menu": patch
5+
"@spectrum-css/actiongroup": patch
6+
---
7+
8+
### Action menu component (now with custom styles!)
9+
10+
Introduces `@spectrum-css/actionmenu`, a composition of `ActionButton`, `Popover`, and `Menu` to present action lists from a trigger. Now with custom styles!
11+
12+
- Adds wrapper classes: `spectrum-ActionMenu`, `spectrum-ActionMenu-trigger`, `spectrum-ActionMenu-popover`, and `spectrum-ActionMenu-menu`.
13+
- Supports long press triggers and four placements (start/end, top/bottom) via the underlying popover API.
14+
- Design reference: [Figma S2 token specs](https://www.figma.com/design/eoZHKJH9a3LJkHYCGt60Vb/S2-token-specs?node-id=20959-21513&node-type=frame&t=jbePQKK1yLdrHG2M-11).
15+
16+
#### Migration notes
17+
18+
- If you previously composed an action menu manually (action button + popover + menu), you can adopt the new wrapper classes without changing the underlying markup semantics. Ensure the trigger has `aria-haspopup="menu"` and manages `aria-expanded` according to your application logic.
19+
- For spacing customizations previously done with ad‑hoc margins, switch to the new `--spectrum-actionmenu-button-to-menu-gap` custom property.
20+
21+
Example markup:
22+
23+
```html
24+
<div class="spectrum-ActionMenu">
25+
<button
26+
class="spectrum-ActionMenu-trigger spectrum-ActionButton"
27+
aria-haspopup="menu"
28+
aria-expanded="false"
29+
>
30+
<!-- icon/label -->
31+
</button>
32+
<div class="spectrum-ActionMenu-popover spectrum-Popover">
33+
<ul class="spectrum-ActionMenu-menu spectrum-Menu">
34+
<!-- menu items -->
35+
</ul>
36+
</div>
37+
<!-- popover positioning/visibility is owned by your implementation -->
38+
<!-- use long-press behavior when appropriate to your UX -->
39+
<!-- use Popover placement options: bottom-start, bottom-end, start-top, end-top -->
40+
</div>
41+
```
42+
43+
### Menu refinements
44+
45+
Updates `@spectrum-css/menu` styles to align with latest Spectrum 2 design specifications and improve accessibility.
46+
47+
- Updated `.is-selectableMultiple .spectrum-Menu-itemCheckbox` to `.is-selectableMultiple:not(:has(.is-selectable)) .spectrum-Menu-itemCheckbox` to prevent clash with the `.is-selectable` placement.
48+
- Non-breaking; no class or DOM changes required.
49+
50+
### Action button refinements
51+
52+
- Selection styling now applies when components use ARIA pressed/expanded semantics, not just `.is-selected`.
53+
- Implemented with `:where()` to keep selector specificity low and prevent downstream specificity battles.
54+
- Non-breaking; no class changes required.
55+
56+
### Action group refinements
57+
58+
Aligns selection behavior of grouped items with action button updates.
59+
60+
- Adds `:where([aria-pressed="true"], [aria-expanded="true"])` alongside `.is-selected` on items to cover more accessibility use-cases while keeping specificity low.
61+
- Non-breaking; no class changes required.

.changeset/good-times-dress.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@spectrum-css/tokens": patch
3+
---
4+
5+
Updated from [@adobe/spectrum-tokens](https://github.com/adobe/spectrum-tokens) [13.15.0](https://github.com/adobe/spectrum-tokens/releases/tag/%40adobe/spectrum-tokens%4013.15.0) -> [13.15.1](https://github.com/adobe/spectrum-tokens/releases/tag/%40adobe/spectrum-tokens%4013.15.1).
6+
7+
### Updated
8+
9+
- `--spectrum-standard-panel-gripper-color`: Updated from `var(--spectrum-gray-200)` to `var(--spectrum-gray-500)`.
10+
11+
- [#593](https://github.com/adobe/spectrum-tokens/pull/593) [`1e860c4`](https://github.com/adobe/spectrum-tokens/commit/1e860c4436c58ceca6f4500ea7e24d6d8cdd20c8) Thanks [@mrcjhicks](https://github.com/mrcjhicks)!

.changeset/kind-cycles-check.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@spectrum-css/preview": minor
3+
---
4+
5+
- _feature_: Add the `resetArgs` function to the argEvents decorator
6+
- _fix_: Resolve minor lint warnings in the Storybook CSS assets

.changeset/modern-times-happen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@spectrum-css/popover": patch
3+
---
4+
5+
Popover positioning "top-left" and "top-right" were using inline properties which caused the spacings to swap in RTL mode. This was unintended as the "right" and "left" naming conventions are meant to retain their location in LTR or RTL mode.

.changeset/pre.json

Lines changed: 7 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",
@@ -103,7 +102,9 @@
103102
"angry-needles-behave",
104103
"beige-dragons-tickle",
105104
"big-beds-care",
105+
"big-glasses-check",
106106
"big-jars-pump",
107+
"brave-bikes-teach",
107108
"breezy-impalas-push",
108109
"calm-hats-sleep",
109110
"chatty-lands-attack",
@@ -132,6 +133,7 @@
132133
"friendly-dolls-raise",
133134
"giant-windows-smoke",
134135
"gold-cats-hide",
136+
"good-times-dress",
135137
"green-falcons-rush",
136138
"grumpy-ghosts-serve",
137139
"healthy-chicken-clap",
@@ -142,6 +144,7 @@
142144
"itchy-shrimps-help",
143145
"itchy-waves-work",
144146
"khaki-icons-hammer",
147+
"kind-cycles-check",
145148
"late-worms-reply",
146149
"legal-lands-warn",
147150
"lemon-flowers-poke",
@@ -153,6 +156,7 @@
153156
"metal-fireants-switch",
154157
"mighty-pigs-accept",
155158
"modern-chairs-sit",
159+
"modern-times-happen",
156160
"nasty-rats-rhyme",
157161
"neat-schools-take",
158162
"nice-cows-shout",
@@ -191,10 +195,12 @@
191195
"strange-glasses-allow",
192196
"strong-pianos-work",
193197
"stupid-lemons-battle",
198+
"sweet-badgers-melt",
194199
"sweet-brooms-fetch",
195200
"tame-bobcats-beam",
196201
"tame-knives-train",
197202
"tasty-eagles-draw",
203+
"tasty-planes-design",
198204
"thick-ears-win",
199205
"tiny-candles-win",
200206
"tiny-taxis-show",

.changeset/sweet-badgers-melt.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
"@spectrum-css/accordion": minor
3+
---
4+
5+
Changes values of `--spectrum-accordion-item-minimum-height` to align more closely with design spec, this affects the minimum height of accordion items for some combinations of size/density by giving them more space.
6+
7+
New accordion minimum heights will use the heights/tokens:
8+
9+
| Size | Compact | Regular | Spacious |
10+
| ---- | --------------------------- | --------------------------- | --------------------------- |
11+
| S | 24px/`component-height-75` | 32px/`component-height-100` | 40px/`component-height-200` |
12+
| M | 32px/`component-height-100` | 40px/`component-height-200` | 48px/`component-height-300` |
13+
| L | 40px/`component-height-200` | 48px/`component-height-300` | 56px/`component-height-400` |
14+
| XL | 48px/`component-height-300` | 56px/`component-height-400` | 64px/`component-height-500` |

.changeset/tasty-planes-design.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
"@spectrum-css/tokens": minor
3+
---
4+
5+
Updated from [@adobe/spectrum-tokens](https://github.com/adobe/spectrum-tokens) [13.14.0](https://github.com/adobe/spectrum-tokens/releases/tag/%40adobe/spectrum-tokens%4013.14.0) -> [13.15.0](https://github.com/adobe/spectrum-tokens/releases/tag/%40adobe/spectrum-tokens%4013.15.0).
6+
7+
### Newly added
8+
9+
| Token name | Token value |
10+
| --------------------------------------------------- | --------------------------------------------------------------- |
11+
| `--spectrum-static-fuchsia-400` | `rgb(247, 181, 255)` |
12+
| `--spectrum-static-fuchsia-600` | `rgb(236, 105, 255)` |
13+
| `--spectrum-static-fuchsia-800` | `rgb(200, 68, 220)` |
14+
| `--spectrum-static-indigo-400` | `rgb(192, 201, 255)` |
15+
| `--spectrum-static-indigo-600` | `rgb(145, 151, 254)` |
16+
| `--spectrum-static-indigo-800` | `rgb(122, 106, 253)` |
17+
| `--spectrum-static-magenta-400` | `rgb(255, 185, 208)` |
18+
| `--spectrum-static-magenta-600` | `rgb(255, 112, 159)` |
19+
| `--spectrum-static-magenta-800` | `rgb(240, 45, 110)` |
20+
| `--spectrum-static-red-400` | `rgb(255, 188, 180)` |
21+
| `--spectrum-static-red-600` | `rgb(255, 118, 101)` |
22+
| `--spectrum-static-red-800` | `rgb(240, 56, 35)` |
23+
| `--spectrum-static-cyan-400` | `rgb(138, 213, 255)` |
24+
| `--spectrum-static-cyan-600` | `rgb(48, 167, 254)` |
25+
| `--spectrum-static-cyan-800` | `rgb(18, 134, 205)` |
26+
| `--spectrum-static-chartreuse-400` | `rgb(182, 219, 0)` |
27+
| `--spectrum-static-chartreuse-600` | `rgb(143, 172, 0)` |
28+
| `--spectrum-static-chartreuse-800` | `rgb(114, 137, 0)` |
29+
| `--spectrum-static-green-400` | `rgb(107, 227, 162)` |
30+
| `--spectrum-static-green-600` | `rgb(107, 227, 162)` |
31+
| `--spectrum-static-green-800` | `rgb(7, 147, 85)` |
32+
| `--spectrum-static-orange-400` | `rgb(255, 193, 94)` |
33+
| `--spectrum-static-orange-600` | `rgb(252, 125, 0)` |
34+
| `--spectrum-static-orange-800` | `rgb(212, 91, 0)` |
35+
| `--spectrum-static-purple-400` | `rgb(221, 193, 246)` |
36+
| `--spectrum-static-purple-600` | `rgb(191, 138, 238)` |
37+
| `--spectrum-static-purple-800` | `rgb(166, 92, 231)` |
38+
| `--spectrum-static-turquoise-400` | `rgb(111, 221, 228)` |
39+
| `--spectrum-static-turquoise-600` | `rgb(15, 177, 192)` |
40+
| `--spectrum-static-turquoise-800` | `rgb(10, 141, 153)` |
41+
| `--spectrum-gradient-stop-1-avatar` | `0` |
42+
| `--spectrum-gradient-stop-2-avatar` | `0.6666` |
43+
| `--spectrum-gradient-stop-3-avatar` | `1` |
44+
| `--spectrum-drop-shadow-ambient-color` | `rgba(0, 0, 0, 0.08)` (light)<br/>`rgba(0, 0, 0, 0.24)` (dark) |
45+
| `--spectrum-drop-shadow-transition-color` | `rgba(0, 0, 0, 0.04)` (light)<br/>`rgba(0, 0, 0, 0.12)` (dark) |
46+
| `--spectrum-drop-shadow-emphasized-key-color` | `rgba(0, 0, 0, 0.08)` (light)</br/>`rgba(0, 0, 0, 0.24)` (dark) |
47+
| `--spectrum-drop-shadow-emphasized-hover-key-color` | `rgba(0, 0, 0, 0.12)` (light)</br/>`rgba(0, 0, 0, 0.36)` (dark) |
48+
| `--spectrum-drop-shadow-elevated-key-color` | `rgba(0, 0, 0, 0.12)` (light)</br/>`rgba(0, 0, 0, 0.36)` (dark) |
49+
| `--spectrum-drop-shadow-dragged-key-color` | `rgba(0, 0, 0, 0.16)` (light)</br/>`rgba(0, 0, 0, 0.48)` (dark) |

.changeset/weak-colts-divide.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"@spectrum-css/alertdialog": major
3+
"@spectrum-css/asset": major
4+
"@spectrum-css/well": major
5+
---
6+
7+
This update removes `--mod-*` custom property hooks per SWC-1264, see also the RFC for extensible styling.
8+
9+
- Remove all `--mod-*` custom property hooks.
10+
- Keep existing class selectors and variants unchanged.
11+
- Update stories to reflect the removal of the `--mod-*` override layer.
12+
13+
Breaking change: the `--mod-*` override layer is removed. Consumers should set `--spectrum-*` variables directly where customization is needed.

0 commit comments

Comments
 (0)