chore: merge remote-tracking branch 'origin' into spectrum-two

Author: castastrophe

.github/workflows/production.yml

@@ -73,4 +73,4 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Convert new TODO items to issues
-              uses: alstr/todo-to-issue-action@v4
+              uses: alstr/todo-to-issue-action@v5

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.storybook/package.json

@@ -74,7 +74,6 @@
 		"react-dom": "^18.3.1",
 		"react-syntax-highlighter": "^15.6.1",
 		"remark-gfm": "^4.0.0",
-		"rollup-plugin-postcss-lit": "^2.1.0",
 		"storybook": "8.4.7",
 		"vite": "^5.4.11"
 	},

components/menu/dist/metadata.json

@@ -4,6 +4,8 @@
     ".spectrum-Swatch",
     ".spectrum-Swatch .spectrum-Swatch-disabledIcon",
     ".spectrum-Swatch .spectrum-Swatch-fill",
+    ".spectrum-Swatch--lightBorder .spectrum-Swatch-fill:before",
+    ".spectrum-Swatch--noBorder .spectrum-Swatch-fill:before",
     ".spectrum-Swatch--rectangle",
     ".spectrum-Swatch--roundingFull.is-selected:not(.spectrum-Swatch--rectangle) .spectrum-Swatch-fill",
     ".spectrum-Swatch--roundingFull.is-selected:not(.spectrum-Swatch--rectangle) .spectrum-Swatch-fill:before",
@@ -20,86 +22,69 @@
     ".spectrum-Swatch--roundingNone:after",
     ".spectrum-Swatch--roundingNone:before",
     ".spectrum-Swatch--sizeL",
-    ".spectrum-Swatch--sizeS",
+    ".spectrum-Swatch--sizeM",
     ".spectrum-Swatch--sizeXS",
     ".spectrum-Swatch-disabledIcon",
     ".spectrum-Swatch-disabledIcon path:first-child",
     ".spectrum-Swatch-disabledIcon path:last-child",
     ".spectrum-Swatch-fill",
     ".spectrum-Swatch-fill:before",
-    ".spectrum-Swatch-icon",
     ".spectrum-Swatch-image",
-    ".spectrum-Swatch.is-addSwatch",
-    ".spectrum-Swatch.is-addSwatch .spectrum-Swatch-fill",
-    ".spectrum-Swatch.is-addSwatch .spectrum-Swatch-icon",
-    ".spectrum-Swatch.is-addSwatch.is-keyboardFocused",
-    ".spectrum-Swatch.is-addSwatch:active",
-    ".spectrum-Swatch.is-addSwatch:focus-visible",
-    ".spectrum-Swatch.is-addSwatch:hover",
+    ".spectrum-Swatch-mixedValueIcon",
     ".spectrum-Swatch.is-disabled",
     ".spectrum-Swatch.is-disabled .spectrum-Swatch-disabledIcon",
     ".spectrum-Swatch.is-image .spectrum-Swatch-fill:before",
-    ".spectrum-Swatch.is-keyboardFocused",
-    ".spectrum-Swatch.is-mixedValue",
     ".spectrum-Swatch.is-mixedValue .spectrum-Swatch-fill",
-    ".spectrum-Swatch.is-mixedValue .spectrum-Swatch-icon",
-    ".spectrum-Swatch.is-nothing.spectrum-Swatch--rectangle:not(.spectrum-Swatch.is-mixedValue, .spectrum-Swatch.is-addSwatch) .spectrum-Swatch-fill:after",
-    ".spectrum-Swatch.is-nothing:not(.spectrum-Swatch.is-mixedValue, .spectrum-Swatch.is-addSwatch) .spectrum-Swatch-fill",
-    ".spectrum-Swatch.is-nothing:not(.spectrum-Swatch.is-mixedValue, .spectrum-Swatch.is-addSwatch) .spectrum-Swatch-fill:after",
+    ".spectrum-Swatch.is-mixedValue .spectrum-Swatch-mixedValueIcon",
+    ".spectrum-Swatch.is-nothing .spectrum-Swatch-fill",
+    ".spectrum-Swatch.is-nothing .spectrum-Swatch-fill:after",
+    ".spectrum-Swatch.is-nothing.spectrum-Swatch--rectangle .spectrum-Swatch-fill:after",
     ".spectrum-Swatch.is-selected",
     ".spectrum-Swatch.is-selected .spectrum-Swatch-fill",
     ".spectrum-Swatch.is-selected .spectrum-Swatch-fill:before",
     ".spectrum-Swatch.is-selected:before",
+    ".spectrum-Swatch:after",
     ".spectrum-Swatch:before",
