fix: include_built_in_themes not working (#1009)

StaticJsCMS · Dec 21, 2023 · d9299de · d9299de
1 parent b53f8b7
commit d9299de
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/core/src/components/theme/hooks/useThemes.ts b/packages/core/src/components/theme/hooks/useThemes.ts
@@ -15,16 +15,16 @@ export default function useThemes(): Theme[] {
   return useMemo(() => {
     const customThemes: Theme[] = [];
 
-    if (customThemes.length === 0 || config?.theme?.include_built_in_themes !== false) {
-      customThemes.push(...DEFAULT_THEMES);
-    }
-
     customThemes.push(
       ...[...(config?.theme?.themes ?? []), ...getThemes()].map(t =>
         'extends' in t ? createTheme(t) : t,
       ),
     );
 
+    if (customThemes.length === 0 || config?.theme?.include_built_in_themes !== false) {
+      customThemes.push(...DEFAULT_THEMES);
+    }
+
     const defaultTheme = config?.theme?.default_theme;
     if (isNotEmpty(defaultTheme)) {
       customThemes.sort((a, b) => {