Skip to content

Commit 7018504

Browse files
castastrophecastastrophe
committed
chore: run branch through format; update pathing and fix errors
1 parent c7f6022 commit 7018504

File tree

26 files changed

+163
-134
lines changed

26 files changed

+163
-134
lines changed

‎.storybook/package.json

+69-52
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,71 @@
11
{
2-
"name": "@spectrum-css/preview",
3-
"version": "10.0.0",
4-
"description": "A Spectrum CSS preview",
5-
"license": "Apache-2.0",
6-
"author": "Adobe",
7-
"homepage": "https://opensource.adobe.com/spectrum-css/preview",
8-
"main": "main.js",
9-
"scripts": {
10-
"build": "storybook build --config-dir . --output-dir ./storybook-static"
11-
},
12-
"dependencies": {
13-
"@adobe/spectrum-css-workflow-icons": "^1.5.4",
14-
"@spectrum-css/tokens": "^14.0.0-next.6",
15-
"@spectrum-css/ui-icons": "^1.1.2"
16-
},
17-
"devDependencies": {
18-
"@babel/core": "^7.24.4",
19-
"@chromaui/addon-visual-tests": "^1.0.0",
20-
"@etchteam/storybook-addon-status": "^4.2.4",
21-
"@storybook/addon-a11y": "^8.0.6",
22-
"@storybook/addon-actions": "^8.0.6",
23-
"@storybook/addon-console": "^3.0.0",
24-
"@storybook/addon-designs": "^8.0.0",
25-
"@storybook/addon-docs": "^8.0.6",
26-
"@storybook/addon-essentials": "^8.0.6",
27-
"@storybook/addon-interactions": "^8.0.6",
28-
"@storybook/blocks": "^8.0.6",
29-
"@storybook/components": "^8.0.6",
30-
"@storybook/core-events": "^8.0.6",
31-
"@storybook/jest": "^0.2.3",
32-
"@storybook/manager-api": "^8.0.6",
33-
"@storybook/preview-api": "^8.0.6",
34-
"@storybook/testing-library": "^0.2.2",
35-
"@storybook/theming": "^8.0.6",
36-
"@storybook/web-components-webpack5": "^8.0.6",
37-
"@whitespace/storybook-addon-html": "^6.0.4",
38-
"chromatic": "^11.3.0",
39-
"file-loader": "^6.2.0",
40-
"lit": "^3.1.2",
41-
"lodash-es": "^4.17.21",
42-
"postcss": "^8.4.35",
43-
"postcss-loader": "^8.1.1",
44-
"postcss-pseudo-classes": "^0.4.0",
45-
"prettier": "^3.2.5",
46-
"react": "^18.2.0",
47-
"react-dom": "^18.2.0",
48-
"react-syntax-highlighter": "^15.5.0",
49-
"source-map-loader": "^5.0.0",
50-
"storybook": "^8.0.6",
51-
"style-loader": "4.0.0",
52-
"webpack": "^5.91.0"
53-
}
2+
"name": "@spectrum-css/preview",
3+
"version": "10.0.0",
4+
"description": "A Spectrum CSS preview",
5+
"license": "Apache-2.0",
6+
"author": "Adobe",
7+
"homepage": "https://opensource.adobe.com/spectrum-css/preview",
8+
"main": "main.js",
9+
"files": [
10+
"*.js",
11+
"*.md",
12+
"*.mdx",
13+
"assets",
14+
"decorators",
15+
"deprecated",
16+
"foundations",
17+
"guides"
18+
],
19+
"scripts": {
20+
"build": "storybook build --config-dir . --output-dir ./storybook-static"
21+
},
22+
"dependencies": {
23+
"@adobe/spectrum-css-workflow-icons": "^1.5.4",
24+
"@spectrum-css/tokens": "^14.0.0-next.6",
25+
"@spectrum-css/ui-icons": "^1.1.2"
26+
},
27+
"devDependencies": {
28+
"@babel/core": "^7.24.4",
29+
"@chromaui/addon-visual-tests": "^1.0.0",
30+
"@etchteam/storybook-addon-status": "^4.2.4",
31+
"@storybook/addon-a11y": "^8.0.6",
32+
"@storybook/addon-actions": "^8.0.6",
33+
"@storybook/addon-console": "^3.0.0",
34+
"@storybook/addon-designs": "^8.0.0",
35+
"@storybook/addon-docs": "^8.0.6",
36+
"@storybook/addon-essentials": "^8.0.6",
37+
"@storybook/addon-interactions": "^8.0.6",
38+
"@storybook/blocks": "^8.0.6",
39+
"@storybook/components": "^8.0.6",
40+
"@storybook/core-events": "^8.0.6",
41+
"@storybook/jest": "^0.2.3",
42+
"@storybook/manager-api": "^8.0.6",
43+
"@storybook/preview-api": "^8.0.6",
44+
"@storybook/testing-library": "^0.2.2",
45+
"@storybook/theming": "^8.0.6",
46+
"@storybook/web-components-webpack5": "^8.0.6",
47+
"@whitespace/storybook-addon-html": "^6.0.4",
48+
"chromatic": "^11.3.0",
49+
"file-loader": "^6.2.0",
50+
"lit": "^3.1.2",
51+
"lodash-es": "^4.17.21",
52+
"postcss": "^8.4.35",
53+
"postcss-loader": "^8.1.1",
54+
"postcss-pseudo-classes": "^0.4.0",
55+
"prettier": "^3.2.5",
56+
"react": "^18.2.0",
57+
"react-dom": "^18.2.0",
58+
"react-syntax-highlighter": "^15.5.0",
59+
"source-map-loader": "^5.0.0",
60+
"storybook": "^8.0.6",
61+
"style-loader": "4.0.0",
62+
"webpack": "^5.91.0"
63+
},
64+
"keywords": [
65+
"adobe",
66+
"css",
67+
"design system",
68+
"spectrum",
69+
"storybook"
70+
]
5471
}

