Merge branch 'release/2.0.0-rc.6'

VizArtJS · Mar 26, 2018 · d08672f · d08672f
2 parents cf71b0a + 767160b
commit d08672f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vizart-core",
-  "version": "2.0.0-rc.5",
+  "version": "2.0.0-rc.6",
   "description": "Core Components for VizArt",
   "main": "dist/vizart-core.js",
   "module": "dist/vizart-core.mjs",

diff --git a/src/layer/canvasLayer.js b/src/layer/canvasLayer.js
@@ -26,8 +26,8 @@ const CanvasState = ()=> ({
 });
 
 const canvasLayer = (containerId, opt, composers) => {
-  const state = initState(containerId, opt, Object.assign({}, defaultComposers, composers, CanvasState()));
-
+  const base = initState(containerId, opt, Object.assign({}, defaultComposers, composers));
+  const state = Object.assign(base, CanvasState());
 
   return Object.assign(
     state,