@vitessce/scatterplot 3.4.14 → 3.5.0

package/dist/{deflate-a9048cdd.js → deflate-c981dfb9.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { B as BaseDecoder } from "./index-eee2d28f.js";
+import { B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{index-eee2d28f.js → index-0fd62e4a.js}

@@ -73744,7 +73744,7 @@ keysShim.shim = function shimObjectKeys() {
   return Object.keys || keysShim;
 };
 var objectKeys$1 = keysShim;
-var shams$2 = function hasSymbols() {
+var shams$1 = function hasSymbols() {
   if (typeof Symbol !== "function" || typeof Object.getOwnPropertySymbols !== "function") {
     return false;
   }
@@ -73789,9 +73789,9 @@ var shams$2 = function hasSymbols() {
   }
   return true;
 };
-var hasSymbols$4 = shams$2;
-var shams$1 = function hasToStringTagShams() {
-  return hasSymbols$4() && !!Symbol.toStringTag;
+var hasSymbols$3 = shams$1;
+var shams = function hasToStringTagShams() {
+  return hasSymbols$3() && !!Symbol.toStringTag;
 };
 var esErrors = Error;
 var _eval = EvalError;
@@ -73801,8 +73801,8 @@ var syntax = SyntaxError;
 var type = TypeError;
 var uri = URIError;
 var origSymbol = typeof Symbol !== "undefined" && Symbol;
-var hasSymbolSham = shams$2;
-var hasSymbols$3 = function hasNativeSymbols() {
+var hasSymbolSham = shams$1;
+var hasSymbols$2 = function hasNativeSymbols() {
   if (typeof origSymbol !== "function") {
     return false;
   }
@@ -73818,11 +73818,12 @@ var hasSymbols$3 = function hasNativeSymbols() {
   return hasSymbolSham();
 };
 var test = {
+  __proto__: null,
   foo: {}
 };
 var $Object$1 = Object;
 var hasProto$1 = function hasProto() {
-  return { __proto__: test }.foo === test.foo && !({ __proto__: null } instanceof $Object$1);
+  return { __proto__: test }.foo === test.foo && !(test instanceof $Object$1);
 };
 var ERROR_MESSAGE = "Function.prototype.bind called on incompatible ";
 var toStr$2 = Object.prototype.toString;
@@ -73937,7 +73938,7 @@ var ThrowTypeError = $gOPD$2 ? function() {
     }
   }
 }() : throwTypeError;
-var hasSymbols$2 = hasSymbols$3();
+var hasSymbols$1 = hasSymbols$2();
 var hasProto2 = hasProto$1();
 var getProto$1 = Object.getPrototypeOf || (hasProto2 ? function(x2) {
   return x2.__proto__;
@@ -73949,7 +73950,7 @@ var INTRINSICS = {
   "%AggregateError%": typeof AggregateError === "undefined" ? undefined$1 : AggregateError,
   "%Array%": Array,
   "%ArrayBuffer%": typeof ArrayBuffer === "undefined" ? undefined$1 : ArrayBuffer,
-  "%ArrayIteratorPrototype%": hasSymbols$2 && getProto$1 ? getProto$1([][Symbol.iterator]()) : undefined$1,
+  "%ArrayIteratorPrototype%": hasSymbols$1 && getProto$1 ? getProto$1([][Symbol.iterator]()) : undefined$1,
   "%AsyncFromSyncIteratorPrototype%": undefined$1,
   "%AsyncFunction%": needsEval,
   "%AsyncGenerator%": needsEval,
@@ -73980,10 +73981,10 @@ var INTRINSICS = {
   "%Int32Array%": typeof Int32Array === "undefined" ? undefined$1 : Int32Array,
   "%isFinite%": isFinite,
   "%isNaN%": isNaN,
-  "%IteratorPrototype%": hasSymbols$2 && getProto$1 ? getProto$1(getProto$1([][Symbol.iterator]())) : undefined$1,
+  "%IteratorPrototype%": hasSymbols$1 && getProto$1 ? getProto$1(getProto$1([][Symbol.iterator]())) : undefined$1,
   "%JSON%": typeof JSON === "object" ? JSON : undefined$1,
   "%Map%": typeof Map === "undefined" ? undefined$1 : Map,
-  "%MapIteratorPrototype%": typeof Map === "undefined" || !hasSymbols$2 || !getProto$1 ? undefined$1 : getProto$1((/* @__PURE__ */ new Map())[Symbol.iterator]()),
+  "%MapIteratorPrototype%": typeof Map === "undefined" || !hasSymbols$1 || !getProto$1 ? undefined$1 : getProto$1((/* @__PURE__ */ new Map())[Symbol.iterator]()),
   "%Math%": Math,
   "%Number%": Number,
   "%Object%": Object,
@@ -73996,11 +73997,11 @@ var INTRINSICS = {
   "%Reflect%": typeof Reflect === "undefined" ? undefined$1 : Reflect,
   "%RegExp%": RegExp,
   "%Set%": typeof Set === "undefined" ? undefined$1 : Set,
-  "%SetIteratorPrototype%": typeof Set === "undefined" || !hasSymbols$2 || !getProto$1 ? undefined$1 : getProto$1((/* @__PURE__ */ new Set())[Symbol.iterator]()),
+  "%SetIteratorPrototype%": typeof Set === "undefined" || !hasSymbols$1 || !getProto$1 ? undefined$1 : getProto$1((/* @__PURE__ */ new Set())[Symbol.iterator]()),
   "%SharedArrayBuffer%": typeof SharedArrayBuffer === "undefined" ? undefined$1 : SharedArrayBuffer,
   "%String%": String,
-  "%StringIteratorPrototype%": hasSymbols$2 && getProto$1 ? getProto$1(""[Symbol.iterator]()) : undefined$1,
-  "%Symbol%": hasSymbols$2 ? Symbol : undefined$1,
+  "%StringIteratorPrototype%": hasSymbols$1 && getProto$1 ? getProto$1(""[Symbol.iterator]()) : undefined$1,
+  "%Symbol%": hasSymbols$1 ? Symbol : undefined$1,
   "%SyntaxError%": $SyntaxError$1,
   "%ThrowTypeError%": ThrowTypeError,
   "%TypedArray%": TypedArray,
@@ -74369,7 +74370,7 @@ var callBound$2 = function callBoundIntrinsic(name2, allowMissing) {
   }
   return intrinsic;
 };
-var hasToStringTag$2 = shams$1();
+var hasToStringTag$2 = shams();
 var callBound$1 = callBound$2;
 var $toString$1 = callBound$1("Object.prototype.toString");
 var isStandardArguments = function isArguments2(value) {
@@ -74414,7 +74415,7 @@ hasPropertyDescriptors2.hasArrayLengthDefineBug = function hasArrayLengthDefineB
 };
 var hasPropertyDescriptors_1 = hasPropertyDescriptors2;
 var keys$1 = objectKeys$1;
-var hasSymbols$1 = typeof Symbol === "function" && typeof Symbol("foo") === "symbol";
+var hasSymbols2 = typeof Symbol === "function" && typeof Symbol("foo") === "symbol";
 var toStr$1 = Object.prototype.toString;
 var concat = Array.prototype.concat;
 var defineDataProperty2 = defineDataProperty$1;
@@ -74441,7 +74442,7 @@ var defineProperty$3 = function(object2, name2, value, predicate) {
 var defineProperties = function(object2, map2) {
   var predicates = arguments.length > 2 ? arguments[2] : {};
   var props = keys$1(map2);
-  if (hasSymbols$1) {
+  if (hasSymbols2) {
     props = concat.call(props, Object.getOwnPropertySymbols(map2));
   }
   for (var i2 = 0; i2 < props.length; i2 += 1) {
@@ -74492,10 +74493,6 @@ define$2(polyfill$1, {
   shim: shim$2
 });
 var objectIs = polyfill$1;
-var hasSymbols2 = shams$2;
-var shams = function hasToStringTagShams2() {
-  return hasSymbols2() && !!Symbol.toStringTag;
-};
 var callBound = callBound$2;
 var hasToStringTag$1 = shams();
 var has$3;
@@ -74702,7 +74699,7 @@ var tryDateObject = function tryDateGetDayCall(value) {
 };
 var toStr = Object.prototype.toString;
 var dateClass = "[object Date]";
-var hasToStringTag = shams$1();
+var hasToStringTag = shams();
 var isDateObject = function isDateObject2(value) {
   if (typeof value !== "object" || value === null) {
     return false;
@@ -108022,16 +108019,16 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-3ece8be3.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-d2cff9a8.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-686ef1b1.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-12f5daf8.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-7c226d63.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-a9048cdd.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-43302cb2.js").then((m2) => m2.default));
-addDecoder(34887, () => import("./lerc-0384b6ad.js").then((m2) => m2.default));
-addDecoder(50001, () => import("./webimage-4065dcff.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-cb535ab0.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-c981dfb9.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-7d462060.js").then((m2) => m2.default));
+addDecoder(34887, () => import("./lerc-263d6f89.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-07e9e96a.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset5 = 0;
@@ -132994,6 +132991,7 @@ const CELLS_LAYER_ID = "scatterplot";
 const LABEL_FONT_FAMILY = "-apple-system, 'Helvetica Neue', Arial, sans-serif";
 const NUM_FORCE_SIMULATION_TICKS = 100;
 const LABEL_UPDATE_ZOOM_DELTA = 0.25;
+const POINT_LAYER_Z_INDEX = 0;
 const makeDefaultGetCellColors = (cellColors, obsIndex, theme) => (object2, { index: index2 }) => {
   const [r2, g2, b, a2] = cellColors && obsIndex && cellColors.get(obsIndex[index2]) || getDefaultColor(theme);
   return [r2, g2, b, 255 * (a2 || 1)];
@@ -133011,7 +133009,7 @@ const makeFlippedGetObsCoords = (obsEmbedding) => (i2) => [
 const getPosition = (object2, { index: index2, data, target }) => {
   target[0] = data.src.obsEmbedding.data[0][index2];
   target[1] = -data.src.obsEmbedding.data[1][index2];
-  target[2] = 0;
+  target[2] = POINT_LAYER_Z_INDEX;
   return target;
 };
 const contourGetWeight = (object2, { index: index2, data }) => data.src.featureValues[index2];
@@ -133021,7 +133019,6 @@ const contourGetPosition = (object2, { index: index2, data, target }) => {
   target[2] = 0;
   return target;
 };
-const contourGetPolygonOffset = () => [0, 20];
 class Scatterplot extends AbstractSpatialOrScatterplot {
   constructor(props) {
     super(props);
@@ -133069,7 +133066,6 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
         data: deckData,
         getWeight: contourGetWeight,
         getPosition: contourGetPosition,
-        getPolygonOffset: contourGetPolygonOffset,
         contours: contourThresholds.map((threshold, i2) => ({
           threshold: contoursFilled ? [threshold, threshold[i2 + 1] || Infinity] : threshold,
           // TODO: should the opacity steps be uniform? Should align with human perception.
@@ -133080,7 +133076,10 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
             // a
             contoursFilled ? (i2 + 0.5) / contourThresholds.length * 255 : (i2 + 1) / contourThresholds.length * 255
           ],
-          strokeWidth: 2
+          strokeWidth: 2,
+          // We need to specify a greater z-index so that the contour layers
+          // will render on top of the point layer.
+          zIndex: POINT_LAYER_Z_INDEX + 1 + i2
         })),
         aggregation: "MEAN",
         gpuAggregation: true,

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A, E, S, a, b, f, e, d, c } from "./index-eee2d28f.js";
+import { A, E, S, a, b, f, e, d, c } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-7c226d63.js → jpeg-cb535ab0.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eee2d28f.js";
+import { B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lerc-0384b6ad.js → lerc-263d6f89.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-eee2d28f.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lzw-d2cff9a8.js → lzw-12f5daf8.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eee2d28f.js";
+import { B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{packbits-43302cb2.js → packbits-7d462060.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eee2d28f.js";
+import { B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{raw-3ece8be3.js → raw-686ef1b1.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eee2d28f.js";
+import { B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{webimage-4065dcff.js → webimage-07e9e96a.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-eee2d28f.js";
+import { B as BaseDecoder } from "./index-0fd62e4a.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist-tsc/Scatterplot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scatterplot.d.ts","sourceRoot":"","sources":["../src/Scatterplot.js"],"names":[],"mappings":";AAshBA;;;;;;GAMG;AACH,sCAKG"}
+{"version":3,"file":"Scatterplot.d.ts","sourceRoot":"","sources":["../src/Scatterplot.js"],"names":[],"mappings":";AA+hBA;;;;;;GAMG;AACH,sCAKG"}

package/dist-tsc/Scatterplot.js

@@ -10,6 +10,15 @@ const CELLS_LAYER_ID = 'scatterplot';
 const LABEL_FONT_FAMILY = "-apple-system, 'Helvetica Neue', Arial, sans-serif";
 const NUM_FORCE_SIMULATION_TICKS = 100;
 const LABEL_UPDATE_ZOOM_DELTA = 0.25;
+// The TextLayer does not support passing a z-index or a getPolygonOffset,
+// so it is implicitly rendered at z-index 0.
+// We want the remaining layers to render below the text layers.
+// eslint-disable-next-line no-unused-vars
+const TEXT_LAYER_Z_INDEX = 0;
+// For some reason, setting this to -10, while it solves the issue for
+// text+contour+points, it also results in the points not appearing at
+// certain zoom levels.
+const POINT_LAYER_Z_INDEX = 0;
 // Default getter function props.
 const makeDefaultGetCellColors = (cellColors, obsIndex, theme) => (object, { index }) => {
     const [r, g, b, a] = (cellColors && obsIndex && cellColors.get(obsIndex[index]))
@@ -29,7 +38,7 @@ const makeFlippedGetObsCoords = obsEmbedding => i => ([
 const getPosition = (object, { index, data, target }) => {
     target[0] = data.src.obsEmbedding.data[0][index];
     target[1] = -data.src.obsEmbedding.data[1][index];
-    target[2] = 0;
+    target[2] = POINT_LAYER_Z_INDEX;
     return target;
 };
 const contourGetWeight = (object, { index, data }) => data.src.featureValues[index];
@@ -39,7 +48,6 @@ const contourGetPosition = (object, { index, data, target }) => {
     target[2] = 0;
     return target;
 };
-const contourGetPolygonOffset = () => ([0, 20]);
 /**
  * React component which renders a scatterplot from cell data.
  * @param {object} props
@@ -125,7 +133,6 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
                 data: deckData,
                 getWeight: contourGetWeight,
                 getPosition: contourGetPosition,
-                getPolygonOffset: contourGetPolygonOffset,
                 contours: contourThresholds.map((threshold, i) => ({
                     threshold: (contoursFilled ? [threshold, threshold[i + 1] || Infinity] : threshold),
                     // TODO: should the opacity steps be uniform? Should align with human perception.
@@ -139,6 +146,9 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
                             : ((i + 1) / (contourThresholds.length)) * 255),
                     ],
                     strokeWidth: 2,
+                    // We need to specify a greater z-index so that the contour layers
+                    // will render on top of the point layer.
+                    zIndex: POINT_LAYER_Z_INDEX + 1 + i,
                 })),
                 aggregation: 'MEAN',
                 gpuAggregation: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitessce/scatterplot",
-  "version": "3.4.14",
-  "author": "Gehlenborg Lab",
+  "version": "3.5.0",
+  "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
     "type": "git",
@@ -23,12 +23,12 @@
     "d3-quadtree": "^1.0.7",
     "lodash-es": "^4.17.21",
     "react-aria": "^3.28.0",
-    "@vitessce/constants-internal": "3.4.14",
-    "@vitessce/gl": "3.4.14",
-    "@vitessce/icons": "3.4.14",
-    "@vitessce/tooltip": "3.4.14",
-    "@vitessce/utils": "3.4.14",
-    "@vitessce/vit-s": "3.4.14"
+    "@vitessce/constants-internal": "3.5.0",
+    "@vitessce/gl": "3.5.0",
+    "@vitessce/icons": "3.5.0",
+    "@vitessce/tooltip": "3.5.0",
+    "@vitessce/utils": "3.5.0",
+    "@vitessce/vit-s": "3.5.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",

package/src/Scatterplot.js

@@ -15,6 +15,16 @@ const LABEL_FONT_FAMILY = "-apple-system, 'Helvetica Neue', Arial, sans-serif";
 const NUM_FORCE_SIMULATION_TICKS = 100;
 const LABEL_UPDATE_ZOOM_DELTA = 0.25;
 
+// The TextLayer does not support passing a z-index or a getPolygonOffset,
+// so it is implicitly rendered at z-index 0.
+// We want the remaining layers to render below the text layers.
+// eslint-disable-next-line no-unused-vars
+const TEXT_LAYER_Z_INDEX = 0;
+// For some reason, setting this to -10, while it solves the issue for
+// text+contour+points, it also results in the points not appearing at
+// certain zoom levels.
+const POINT_LAYER_Z_INDEX = 0;
+
 // Default getter function props.
 const makeDefaultGetCellColors = (cellColors, obsIndex, theme) => (object, { index }) => {
   const [r, g, b, a] = (cellColors && obsIndex && cellColors.get(obsIndex[index]))
@@ -34,7 +44,7 @@ const makeFlippedGetObsCoords = obsEmbedding => i => ([
 const getPosition = (object, { index, data, target }) => {
   target[0] = data.src.obsEmbedding.data[0][index];
   target[1] = -data.src.obsEmbedding.data[1][index];
-  target[2] = 0;
+  target[2] = POINT_LAYER_Z_INDEX;
   return target;
 };
 
@@ -48,9 +58,6 @@ const contourGetPosition = (object, { index, data, target }) => {
   return target;
 };
 
-const contourGetPolygonOffset = () => ([0, 20]);
-
-
 /**
  * React component which renders a scatterplot from cell data.
  * @param {object} props
@@ -154,7 +161,6 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
             data: deckData,
             getWeight: contourGetWeight,
             getPosition: contourGetPosition,
-            getPolygonOffset: contourGetPolygonOffset,
             contours: contourThresholds.map((threshold, i) => ({
               threshold: (contoursFilled ? [threshold, threshold[i + 1] || Infinity] : threshold),
               // TODO: should the opacity steps be uniform? Should align with human perception.
@@ -168,6 +174,9 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
                   : ((i + 1) / (contourThresholds.length)) * 255),
               ],
               strokeWidth: 2,
+              // We need to specify a greater z-index so that the contour layers
+              // will render on top of the point layer.
+              zIndex: POINT_LAYER_Z_INDEX + 1 + i,
             })),
             aggregation: 'MEAN',
             gpuAggregation: true,