Merge branch 'main' into lukasoppermann-fix-buttonGroup-props

.changeset/giant-bobcats-deliver.md

@@ -0,0 +1,7 @@
+---
+'@primer/react': patch
+---
+
+Update ActionList to place `id` on item with an ARIA role
+
+<!-- Changed components: ActionList -->

.changeset/purple-panthers-accept.md

@@ -0,0 +1,7 @@
+---
+'@primer/react': patch
+---
+
+Button: Allow leadingIcon, trailingIcon, trailingAction to be overridable with sx
+
+<!-- Changed components: Button -->

.github/workflows/check_for_changeset.yml

@@ -0,0 +1,25 @@
+name: Check for changeset
+
+on:
+  pull_request:
+    types:
+      # On by default if you specify no types.
+      - 'opened'
+      - 'reopened'
+      - 'synchronize'
+      # For `skip-label` only.
+      - 'labeled'
+      - 'unlabeled'
+
+jobs:
+  check-for-changeset:
+    name: Check for changeset
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: 'Check for changeset'
+        uses: brettcannon/check-for-changed-files@v1
+        with:
+          file-pattern: '.changeset/*.md'
+          skip-label: 'skip changeset'
+          failure-message: 'No changeset found. If these changes should not result in a new version, apply the ${skip-label} label to this pull request. If these changes should result in a version bump, please add a changeset https://git.io/J6QvQ'

.github/workflows/ci.yml

@@ -54,10 +54,6 @@ jobs:
         run: npm run lint:md
 
   test:
-    strategy:
-      fail-fast: false
-      matrix:
-        react: [17, 18]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -69,30 +65,16 @@ jobs:
           node-version: 18
           cache: 'npm'
 
-      - name: Set React version
-        run: node script/set-react-version.js ${{ matrix.react }}
-
       - name: Install dependencies
-        if: ${{ matrix.react == 17 }}
-        run: npm install --legacy-peer-deps
-
-      - name: Install dependencies
-        if: ${{ matrix.react == 18 }}
         run: npm ci
 
       - name: Build
         run: npm run build
 
       - name: Test
         run: npm run test -- --coverage
-        env:
-          REACT_VERSION_17: ${{ matrix.react == 17 }}
 
   type-check:
-    strategy:
-      fail-fast: false
-      matrix:
-        react: [17, 18]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -104,15 +86,7 @@ jobs:
           node-version: 18
           cache: 'npm'
 
-      - name: Set React version
-        run: node script/set-react-version.js ${{ matrix.react }}
-
-      - name: Install dependencies
-        if: ${{ matrix.react == 17 }}
-        run: npm install --legacy-peer-deps
-
       - name: Install dependencies
-        if: ${{ matrix.react != 17 }}
         run: npm ci
 
       - name: Type check

docs/content/drafts/Tooltip.mdx

@@ -1,7 +1,8 @@
 ---
-componentId: tooltip
-title: Tooltip
-status: Alpha
+componentId: tooltip_v2
+title: Tooltip v2
+status: Draft
+source: https://github.com/primer/react/blob/main/src/drafts/Tooltip.tsx
 ---
 
 import data from '../../../src/drafts/Tooltip/Tooltip.docs.json'

docs/src/@primer/gatsby-theme-doctocat/nav.yml

@@ -160,6 +160,8 @@
   children:
     - title: Dialog v2
       url: /drafts/Dialog
+    - title: Hidden
+      url: /drafts/Hidden
     - title: InlineAutocomplete
       url: /drafts/InlineAutocomplete
     - title: MarkdownEditor
@@ -170,8 +172,8 @@
       url: /drafts/UnderlineNav2
     - title: PageHeader
       url: /drafts/PageHeader
-    - title: Hidden
-      url: /drafts/Hidden
+    - title: Tooltip v2
+      url: /drafts/Tooltip
 - title: Deprecated
   children:
     - title: ActionList (legacy)

jest.config.js

@@ -3,16 +3,11 @@
 'use strict'
 
 const path = require('node:path')
-const {REACT_VERSION_17} = process.env
 
 /**
  * @type {import('jest').Config}
  */
 module.exports = {
-  globals: {
-    REACT_VERSION_LATEST: REACT_VERSION_17 ? REACT_VERSION_17 !== 'true' : true,
-    REACT_VERSION_17: REACT_VERSION_17 === 'true',
-  },
   testEnvironment: 'jsdom',
   cacheDirectory: '.test',
   collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!src/stories/**', '!**/*.stories.{js,jsx,ts,tsx}'],