Commit f905f49

authored

Merge branch 'dev' into lowcoder-comps-version-switch

2 parents e83c6b9 + d67b991 commit f905f49Copy full SHA for f905f49

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -873,15 +873,15 @@ export function styleControl<T extends readonly SingleColorConfig[]>(`
`873`	`873`	`const { appliedThemeId, preventStyleOverwriting } = comp?.comp?.container \|\| comp?.comp \|\| {};`
`874`	`874`	`const appTheme = isPreviewTheme \|\| isDefaultTheme \|\| (!preventStyleOverwriting && !preventAppStylesOverwriting)`
`875`	`875`	`? theme?.theme`
`876`		`- : undefined;`
	`876`	`+ : defaultTheme;`
`877`	`877`	`const compTheme = isPreviewTheme \|\| isDefaultTheme \|\| (compType && !preventStyleOverwriting && !preventAppStylesOverwriting)`
`878`	`878`	`? {`
`879`	`879`	`...(`
`880`	`880`	`theme?.theme?.components?.[compType]?.[styleKey]`
`881`	`881`	`\|\| defaultTheme.components?.[compType]?.[styleKey]`
`882`	`882`	`) as unknown as Record<string, string>`
`883`	`883`	`}`
`884`		`- : undefined;`
	`884`	`+ : defaultTheme.components?.[compType]?.[styleKey];`
`885`	`885`	`const styleProps = (!comp && !compType) \|\| preventStyleOverwriting \|\| preventAppStylesOverwriting \|\| appliedThemeId === themeId`
`886`	`886`	`? props as ColorMap`
`887`	`887`	`: {} as ColorMap;`

Comments

(0)