Skip to content

Commit 03cc59e

Browse files
committed
Merge branch 'main' into aramos-adobe/css868-combobox-readonly
2 parents d6d091b + 3e5c46e commit 03cc59e

File tree

161 files changed

+2430
-1701
lines changed

Some content is hidden

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

161 files changed

+2430
-1701
lines changed

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
**/node_modules
66

77
# Static utility assets
8-
tokens/custom-*/*.css
98
site/includes/*.js
109

1110
# Compiled and generated files

.storybook/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Change Log
22

3+
## 10.11.6
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`092aac5`](https://github.com/adobe/spectrum-css/commit/092aac56953f4c02cd5227e3f61c6cb0b2b4e46a)]:
8+
- @spectrum-css/table@6.1.4
9+
10+
## 10.11.5
11+
12+
### Patch Changes
13+
14+
- Updated dependencies [[`4b818e1`](https://github.com/adobe/spectrum-css/commit/4b818e1062202e404de1350938ce2a19146aa0b0)]:
15+
- @spectrum-css/tokens@14.6.0
16+
317
## 10.11.4
418

519
### Patch Changes

.storybook/assets/base.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ svg:has(symbol):not(:has(use)) {
5555
border-block-end: 1px solid hsla(203deg, 50%, 30%, 15%);
5656
}
5757

58-
/* This is the container Chromatic uses to determine the height and width of the story */
59-
#storybook-root {
60-
inline-size: max-content;
61-
max-inline-size: 100%;
62-
}
63-
6458
/* Force the modal wrapper to be contained by the frame not the viewport */
6559
#root-inner {
6660
.spectrum-Modal-wrapper {

.storybook/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/preview",
3-
"version": "10.11.4",
3+
"version": "10.11.6",
44
"description": "A Spectrum CSS preview",
55
"license": "Apache-2.0",
66
"author": "Adobe",
@@ -35,7 +35,7 @@
3535
"@spectrum-css/ui-icons": "workspace:^"
3636
},
3737
"devDependencies": {
38-
"@babel/core": "^7.25.2",
38+
"@babel/core": "^7.26.0",
3939
"@chromaui/addon-visual-tests": "^1.0.0",
4040
"@etchteam/storybook-addon-status": "^5.0.0",
4141
"@storybook/addon-a11y": "^8.3.6",
@@ -56,10 +56,10 @@
5656
"@storybook/web-components-vite": "^8.3.6",
5757
"@whitespace/storybook-addon-html": "^6.1.1",
5858
"chromatic": "^11.12.5",
59-
"lit": "^3.2.0",
59+
"lit": "^3.2.1",
6060
"lodash-es": "^4.17.21",
61-
"npm-registry-fetch": "^18.0.1",
62-
"postcss": "^8.4.45",
61+
"npm-registry-fetch": "^18.0.2",
62+
"postcss": "^8.4.47",
6363
"prettier": "^3.2.5",
6464
"react": "^18.3.1",
6565
"react-dom": "^18.3.1",

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
"postcss": "css"
120120
},
121121
"eslint.format.enable": true,
122-
"eslint.packageManager": "yarn",
123122
"eslint.useESLintClass": true,
124123
"files.associations": {
125124
"*.css": "postcss"
@@ -167,6 +166,7 @@
167166
}
168167
],
169168
"js/ts.implicitProjectConfig.experimentalDecorators": true,
169+
"postcss.validate": false,
170170
"prettier.configPath": ".prettierrc",
171171
"prettier.ignorePath": ".prettierignore",
172172
"prettier.prettierPath": "node_modules/prettier",

components/actionbutton/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## 6.1.4
4+
5+
### Patch Changes
6+
7+
- [#3256](https://github.com/adobe/spectrum-css/pull/3256) [`b84b93e`](https://github.com/adobe/spectrum-css/commit/b84b93e64157c7a8288a3ed19f1a637ee609251c) Thanks [@marissahuysentruyt](https://github.com/marissahuysentruyt)! - Adds line-height on `.spectrum-ActionButton-label` in order to accommodate text with diacritics that may be cut off vertically.
8+
39
## 6.1.3
410

511
### Patch Changes

components/actionbutton/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ a.spectrum-ActionButton {
234234
.spectrum-ActionButton-label {
235235
@extend %spectrum-ButtonLabel;
236236
pointer-events: none;
237+
line-height: var(--spectrum-actionbutton-height);
237238

238239
font-size: var(--mod-actionbutton-font-size, var(--spectrum-actionbutton-font-size));
239240
white-space: nowrap;

components/actionbutton/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@spectrum-css/actionbutton",
3-
"version": "6.1.3",
3+
"version": "6.1.4",
44
"description": "The Spectrum CSS action button component",
55
"license": "Apache-2.0",
66
"author": "Adobe",

components/actionbutton/stories/actionbutton.test.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ export const ActionButtonGroup = Variants({
7575
testHeading: "Static white",
7676
staticColor: "white",
7777
},
78+
{
79+
testHeading: "Internationalization (Thai)",
80+
label: "ล้างทั้งหมด",
81+
},
7882
],
7983
stateData: [{
8084
testHeading: "Disabled",
@@ -95,5 +99,17 @@ export const ActionButtonGroup = Variants({
9599
testHeading: "Disabled + selected",
96100
isDisabled: true,
97101
isSelected: true,
98-
}],
102+
}, {
103+
testHeading: "Hovered + selected",
104+
isHovered: true,
105+
isSelected: true,
106+
}, {
107+
testHeading: "Focused + selected",
108+
isFocused: true,
109+
isSelected: true,
110+
}, {
111+
testHeading: "Active + selected",
112+
isActive: true,
113+
isSelected: true,
114+
}]
99115
});

components/actiongroup/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
## 5.1.3
4+
5+
### Patch Changes
6+
7+
- [#3256](https://github.com/adobe/spectrum-css/pull/3256) [`b84b93e`](https://github.com/adobe/spectrum-css/commit/b84b93e64157c7a8288a3ed19f1a637ee609251c) Thanks [@marissahuysentruyt](https://github.com/marissahuysentruyt)! - Action group
8+
9+
`flex: 1` has now changed to `flex-grow: 1` in the `.spectrum-ActionGroup--justified .spectrum-ActionGroup-item` selector to specify the desired behavior of justified action groups.
10+
11+
- Updated dependencies [[`b84b93e`](https://github.com/adobe/spectrum-css/commit/b84b93e64157c7a8288a3ed19f1a637ee609251c)]:
12+
- @spectrum-css/actionbutton@6.1.4
13+
314
## 5.1.2
415

516
### Patch Changes

0 commit comments

Comments
 (0)