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

Author: castastrophe

.gitignore

@@ -1,5 +1,6 @@
-dist
-!dist/metadata.json
+# Ignore dist directories except metadata.json
+**/dist/*
+!components/*/dist/metadata.json
 !tokens/dist/json/*
 !ui-icons/dist
 

.storybook/decorators/context.js

@@ -54,7 +54,7 @@ export const withContextWrapper = makeDecorator({
 				// Check if the container is a testing wrapper to prevent applying colors around the testing grid
 				const isTestingWrapper = isTesting ? container.matches("body:has([data-testing-preview]),[data-testing-preview]") : false;
 				// Check if the container has a static color element
-				let hasStaticElement = container.matches(`:has([data-html-preview])`) ? container.matches(`:has([data-html-preview] .${rootClass}--staticWhite, [data-html-preview] .${rootClass}--staticBlack)`) : container.matches(`:has(.${rootClass}--staticWhite, .${rootClass}--staticBlack)`);
+				let hasStaticElement = container.matches(":has([data-html-preview])") ? container.matches(`:has([data-html-preview] .${rootClass}--staticWhite, [data-html-preview] .${rootClass}--staticBlack)`) : container.matches(`:has(.${rootClass}--staticWhite, .${rootClass}--staticBlack)`);
 
 				// Reset the context to the original values
 				color = original.color;
@@ -97,7 +97,8 @@ export const withContextWrapper = makeDecorator({
 					if (hasStaticElement && staticKey && staticColorSettings[staticKey]) {
 						container.style.background = staticColorSettings[staticKey].background;
 					}
-				} else {
+				}
+				else {
 					// Testing background is stark white to highlight the gray-ish background color on light theme
 					container.style.background = "Canvas";
 				}

.storybook/decorators/helpers.js

@@ -1,4 +1,4 @@
-import { global } from '@storybook/global';
+import { global } from "@storybook/global";
 
 /**
  * @description Fetches the style container for the given ID or creates a new one
@@ -37,8 +37,8 @@ export function toggleStyles(container, id, styles, add = true, context = undefi
 export function fetchStyleContainer(id, container) {
 	if (!id) return;
 
-    const { document } = global;
-    if (!container) container = document.body;
+	const { document } = global;
+	if (!container) container = document.body;
 
 	let styleContainer = container.querySelector(`#${id}`);
 	if (styleContainer) return styleContainer;

.storybook/decorators/icon-sprites.js

@@ -11,23 +11,23 @@ export const withIconSpriteSheet = makeDecorator({
 	parameterName: "spritesheet",
 	wrapper: (StoryFn, context) => {
 		const {
-            loaded = {},
+			loaded = {},
 		} = context;
 
 		useEffect(() => {
-            // Inject the sprite sheets into the document
-            let sprite = document.getElementById("spritesheets");
-            if (!sprite) {
-                sprite = document.createElement("div");
-                sprite.id = "spritesheets";
-                sprite.innerHTML = workflowSprite + uiSprite;
-                document.body.appendChild(sprite);
-            }
-            else {
-                sprite.innerHTML = workflowSprite + uiSprite;
-            }
+			// Inject the sprite sheets into the document
+			let sprite = document.getElementById("spritesheets");
+			if (!sprite) {
+				sprite = document.createElement("div");
+				sprite.id = "spritesheets";
+				sprite.innerHTML = workflowSprite + uiSprite;
+				document.body.appendChild(sprite);
+			}
+			else {
+				sprite.innerHTML = workflowSprite + uiSprite;
+			}
 		}, []);
 
-        return StoryFn(context);
+		return StoryFn(context);
 	},
 });

.storybook/decorators/language.js

@@ -59,7 +59,8 @@ export const withLanguageWrapper = makeDecorator({
 
 					},
 				});
-			} catch (e) {/* empty */}
+			}
+			catch (e) {/* empty */}
 		}, [lang, currentKitId, window]);
 
 		return StoryFn(context);

.storybook/decorators/testing-preview.js

@@ -28,13 +28,16 @@ export const withTestingPreviewWrapper = makeDecorator({
 		// If isChromatic() is true, we should update the global value to always show the testing grid
 		if (typeof isChromatic === "function" && isChromatic() === true) {
 			context.parameters.showTestingGrid = true;
-		} else if (viewMode === "docs") {
+		}
+		else if (viewMode === "docs") {
 			// If we're in the docs view, we should disable the testing grid
 			context.parameters.showTestingGrid = false;
-		} else if (typeof showTestingGrid === "undefined") {
+		}
+		else if (typeof showTestingGrid === "undefined") {
 			// If the global value is undefined, we should set it to the testing preview value
 			context.parameters.showTestingGrid = testingPreview;
-		} else if (showTestingGrid !== testingPreview) {
+		}
+		else if (showTestingGrid !== testingPreview) {
 			context.parameters.showTestingGrid = testingPreview;
 		}
 

.storybook/decorators/utilities.js

@@ -24,7 +24,7 @@ const Heading = ({
 	const headingStyles = {
 		"display": "block",
 		"color": "inherit",
-		"font-family": 'adobe-clean, "adobe clean", "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Trebuchet MS", "Lucida Grande", sans-serif',
+		"font-family": "adobe-clean, \"adobe clean\", \"Source Sans Pro\", -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, Ubuntu, \"Trebuchet MS\", \"Lucida Grande\", sans-serif",
 		"font-size": "11px",
 		"line-height": "1.3",
 		"font-weight": "700",
@@ -215,7 +215,7 @@ export const States = ({
 
 			// If the container test heading is in the ignore list, skip rendering this state
 			if (ignore.length && ignore.includes(containerHeading)) {
-				return nothing
+				return nothing;
 			}
 
 			context = {

.storybook/main.js

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import remarkGfm from 'remark-gfm';
+import remarkGfm from "remark-gfm";
 
 // Get a list of all the folders in the components directory
 const componentDir = path.resolve(__dirname, "../components");
@@ -128,7 +128,7 @@ export default {
 	},
 	framework: "@storybook/web-components-vite",
 	typescript: {
-		reactDocgen: 'react-docgen',
+		reactDocgen: "react-docgen",
 		// Not using typescript so disable the check
 		check: false,
 	},

.storybook/project.json

@@ -27,7 +27,7 @@
 					"outputs": ["{workspaceRoot}/dist"]
 				}
 			},
-			"dependsOn": ["clean", "^build", { "target": "report", "tag": "component" }],
+			"dependsOn": ["clean", "^build", { "tag": "component", "target": "report" }],
 			"executor": "nx:run-commands",
 			"inputs": ["tools", { "externalDependencies": ["storybook"] }],
 			"options": {
@@ -85,7 +85,7 @@
 		},
 		"start": {
 			"cache": true,
-			"dependsOn": [{ "target": "report", "projects": "tag:component" }, "^build"],
+			"dependsOn": [{ "projects": "tag:component", "target": "report" }, "^build"],
 			"executor": "nx:run-commands",
 			"inputs": [
 				"tools",

components/button/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## 14.1.2
+
+### Patch Changes
+
+- [#3600](https://github.com/adobe/spectrum-css/pull/3600) [`bb845cb`](https://github.com/adobe/spectrum-css/commit/bb845cb2477d0c218a9675169f157b047c028222) Thanks [@rise-erpelding](https://github.com/rise-erpelding)! - Adjust border colors for static black and static white outline buttons, primary variant to match S2 spec.
+
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.