Add zindex to image

Author: Farkites

dist/plotly-cartesian.js

@@ -87391,19 +87391,19 @@ module.exports = $gOPD;
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 "use strict";
-
-
-var isBrowser = __webpack_require__(24200)
-var hasHover
-
-if (typeof __webpack_require__.g.matchMedia === 'function') {
-	hasHover = !__webpack_require__.g.matchMedia('(hover: none)').matches
-}
-else {
-	hasHover = isBrowser
-}
-
-module.exports = hasHover
+
+
+var isBrowser = __webpack_require__(24200)
+var hasHover
+
+if (typeof __webpack_require__.g.matchMedia === 'function') {
+	hasHover = !__webpack_require__.g.matchMedia('(hover: none)').matches
+}
+else {
+	hasHover = isBrowser
+}
+
+module.exports = hasHover
 
 
 /***/ }),
@@ -87412,30 +87412,30 @@ module.exports = hasHover
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 "use strict";
-
-
-var isBrowser = __webpack_require__(24200)
-
-function detect() {
-	var supported = false
-
-	try {
-		var opts = Object.defineProperty({}, 'passive', {
-			get: function() {
-				supported = true
-			}
-		})
-
-		window.addEventListener('test', null, opts)
-		window.removeEventListener('test', null, opts)
-	} catch(e) {
-		supported = false
-	}
-
-	return supported
-}
-
-module.exports = isBrowser && detect()
+
+
+var isBrowser = __webpack_require__(24200)
+
+function detect() {
+	var supported = false
+
+	try {
+		var opts = Object.defineProperty({}, 'passive', {
+			get: function() {
+				supported = true
+			}
+		})
+
+		window.addEventListener('test', null, opts)
+		window.removeEventListener('test', null, opts)
+	} catch(e) {
+		supported = false
+	}
+
+	return supported
+}
+
+module.exports = isBrowser && detect()
 
 
 /***/ }),
@@ -88021,41 +88021,41 @@ module.exports = function shimNumberIsNaN() {
 /***/ (function(module) {
 
 "use strict";
-
-
-/**
- * Is this string all whitespace?
- * This solution kind of makes my brain hurt, but it's significantly faster
- * than !str.trim() or any other solution I could find.
- *
- * whitespace codes from: http://en.wikipedia.org/wiki/Whitespace_character
- * and verified with:
- *
- *  for(var i = 0; i < 65536; i++) {
- *      var s = String.fromCharCode(i);
- *      if(+s===0 && !s.trim()) console.log(i, s);
- *  }
- *
- * which counts a couple of these as *not* whitespace, but finds nothing else
- * that *is* whitespace. Note that charCodeAt stops at 16 bits, but it appears
- * that there are no whitespace characters above this, and code points above
- * this do not map onto white space characters.
- */
-
-module.exports = function(str){
-    var l = str.length,
-        a;
-    for(var i = 0; i < l; i++) {
-        a = str.charCodeAt(i);
-        if((a < 9 || a > 13) && (a !== 32) && (a !== 133) && (a !== 160) &&
-            (a !== 5760) && (a !== 6158) && (a < 8192 || a > 8205) &&
-            (a !== 8232) && (a !== 8233) && (a !== 8239) && (a !== 8287) &&
-            (a !== 8288) && (a !== 12288) && (a !== 65279)) {
-                return false;
-        }
-    }
-    return true;
-}
+
+
+/**
+ * Is this string all whitespace?
+ * This solution kind of makes my brain hurt, but it's significantly faster
+ * than !str.trim() or any other solution I could find.
+ *
+ * whitespace codes from: http://en.wikipedia.org/wiki/Whitespace_character
+ * and verified with:
+ *
+ *  for(var i = 0; i < 65536; i++) {
+ *      var s = String.fromCharCode(i);
+ *      if(+s===0 && !s.trim()) console.log(i, s);
+ *  }
+ *
+ * which counts a couple of these as *not* whitespace, but finds nothing else
+ * that *is* whitespace. Note that charCodeAt stops at 16 bits, but it appears
+ * that there are no whitespace characters above this, and code points above
+ * this do not map onto white space characters.
+ */
+
+module.exports = function(str){
+    var l = str.length,
+        a;
+    for(var i = 0; i < l; i++) {
+        a = str.charCodeAt(i);
+        if((a < 9 || a > 13) && (a !== 32) && (a !== 133) && (a !== 160) &&
+            (a !== 5760) && (a !== 6158) && (a < 8192 || a > 8205) &&
+            (a !== 8232) && (a !== 8233) && (a !== 8239) && (a !== 8287) &&
+            (a !== 8288) && (a !== 12288) && (a !== 65279)) {
+                return false;
+        }
+    }
+    return true;
+}
 
 
 /***/ }),

src/traces/image/attributes.js

@@ -133,5 +133,15 @@ module.exports = extendFlat({
         keys: ['z', 'color', 'colormodel']
     }),
 
-    transforms: undefined
+    transforms: undefined,
+    zindex: {
+        valType: 'integer',
+        dflt: 0,
+        editType: 'calc',
+        description: [
+            'Sets the layer on which this trace is displayed, relative to ',
+            'other traces on the same axes. Traces with higher `zindex` ',
+            'appear in front of those with lower `zindex`.'
+        ].join(' ')
+    }
 });

src/traces/image/defaults.js

@@ -45,4 +45,6 @@ module.exports = function supplyDefaults(traceIn, traceOut) {
     coerce('hovertemplate');
 
     traceOut._length = null;
+
+    coerce('zindex');
 };

test/image/mocks/zindex-scatter-image.json

@@ -0,0 +1,23 @@
+{
+"data": [
+    {
+        "type": "scatter",
+        "y": ["E", "F", "G", "H"],
+        "x": ["A", "B", "C", "D"]
+        }, {
+        "type": "image",
+        "zmax": [1, 1, 1],
+        "x0": "B",
+        "y0": "F",
+        "z": [
+        [[1, 0, 0], [0, 1, 0], [0, 0, 1], [0, 0, 0]],
+        [[0, 1, 0], [0, 0, 1], [1, 0, 0], [0, 0, 0]],
+        [[1, 0, 0], [1, 0, 0], [0, 0, 1], [0, 0, 0]]
+        ],
+        "zindex":10
+    }
+],
+    "layout": {
+        "width": 400, "height": 600
+    }
+}