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

Author: castastrophe

.github/workflows/release.yml

@@ -29,12 +29,12 @@ jobs:
         id: changesets
         uses: changesets/action@v1
         with:
-          version: yarn version:packages
-
-          # This expects you to have a script called release which does a build for your packages and calls changeset publish
           title: "chore: release"
           commit: "chore: release"
+          # This expects you to have a script called release / version:packages
+          # which does a build for your packages and calls changeset publish
           publish: yarn release
+          version: yarn version:packages
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

components/actionbutton/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## 7.1.2
+
+### Patch Changes
+
+📝 [#3606](https://github.com/adobe/spectrum-css/pull/3606) [`3ec3b46`](https://github.com/adobe/spectrum-css/commit/3ec3b468313cbeb19298b35a2bd80860b83f4734) Thanks [@jawinn](https://github.com/jawinn)!
+
+This updates the colors used in action button for the spectrum two theme, so they are closer aligned with the spectrum 2 spec, per the request in SWC-597. This removes the border by making it transparent and updates the background color tokens that are used.
+
+This also includes a forced-colors/high contrast mode fix for the selected + disabled state. This now shows the disabled colors.
+
 ## 8.0.0-next.0
 
 ### Patch Changes

components/button/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change log
 
+## 14.1.3
+
+### Patch Changes
+
+📝 [`d2272ea`](https://github.com/adobe/spectrum-css/commit/d2272eaedcc3a2a957028fe3d1ed6a3ce96a49f6) Thanks [@rise-erpelding](https://github.com/rise-erpelding)!
+
+Adjusts static color buttons to more closely resemble the S2 specifications. There are no expected changes to non-static button variants in S2, and no expected changes to other themes.
+
+This PR includes changes to:
+
+- Static white primary button (outline variant), static white secondary button (fill variant), static black primary button (outline variant), static black secondary button (fill variant)
+- Static white secondary button (outline variant) and static black secondary button (outline variant) border and background colors
+- Static color buttons' content color
+- Static white primary button (fill variant) and static black primary button (fill variant) background colors
+
 ## 14.1.2
 
 ### Patch Changes

components/search/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## 8.1.1
+
+### Patch Changes
+
+📝 [#3593](https://github.com/adobe/spectrum-css/pull/3593) [`d829abb`](https://github.com/adobe/spectrum-css/commit/d829abb44f1eaa1874090e52caee553d776684e7) Thanks [@TarunAdobe](https://github.com/TarunAdobe)!
+
+Updated `--spectrum-search-background-color-disabled` to `--spectrum-gray-25` and `--spectrum-search-border-color-disabled` to `--spectrum-gray-300` for the S2 foundations contexts.
+
+Also defines disabled quiet border and background colors (`--system-search-quiet-background-color-disabled` and `--system-search-quiet-border-color-disabled`) in order to maintain disabled quiet styling.
+
 ## 9.0.0-next.0
 
 ### Patch Changes

components/search/dist/metadata.json

@@ -117,7 +117,6 @@
     "--spectrum-component-top-to-text-100",
     "--spectrum-corner-radius-100",
     "--spectrum-default-font-style",
-    "--spectrum-disabled-background-color",
     "--spectrum-disabled-border-color",
     "--spectrum-disabled-content-color",
     "--spectrum-field-edge-to-visual-quiet",

components/search/index.css

@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
- .spectrum-Search {
+.spectrum-Search {
 	--spectrum-search-border-color-default: var(--spectrum-gray-500);
 	--spectrum-search-border-color-hover: var(--spectrum-gray-600);
 	--spectrum-search-border-color-focus: var(--spectrum-gray-800);
@@ -80,8 +80,6 @@
 
 	/* Disabled */
 	--spectrum-search-color-disabled: var(--spectrum-disabled-content-color);
-	--spectrum-search-background-color-disabled: var(--spectrum-disabled-background-color);
-	--spectrum-search-border-color-disabled: var(--spectrum-disabled-background-color);
 
 	/* @passthrough start -- settings for nested Textfield component */
 	--mod-textfield-font-family: var(--mod-search-font-family, var(--spectrum-search-font-family));

components/slider/stories/template.js

@@ -18,7 +18,7 @@ export const Template = ({
 	values = [],
 	variant,
 	labelPosition,
-	fillColor = "rgb(213, 213, 213)",
+	fillColor,
 	showTicks = false,
 	showTickLabels = false,
 	isDisabled = false,
@@ -124,8 +124,8 @@ export const Template = ({
 			})}
 			id=${ifDefined(id)}
 			style=${styleMap({
+				"--spectrum-slider-track-color": fillColor ? fillColor : undefined,
 				"inline-size": "240px",
-				["--spectrum-slider-track-color"]: fillColor,
 				...customStyles,
 			})}
 			role=${ifDefined(values.length > 1 ? "group" : undefined)}

lint-staged.config.js

@@ -6,20 +6,21 @@ module.exports = {
 	"*.{js,json}": [
 		"eslint --fix --cache --no-error-on-unmatched-pattern --quiet"
 	],
-	"package.json": (files) => [
-		"yarn constraints --fix",
-		`eslint --fix --cache --no-error-on-unmatched-pattern --quiet ${files.join(" ")}`,
+	"*.{md,mdx}": [
+		"prettier --no-error-on-unmatched-pattern --ignore-unknown --log-level silent --write --config .prettierrc",
+		"markdownlint --config .markdownlint.json --fix"
 	],
+	"package.json": () => ([
+		"yarn constraints --fix",
+		"yarn install --refresh-lockfile",
+		"git add yarn.lock"
+	]),
 	"dist/*.css": [
 		"prettier --no-error-on-unmatched-pattern --ignore-unknown --log-level silent --write --config .prettierrc"
 	],
 	"components/*/dist/metadata.json": (files) => {
 		return [
 			...(files.map(file => `pajv test --valid -s ./schemas/metadata.schema.json -d "${file}"`) ?? []),
 		];
-	},
-	"*.{md,mdx}": [
-		"prettier --no-error-on-unmatched-pattern --ignore-unknown --log-level silent --write --config .prettierrc",
-		"markdownlint --config .markdownlint.json --fix"
-	]
+	}
 };

package.json

@@ -53,7 +53,7 @@
 		"tester": "cross-env NODE_ENV=development nx run storybook:test:scope",
 		"validate": "yarn validator tag:component",
 		"validator": "nx run-many --target validate --verbose --projects",
-		"version:packages": "changeset version && yarn constraints --fix && yarn install"
+		"version:packages": "yarn config set -H enableImmutableInstalls false && changeset version && git add . && yarn lint-staged"
 	},
 	"workspaces": [
 		"components/*",

yarn.lock

@@ -764,11 +764,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.3.1":
-  version: 7.26.9
-  resolution: "@babel/runtime@npm:7.26.9"
+  version: 7.26.10
+  resolution: "@babel/runtime@npm:7.26.10"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10c0/e8517131110a6ec3a7360881438b85060e49824e007f4a64b5dfa9192cf2bb5c01e84bfc109f02d822c7edb0db926928dd6b991e3ee460b483fb0fac43152d9b
+  checksum: 10c0/6dc6d88c7908f505c4f7770fb4677dfa61f68f659b943c2be1f2a99cb6680343462867abf2d49822adc435932919b36c77ac60125793e719ea8745f2073d3745
   languageName: node
   linkType: hard