Skip to content

Commit 2fcd653

Browse files
authored
Merge branch 'main' into mp/rm-dialog-btm-border
2 parents 41b4421 + 8e7bc0e commit 2fcd653

21 files changed

+388
-215
lines changed

.changeset/beige-bags-look.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': minor
3+
---
4+
5+
Remove the CSS modules feature flag from the ActionList.Heading component

.changeset/funny-toys-agree.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": minor
3+
---
4+
5+
chore(SelectPanel): remove css modules feature flag

.changeset/olive-kangaroos-wonder.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
fix(SelectPanel): differentiate onCancel gesture from escape

.changeset/tasty-games-trade.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
fix(SelectPanel): disable body scroll on full screen

.changeset/ten-eggs-arrive.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': patch
3+
---
4+
5+
SelectPanelV2: Add `deprecated` status to SelectPanelV2 docs and stories

.github/workflows/lock-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Get App Token
23-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547
23+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5
2424
id: app-token
2525
with:
2626
app-id: ${{ vars.PRIMER_APP_ID_SHARED }}
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-latest
5454
steps:
5555
- name: Get App Token
56-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547
56+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5
5757
id: app-token
5858
with:
5959
app-id: ${{ vars.PRIMER_APP_ID_SHARED }}

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install dependencies
2929
run: npm ci
3030

31-
- uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547
31+
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5
3232
id: app-token
3333
with:
3434
app-id: ${{ vars.PRIMER_APP_ID_SHARED }}

.github/workflows/update-snapshots.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262
steps:
6363
- name: Generate token
6464
id: generate_token
65-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547
65+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5
6666
with:
67-
app_id: ${{ secrets.APP_ID }}
68-
private_key: ${{ secrets.PRIVATE_KEY }}
67+
app-id: ${{ secrets.APP_ID }}
68+
private-key: ${{ secrets.PRIVATE_KEY }}
6969
# Warning: we are checking out an untrusted source at this point in order
7070
# to push to the head pull request. Code from this checkout must not be
7171
# used in any of the following steps.

e2e/components/drafts/SelectPanel.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ const stories: Array<{
1010
}> = [
1111
{
1212
title: 'Default',
13-
id: 'experimental-components-selectpanel--default',
13+
id: 'deprecated-components-selectpanel--default',
1414
},
1515
{
16-
id: 'experimental-components-selectpanel-features--as-modal',
16+
id: 'deprecated-components-selectpanel-features--as-modal',
1717
title: 'As Modal',
1818
},
1919
{
20-
id: 'experimental-components-selectpanel-features--external-anchor',
20+
id: 'deprecated-components-selectpanel-features--external-anchor',
2121
title: 'External Anchor',
2222
},
2323
{
24-
id: 'experimental-components-selectpanel-features--instant-selection-variant',
24+
id: 'deprecated-components-selectpanel-features--instant-selection-variant',
2525
title: 'Instant Selection Variant',
2626
buttonText: 'Choose a tag',
2727
},
2828
{
29-
id: 'experimental-components-selectpanel-features--with-warning',
29+
id: 'deprecated-components-selectpanel-features--with-warning',
3030
title: 'With Warning',
3131
buttonText: 'Assignees',
3232
},
3333
{
34-
id: 'experimental-components-selectpanel-features--with-errors',
34+
id: 'deprecated-components-selectpanel-features--with-errors',
3535
title: 'With Errors',
3636
buttonText: 'Assignees',
3737
},

package-lock.json

+73-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react/src/ActionList/Heading.test.tsx

+8-24
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from 'react'
33
import theme from '../theme'
44
import {ActionList} from '.'
55
import {BaseStyles, ThemeProvider, ActionMenu} from '..'
6-
import {FeatureFlags} from '../FeatureFlags'
76
import {behavesAsComponent} from '../utils/testing'
87

98
describe('ActionList.Heading', () => {
@@ -62,28 +61,13 @@ describe('ActionList.Heading', () => {
6261
})
6362

6463
it('should support a custom `className` on the outermost element', () => {
65-
const Element = () => {
66-
return (
67-
<ActionList>
68-
<ActionList.Heading as="h2" className="test-class-name">
69-
Filter by
70-
</ActionList.Heading>
71-
</ActionList>
72-
)
73-
}
74-
const FeatureFlagElement = () => {
75-
return (
76-
<FeatureFlags
77-
flags={{
78-
primer_react_css_modules_staff: true,
79-
primer_react_css_modules_ga: true,
80-
}}
81-
>
82-
<Element />
83-
</FeatureFlags>
84-
)
85-
}
86-
expect(HTMLRender(<FeatureFlagElement />).container.querySelector('h2')).toHaveClass('test-class-name')
87-
expect(HTMLRender(<Element />).container.querySelector('h2')).toHaveClass('test-class-name')
64+
const actionList = HTMLRender(
65+
<ActionList>
66+
<ActionList.Heading as="h2" className="test-class-name">
67+
Filter by
68+
</ActionList.Heading>
69+
</ActionList>,
70+
)
71+
expect(actionList.container.querySelector('h2')).toHaveClass('test-class-name')
8872
})
8973
})

0 commit comments

Comments
 (0)