Commit2098b44

committed

stop overriding dynamic styles

1 parent55bd8f5 commit2098b44Copy full SHA for 2098b44

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ let TextTmpComp = (function () {`
`150`	`150`	`};`
`151`	`151`	`returnnewUICompBuilder(childrenMap,(props,dispatch)=>{`
`152`	`152`	`constvalue=props.text.value;`
`153`		`-`
`154`		`-useMergeCompStyles(`
`155`		`-propsasRecord<string,any>,`
`156`		`-dispatch`
`157`		`-);`
	`153`	`+`
	`154`	`+//useMergeCompStyles(`
	`155`	`+// props as Record<string, any>,`
	`156`	`+// dispatch`
	`157`	`+//);`
`158`	`158`
`159`	`159`	`return(`
`160`	`160`	`<TextContainer`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import { UICompType, uiCompRegistry } from "../uiCompRegistry";`
`33`	`33`	`import{getNpmPackageMeta}from"../utils/remote";`
`34`	`34`	`import{compPluginsList}from"constants/compPluginConstants";`
`35`	`35`	`importSelectfrom"antd/es/select";`
	`36`	`+import{useMergeCompStyles}from"@lowcoder-ee/util/hooks";`
`36`	`37`
`37`	`38`	`exporttypeNewChildren<ChildrenCompMapextendsRecord<string,Comp<unknown>>>=`
`38`	`39`	`ChildrenCompMap&{`
`@@ -281,6 +282,7 @@ function UIView(props: {`
`281`	`282`	`}){`
`282`	`283`	`constcomp=props.comp;`
`283`	`284`	`constchildrenProps=childrenToProps(comp.children);`
	`285`	`+constchildrenJsonProps=comp.toJsonValue();`
`284`	`286`	`constparentDisabled=useContext(DisabledContext);`
`285`	`287`	`constdisabled=childrenProps['disabled'];`
`286`	`288`	`if(disabled!==undefined&&typeofdisabled==='boolean'){`
`@@ -296,6 +298,11 @@ function UIView(props: {`
`296`	`298`	`}`
`297`	`299`	`//END ADD BY FRED`
`298`	`300`
	`301`	`+useMergeCompStyles(`
	`302`	`+childrenJsonPropsasRecord<string,any>,`
	`303`	`+comp.dispatch`
	`304`	`+);`
	`305`	`+`
`299`	`306`	`// render condition for modal and drawer as we are not getting compType here`
`300`	`307`	`if(comp.children.hasOwnProperty('showMask')&&comp.children.hasOwnProperty('maskClosable')){`
`301`	`308`	`return(`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -199,13 +199,13 @@ export const ThemeCompPanel = (props: any) => {`
`199`	`199`
`200`	`200`	`if(newComp){`
`201`	`201`	`constcompChildrens=newComp.children;`
`202`		`-letstyleChildrenKeys=Object.keys(compChildrens).filter(child=>child.toLowerCase().endsWith('style'));`
	`202`	`+letstyleChildrenKeys=Object.keys(compChildrens).filter(child=>child.toLowerCase().endsWith('style'\|\|'styles'));`
`203`	`203`	`letstyleChildrens:Record<string,any>={};`
`204`	`204`	`styleChildrenKeys.forEach((childKey:string)=>{`
`205`	`205`	`styleChildrens[childKey]=compChildrens[childKey];`
`206`	`206`	`})`
`207`	`207`	`if(compChildrens.container){`
`208`		`-styleChildrenKeys=Object.keys(compChildrens.container.children).filter(child=>child.toLowerCase().endsWith('style'));`
	`208`	`+styleChildrenKeys=Object.keys(compChildrens.container.children).filter(child=>child.toLowerCase().endsWith('style'\|\|'styles'));`
`209`	`209`	`styleChildrenKeys.forEach((childKey:string)=>{`
`210`	`210`	`styleChildrens[childKey]=compChildrens.container.children[childKey];`
`211`	`211`	`})`

Comments

(0)