Skip to content

Commit 248d844

Browse files
Merge branch 'main' into kendallg/progress-bar
2 parents b3b2235 + 88ffc0d commit 248d844

File tree

139 files changed

+2796
-647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+2796
-647
lines changed

.changeset/afraid-pianos-invent.md

+5

.changeset/blue-actors-rule.md

+5

.changeset/cyan-gorillas-carry.md

+5

.changeset/dirty-moles-own.md

+5

.changeset/eighty-carpets-rush.md

-5
This file was deleted.

.changeset/few-rockets-retire.md

+5

.changeset/flat-candles-burn.md

+5

.changeset/gentle-stingrays-search.md

+5

.changeset/giant-bees-impress.md

+5

.changeset/large-socks-clean.md

+5

.changeset/late-humans-guess.md

+5

.changeset/lazy-jars-leave.md

+5

.changeset/lemon-files-complain.md

-5
This file was deleted.

.changeset/lucky-snakes-jump.md

+5

.changeset/mean-plants-cover.md

-5
This file was deleted.

.changeset/pink-bats-grow.md

+5

.changeset/selfish-taxis-notice.md

+5

.changeset/short-fireants-jog.md

+5

.changeset/shy-carpets-relax.md

+6

.changeset/slow-nails-reflect.md

+5

.changeset/swift-baboons-compare.md

+5

.changeset/tasty-experts-fix.md

+5

.changeset/tough-tigers-vanish.md

+5

.changeset/tricky-avocados-live.md

+5

.changeset/tricky-ducks-pretend.md

+5

.changeset/two-apples-juggle.md

-5
This file was deleted.

.changeset/two-jokes-compete.md

-5
This file was deleted.

.changeset/wicked-zoos-bake.md

+5

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module.exports = {
1717
'plugin:primer-react/recommended',
1818
'plugin:import/typescript',
1919
'plugin:ssr-friendly/recommended',
20+
'plugin:clsx/recommended',
2021
],
2122
settings: {
2223
react: {

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,9 @@ jobs:
414414
- name: Build components.json
415415
run: npx tsx script/components-json/build.ts --storybook-data 'storybook-static/index.json'
416416
working-directory: packages/react
417+
- name: Build hooks.json
418+
run: npx tsx script/hooks-json/build.ts
419+
working-directory: packages/react
417420

418421
sizes:
419422
runs-on: ubuntu-latest

e2e/components/IconButton.test.ts

+34
Original file line numberDiff line numberDiff line change
@@ -371,4 +371,38 @@ test.describe('IconButton', () => {
371371
})
372372
}
373373
})
374+
375+
test.describe('Flex', () => {
376+
for (const theme of themes) {
377+
test.describe(theme, () => {
378+
test('default @vrt', async ({page}) => {
379+
await visit(page, {
380+
id: 'components-iconbutton-devonly--icon-button-within-flex-container',
381+
globals: {
382+
colorScheme: theme,
383+
},
384+
})
385+
386+
// Default state
387+
expect(await page.screenshot()).toMatchSnapshot(`IconButton.Flex.${theme}.png`)
388+
})
389+
390+
test('axe @aat', async ({page}) => {
391+
await visit(page, {
392+
id: 'components-iconbutton-devonly--icon-button-within-flex-container',
393+
globals: {
394+
colorScheme: theme,
395+
},
396+
})
397+
await expect(page).toHaveNoViolations({
398+
rules: {
399+
'color-contrast': {
400+
enabled: theme !== 'dark_dimmed',
401+
},
402+
},
403+
})
404+
})
405+
})
406+
}
407+
})
374408
})

e2e/components/drafts/ActionBar.test.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@ test.describe('ActionBar', () => {
4141
},
4242
})
4343
const toolbarButtonSelector = `button[data-component="IconButton"]`
44-
await expect(page.locator(toolbarButtonSelector)).toHaveCount(10)
44+
await expect(page.locator(toolbarButtonSelector)).toHaveCount(9)
4545
await page.setViewportSize({width: viewports['primer.breakpoint.xs'], height: 768})
46-
await expect(page.locator(toolbarButtonSelector)).toHaveCount(6)
46+
await page.getByLabel('Insert Link').waitFor({
47+
state: 'hidden',
48+
})
49+
await expect(page.locator(toolbarButtonSelector)).toHaveCount(5)
4750
const moreButtonSelector = page.getByLabel('More Comment box toolbar items')
4851
await moreButtonSelector.click()
49-
await expect(page.locator('ul[role="menu"]>li')).toHaveCount(5)
52+
await expect(page.locator('ul[role="menu"] [role="menuitem"]')).toHaveCount(6)
5053
})
5154
})
5255
}

examples/app-router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"type-check": "tsc --noEmit"
1111
},
1212
"dependencies": {
13-
"@primer/react": "37.9.1",
13+
"@primer/react": "37.10.0",
1414
"next": "^14.2.15",
1515
"react": "^18.3.1",
1616
"react-dom": "^18.3.1",

examples/codesandbox/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"@typescript-eslint/eslint-plugin": "^7.11.0",
2121
"@typescript-eslint/parser": "^7.3.1",
2222
"@vitejs/plugin-react": "^4.3.3",
23-
"@primer/react": "37.9.1",
23+
"@primer/react": "37.10.0",
2424
"eslint": "^8.56.0",
2525
"eslint-plugin-react-hooks": "^4.6.0",
2626
"eslint-plugin-react-refresh": "^0.4.7",
2727
"styled-components": "5.x",
2828
"typescript": "^5.7.2",
29-
"vite": "^5.2.14"
29+
"vite": "^5.4.12"
3030
}
3131
}

examples/theming/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@primer/octicons-react": "^19.14.0",
14-
"@primer/react": "37.9.1",
14+
"@primer/react": "37.10.0",
1515
"clsx": "^1.2.1",
1616
"next": "^14.2.15",
1717
"react": "^18.3.1",

0 commit comments

Comments
 (0)