refactor layers

VizArtJS · Mar 24, 2018 · 7a8d862 · 7a8d862
1 parent beebdb2
commit 7a8d862
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/baseChart/index.js b/src/baseChart/index.js
diff --git a/src/color/scale/generic.js b/src/color/scale/generic.js
@@ -1,6 +1,6 @@
 import { max } from 'd3-array';
 
-import Globals from '../../baseChart/Globals';
+import Globals from '../../layer/Globals';
 
 import gradientColor from './gradient';
 import distinctColor from './distinct';

diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,6 @@
 export { version } from '../package.json';
 
-export * from './baseChart';
+export * from './layer';
 export * from './color';
 export * from './options';
 export * from './util';

diff --git a/src/baseChart/Globals.js → src/layer/Globals.js b/src/baseChart/Globals.js → src/layer/Globals.js
diff --git a/src/baseChart/canvasChart.js → src/layer/canvasLayer.js b/src/baseChart/canvasChart.js → src/layer/canvasLayer.js
@@ -23,7 +23,7 @@ const CanvasState = {
   _animationState: null,
 };
 
-const canvas = (containerId, opt, composers = defaultComposers) => {
+const canvasLayer = (containerId, opt, composers = defaultComposers) => {
   const state = Object.assign(
     {},
     initState(containerId, opt, composers),
@@ -43,4 +43,4 @@ const canvas = (containerId, opt, composers = defaultComposers) => {
   );
 };
 
-export default canvas;
+export default canvasLayer;
diff --git a/src/baseChart/compose.js → src/layer/compose.js b/src/baseChart/compose.js → src/layer/compose.js
diff --git a/src/layer/index.js b/src/layer/index.js
@@ -0,0 +1,4 @@
+export { default as svgLayer } from './svgLayer';
+export { default as canvasLayer } from './canvasLayer';
+export { default as Globals } from './Globals';
+export * from './compose';
diff --git a/src/baseChart/svgChart.js → src/layer/svgLayer.js b/src/baseChart/svgChart.js → src/layer/svgLayer.js
@@ -15,7 +15,7 @@ const defaultComposers = {
   color: (color, data, opt) => genericColor(color),
 };
 
-const svg = (containerId, opt, composers = defaultComposers) => {
+const svgLayer = (containerId, opt, composers = defaultComposers) => {
   const state = initState(containerId, opt, composers);
 
   return Object.assign(
@@ -29,4 +29,4 @@ const svg = (containerId, opt, composers = defaultComposers) => {
   );
 };
 
-export default svg;
+export default svgLayer;
diff --git a/src/options/DefaultCategoricalColor.js b/src/options/DefaultCategoricalColor.js
@@ -1,4 +1,4 @@
-import Globals from '../baseChart/Globals';
+import Globals from '../layer/Globals';
 import { TheMetLight } from '../color/preset/metropolis';
 
 const DefaultCategoricalColor = {

diff --git a/src/options/DefaultSequentialColor.js b/src/options/DefaultSequentialColor.js
@@ -1,4 +1,4 @@
-import Globals from '../baseChart/Globals';
+import Globals from '../layer/Globals';
 import { MetroRain3 } from '../color/preset/metropolis';
 
 const DefaultSequentialColor = {