Theme: replacing code with custom hook

raheeliftikhar5 · raheeliftikhar5 · commit 3cc61894ad85 · 2024-07-03T14:22:20.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/textComp.tsx b/client/packages/lowcoder/src/comps/comps/textComp.tsx
@@ -28,6 +28,7 @@ import { CompTypeContext } from "../utils/compTypeContext";
 import { changeChildAction } from "lowcoder-core";
 import { setInitialCompStyles } from "../utils/themeUtil";
 import { BoolControl } from "../controls/boolControl";
+import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";
 
 const getStyle = (style: TextStyleType) => {
   return css`
@@ -142,27 +143,14 @@ let TextTmpComp = (function () {
     animationStyle: styleControl(AnimationStyle, 'animationStyle'),
     margin: MarginControl,
     padding: PaddingControl,
-    themeApplied: BoolControl,
   };
   return new UICompBuilder(childrenMap, (props, dispatch) => {
     const value = props.text.value;
-    const theme = useContext(ThemeContext);
-    const compType = useContext(CompTypeContext);
-    const compTheme = theme?.theme?.components?.[compType];
-  
-    const styleProps: Record<string, any> = {};
-    ['style', 'animationStyle'].forEach((key: string) => {
-      styleProps[key] = (props as any)[key];
-    });
 
-    useEffect(() => {
-      if (props.themeApplied) return;
-      setInitialCompStyles({
-        dispatch,
-        compTheme,
-        styleProps,
-      });
-    }, []);
+    useMergeCompStyles(
+      props as Record<string, any>,
+      dispatch
+    );
   
     return (
       <TextContainer
