Skip to content

Commit dd5ee52

Browse files
authored
Add @react-aria/ssr to fix SSR warnings (#23007)
1 parent 580c38b commit dd5ee52

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@primer/css": "^18.2.0",
1717
"@primer/octicons": "^16.1.1",
1818
"@primer/octicons-react": "^16.1.1",
19+
"@react-aria/ssr": "^3.1.0",
1920
"accept-language-parser": "^1.5.0",
2021
"ajv": "^8.7.1",
2122
"ajv-formats": "^2.1.1",

pages/_app.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import App from 'next/app'
33
import type { AppProps, AppContext } from 'next/app'
44
import Head from 'next/head'
55
import { useTheme, ThemeProvider } from '@primer/components'
6+
import { SSRProvider } from '@react-aria/ssr'
67
import { defaultComponentThemeProps, getThemeProps } from 'components/lib/getThemeProps'
78

89
import '../stylesheets/index.scss'
@@ -43,12 +44,14 @@ const MyApp = ({ Component, pageProps, csrfToken, themeProps, languagesContext }
4344

4445
<meta name="csrf-token" content={csrfToken} />
4546
</Head>
46-
<ThemeProvider dayScheme={themeProps.dayTheme} nightScheme={themeProps.nightTheme}>
47-
<LanguagesContext.Provider value={languagesContext}>
48-
<SetTheme themeProps={themeProps} />
49-
<Component {...pageProps} />
50-
</LanguagesContext.Provider>
51-
</ThemeProvider>
47+
<SSRProvider>
48+
<ThemeProvider dayScheme={themeProps.dayTheme} nightScheme={themeProps.nightTheme}>
49+
<LanguagesContext.Provider value={languagesContext}>
50+
<SetTheme themeProps={themeProps} />
51+
<Component {...pageProps} />
52+
</LanguagesContext.Provider>
53+
</ThemeProvider>
54+
</SSRProvider>
5255
</>
5356
)
5457
}

0 commit comments

Comments
 (0)