‎components/actionbutton/metadata/mods.md

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
| `--mod-actionbutton-min-width` |
5050
| `--mod-actionbutton-static-content-color` |
5151
| `--mod-actionbutton-text-to-visual` |
52+
| `--mod-animation-duration-100` |
5253
| `--mod-button-animation-duration` |
5354
| `--mod-button-font-family` |
5455
| `--mod-button-line-height` |
56+
| `--mod-line-height-100` |
57+
| `--mod-sans-font-family-stack` |

‎components/actiongroup/CHANGELOG.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
88
🗓
99
2024-04-18 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/actiongroup@4.2.5...@spectrum-css/actiongroup@5.0.0)
1010

11-
* feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
11+
- feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
1212

13-
###
14-
🛑 BREAKING CHANGES
13+
###
1514

16-
*
17-
- Removes component-builder & component-builder-simple for script leveraging postcss
15+
🛑 BREAKING CHANGES
16+
17+
-
18+
19+
* Removes component-builder & component-builder-simple for script leveraging postcss
1820

19-
- Imports added to index.css and themes/express.css
21+
* Imports added to index.css and themes/express.css
2022

2123
<a name="4.2.5"></a>
2224
##4.2.5

‎components/button/index.css

+4-12
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,12 @@ governing permissions and limitations under the License.
142142
}
143143

