fix(conditional container): error render fallback

\
tutods · Sep 10, 2023 · a97a8ca · a97a8ca
1 parent ef55623
commit a97a8ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/components/src/components/ConditionalContainer/index.tsx b/packages/components/src/components/ConditionalContainer/index.tsx
@@ -45,11 +45,11 @@ const ConditionalContainer = <TRender extends RenderElement, TFallback extends R
   if (!when && fallback) {
     const { element: fallbackElement, props: fallbackProps = {} } = fallback;
 
-    // If (typeof fallbackElement === 'string') {
-    return createElement(fallbackElement, fallbackProps, children);
-    // }
+    if (typeof fallbackElement === 'string') {
+      return createElement(fallbackElement, fallbackProps, children);
+    }
 
-    // Return fallbackElement({ ...fallbackProps, children });
+    return fallbackElement({ ...fallbackProps, children });
   }
 
   // When no `fallback` element is specified

diff --git a/packages/components/src/components/ConditionalContainer/types.ts b/packages/components/src/components/ConditionalContainer/types.ts
@@ -1,14 +1,19 @@
-import type { ComponentProps, FunctionComponent, JSX, ReactNode } from 'react';
+import type {
+  ComponentProps,
+  ForwardRefExoticComponent,
+  JSX,
+  ReactElement,
+  ReactNode,
+} from 'react';
 
 /**
  * Available types to be used on `render` or `otherwise`
  */
 // TS will infer the props when `element` is defined
-type RenderElement = FunctionComponent<any> | keyof JSX.IntrinsicElements;
-/*
- * | ((props: any) => ReactElement)
- * | ForwardRefExoticComponent<any>
- */
+type RenderElement =
+  | keyof JSX.IntrinsicElements
+  | ((props: any) => ReactElement)
+  | ForwardRefExoticComponent<any>;
 
 type ComponentArgs<T extends RenderElement> = {
   /**