From d9f0d734cfeedfc132a8f516aa0575c4a82369ec Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 15 May 2020 09:25:18 +0200
Subject: [PATCH] packages/core: simplify app theme configuration

---
 packages/core/src/api/app/App.tsx  | 38 +++++++++---------------------
 packages/core/src/api/app/types.ts | 30 +++++++++++++----------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/packages/core/src/api/app/App.tsx b/packages/core/src/api/app/App.tsx
index 462734ee4b..50eaac6a2c 100644
--- a/packages/core/src/api/app/App.tsx
+++ b/packages/core/src/api/app/App.tsx
@@ -182,36 +182,20 @@ export function createApp(options?: AppOptions) {
     NotFoundErrorPage: DefaultNotFoundPage,
     ...options?.components,
   };
-  const themes = new Array<AppTheme>();
-
-  if (Array.isArray(options?.themes)) {
-    themes.push(...options?.themes!);
-  } else {
-    if (options?.themes?.light) {
-      themes.push({
-        id: 'light',
-        title: 'Light Theme',
-        variant: 'light',
-        theme: options?.themes?.light,
-      });
-    }
-    if (options?.themes?.dark) {
-      themes.push({
-        id: 'dark',
-        title: 'Dark Theme',
-        variant: 'dark',
-        theme: options?.themes?.dark,
-      });
-    }
-  }
-  if (themes.length === 0) {
-    themes.push({
+  const themes = options?.themes ?? [
+    {
       id: 'light',
-      title: 'Default Theme',
+      title: 'Light Theme',
       variant: 'light',
       theme: lightTheme,
-    });
-  }
+    },
+    {
+      id: 'dark',
+      title: 'Dark Theme',
+      variant: 'dark',
+      theme: darkTheme,
+    },
+  ];
 
   const app = new AppImpl({ apis, icons, plugins, components, themes });
 
diff --git a/packages/core/src/api/app/types.ts b/packages/core/src/api/app/types.ts
index b208b85afb..75a750ce6e 100644
--- a/packages/core/src/api/app/types.ts
+++ b/packages/core/src/api/app/types.ts
@@ -15,7 +15,6 @@
  */
 
 import { ComponentType } from 'react';
-import { BackstageTheme } from '@backstage/theme';
 import { IconComponent, SystemIconKey, SystemIcons } from '../../icons';
 import { BackstagePlugin } from '../plugin';
 import { ApiHolder } from '../apis';
@@ -49,21 +48,26 @@ export type AppOptions = {
   components?: Partial<AppComponents>;
 
   /**
-   * Themes provided as a part of the app.
+   * Themes provided as a part of the app. By default two themes are included, one
+   * light variant of the default backstage theme, and one dark.
    *
-   * The themes can be specified either as just default light and dark mode themes.
-   * If only one of then is specified then that theme will always be used.
-   * If both are provided the default theme will be set based on browser preferences.
+   * This is the default config:
    *
-   * If an array of themes is provided, the first occurence of light and dark mode variants
-   * will be treated as the default for each variant.
+   * ```
+   * [{
+   *   id: 'light',
+   *   title: 'Light Theme',
+   *   variant: 'light',
+   *   theme: lightTheme,
+   * }, {
+   *   id: 'dark',
+   *   title: 'Dark Theme',
+   *   variant: 'dark',
+   *   theme: darkTheme,
+   * }]
+   * ```
    */
-  themes?:
-    | {
-        light?: BackstageTheme;
-        dark?: BackstageTheme;
-      }
-    | AppTheme[];
+  themes?: AppTheme[];
 };
 
 export type BackstageApp = {