@vitessce/scatterplot 3.3.1 → 3.3.3

package/dist/{deflate-d286fc81.js → deflate-592075d1.js}

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

package/dist/{index-1144f987.js → index-013d5fd5.js}

@@ -12316,8 +12316,8 @@ function acos$1(radians2, result) {
 function atan$1(radians2, result) {
   return map(radians2, (angle2) => Math.atan(angle2), result);
 }
-function clamp$4(value, min, max) {
-  return map(value, (value2) => Math.max(min, Math.min(max, value2)));
+function clamp$4(value, min, max2) {
+  return map(value, (value2) => Math.max(min, Math.min(max2, value2)));
 }
 function lerp$5(a2, b, t2) {
   if (isArray$3(a2)) {
@@ -12604,9 +12604,9 @@ class MathArray extends _extendableBuiltin(Array) {
   divideScalar(a2) {
     return this.multiplyByScalar(1 / a2);
   }
-  clampScalar(min, max) {
+  clampScalar(min, max2) {
     for (let i2 = 0; i2 < this.ELEMENTS; ++i2) {
-      this[i2] = Math.min(Math.max(this[i2], min), max);
+      this[i2] = Math.min(Math.max(this[i2], min), max2);
     }
     return this.check();
   }
@@ -18739,8 +18739,8 @@ function mod$1(value, divisor) {
 function lerp(start, end, step) {
   return step * end + (1 - step) * start;
 }
-function clamp$3(x2, min, max) {
-  return x2 < min ? min : x2 > max ? max : x2;
+function clamp$3(x2, min, max2) {
+  return x2 < min ? min : x2 > max2 ? max2 : x2;
 }
 function ieLog2(x2) {
   return Math.log(x2) * Math.LOG2E;
@@ -28461,17 +28461,17 @@ class DataColumn {
       const len2 = numInstances * size;
       if (value && len2 && value.length >= len2) {
         const min = new Array(size).fill(Infinity);
-        const max = new Array(size).fill(-Infinity);
+        const max2 = new Array(size).fill(-Infinity);
         for (let i2 = 0; i2 < len2; ) {
           for (let j = 0; j < size; j++) {
             const v = value[i2++];
             if (v < min[j])
               min[j] = v;
-            if (v > max[j])
-              max[j] = v;
+            if (v > max2[j])
+              max2[j] = v;
           }
         }
-        result = [min, max];
+        result = [min, max2];
       }
     }
     this.state.bounds = result;
@@ -54555,10 +54555,10 @@ class GroupNode extends ScenegraphNode {
       if (!bounds2) {
         return;
       }
-      const [min, max] = bounds2;
-      const center2 = new Vector3(min).add(max).divide([2, 2, 2]);
+      const [min, max2] = bounds2;
+      const center2 = new Vector3(min).add(max2).divide([2, 2, 2]);
       worldMatrix.transformAsPoint(center2, center2);
-      const halfSize = new Vector3(max).subtract(min).divide([2, 2, 2]);
+      const halfSize = new Vector3(max2).subtract(min).divide([2, 2, 2]);
       worldMatrix.transformAsVector(halfSize, halfSize);
       for (let v = 0; v < 8; v++) {
         const position = new Vector3(v & 1 ? -1 : 1, v & 2 ? -1 : 1, v & 4 ? -1 : 1).multiply(halfSize).add(center2);
@@ -63507,7 +63507,7 @@ class Tile {
     const { errors } = this;
     let numVertices = 0;
     let numTriangles = 0;
-    const max = size - 1;
+    const max2 = size - 1;
     indices.fill(0);
     function countElements(ax, ay, bx, by, cx, cy) {
       const mx = ax + bx >> 1;
@@ -63522,8 +63522,8 @@ class Tile {
         numTriangles++;
       }
     }
-    countElements(0, 0, max, max, max, 0);
-    countElements(max, max, 0, 0, 0, max);
+    countElements(0, 0, max2, max2, max2, 0);
+    countElements(max2, max2, 0, 0, 0, max2);
     const vertices = new Uint16Array(numVertices * 2);
     const triangles = new Uint32Array(numTriangles * 3);
     let triIndex = 0;
@@ -63548,8 +63548,8 @@ class Tile {
         triangles[triIndex++] = c2;
       }
     }
-    processTriangle(0, 0, max, max, max, 0);
-    processTriangle(max, max, 0, 0, 0, max);
+    processTriangle(0, 0, max2, max2, max2, 0);
+    processTriangle(max2, max2, 0, 0, 0, max2);
     return { vertices, triangles };
   }
 }
@@ -104764,16 +104764,16 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-9b667484.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-7dccbdc7.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-0442b8e5.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-39a9cd4a.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-7411bf6b.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-d286fc81.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-11ee86b7.js").then((m2) => m2.default));
-addDecoder(34887, () => import("./lerc-1e14a3bb.js").then((m2) => m2.default));
-addDecoder(50001, () => import("./webimage-1cd07cf5.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-b02bdb82.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-592075d1.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-cf9843a0.js").then((m2) => m2.default));
+addDecoder(34887, () => import("./lerc-42d93f50.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-0cc02cbc.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset5 = 0;
@@ -108322,9 +108322,9 @@ const buf2binstring = (buf, len2) => {
   }
   return result;
 };
-var buf2string = (buf, max) => {
+var buf2string = (buf, max2) => {
   let i2, out;
-  const len2 = max || buf.length;
+  const len2 = max2 || buf.length;
   const utf16buf = new Array(len2 * 2);
   for (out = 0, i2 = 0; i2 < len2; ) {
     let c2 = buf[i2++];
@@ -108357,22 +108357,22 @@ var buf2string = (buf, max) => {
   }
   return buf2binstring(utf16buf, out);
 };
-var utf8border = (buf, max) => {
-  max = max || buf.length;
-  if (max > buf.length) {
-    max = buf.length;
+var utf8border = (buf, max2) => {
+  max2 = max2 || buf.length;
+  if (max2 > buf.length) {
+    max2 = buf.length;
   }
-  let pos = max - 1;
+  let pos = max2 - 1;
   while (pos >= 0 && (buf[pos] & 192) === 128) {
     pos--;
   }
   if (pos < 0) {
-    return max;
+    return max2;
   }
   if (pos === 0) {
-    return max;
+    return max2;
   }
-  return pos + _utf8len[buf[pos]] > max ? pos : max;
+  return pos + _utf8len[buf[pos]] > max2 ? pos : max2;
 };
 var strings = {
   string2buf,
@@ -108922,7 +108922,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
   const bits = opts2.bits;
   let len2 = 0;
   let sym = 0;
-  let min = 0, max = 0;
+  let min = 0, max2 = 0;
   let root2 = 0;
   let curr = 0;
   let drop = 0;
@@ -108949,21 +108949,21 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
     count2[lens2[lens_index + sym]]++;
   }
   root2 = bits;
-  for (max = MAXBITS; max >= 1; max--) {
-    if (count2[max] !== 0) {
+  for (max2 = MAXBITS; max2 >= 1; max2--) {
+    if (count2[max2] !== 0) {
       break;
     }
   }
-  if (root2 > max) {
-    root2 = max;
+  if (root2 > max2) {
+    root2 = max2;
   }
-  if (max === 0) {
+  if (max2 === 0) {
     table[table_index++] = 1 << 24 | 64 << 16 | 0;
     table[table_index++] = 1 << 24 | 64 << 16 | 0;
     opts2.bits = 1;
     return 0;
   }
-  for (min = 1; min < max; min++) {
+  for (min = 1; min < max2; min++) {
     if (count2[min] !== 0) {
       break;
     }
@@ -108979,7 +108979,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
       return -1;
     }
   }
-  if (left > 0 && (type === CODES || max !== 1)) {
+  if (left > 0 && (type === CODES || max2 !== 1)) {
     return -1;
   }
   offs[1] = 0;
@@ -109048,7 +109048,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
     }
     sym++;
     if (--count2[len2] === 0) {
-      if (len2 === max) {
+      if (len2 === max2) {
         break;
       }
       len2 = lens2[lens_index + work[sym]];
@@ -109060,7 +109060,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
       next += min;
       curr = len2 - drop;
       left = 1 << curr;
-      while (curr + drop < max) {
+      while (curr + drop < max2) {
         left -= count2[curr + drop];
         if (left <= 0) {
           break;
@@ -118646,14 +118646,14 @@ class ZodString extends ZodType {
     return min;
   }
   get maxLength() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max;
+    return max2;
   }
 }
 ZodString.create = (params) => {
@@ -118868,20 +118868,20 @@ class ZodNumber extends ZodType {
     return min;
   }
   get maxValue() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max;
+    return max2;
   }
   get isInt() {
     return !!this._def.checks.find((ch) => ch.kind === "int" || ch.kind === "multipleOf" && util.isInteger(ch.value));
   }
   get isFinite() {
-    let max = null, min = null;
+    let max2 = null, min = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "finite" || ch.kind === "int" || ch.kind === "multipleOf") {
         return true;
@@ -118889,11 +118889,11 @@ class ZodNumber extends ZodType {
         if (min === null || ch.value > min)
           min = ch.value;
       } else if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return Number.isFinite(min) && Number.isFinite(max);
+    return Number.isFinite(min) && Number.isFinite(max2);
   }
 }
 ZodNumber.create = (params) => {
@@ -119051,14 +119051,14 @@ class ZodBigInt extends ZodType {
     return min;
   }
   get maxValue() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max;
+    return max2;
   }
 }
 ZodBigInt.create = (params) => {
@@ -119186,14 +119186,14 @@ class ZodDate extends ZodType {
     return min != null ? new Date(min) : null;
   }
   get maxDate() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max != null ? new Date(max) : null;
+    return max2 != null ? new Date(max2) : null;
   }
 }
 ZodDate.create = (params) => {
@@ -123552,7 +123552,7 @@ var toComparators_1 = toComparators$1;
 const SemVer$4 = semver;
 const Range$7 = requireRange();
 const maxSatisfying$1 = (versions, range2, options) => {
-  let max = null;
+  let max2 = null;
   let maxSV = null;
   let rangeObj = null;
   try {
@@ -123562,13 +123562,13 @@ const maxSatisfying$1 = (versions, range2, options) => {
   }
   versions.forEach((v) => {
     if (rangeObj.test(v)) {
-      if (!max || maxSV.compare(v) === -1) {
-        max = v;
-        maxSV = new SemVer$4(max, options);
+      if (!max2 || maxSV.compare(v) === -1) {
+        max2 = v;
+        maxSV = new SemVer$4(max2, options);
       }
     }
   });
-  return max;
+  return max2;
 };
 var maxSatisfying_1 = maxSatisfying$1;
 const SemVer$3 = semver;
@@ -123753,17 +123753,17 @@ var simplify = (versions, range2, options) => {
     set3.push([first, null]);
   }
   const ranges2 = [];
-  for (const [min, max] of set3) {
-    if (min === max) {
+  for (const [min, max2] of set3) {
+    if (min === max2) {
       ranges2.push(min);
-    } else if (!max && min === v[0]) {
+    } else if (!max2 && min === v[0]) {
       ranges2.push("*");
-    } else if (!max) {
+    } else if (!max2) {
       ranges2.push(`>=${min}`);
     } else if (min === v[0]) {
-      ranges2.push(`<=${max}`);
+      ranges2.push(`<=${max2}`);
     } else {
-      ranges2.push(`${min} - ${max}`);
+      ranges2.push(`${min} - ${max2}`);
     }
   }
   const simplified = ranges2.join(" || ");
@@ -124057,7 +124057,9 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_JSON: "obsSegmentations.json",
   OBS_SETS_CSV: "obsSets.csv",
   OBS_SETS_JSON: "obsSets.json",
+  // OME-Zarr
   IMAGE_OME_ZARR: "image.ome-zarr",
+  OBS_SEGMENTATIONS_OME_ZARR: "obsSegmentations.ome-zarr",
   // AnnData
   OBS_FEATURE_MATRIX_ANNDATA_ZARR: "obsFeatureMatrix.anndata.zarr",
   OBS_SETS_ANNDATA_ZARR: "obsSets.anndata.zarr",
@@ -124510,30 +124512,39 @@ const omeCoordinateTransformations = z.array(z.union([
     scale: z.array(z.number())
   })
 ]));
-z.object({
+const imageOmeTiffSchema = z.object({
   offsetsUrl: z.string().optional(),
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
+imageOmeTiffSchema.extend({
+  obsTypesFromChannelNames: z.boolean().optional()
+});
 const imageOmeZarrSchema = z.object({
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
 imageOmeZarrSchema.extend({
+  obsTypesFromChannelNames: z.boolean().optional()
+});
+const imageSpatialdataSchema = imageOmeZarrSchema.extend({
   path: z.string()
 });
-z.object({
+const obsSegmentationsSpatialdataSchema = z.object({
+  // TODO: should this also extend the imageOmeZarrSchema?
+  // TODO: should this be renamed labelsSpatialdataSchema?
+  // TODO: support obsTypesFromChannelNames?
   path: z.string()
 });
 z.object({
   path: z.string()
 });
-z.object({
+const obsSpotsSpatialdataSchema = z.object({
   path: z.string(),
   tablePath: z.string().optional().describe("The path to a table which annotates the spots. If available but not specified, the spot identifiers may not be aligned with associated tabular data as expected.")
 });
-annDataObsFeatureMatrix.extend({
+const obsFeatureMatrixSpatialdataSchema = annDataObsFeatureMatrix.extend({
   region: z.string().describe("The name of a region to use to filter instances (i.e., rows) in the table").optional()
 });
-z.object({
+const obsSetsSpatialdataSchema = z.object({
   region: z.string().describe("The name of a region to use to filter instances (i.e., rows) in the table").optional(),
   tablePath: z.string().optional().describe("The path to a table which contains the index for the set values."),
   obsSets: annDataObsSets
@@ -124596,6 +124607,19 @@ z.object({
     z.array(annDataConvenienceObsEmbeddingItem)
   ])
 }).partial();
+z.object({
+  // TODO: should `image` be a special schema
+  // to allow specifying fileUid (like for embeddingType)?
+  image: imageSpatialdataSchema,
+  // TODO: should this be a special schema
+  // to allow specifying fileUid (like for embeddingType)?
+  labels: obsSegmentationsSpatialdataSchema,
+  obsFeatureMatrix: obsFeatureMatrixSpatialdataSchema,
+  obsSpots: obsSpotsSpatialdataSchema,
+  // TODO: obsPoints
+  // TODO: obsLocations
+  obsSets: obsSetsSpatialdataSchema
+}).partial();
 z.object({
   obsLabelsTypes: z.array(z.string()).optional(),
   embeddingTypes: z.array(z.string()).optional()
@@ -124964,14 +124988,14 @@ var tinycolor = { exports: {} };
       r2 = bound01(r2, 255);
       g2 = bound01(g2, 255);
       b = bound01(b, 255);
-      var max = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
-      var h, s2, l2 = (max + min) / 2;
-      if (max == min) {
+      var max2 = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
+      var h, s2, l2 = (max2 + min) / 2;
+      if (max2 == min) {
         h = s2 = 0;
       } else {
-        var d = max - min;
-        s2 = l2 > 0.5 ? d / (2 - max - min) : d / (max + min);
-        switch (max) {
+        var d = max2 - min;
+        s2 = l2 > 0.5 ? d / (2 - max2 - min) : d / (max2 + min);
+        switch (max2) {
           case r2:
             h = (g2 - b) / d + (g2 < b ? 6 : 0);
             break;
@@ -125019,14 +125043,14 @@ var tinycolor = { exports: {} };
       r2 = bound01(r2, 255);
       g2 = bound01(g2, 255);
       b = bound01(b, 255);
-      var max = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
-      var h, s2, v = max;
-      var d = max - min;
-      s2 = max === 0 ? 0 : d / max;
-      if (max == min) {
+      var max2 = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
+      var h, s2, v = max2;
+      var d = max2 - min;
+      s2 = max2 === 0 ? 0 : d / max2;
+      if (max2 == min) {
         h = 0;
       } else {
-        switch (max) {
+        switch (max2) {
           case r2:
             h = (g2 - b) / d + (g2 < b ? 6 : 0);
             break;
@@ -125423,19 +125447,19 @@ var tinycolor = { exports: {} };
       }
       return a2;
     }
-    function bound01(n2, max) {
+    function bound01(n2, max2) {
       if (isOnePointZero(n2)) {
         n2 = "100%";
       }
       var processPercent = isPercentage(n2);
-      n2 = mathMin(max, mathMax(0, parseFloat(n2)));
+      n2 = mathMin(max2, mathMax(0, parseFloat(n2)));
       if (processPercent) {
-        n2 = parseInt(n2 * max, 10) / 100;
+        n2 = parseInt(n2 * max2, 10) / 100;
       }
-      if (Math2.abs(n2 - max) < 1e-6) {
+      if (Math2.abs(n2 - max2) < 1e-6) {
         return 1;
       }
-      return n2 % max / parseFloat(max);
+      return n2 % max2 / parseFloat(max2);
     }
     function clamp01(val) {
       return mathMin(1, mathMax(0, val));
@@ -126494,10 +126518,10 @@ var json2csv_umd = { exports: {} };
     };
     Buffer3.prototype.inspect = function inspect2() {
       var str = "";
-      var max = INSPECT_MAX_BYTES;
+      var max2 = INSPECT_MAX_BYTES;
       if (this.length > 0) {
-        str = this.toString("hex", 0, max).match(/.{2}/g).join(" ");
-        if (this.length > max)
+        str = this.toString("hex", 0, max2).match(/.{2}/g).join(" ");
+        if (this.length > max2)
           str += " ... ";
       }
       return "<Buffer " + str + ">";
@@ -127063,10 +127087,10 @@ var json2csv_umd = { exports: {} };
         checkOffset(offset5, 8, this.length);
       return read(this, offset5, false, 52, 8);
     };
-    function checkInt(buf, value, offset5, ext, max, min) {
+    function checkInt(buf, value, offset5, ext, max2, min) {
       if (!internalIsBuffer(buf))
         throw new TypeError('"buffer" argument must be a Buffer instance');
-      if (value > max || value < min)
+      if (value > max2 || value < min)
         throw new RangeError('"value" argument is out of bounds');
       if (offset5 + ext > buf.length)
         throw new RangeError("Index out of range");
@@ -127291,7 +127315,7 @@ var json2csv_umd = { exports: {} };
       }
       return offset5 + 4;
     };
-    function checkIEEE754(buf, value, offset5, ext, max, min) {
+    function checkIEEE754(buf, value, offset5, ext, max2, min) {
       if (offset5 + ext > buf.length)
         throw new RangeError("Index out of range");
       if (offset5 < 0)
@@ -131348,18 +131372,18 @@ void main() {
 `;
 function extent(values2, valueof) {
   let min;
-  let max;
+  let max2;
   if (valueof === void 0) {
     for (const value of values2) {
       if (value != null) {
         if (min === void 0) {
           if (value >= value)
-            min = max = value;
+            min = max2 = value;
         } else {
           if (min > value)
             min = value;
-          if (max < value)
-            max = value;
+          if (max2 < value)
+            max2 = value;
         }
       }
     }
@@ -131369,34 +131393,52 @@ function extent(values2, valueof) {
       if ((value = valueof(value, ++index2, values2)) != null) {
         if (min === void 0) {
           if (value >= value)
-            min = max = value;
+            min = max2 = value;
         } else {
           if (min > value)
             min = value;
-          if (max < value)
-            max = value;
+          if (max2 < value)
+            max2 = value;
         }
       }
     }
   }
-  return [min, max];
+  return [min, max2];
+}
+function max(values2, valueof) {
+  let max2;
+  if (valueof === void 0) {
+    for (const value of values2) {
+      if (value != null && (max2 < value || max2 === void 0 && value >= value)) {
+        max2 = value;
+      }
+    }
+  } else {
+    let index2 = -1;
+    for (let value of values2) {
+      if ((value = valueof(value, ++index2, values2)) != null && (max2 < value || max2 === void 0 && value >= value)) {
+        max2 = value;
+      }
+    }
+  }
+  return max2;
 }
 function normalize(arr) {
-  const [min, max] = extent(arr);
-  const ratio = 255 / (max - min);
+  const [min, max2] = extent(arr);
+  const ratio = 255 / (max2 - min);
   const data = new Uint8Array(arr.map((i2) => Math.floor((i2 - min) * ratio)));
   return data;
 }
-function multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSetColorMode, texSize) {
+function multiSetsToTextureData(multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode, texSize) {
   let totalValuesLength = 0;
   let totalColorsLength = 0;
   channelIsSetColorMode.forEach((isSetColorMode, channelIndex) => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c, _d;
     if (isSetColorMode) {
-      totalValuesLength += ((_b = (_a2 = setColorValues[channelIndex]) == null ? void 0 : _a2.obsIndex) == null ? void 0 : _b.length) || 0;
-      totalColorsLength += (((_d = (_c = setColorValues[channelIndex]) == null ? void 0 : _c.setColors) == null ? void 0 : _d.length) || 0) * 3;
+      totalColorsLength += (((_b = (_a2 = setColorValues[channelIndex]) == null ? void 0 : _a2.setColors) == null ? void 0 : _b.length) || 0) * 3;
+      totalValuesLength += ((_c = setColorValues[channelIndex]) == null ? void 0 : _c.obsIndex) ? max(setColorValues[channelIndex].obsIndex.map((d) => parseInt(d))) : 0;
     } else {
-      totalValuesLength += ((_e = multiFeatureValues[channelIndex]) == null ? void 0 : _e.length) || 0;
+      totalValuesLength += multiMatrixObsIndex[channelIndex] ? max(multiMatrixObsIndex[channelIndex].map((d) => parseInt(d))) : ((_d = multiFeatureValues[channelIndex]) == null ? void 0 : _d.length) || 0;
     }
   });
   const valueTexHeight = Math.max(2, Math.ceil(totalValuesLength / texSize));
@@ -131414,12 +131456,20 @@ function multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSet
   let indexOffset = 0;
   let colorOffset = 0;
   channelIsSetColorMode.forEach((isSetColorMode, channelIndex) => {
+    const matrixObsIndex = multiMatrixObsIndex[channelIndex];
+    const bitmaskValueIsIndex = matrixObsIndex === null;
     if (isSetColorMode) {
       const { setColorIndices, setColors, obsIndex } = setColorValues[channelIndex] || {};
       if (setColorIndices && setColors && obsIndex) {
         for (let i2 = 0; i2 < obsIndex.length; i2++) {
-          const colorIndex = setColorIndices.get(String(i2 + 1));
-          totalData[indexOffset + i2] = colorIndex === void 0 ? 0 : colorIndex + 1;
+          let obsId = String(i2 + 1);
+          let obsI = i2;
+          if (!bitmaskValueIsIndex) {
+            obsId = obsIndex[i2];
+            obsI = parseInt(obsId) - 1;
+          }
+          const colorIndex = setColorIndices.get(obsId);
+          totalData[indexOffset + obsI] = colorIndex === void 0 ? 0 : colorIndex + 1;
         }
         for (let i2 = 0; i2 < setColors.length; i2++) {
           const { color: [r2, g2, b] } = setColors[i2];
@@ -131434,7 +131484,16 @@ function multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSet
       colorOffset += (setColors == null ? void 0 : setColors.length) || 0;
     } else {
       const featureArr = multiFeatureValues[channelIndex];
-      totalData.set(normalize(featureArr), indexOffset);
+      const normalizedFeatureArr = normalize(featureArr);
+      if (!bitmaskValueIsIndex && matrixObsIndex) {
+        for (let i2 = 0; i2 < matrixObsIndex.length; i2++) {
+          const obsId = matrixObsIndex[i2];
+          const obsI = parseInt(obsId) - 1;
+          totalData[indexOffset + obsI] = normalizedFeatureArr[i2];
+        }
+      } else {
+        totalData.set(normalizedFeatureArr, indexOffset);
+      }
       indicesOffsets.push(indexOffset);
       indexOffset += featureArr.length;
       colorsOffsets.push(colorOffset);
@@ -131461,6 +131520,17 @@ function padWithDefault(arr, defaultValue2, padWidth) {
 function getColor(arr) {
   return arr ? arr.map((v) => v / 255) : [0, 0, 0];
 }
+function isEqualShallow(prevArr, nextArr) {
+  if (prevArr === nextArr) {
+    return true;
+  }
+  if (Array.isArray(prevArr) && Array.isArray(nextArr)) {
+    if (prevArr.length === nextArr.length) {
+      return !prevArr.some((v, i2) => v !== nextArr[i2] && (!Array.isArray(v) && !Array.isArray(nextArr[i2]) || (v.length > 0 || nextArr[i2].length > 0)));
+    }
+  }
+  return prevArr === nextArr;
+}
 const defaultProps$1 = {
   channelStrokeWidths: { type: "array", value: null, compare: true },
   channelsFilled: { type: "array", value: null, compare: true },
@@ -131470,6 +131540,7 @@ const defaultProps$1 = {
   colormap: { type: "string", value: GLSL_COLORMAP_DEFAULT, compare: true },
   expressionData: { type: "object", value: null, compare: true },
   multiFeatureValues: { type: "array", value: null, compare: true },
+  multiMatrixObsIndex: { type: "array", value: null, compare: true },
   setColorValues: { type: "array", value: null, compare: true },
   channelFeatureValueColormaps: { type: "array", value: null, compare: true },
   channelFeatureValueColormapRanges: { type: "array", value: null, compare: true },
@@ -131516,9 +131587,9 @@ class BitmaskLayer2 extends XRLayer {
   }
   updateState({ props: props2, oldProps, changeFlags }) {
     super.updateState({ props: props2, oldProps, changeFlags });
-    if (props2.multiFeatureValues !== oldProps.multiFeatureValues || props2.setColorValues !== oldProps.setColorValues || props2.channelIsSetColorMode !== oldProps.channelIsSetColorMode) {
-      const { multiFeatureValues, setColorValues, channelIsSetColorMode } = this.props;
-      const [valueTex, colorTex, valueTexOffsets, colorTexOffsets, valueTexHeight, colorTexHeight] = this.multiSetsToTexture(multiFeatureValues, setColorValues, channelIsSetColorMode);
+    if (!isEqualShallow(props2.multiFeatureValues, oldProps.multiFeatureValues) || !isEqualShallow(props2.multiMatrixObsIndex, oldProps.multiMatrixObsIndex) || !isEqualShallow(props2.setColorValues, oldProps.setColorValues) || !isEqualShallow(props2.channelIsSetColorMode, oldProps.channelIsSetColorMode)) {
+      const { multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode } = this.props;
+      const [valueTex, colorTex, valueTexOffsets, colorTexOffsets, valueTexHeight, colorTexHeight] = this.multiSetsToTexture(multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode);
       this.setState({
         valueTex,
         colorTex,
@@ -131670,9 +131741,9 @@ class BitmaskLayer2 extends XRLayer {
       type: GL$1.FLOAT
     });
   }
-  multiSetsToTexture(multiFeatureValues, setColorValues, channelIsSetColorMode) {
+  multiSetsToTexture(multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode) {
     const isWebGL2On = isWebGL2$1(this.context.gl);
-    const [totalData, valueTexHeight, indicesOffsets, totalColors, colorTexHeight, colorsOffsets] = multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSetColorMode, MULTI_FEATURE_TEX_SIZE);
+    const [totalData, valueTexHeight, indicesOffsets, totalColors, colorTexHeight, colorsOffsets] = multiSetsToTextureData(multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode, MULTI_FEATURE_TEX_SIZE);
     return [
       // Color indices texture
       new Texture2D(this.context.gl, {
@@ -132924,13 +132995,13 @@ var refType = PropTypes.oneOfType([PropTypes.func, PropTypes.object]);
 const refType$1 = refType;
 function clamp$1(value) {
   var min = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-  var max = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 1;
+  var max2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 1;
   {
-    if (value < min || value > max) {
-      console.error("Material-UI: The value provided ".concat(value, " is out of range [").concat(min, ", ").concat(max, "]."));
+    if (value < min || value > max2) {
+      console.error("Material-UI: The value provided ".concat(value, " is out of range [").concat(min, ", ").concat(max2, "]."));
     }
   }
-  return Math.min(Math.max(min, value), max);
+  return Math.min(Math.max(min, value), max2);
 }
 function hexToRgb(color) {
   color = color.substr(1);
@@ -140585,8 +140656,8 @@ const ValueLabel$1 = withStyles2(styles$4, {
 function asc(a2, b) {
   return a2 - b;
 }
-function clamp(value, min, max) {
-  return Math.min(Math.max(min, value), max);
+function clamp(value, min, max2) {
+  return Math.min(Math.max(min, value), max2);
 }
 function findClosest(values2, currentValue) {
   var _values$reduce = values2.reduce(function(acc, value, index2) {
@@ -140619,11 +140690,11 @@ function trackFinger(event, touchId) {
     y: event.clientY
   };
 }
-function valueToPercent(value, min, max) {
-  return (value - min) * 100 / (max - min);
+function valueToPercent(value, min, max2) {
+  return (value - min) * 100 / (max2 - min);
 }
-function percentToValue(percent2, min, max) {
-  return (max - min) * percent2 + min;
+function percentToValue(percent2, min, max2) {
+  return (max2 - min) * percent2 + min;
 }
 function getDecimalPrecision(num) {
   if (Math.abs(num) < 1) {
@@ -140911,7 +140982,7 @@ var styles$3 = function styles7(theme) {
   };
 };
 var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
-  var ariaLabel = props2["aria-label"], ariaLabelledby = props2["aria-labelledby"], ariaValuetext = props2["aria-valuetext"], classes = props2.classes, className = props2.className, _props$color = props2.color, color = _props$color === void 0 ? "primary" : _props$color, _props$component = props2.component, Component2 = _props$component === void 0 ? "span" : _props$component, defaultValue2 = props2.defaultValue, _props$disabled = props2.disabled, disabled = _props$disabled === void 0 ? false : _props$disabled, getAriaLabel = props2.getAriaLabel, getAriaValueText = props2.getAriaValueText, _props$marks = props2.marks, marksProp = _props$marks === void 0 ? false : _props$marks, _props$max = props2.max, max = _props$max === void 0 ? 100 : _props$max, _props$min = props2.min, min = _props$min === void 0 ? 0 : _props$min, name2 = props2.name, onChange = props2.onChange, onChangeCommitted = props2.onChangeCommitted, onMouseDown = props2.onMouseDown, _props$orientation = props2.orientation, orientation = _props$orientation === void 0 ? "horizontal" : _props$orientation, _props$scale = props2.scale, scale2 = _props$scale === void 0 ? Identity : _props$scale, _props$step = props2.step, step = _props$step === void 0 ? 1 : _props$step, _props$ThumbComponent = props2.ThumbComponent, ThumbComponent = _props$ThumbComponent === void 0 ? "span" : _props$ThumbComponent, _props$track = props2.track, track = _props$track === void 0 ? "normal" : _props$track, valueProp = props2.value, _props$ValueLabelComp = props2.ValueLabelComponent, ValueLabelComponent = _props$ValueLabelComp === void 0 ? ValueLabel$1 : _props$ValueLabelComp, _props$valueLabelDisp = props2.valueLabelDisplay, valueLabelDisplay = _props$valueLabelDisp === void 0 ? "off" : _props$valueLabelDisp, _props$valueLabelForm = props2.valueLabelFormat, valueLabelFormat = _props$valueLabelForm === void 0 ? Identity : _props$valueLabelForm, other = _objectWithoutProperties(props2, ["aria-label", "aria-labelledby", "aria-valuetext", "classes", "className", "color", "component", "defaultValue", "disabled", "getAriaLabel", "getAriaValueText", "marks", "max", "min", "name", "onChange", "onChangeCommitted", "onMouseDown", "orientation", "scale", "step", "ThumbComponent", "track", "value", "ValueLabelComponent", "valueLabelDisplay", "valueLabelFormat"]);
+  var ariaLabel = props2["aria-label"], ariaLabelledby = props2["aria-labelledby"], ariaValuetext = props2["aria-valuetext"], classes = props2.classes, className = props2.className, _props$color = props2.color, color = _props$color === void 0 ? "primary" : _props$color, _props$component = props2.component, Component2 = _props$component === void 0 ? "span" : _props$component, defaultValue2 = props2.defaultValue, _props$disabled = props2.disabled, disabled = _props$disabled === void 0 ? false : _props$disabled, getAriaLabel = props2.getAriaLabel, getAriaValueText = props2.getAriaValueText, _props$marks = props2.marks, marksProp = _props$marks === void 0 ? false : _props$marks, _props$max = props2.max, max2 = _props$max === void 0 ? 100 : _props$max, _props$min = props2.min, min = _props$min === void 0 ? 0 : _props$min, name2 = props2.name, onChange = props2.onChange, onChangeCommitted = props2.onChangeCommitted, onMouseDown = props2.onMouseDown, _props$orientation = props2.orientation, orientation = _props$orientation === void 0 ? "horizontal" : _props$orientation, _props$scale = props2.scale, scale2 = _props$scale === void 0 ? Identity : _props$scale, _props$step = props2.step, step = _props$step === void 0 ? 1 : _props$step, _props$ThumbComponent = props2.ThumbComponent, ThumbComponent = _props$ThumbComponent === void 0 ? "span" : _props$ThumbComponent, _props$track = props2.track, track = _props$track === void 0 ? "normal" : _props$track, valueProp = props2.value, _props$ValueLabelComp = props2.ValueLabelComponent, ValueLabelComponent = _props$ValueLabelComp === void 0 ? ValueLabel$1 : _props$ValueLabelComp, _props$valueLabelDisp = props2.valueLabelDisplay, valueLabelDisplay = _props$valueLabelDisp === void 0 ? "off" : _props$valueLabelDisp, _props$valueLabelForm = props2.valueLabelFormat, valueLabelFormat = _props$valueLabelForm === void 0 ? Identity : _props$valueLabelForm, other = _objectWithoutProperties(props2, ["aria-label", "aria-labelledby", "aria-valuetext", "classes", "className", "color", "component", "defaultValue", "disabled", "getAriaLabel", "getAriaValueText", "marks", "max", "min", "name", "onChange", "onChangeCommitted", "onMouseDown", "orientation", "scale", "step", "ThumbComponent", "track", "value", "ValueLabelComponent", "valueLabelDisplay", "valueLabelFormat"]);
   var theme = useTheme();
   var touchId = React.useRef();
   var _React$useState = React.useState(-1), active = _React$useState[0], setActive = _React$useState[1];
@@ -140924,9 +140995,9 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
   var range2 = Array.isArray(valueDerived);
   var values2 = range2 ? valueDerived.slice().sort(asc) : [valueDerived];
   values2 = values2.map(function(value) {
-    return clamp(value, min, max);
+    return clamp(value, min, max2);
   });
-  var marks = marksProp === true && step !== null ? _toConsumableArray$1(Array(Math.floor((max - min) / step) + 1)).map(function(_, index2) {
+  var marks = marksProp === true && step !== null ? _toConsumableArray$1(Array(Math.floor((max2 - min) / step) + 1)).map(function(_, index2) {
     return {
       value: min + step * index2
     };
@@ -140961,7 +141032,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
   var handleKeyDown2 = useEventCallback(function(event) {
     var index2 = Number(event.currentTarget.getAttribute("data-index"));
     var value = values2[index2];
-    var tenPercents = (max - min) / 10;
+    var tenPercents = (max2 - min) / 10;
     var marksValues = marks.map(function(mark) {
       return mark.value;
     });
@@ -140974,7 +141045,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
         newValue = min;
         break;
       case "End":
-        newValue = max;
+        newValue = max2;
         break;
       case "PageUp":
         if (step) {
@@ -141009,7 +141080,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
     if (step) {
       newValue = roundValueToStep(newValue, step, min);
     }
-    newValue = clamp(newValue, min, max);
+    newValue = clamp(newValue, min, max2);
     if (range2) {
       var previousValue = newValue;
       newValue = setValueIndex({
@@ -141051,7 +141122,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
       percent2 = 1 - percent2;
     }
     var newValue;
-    newValue = percentToValue(percent2, min, max);
+    newValue = percentToValue(percent2, min, max2);
     if (step) {
       newValue = roundValueToStep(newValue, step, min);
     } else {
@@ -141061,7 +141132,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
       var closestIndex = findClosest(marksValues, newValue);
       newValue = marksValues[closestIndex];
     }
-    newValue = clamp(newValue, min, max);
+    newValue = clamp(newValue, min, max2);
     var activeIndex = 0;
     if (range2) {
       if (!move) {
@@ -141190,8 +141261,8 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
     doc.addEventListener("mousemove", handleTouchMove);
     doc.addEventListener("mouseup", handleTouchEnd);
   });
-  var trackOffset = valueToPercent(range2 ? values2[0] : min, min, max);
-  var trackLeap = valueToPercent(values2[values2.length - 1], min, max) - trackOffset;
+  var trackOffset = valueToPercent(range2 ? values2[0] : min, min, max2);
+  var trackLeap = valueToPercent(values2[values2.length - 1], min, max2) - trackOffset;
   var trackStyle = _extends$1({}, axisProps[axis].offset(trackOffset), axisProps[axis].leap(trackLeap));
   return /* @__PURE__ */ React.createElement(Component2, _extends$1({
     ref: handleRef,
@@ -141209,7 +141280,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
     name: name2,
     type: "hidden"
   }), marks.map(function(mark, index2) {
-    var percent2 = valueToPercent(mark.value, min, max);
+    var percent2 = valueToPercent(mark.value, min, max2);
     var style = axisProps[axis].offset(percent2);
     var markActive;
     if (track === false) {
@@ -141230,7 +141301,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
       className: clsx(classes.markLabel, markActive && classes.markLabelActive)
     }, mark.label) : null);
   }), values2.map(function(value, index2) {
-    var percent2 = valueToPercent(value, min, max);
+    var percent2 = valueToPercent(value, min, max2);
     var style = axisProps[axis].offset(percent2);
     return /* @__PURE__ */ React.createElement(ValueLabelComponent, {
       key: index2,
@@ -141250,7 +141321,7 @@ var Slider = /* @__PURE__ */ React.forwardRef(function Slider2(props2, ref) {
       "aria-label": getAriaLabel ? getAriaLabel(index2) : ariaLabel,
       "aria-labelledby": ariaLabelledby,
       "aria-orientation": orientation,
-      "aria-valuemax": scale2(max),
+      "aria-valuemax": scale2(max2),
       "aria-valuemin": scale2(min),
       "aria-valuenow": scale2(value),
       "aria-valuetext": getAriaValueText ? getAriaValueText(scale2(value), index2) : ariaValuetext,

package/dist/index.js

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

package/dist/{jpeg-7411bf6b.js → jpeg-b02bdb82.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-1144f987.js";
+import { B as BaseDecoder } from "./index-013d5fd5.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lerc-1e14a3bb.js → lerc-42d93f50.js}

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

package/dist/{lzw-7dccbdc7.js → lzw-39a9cd4a.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-1144f987.js";
+import { B as BaseDecoder } from "./index-013d5fd5.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{packbits-11ee86b7.js → packbits-cf9843a0.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-1144f987.js";
+import { B as BaseDecoder } from "./index-013d5fd5.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{raw-9b667484.js → raw-0442b8e5.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-1144f987.js";
+import { B as BaseDecoder } from "./index-013d5fd5.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{webimage-1cd07cf5.js → webimage-0cc02cbc.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-1144f987.js";
+import { B as BaseDecoder } from "./index-013d5fd5.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/package.json

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