fix: export combined css var and themeToVar

toeverything · Oct 28, 2024 · ed1e9ce · ed1e9ce
1 parent fed5691
commit ed1e9ce
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/packages/theme/src/index.css.ts b/packages/theme/src/index.css.ts
@@ -1,21 +1,10 @@
 import { globalStyle } from '@vanilla-extract/css';
 
 import {
-  darkCssVariables,
-  lightCssVariables,
+  combinedDarkCssVariables,
+  combinedLightCssVariables,
   printCssVariables,
 } from './index';
-import { darkCssVariablesV2, lightCssVariablesV2 } from './v2';
-
-export const combinedLightCssVariables = {
-  ...lightCssVariables,
-  ...lightCssVariablesV2,
-};
-
-export const combinedDarkCssVariables = {
-  ...darkCssVariables,
-  ...darkCssVariablesV2,
-};
 
 globalStyle(':root', {
   vars: combinedLightCssVariables,

diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
@@ -1,4 +1,5 @@
 import { grabbingCursor, grabCursor } from './cursors';
+import { darkCssVariablesV2, lightCssVariablesV2 } from './v2';
 
 export const camelToKebab = (s: string) => {
   if (typeof s !== 'string') return '';
@@ -14,7 +15,7 @@ export const camelToKebab = (s: string) => {
 const toCSSCursor = (cursor: string, fallbacks: string[]) => {
   return `url(${cursor}), ${fallbacks.join(', ')}`;
 };
-const themeToVar = (themeName: keyof AffineTheme) =>
+export const themeToVar = (themeName: keyof AffineTheme) =>
   `--affine-${camelToKebab(themeName)}` as keyof AffineCssVariables;
 const objectEntries = <T extends Record<string, any>>(
   obj: T
@@ -454,6 +455,16 @@ export const lightCssVariables = createVariables(lightTheme);
 export const darkCssVariables = createVariables(darkTheme);
 export const printCssVariables = createVariables(printTheme);
 
+export const combinedLightCssVariables = {
+  ...lightCssVariables,
+  ...lightCssVariablesV2,
+};
+
+export const combinedDarkCssVariables = {
+  ...darkCssVariables,
+  ...darkCssVariablesV2,
+};
+
 /**
  * Get AFFiNE css variable name type safely
  * @param key in camel or kebab format