@vitessce/heatmap 3.2.2 → 3.3.1

package/dist/{deflate-54e8a983.js → deflate-9263f588.js}

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

package/dist/{index-99684608.js → index-6515eb5d.js}

@@ -1,3 +1,9 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 import * as React from "react";
 import React__default, { Children, isValidElement, cloneElement, useRef, useMemo, useEffect, useLayoutEffect, createElement, forwardRef, useState, useImperativeHandle, useReducer, useCallback, useContext } from "react";
 import { useVitessceContainer, useComponentHover, useComponentViewInfo, usePlotOptionsStyles, OptionsContainer, OptionSelect, useLoaders, useSetComponentHover, useSetComponentViewInfo, useCoordination, useDeckCanvasSize, useMultiObsLabels, useFeatureLabelsData, useObsFeatureMatrixData, useObsSetsData, useReady, useUrls, useUint8ObsFeatureMatrix, useGetObsInfo, useGetObsMembership, TitleInfo } from "@vitessce/vit-s";
@@ -10867,6 +10873,7 @@ const DataType$2 = {
 const FileType$1 = {
   // Joint file types
   ANNDATA_ZARR: "anndata.zarr",
+  SPATIALDATA_ZARR: "spatialdata.zarr",
   // Atomic file types
   OBS_EMBEDDING_CSV: "obsEmbedding.csv",
   OBS_SPOTS_CSV: "obsSpots.csv",
@@ -10889,6 +10896,16 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_ANNDATA_ZARR: "obsSegmentations.anndata.zarr",
   OBS_LABELS_ANNDATA_ZARR: "obsLabels.anndata.zarr",
   FEATURE_LABELS_ANNDATA_ZARR: "featureLabels.anndata.zarr",
+  // SpatialData
+  IMAGE_SPATIALDATA_ZARR: "image.spatialdata.zarr",
+  LABELS_SPATIALDATA_ZARR: "labels.spatialdata.zarr",
+  SHAPES_SPATIALDATA_ZARR: "shapes.spatialdata.zarr",
+  OBS_FEATURE_MATRIX_SPATIALDATA_ZARR: "obsFeatureMatrix.spatialdata.zarr",
+  OBS_SETS_SPATIALDATA_ZARR: "obsSets.spatialdata.zarr",
+  OBS_SPOTS_SPATIALDATA_ZARR: "obsSpots.spatialdata.zarr",
+  // TODO:
+  // OBS_POINTS_SPATIALDATA_ZARR: 'obsPoints.spatialdata.zarr',
+  // OBS_LOCATIONS_SPATIALDATA_ZARR: 'obsLocations.spatialdata.zarr',
   // MuData
   OBS_FEATURE_MATRIX_MUDATA_ZARR: "obsFeatureMatrix.mudata.zarr",
   OBS_SETS_MUDATA_ZARR: "obsSets.mudata.zarr",
@@ -11690,9 +11707,30 @@ z.object({
   offsetsUrl: z.string().optional(),
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
-z.object({
+const imageOmeZarrSchema = z.object({
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
+imageOmeZarrSchema.extend({
+  path: z.string()
+});
+z.object({
+  path: z.string()
+});
+z.object({
+  path: z.string()
+});
+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({
+  region: z.string().describe("The name of a region to use to filter instances (i.e., rows) in the table").optional()
+});
+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
+});
 z.object({
   obsIndex: z.string(),
   obsEmbedding: z.array(z.string()).length(2)
@@ -18354,9 +18392,9 @@ const schemePlasma = [[13, 8, 135], [16, 7, 136], [19, 7, 137], [22, 7, 138], [2
 function rgbSpline(spline) {
   return (colors) => {
     const n2 = colors.length;
-    let r2 = new Array(n2);
-    let g2 = new Array(n2);
-    let b = new Array(n2);
+    const r2 = new Array(n2);
+    const g2 = new Array(n2);
+    const b = new Array(n2);
     let i2;
     let color2;
     for (i2 = 0; i2 < n2; ++i2) {
@@ -18365,10 +18403,10 @@ function rgbSpline(spline) {
       g2[i2] = color2[1] || 0;
       b[i2] = color2[2] || 0;
     }
-    r2 = spline(r2);
-    g2 = spline(g2);
-    b = spline(b);
-    return (t2) => [r2(t2), g2(t2), b(t2)];
+    const rFunc = spline(r2);
+    const gFunc = spline(g2);
+    const bFunc = spline(b);
+    return (t2) => [rFunc(t2), gFunc(t2), bFunc(t2)];
   };
 }
 function basis(values2) {
@@ -18404,17 +18442,19 @@ function getCellColors(params) {
   }
   return /* @__PURE__ */ new Map();
 }
-const defaultPoolSize = typeof navigator !== "undefined" ? navigator.hardwareConcurrency || 4 : null;
+const defaultPoolSize = typeof navigator !== "undefined" ? navigator.hardwareConcurrency || 4 : 1;
 class Pool {
   /**
    * @constructor
    * @param {object} Worker The worker class to be used for processing.
    */
   constructor(createWorker2) {
+    __publicField(this, "workers");
+    __publicField(this, "idleWorkers");
+    __publicField(this, "waitQueue");
     this.workers = [];
     this.idleWorkers = [];
     this.waitQueue = [];
-    this.decoder = null;
     for (let i2 = 0; i2 < defaultPoolSize; ++i2) {
       const w2 = createWorker2();
       this.workers.push(w2);
@@ -18439,7 +18479,7 @@ class Pool {
   }
   async finishTask(currentWorker) {
     const waiter = this.waitQueue.pop();
-    if (waiter) {
+    if (waiter && waiter.resolve) {
       waiter.resolve(currentWorker);
     } else {
       this.idleWorkers.push(currentWorker);
@@ -30597,9 +30637,9 @@ function Legend(props2) {
     const hasSubLabel = subLabel !== null;
     if (!isSetColor) {
       g2.append("text").attr("text-anchor", hasSubLabel ? "start" : "end").attr("dominant-baseline", "hanging").attr("x", hasSubLabel ? 0 : width).attr("y", 0).text(mainLabel).style("font-size", "10px").style("fill", foregroundColor);
-    }
-    if (hasSubLabel) {
-      g2.append("text").attr("text-anchor", "end").attr("dominant-baseline", "hanging").attr("x", width).attr("y", titleHeight).text(subLabel).style("font-size", "9px").style("fill", foregroundColor);
+      if (hasSubLabel) {
+        g2.append("text").attr("text-anchor", "end").attr("dominant-baseline", "hanging").attr("x", width).attr("y", titleHeight).text(subLabel).style("font-size", "9px").style("fill", foregroundColor);
+      }
     }
   }, [
     width,
@@ -33558,7 +33598,7 @@ const jsonLoader = {
   testText: isJSON,
   parseTextSync: JSON.parse
 };
-const version = "8.8.20";
+const version = "8.8.27";
 const existingVersion = globalThis.deck && globalThis.deck.VERSION;
 if (existingVersion && existingVersion !== version) {
   throw new Error("deck.gl - multiple versions detected: ".concat(existingVersion, " vs ").concat(version));
@@ -34757,9 +34797,8 @@ function cssToDeviceRatio(gl) {
     luma
   } = gl;
   if (gl.canvas && luma) {
-    const {
-      clientWidth
-    } = luma.canvasSizeInfo;
+    const cachedSize = luma.canvasSizeInfo;
+    const clientWidth = "clientWidth" in cachedSize ? cachedSize.clientWidth : gl.canvas.clientWidth;
     return clientWidth ? gl.drawingBufferWidth / clientWidth : 1;
   }
   return 1;
@@ -35015,7 +35054,7 @@ function setDevicePixelRatio(gl, devicePixelRatio, options) {
     });
   }
 }
-const VERSION$7 = "8.5.16";
+const VERSION$7 = "8.5.21";
 const STARTUP_MESSAGE = "set luma.log.level=1 (or higher) to trace rendering";
 class StatsManager {
   constructor() {
@@ -35136,7 +35175,6 @@ let Resource$1 = class Resource {
       this._handle = this._createHandle();
     }
     this.byteLength = 0;
-    this._initStats();
     this._addStats();
   }
   toString() {
@@ -35272,9 +35310,6 @@ let Resource$1 = class Resource {
     this.gl.luma = this.gl.luma || {};
     return this.gl.luma;
   }
-  _initStats() {
-    this.gl.stats = this.gl.stats || new StatsManager();
-  }
   _addStats() {
     const name2 = this[Symbol.toStringTag];
     const stats = lumaStats.get("Resource Counts");
@@ -35289,27 +35324,29 @@ let Resource$1 = class Resource {
   }
   _trackAllocatedMemory(bytes) {
     let name2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this[Symbol.toStringTag];
-    this._doTrackAllocatedMemory(bytes, name2);
-    this._doTrackAllocatedMemory(bytes, name2, this.gl.stats.get("Memory Usage"));
+    this._trackAllocatedMemoryForContext(bytes, name2);
+    this._trackAllocatedMemoryForContext(bytes, name2, this.gl.canvas && this.gl.canvas.id);
+    this.byteLength = bytes;
   }
-  _doTrackAllocatedMemory(bytes) {
+  _trackAllocatedMemoryForContext(bytes) {
     let name2 = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this[Symbol.toStringTag];
-    let stats = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : lumaStats.get("Memory Usage");
+    let id = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "";
+    const stats = lumaStats.get("Memory Usage".concat(id));
     stats.get("GPU Memory").addCount(bytes);
     stats.get("".concat(name2, " Memory")).addCount(bytes);
-    this.byteLength = bytes;
   }
   _trackDeallocatedMemory() {
     let name2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this[Symbol.toStringTag];
-    this._doTrackDeallocatedMemory(name2);
-    this._doTrackDeallocatedMemory(name2, this.gl.stats.get("Memory Usage"));
+    this._trackDeallocatedMemoryForContext(name2);
+    this._trackDeallocatedMemoryForContext(name2, this.gl.canvas && this.gl.canvas.id);
+    this.byteLength = 0;
   }
-  _doTrackDeallocatedMemory() {
+  _trackDeallocatedMemoryForContext() {
     let name2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this[Symbol.toStringTag];
-    let stats = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : lumaStats.get("Memory Usage");
+    let id = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+    const stats = lumaStats.get("Memory Usage".concat(id));
     stats.get("GPU Memory").subtractCount(this.byteLength);
     stats.get("".concat(name2, " Memory")).subtractCount(this.byteLength);
-    this.byteLength = 0;
   }
 };
 const ERR_TYPE_DEDUCTION = "Failed to deduce GL constant from typed array";
@@ -48525,6 +48562,7 @@ const picking = {
   inject: {
     "vs:DECKGL_FILTER_GL_POSITION": "\n    // for picking depth values\n    picking_setPickingAttribute(position.z / position.w);\n  ",
     "vs:DECKGL_FILTER_COLOR": "\n  picking_setPickingColor(geometry.pickingColor);\n  ",
+    "fs:#decl": "\nuniform bool picking_uAttribute;\n  ",
     "fs:DECKGL_FILTER_COLOR": {
       order: 99,
       injection: "\n  // use highlight color if this fragment belongs to the selected object.\n  color = picking_filterHighlightColor(color);\n\n  // use picking color if rendering to picking FBO.\n  color = picking_filterPickingColor(color);\n    "
@@ -49335,6 +49373,9 @@ class Viewport {
     this.projectFlat = this.projectFlat.bind(this);
     this.unprojectFlat = this.unprojectFlat.bind(this);
   }
+  get subViewports() {
+    return null;
+  }
   get metersPerPixel() {
     return this.distanceScales.metersPerUnit[2] / this.scale;
   }
@@ -58226,7 +58267,7 @@ class Attribute extends DataColumn {
     const {
       startIndices
     } = this;
-    const vertexIndex = startIndices ? startIndices[row] : row;
+    const vertexIndex = startIndices ? row < startIndices.length ? startIndices[row] : this.numInstances : row;
     return vertexIndex * this.size;
   }
   getShaderAttributes() {
@@ -60870,7 +60911,7 @@ class Layer extends Component {
       if (Array.isArray(highlightColor)) {
         parameters.pickingHighlightColor = highlightColor;
       }
-      if (Number.isInteger(highlightedObjectIndex)) {
+      if (forceUpdate || highlightedObjectIndex !== oldProps.highlightedObjectIndex) {
         parameters.pickingSelectedColor = Number.isFinite(highlightedObjectIndex) && highlightedObjectIndex >= 0 ? this.encodePickingColor(highlightedObjectIndex) : null;
       }
       this.setModuleParameters(parameters);
@@ -62233,7 +62274,7 @@ function interpolateQuad(quad, ut, vt) {
 }
 const vs$g = "\n#define SHADER_NAME bitmap-layer-vertex-shader\n\nattribute vec2 texCoords;\nattribute vec3 positions;\nattribute vec3 positions64Low;\n\nvarying vec2 vTexCoord;\nvarying vec2 vTexPos;\n\nuniform float coordinateConversion;\n\nconst vec3 pickingColor = vec3(1.0, 0.0, 0.0);\n\nvoid main(void) {\n  geometry.worldPosition = positions;\n  geometry.uv = texCoords;\n  geometry.pickingColor = pickingColor;\n\n  gl_Position = project_position_to_clipspace(positions, positions64Low, vec3(0.0), geometry.position);\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  vTexCoord = texCoords;\n\n  if (coordinateConversion < -0.5) {\n    vTexPos = geometry.position.xy + project_uCommonOrigin.xy;\n  } else if (coordinateConversion > 0.5) {\n    vTexPos = geometry.worldPosition.xy;\n  }\n\n  vec4 color = vec4(0.0);\n  DECKGL_FILTER_COLOR(color, geometry);\n}\n";
 const packUVsIntoRGB = "\nvec3 packUVsIntoRGB(vec2 uv) {\n  // Extract the top 8 bits. We want values to be truncated down so we can add a fraction\n  vec2 uv8bit = floor(uv * 256.);\n\n  // Calculate the normalized remainders of u and v parts that do not fit into 8 bits\n  // Scale and clamp to 0-1 range\n  vec2 uvFraction = fract(uv * 256.);\n  vec2 uvFraction4bit = floor(uvFraction * 16.);\n\n  // Remainder can be encoded in blue channel, encode as 4 bits for pixel coordinates\n  float fractions = uvFraction4bit.x + uvFraction4bit.y * 16.;\n\n  return vec3(uv8bit, fractions) / 255.;\n}\n";
-const fs$i = "\n#define SHADER_NAME bitmap-layer-fragment-shader\n\n#ifdef GL_ES\nprecision highp float;\n#endif\n\nuniform sampler2D bitmapTexture;\n\nvarying vec2 vTexCoord;\nvarying vec2 vTexPos;\n\nuniform float desaturate;\nuniform vec4 transparentColor;\nuniform vec3 tintColor;\nuniform float opacity;\n\nuniform float coordinateConversion;\nuniform vec4 bounds;\n\n/* projection utils */\nconst float TILE_SIZE = 512.0;\nconst float PI = 3.1415926536;\nconst float WORLD_SCALE = TILE_SIZE / PI / 2.0;\n\n// from degrees to Web Mercator\nvec2 lnglat_to_mercator(vec2 lnglat) {\n  float x = lnglat.x;\n  float y = clamp(lnglat.y, -89.9, 89.9);\n  return vec2(\n    radians(x) + PI,\n    PI + log(tan(PI * 0.25 + radians(y) * 0.5))\n  ) * WORLD_SCALE;\n}\n\n// from Web Mercator to degrees\nvec2 mercator_to_lnglat(vec2 xy) {\n  xy /= WORLD_SCALE;\n  return degrees(vec2(\n    xy.x - PI,\n    atan(exp(xy.y - PI)) * 2.0 - PI * 0.5\n  ));\n}\n/* End projection utils */\n\n// apply desaturation\nvec3 color_desaturate(vec3 color) {\n  float luminance = (color.r + color.g + color.b) * 0.333333333;\n  return mix(color, vec3(luminance), desaturate);\n}\n\n// apply tint\nvec3 color_tint(vec3 color) {\n  return color * tintColor;\n}\n\n// blend with background color\nvec4 apply_opacity(vec3 color, float alpha) {\n  return mix(transparentColor, vec4(color, 1.0), alpha);\n}\n\nvec2 getUV(vec2 pos) {\n  return vec2(\n    (pos.x - bounds[0]) / (bounds[2] - bounds[0]),\n    (pos.y - bounds[3]) / (bounds[1] - bounds[3])\n  );\n}\n\n".concat(packUVsIntoRGB, "\n\nvoid main(void) {\n  vec2 uv = vTexCoord;\n  if (coordinateConversion < -0.5) {\n    vec2 lnglat = mercator_to_lnglat(vTexPos);\n    uv = getUV(lnglat);\n  } else if (coordinateConversion > 0.5) {\n    vec2 commonPos = lnglat_to_mercator(vTexPos);\n    uv = getUV(commonPos);\n  }\n  vec4 bitmapColor = texture2D(bitmapTexture, uv);\n\n  gl_FragColor = apply_opacity(color_tint(color_desaturate(bitmapColor.rgb)), bitmapColor.a * opacity);\n\n  geometry.uv = uv;\n  DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n\n  if (picking_uActive) {\n    // Since instance information is not used, we can use picking color for pixel index\n    gl_FragColor.rgb = packUVsIntoRGB(uv);\n  }\n}\n");
+const fs$i = "\n#define SHADER_NAME bitmap-layer-fragment-shader\n\n#ifdef GL_ES\nprecision highp float;\n#endif\n\nuniform sampler2D bitmapTexture;\n\nvarying vec2 vTexCoord;\nvarying vec2 vTexPos;\n\nuniform float desaturate;\nuniform vec4 transparentColor;\nuniform vec3 tintColor;\nuniform float opacity;\n\nuniform float coordinateConversion;\nuniform vec4 bounds;\n\n/* projection utils */\nconst float TILE_SIZE = 512.0;\nconst float PI = 3.1415926536;\nconst float WORLD_SCALE = TILE_SIZE / PI / 2.0;\n\n// from degrees to Web Mercator\nvec2 lnglat_to_mercator(vec2 lnglat) {\n  float x = lnglat.x;\n  float y = clamp(lnglat.y, -89.9, 89.9);\n  return vec2(\n    radians(x) + PI,\n    PI + log(tan(PI * 0.25 + radians(y) * 0.5))\n  ) * WORLD_SCALE;\n}\n\n// from Web Mercator to degrees\nvec2 mercator_to_lnglat(vec2 xy) {\n  xy /= WORLD_SCALE;\n  return degrees(vec2(\n    xy.x - PI,\n    atan(exp(xy.y - PI)) * 2.0 - PI * 0.5\n  ));\n}\n/* End projection utils */\n\n// apply desaturation\nvec3 color_desaturate(vec3 color) {\n  float luminance = (color.r + color.g + color.b) * 0.333333333;\n  return mix(color, vec3(luminance), desaturate);\n}\n\n// apply tint\nvec3 color_tint(vec3 color) {\n  return color * tintColor;\n}\n\n// blend with background color\nvec4 apply_opacity(vec3 color, float alpha) {\n  return mix(transparentColor, vec4(color, 1.0), alpha);\n}\n\nvec2 getUV(vec2 pos) {\n  return vec2(\n    (pos.x - bounds[0]) / (bounds[2] - bounds[0]),\n    (pos.y - bounds[3]) / (bounds[1] - bounds[3])\n  );\n}\n\n".concat(packUVsIntoRGB, "\n\nvoid main(void) {\n  vec2 uv = vTexCoord;\n  if (coordinateConversion < -0.5) {\n    vec2 lnglat = mercator_to_lnglat(vTexPos);\n    uv = getUV(lnglat);\n  } else if (coordinateConversion > 0.5) {\n    vec2 commonPos = lnglat_to_mercator(vTexPos);\n    uv = getUV(commonPos);\n  }\n  vec4 bitmapColor = texture2D(bitmapTexture, uv);\n\n  gl_FragColor = apply_opacity(color_tint(color_desaturate(bitmapColor.rgb)), bitmapColor.a * opacity);\n\n  geometry.uv = uv;\n  DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n\n  if (picking_uActive && !picking_uAttribute) {\n    // Since instance information is not used, we can use picking color for pixel index\n    gl_FragColor.rgb = packUVsIntoRGB(uv);\n  }\n}\n");
 const defaultProps$I = {
   image: {
     type: "image",
@@ -70373,18 +70414,22 @@ function getBoundingBox(viewport, zRange, extent2) {
 }
 function getCullBounds({
   viewport,
-  z: z2,
+  z: z2 = 0,
   cullRect
 }) {
-  const x2 = cullRect.x - viewport.x;
-  const y2 = cullRect.y - viewport.y;
-  const {
-    width,
-    height
-  } = cullRect;
+  const subViewports = viewport.subViewports || [viewport];
+  return subViewports.map((v) => getCullBoundsInViewport(v, z2, cullRect));
+}
+function getCullBoundsInViewport(viewport, z2, cullRect) {
   if (!Array.isArray(z2)) {
+    const x2 = cullRect.x - viewport.x;
+    const y2 = cullRect.y - viewport.y;
+    const {
+      width,
+      height
+    } = cullRect;
     const unprojectOption = {
-      targetZ: z2 || 0
+      targetZ: z2
     };
     const topLeft = viewport.unproject([x2, y2], unprojectOption);
     const topRight = viewport.unproject([x2 + width, y2], unprojectOption);
@@ -70392,16 +70437,8 @@ function getCullBounds({
     const bottomRight = viewport.unproject([x2 + width, y2 + height], unprojectOption);
     return [Math.min(topLeft[0], topRight[0], bottomLeft[0], bottomRight[0]), Math.min(topLeft[1], topRight[1], bottomLeft[1], bottomRight[1]), Math.max(topLeft[0], topRight[0], bottomLeft[0], bottomRight[0]), Math.max(topLeft[1], topRight[1], bottomLeft[1], bottomRight[1])];
   }
-  const bounds0 = getCullBounds({
-    viewport,
-    z: z2[0],
-    cullRect
-  });
-  const bounds1 = getCullBounds({
-    viewport,
-    z: z2[1],
-    cullRect
-  });
+  const bounds0 = getCullBoundsInViewport(viewport, z2[0], cullRect);
+  const bounds1 = getCullBoundsInViewport(viewport, z2[1], cullRect);
   return [Math.min(bounds0[0], bounds1[0]), Math.min(bounds0[1], bounds1[1]), Math.max(bounds0[2], bounds1[2]), Math.max(bounds0[3], bounds1[3])];
 }
 function getIndexingCoords(bbox2, scale2, modelMatrixInverse) {
@@ -70631,7 +70668,7 @@ class Tileset2D {
       return false;
     }
     if (cullRect && this._viewport) {
-      const [minX, minY, maxX, maxY] = getCullBounds({
+      const boundsArr = this._getCullBounds({
         viewport: this._viewport,
         z: this._zRange,
         cullRect
@@ -70639,12 +70676,20 @@ class Tileset2D {
       const {
         bbox: bbox2
       } = tile;
-      if ("west" in bbox2) {
-        return bbox2.west < maxX && bbox2.east > minX && bbox2.south < maxY && bbox2.north > minY;
+      for (const [minX, minY, maxX, maxY] of boundsArr) {
+        let overlaps;
+        if ("west" in bbox2) {
+          overlaps = bbox2.west < maxX && bbox2.east > minX && bbox2.south < maxY && bbox2.north > minY;
+        } else {
+          const y02 = Math.min(bbox2.top, bbox2.bottom);
+          const y12 = Math.max(bbox2.top, bbox2.bottom);
+          overlaps = bbox2.left < maxX && bbox2.right > minX && y02 < maxY && y12 > minY;
+        }
+        if (overlaps) {
+          return true;
+        }
       }
-      const y02 = Math.min(bbox2.top, bbox2.bottom);
-      const y12 = Math.max(bbox2.top, bbox2.bottom);
-      return bbox2.left < maxX && bbox2.right > minX && y02 < maxY && y12 > minY;
+      return false;
     }
     return true;
   }
@@ -71093,14 +71138,19 @@ class TileLayer extends CompositeLayer {
     info,
     sourceLayer
   }) {
+    const sourceTile = sourceLayer.props.tile;
     if (info.picked) {
-      info.tile = sourceLayer.props.tile;
+      info.tile = sourceTile;
     }
+    info.sourceTile = sourceTile;
     return info;
   }
   _updateAutoHighlight(info) {
-    if (info.sourceLayer) {
-      info.sourceLayer.updateAutoHighlight(info);
+    const sourceTile = info.sourceTile;
+    if (sourceTile && sourceTile.layers) {
+      for (const layer of sourceTile.layers) {
+        layer.updateAutoHighlight(info);
+      }
     }
   }
   renderLayers() {
@@ -83418,6 +83468,9 @@ class ScenegraphNode {
   toString() {
     return "{type: ScenegraphNode, id: ".concat(this.id, ")}");
   }
+  getBounds() {
+    return null;
+  }
   setPosition(position) {
     assert$8(position.length === 3, "setPosition requires vector argument");
     this.position = position;
@@ -83568,6 +83621,34 @@ class GroupNode extends ScenegraphNode {
     this.removeAll();
     super.delete();
   }
+  getBounds() {
+    const result = [[Infinity, Infinity, Infinity], [-Infinity, -Infinity, -Infinity]];
+    this.traverse((node, _ref) => {
+      let {
+        worldMatrix
+      } = _ref;
+      const bounds2 = node.getBounds();
+      if (!bounds2) {
+        return;
+      }
+      const [min, max] = bounds2;
+      const center2 = new Vector3(min).add(max).divide([2, 2, 2]);
+      worldMatrix.transformAsPoint(center2, center2);
+      const halfSize = new Vector3(max).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);
+        for (let i2 = 0; i2 < 3; i2++) {
+          result[0][i2] = Math.min(result[0][i2], position[i2]);
+          result[1][i2] = Math.max(result[1][i2], position[i2]);
+        }
+      }
+    });
+    if (!Number.isFinite(result[0][0])) {
+      return null;
+    }
+    return result;
+  }
   traverse(visitor) {
     let {
       worldMatrix = new Matrix4()
@@ -83817,6 +83898,7 @@ class ModelNode extends ScenegraphNode {
     } else {
       this.model = new Model(gl, props2);
     }
+    this.bounds = null;
     this.managedResources = props2.managedResources || [];
   }
   setProps(props2) {
@@ -83824,6 +83906,9 @@ class ModelNode extends ScenegraphNode {
     this._setModelNodeProps(props2);
     return this;
   }
+  getBounds() {
+    return this.bounds;
+  }
   delete() {
     if (this.model) {
       this.model.delete();
@@ -84008,17 +84093,21 @@ function createGLTFModel(gl, options) {
   const managedResources = [];
   managedResources.push(...materialParser.generatedTextures);
   managedResources.push(...Object.values(attributes).map((attribute) => attribute.buffer));
-  const model = new ModelNode(gl, Object.assign({
+  const model = new ModelNode(gl, {
     id,
     drawMode,
     vertexCount,
     modules: [pbr],
-    defines: materialParser.defines,
     parameters: materialParser.parameters,
     vs: addVersionToShader(gl, vs$7),
     fs: addVersionToShader(gl, fs$7),
-    managedResources
-  }, modelOptions));
+    managedResources,
+    ...modelOptions,
+    defines: {
+      ...materialParser.defines,
+      ...modelOptions.defines
+    }
+  });
   model.setProps({
     attributes
   });
@@ -84113,13 +84202,15 @@ class GLTFInstantiator {
     log$2.warn("getVertexCount() not found")();
   }
   createPrimitive(gltfPrimitive, i2, gltfMesh) {
-    return createGLTFModel(this.gl, Object.assign({
+    const model = createGLTFModel(this.gl, Object.assign({
       id: gltfPrimitive.name || "".concat(gltfMesh.name || gltfMesh.id, "-primitive-").concat(i2),
       drawMode: gltfPrimitive.mode || 4,
       vertexCount: gltfPrimitive.indices ? gltfPrimitive.indices.count : this.getVertexCount(gltfPrimitive.attributes),
       attributes: this.createAttributes(gltfPrimitive.attributes, gltfPrimitive.indices),
       material: gltfPrimitive.material
     }, this.options));
+    model.bounds = [gltfPrimitive.attributes.POSITION.min, gltfPrimitive.attributes.POSITION.max];
+    return model;
   }
   createAttributes(attributes, indices) {
     const loadedAttributes = {};
@@ -92047,15 +92138,11 @@ class Tile3DLayer extends CompositeLayer {
     info,
     sourceLayer
   }) {
-    const {
-      layerMap
-    } = this.state;
-    const layerId = sourceLayer && sourceLayer.id;
-    if (layerId) {
-      const substr = layerId.substring(this.id.length + 1);
-      const tileId = substr.substring(substr.indexOf("-") + 1);
-      info.object = layerMap[tileId] && layerMap[tileId].tile;
+    const sourceTile = sourceLayer && sourceLayer.props.tile;
+    if (info.picked) {
+      info.object = sourceTile;
     }
+    info.sourceTile = sourceTile;
     return info;
   }
   filterSubLayer({
@@ -92071,8 +92158,10 @@ class Tile3DLayer extends CompositeLayer {
     return tile.selected && tile.viewportIds.includes(viewportId);
   }
   _updateAutoHighlight(info) {
-    if (info.sourceLayer) {
-      info.sourceLayer.updateAutoHighlight(info);
+    const sourceTile = info.sourceTile;
+    const layerCache = this.state.layerMap[sourceTile === null || sourceTile === void 0 ? void 0 : sourceTile.id];
+    if (layerCache && layerCache.layer) {
+      layerCache.layer.updateAutoHighlight(info);
     }
   }
   async _loadTileset(tilesetUrl) {
@@ -132521,16 +132610,16 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c) => registry$1.set(c, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-ed466def.js").then((m) => m.default));
-addDecoder(5, () => import("./lzw-dcec678f.js").then((m) => m.default));
+addDecoder([void 0, 1], () => import("./raw-70e6b59a.js").then((m) => m.default));
+addDecoder(5, () => import("./lzw-a69646f9.js").then((m) => m.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-91201fe5.js").then((m) => m.default));
-addDecoder([8, 32946], () => import("./deflate-54e8a983.js").then((m) => m.default));
-addDecoder(32773, () => import("./packbits-1f0b4f8a.js").then((m) => m.default));
-addDecoder(34887, () => import("./lerc-ede29ce8.js").then((m) => m.default));
-addDecoder(50001, () => import("./webimage-892fe81d.js").then((m) => m.default));
+addDecoder(7, () => import("./jpeg-aa77b6ec.js").then((m) => m.default));
+addDecoder([8, 32946], () => import("./deflate-9263f588.js").then((m) => m.default));
+addDecoder(32773, () => import("./packbits-fe4063d1.js").then((m) => m.default));
+addDecoder(34887, () => import("./lerc-1fcb6280.js").then((m) => m.default));
+addDecoder(50001, () => import("./webimage-093820b7.js").then((m) => m.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset5 = 0;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a, H } from "./index-99684608.js";
+import { a, H } from "./index-6515eb5d.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-91201fe5.js → jpeg-aa77b6ec.js}

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

package/dist/{lerc-ede29ce8.js → lerc-1fcb6280.js}

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

package/dist/{lzw-dcec678f.js → lzw-a69646f9.js}

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

package/dist/{packbits-1f0b4f8a.js → packbits-fe4063d1.js}

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

package/dist/{raw-ed466def.js → raw-70e6b59a.js}

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

package/dist/{webimage-892fe81d.js → webimage-093820b7.js}

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/heatmap",
-  "version": "3.2.2",
+  "version": "3.3.1",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -20,14 +20,14 @@
     "lodash-es": "^4.17.21",
     "uuid": "^9.0.0",
     "react-aria": "^3.28.0",
-    "@vitessce/constants-internal": "3.2.2",
-    "@vitessce/gl": "3.2.2",
-    "@vitessce/legend": "3.2.2",
-    "@vitessce/sets-utils": "3.2.2",
-    "@vitessce/tooltip": "3.2.2",
-    "@vitessce/utils": "3.2.2",
-    "@vitessce/vit-s": "3.2.2",
-    "@vitessce/workers": "3.2.2"
+    "@vitessce/constants-internal": "3.3.1",
+    "@vitessce/legend": "3.3.1",
+    "@vitessce/sets-utils": "3.3.1",
+    "@vitessce/gl": "3.3.1",
+    "@vitessce/tooltip": "3.3.1",
+    "@vitessce/utils": "3.3.1",
+    "@vitessce/workers": "3.3.1",
+    "@vitessce/vit-s": "3.3.1"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",