Theme: apply theme styles in textComp

raheeliftikhar5 · raheeliftikhar5 · commit 8c17c04efdec · 2024-07-03T14:20:53.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/textComp.tsx b/client/packages/lowcoder/src/comps/comps/textComp.tsx
@@ -6,7 +6,7 @@ import styled, { css } from "styled-components";
 import { AlignCenter } from "lowcoder-design";
 import { AlignLeft } from "lowcoder-design";
 import { AlignRight } from "lowcoder-design";
-import { UICompBuilder } from "../generators";
+import { UICompBuilder, withDefault } from "../generators";
 import { NameConfig, NameConfigHidden, withExposingConfigs } from "../generators/withExposing";
 import { markdownCompCss, TacoMarkDown } from "lowcoder-design";
 import { styleControl } from "comps/controls/styleControl";
@@ -18,11 +18,15 @@ import { alignWithJustifyControl } from "comps/controls/alignControl";
 import { MarginControl } from "../controls/marginControl";
 import { PaddingControl } from "../controls/paddingControl";
 
-import React, { useContext } from "react";
+import React, { useContext, useEffect } from "react";
 import { EditorContext } from "comps/editorState";
 import { clickEvent, eventHandlerControl } from "../controls/eventHandlerControl";
 
 const EventOptions = [clickEvent] as const;
+import { ThemeContext } from "../utils/themeContext";
+import { CompTypeContext } from "../utils/compTypeContext";
+import { changeChildAction } from "lowcoder-core";
+import { setInitialCompStyles } from "../utils/themeUtil";
 
 const getStyle = (style: TextStyleType) => {
   return css`
@@ -115,6 +119,7 @@ const typeOptions = [
     value: "text",
   },
 ] as const;
+
 const VerticalAlignmentOptions = [
   { label: <AlignTop />, value: "flex-start" },
   { label: <AlignVerticalCenter />, value: "center" },
@@ -132,13 +137,29 @@ let TextTmpComp = (function () {
     type: dropdownControl(typeOptions, "markdown"),
     horizontalAlignment: alignWithJustifyControl(),
     verticalAlignment: dropdownControl(VerticalAlignmentOptions, "center"),
-    style: styleControl(TextStyle),
+    style: styleControl(TextStyle, 'style'),
     animationStyle: styleControl(AnimationStyle),
     margin: MarginControl,
     padding: PaddingControl,
   };
-  return new UICompBuilder(childrenMap, (props) => {
+  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'].forEach((key: string) => {
+      styleProps[key] = (props as any)[key];
+    });
+
+    useEffect(() => {
+      setInitialCompStyles({
+        dispatch,
+        compTheme,
+        styleProps,
+      });
+    }, []);
+  
     return (
       <TextContainer
         $animationStyle={props.animationStyle}
diff --git a/client/packages/lowcoder/src/comps/utils/themeUtil.ts b/client/packages/lowcoder/src/comps/utils/themeUtil.ts
@@ -1,6 +1,8 @@
 import { ThemeType } from "api/commonSettingApi";
 import { getLocalThemeId } from "util/localStorageUtil";
 import { getGlobalSettings } from "./globalSettings";
+import { CompAction, multiChangeAction, changeValueAction } from "lowcoder-core";
+import { JSONObject, JSONValue } from "@lowcoder-ee/util/jsonTypes";
 
 export const DEFAULT_THEMEID = "default";
 
@@ -20,3 +22,26 @@ export function getCurrentTheme(themeList: ThemeType[], appThemeId: string) {
       : appThemeId
   );
 }
+
+export function setInitialCompStyles({
+  dispatch,
+  compTheme,
+  styleProps,
+}: {
+  dispatch: (action: CompAction) => void,
+  compTheme?: JSONObject,
+  styleProps: Record<string, any>,
+}) {
+  const styleKeys = Object.keys(styleProps);
+  const actions: Record<string, any> = {};
+  styleKeys.forEach(styleKey => {
+    actions[styleKey] = changeValueAction({
+      ...(compTheme?.[styleKey] as object || {}),
+      ...styleProps[styleKey],
+    }, false);
+  })
+
+  dispatch(
+    multiChangeAction(actions),
+  );
+}
