Browse Source

fixed cyclic color import

Alexander Rose 6 years ago
parent
commit
4edb0a6ef9

+ 8 - 4
src/mol-util/color/color.ts

@@ -5,11 +5,11 @@
  */
 
 /** RGB color triplet expressed as a single number */
-type Color = { readonly '@type': 'color' } & number
+export type Color = { readonly '@type': 'color' } & number
 
-function Color(hex: number) { return hex as Color }
+export function Color(hex: number) { return hex as Color }
 
-namespace Color {
+export namespace Color {
     export function toRgb(hexColor: Color) {
         return [ hexColor >> 16 & 255, hexColor >> 8 & 255, hexColor & 255 ]
     }
@@ -53,4 +53,8 @@ namespace Color {
     }
 }
 
-export default Color
+type ColorTable<T extends { [k: string]: number[] }> = { [k in keyof T]: Color[] }
+export function ColorTable<T extends { [k: string]: number[] }>(o: T) { return o as ColorTable<T> }
+
+type ColorMap<T extends { [k: string]: number }> = { [k in keyof T]: Color }
+export function ColorMap<T extends { [k: string]: number }>(o: T) { return o as ColorMap<T> }

+ 2 - 10
src/mol-util/color/index.ts

@@ -4,14 +4,6 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import Color from './color'
-import { ColorScale } from './scale';
-
-type ColorTable<T extends { [k: string]: number[] }> = { [k in keyof T]: Color[] }
-export function ColorTable<T extends { [k: string]: number[] }>(o: T) { return o as ColorTable<T> }
-
-type ColorMap<T extends { [k: string]: number }> = { [k in keyof T]: Color }
-export function ColorMap<T extends { [k: string]: number }>(o: T) { return o as ColorMap<T> }
-
-export { Color, ColorScale }
+export { Color, ColorMap, ColorTable } from './color'
+export { ColorScale } from './scale';
 export { ColorBrewer, ColorNames } from './tables'

+ 1 - 1
src/mol-util/color/scale.ts

@@ -4,7 +4,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import Color from './color'
+import { Color } from './color'
 import { ColorBrewer } from './tables'
 
 export interface ColorScale {

+ 1 - 1
src/mol-util/color/tables.ts

@@ -4,7 +4,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { ColorMap, ColorTable } from './index';
+import { ColorMap, ColorTable } from './color';
 
 /**
  * Brewer Color Lists