Skip to content

Commit b828d90

Browse files
authored
Merge branch 'main' into /issues/1021/reeact-select-panel
2 parents 54db5ef + 7b8bc81 commit b828d90

File tree

12 files changed

+67
-78
lines changed

12 files changed

+67
-78
lines changed

.changeset/shiny-hairs-wait.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+
Support React.ReactNode as child type in ActionMenu.Overlay

docs/content/ActionMenu.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ render(
342342
### ActionMenu.Overlay
343343

344344
<PropsTable>
345-
<PropsTableRow name="children" required type="React.ReactElement | React.ReactElement[]" />
345+
<PropsTableRow name="children" required type="React.ReactNode" />
346346
<PropsTableRow name="align" type="start | center | end" defaultValue="start" />
347347
<PropsTablePassthroughPropsRow
348348
elementName="Overlay"

docs/content/Autocomplete.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Autocomplete
44
status: Alpha
55
description: Used to render a text input that allows a user to quickly filter through a list of options to pick one or more values.
66
source: https://github.com/primer/react/tree/main/src/Autocomplete
7-
storybook: '/react/storybook?path=/story/form-controls-autocomplete--default'
7+
storybook: '/react/storybook?path=/story/forms-form-controls-autocomplete'
88
---
99

1010
import {Autocomplete} from '@primer/react'

docs/content/Checkbox.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Checkbox
33
description: Use checkboxes to toggle between checked and unchecked states in a list or as a standalone form field
44
status: Alpha
55
source: https://github.com/primer/react/blob/main/src/Checkbox.tsx
6-
storybook: '/react/storybook?path=/story/form-controls-checkbox--default'
6+
storybook: '/react/storybook?path=/story/forms-form-controls-checkbox'
77
componentId: checkbox
88
---
99

docs/content/CheckboxGroup.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ componentId: checkbox_group
44
description: Renders a set of checkboxes to let users make one or more selections from a short list of options
55
status: Alpha
66
source: https://github.com/primer/react/blob/main/src/CheckboxGroup/CheckboxGroup.tsx
7-
storybook: '/react/storybook/?path=/story/forms-checkboxgroup-examples--basic'
7+
storybook: '/react/storybook/?path=/story/forms-checkboxgroup-examples'
88
---
99

1010
import {CheckboxGroup, Checkbox, Box} from '@primer/components'

docs/content/FilteredSearch.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ title: FilteredSearch
44
status: Alpha
55
---
66

7-
The FilteredSearch component helps style a Dropdown and a TextInput side-by-side.
7+
The FilteredSearch component helps style an ActionMenu and a TextInput side-by-side.
88

9-
**Note:** You _must_ use a `TextInput` and `Dropdown` (or native `<details>` and `<summary>`) in order for this component to work properly.
9+
**Note:** You _must_ use a `TextInput` and `ActionMenu` (or native `<details>` and `<summary>`) in order for this component to work properly.
1010

1111
## Default example
1212

@@ -30,7 +30,7 @@ The FilteredSearch component helps style a Dropdown and a TextInput side-by-side
3030

3131
#### FilteredSearch.Children
3232

33-
| Name | Type | Default | Description |
34-
| :------- | :---------------- | :-----: | :------------------------------------------------------------------------------------------------------- |
35-
| children | | | FilteredSearch is expected to contain a [`Dropdown`](/Dropdown) followed by a [`TextInput`](/TextInput). |
36-
| sx | SystemStyleObject | {} | Style to be applied to the component |
33+
| Name | Type | Default | Description |
34+
| :------- | :---------------- | :-----: | :------------------------------------------------------------------------------------------------------------ |
35+
| children | | | FilteredSearch is expected to contain an [`ActionMenu`](/ActionMenu) followed by a [`TextInput`](/TextInput). |
36+
| sx | SystemStyleObject | {} | Style to be applied to the component |

docs/content/IconButton.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: IconButton
33
componentId: icon_button
44
status: Alpha
55
source: https://github.com/primer/react/tree/main/src/Button
6-
storybook: '/react/storybook?path=/story/composite-components-button'
6+
storybook: '/react/storybook?path=/story/composite-components-button--icon-button'
77
description: An accessible button component with no text and only icon.
88
---
99

docs/content/Label.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Label
33
componentId: label
44
status: Alpha
55
source: https://github.com/primer/react/tree/main/src/Label
6-
storybook: '/react/storybook?path=story/labels-label--label'
6+
storybook: '/react/storybook?path=/story/labels-label--label'
77
description: Use Label components to add contextual metadata to a design.
88
---
99

docs/content/PageLayout.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {PageLayout} from '@primer/react'
1515

1616
<Note>
1717

18-
See [storybook](https://primer.style/react/storybook?path=/story/layout-pagelayout--playground) for fullscreen examples.
18+
See [storybook](https://primer.style/react/storybook?path=/story/layout-pagelayout) for fullscreen examples.
1919

2020
</Note>
2121

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@
161161
url: /drafts/MarkdownEditor
162162
- title: MarkdownViewer
163163
url: /drafts/MarkdownViewer
164+
- title: UnderlineNav v2
165+
url: /drafts/UnderlineNav2
164166
- title: Deprecated
165167
children:
166168
- title: ActionList (legacy)

0 commit comments

Comments
 (0)