Re-organized base themes

deephaven#1542
bmingles · Oct 10, 2023 · 0302957 · 0302957
1 parent 9f428e5
commit 0302957
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 7 deletions.
diff --git a/packages/components/src/theme/ThemeUtils.test.ts b/packages/components/src/theme/ThemeUtils.test.ts
@@ -191,7 +191,7 @@ describe('getDefaultBaseThemes', () => {
       {
         name: 'Default Dark',
         themeKey: 'default-dark',
-        styleContent: 'test-file-stub\ntest-file-stub',
+        styleContent: 'test-file-stub\ntest-file-stub\ntest-file-stub',
       },
       {
         name: 'Default Light',

diff --git a/packages/components/src/theme/ThemeUtils.ts b/packages/components/src/theme/ThemeUtils.ts
@@ -12,9 +12,8 @@ import { assertNotNull, ColorUtils } from '@deephaven/utils';
 //    },
 //  ],
 // },
-import darkThemePalette from './theme_default_dark_palette.css?inline';
-import darkThemeSemantic from './theme_default_dark_semantic.css?inline';
-import lightTheme from './theme_default_light.css?inline';
+import { themeDark } from './theme-dark';
+import { themeLight } from './theme-light';
 import {
   DEFAULT_DARK_THEME_KEY,
   DEFAULT_LIGHT_THEME_KEY,
@@ -117,12 +116,12 @@ export function getDefaultBaseThemes(): ThemeData[] {
     {
       name: 'Default Dark',
       themeKey: DEFAULT_DARK_THEME_KEY,
-      styleContent: [darkThemePalette, darkThemeSemantic].join('\n'),
+      styleContent: themeDark,
     },
     {
       name: 'Default Light',
       themeKey: DEFAULT_LIGHT_THEME_KEY,
-      styleContent: lightTheme,
+      styleContent: themeLight,
     },
   ];
 }

diff --git a/packages/components/src/theme/__snapshots__/ThemeProvider.test.tsx.snap b/packages/components/src/theme/__snapshots__/ThemeProvider.test.tsx.snap
@@ -22,6 +22,7 @@ exports[`ThemeProvider setSelectedThemeKey: [ [Object] ] should change selected
       data-theme-key="default-dark"
     >
       test-file-stub
+test-file-stub
 test-file-stub
     </style>
     <style
@@ -61,6 +62,7 @@ exports[`ThemeProvider should load themes based on preload data or default: [ [O
       data-theme-key="default-dark"
     >
       test-file-stub
+test-file-stub
 test-file-stub
     </style>
     <style
@@ -80,6 +82,7 @@ exports[`ThemeProvider should load themes based on preload data or default: [ [O
       data-theme-key="default-dark"
     >
       test-file-stub
+test-file-stub
 test-file-stub
     </style>
     <div>

diff --git a/packages/components/src/theme/theme-dark/index.ts b/packages/components/src/theme/theme-dark/index.ts
@@ -0,0 +1,11 @@
+import themeDarkPalette from './theme-dark-palette.css?inline';
+import themeDarkSemantic from './theme-dark-semantic.css?inline';
+import themeDarkSemanticGrid from './theme-dark-semantic-grid.css?inline';
+
+export const themeDark = [
+  themeDarkPalette,
+  themeDarkSemantic,
+  themeDarkSemanticGrid,
+].join('\n');
+
+export default themeDark;
diff --git a/.../src/theme/theme_default_dark_palette.css → ...c/theme/theme-dark/theme-dark-palette.css b/.../src/theme/theme_default_dark_palette.css → ...c/theme/theme-dark/theme-dark-palette.css
diff --git a/packages/components/src/theme/theme-dark/theme-dark-semantic-grid.css b/packages/components/src/theme/theme-dark/theme-dark-semantic-grid.css
@@ -0,0 +1,3 @@
+:root {
+  --dh-color-grid-background: var(--dh-color-background);
+}
diff --git a/...src/theme/theme_default_dark_semantic.css → .../theme/theme-dark/theme-dark-semantic.css b/...src/theme/theme_default_dark_semantic.css → .../theme/theme-dark/theme-dark-semantic.css
@@ -5,7 +5,6 @@
   --dh-color-border: var(--dh-color-gray-500);
   --dh-color-background: var(--dh-color-black);
   --dh-color-foreground: var(--dh-color-white);
-  --dh-color-grid-background: var(--dh-color-background);
   --dh-color-content-background: var(--dh-color-gray-100);
 
   /* Text */

diff --git a/packages/components/src/theme/theme-light/index.ts b/packages/components/src/theme/theme-light/index.ts
@@ -0,0 +1,5 @@
+import themeLightPalette from './theme-light-palette.css?inline';
+
+export const themeLight = themeLightPalette;
+
+export default themeLight;
diff --git a/...ponents/src/theme/theme_default_light.css → ...theme/theme-light/theme-light-palette.css b/...ponents/src/theme/theme_default_light.css → ...theme/theme-light/theme-light-palette.css