Merge branch 'release/2.0.0-rc.1'

VizArtJS · Mar 24, 2018 · 907433b · 907433b
2 parents b4694b4 + cbc1c27
commit 907433b
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 37 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -45,28 +45,6 @@
     </style>
 </head>
 <body>
-<a class="card card-1" href="scientific-color.html">
-    <div class="title">Colorspace Network</div>
-</a>
-
-<a class="card card-1" href="colorspace-select.html">
-    <div class="title">Colorspace Selector</div>
-</a>
-
-<a class="card card-1" href="color-rects.html">
-    <div class="title">Color Tiles</div>
-</a>
-<a class="card card-1" href="twitter.html">
-    <div class="title">Twitter</div>
-</a>
-
-<a class="card card-1" href="./stack-overflow.html">
-    <div class="title">Stackoverflow</div>
-</a>
-
-<a class="card card-1" href="./keiko.html">
-    <div class="title">Keiko</div>
-</a>
-
+None
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vizart-core",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.1",
   "description": "Core Components for VizArt",
   "main": "dist/vizart-core.js",
   "module": "dist/vizart-core.mjs",

diff --git a/src/baseChart/index.js b/src/baseChart/index.js
diff --git a/src/canvas/helper/radial-gradient.js b/src/canvas/helper/radial-gradient.js
@@ -1,4 +1,3 @@
-import { hsl } from 'd3-color';
 import linearStops from '../../color/filter/linear-stops';
 
 /**

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 = {