fix: make config integrator optional

lifinance · Apr 13, 2023 · 7b983de · 7b983de
1 parent 10b7e31
commit 7b983de
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/packages/widget/src/App.tsx b/packages/widget/src/App.tsx
@@ -13,16 +13,16 @@ import { Initializer } from './components/Initializer';
 import { PoweredBy } from './components/PoweredBy';
 import { SwapRoutesExpanded } from './components/SwapRoutes';
 import { useExpandableVariant } from './hooks';
-import type { WidgetProps } from './types';
+import type { WidgetConfig, WidgetProps } from './types';
 
 export const App: React.FC<WidgetProps> = forwardRef<WidgetDrawer, WidgetProps>(
   ({ elementRef, open, integrator, ...other }, ref) => {
-    const config = useMemo(
+    const config: WidgetConfig = useMemo(
       () => ({ integrator, ...other, ...other.config }),
       [integrator, other],
     );
     return config?.variant !== 'drawer' ? (
-      <AppProvider integrator={integrator} config={config}>
+      <AppProvider config={config}>
         <AppDefault />
       </AppProvider>
     ) : (

diff --git a/packages/widget/src/AppDrawer.tsx b/packages/widget/src/AppDrawer.tsx
@@ -50,7 +50,7 @@ export const AppDrawer = forwardRef<WidgetDrawer, WidgetProps>(
       [closeDrawer, openDrawer, toggleDrawer],
     );
 
-    const drawerConfig: WidgetConfig = useMemo(
+    const widgetConfig: WidgetConfig = useMemo(
       () => ({
         ...config,
         integrator,
@@ -63,7 +63,7 @@ export const AppDrawer = forwardRef<WidgetDrawer, WidgetProps>(
     );
 
     return (
-      <AppProvider integrator={integrator} config={drawerConfig}>
+      <AppProvider config={widgetConfig}>
         <DrawerButton
           variant="contained"
           onClick={toggleDrawer}

diff --git a/packages/widget/src/AppProvider.tsx b/packages/widget/src/AppProvider.tsx
@@ -14,9 +14,9 @@ import {
   useWidgetConfig,
 } from './providers';
 import { StoreProvider } from './stores';
-import type { WidgetProps } from './types';
+import type { WidgetConfigProps } from './types';
 
-export const AppProvider: React.FC<PropsWithChildren<WidgetProps>> = ({
+export const AppProvider: React.FC<PropsWithChildren<WidgetConfigProps>> = ({
   children,
   config,
 }) => {

diff --git a/packages/widget/src/types/widget.ts b/packages/widget/src/types/widget.ts
@@ -166,7 +166,14 @@ export type WidgetDrawerProps = {
   open?: boolean;
 };
 
+export interface WidgetConfigProps {
+  config: WidgetConfig;
+}
+
+export interface WidgetConfigPartialProps {
+  config?: Partial<WidgetConfig>;
+}
+
 export type WidgetProps = WidgetDrawerProps &
-  WidgetConfig & {
-    config?: WidgetConfig;
-  };
+  WidgetConfig &
+  WidgetConfigPartialProps;