Fixes #1986 and allows for the theme argument to be null for the Word…

…PressBlocksProvider
wpengine · Dec 20, 2024 · fb7f89c · fb7f89c
1 parent 6cf7643
commit fb7f89c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/blocks/src/components/WordPressBlocksProvider.tsx b/packages/blocks/src/components/WordPressBlocksProvider.tsx
@@ -69,14 +69,13 @@ export function WordPressBlocksProvider(props: {
  * ```
  */
 export function useBlocksTheme(): BlocksTheme {
-  const themeContext = React.useContext(WordPressThemeContext);
 
   // If it's an empty object, the provider hasn't been initialized.
-  if (themeContext === undefined) {
+  if (WordPressBlocksContext == null || WordPressThemeContext == null) {
     throw new Error(
       'useBlocksTheme hook was called outside of context, make sure your app is wrapped with WordPressBlocksProvider',
     );
   }
 
-  return themeContext;
+  return React.useContext(WordPressThemeContext);;
 }