chore: merge in latest from main

Author: castastrophe

.github/workflows/lint.yml

@@ -96,7 +96,7 @@ jobs:
 
             - name: Lint component styles
               if: ${{ inputs.styles_added_files != '' || inputs.styles_modified_files != '' }}
-              uses: reviewdog/[email protected].0
+              uses: reviewdog/[email protected].2
               with:
                   fail_level: error
                   filter_mode: diff_context
@@ -108,7 +108,7 @@ jobs:
                   packages: 'stylelint-header stylelint-config-standard stylelint-selector-bem-pattern stylelint-order stylelint-use-logical'
 
             - name: Run eslint on packages and stories
-              uses: reviewdog/[email protected].0
+              uses: reviewdog/[email protected].2
               if: ${{ inputs.eslint_added_files != '' || inputs.eslint_modified_files != '' }}
               with:
                   fail_level: error
@@ -119,7 +119,7 @@ jobs:
                   eslint_flags: "${{ inputs.eslint_added_files }} ${{ inputs.eslint_modified_files }}"
 
             - name: Run markdownlint on documentation
-              uses: reviewdog/[email protected].0
+              uses: reviewdog/[email protected].2
               with:
                 reporter: github-pr-review
                 filter_mode: diff_context

components/actionbutton/CHANGELOG.md

@@ -4,29 +4,31 @@
 
 ### Major Changes
 
