Commitcaa3065

committed

fix styles not working on table and container based comps

1 parent76c8e81 commitcaa3065Copy full SHA for caa3065

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import { trans } from "i18n";`
`29`	`29`	`import{ControlNode}from"lowcoder-design";`
`30`	`30`	`import{StringControl}from"comps/controls/codeControl";`
`31`	`31`	`importSliderControlfrom"@lowcoder-ee/comps/controls/sliderControl";`
	`32`	`+import{useMergeCompStyles}from"@lowcoder-ee/util/hooks";`
`32`	`33`
`33`	`34`	`constchildrenMap={`
`34`	`35`	`header:SimpleContainerComp,`
`@@ -65,6 +66,7 @@ const childrenMap = {`
`65`	`66`	`// Compatible with old style data 2022-8-15`
`66`	`67`	`constlayoutBaseComp=migrateOldData(`
`67`	`68`	`newMultiCompBuilder(childrenMap,(props,dispatch)=>{`
	`69`	`+useMergeCompStyles(props,dispatch);`
`68`	`70`	`return{ ...props, dispatch};`
`69`	`71`	`}).build(),`
`70`	`72`	`fixOldStyleData`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import { darkenColor, isDarkColor, ScrollBar } from "lowcoder-design";`
`33`	`33`	`importReact,{Children,useCallback,useContext,useEffect,useMemo,useRef,useState}from"react";`
`34`	`34`	`import{Resizable}from"react-resizable";`
`35`	`35`	`importstyled,{css}from"styled-components";`
`36`		`-import{useUserViewMode}from"util/hooks";`
	`36`	`+import{useMergeCompStyles,useUserViewMode}from"util/hooks";`
`37`	`37`	`import{TableImplComp}from"./tableComp";`
`38`	`38`	`import{useResizeDetector}from"react-resize-detector";`
`39`	`39`	`import{SlotConfigContext}from"comps/controls/slotControl";`
`@@ -903,7 +903,6 @@ export function TableCompView(props: {`
`903`	`903`	`updateEmptyRows();`
`904`	`904`	`},[updateEmptyRows]);`
`905`	`905`
`906`		`-`
`907`	`906`	`constpageDataInfo=useMemo(()=>{`
`908`	`907`	`// Data pagination`
`909`	`908`	`letpagedData=data;`
`@@ -928,6 +927,11 @@ export function TableCompView(props: {`
`928`	`927`
`929`	`928`	`constchildrenProps=childrenToProps(comp.children);`
`930`	`929`
	`930`	`+useMergeCompStyles(`
	`931`	`+childrenPropsasRecord<string,any>,`
	`932`	`+comp.dispatch`
	`933`	`+);`
	`934`	`+`
`931`	`935`	`consthandleChangeEvent=useCallback(`
`932`	`936`	`(eventName:TableEventOptionValues)=>{`
`933`	`937`	`if(eventName==="saveChanges"&&!compChildren.onEvent.isBind(eventName)){`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import { ContainerBodyChildComp } from "./containerBodyChildComp";`
`28`	`28`	`import{trans}from"i18n";`
`29`	`29`	`import{ControlNode}from"lowcoder-design";`
`30`	`30`	`importSliderControlfrom"@lowcoder-ee/comps/controls/sliderControl";`
	`31`	`+import{useMergeCompStyles}from"@lowcoder-ee/util/hooks";`
`31`	`32`
`32`	`33`	`constchildrenMap={`
`33`	`34`	`header:SimpleContainerComp,`
`@@ -53,6 +54,7 @@ const childrenMap = {`
`53`	`54`	`// Compatible with old style data 2022-8-15`
`54`	`55`	`constTriContainerBaseComp=migrateOldData(`
`55`	`56`	`newMultiCompBuilder(childrenMap,(props,dispatch)=>{`
	`57`	`+useMergeCompStyles(props,dispatch);`
`56`	`58`	`return{ ...props, dispatch};`
`57`	`59`	`}).build(),`
`58`	`60`	`fixOldStyleData`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -673,10 +673,10 @@ function calcColors<ColorMap extends Record<string, string>>(`
`673`	`673`	`themeWithDefault.textDark,`
`674`	`674`	`themeWithDefault.textLight`
`675`	`675`	`);`
`676`		`-}elseif(config?.depType===DEP_TYPE.SELF&&config.depTheme==="canvas"&&bgColor){`
`677`		`-res[name]=bgColor;`
`678`	`676`	`}elseif((config?.depType\|\|config?.depName)&&compTheme?.[name]){`
`679`	`677`	`res[name]=compTheme[name];`
	`678`	`+}elseif(config?.depType===DEP_TYPE.SELF&&config.depTheme==="canvas"&&bgColor){`
	`679`	`+res[name]=bgColor;`
`680`	`680`	`}else{`
`681`	`681`	`constrest=[];`
`682`	`682`	`config.depName&&rest.push(res[config.depName]);`
`@@ -900,7 +900,7 @@ export function styleControl<T extends readonly SingleColorConfig[]>(`
`900`	`900`
`901`	`901`	`constappSettingsComp=editorState?.getAppSettingsComp();`
`902`	`902`	`constpreventAppStylesOverwriting=appSettingsComp?.getView()?.preventAppStylesOverwriting;`
`903`		`-const{ appliedThemeId, preventStyleOverwriting}=comp?.comp?.container\|\|comp?.comp\|\|{};`
	`903`	`+const{ appliedThemeId, preventStyleOverwriting}=(comp?.comp\|\|{});`
`904`	`904`	`constappTheme=isPreviewTheme\|\|isDefaultTheme\|\|(!preventStyleOverwriting&&!preventAppStylesOverwriting)`
`905`	`905`	`?theme?.theme`
`906`	`906`	`:defaultTheme;`

Comments

(0)