fix: loads of changes

The-Code-Monkey · Jan 5, 2023 · a8bcd71 · a8bcd71
1 parent c07eea9
commit a8bcd71
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 36 deletions.
diff --git a/packages/components/src/utils/theme-provider/create-theme.ts b/packages/components/src/utils/theme-provider/create-theme.ts
@@ -1,15 +1,15 @@
 import deepMerge from 'deepmerge';
 
-import { ThemeModeEnum } from './enum';
-import { ITheme } from './types';
+import {ITheme} from "../../theme/utils";
+import {ThemeModeEnum} from "../../theme/enum";
 
 const arrayMerge = (_destination: unknown[], source: unknown[]) => source;
 
 const getActiveMode = <V extends object>(
   theme?: ITheme<V>,
   parent?: ITheme<V>,
-  mode?: ThemeModeEnum
-): ThemeModeEnum => {
+  mode?: string
+): string => {
   if (mode) return mode;
   if (theme?.colors?.mode) return theme.colors.mode;
   if (parent?.colors?.mode) return parent.colors.mode;
@@ -19,7 +19,7 @@ const getActiveMode = <V extends object>(
 
 const applyMode = <V extends object>(
   theme?: ITheme<V>,
-  mode?: ThemeModeEnum
+  mode?: string
 ): ITheme<V> => {
   if (theme?.colors?.modes) {
     const colors = { ...theme.colors };
@@ -56,7 +56,7 @@ const applyMode = <V extends object>(
 };
 
 const createTheme =
-  <V extends object>(theme?: ITheme<V>, mode?: ThemeModeEnum) =>
+  <V extends object>(theme?: ITheme<V>, mode?: string) =>
   (parent): ITheme<V> => {
     const activeMode = getActiveMode<V>(theme, parent, mode);
     const themeWithAppliedMode = applyMode<V>(theme, activeMode);

diff --git a/packages/components/src/utils/theme-provider/index.ts b/packages/components/src/utils/theme-provider/index.ts
@@ -1,9 +1 @@
-export { ThemeModeEnum } from './enum';
 export { ThemeProvider } from './theme-provider';
-export {
-  ITheme,
-  IntentsType,
-  ColorType,
-  IThemeColorsType,
-  ModeThemeType,
-} from './types';
diff --git a/packages/components/src/utils/theme-provider/theme-provider.tsx b/packages/components/src/utils/theme-provider/theme-provider.tsx
@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
 import { ThemeProvider as StyledThemeProvider } from 'styled-components';
 
 import createTheme from './create-theme';
-import { ThemeModeEnum } from './enum';
-import { ITheme } from './types';
+import {ThemeModeEnum} from "../../theme/enum";
+import {ITheme} from "../../theme/utils";
 
 interface Props<V> {
   children: ReactNode;

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -19,7 +19,7 @@
     "copy:theme": "cp -r ./src/theme ./dist/esm",
     "copy:orchard": "cp ./orchard.theme.config.json ./dist/esm",
     "copy:ts": "cp -r ./ts ./dist/esm",
-    "lint": "tcm lint src",
+    "lint": "tcm lint src ts",
     "test": "yarn generate && yarn generate -b partial",
     "prepare": "yarn build",
     "size": "size-limit",

diff --git a/packages/theme/ts/colors.ts b/packages/theme/ts/colors.ts
@@ -1,10 +1,10 @@
-import { IThemeColorsType, ModeThemeType, ThemeModeEnum } from '../utils';
-
 import common from './dist/core';
 import darkMode from './dist/dark-mode';
 import intents from './dist/intents';
 import lightMode from './dist/light-mode';
 import neutrals from './dist/neutrals';
+import { ThemeModeEnum } from './enum';
+import { IThemeColorsType, ModeThemeType } from './utils';
 
 const dark: ModeThemeType = {
   mode: ThemeModeEnum.DARK,

diff --git a/...mponents/src/utils/theme-provider/enum.ts → packages/theme/ts/enum.ts b/...mponents/src/utils/theme-provider/enum.ts → packages/theme/ts/enum.ts
diff --git a/packages/theme/ts/index.ts b/packages/theme/ts/index.ts
@@ -1,5 +1,3 @@
-import { ITheme, IThemeColorsType, ModeThemeType } from '../utils';
-
 import colors from './colors';
 import variants from './defaultVariants';
 import borders from './dist/borders';
@@ -20,6 +18,7 @@ import sizes from './dist/sizes';
 import space from './dist/space';
 import spacing from './dist/spacing';
 import time from './dist/time';
+import { ITheme, IThemeColorsType, ModeThemeType } from './utils';
 
 const theme: ITheme<typeof variants> = {
   colors: colors as IThemeColorsType & ModeThemeType,

diff --git a/...ponents/src/utils/theme-provider/types.ts → packages/theme/ts/utils.ts b/...ponents/src/utils/theme-provider/types.ts → packages/theme/ts/utils.ts
@@ -1,6 +1,8 @@
 import { StandardProperties } from 'csstype';
 
-import { ThemeModeEnum } from './enum';
+type OptionalRecord<K extends string, T> = {
+  [P in K]?: T;
+};
 
 export type ColorType = Array<string> | Record<string, string>;
 
@@ -12,27 +14,14 @@ export type IntentsType = {
 };
 
 export type ModeThemeType = {
-  mode: ThemeModeEnum;
+  mode: string;
   text: string;
   highlight: string;
   highlights: ColorType;
   primary: ColorType;
   neutrals: ColorType;
   intents: IntentsType;
 };
-
-export type IThemeColorsType = {
-  mode?: ThemeModeEnum;
-  common: Record<string, string | ColorType>;
-  modes: {
-    [x in ThemeModeEnum]: ModeThemeType;
-  };
-};
-
-type OptionalRecord<K extends string, T> = {
-  [P in K]?: T;
-};
-
 export interface ITheme<V> {
   colors?: ModeThemeType & IThemeColorsType;
   variants?: V;
@@ -56,3 +45,11 @@ export interface ITheme<V> {
   [x: string]: unknown;
   defaultStyles?: OptionalRecord<string, unknown>;
 }
+
+export type IThemeColorsType = {
+  mode?: string;
+  common: Record<string, string | ColorType>;
+  modes: {
+    [x: string]: ModeThemeType;
+  };
+};