@vitessce/heatmap 3.3.3 → 3.3.5

package/dist/{deflate-ca3a4331.js → deflate-e18d403c.js}

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

package/dist/{index-98499b51.js → index-dd20d252.js}

@@ -1302,9 +1302,6 @@ var pluralizeExports = pluralize$1.exports;
 const plur = /* @__PURE__ */ getDefaultExportFromCjs(pluralizeExports);
 plur.addPluralRule("glomerulus", "glomeruli");
 plur.addPluralRule("interstitium", "interstitia");
-function fromEntries(iterable) {
-  return [...iterable].reduce((obj, { 0: key, 1: val }) => Object.assign(obj, { [key]: val }), {});
-}
 function commaNumber(n2) {
   const nf = new Intl.NumberFormat("en-US");
   return nf.format(n2);
@@ -1371,6 +1368,55 @@ function copyUint8Array(arr) {
   newArr.set(arr);
   return newArr;
 }
+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 = [];
+    for (let i2 = 0; i2 < defaultPoolSize; ++i2) {
+      const w2 = createWorker2();
+      this.workers.push(w2);
+      this.idleWorkers.push(w2);
+    }
+  }
+  // eslint-disable-next-line class-methods-use-this
+  async process() {
+    throw new Error('Pool needs to implement "process" method');
+  }
+  async waitForWorker() {
+    const idleWorker = this.idleWorkers.pop();
+    if (idleWorker) {
+      return idleWorker;
+    }
+    const waiter = {};
+    const promise = new Promise((resolve) => {
+      waiter.resolve = resolve;
+    });
+    this.waitQueue.push(waiter);
+    return promise;
+  }
+  async finishTask(currentWorker) {
+    const waiter = this.waitQueue.pop();
+    if (waiter && waiter.resolve) {
+      waiter.resolve(currentWorker);
+    } else {
+      this.idleWorkers.push(currentWorker);
+    }
+  }
+  destroy() {
+    for (let i2 = 0; i2 < this.workers.length; ++i2) {
+      this.workers[i2].terminate();
+    }
+  }
+}
 let getRandomValues$1;
 const rnds8$1 = new Uint8Array(16);
 function rng$1() {
@@ -10890,6 +10936,7 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_OME_ZARR: "obsSegmentations.ome-zarr",
   // AnnData
   OBS_FEATURE_MATRIX_ANNDATA_ZARR: "obsFeatureMatrix.anndata.zarr",
+  OBS_FEATURE_COLUMNS_ANNDATA_ZARR: "obsFeatureColumns.anndata.zarr",
   OBS_SETS_ANNDATA_ZARR: "obsSets.anndata.zarr",
   OBS_EMBEDDING_ANNDATA_ZARR: "obsEmbedding.anndata.zarr",
   OBS_SPOTS_ANNDATA_ZARR: "obsSpots.anndata.zarr",
@@ -11616,7 +11663,7 @@ function configSchemaToVersion(zodSchema) {
   return zodSchema.shape.version._def.value;
 }
 ({
-  ...fromEntries(SCHEMA_HANDLERS.map(([zodSchema]) => {
+  ...Object.fromEntries(SCHEMA_HANDLERS.map(([zodSchema]) => {
     const version2 = configSchemaToVersion(zodSchema);
     return [version2, zodSchema];
   })),
@@ -11692,6 +11739,9 @@ const annDataObsSets = z.array(z.object({
   ]),
   scorePath: z.string().optional().describe("The location in the AnnData store for the set confidence scores, like 'obs/celltype_prediction_score.'")
 }));
+z.array(z.object({
+  path: z.string()
+}));
 const annDataObsSpots = annDataObsm;
 const annDataObsPoints = annDataObsm;
 const annDataObsLocations = annDataObsm;
@@ -18464,62 +18514,19 @@ interpolateSequentialMulti(schemePlasma);
 function getCellColors(params) {
   const { cellSets, cellSetSelection, cellSetColor, obsIndex, theme } = params;
   if (cellSetSelection && cellSets) {
-    return treeToCellColorsBySetNames(cellSets, cellSetSelection, cellSetColor, theme);
+    return treeToCellColorsBySetNames(
+      cellSets,
+      cellSetSelection,
+      cellSetColor,
+      theme
+      /* as string */
+    );
   }
   if (obsIndex && theme) {
     return new Map(obsIndex.map((o2) => [o2, getDefaultColor(theme)]));
   }
   return /* @__PURE__ */ new Map();
 }
-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 = [];
-    for (let i2 = 0; i2 < defaultPoolSize; ++i2) {
-      const w2 = createWorker2();
-      this.workers.push(w2);
-      this.idleWorkers.push(w2);
-    }
-  }
-  // eslint-disable-next-line class-methods-use-this
-  async process() {
-    throw new Error('Pool needs to implement "process" method');
-  }
-  async waitForWorker() {
-    const idleWorker = this.idleWorkers.pop();
-    if (idleWorker) {
-      return idleWorker;
-    }
-    const waiter = {};
-    const promise = new Promise((resolve) => {
-      waiter.resolve = resolve;
-    });
-    this.waitQueue.push(waiter);
-    return promise;
-  }
-  async finishTask(currentWorker) {
-    const waiter = this.waitQueue.pop();
-    if (waiter && waiter.resolve) {
-      waiter.resolve(currentWorker);
-    } else {
-      this.idleWorkers.push(currentWorker);
-    }
-  }
-  destroy() {
-    for (let i2 = 0; i2 < this.workers.length; ++i2) {
-      this.workers[i2].terminate();
-    }
-  }
-}
 function r$1(e3) {
   var t2, f2, n2 = "";
   if ("string" == typeof e3 || "number" == typeof e3)
@@ -20667,19 +20674,19 @@ function _createClass$w(Constructor, protoProps, staticProps) {
   });
   return Constructor;
 }
-function _setPrototypeOf$w(o2, p) {
-  _setPrototypeOf$w = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o3, p2) {
+function _setPrototypeOf$v(o2, p) {
+  _setPrototypeOf$v = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o3, p2) {
     o3.__proto__ = p2;
     return o3;
   };
-  return _setPrototypeOf$w(o2, p);
+  return _setPrototypeOf$v(o2, p);
 }
-function _inheritsLoose$1(subClass, superClass) {
+function _inheritsLoose(subClass, superClass) {
   subClass.prototype = Object.create(superClass.prototype);
   subClass.prototype.constructor = subClass;
-  _setPrototypeOf$w(subClass, superClass);
+  _setPrototypeOf$v(subClass, superClass);
 }
-function _assertThisInitialized$w(self2) {
+function _assertThisInitialized$v(self2) {
   if (self2 === void 0) {
     throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
   }
@@ -20886,7 +20893,7 @@ var BaseStyleRule = /* @__PURE__ */ function() {
   return BaseStyleRule2;
 }();
 var StyleRule = /* @__PURE__ */ function(_BaseStyleRule) {
-  _inheritsLoose$1(StyleRule2, _BaseStyleRule);
+  _inheritsLoose(StyleRule2, _BaseStyleRule);
   function StyleRule2(key, style2, options) {
     var _this;
     _this = _BaseStyleRule.call(this, key, style2, options) || this;
@@ -20894,7 +20901,7 @@ var StyleRule = /* @__PURE__ */ function(_BaseStyleRule) {
     if (selector2) {
       _this.selectorText = selector2;
     } else if (scoped !== false) {
-      _this.id = generateId(_assertThisInitialized$w(_assertThisInitialized$w(_this)), sheet);
+      _this.id = generateId(_assertThisInitialized$v(_assertThisInitialized$v(_this)), sheet);
       _this.selectorText = "." + escape(_this.id);
     }
     return _this;
@@ -21124,7 +21131,7 @@ var pluginKeyframesRule = {
   }
 };
 var KeyframeRule = /* @__PURE__ */ function(_BaseStyleRule) {
-  _inheritsLoose$1(KeyframeRule2, _BaseStyleRule);
+  _inheritsLoose(KeyframeRule2, _BaseStyleRule);
   function KeyframeRule2() {
     return _BaseStyleRule.apply(this, arguments) || this;
   }
@@ -24036,25 +24043,7 @@ function useIsFocusVisible() {
     ref
   };
 }
-function _setPrototypeOf$v(o2, p) {
-  _setPrototypeOf$v = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf2(o3, p2) {
-    o3.__proto__ = p2;
-    return o3;
-  };
-  return _setPrototypeOf$v(o2, p);
-}
-function _inheritsLoose(subClass, superClass) {
-  subClass.prototype = Object.create(superClass.prototype);
-  subClass.prototype.constructor = subClass;
-  _setPrototypeOf$v(subClass, superClass);
-}
 const TransitionGroupContext = React__default.createContext(null);
-function _assertThisInitialized$v(self2) {
-  if (self2 === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self2;
-}
 function getChildMapping(children2, mapFn) {
   var mapper = function mapper2(child) {
     return mapFn && isValidElement(child) ? mapFn(child) : child;
@@ -24203,7 +24192,7 @@ var TransitionGroup = /* @__PURE__ */ function(_React$Component) {
     }
     if (this.mounted) {
       this.setState(function(state) {
-        var children2 = _extends$1({}, state.children);
+        var children2 = _extends$2({}, state.children);
         delete children2[child.key];
         return {
           children: children2
@@ -24212,7 +24201,7 @@ var TransitionGroup = /* @__PURE__ */ function(_React$Component) {
     }
   };
   _proto.render = function render() {
-    var _this$props = this.props, Component2 = _this$props.component, childFactory2 = _this$props.childFactory, props2 = _objectWithoutPropertiesLoose$1(_this$props, ["component", "childFactory"]);
+    var _this$props = this.props, Component2 = _this$props.component, childFactory2 = _this$props.childFactory, props2 = _objectWithoutPropertiesLoose(_this$props, ["component", "childFactory"]);
     var contextValue = this.state.contextValue;
     var children2 = values(this.state.children).map(childFactory2);
     delete props2.appear;
@@ -131554,7 +131543,8 @@ const AXIS_MARGIN = 3;
 const AXIS_PADDING = 10;
 const THEME_TO_TEXT_COLOR = {
   dark: [224, 224, 224],
-  light: [64, 64, 64]
+  light: [64, 64, 64],
+  light2: [64, 64, 64]
 };
 const AXIS_FONT_FAMILY = "-apple-system, 'Helvetica Neue', Arial, sans-serif";
 const PIXELATED_TEXTURE_PARAMETERS = {
@@ -132657,16 +132647,16 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c) => registry$1.set(c, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-0da61dee.js").then((m) => m.default));
-addDecoder(5, () => import("./lzw-85a51820.js").then((m) => m.default));
+addDecoder([void 0, 1], () => import("./raw-b95711bc.js").then((m) => m.default));
+addDecoder(5, () => import("./lzw-c47337be.js").then((m) => m.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-de3f5fd6.js").then((m) => m.default));
-addDecoder([8, 32946], () => import("./deflate-ca3a4331.js").then((m) => m.default));
-addDecoder(32773, () => import("./packbits-e923ce89.js").then((m) => m.default));
-addDecoder(34887, () => import("./lerc-1f658a8e.js").then((m) => m.default));
-addDecoder(50001, () => import("./webimage-dc2efc6c.js").then((m) => m.default));
+addDecoder(7, () => import("./jpeg-329d0b25.js").then((m) => m.default));
+addDecoder([8, 32946], () => import("./deflate-e18d403c.js").then((m) => m.default));
+addDecoder(32773, () => import("./packbits-4373d6cf.js").then((m) => m.default));
+addDecoder(34887, () => import("./lerc-497104ea.js").then((m) => m.default));
+addDecoder(50001, () => import("./webimage-85278526.js").then((m) => m.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset5 = 0;
@@ -143908,7 +143898,7 @@ class BitmaskLayer2 extends XRLayer {
     } = this.state;
     if (textures && model) {
       const scaleFactor = 1 / 2 ** (maxZoom - zoom);
-      const colors = fromEntries(range$5(MAX_CHANNELS).map((i2) => [`color${i2}`, getColor(channelColors[i2])]));
+      const colors = Object.fromEntries(range$5(MAX_CHANNELS).map((i2) => [`color${i2}`, getColor(channelColors[i2])]));
       model.setUniforms(Object.assign({}, uniforms, {
         ...colors,
         // Bitmask image channel data textures

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a, H } from "./index-98499b51.js";
+import { a, H } from "./index-dd20d252.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-de3f5fd6.js → jpeg-329d0b25.js}

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

package/dist/{lerc-1f658a8e.js → lerc-497104ea.js}

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

package/dist/{lzw-85a51820.js → lzw-c47337be.js}

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

package/dist/{packbits-e923ce89.js → packbits-4373d6cf.js}

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

package/dist/{raw-0da61dee.js → raw-b95711bc.js}

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

package/dist/{webimage-dc2efc6c.js → webimage-85278526.js}

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

package/dist-tsc/HeatmapSubscriber.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useCallback, useMemo, } from 'react';
 import { TitleInfo, useDeckCanvasSize, useGetObsMembership, useGetObsInfo, useReady, useUrls, useObsSetsData, useObsFeatureMatrixData, useUint8ObsFeatureMatrix, useMultiObsLabels, useFeatureLabelsData, useCoordination, useLoaders, useSetComponentHover, useSetComponentViewInfo, } from '@vitessce/vit-s';
-import { pluralize as plur, capitalize, commaNumber, getCellColors } from '@vitessce/utils';
-import { mergeObsSets, findLongestCommonPath } from '@vitessce/sets-utils';
+import { pluralize as plur, capitalize, commaNumber } from '@vitessce/utils';
+import { mergeObsSets, findLongestCommonPath, getCellColors } from '@vitessce/sets-utils';
 import { COMPONENT_COORDINATION_TYPES, ViewType } from '@vitessce/constants-internal';
 import { Legend } from '@vitessce/legend';
 import Heatmap from './Heatmap.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/heatmap",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "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.3.3",
-    "@vitessce/sets-utils": "3.3.3",
-    "@vitessce/legend": "3.3.3",
-    "@vitessce/tooltip": "3.3.3",
-    "@vitessce/vit-s": "3.3.3",
-    "@vitessce/workers": "3.3.3",
-    "@vitessce/utils": "3.3.3",
-    "@vitessce/gl": "3.3.3"
+    "@vitessce/constants-internal": "3.3.5",
+    "@vitessce/gl": "3.3.5",
+    "@vitessce/legend": "3.3.5",
+    "@vitessce/tooltip": "3.3.5",
+    "@vitessce/sets-utils": "3.3.5",
+    "@vitessce/utils": "3.3.5",
+    "@vitessce/vit-s": "3.3.5",
+    "@vitessce/workers": "3.3.5"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",

package/src/HeatmapSubscriber.js

@@ -16,8 +16,8 @@ import {
   useCoordination, useLoaders,
   useSetComponentHover, useSetComponentViewInfo,
 } from '@vitessce/vit-s';
-import { pluralize as plur, capitalize, commaNumber, getCellColors } from '@vitessce/utils';
-import { mergeObsSets, findLongestCommonPath } from '@vitessce/sets-utils';
+import { pluralize as plur, capitalize, commaNumber } from '@vitessce/utils';
+import { mergeObsSets, findLongestCommonPath, getCellColors } from '@vitessce/sets-utils';
 import { COMPONENT_COORDINATION_TYPES, ViewType } from '@vitessce/constants-internal';
 import { Legend } from '@vitessce/legend';
 import Heatmap from './Heatmap.js';