-- [#2669](https://github.com/adobe/spectrum-css/pull/2669) [`b2c6357`](https://github.com/adobe/spectrum-css/commit/b2c6357c542737fb996cf8378354f525adde1fc2) Thanks [@mdt2](https://github.com/mdt2)! - Action button now uses Spectrum 2 tokens and design specifications. A few notable changes:
-
-  - Medium is now the default size and `.spectrum-ActionButton--sizeM` has been removed.
-  - Includes the Spectrum 2 down state transform.
-  - The component border was not removed and its color was changed to `transparent` in order to continue support for Windows High Contrast / forced colors, which still shows a border. The mod custom properties for border were removed to avoid interference with Windows High Contrast / forced colors accessibility.
-  - Some selectors to target the icon + text button and the icon-only button have been simplified using `:has`. This removes some overly complex `calc()` functions used for inline spacing, uses the design tokens more directly, and removes the previously documented need for the component's child elements to use a specific source order.
-  - Background and content colors were updated.
-  - Mod custom properties have been adjusted:
-    - Renamed:
-      - `--mod-line-height-100` renamed to `--mod-actionbutton-line-height`.
-      - `--mod-sans-font-family-stack` renamed to `--mod-button-font-family`.
-      - `--mod-animation-duration-100` renamed to `--mod-button-animation-duration`.
-    - Removed:
-      - `--mod-actionbutton-border-color-default`
-      - `--mod-actionbutton-border-color-disabled`
-      - `--mod-actionbutton-border-color-down`
-      - `--mod-actionbutton-border-color-focus`
-      - `--mod-actionbutton-border-color-hover`
-      - `--mod-actionbutton-border-width`
-      - `--mod-actionbutton-static-content-color`
-    - New:
-      - `--mod-actionbutton-font-weight`
-      - `--mod-actionbutton-font-style`
+📝 [#2669](https://github.com/adobe/spectrum-css/pull/2669) [`b2c6357`](https://github.com/adobe/spectrum-css/commit/b2c6357c542737fb996cf8378354f525adde1fc2) Thanks [@mdt2](https://github.com/mdt2)!
+
+Action button now uses Spectrum 2 tokens and design specifications. A few notable changes:
+
+- Medium is now the default size and `.spectrum-ActionButton--sizeM` has been removed.
+- Includes the Spectrum 2 down state transform.
+- The component border was not removed and its color was changed to `transparent` in order to continue support for Windows High Contrast / forced colors, which still shows a border. The mod custom properties for border were removed to avoid interference with Windows High Contrast / forced colors accessibility.
+- Some selectors to target the icon + text button and the icon-only button have been simplified using `:has`. This removes some overly complex `calc()` functions used for inline spacing, uses the design tokens more directly, and removes the previously documented need for the component's child elements to use a specific source order.
+- Background and content colors were updated.
+- Mod custom properties have been adjusted:
+  - Renamed:
+    - `--mod-line-height-100` renamed to `--mod-actionbutton-line-height`.
+    - `--mod-sans-font-family-stack` renamed to `--mod-button-font-family`.
+    - `--mod-animation-duration-100` renamed to `--mod-button-animation-duration`.
+  - Removed:
+    - `--mod-actionbutton-border-color-default`
+    - `--mod-actionbutton-border-color-disabled`
+    - `--mod-actionbutton-border-color-down`
+    - `--mod-actionbutton-border-color-focus`
+    - `--mod-actionbutton-border-color-hover`
+    - `--mod-actionbutton-border-width`
+    - `--mod-actionbutton-static-content-color`
+  - New:
+    - `--mod-actionbutton-font-weight`
+    - `--mod-actionbutton-font-style`
 
 ## 8.0.0-next.0
 
@@ -35,6 +37,14 @@
 - Updated dependencies [[`a25e0a9`](https://github.com/adobe/spectrum-css/commit/a25e0a99e5a4736ab4e607e00739343101a2633b)]:
   - @spectrum-css/icon@10.0.0-next.0
 
+## 7.1.3
+
+### Patch Changes
+
+📝 [#3644](https://github.com/adobe/spectrum-css/pull/3644) [`5adef1d`](https://github.com/adobe/spectrum-css/commit/5adef1d15d07516dc9c1aac7bbcf9ac5bdeb9e97) Thanks [@marissahuysentruyt](https://github.com/marissahuysentruyt)!
+
+Fix support for `--mod-actionbutton-border-radius` to make sure it is surfaced to consumers, and properly overwrites the default border radius setting.
+
 ## 7.1.2
 
 ### Patch Changes

components/button/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change log
 
+## 15.0.0-next.0
+
+### Patch Changes
+
+- Updated dependencies [[`a25e0a9`](https://github.com/adobe/spectrum-css/commit/a25e0a99e5a4736ab4e607e00739343101a2633b)]:
+  - @spectrum-css/icon@10.0.0-next.0
+
+## 14.1.4
+
+### Patch Changes
+
+📝 [#3648](https://github.com/adobe/spectrum-css/pull/3648) [`8e52975`](https://github.com/adobe/spectrum-css/commit/8e52975c9c75d1fc44089a3b112c7f1745f8cea3) Thanks [@rise-erpelding](https://github.com/rise-erpelding)!
+
+S2 Foundations fixes to adjust:
+
+- primary outline background color for hover, active, and focus states (gray-100)
+- secondary fill background color for active state (gray-200)
+- secondary outline background color for hover, active, and focus states (gray-100)
+- secondary outline border color for default (gray-300) and active states (gray-400)
+
 ## 14.1.3
 
 ### Patch Changes
@@ -23,13 +43,6 @@ This PR includes changes to:
 
 - Adjust border colors for static black and static white outline buttons, primary variant to match S2 spec.
 
-## 15.0.0-next.0
-
-### Patch Changes
-
-- Updated dependencies [[`a25e0a9`](https://github.com/adobe/spectrum-css/commit/a25e0a99e5a4736ab4e607e00739343101a2633b)]:
-  - @spectrum-css/icon@10.0.0-next.0
-
 ## 14.1.1
 
 ### Patch Changes

components/pickerbutton/CHANGELOG.md

@@ -9,6 +9,18 @@
   - @spectrum-css/menu@10.0.0-next.0
   - @spectrum-css/popover@9.0.0-next.0
 
+## 6.1.2
+
+### Patch Changes
+
+📝 [#3630](https://github.com/adobe/spectrum-css/pull/3630) [`954243f`](https://github.com/adobe/spectrum-css/commit/954243fe5c9a6ff0649ee041d197fcd0d9ad5899) Thanks [@marissahuysentruyt](https://github.com/marissahuysentruyt)!
+
+Updates background colors for the picker button to match S2-foundations design specifications:
+
+- default state: `gray-50` to `gray-100`
+- hover state: `gray-100` to `gray-200`
+- key-focus state: `gray-100` to `gray-200`
+
 ## 6.1.1
 
 ### Patch Changes