Removed ThemeRegistration mapping

#1504

Author: bmingles

packages/components/src/theme/ThemeModel.ts

@@ -29,8 +29,3 @@ export interface ThemeRegistrationData {
   base: ThemeData[];
   custom: ThemeData[];
 }
-
-export interface ThemeRegistrationStorageData {
-  base: Map<string, ThemeData>;
-  custom: Map<string, ThemeData>;
-}

packages/components/src/theme/ThemeUtils.test.ts

@@ -1,7 +1,7 @@
 import {
   DEFAULT_PRELOAD_DATA_VARIABLES,
   ThemeData,
-  ThemeRegistrationStorageData,
+  ThemeRegistrationData,
   THEME_CACHE_LOCAL_STORAGE_KEY,
 } from './ThemeModel';
 import {
@@ -10,7 +10,6 @@ import {
   getDefaultBaseThemes,
   getThemeKey,
   getThemePreloadData,
-  mapThemeRegistrationData,
   preloadTheme,
   setThemePreloadData,
 } from './ThemeUtils';
@@ -62,21 +61,18 @@ describe('getActiveThemes', () => {
     },
   } satisfies Record<string, ThemeData>;
 
-  const themeRegistration: ThemeRegistrationStorageData = {
-    base: new Map([[mockTheme.base.themeKey, mockTheme.base]]),
-    custom: new Map([[mockTheme.custom.themeKey, mockTheme.custom]]),
+  const themeRegistration: ThemeRegistrationData = {
+    base: [mockTheme.base],
+    custom: [mockTheme.custom],
   };
 
   it.each([null, mockTheme.customInvalid])(
     'should throw if base theme not found',
     customTheme => {
       expect(() =>
         getActiveThemes(customTheme?.themeKey ?? 'mock.themeKey', {
-          base: new Map(),
-          custom:
-            customTheme == null
-              ? new Map()
-              : new Map([[customTheme.themeKey, customTheme]]),
+          base: [],
+          custom: customTheme == null ? [] : [customTheme],
         })
       ).toThrowError(`Default base theme 'default-dark' is not registered`);
     }
@@ -153,55 +149,6 @@ describe('getThemePreloadData', () => {
   );
 });
 
-describe('mapThemeRegistrationData', () => {
-  const baseThemeA: ThemeData = {
-    name: 'Default Dark',
-    themeKey: 'default-dark',
-    styleContent: 'mock.base.styleContent',
-  };
-
-  const baseThemeB: ThemeData = {
-    name: 'Default Light',
-    themeKey: 'default-light',
-    styleContent: 'mock.base.styleContent',
-  };
-
-  const customThemeA: ThemeData = {
-    name: 'mock.custom.A',
-    baseThemeKey: 'default-dark',
-    themeKey: 'mock.custom.a',
-    styleContent: 'mock.custom.styleContent',
-  };
-
-  const customThemeB: ThemeData = {
-    name: 'mock.custom.B',
-    baseThemeKey: 'default-light',
-    themeKey: 'mock.custom.b',
-    styleContent: 'mock.custom.styleContent',
-  };
-
-  it('should map theme registration data to storage data', () => {
-    const base = [baseThemeA, baseThemeB];
-    const custom = [customThemeA, customThemeB];
-
-    const actual = mapThemeRegistrationData({
-      base,
-      custom,
-    });
-
-    expect(actual).toEqual({
-      base: new Map([
-        [baseThemeA.themeKey, baseThemeA],
-        [baseThemeB.themeKey, baseThemeB],
-      ]),
-      custom: new Map([
-        [customThemeA.themeKey, customThemeA],
-        [customThemeB.themeKey, customThemeB],
-      ]),
-    });
-  });
-});
-
 describe('preloadTheme', () => {
   it.each([
     null,

packages/components/src/theme/ThemeUtils.ts

@@ -10,7 +10,6 @@ import {
   ThemePreloadData,
   ThemePreloadStyleContent,
   ThemeRegistrationData,
-  ThemeRegistrationStorageData,
   THEME_CACHE_LOCAL_STORAGE_KEY,
 } from './ThemeModel';
 
@@ -40,19 +39,25 @@ export function calculatePreloadStyleContent(): ThemePreloadStyleContent {
  */
 export function getActiveThemes(
   themeKey: string,
-  themeRegistration: ThemeRegistrationStorageData
+  themeRegistration: ThemeRegistrationData
 ): [ThemeData] | [ThemeData, ThemeData] {
-  const custom = themeRegistration.custom.get(themeKey);
+  const custom = themeRegistration.custom.find(
+    theme => theme.themeKey === themeKey
+  );
 
   const baseThemeKey = custom?.baseThemeKey ?? themeKey;
 
-  let base = themeRegistration.base.get(baseThemeKey);
+  let base = themeRegistration.base.find(
+    theme => theme.themeKey === baseThemeKey
+  );
 
   if (base == null) {
     log.error(
       `No registered base theme found for theme key: '${baseThemeKey}'`
     );
-    base = themeRegistration.base.get(DEFAULT_DARK_THEME_KEY);
+    base = themeRegistration.base.find(
+      theme => theme.themeKey === DEFAULT_DARK_THEME_KEY
+    );
 
     assertNotNull(
       base,
@@ -99,21 +104,6 @@ export function getThemePreloadData(): ThemePreloadData | null {
   return null;
 }
 
-/**
- * Map theme registration data to storage data.
- * @param themeRegistrationData
- */
-export function mapThemeRegistrationData(
-  themeRegistrationData: ThemeRegistrationData
-): ThemeRegistrationStorageData {
-  const { base, custom } = themeRegistrationData;
-
-  return {
-    base: new Map(base.map(theme => [theme.themeKey, theme])),
-    custom: new Map(custom.map(theme => [theme.themeKey, theme])),
-  };
-}
-
 /**
  * Store theme preload data in local storage.
  * @param preloadData The preload data to set

packages/components/src/theme/useInitializeThemeContextValue.test.ts

@@ -9,7 +9,6 @@ import {
 import {
   calculatePreloadStyleContent,
   getActiveThemes,
-  mapThemeRegistrationData,
   setThemePreloadData,
 } from './ThemeUtils';
 
@@ -67,7 +66,7 @@ describe('useInitializeThemeContextValue', () => {
 
         expect(getActiveThemes).toHaveBeenCalledWith(
           expectedThemeKey,
-          mapThemeRegistrationData(themeRegistration)
+          themeRegistration
         );
 
         expect(setThemePreloadData).toHaveBeenCalledWith({

packages/components/src/theme/useInitializeThemeContextValue.ts

@@ -1,16 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import Log from '@deephaven/log';
 import { ThemeContextValue } from './ThemeContext';
-import {
-  DEFAULT_DARK_THEME_KEY,
-  ThemeRegistrationData,
-  ThemeRegistrationStorageData,
-} from './ThemeModel';
+import { DEFAULT_DARK_THEME_KEY, ThemeRegistrationData } from './ThemeModel';
 import {
   calculatePreloadStyleContent,
   getActiveThemes,
   getThemePreloadData,
-  mapThemeRegistrationData,
   setThemePreloadData,
 } from './ThemeUtils';
 
@@ -25,7 +20,7 @@ export function useInitializeThemeContextValue(): ThemeContextValue {
   );
 
   const [themeRegistration, setThemeRegistration] =
-    useState<ThemeRegistrationStorageData | null>(null);
+    useState<ThemeRegistrationData | null>(null);
 
   const activeThemes = useMemo(
     () =>
@@ -40,11 +35,8 @@ export function useInitializeThemeContextValue(): ThemeContextValue {
    */
   const registerThemes = useCallback(
     (themeRegistrationData: ThemeRegistrationData) => {
-      const themeRegistrationStorage = mapThemeRegistrationData(
-        themeRegistrationData
-      );
-      log.debug('Registering themes', themeRegistrationStorage);
-      setThemeRegistration(themeRegistrationStorage);
+      log.debug('Registering themes', themeRegistrationData);
+      setThemeRegistration(themeRegistrationData);
     },
     []
   );