144144
.spectrum-Icon {
145-
/* Any block-size difference between the intended workflow icon size and actual icon used.
145+
/* stylelint-disable-next-line custom-property-pattern -- Any block-size difference between the intended workflow icon size and actual icon used.
146146
Helps support any existing use of smaller UI icons instead of intended Workflow icons. */
147-
--_icon-size-difference: max(0px,
148-
var(--spectrum-button-intended-icon-size) -
149-
var(--spectrum-icon-block-size, var(--spectrum-button-intended-icon-size))
150-
);
147+
--_icon-size-difference: max(0px, var(--spectrum-button-intended-icon-size) - var(--spectrum-icon-block-size, var(--spectrum-button-intended-icon-size)));
151148

152-
margin-block-start: var(--mod-button-icon-margin-block-start,
153-
max(0px,
154-
var(--mod-button-top-to-icon, var(--spectrum-button-top-to-icon)) -
155-
var(--mod-button-border-width, var(--spectrum-button-border-width)) +
156-
(var(--_icon-size-difference, 0px) / 2)
157-
)
158-
);
149+
/* stylelint-disable-next-line custom-property-pattern -- see note above */
150+
margin-block-start: var(--mod-button-icon-margin-block-start, max(0px, var(--mod-button-top-to-icon, var(--spectrum-button-top-to-icon)) - var(--mod-button-border-width, var(--spectrum-button-border-width)) + (var(--_icon-size-difference, 0px) / 2)));
159151

160152
margin-inline-start: calc(
161153
var(--mod-button-edge-to-visual, var(--spectrum-button-edge-to-visual)) -

‎components/button/metadata/mods.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
| Modifiable custom properties |
22
| ------------------------------------------ |
3+
| `--mod-animation-duration-100` |
34
| `--mod-bold-font-weight` |
45
| `--mod-button-animation-duration` |
56
| `--mod-button-background-color-default` |
@@ -44,4 +45,6 @@
4445
| `--mod-button-top-to-icon` |
4546
| `--mod-button-top-to-text` |
4647
| `--mod-focus-indicator-gap` |
48+
| `--mod-line-height-100` |
49+
| `--mod-sans-font-family-stack` |
4750
| `--mod-static-black-focus-indicator-color` |

‎components/button/stories/button.stories.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { withDownStateDimensionCapture } from "@spectrum-css/preview/decorators";
2+
13
import { html } from "lit";
24
import { styleMap } from "lit/directives/style-map.js";
3-
import { when } from "lit/directives/when.js";
4-
import { withDownStateDimensionCapture } from "../../../.storybook/decorators";
55

66
import { default as IconStories } from "@spectrum-css/icon/stories/icon.stories.js";
77
import { Template as Typography } from "@spectrum-css/typography/stories/template.js";
@@ -14,7 +14,6 @@ import { Template } from "./template";
1414
export default {
1515
title: "Components/Button",
1616
component: "Button",
17-
decorators: [withDownStateDimensionCapture('.spectrum-Button:not(:disabled)')],
1817
argTypes: {
1918
size: {
2019
name: "Size",
@@ -146,6 +145,7 @@ export default {
146145
}
147146
},
148147
decorators: [
148+
withDownStateDimensionCapture(".spectrum-Button:not(:disabled)"),
149149
(Story, context) => html`
150150
<style>
151151
.spectrum-Detail { display: inline-block; }

‎components/buttongroup/CHANGELOG.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
88
🗓
99
2024-04-18 • 📝 [Commits](https://github.com/adobe/spectrum-css/compare/@spectrum-css/buttongroup@6.2.5...@spectrum-css/buttongroup@7.0.0)
1010

11-
* feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
11+
- feat!: postcss config build and script; remove gulp (#2466)([b0f337b](https://github.com/adobe/spectrum-css/commit/b0f337b)), closes[#2466](https://github.com/adobe/spectrum-css/issues/2466)
1212

13-
###
14-
🛑 BREAKING CHANGES
13+
###
1514

16-
*
17-
- Removes component-builder & component-builder-simple for script leveraging postcss
15+
🛑 BREAKING CHANGES
1816

19-
- Imports added to index.css and themes/express.css
17+
-
18+
19+
* Removes component-builder & component-builder-simple for script leveraging postcss
20+
21+
* Imports added to index.css and themes/express.css
2022

2123
<a name="6.2.5"></a>
2224
##6.2.5

‎components/checkbox/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
"stories/template.js",
2222
"metadata/mods.md"
2323
],
24+
"peerDependencies": {
25+
"@spectrum-css/icon": ">=4",
26+
"@spectrum-css/tokens": ">=14.0.0-next.3"
27+
},
2428
"keywords": [
2529
"spectrum",
2630
"css",
2731
"design system",
2832
"adobe"
2933
],
30-
"peerDependencies": {
31-
"@spectrum-css/icon": ">=4",
32-
"@spectrum-css/tokens": ">=14.0.0-next.3"
33-
},
3434
"publishConfig": {
3535
"access": "public"
3636
}

‎components/clearbutton/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
"stories/template.js",
2222
"metadata/mods.md"
2323
],
24+
"peerDependencies": {
25+
"@spectrum-css/icon": ">=4",
26+
"@spectrum-css/tokens": ">=14.0.0-next.3"
27+
},
2428
"keywords": [
2529
"spectrum",
2630
"css",
2731
"design system",
2832
"adobe"
2933
],
30-
"peerDependencies": {
31-
"@spectrum-css/icon": ">=4",
32-
"@spectrum-css/tokens": ">=14.0.0-next.3"
33-
},
3434
"publishConfig": {
3535
"access": "public"
3636
}

‎components/closebutton/metadata/mods.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
| Modifiable custom properties |
22
| --------------------------------------------- |
3+
| `--mod-animation-duration-100` |
34
| `--mod-button-animation-duration` |
45
| `--mod-button-font-family` |
56
| `--mod-button-line-height` |
@@ -23,3 +24,5 @@
2324
| `--mod-closebutton-margin-inline` |
2425
| `--mod-closebutton-margin-top` |
2526
| `--mod-closebutton-width` |
27+
| `--mod-line-height-100` |
28+
| `--mod-sans-font-family-stack` |

‎components/closebutton/stories/template.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ export const Template = ({
2121
}) => {
2222
let iconName = "Cross300";
2323
switch (size) {
24-
case "s":
25-
iconName = "Cross200";
26-
break;
27-
case "l":
28-
iconName = "Cross400";
29-
break;
30-
case "xl":
31-
iconName = "Cross500";
32-
break;
33-
default:
34-
iconName = "Cross300";
24+
case "s":
25+
iconName = "Cross200";
26+
break;
27+
case "l":
28+
iconName = "Cross400";
29+
break;
30+
case "xl":
31+
iconName = "Cross500";
32+
break;
33+
default:
34+
iconName = "Cross300";
3535
}
3636

3737
return html`

‎components/dial/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"stories/template.js",
2222
"metadata/mods.md"
2323
],
24+
"peerDependencies": {
25+
"@spectrum-css/tokens": ">=14.0.0-next.3"
26+
},
2427
"keywords": [
2528
"spectrum",
2629
"css",
2730
"design system",
2831
"adobe"
2932
],
30-
"peerDependencies": {
31-
"@spectrum-css/tokens": ">=14.0.0-next.3"
32-
},
3333
"publishConfig": {
3434
"access": "public"
3535
}

‎components/divider/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"stories/template.js",
2222
"metadata/mods.md"
2323
],
24+
"peerDependencies": {
25+
"@spectrum-css/tokens": ">=14.0.0-next.3"
26+
},
2427
"keywords": [
2528
"spectrum",
2629
"css",
2730
"design system",
2831
"adobe"
2932
],
30-
"peerDependencies": {
31-
"@spectrum-css/tokens": ">=14.0.0-next.3"
32-
},
3333
"publishConfig": {
3434
"access": "public"
3535
}

‎components/fieldlabel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
],
2424
"peerDependencies": {
2525
"@spectrum-css/icon": ">=4",
26-
"@spectrum-css/tokens": ">=14.0.0-next.0"
26+
"@spectrum-css/tokens": ">=14"
2727
},
2828
"keywords": [
2929
"spectrum",

‎components/logicbutton/metadata/mods.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
| Modifiable custom properties |
22
| -------------------------------------------------------- |
3+
| `--mod-animation-duration-100` |
34
| `--mod-button-animation-duration` |
45
| `--mod-button-focus-indicator-gap` |
56
| `--mod-button-font-family` |
67
| `--mod-button-line-height` |
8+
| `--mod-focus-indicator-gap` |
9+
| `--mod-line-height-100` |
710
| `--mod-logic-button-and-background-color` |
811
| `--mod-logic-button-and-background-color-disabled` |
912
| `--mod-logic-button-and-background-color-hover` |
@@ -33,3 +36,4 @@
3336
| `--mod-logic-button-or-text-color` |
3437
| `--mod-logic-button-or-text-color-disabled` |
3538
| `--mod-logic-button-padding` |
39+
| `--mod-sans-font-family-stack` |

0 commit comments

Comments
 (0)