Merge branch 'release/2.0.2'

VizArtJS · Dec 9, 2018 · 9165d4d · 9165d4d
2 parents cad6bbb + bc7b3fb
commit 9165d4d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vizart-geo",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "VizArt: Geo",
   "main": "dist/vizart-geo.js",
   "module": "dist/vizart-geo.esm.js",

diff --git a/src/choropleth/api-color.js b/src/choropleth/api-color.js
@@ -1,7 +1,21 @@
 const apiColor = state => ({
   color(colorOptions) {
-    state._options.color = colorOptions;
-    state._color = state._composers.color(colorOptions);
+    if (!colorOptions) {
+      console.warn('color opt is null, either scheme or type is required');
+      return;
+    } else if (!colorOptions.type && !colorOptions.scheme) {
+      console.warn('invalid color opt, either scheme or type is required');
+      return;
+    }
+
+    if (colorOptions.type) {
+      state._options.color.type = colorOptions.type;
+    }
+
+    if (colorOptions.scheme) {
+      state._options.color.scheme = colorOptions.scheme;
+    }
+    state._color = state._composers.color(state._options.color);
 
     const { _svg, _options, _c } = state;
     _svg