Skip to content

Commit aa55f25

Browse files
authored
Merge branch 'next-major' into mp/deprecate-old-filter-components
2 parents 9de8956 + 98ea43f commit aa55f25

File tree

133 files changed

+235
-2019
lines changed

Some content is hidden

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

133 files changed

+235
-2019
lines changed

.changeset/flat-onions-sort.md

Lines changed: 7 additions & 0 deletions

.changeset/great-spies-deliver.md

Lines changed: 5 additions & 0 deletions

.changeset/nasty-bottles-draw.md

Lines changed: 5 additions & 0 deletions

.changeset/popular-rivers-warn.md

Lines changed: 5 additions & 0 deletions

.changeset/weak-jokes-chew.md

Lines changed: 5 additions & 0 deletions

.github/workflows/ci.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ jobs:
5454
run: npm run lint:md
5555

5656
test:
57-
strategy:
58-
fail-fast: false
59-
matrix:
60-
react: [17, 18]
6157
runs-on: ubuntu-latest
6258
steps:
6359
- name: Checkout repository
@@ -69,30 +65,16 @@ jobs:
6965
node-version: 18
7066
cache: 'npm'
7167

72-
- name: Set React version
73-
run: node script/set-react-version.js ${{ matrix.react }}
74-
75-
- name: Install dependencies
76-
if: ${{ matrix.react == 17 }}
77-
run: npm install --legacy-peer-deps
78-
7968
- name: Install dependencies
80-
if: ${{ matrix.react == 18 }}
8169
run: npm ci
8270

8371
- name: Build
8472
run: npm run build
8573

8674
- name: Test
8775
run: npm run test -- --coverage
88-
env:
89-
REACT_VERSION_17: ${{ matrix.react == 17 }}
9076

9177
type-check:
92-
strategy:
93-
fail-fast: false
94-
matrix:
95-
react: [17, 18]
9678
runs-on: ubuntu-latest
9779
steps:
9880
- name: Checkout repository
@@ -104,15 +86,7 @@ jobs:
10486
node-version: 18
10587
cache: 'npm'
10688

107-
- name: Set React version
108-
run: node script/set-react-version.js ${{ matrix.react }}
109-
110-
- name: Install dependencies
111-
if: ${{ matrix.react == 17 }}
112-
run: npm install --legacy-peer-deps
113-
11489
- name: Install dependencies
115-
if: ${{ matrix.react != 17 }}
11690
run: npm ci
11791

11892
- name: Type check

docs/content/ActionMenu.mdx

Lines changed: 1 addition & 1 deletion

docs/content/Breadcrumbs.mdx

Lines changed: 0 additions & 5 deletions

docs/content/Button.mdx

Lines changed: 6 additions & 19 deletions

docs/content/SelectPanel.mdx

Lines changed: 12 additions & 14 deletions

docs/content/SubNav.mdx

Lines changed: 0 additions & 7 deletions

docs/content/TabNav.mdx

Lines changed: 0 additions & 5 deletions

docs/content/UnderlineNav.mdx

Lines changed: 0 additions & 5 deletions

docs/content/drafts/PageHeader.mdx

Lines changed: 4 additions & 4 deletions

e2e/components/Button.test.ts

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -275,40 +275,6 @@ test.describe('Button', () => {
275275
}
276276
})
277277

278-
test.describe('Outline', () => {
279-
for (const theme of themes) {
280-
test.describe(theme, () => {
281-
test('default @vrt', async ({page}) => {
282-
await visit(page, {
283-
id: 'components-button-features--outline',
284-
globals: {
285-
colorScheme: theme,
286-
},
287-
})
288-
289-
// Default state
290-
expect(await page.screenshot()).toMatchSnapshot(`Button.Outline.${theme}.png`)
291-
})
292-
293-
test('axe @aat', async ({page}) => {
294-
await visit(page, {
295-
id: 'components-button-features--outline',
296-
globals: {
297-
colorScheme: theme,
298-
},
299-
})
300-
await expect(page).toHaveNoViolations({
301-
rules: {
302-
'color-contrast': {
303-
enabled: theme !== 'dark_dimmed',
304-
},
305-
},
306-
})
307-
})
308-
})
309-
}
310-
})
311-
312278
test.describe('Primary', () => {
313279
for (const theme of themes) {
314280
test.describe(theme, () => {

e2e/components/LinkButton.test.ts

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -241,40 +241,6 @@ test.describe('LinkButton', () => {
241241
}
242242
})
243243

244-
test.describe('Outline', () => {
245-
for (const theme of themes) {
246-
test.describe(theme, () => {
247-
test('default @vrt', async ({page}) => {
248-
await visit(page, {
249-
id: 'components-linkbutton-features--outline',
250-
globals: {
251-
colorScheme: theme,
252-
},
253-
})
254-
255-
// Default state
256-
expect(await page.screenshot()).toMatchSnapshot(`LinkButton.Outline.${theme}.png`)
257-
})
258-
259-
test('axe @aat', async ({page}) => {
260-
await visit(page, {
261-
id: 'components-linkbutton-features--outline',
262-
globals: {
263-
colorScheme: theme,
264-
},
265-
})
266-
await expect(page).toHaveNoViolations({
267-
rules: {
268-
'color-contrast': {
269-
enabled: theme !== 'dark_dimmed',
270-
},
271-
},
272-
})
273-
})
274-
})
275-
}
276-
})
277-
278244
test.describe('Primary', () => {
279245
for (const theme of themes) {
280246
test.describe(theme, () => {

generated/components.json

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -884,6 +884,12 @@
884884
"type": "React.ReactNode",
885885
"description": "The content of the button."
886886
},
887+
{
888+
"name": "count",
889+
"required": true,
890+
"type": "number | string",
891+
"description": "For counter buttons, the number to display."
892+
},
887893
{
888894
"name": "variant",
889895
"type": "| 'default'\n| 'primary'\n| 'danger'\n| 'outline'\n| 'invisible'",
@@ -922,24 +928,7 @@
922928
"passthrough": {
923929
"element": "button",
924930
"url": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attributes"
925-
},
926-
"subcomponents": [
927-
{
928-
"name": "Button.Counter",
929-
"props": [
930-
{
931-
"name": "children",
932-
"required": true,
933-
"type": "number",
934-
"description": "The counter value."
935-
},
936-
{
937-
"name": "sx",
938-
"type": "SystemStyleObject"
939-
}
940-
]
941-
}
942-
]
931+
}
943932
},
944933
"icon_button": {
945934
"id": "icon_button",

0 commit comments

Comments
 (0)