fixed theme styling

raheeliftikhar5 · raheeliftikhar5 · commit 4055b8949d61 · 2024-09-25T23:58:15.000+05:00
diff --git a/client/packages/lowcoder/src/comps/utils/themeUtil.ts b/client/packages/lowcoder/src/comps/utils/themeUtil.ts
@@ -41,7 +41,7 @@ export function setInitialCompStyles({
   styleKeys.forEach(styleKey => {
     actions[styleKey] = changeValueAction({
       ...(compTheme?.[styleKey] as object || {}),
-      ...styleProps[styleKey],
+      // ...styleProps[styleKey],
     }, true);
   })
 
diff --git a/client/packages/lowcoder/src/util/hooks.ts b/client/packages/lowcoder/src/util/hooks.ts
@@ -172,10 +172,14 @@ export function useMergeCompStyles(
   props: Record<string, any>,
   dispatch: (action: CompAction) => void
 ) {
+  const editorState = useContext(EditorContext);
   const theme = useContext(ThemeContext);
   const compType = useContext(CompTypeContext);
   const compTheme = theme?.theme?.components?.[compType];
   const themeId = theme?.themeId;
+  const appSettingsComp = editorState?.getAppSettingsComp();
+  const preventAppStylesOverwriting = appSettingsComp?.getView()?.preventAppStylesOverwriting;
+  const { preventStyleOverwriting } = props;
 
   const styleKeys = Object.keys(props).filter(key => key.toLowerCase().endsWith('style' || 'styles'));
   const styleProps: Record<string, any> = {};
@@ -184,6 +188,7 @@ export function useMergeCompStyles(
   });
 
   useEffect(() => {
+    if (preventAppStylesOverwriting || preventStyleOverwriting) return;
     setInitialCompStyles({
       dispatch,
       compTheme,
@@ -194,6 +199,8 @@ export function useMergeCompStyles(
     themeId,
     JSON.stringify(styleProps),
     JSON.stringify(compTheme),
-    setInitialCompStyles
+    setInitialCompStyles,
+    preventAppStylesOverwriting,
+    preventStyleOverwriting,
   ]);
 }
