Merge branch 'main' into francinelucca/select-panel-overflow

.changeset/afraid-pianos-invent.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+bug: ensure Announce components work without pre-existing text node

.changeset/gentle-stingrays-search.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": minor
+---
+
+Update FormControl to use CSS Modules behind feature flag

.changeset/giant-bees-impress.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Fix an issue in useAnnouncements.tsx causing a TypeError in production. The activeItem variable may be null.

.changeset/lazy-jars-leave.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Avoid accessing properties of potentially null document.body in PageLayout

.changeset/selfish-taxis-notice.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Promote ActionList to staff

.changeset/short-fireants-jog.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Add `flex-shrink` to IconButton

.changeset/shy-carpets-relax.md

@@ -0,0 +1,6 @@
+---
+"@primer/react": minor
+---
+
+- Convert ActionBar to CSS Modules
+- Add new padding prop for container padding

.changeset/slow-nails-reflect.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Update specificity for ButtonBase to be at least 0,1,0

.changeset/swift-baboons-compare.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Hide NavList sub items if collapsed

.github/workflows/ci.yml

@@ -414,6 +414,9 @@ jobs:
       - name: Build components.json
         run: npx tsx script/components-json/build.ts --storybook-data 'storybook-static/index.json'
         working-directory: packages/react
+      - name: Build hooks.json
+        run: npx tsx script/hooks-json/build.ts
+        working-directory: packages/react
 
   sizes:
     runs-on: ubuntu-latest

e2e/components/IconButton.test.ts

@@ -371,4 +371,38 @@ test.describe('IconButton', () => {
       })
     }
   })
+
+  test.describe('Flex', () => {
+    for (const theme of themes) {
+      test.describe(theme, () => {
+        test('default @vrt', async ({page}) => {
+          await visit(page, {
+            id: 'components-iconbutton-devonly--icon-button-within-flex-container',
+            globals: {
+              colorScheme: theme,
+            },
+          })
+
+          // Default state
+          expect(await page.screenshot()).toMatchSnapshot(`IconButton.Flex.${theme}.png`)
+        })
+
+        test('axe @aat', async ({page}) => {
+          await visit(page, {
+            id: 'components-iconbutton-devonly--icon-button-within-flex-container',
+            globals: {
+              colorScheme: theme,
+            },
+          })
+          await expect(page).toHaveNoViolations({
+            rules: {
+              'color-contrast': {
+                enabled: theme !== 'dark_dimmed',
+              },
+            },
+          })
+        })
+      })
+    }
+  })
 })

e2e/components/drafts/ActionBar.test.ts

@@ -41,12 +41,15 @@ test.describe('ActionBar', () => {
             },
           })
           const toolbarButtonSelector = `button[data-component="IconButton"]`
-          await expect(page.locator(toolbarButtonSelector)).toHaveCount(10)
+          await expect(page.locator(toolbarButtonSelector)).toHaveCount(9)
           await page.setViewportSize({width: viewports['primer.breakpoint.xs'], height: 768})
-          await expect(page.locator(toolbarButtonSelector)).toHaveCount(6)
+          await page.getByLabel('Insert Link').waitFor({
+            state: 'hidden',
+          })
+          await expect(page.locator(toolbarButtonSelector)).toHaveCount(5)
           const moreButtonSelector = page.getByLabel('More Comment box toolbar items')
           await moreButtonSelector.click()
-          await expect(page.locator('ul[role="menu"]>li')).toHaveCount(5)
+          await expect(page.locator('ul[role="menu"] [role="menuitem"]')).toHaveCount(6)
         })
       })
     }

examples/app-router/package.json

@@ -10,7 +10,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@primer/react": "37.9.1",
+    "@primer/react": "37.10.0",
     "next": "^14.2.15",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

examples/codesandbox/package.json

@@ -20,12 +20,12 @@
     "@typescript-eslint/eslint-plugin": "^7.11.0",
     "@typescript-eslint/parser": "^7.3.1",
     "@vitejs/plugin-react": "^4.3.3",
-    "@primer/react": "37.9.1",
+    "@primer/react": "37.10.0",
     "eslint": "^8.56.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.7",
     "styled-components": "5.x",
     "typescript": "^5.7.2",
-    "vite": "^5.2.14"
+    "vite": "^5.4.12"
   }
 }

examples/theming/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@primer/octicons-react": "^19.14.0",
-    "@primer/react": "37.9.1",
+    "@primer/react": "37.10.0",
     "clsx": "^1.2.1",
     "next": "^14.2.15",
     "react": "^18.3.1",