-    ".spectrum-Swatch:focus-visible",
+    ".spectrum-Swatch:focus-visible:after",
     ".spectrum-Swatch[disabled]",
     ".spectrum-Swatch[disabled] .spectrum-Swatch-disabledIcon"
   ],
   "modifiers": [
-    "--mod-add-button-background",
-    "--mod-add-button-background-down",
-    "--mod-add-button-background-hover",
-    "--mod-add-button-background-keyboard-focus",
     "--mod-animation-duration-100",
-    "--mod-corner-radius-full",
-    "--mod-mixed-button-background",
-    "--mod-swatch-border",
     "--mod-swatch-border-color",
+    "--mod-swatch-border-color-light",
     "--mod-swatch-border-color-selected",
-    "--mod-swatch-border-opacity",
     "--mod-swatch-border-radius",
     "--mod-swatch-border-thickness",
     "--mod-swatch-border-thickness-selected",
     "--mod-swatch-disabled-icon-color",
     "--mod-swatch-disabled-icon-size",
+    "--mod-swatch-focus-indicator-border-radius",
     "--mod-swatch-focus-indicator-color",
     "--mod-swatch-focus-indicator-gap",
     "--mod-swatch-focus-indicator-thickness",
     "--mod-swatch-icon-border-color",
-    "--mod-swatch-icon-color",
     "--mod-swatch-inner-border-color-selected",
     "--mod-swatch-size",
     "--mod-swatch-slash-icon-color",
     "--mod-swatch-slash-thickness"
   ],
   "component": [
-    "--spectrum-swatch-border",
     "--spectrum-swatch-border-color",
+    "--spectrum-swatch-border-color-light",
     "--spectrum-swatch-border-color-selected",
-    "--spectrum-swatch-border-opacity",
     "--spectrum-swatch-border-radius",
     "--spectrum-swatch-border-thickness",
     "--spectrum-swatch-border-thickness-selected",
-    "--spectrum-swatch-disabled-icon-border-opacity",
+    "--spectrum-swatch-dash-icon-color",
     "--spectrum-swatch-disabled-icon-color",
     "--spectrum-swatch-disabled-icon-size",
+    "--spectrum-swatch-focus-indicator-border-radius",
     "--spectrum-swatch-focus-indicator-color",
     "--spectrum-swatch-focus-indicator-gap",
     "--spectrum-swatch-focus-indicator-thickness",
     "--spectrum-swatch-icon-border-color",
-    "--spectrum-swatch-icon-color",
     "--spectrum-swatch-inner-border-color-selected",
-    "--spectrum-swatch-rectangle-width-multiplier",
     "--spectrum-swatch-size",
     "--spectrum-swatch-size-extra-small",
     "--spectrum-swatch-size-large",
@@ -113,28 +98,20 @@
     "--spectrum-swatch-slash-thickness-small"
   ],
   "global": [
-    "--spectrum-add-button-background",
-    "--spectrum-add-button-background-down",
-    "--spectrum-add-button-background-hover",
-    "--spectrum-add-button-background-keyboard-focus",
     "--spectrum-animation-duration-100",
     "--spectrum-border-width-100",
     "--spectrum-border-width-200",
     "--spectrum-corner-radius-100",
-    "--spectrum-corner-radius-full",
-    "--spectrum-corner-radius-none",
     "--spectrum-focus-indicator-color",
     "--spectrum-focus-indicator-gap",
     "--spectrum-focus-indicator-thickness",
-    "--spectrum-gray-100",
-    "--spectrum-gray-1000",
-    "--spectrum-gray-200",
     "--spectrum-gray-25",
-    "--spectrum-mixed-button-background",
-    "--spectrum-negative-visual-color",
-    "--spectrum-neutral-content-color-default",
+    "--spectrum-gray-800",
+    "--spectrum-gray-900",
     "--spectrum-picked-color",
+    "--spectrum-red-900",
     "--spectrum-white",
+    "--spectrum-workflow-icon-size-100",
     "--spectrum-workflow-icon-size-200",
     "--spectrum-workflow-icon-size-50",
     "--spectrum-workflow-icon-size-75"
@@ -146,7 +123,6 @@
     "--highcontrast-swatch-border-color-selected",
     "--highcontrast-swatch-disabled-icon-color",
     "--highcontrast-swatch-fill-foreground-color",
-    "--highcontrast-swatch-focus-indicator-color",
-    "--highcontrast-swatch-icon-color"
+    "--highcontrast-swatch-focus-indicator-color"
   ]
 }

components/swatch/dist/metadata.json

@@ -3,19 +3,19 @@
   "selectors": [
     ".spectrum-SwatchGroup",
     ".spectrum-SwatchGroup--compact",
-    ".spectrum-SwatchGroup--spacious:has(.spectrum-Swatch--sizeM, .spectrum-Swatch--sizeL)",
-    ".spectrum-SwatchGroup--spacious:has(.spectrum-Swatch--sizeXS, .spectrum-Swatch--sizeS)"
+    ".spectrum-SwatchGroup--spacious"
   ],
-  "modifiers": ["--mod-swatchgroup-spacing"],
-  "component": [
-    "--spectrum-swatch-group-spacing-spacious",
-    "--spectrum-swatchgroup-spacing"
+  "modifiers": [
+    "--mod-swatchgroup-spacing-compact",
+    "--mod-swatchgroup-spacing-regular",
+    "--mod-swatchgroup-spacing-spacious"
   ],
+  "component": ["--spectrum-swatchgroup-spacing"],
   "global": [
     "--spectrum-spacing-100",
     "--spectrum-spacing-50",
     "--spectrum-spacing-75"
   ],
-  "passthroughs": ["--mod-swatch-border-opacity"],
+  "passthroughs": [],
   "high-contrast": []
 }

components/swatchgroup/dist/metadata.json

@@ -90,7 +90,7 @@
 		"jsonc-eslint-parser": "^2.4.0",
 		"lint-staged": "^15.3.0",
 		"lodash": "^4.17.21",
-		"markdownlint": "^0.37.4",
+		"markdownlint": "^0.38.0",
 		"markdownlint-cli": "^0.44.0",
 		"node-gyp": "^10.1.0",
 		"npm-registry-fetch": "^18.0.2",