stop overriding dynamic styles

raheeliftikhar5 · raheeliftikhar5 · commit 2098b4492e9b · 2024-08-13T21:20:29.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/textComp.tsx b/client/packages/lowcoder/src/comps/comps/textComp.tsx
@@ -150,11 +150,11 @@ let TextTmpComp = (function () {
   };
   return new UICompBuilder(childrenMap, (props, dispatch) => {
     const value = props.text.value;
-
-    useMergeCompStyles(
-      props as Record<string, any>,
-      dispatch
-    );
+    
+    // useMergeCompStyles(
+    //   props as Record<string, any>,
+    //   dispatch
+    // );
   
     return (
       <TextContainer
diff --git a/client/packages/lowcoder/src/comps/generators/uiCompBuilder.tsx b/client/packages/lowcoder/src/comps/generators/uiCompBuilder.tsx
@@ -33,6 +33,7 @@ import { UICompType, uiCompRegistry } from "../uiCompRegistry";
 import { getNpmPackageMeta } from "../utils/remote";
 import { compPluginsList } from "constants/compPluginConstants";
 import Select from "antd/es/select";
+import { useMergeCompStyles } from "@lowcoder-ee/util/hooks";
 
 export type NewChildren<ChildrenCompMap extends Record<string, Comp<unknown>>> =
   ChildrenCompMap & {
@@ -281,6 +282,7 @@ function UIView(props: {
 }) {
   const comp = props.comp;
   const childrenProps = childrenToProps(comp.children);
+  const childrenJsonProps = comp.toJsonValue();
   const parentDisabled = useContext(DisabledContext);
   const disabled = childrenProps['disabled'];
   if (disabled !== undefined && typeof disabled === 'boolean') {
@@ -296,6 +298,11 @@ function UIView(props: {
   }
   //END ADD BY FRED
 
+  useMergeCompStyles(
+    childrenJsonProps as Record<string, any>,
+    comp.dispatch
+  );
+
   // render condition for modal and drawer as we are not getting compType here
   if (comp.children.hasOwnProperty('showMask') && comp.children.hasOwnProperty('maskClosable')) {
     return (
diff --git a/client/packages/lowcoder/src/pages/setting/theme/ThemeCompPanel.tsx b/client/packages/lowcoder/src/pages/setting/theme/ThemeCompPanel.tsx
@@ -199,13 +199,13 @@ export const ThemeCompPanel = (props: any) => {
 
       if (newComp) {
         const compChildrens = newComp.children;
-        let styleChildrenKeys = Object.keys(compChildrens).filter(child => child.toLowerCase().endsWith('style'));
+        let styleChildrenKeys = Object.keys(compChildrens).filter(child => child.toLowerCase().endsWith('style' || 'styles'));
         let styleChildrens: Record<string, any> = {};
         styleChildrenKeys.forEach((childKey: string) => {
           styleChildrens[childKey] = compChildrens[childKey];
         })
         if (compChildrens.container) {
-          styleChildrenKeys = Object.keys(compChildrens.container.children).filter(child => child.toLowerCase().endsWith('style'));
+          styleChildrenKeys = Object.keys(compChildrens.container.children).filter(child => child.toLowerCase().endsWith('style' || 'styles'));
           styleChildrenKeys.forEach((childKey: string) => {
             styleChildrens[childKey] = compChildrens.container.children[childKey];
           })
