fix: move typography color fix to proper file

styled-components · Oct 7, 2021 · 5c635b0 · 5c635b0
1 parent 1498d86
commit 5c635b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/system/src/styles/colors.ts b/packages/system/src/styles/colors.ts
@@ -1,12 +1,12 @@
 import * as CSS from 'csstype'
 import { themeGetter } from '../style'
-import { SystemProp, ThemeNamespaceValue, ITheme, Theme } from '../types'
+import { ThemeNamespaceValue, ITheme, Theme } from '../types'
 
 export type ThemeColor<T extends ITheme = Theme> = ThemeNamespaceValue<
   'colors',
   T
 >
-export type Color<T extends ITheme = Theme> = SystemProp<ThemeColor<T> | CSS.Property.Color, T>;
+export type Color<T extends ITheme = Theme> = ThemeColor<T> | CSS.Property.Color
 export const getColor = themeGetter<ThemeColor>({
   name: 'color',
   key: 'colors',

diff --git a/packages/system/src/styles/typography.ts b/packages/system/src/styles/typography.ts
@@ -110,7 +110,7 @@ export const letterSpacing = style<LetterSpacingProps>({
 // Color
 
 export interface ColorProps<T extends ITheme = Theme> {
-  color?: Color<T>
+  color?: SystemProp<Color<T>, T>
 }
 export const color = style<ColorProps>({
   prop: 'color',
@@ -231,7 +231,10 @@ export interface TextProps<T extends ITheme = Theme> {
 export const text = style<TextProps>({
   prop: 'text',
   key: 'texts',
-  css: (value) => ({ theme }: any) => all({ ...value, theme }),
+  css:
+    (value) =>
+    ({ theme }: any) =>
+      all({ ...value, theme }),
 })
 
 // @TODO add word-break