fix(avatar): 🩹 fix calling hooks inside hooks bug (#337)

adaptui · Jul 4, 2022 · d770ab4 · d770ab4 · vercel · Jul 4, 2022
1 parent 9a50de2
commit d770ab4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/avatar/AvatarProps.tsx b/src/avatar/AvatarProps.tsx
@@ -63,7 +63,8 @@ export const useAvatarProps = ({
     crossOrigin,
     loading,
   });
-  let uiProps: AvatarUIProps = useMemo(() => ({ ...uiState }), [uiState]);
+  let uiProps: AvatarUIProps = uiState;
+
   const { componentProps } = getComponentProps(componentMap, children, uiProps);
 
   const _icon: AvatarUIState["icon"] =
@@ -129,13 +130,14 @@ export const useAvatarProps = ({
     ],
   );
 
+  const finalStatusIndicators = withIconA11y(uiProps.statusIndicators, uiProps);
   const statusIndicatorProps: AvatarStatusIndicatorProps = useMemo(
     () => ({
       ...uiProps,
       ...componentProps.statusIndicatorProps,
-      children: withIconA11y(uiProps.statusIndicators, uiProps),
+      children: finalStatusIndicators,
     }),
-    [componentProps.statusIndicatorProps, uiProps],
+    [componentProps.statusIndicatorProps, finalStatusIndicators, uiProps],
   );
 
   return {