Merge branch 'main' into 3096-remove-aria-live=polite-on-textinput-wr…

…apper
primer · Apr 24, 2023 · 9fe09da · 9fe09da
2 parents f0c5e4d + cb233cf
commit 9fe09da
Show file tree

Hide file tree

Showing 191 changed files with 4,285 additions and 1,875 deletions.
diff --git a/.changeset/modern-coins-destroy.md b/.changeset/modern-coins-destroy.md
@@ -0,0 +1,39 @@
+---
+"@primer/react": major
+---
+
+Update PRC ActionList implementation to have similar semantics to PVC.
+* Removes `ActionList.Group`.
+* Adds `ActionList.Heading` to be used for labelling children in an `ActionList`.
+* Adds `heading` slot to `ActionList` for adding headings that label internal lists correctly.
+
+ActionList.Groups inside an ActionList generated inaccessible markup. Previous usage:
+```
+<ActionList>
+  <ActionList.Group title="Actions">
+    <ActionList.Item>Create</ActionList.Item>
+    <ActionList.Item>Read</ActionList.Item>
+    <ActionList.Item>Update</ActionList.Item>
+    <ActionList.Item>Delete</ActionList.Item>
+  </ActionList.Group>
+  <ActionList.Group>
+    ...
+  </ActionList.Group>
+</ActionList>
+```
+
+Instead, use `ActionList`s and stack them as needed.
+```
+<div>
+  <ActionList>
+    <ActionList.Heading title="Actions" />
+    <ActionList.Item>Create</ActionList.Item>
+    <ActionList.Item>Read</ActionList.Item>
+    <ActionList.Item>Update</ActionList.Item>
+    <ActionList.Item>Delete</ActionList.Item>
+  </ActionList>
+  <ActionList>
+    ...
+  </ActionList>
+</div>
+```
diff --git a/.changeset/wicked-knives-sparkle.md b/.changeset/wicked-knives-sparkle.md
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
   "image": "mcr.microsoft.com/vscode/devcontainers/typescript-node:18",
   "extensions": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint", "DavidAnson.vscode-markdownlint"],
   "forwardPorts": [8000],
