fix: refactors prop types in OdysseyProvider

okta · Jul 20, 2023 · 3d2c221 · 3d2c221
1 parent bdedb6c
commit 3d2c221
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/packages/odyssey-react-mui/src/OdysseyCacheProvider.tsx b/packages/odyssey-react-mui/src/OdysseyCacheProvider.tsx
@@ -18,19 +18,21 @@ declare global {
 
 import createCache, { StylisPlugin } from "@emotion/cache";
 import { CacheProvider } from "@emotion/react";
-import { memo, ReactElement, useMemo } from "react";
+import { memo, ReactNode, useMemo } from "react";
 
 import { useUniqueAlphabeticalId } from "./useUniqueAlphabeticalId";
 
+export type OdysseyCacheProviderProps = {
+  children: ReactNode;
+  nonce?: string;
+  stylisPlugins?: StylisPlugin[];
+};
+
 const OdysseyCacheProvider = ({
   children,
   nonce,
   stylisPlugins,
-}: {
-  children: ReactElement;
-  nonce?: string;
-  stylisPlugins: StylisPlugin[];
-}) => {
+}: OdysseyCacheProviderProps) => {
   const uniqueAlphabeticalId = useUniqueAlphabeticalId();
 
   const emotionCache = useMemo(

diff --git a/packages/odyssey-react-mui/src/OdysseyProvider.tsx b/packages/odyssey-react-mui/src/OdysseyProvider.tsx
@@ -10,36 +10,37 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
-import { memo, ReactElement } from "react";
+import { memo, ReactNode } from "react";
 
-import { ThemeOptions } from "@mui/material";
-import { DesignTokensOverride } from "../src/theme/index";
-import { OdysseyCacheProvider } from "./OdysseyCacheProvider";
-import { OdysseyThemeProvider } from "./OdysseyThemeProvider";
+import {
+  OdysseyCacheProvider,
+  OdysseyCacheProviderProps,
+} from "./OdysseyCacheProvider";
+import {
+  OdysseyThemeProvider,
+  OdysseyThemeProviderProps,
+} from "./OdysseyThemeProvider";
 import {
   OdysseyTranslationProvider,
-  TranslationOverrides,
+  OdysseyTranslationProviderProps,
 } from "./OdysseyTranslationProvider";
-import { SupportedLanguages } from "./OdysseyTranslationProvider.types";
 
-type OdysseyProviderProps = {
-  children: ReactElement;
-  designTokensOverride?: DesignTokensOverride;
-  languageCode?: SupportedLanguages;
-  nonce?: string;
-  themeOverride?: ThemeOptions;
-  translationOverrides?: TranslationOverrides;
-};
+export type OdysseyProviderProps = OdysseyCacheProviderProps &
+  OdysseyThemeProviderProps &
+  OdysseyTranslationProviderProps & {
+    children: ReactNode;
+  };
 
 const OdysseyProvider = ({
   children,
   designTokensOverride,
   languageCode,
   nonce,
+  stylisPlugins,
   themeOverride,
   translationOverrides,
 }: OdysseyProviderProps) => (
-  <OdysseyCacheProvider nonce={nonce}>
+  <OdysseyCacheProvider nonce={nonce} stylisPlugins={stylisPlugins}>
     <OdysseyThemeProvider
       themeOverride={themeOverride}
       designTokensOverride={designTokensOverride}

diff --git a/packages/odyssey-react-mui/src/OdysseyThemeProvider.tsx b/packages/odyssey-react-mui/src/OdysseyThemeProvider.tsx
@@ -14,22 +14,24 @@ import {
   createTheme,
   ThemeProvider as MuiThemeProvider,
 } from "@mui/material/styles";
-import { memo, ReactElement, useMemo } from "react";
+import { memo, ReactNode, useMemo } from "react";
 
 import { ThemeOptions } from "@mui/material";
 import { deepmerge } from "@mui/utils";
 import { createOdysseyMuiTheme, DesignTokensOverride } from "./theme";
 import * as Tokens from "@okta/odyssey-design-tokens";
 
+export type OdysseyThemeProviderProps = {
+  children: ReactNode;
+  designTokensOverride?: DesignTokensOverride;
+  themeOverride?: ThemeOptions;
+};
+
 const OdysseyThemeProvider = ({
   children,
   designTokensOverride,
   themeOverride,
-}: {
-  children: ReactElement;
-  designTokensOverride?: DesignTokensOverride;
-  themeOverride?: ThemeOptions;
-}) => {
+}: OdysseyThemeProviderProps) => {
   const odysseyTokens = { ...Tokens, ...designTokensOverride };
   const odysseyTheme = createOdysseyMuiTheme(odysseyTokens);
 

diff --git a/packages/odyssey-react-mui/src/OdysseyTranslationProvider.tsx b/packages/odyssey-react-mui/src/OdysseyTranslationProvider.tsx
@@ -21,12 +21,6 @@ export type TranslationOverrides = {
   [key in SupportedLanguages]?: Partial<(typeof resources)["en"]>;
 };
 
-type OdysseyTranslationProviderProps = {
-  children: ReactNode;
-  languageCode?: SupportedLanguages;
-  translationOverrides?: TranslationOverrides;
-};
-
 const mergeBundleOverrides = (
   languageCode: SupportedLanguages,
   translationOverrides: TranslationOverrides
@@ -39,6 +33,12 @@ const mergeBundleOverrides = (
   };
 };
 
+export type OdysseyTranslationProviderProps = {
+  children: ReactNode;
+  languageCode?: SupportedLanguages;
+  translationOverrides?: TranslationOverrides;
+};
+
 export const OdysseyTranslationProvider = ({
   children,
   languageCode,