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

Author: FalkWolsky

client/packages/lowcoder/src/comps/controls/styleControl.tsx

@@ -873,15 +873,15 @@ export function styleControl<T extends readonly SingleColorConfig[]>(
       const { appliedThemeId, preventStyleOverwriting } = comp?.comp?.container || comp?.comp || {};
       const appTheme = isPreviewTheme || isDefaultTheme || (!preventStyleOverwriting && !preventAppStylesOverwriting)
         ? theme?.theme
-        : undefined;
+        : defaultTheme;
       const compTheme = isPreviewTheme || isDefaultTheme || (compType && !preventStyleOverwriting && !preventAppStylesOverwriting)
         ? {
             ...(
               theme?.theme?.components?.[compType]?.[styleKey]
               || defaultTheme.components?.[compType]?.[styleKey]
             ) as unknown as Record<string, string>
           }
-        : undefined;
+        : defaultTheme.components?.[compType]?.[styleKey];
       const styleProps = (!comp && !compType) || preventStyleOverwriting || preventAppStylesOverwriting || appliedThemeId === themeId
         ? props as ColorMap
         : {} as ColorMap;