Skip to content

Commit d4d98cf

Browse files
authored
Merge branch 'main' into fix-textinput-types
2 parents 2678bbc + 3f50ef5 commit d4d98cf

39 files changed

+521
-500
lines changed

.changeset/seven-hornets-jam.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': minor
3+
---
4+
5+
Adds button element selector to FilteredSearch button styles

.changeset/stupid-terms-hang.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": minor
3+
---
4+
5+
Bump primer/primitives to `7.5.1`

.changeset/yellow-planes-decide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
Add disabled color and backgroundColor to Button.Counter

docs/content/CheckboxGroup.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: CheckboxGroup
3+
componentId: checkbox_group
34
description: Renders a set of checkboxes to let users make one or more selections from a short list of options
45
status: Alpha
56
source: https://github.com/primer/react/blob/main/src/CheckboxGroup/CheckboxGroup.tsx

docs/content/Dialog2.mdx renamed to docs/content/Dialog.mdx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Dialog v2
2+
title: Dialog
3+
componentId: dialog
34
status: Alpha
45
---
56

@@ -53,7 +54,7 @@ By default, the Dialog component implements the design and interactions defined
5354
<>
5455
<Button onClick={openDialog}>Open</Button>
5556
{isOpen && (
56-
<Dialog2
57+
<Dialog
5758
title="Dialog example"
5859
subtitle={
5960
<>
@@ -64,7 +65,7 @@ By default, the Dialog component implements the design and interactions defined
6465
onClose={closeDialog}
6566
>
6667
<Text fontFamily="sans-serif">Some content</Text>
67-
</Dialog2>
68+
</Dialog>
6869
)}
6970
</>
7071
)

docs/content/FilteredSearch.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ The FilteredSearch component helps style a Dropdown and a TextInput side-by-side
1212

1313
```jsx live
1414
<FilteredSearch>
15-
<Dropdown>
16-
<Dropdown.Button>Filter</Dropdown.Button>
17-
<Dropdown.Menu direction="sw">
18-
<Dropdown.Item>Item 1</Dropdown.Item>
19-
<Dropdown.Item>Item 2</Dropdown.Item>
20-
<Dropdown.Item>Item 3</Dropdown.Item>
21-
</Dropdown.Menu>
22-
</Dropdown>
15+
<ActionMenu>
16+
<ActionMenu.Button as="summary">Filter</ActionMenu.Button>
17+
<ActionMenu.Overlay>
18+
<ActionList direction="sw">
19+
<ActionList.Item>Item 1</ActionList.Item>
20+
<ActionList.Item>Item 2</ActionList.Item>
21+
<ActionList.Item>Item 3</ActionList.Item>
22+
</ActionList>
23+
</ActionMenu.Overlay>
24+
</ActionMenu>
2325
<TextInput icon={SearchIcon} />
2426
</FilteredSearch>
2527
```

docs/content/IconButton.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: IconButton
3+
componentId: icon_button
34
status: Alpha
45
source: https://github.com/primer/react/tree/main/src/Button2
56
storybook: '/react/storybook?path=/story/composite-components-button2'

docs/content/LinkButton.mdx

Lines changed: 0 additions & 107 deletions
This file was deleted.

docs/content/PageLayout.mdx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
title: PageLayout
3+
componentId: page_layout
34
status: Alpha
45
# description: TODO
56
source: https://github.com/primer/react/tree/main/src/PageLayout

docs/content/Popover.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import {Popover} from '@primer/react'
1414

1515
```jxs live
1616
<Box position="relative">
17-
<Text textAlign="center" display="block">
18-
<ButtonPrimary>Hello!</ButtonPrimary>
19-
</Text>
17+
<Box justifyContent="center" display="flex">
18+
<Button variant="primary">Hello!</Button>
19+
</Box>
2020
2121
<Popover relative open={true} caret="top">
2222
<Popover.Content sx={{mt: 2}}>

0 commit comments

Comments
 (0)