Merge branch 'main' into bs/experimental-tooltip-with-popover

primer · Aug 11, 2023 · 8b6da3e · 8b6da3e
2 parents c64323f + f487a8d
commit 8b6da3e
Show file tree

Hide file tree

Showing 11 changed files with 813 additions and 240 deletions.
diff --git a/.changeset/clever-parents-bathe.md b/.changeset/clever-parents-bathe.md
@@ -0,0 +1,7 @@
+---
+'@primer/react': patch
+---
+
+Update @react-aria/ssr dependency to ^3.5.0 to address server-side rendering mismatch when using React StrictMode
+
+<!-- Changed components: FormControl -->
diff --git a/.changeset/thin-laws-beam.md b/.changeset/thin-laws-beam.md
@@ -0,0 +1,7 @@
+---
+"@primer/react": patch
+---
+
+Expose `useSlots` from `drafts/hooks`
+
+<!-- Changed components: _none_ -->
diff --git a/docs/content/getting-started.md b/docs/content/getting-started.md
@@ -88,7 +88,9 @@ import {BaseStyles, Box, Heading} from '@primer/react'
 export default () => (
   <BaseStyles>
     <Box m={4}>
-      <Heading sx={{mb: 2}}>Hello, world!</Heading>
+      <Heading as="h2" sx={{mb: 2}}>
+        Hello, world!
+      </Heading>
       <p>This will get Primer text styles.</p>
     </Box>
   </BaseStyles>

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "npm": ">=7"
   },
   "dependencies": {
-    "@primer/gatsby-theme-doctocat": "^4.6.1",
+    "@primer/gatsby-theme-doctocat": "^4.6.3",
     "@primer/octicons-react": "^17.7.0",
     "@primer/primitives": "4.1.0",
     "@styled-system/prop-types": "^5.1.0",

diff --git a/docs/src/@primer/gatsby-theme-doctocat/components/hero.js b/docs/src/@primer/gatsby-theme-doctocat/components/hero.js
@@ -9,7 +9,9 @@ export default function Hero() {
     <ThemeProvider colorMode="night" nightScheme="dark_dimmed">
       <Box bg="canvas.default" py={6}>
         <Container>
-          <Heading sx={{color: 'accent.fg', fontSize: 7, lineHeight: 'condensed', pb: 3, m: 0}}>Primer React</Heading>
+          <Heading as="h2" sx={{color: 'accent.fg', fontSize: 7, lineHeight: 'condensed', pb: 3, m: 0}}>
+            Primer React
+          </Heading>
           <Text as="p" fontFamily="mono" mt={0} mb={2} color="fg.default" fontSize={2}>
             v{version}
           </Text>