@@ -865,17 +865,21 @@ export function styleControl<T extends readonly SingleColorConfig[]>(
865
865
const bgColor = useContext ( BackgroundColorContext ) ;
866
866
const { themeId} = theme || { } ;
867
867
const isPreviewTheme = themeId === 'preview-theme' ;
868
+ const isDefaultTheme = themeId === 'default-theme-id' ;
868
869
869
870
870
871
const appSettingsComp = editorState ?. getAppSettingsComp ( ) ;
871
872
const preventAppStylesOverwriting = appSettingsComp ?. getView ( ) ?. preventAppStylesOverwriting ;
872
873
const { appliedThemeId, preventStyleOverwriting} = comp ?. comp ?. container || comp ?. comp || { } ;
873
- const appTheme = isPreviewTheme || ( ! preventStyleOverwriting && ! preventAppStylesOverwriting )
874
+ const appTheme = isPreviewTheme || isDefaultTheme || ( ! preventStyleOverwriting && ! preventAppStylesOverwriting )
874
875
?theme ?. theme
875
876
:undefined ;
876
- const compTheme = isPreviewTheme || ( compType && ! preventStyleOverwriting && ! preventAppStylesOverwriting )
877
+ const compTheme = isPreviewTheme || isDefaultTheme || ( compType && ! preventStyleOverwriting && ! preventAppStylesOverwriting )
877
878
?{
878
- ...( theme ?. theme ?. components ?. [ compType ] ?. [ styleKey ] || { } ) as unknown as Record < string , string >
879
+ ...(
880
+ theme ?. theme ?. components ?. [ compType ] ?. [ styleKey ]
881
+ || defaultTheme . components ?. [ compType ] ?. [ styleKey ]
882
+ ) as unknown as Record < string , string >
879
883
}
880
884
:undefined ;
881
885
const styleProps = ( ! comp && ! compType ) || preventStyleOverwriting || preventAppStylesOverwriting || appliedThemeId === themeId