fix(componentProps): 🐛 proper solution for all cases

adaptui · Jan 4, 2022 · e33161f · e33161f · vercel · Jan 4, 2022
1 parent 2e2aa68
commit e33161f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/checkbox-group/CheckboxGroupWrapper.tsx b/src/checkbox-group/CheckboxGroupWrapper.tsx
@@ -43,6 +43,7 @@ export const useCheckboxGroupContextWrapper = createHook<
 
 export const CheckboxGroupWrapper = createComponent({
   as: "div",
+  memo: true,
   useHook: useCheckboxGroupContextWrapper,
   useCreateElement: (type, props, children) => {
     useWarning(

diff --git a/src/tooltip/SliderTooltipReference.tsx b/src/tooltip/SliderTooltipReference.tsx
@@ -123,5 +123,6 @@ export const useSliderTooltipReference = createHook<
 
 export const SliderTooltipReference = createComponent({
   as: "div",
+  memo: true,
   useHook: useSliderTooltipReference,
 });
diff --git a/src/utils/react.ts b/src/utils/react.ts
@@ -100,18 +100,22 @@ export const getComponentProps = <T, P>(
 
   if (validChildren.length > 0) {
     validChildren.forEach(function (child) {
+      // For only React Element
       // @ts-ignore
-      if (componentMaps[child.type.displayName]) {
+      if (componentMaps[child?.type]) {
         // @ts-ignore
-        componentProps[componentMaps[child.type.displayName]] = child.props; // @ts-ignore
-      } else if (componentMaps[child.type.type.displayName]) {
+        componentProps[componentMaps[child?.displayName]] = child.props;
+        // For Forwarded Ref with React Element
         // @ts-ignore
-        componentProps[componentMaps[child.type.type.displayName]] = // @ts-ignore
+      } else if (componentMaps[child?.type?.render?.displayName]) {
+        // @ts-ignore
+        componentProps[componentMaps[child?.type?.render?.displayName]] =
           child.props;
+        // For Memoised Forwarded Ref with React Element
         // @ts-ignore
-      } else if (componentMaps[child.type.type.render.displayName]) {
+      } else if (componentMaps[child?.type?.type?.render?.displayName]) {
         // @ts-ignore
-        componentProps[componentMaps[child.type.type.render.displayName]] = // @ts-ignore
+        componentProps[componentMaps[child?.type?.type?.render?.displayName]] =
           child.props;
       } else {
         finalChildren.push(child);