Commit4055b89

committed

fixed theme styling

1 parent7bd15c6 commit4055b89Copy full SHA for 4055b89

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export function setInitialCompStyles({`
`41`	`41`	`styleKeys.forEach(styleKey=>{`
`42`	`42`	`actions[styleKey]=changeValueAction({`
`43`	`43`	`...(compTheme?.[styleKey]asobject\|\|{}),`
`44`		`- ...styleProps[styleKey],`
	`44`	`+//...styleProps[styleKey],`
`45`	`45`	`},true);`
`46`	`46`	`})`
`47`	`47`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,14 @@ export function useMergeCompStyles(`
`172`	`172`	`props:Record<string,any>,`
`173`	`173`	`dispatch:(action:CompAction)=>void`
`174`	`174`	`){`
	`175`	`+consteditorState=useContext(EditorContext);`
`175`	`176`	`consttheme=useContext(ThemeContext);`
`176`	`177`	`constcompType=useContext(CompTypeContext);`
`177`	`178`	`constcompTheme=theme?.theme?.components?.[compType];`
`178`	`179`	`constthemeId=theme?.themeId;`
	`180`	`+constappSettingsComp=editorState?.getAppSettingsComp();`
	`181`	`+constpreventAppStylesOverwriting=appSettingsComp?.getView()?.preventAppStylesOverwriting;`
	`182`	`+const{ preventStyleOverwriting}=props;`
`179`	`183`
`180`	`184`	`conststyleKeys=Object.keys(props).filter(key=>key.toLowerCase().endsWith('style'\|\|'styles'));`
`181`	`185`	`conststyleProps:Record<string,any>={};`
`@@ -184,6 +188,7 @@ export function useMergeCompStyles(`
`184`	`188`	`});`
`185`	`189`
`186`	`190`	`useEffect(()=>{`
	`191`	`+if(preventAppStylesOverwriting\|\|preventStyleOverwriting)return;`
`187`	`192`	`setInitialCompStyles({`
`188`	`193`	`dispatch,`
`189`	`194`	`compTheme,`
`@@ -194,6 +199,8 @@ export function useMergeCompStyles(`
`194`	`199`	`themeId,`
`195`	`200`	`JSON.stringify(styleProps),`
`196`	`201`	`JSON.stringify(compTheme),`
`197`		`-setInitialCompStyles`
	`202`	`+setInitialCompStyles,`
	`203`	`+preventAppStylesOverwriting,`
	`204`	`+preventStyleOverwriting,`
`198`	`205`	`]);`
`199`	`206`	`}`

Comments

(0)