-  "postCreateCommand": ["/bin/bash", "-c", "npm run setup"],
+  "onCreateCommand": ["/bin/bash", "-c", "npm run setup"],
   "remoteUser": "node",
   "features": {
     "ghcr.io/devcontainers/features/sshd:1": {

diff --git a/....test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-colorblind-linux.png b/....test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-colorblind-linux.png
diff --git a/...Menu.test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-dimmed-linux.png b/...Menu.test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-dimmed-linux.png
diff --git a/...st.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-high-contrast-linux.png b/...st.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-high-contrast-linux.png
diff --git a/.../ActionMenu.test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-linux.png b/.../ActionMenu.test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-linux.png
diff --git a/....test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-tritanopia-linux.png b/....test.ts-snapshots/ActionMenu-Groups-And-Descriptions-dark-tritanopia-linux.png
diff --git a/...test.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-colorblind-linux.png b/...test.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-colorblind-linux.png
diff --git a/...t.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-high-contrast-linux.png b/...t.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-high-contrast-linux.png
diff --git a/...ActionMenu.test.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-linux.png b/...ActionMenu.test.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-linux.png
diff --git a/...test.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-tritanopia-linux.png b/...test.ts-snapshots/ActionMenu-Groups-And-Descriptions-light-tritanopia-linux.png
diff --git a/...onMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-colorblind-linux.png b/...onMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-colorblind-linux.png
diff --git a/...ActionMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-dimmed-linux.png b/...ActionMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-dimmed-linux.png
diff --git a/...enu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-high-contrast-linux.png b/...enu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-high-contrast-linux.png
diff --git a/...onents/ActionMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-linux.png b/...onents/ActionMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-linux.png
diff --git a/...onMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-tritanopia-linux.png b/...onMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-dark-tritanopia-linux.png
diff --git a/...nMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-colorblind-linux.png b/...nMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-colorblind-linux.png
diff --git a/...nu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-high-contrast-linux.png b/...nu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-high-contrast-linux.png
diff --git a/...nents/ActionMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-linux.png b/...nents/ActionMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-linux.png
diff --git a/...nMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-tritanopia-linux.png b/...nMenu.test.ts-snapshots/ActionMenu-Multiple-Sections-light-tritanopia-linux.png
diff --git a/...nts/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-colorblind-linux.png b/...nts/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-colorblind-linux.png
diff --git a/...ponents/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-dimmed-linux.png b/...ponents/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-dimmed-linux.png
diff --git a/.../SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-high-contrast-linux.png b/.../SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-high-contrast-linux.png
diff --git a/...ots/components/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-linux.png b/...ots/components/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-linux.png
diff --git a/...nts/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-tritanopia-linux.png b/...nts/SelectPanel.test.ts-snapshots/SelectPanel-Default-dark-tritanopia-linux.png
diff --git a/...ts/SelectPanel.test.ts-snapshots/SelectPanel-Default-light-colorblind-linux.png b/...ts/SelectPanel.test.ts-snapshots/SelectPanel-Default-light-colorblind-linux.png
diff --git a/...SelectPanel.test.ts-snapshots/SelectPanel-Default-light-high-contrast-linux.png b/...SelectPanel.test.ts-snapshots/SelectPanel-Default-light-high-contrast-linux.png
diff --git a/...ts/components/SelectPanel.test.ts-snapshots/SelectPanel-Default-light-linux.png b/...ts/components/SelectPanel.test.ts-snapshots/SelectPanel-Default-light-linux.png
diff --git a/...ts/SelectPanel.test.ts-snapshots/SelectPanel-Default-light-tritanopia-linux.png b/...ts/SelectPanel.test.ts-snapshots/SelectPanel-Default-light-tritanopia-linux.png
diff --git a/...ctPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-colorblind-linux.png b/...ctPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-colorblind-linux.png
diff --git a/...SelectPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-dimmed-linux.png b/...SelectPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-dimmed-linux.png
diff --git a/...anel.test.ts-snapshots/SelectPanel-External-Anchor-dark-high-contrast-linux.png b/...anel.test.ts-snapshots/SelectPanel-External-Anchor-dark-high-contrast-linux.png
diff --git a/...onents/SelectPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-linux.png b/...onents/SelectPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-linux.png
diff --git a/...ctPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-tritanopia-linux.png b/...ctPanel.test.ts-snapshots/SelectPanel-External-Anchor-dark-tritanopia-linux.png
diff --git a/...tPanel.test.ts-snapshots/SelectPanel-External-Anchor-light-colorblind-linux.png b/...tPanel.test.ts-snapshots/SelectPanel-External-Anchor-light-colorblind-linux.png
diff --git a/...nel.test.ts-snapshots/SelectPanel-External-Anchor-light-high-contrast-linux.png b/...nel.test.ts-snapshots/SelectPanel-External-Anchor-light-high-contrast-linux.png
diff --git a/...nents/SelectPanel.test.ts-snapshots/SelectPanel-External-Anchor-light-linux.png b/...nents/SelectPanel.test.ts-snapshots/SelectPanel-External-Anchor-light-linux.png
diff --git a/...tPanel.test.ts-snapshots/SelectPanel-External-Anchor-light-tritanopia-linux.png b/...tPanel.test.ts-snapshots/SelectPanel-External-Anchor-light-tritanopia-linux.png
diff --git a/...s-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-colorblind-linux.png b/...s-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-colorblind-linux.png
diff --git a/...st.ts-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-dimmed-linux.png b/...st.ts-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-dimmed-linux.png
diff --git a/...napshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-high-contrast-linux.png b/...napshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-high-contrast-linux.png
diff --git a/...anel.test.ts-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-linux.png b/...anel.test.ts-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-linux.png
diff --git a/...s-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-tritanopia-linux.png b/...s-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-dark-tritanopia-linux.png
diff --git a/...-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-colorblind-linux.png b/...-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-colorblind-linux.png
diff --git a/...apshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-high-contrast-linux.png b/...apshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-high-contrast-linux.png
diff --git a/...nel.test.ts-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-linux.png b/...nel.test.ts-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-linux.png
diff --git a/...-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-tritanopia-linux.png b/...-snapshots/SelectPanel-SelectPanel-Above-a-Tall-Body-light-tritanopia-linux.png
diff --git a/...ectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-colorblind-linux.png b/...ectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-colorblind-linux.png
diff --git a/.../SelectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-dimmed-linux.png b/.../SelectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-dimmed-linux.png
diff --git a/...Panel-SelectPanel-Height-Initial-Overflowing-Items-dark-high-contrast-linux.png b/...Panel-SelectPanel-Height-Initial-Overflowing-Items-dark-high-contrast-linux.png
diff --git a/...apshots/SelectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-linux.png b/...apshots/SelectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-linux.png
diff --git a/...ectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-tritanopia-linux.png b/...ectPanel-SelectPanel-Height-Initial-Overflowing-Items-dark-tritanopia-linux.png
diff --git a/...ctPanel-SelectPanel-Height-Initial-Overflowing-Items-light-colorblind-linux.png b/...ctPanel-SelectPanel-Height-Initial-Overflowing-Items-light-colorblind-linux.png
diff --git a/...anel-SelectPanel-Height-Initial-Overflowing-Items-light-high-contrast-linux.png b/...anel-SelectPanel-Height-Initial-Overflowing-Items-light-high-contrast-linux.png
diff --git a/...pshots/SelectPanel-SelectPanel-Height-Initial-Overflowing-Items-light-linux.png b/...pshots/SelectPanel-SelectPanel-Height-Initial-Overflowing-Items-light-linux.png
diff --git a/...ctPanel-SelectPanel-Height-Initial-Overflowing-Items-light-tritanopia-linux.png b/...ctPanel-SelectPanel-Height-Initial-Overflowing-Items-light-tritanopia-linux.png
diff --git a/...ctPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-colorblind-linux.png b/...ctPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-colorblind-linux.png
diff --git a/...SelectPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-dimmed-linux.png b/...SelectPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-dimmed-linux.png
diff --git a/...anel-SelectPanel-Height-Initial-Underflowing-Items-dark-high-contrast-linux.png b/...anel-SelectPanel-Height-Initial-Underflowing-Items-dark-high-contrast-linux.png
diff --git a/...pshots/SelectPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-linux.png b/...pshots/SelectPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-linux.png
diff --git a/...ctPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-tritanopia-linux.png b/...ctPanel-SelectPanel-Height-Initial-Underflowing-Items-dark-tritanopia-linux.png
diff --git a/...tPanel-SelectPanel-Height-Initial-Underflowing-Items-light-colorblind-linux.png b/...tPanel-SelectPanel-Height-Initial-Underflowing-Items-light-colorblind-linux.png
diff --git a/...nel-SelectPanel-Height-Initial-Underflowing-Items-light-high-contrast-linux.png b/...nel-SelectPanel-Height-Initial-Underflowing-Items-light-high-contrast-linux.png
diff --git a/...shots/SelectPanel-SelectPanel-Height-Initial-Underflowing-Items-light-linux.png b/...shots/SelectPanel-SelectPanel-Height-Initial-Underflowing-Items-light-linux.png
diff --git a/...tPanel-SelectPanel-Height-Initial-Underflowing-Items-light-tritanopia-linux.png b/...tPanel-SelectPanel-Height-Initial-Underflowing-Items-light-tritanopia-linux.png
diff --git a/...ectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-colorblind-linux.png b/...ectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-colorblind-linux.png
diff --git a/.../SelectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-dimmed-linux.png b/.../SelectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-dimmed-linux.png
diff --git a/...Panel-SelectPanel-Initial-Height-Overflowing-Items-dark-high-contrast-linux.png b/...Panel-SelectPanel-Initial-Height-Overflowing-Items-dark-high-contrast-linux.png
diff --git a/...apshots/SelectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-linux.png b/...apshots/SelectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-linux.png
diff --git a/...ectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-tritanopia-linux.png b/...ectPanel-SelectPanel-Initial-Height-Overflowing-Items-dark-tritanopia-linux.png
diff --git a/...ctPanel-SelectPanel-Initial-Height-Overflowing-Items-light-colorblind-linux.png b/...ctPanel-SelectPanel-Initial-Height-Overflowing-Items-light-colorblind-linux.png
diff --git a/...anel-SelectPanel-Initial-Height-Overflowing-Items-light-high-contrast-linux.png b/...anel-SelectPanel-Initial-Height-Overflowing-Items-light-high-contrast-linux.png
diff --git a/...pshots/SelectPanel-SelectPanel-Initial-Height-Overflowing-Items-light-linux.png b/...pshots/SelectPanel-SelectPanel-Initial-Height-Overflowing-Items-light-linux.png
diff --git a/...ctPanel-SelectPanel-Initial-Height-Overflowing-Items-light-tritanopia-linux.png b/...ctPanel-SelectPanel-Initial-Height-Overflowing-Items-light-tritanopia-linux.png
diff --git a/...ctPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-colorblind-linux.png b/...ctPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-colorblind-linux.png
diff --git a/...SelectPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-dimmed-linux.png b/...SelectPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-dimmed-linux.png
diff --git a/...anel-SelectPanel-Initial-Height-Underflowing-Items-dark-high-contrast-linux.png b/...anel-SelectPanel-Initial-Height-Underflowing-Items-dark-high-contrast-linux.png
diff --git a/...pshots/SelectPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-linux.png b/...pshots/SelectPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-linux.png
diff --git a/...ctPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-tritanopia-linux.png b/...ctPanel-SelectPanel-Initial-Height-Underflowing-Items-dark-tritanopia-linux.png
diff --git a/...tPanel-SelectPanel-Initial-Height-Underflowing-Items-light-colorblind-linux.png b/...tPanel-SelectPanel-Initial-Height-Underflowing-Items-light-colorblind-linux.png
diff --git a/...nel-SelectPanel-Initial-Height-Underflowing-Items-light-high-contrast-linux.png b/...nel-SelectPanel-Initial-Height-Underflowing-Items-light-high-contrast-linux.png
diff --git a/...shots/SelectPanel-SelectPanel-Initial-Height-Underflowing-Items-light-linux.png b/...shots/SelectPanel-SelectPanel-Initial-Height-Underflowing-Items-light-linux.png
diff --git a/...tPanel-SelectPanel-Initial-Height-Underflowing-Items-light-tritanopia-linux.png b/...tPanel-SelectPanel-Initial-Height-Underflowing-Items-light-tritanopia-linux.png
diff --git a/...lectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-colorblind-linux.png b/...lectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-colorblind-linux.png
diff --git a/...s/SelectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-dimmed-linux.png b/...s/SelectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-dimmed-linux.png
diff --git a/...tPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-high-contrast-linux.png b/...tPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-high-contrast-linux.png
diff --git a/...mponents/SelectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-linux.png b/...mponents/SelectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-linux.png
diff --git a/...lectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-tritanopia-linux.png b/...lectPanel.test.ts-snapshots/SelectPanel-Single-Select-dark-tritanopia-linux.png
diff --git a/...ectPanel.test.ts-snapshots/SelectPanel-Single-Select-light-colorblind-linux.png b/...ectPanel.test.ts-snapshots/SelectPanel-Single-Select-light-colorblind-linux.png
diff --git a/...Panel.test.ts-snapshots/SelectPanel-Single-Select-light-high-contrast-linux.png b/...Panel.test.ts-snapshots/SelectPanel-Single-Select-light-high-contrast-linux.png
diff --git a/...ponents/SelectPanel.test.ts-snapshots/SelectPanel-Single-Select-light-linux.png b/...ponents/SelectPanel.test.ts-snapshots/SelectPanel-Single-Select-light-linux.png
diff --git a/...ectPanel.test.ts-snapshots/SelectPanel-Single-Select-light-tritanopia-linux.png b/...ectPanel.test.ts-snapshots/SelectPanel-Single-Select-light-tritanopia-linux.png
diff --git a/...omponents/Truncate.test.ts-snapshots/Truncate-Default-dark-colorblind-linux.png b/...omponents/Truncate.test.ts-snapshots/Truncate-Default-dark-colorblind-linux.png
diff --git a/...ts/components/Truncate.test.ts-snapshots/Truncate-Default-dark-dimmed-linux.png b/...ts/components/Truncate.test.ts-snapshots/Truncate-Default-dark-dimmed-linux.png
diff --git a/...onents/Truncate.test.ts-snapshots/Truncate-Default-dark-high-contrast-linux.png b/...onents/Truncate.test.ts-snapshots/Truncate-Default-dark-high-contrast-linux.png
diff --git a/...snapshots/components/Truncate.test.ts-snapshots/Truncate-Default-dark-linux.png b/...snapshots/components/Truncate.test.ts-snapshots/Truncate-Default-dark-linux.png
diff --git a/...omponents/Truncate.test.ts-snapshots/Truncate-Default-dark-tritanopia-linux.png b/...omponents/Truncate.test.ts-snapshots/Truncate-Default-dark-tritanopia-linux.png
diff --git a/...mponents/Truncate.test.ts-snapshots/Truncate-Default-light-colorblind-linux.png b/...mponents/Truncate.test.ts-snapshots/Truncate-Default-light-colorblind-linux.png
diff --git a/...nents/Truncate.test.ts-snapshots/Truncate-Default-light-high-contrast-linux.png b/...nents/Truncate.test.ts-snapshots/Truncate-Default-light-high-contrast-linux.png
diff --git a/...napshots/components/Truncate.test.ts-snapshots/Truncate-Default-light-linux.png b/...napshots/components/Truncate.test.ts-snapshots/Truncate-Default-light-linux.png
diff --git a/...mponents/Truncate.test.ts-snapshots/Truncate-Default-light-tritanopia-linux.png b/...mponents/Truncate.test.ts-snapshots/Truncate-Default-light-tritanopia-linux.png
diff --git a/...onents/Truncate.test.ts-snapshots/Truncate-Playground-dark-colorblind-linux.png b/...onents/Truncate.test.ts-snapshots/Truncate-Playground-dark-colorblind-linux.png
diff --git a/...components/Truncate.test.ts-snapshots/Truncate-Playground-dark-dimmed-linux.png b/...components/Truncate.test.ts-snapshots/Truncate-Playground-dark-dimmed-linux.png
diff --git a/...nts/Truncate.test.ts-snapshots/Truncate-Playground-dark-high-contrast-linux.png b/...nts/Truncate.test.ts-snapshots/Truncate-Playground-dark-high-contrast-linux.png
diff --git a/...pshots/components/Truncate.test.ts-snapshots/Truncate-Playground-dark-linux.png b/...pshots/components/Truncate.test.ts-snapshots/Truncate-Playground-dark-linux.png
diff --git a/...onents/Truncate.test.ts-snapshots/Truncate-Playground-dark-tritanopia-linux.png b/...onents/Truncate.test.ts-snapshots/Truncate-Playground-dark-tritanopia-linux.png
diff --git a/...nents/Truncate.test.ts-snapshots/Truncate-Playground-light-colorblind-linux.png b/...nents/Truncate.test.ts-snapshots/Truncate-Playground-light-colorblind-linux.png
diff --git a/...ts/Truncate.test.ts-snapshots/Truncate-Playground-light-high-contrast-linux.png b/...ts/Truncate.test.ts-snapshots/Truncate-Playground-light-high-contrast-linux.png
diff --git a/...shots/components/Truncate.test.ts-snapshots/Truncate-Playground-light-linux.png b/...shots/components/Truncate.test.ts-snapshots/Truncate-Playground-light-linux.png
diff --git a/...nents/Truncate.test.ts-snapshots/Truncate-Playground-light-tritanopia-linux.png b/...nents/Truncate.test.ts-snapshots/Truncate-Playground-light-tritanopia-linux.png
diff --git a/...eNav-UnderlineNav-Interactions-dark-dimmed-Overflow-interaction-vrt-3-linux.png b/...eNav-UnderlineNav-Interactions-dark-dimmed-Overflow-interaction-vrt-3-linux.png
diff --git a/...derlineNav-Interactions-dark-high-contrast-Overflow-interaction-vrt-3-linux.png b/...derlineNav-Interactions-dark-high-contrast-Overflow-interaction-vrt-3-linux.png
diff --git a/...-UnderlineNav-Interactions-dark-tritanopia-Overflow-interaction-vrt-3-linux.png b/...-UnderlineNav-Interactions-dark-tritanopia-Overflow-interaction-vrt-3-linux.png
diff --git a/...UnderlineNav-Interactions-light-tritanopia-Overflow-interaction-vrt-3-linux.png b/...UnderlineNav-Interactions-light-tritanopia-Overflow-interaction-vrt-3-linux.png
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @primer/components
 
+## 35.25.1
+
+### Patch Changes
+
+- [#3174](https://github.com/primer/react/pull/3174) [`d4c6ae5b`](https://github.com/primer/react/commit/d4c6ae5b481631ab9bcd7256f5287612c97e021e) Thanks [@colebemis](https://github.com/colebemis)! - `MarkdownEditor` is now SSR-compatible.
+
+  Warning: In this new implementation, `MarkdownEditor.Toolbar`, `MarkdownEditor.Actions`, and `MarkdownEditor.Label` must be direct children of `MarkdownEditor`.
+
+- [#3209](https://github.com/primer/react/pull/3209) [`a6279536`](https://github.com/primer/react/commit/a6279536e3c2c28788196fd9a5e28fc53ec6538a) Thanks [@langermank](https://github.com/langermank)! - Remove `--primer` prefix from CSS var
+
+- [#3173](https://github.com/primer/react/pull/3173) [`6b900e90`](https://github.com/primer/react/commit/6b900e90c3a551251b8161227c3d51ba476b9b5c) Thanks [@colebemis](https://github.com/colebemis)! - `ActionList` and `NavList` are now SSR-compatible.
+
+  Warning: In this new implementation, `ActionList.LeadingVisual`, `ActionList.TrailingVisual,` and `ActionList.Description` must be direct children of `ActionList`. The same applies to `NavList`.
+
+- [#3198](https://github.com/primer/react/pull/3198) [`a273748b`](https://github.com/primer/react/commit/a273748b6d8162b7f6e819200c5663963558ec2f) Thanks [@langermank](https://github.com/langermank)! - Bug fix: `ButtonGroup` borders show incorrectly on hover
+
 ## 35.25.0
 
 ### Minor Changes

diff --git a/docs/content/ActionList.mdx b/docs/content/ActionList.mdx
@@ -170,7 +170,7 @@ When you want to add links to the List instead of actions, use `ActionList.LinkI
 </ActionList>
 ```
 
-### With groups
+### With headings
 
 ```javascript live noinline
 const SelectFields = () => {
@@ -196,29 +196,30 @@ const SelectFields = () => {
   }
 
   return (
-    <ActionList selectionVariant="multiple">
-      <ActionList.Group title="Visible fields">
+    <>
+      <ActionList selectionVariant="multiple">
+        <ActionList.Heading title="Visible fields" />
         {visibleOptions.map(option => (
           <ActionList.Item key={option.text} selected={true} onSelect={() => toggle(option.text)}>
             {option.text}
           </ActionList.Item>
         ))}
-      </ActionList.Group>
-      <ActionList.Group
-        title="Hidden fields"
+      </ActionList>
+      <ActionList
         selectionVariant={
           /** selectionVariant override on Group: disable selection if there are no options */
           hiddenOptions.length ? 'multiple' : false
         }
       >
+        <ActionList.Heading title="Hidden fields" />
         {hiddenOptions.map((option, index) => (
           <ActionList.Item key={option.text} selected={false} onSelect={() => toggle(option.text)}>
             {option.text}
           </ActionList.Item>
         ))}
         {hiddenOptions.length === 0 && <ActionList.Item disabled>No hidden fields</ActionList.Item>}
-      </ActionList.Group>
-    </ActionList>
+      </ActionList>
+    </>
   )
 }
 

diff --git a/docs/content/ActionMenu.mdx b/docs/content/ActionMenu.mdx
@@ -110,65 +110,62 @@ You can choose to have a different _anchor_ for the Menu depending on the applic
 </ActionMenu>
 ```
 
-### With Groups
+### Divided into sections
 
 ```jsx live
 <ActionMenu>
   <ActionMenu.Button>Open column menu</ActionMenu.Button>
 
   <ActionMenu.Overlay>
     <ActionList showDividers>
-      <ActionList.Group title="Live query">
-        <ActionList.Item>
-          <ActionList.LeadingVisual>
-            <SearchIcon />
-          </ActionList.LeadingVisual>
-          repo:github/memex,github/github
-        </ActionList.Item>
-      </ActionList.Group>
-      <ActionList.Divider />
-      <ActionList.Group title="Layout" variant="subtle">
-        <ActionList.Item>
-          <ActionList.LeadingVisual>
-            <NoteIcon />
-          </ActionList.LeadingVisual>
-          Table
-          <ActionList.Description variant="block">
-            Information-dense table optimized for operations across teams
-          </ActionList.Description>
-        </ActionList.Item>
-        <ActionList.Item role="listitem">
-          <ActionList.LeadingVisual>
-            <ProjectIcon />
-          </ActionList.LeadingVisual>
-          Board
-          <ActionList.Description variant="block">Kanban-style board focused on visual states</ActionList.Description>
-        </ActionList.Item>
-      </ActionList.Group>
-      <ActionList.Divider />
-      <ActionList.Group>
-        <ActionList.Item>
-          <ActionList.LeadingVisual>
-            <FilterIcon />
-          </ActionList.LeadingVisual>
-          Save sort and filters to current view
-        </ActionList.Item>
-        <ActionList.Item>
-          <ActionList.LeadingVisual>
-            <FilterIcon />
-          </ActionList.LeadingVisual>
-          Save sort and filters to new view
-        </ActionList.Item>
-      </ActionList.Group>
-      <ActionList.Divider />
-      <ActionList.Group>
-        <ActionList.Item>
-          <ActionList.LeadingVisual>
-            <GearIcon />
-          </ActionList.LeadingVisual>
-          View settings
-        </ActionList.Item>
-      </ActionList.Group>
+      <ActionList.Heading title="Live query" />
+      <ActionList.Item>
+        <ActionList.LeadingVisual>
+          <SearchIcon />
+        </ActionList.LeadingVisual>
+        repo:github/memex,github/github
+      </ActionList.Item>
+    </ActionList>
+    <ActionList showDividers>
+      <ActionList.Heading title="Layout" variant="subtle" />
+      <ActionList.Item>
+        <ActionList.LeadingVisual>
+          <NoteIcon />
+        </ActionList.LeadingVisual>
+        Table
+        <ActionList.Description variant="block">
+          Information-dense table optimized for operations across teams
+        </ActionList.Description>
+      </ActionList.Item>
+      <ActionList.Item role="listitem">
+        <ActionList.LeadingVisual>
+          <ProjectIcon />
+        </ActionList.LeadingVisual>
+        Board
+        <ActionList.Description variant="block">Kanban-style board focused on visual states</ActionList.Description>
+      </ActionList.Item>
+    </ActionList>
+    <ActionList showDividers>
+      <ActionList.Item>
+        <ActionList.LeadingVisual>
+          <FilterIcon />
+        </ActionList.LeadingVisual>
+        Save sort and filters to current view
+      </ActionList.Item>
+      <ActionList.Item>
+        <ActionList.LeadingVisual>
+          <FilterIcon />
+        </ActionList.LeadingVisual>
+        Save sort and filters to new view
+      </ActionList.Item>
+    </ActionList>
+    <ActionList>
+      <ActionList.Item>
+        <ActionList.LeadingVisual>
+          <GearIcon />
+        </ActionList.LeadingVisual>
+        View settings
+      </ActionList.Item>
     </ActionList>
   </ActionMenu.Overlay>
 </ActionMenu>

diff --git a/docs/content/Header.mdx b/docs/content/Header.mdx
@@ -23,7 +23,7 @@ All items directly under the Header component should be a `Header.Item` componen
     </Header.Link>
   </Header.Item>
   <Header.Item full>Menu</Header.Item>
-  <Header.Item mr={0}>
+  <Header.Item sx={{mr: 0}}>
     <Avatar src="https://github.com/octocat.png" size={20} square alt="@octocat" />
   </Header.Item>
 </Header>
@@ -37,7 +37,7 @@ All items directly under the Header component should be a `Header.Item` componen
   <Header.Item full border={1} borderStyle="solid">
     Item 2
   </Header.Item>
-  <Header.Item mr={0}>Item 3</Header.Item>
+  <Header.Item sx={{mr: 0}}>Item 3</Header.Item>
 </Header>
 ```
 

diff --git a/docs/content/StyledOcticon.mdx b/docs/content/StyledOcticon.mdx
@@ -2,11 +2,11 @@
 description: Use StyledOcticon to render an Octicon as a component.
 title: StyledOcticon
 status: Alpha
-source: https://github.com/primer/react/blob/main/src/StyledOcticon.tsx
+source: https://github.com/primer/react/blob/main/src/StyledOcticon/StyledOcticon.tsx
 componentId: styled_octicon
 ---
 
-import data from '../../src/StyledOcticon.docs.json'
+import data from '../../src/StyledOcticon/StyledOcticon.docs.json'
 
 ## Example
 

diff --git a/docs/content/Truncate.mdx b/docs/content/Truncate.mdx
@@ -4,7 +4,7 @@ title: Truncate
 status: Alpha
 ---
 
-import data from '../../src/Truncate.docs.json'
+import data from '../../src/Truncate/Truncate.docs.json'
 
 The Truncate component will shorten text with an ellipsis. Always add a `title` attribute to the truncated element so the full text remains accessible.
 

diff --git a/docs/content/drafts/UnderlineNav2.mdx b/docs/content/drafts/UnderlineNav2.mdx
@@ -145,7 +145,7 @@ function UnderlineNavItem({href, children, ...rest}) {
   const router = useRouter()
   const isCurrent = typeof href === 'string' ? router.asPath === href : router.pathname === href.pathname
   return (
-    <UnderlineNav.Item s={Link} href={href} aria-current={isCurrent ? 'page' : undefined} {...rest}>
+    <UnderlineNav.Item as={Link} href={href} aria-current={isCurrent ? 'page' : undefined} {...rest}>
       {children}
     </UnderlineNav.Item>
   )