Merge branch 'main' into keep-selected-item-visible

broccolinisoup · web-flow · commit 043dbe30f61b · 2022-10-07T10:10:42.000+10:00
diff --git a/.changeset/eleven-years-march.md b/.changeset/eleven-years-march.md
@@ -0,0 +1,5 @@
+---
+'@primer/react': patch
+---
+
+fix react 18 typing for MarkdownEditor.Label
diff --git a/src/drafts/MarkdownEditor/Label.tsx b/src/drafts/MarkdownEditor/Label.tsx
@@ -6,6 +6,7 @@ import {MarkdownEditorContext} from './_MarkdownEditorContext'
 
 type LabelProps = SxProp & {
   visuallyHidden?: boolean
+  children?: React.ReactNode
 }
 
 // ref is not forwarded because InputLabel does not (yet) support it

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@primer/react': patch
 +---
++
 +fix react 18 typing for MarkdownEditor.Label
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import {MarkdownEditorContext} from './_MarkdownEditorContext'`
`6`	`6`
`7`	`7`	`type LabelProps = SxProp & {`
`8`	`8`	`visuallyHidden?: boolean`
	`9`	`+ children?: React.ReactNode`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`// ref is not forwarded because InputLabel does not (yet) support it`