Merge pull request qntln#2 from vojty/hotfix/new-element-z-index

 Keep defined RenderLayer zIndex

Author: vitawasalreadytaken

.eslintrc.js

@@ -6,14 +6,5 @@ module.exports = {
     node: true
   },
   plugins: ["prettier", "react"],
-  rules: {
-    "prettier/prettier": "error",
-    "prefer-const": "error",
-    "no-use-before-define": "error",
-    "no-var": "error",
-    "no-throw-literal": "error",
-    // Light console usage is useful but remove debug logs before merging to master.
-    "no-console": "off"
-  },
   extends: ["prettier", "plugin:react/recommended", "eslint:recommended"]
 };

.gitignore

@@ -2,4 +2,5 @@ node_modules
 npm-debug.log
 .idea
 storybook-static
-dist
+dist
+yarn-error.log

package.json

@@ -11,7 +11,9 @@
     "build": "rimraf dist && babel src --out-dir dist",
     "storybook": "start-storybook -p 6006 -c .storybook",
     "build-storybook": "build-storybook -c .storybook",
-    "prepare": "yarn build"
+    "prepare": "yarn build",
+    "prettier": "prettier src/**/* --write",
+    "lint": "eslint src/**/*"
   },
   "keywords": [
     "react",

src/CanvasRenderer.js

@@ -212,7 +212,7 @@ CanvasRenderer.injectIntoDevTools({
   version: React.version || 16,
   rendererPackageName: "react-canvas",
   getInspectorDataForViewTag: (...args) => {
-    console.log(args);
+    console.log(args); // eslint-disable-line no-console
   }
 });
 

src/DrawingUtils.js

@@ -405,7 +405,7 @@ drawRenderLayer = (ctx, layer) => {
   if (saveContext) {
     ctx.restore();
   }
-}
+};
 
 /**
  * Draw a bitmap-cacheable layer into a pooled <canvas>. The result will be

src/RenderLayer.js

@@ -83,7 +83,7 @@ RenderLayer.prototype = {
     const beforeIndex = parentLayer.children.indexOf(beforeLayer);
     parentLayer.children.splice(beforeIndex, 0, this);
     this.parentLayer = parentLayer;
-    this.zIndex = beforeLayer.zIndex || 0;
+    this.zIndex = this.zIndex || beforeLayer.zIndex || 0;
   },
 
   /**