@@ -3,7 +3,7 @@ import _ from 'lodash';
3
3
import Color from 'color' ;
4
4
import { OpaqueColorValue } from 'react-native' ;
5
5
import tinycolor from 'tinycolor2' ;
6
- import { colorsPalette , themeColors } from './colorsPalette' ;
6
+ import { colorsPalette } from './colorsPalette' ;
7
7
import DesignTokens from './designTokens' ;
8
8
import DesignTokensDM from './designTokensDM' ;
9
9
//@ts -ignore
@@ -20,7 +20,7 @@ export class Colors {
20
20
private shouldSupportDarkMode = false ;
21
21
22
22
constructor ( ) {
23
- const colors = Object . assign ( colorsPalette , themeColors ) ;
23
+ const colors = Object . assign ( colorsPalette ) ;
24
24
Object . assign ( this , colors ) ;
25
25
this . loadSchemes ( { light : DesignTokens , dark : DesignTokensDM } ) ;
26
26
@@ -185,7 +185,7 @@ export class Colors {
185
185
const shouldReverseOnDark =
186
186
! options ?. avoidReverseOnDark && this . shouldSupportDarkMode && Scheme . getSchemeType ( ) === 'dark' ;
187
187
const key = shouldReverseOnDark ? colorKeys [ colorKeys . length - 1 - keyIndex ] : tintKey ;
188
-
188
+
189
189
const requiredColorKey = `${ colorKey . slice ( 0 , - 2 ) } ${ key } ` ;
190
190
const requiredColorKey1 = `${ colorKey . slice ( 0 , - 1 ) } ${ key } ` ;
191
191
const requiredColor = this [ requiredColorKey ] || this [ requiredColorKey1 ] ;
@@ -355,10 +355,7 @@ function threeDigitHexToSix(value: string) {
355
355
return value . replace ( / ./ g, '$&$&' ) ;
356
356
}
357
357
358
- const TypedColors = Colors as ExtendTypeWith <
359
- typeof Colors ,
360
- typeof colorsPalette & typeof themeColors & typeof DesignTokens
361
- > ;
358
+ const TypedColors = Colors as ExtendTypeWith < typeof Colors , typeof colorsPalette & typeof DesignTokens > ;
362
359
const colorObject = new TypedColors ( ) ;
363
360
colorObject . loadColors ( colorsPalette ) ;
364
361
export default colorObject ;
0 commit comments