@vitessce/dev 2.0.0-beta.1 → 2.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm.4b234125.mjs";
2
- import { B as BaseDecoder } from "./index.4511cb5d.mjs";
2
+ import { B as BaseDecoder } from "./index.879a4eb2.mjs";
3
3
  import "react";
4
4
  import "react-dom";
5
5
  class DeflateDecoder extends BaseDecoder {
@@ -61000,11 +61000,19 @@ var _fails = function(exec) {
61000
61000
  return true;
61001
61001
  }
61002
61002
  };
61003
- var _descriptors = !_fails(function() {
61004
- return Object.defineProperty({}, "a", { get: function() {
61005
- return 7;
61006
- } }).a != 7;
61007
- });
61003
+ var _descriptors;
61004
+ var hasRequired_descriptors;
61005
+ function require_descriptors() {
61006
+ if (hasRequired_descriptors)
61007
+ return _descriptors;
61008
+ hasRequired_descriptors = 1;
61009
+ _descriptors = !_fails(function() {
61010
+ return Object.defineProperty({}, "a", { get: function() {
61011
+ return 7;
61012
+ } }).a != 7;
61013
+ });
61014
+ return _descriptors;
61015
+ }
61008
61016
  var _domCreate;
61009
61017
  var hasRequired_domCreate;
61010
61018
  function require_domCreate() {
@@ -61019,11 +61027,19 @@ function require_domCreate() {
61019
61027
  };
61020
61028
  return _domCreate;
61021
61029
  }
61022
- var _ie8DomDefine = !_descriptors && !_fails(function() {
61023
- return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
61024
- return 7;
61025
- } }).a != 7;
61026
- });
61030
+ var _ie8DomDefine;
61031
+ var hasRequired_ie8DomDefine;
61032
+ function require_ie8DomDefine() {
61033
+ if (hasRequired_ie8DomDefine)
61034
+ return _ie8DomDefine;
61035
+ hasRequired_ie8DomDefine = 1;
61036
+ _ie8DomDefine = !require_descriptors() && !_fails(function() {
61037
+ return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
61038
+ return 7;
61039
+ } }).a != 7;
61040
+ });
61041
+ return _ie8DomDefine;
61042
+ }
61027
61043
  var isObject$f = _isObject;
61028
61044
  var _toPrimitive = function(it, S) {
61029
61045
  if (!isObject$f(it))
@@ -61037,25 +61053,32 @@ var _toPrimitive = function(it, S) {
61037
61053
  return val;
61038
61054
  throw TypeError("Can't convert object to primitive value");
61039
61055
  };
61040
- var anObject$3 = _anObject;
61041
- var IE8_DOM_DEFINE$1 = _ie8DomDefine;
61042
- var toPrimitive$2 = _toPrimitive;
61043
- var dP$3 = Object.defineProperty;
61044
- _objectDp.f = _descriptors ? Object.defineProperty : function defineProperty(O, P2, Attributes2) {
61045
- anObject$3(O);
61046
- P2 = toPrimitive$2(P2, true);
61047
- anObject$3(Attributes2);
61048
- if (IE8_DOM_DEFINE$1)
61049
- try {
61050
- return dP$3(O, P2, Attributes2);
61051
- } catch (e3) {
61052
- }
61053
- if ("get" in Attributes2 || "set" in Attributes2)
61054
- throw TypeError("Accessors not supported!");
61055
- if ("value" in Attributes2)
61056
- O[P2] = Attributes2.value;
61057
- return O;
61058
- };
61056
+ var hasRequired_objectDp;
61057
+ function require_objectDp() {
61058
+ if (hasRequired_objectDp)
61059
+ return _objectDp;
61060
+ hasRequired_objectDp = 1;
61061
+ var anObject2 = _anObject;
61062
+ var IE8_DOM_DEFINE2 = require_ie8DomDefine();
61063
+ var toPrimitive2 = _toPrimitive;
61064
+ var dP2 = Object.defineProperty;
61065
+ _objectDp.f = require_descriptors() ? Object.defineProperty : function defineProperty4(O, P2, Attributes2) {
61066
+ anObject2(O);
61067
+ P2 = toPrimitive2(P2, true);
61068
+ anObject2(Attributes2);
61069
+ if (IE8_DOM_DEFINE2)
61070
+ try {
61071
+ return dP2(O, P2, Attributes2);
61072
+ } catch (e3) {
61073
+ }
61074
+ if ("get" in Attributes2 || "set" in Attributes2)
61075
+ throw TypeError("Accessors not supported!");
61076
+ if ("value" in Attributes2)
61077
+ O[P2] = Attributes2.value;
61078
+ return O;
61079
+ };
61080
+ return _objectDp;
61081
+ }
61059
61082
  var _propertyDesc = function(bitmap, value2) {
61060
61083
  return {
61061
61084
  enumerable: !(bitmap & 1),
@@ -61064,9 +61087,9 @@ var _propertyDesc = function(bitmap, value2) {
61064
61087
  value: value2
61065
61088
  };
61066
61089
  };
61067
- var dP$2 = _objectDp;
61090
+ var dP$2 = require_objectDp();
61068
61091
  var createDesc$2 = _propertyDesc;
61069
- var _hide = _descriptors ? function(object2, key2, value2) {
61092
+ var _hide = require_descriptors() ? function(object2, key2, value2) {
61070
61093
  return dP$2.f(object2, key2, createDesc$2(1, value2));
61071
61094
  } : function(object2, key2, value2) {
61072
61095
  object2[key2] = value2;
@@ -61269,7 +61292,7 @@ function require_objectAssign() {
61269
61292
  if (hasRequired_objectAssign)
61270
61293
  return _objectAssign;
61271
61294
  hasRequired_objectAssign = 1;
61272
- var DESCRIPTORS2 = _descriptors;
61295
+ var DESCRIPTORS2 = require_descriptors();
61273
61296
  var getKeys2 = _objectKeys$1;
61274
61297
  var gOPS2 = _objectGops;
61275
61298
  var pIE2 = require_objectPie();
@@ -61332,9 +61355,9 @@ var _default$i = _assign2.default || function(target2) {
61332
61355
  };
61333
61356
  var defineProperty$6 = { exports: {} };
61334
61357
  var $export$4 = _export;
61335
- $export$4($export$4.S + $export$4.F * !_descriptors, "Object", { defineProperty: _objectDp.f });
61358
+ $export$4($export$4.S + $export$4.F * !require_descriptors(), "Object", { defineProperty: require_objectDp().f });
61336
61359
  var $Object$1 = _core.exports.Object;
61337
- var defineProperty$5 = function defineProperty2(it, key2, desc) {
61360
+ var defineProperty$5 = function defineProperty(it, key2, desc) {
61338
61361
  return $Object$1.defineProperty(it, key2, desc);
61339
61362
  };
61340
61363
  (function(module2) {
@@ -61408,10 +61431,10 @@ var _redefine = { exports: {} };
61408
61431
  module2.exports = _hide;
61409
61432
  })(_redefine);
61410
61433
  var _iterators = {};
61411
- var dP$1 = _objectDp;
61434
+ var dP$1 = require_objectDp();
61412
61435
  var anObject$2 = _anObject;
61413
61436
  var getKeys$1 = _objectKeys$1;
61414
- var _objectDps = _descriptors ? Object.defineProperties : function defineProperties(O, Properties) {
61437
+ var _objectDps = require_descriptors() ? Object.defineProperties : function defineProperties(O, Properties) {
61415
61438
  anObject$2(O);
61416
61439
  var keys4 = getKeys$1(Properties);
61417
61440
  var length2 = keys4.length;
@@ -61476,7 +61499,7 @@ var $exports = _wks.exports = function(name2) {
61476
61499
  return store[name2] || (store[name2] = USE_SYMBOL && Symbol$7[name2] || (USE_SYMBOL ? Symbol$7 : uid$2)("Symbol." + name2));
61477
61500
  };
61478
61501
  $exports.store = store;
61479
- var def$1 = _objectDp.f;
61502
+ var def$1 = require_objectDp().f;
61480
61503
  var has$8 = _has$1;
61481
61504
  var TAG = _wks.exports("toStringTag");
61482
61505
  var _setToStringTag = function(it, tag2, stat) {
@@ -61646,7 +61669,7 @@ var _meta$3 = { exports: {} };
61646
61669
  var META$1 = _uid("meta");
61647
61670
  var isObject$e = _isObject;
61648
61671
  var has$6 = _has$1;
61649
- var setDesc = _objectDp.f;
61672
+ var setDesc = require_objectDp().f;
61650
61673
  var id$2 = 0;
61651
61674
  var isExtensible = Object.isExtensible || function() {
61652
61675
  return true;
@@ -61696,7 +61719,7 @@ var meta$6 = _meta$3.exports = {
61696
61719
  };
61697
61720
  var core$1 = _core.exports;
61698
61721
  var wksExt$1 = _wksExt;
61699
- var defineProperty$4 = _objectDp.f;
61722
+ var defineProperty$4 = require_objectDp().f;
61700
61723
  var _wksDefine = function(name2) {
61701
61724
  var $Symbol2 = core$1.Symbol || (core$1.Symbol = {});
61702
61725
  if (name2.charAt(0) != "_" && !(name2 in $Symbol2))
@@ -61750,9 +61773,9 @@ var createDesc$1 = _propertyDesc;
61750
61773
  var toIObject$1 = _toIobject;
61751
61774
  var toPrimitive$1 = _toPrimitive;
61752
61775
  var has$5 = _has$1;
61753
- var IE8_DOM_DEFINE = _ie8DomDefine;
61776
+ var IE8_DOM_DEFINE = require_ie8DomDefine();
61754
61777
  var gOPD$4 = Object.getOwnPropertyDescriptor;
61755
- _objectGopd.f = _descriptors ? gOPD$4 : function getOwnPropertyDescriptor2(O, P2) {
61778
+ _objectGopd.f = require_descriptors() ? gOPD$4 : function getOwnPropertyDescriptor2(O, P2) {
61756
61779
  O = toIObject$1(O);
61757
61780
  P2 = toPrimitive$1(P2, true);
61758
61781
  if (IE8_DOM_DEFINE)
@@ -61765,7 +61788,7 @@ _objectGopd.f = _descriptors ? gOPD$4 : function getOwnPropertyDescriptor2(O, P2
61765
61788
  };
61766
61789
  var global$2 = _global.exports;
61767
61790
  var has$4 = _has$1;
61768
- var DESCRIPTORS = _descriptors;
61791
+ var DESCRIPTORS = require_descriptors();
61769
61792
  var $export$2 = _export;
61770
61793
  var redefine = _redefine.exports;
61771
61794
  var META = _meta$3.exports.KEY;
@@ -61788,7 +61811,7 @@ var _create$1 = _objectCreate;
61788
61811
  var gOPNExt = _objectGopnExt;
61789
61812
  var $GOPD = _objectGopd;
61790
61813
  var $GOPS = _objectGops;
61791
- var $DP = _objectDp;
61814
+ var $DP = require_objectDp();
61792
61815
  var $keys = _objectKeys$1;
61793
61816
  var gOPD$3 = $GOPD.f;
61794
61817
  var dP = $DP.f;
@@ -61831,7 +61854,7 @@ var isSymbol$6 = USE_NATIVE && typeof $Symbol$1.iterator == "symbol" ? function(
61831
61854
  } : function(it) {
61832
61855
  return it instanceof $Symbol$1;
61833
61856
  };
61834
- var $defineProperty$1 = function defineProperty3(it, key2, D2) {
61857
+ var $defineProperty$1 = function defineProperty2(it, key2, D2) {
61835
61858
  if (it === ObjectProto)
61836
61859
  $defineProperty$1(OPSymbols, key2, D2);
61837
61860
  anObject(it);
@@ -180605,16 +180628,16 @@ async function getDecoder(fileDirectory) {
180605
180628
  const Decoder = await importFn();
180606
180629
  return new Decoder(fileDirectory);
180607
180630
  }
180608
- addDecoder([void 0, 1], () => import("./raw.61eaecb4.mjs").then((m2) => m2.default));
180609
- addDecoder(5, () => import("./lzw.3bf56bd2.mjs").then((m2) => m2.default));
180631
+ addDecoder([void 0, 1], () => import("./raw.f81790cb.mjs").then((m2) => m2.default));
180632
+ addDecoder(5, () => import("./lzw.a7b59c9a.mjs").then((m2) => m2.default));
180610
180633
  addDecoder(6, () => {
180611
180634
  throw new Error("old style JPEG compression is not supported.");
180612
180635
  });
180613
- addDecoder(7, () => import("./jpeg.2cba0391.mjs").then((m2) => m2.default));
180614
- addDecoder([8, 32946], () => import("./deflate.628654fc.mjs").then((m2) => m2.default));
180615
- addDecoder(32773, () => import("./packbits.cf4e19b0.mjs").then((m2) => m2.default));
180616
- addDecoder(34887, () => import("./lerc.7110c4d8.mjs").then((m2) => m2.default));
180617
- addDecoder(50001, () => import("./webimage.e4333f12.mjs").then((m2) => m2.default));
180636
+ addDecoder(7, () => import("./jpeg.da6a1ce7.mjs").then((m2) => m2.default));
180637
+ addDecoder([8, 32946], () => import("./deflate.fd6a2bf5.mjs").then((m2) => m2.default));
180638
+ addDecoder(32773, () => import("./packbits.948b00a6.mjs").then((m2) => m2.default));
180639
+ addDecoder(34887, () => import("./lerc.f650c15f.mjs").then((m2) => m2.default));
180640
+ addDecoder(50001, () => import("./webimage.a23de56d.mjs").then((m2) => m2.default));
180618
180641
  function copyNewSize(array2, width2, height2, samplesPerPixel = 1) {
180619
180642
  return new (Object.getPrototypeOf(array2)).constructor(width2 * height2 * samplesPerPixel);
180620
180643
  }
@@ -192585,6 +192608,7 @@ const MinimumIntensityProjectionExtension = class extends BaseExtension {
192585
192608
  }
192586
192609
  };
192587
192610
  MinimumIntensityProjectionExtension.extensionName = "MinimumIntensityProjectionExtension";
192611
+ const AdditiveColormap3DExtensions = { BaseExtension, AdditiveBlendExtension, MaximumIntensityProjectionExtension, MinimumIntensityProjectionExtension };
192588
192612
  const defaultProps$5 = { pickable: { type: "boolean", value: true, compare: true }, coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, contrastLimits: { type: "array", value: [], compare: true }, channelsVisible: { type: "array", value: [], compare: true }, selections: { type: "array", value: [], compare: true }, domain: { type: "array", value: [], compare: true }, viewportId: { type: "string", value: "", compare: true }, loader: { type: "object", value: { getRaster: async () => ({ data: [], height: 0, width: 0 }), dtype: "Uint16" }, compare: true }, onClick: { type: "function", value: null, compare: true }, onViewportLoad: { type: "function", value: null, compare: true }, interpolation: { type: "number", value: GL$1.NEAREST, compare: true }, extensions: { type: "array", value: [new ColorPaletteExtension()], compare: true } };
192589
192613
  const ImageLayer = class extends CompositeLayer {
192590
192614
  finalizeState() {
@@ -203210,11 +203234,11 @@ var createPow = /* @__PURE__ */ factory(name$g, dependencies$f, (_ref3) => {
203210
203234
  return matrix2(_powArray(x2.valueOf(), y2));
203211
203235
  }
203212
203236
  });
203213
- var defineProperty4 = { exports: {} };
203237
+ var defineProperty3 = { exports: {} };
203214
203238
  var hasRequiredDefineProperty;
203215
203239
  function requireDefineProperty() {
203216
203240
  if (hasRequiredDefineProperty)
203217
- return defineProperty4.exports;
203241
+ return defineProperty3.exports;
203218
203242
  hasRequiredDefineProperty = 1;
203219
203243
  (function(module2) {
203220
203244
  function _defineProperty3(obj, key2, value2) {
@@ -203231,8 +203255,8 @@ function requireDefineProperty() {
203231
203255
  return obj;
203232
203256
  }
203233
203257
  module2.exports = _defineProperty3, module2.exports.__esModule = true, module2.exports["default"] = module2.exports;
203234
- })(defineProperty4);
203235
- return defineProperty4.exports;
203258
+ })(defineProperty3);
203259
+ return defineProperty3.exports;
203236
203260
  }
203237
203261
  var definePropertyExports = requireDefineProperty();
203238
203262
  function ownKeys$3(object2, enumerableOnly) {
@@ -209693,20 +209717,20 @@ function getVivLayerExtensions(use3d, colormap, renderingMode) {
209693
209717
  if (use3d) {
209694
209718
  if (colormap) {
209695
209719
  if (renderingMode === "Minimum Intensity Projection") {
209696
- return [new (void 0)()];
209720
+ return [new AdditiveColormap3DExtensions.MinimumIntensityProjectionExtension()];
209697
209721
  }
209698
209722
  if (renderingMode === "Maximum Intensity Projection") {
209699
- return [new (void 0)()];
209723
+ return [new AdditiveColormap3DExtensions.MaximumIntensityProjectionExtension()];
209700
209724
  }
209701
- return [new (void 0)()];
209725
+ return [new AdditiveColormap3DExtensions.AdditiveBlendExtension()];
209702
209726
  }
209703
209727
  if (renderingMode === "Minimum Intensity Projection") {
209704
- return [new (void 0)()];
209728
+ return [new ColorPalette3DExtensions.MinimumIntensityProjectionExtension()];
209705
209729
  }
209706
209730
  if (renderingMode === "Maximum Intensity Projection") {
209707
- return [new (void 0)()];
209731
+ return [new ColorPalette3DExtensions.MaximumIntensityProjectionExtension()];
209708
209732
  }
209709
- return [new (void 0)()];
209733
+ return [new ColorPalette3DExtensions.AdditiveBlendExtension()];
209710
209734
  }
209711
209735
  if (colormap) {
209712
209736
  return [new AdditiveColormapExtension()];
@@ -210266,7 +210290,8 @@ function SpatialSubscriber(props2) {
210266
210290
  const [width2, height2, deckRef] = useDeckCanvasSize();
210267
210291
  const [obsLabelsTypes, obsLabelsData] = useMultiObsLabels(coordinationScopes, obsType, loaders, dataset, addUrl2);
210268
210292
  const hasExpressionData = useHasLoader(loaders, dataset, DataType$3.OBS_FEATURE_MATRIX, { obsType, featureType, featureValueType });
210269
- const hasCellsData = useHasLoader(loaders, dataset, DataType$3.OBS_SEGMENTATIONS, { obsType });
210293
+ const hasSegmentationsData = useHasLoader(loaders, dataset, DataType$3.OBS_SEGMENTATIONS, { obsType });
210294
+ const hasLocationsData = useHasLoader(loaders, dataset, DataType$3.OBS_LOCATIONS, { obsType });
210270
210295
  const hasImageData = useHasLoader(loaders, dataset, DataType$3.IMAGE, {});
210271
210296
  const [{ obsIndex: obsLocationsIndex, obsLocations }, obsLocationsStatus] = useObsLocationsData(loaders, dataset, addUrl2, false, { setSpatialPointLayer: setMoleculesLayer }, { spatialPointLayer: moleculesLayer }, { obsType: "molecule" });
210272
210297
  const [{ obsLabels: obsLocationsLabels }, obsLabelsStatus] = useObsLabelsData(loaders, dataset, addUrl2, false, {}, {}, { obsType: "molecule" });
@@ -210388,7 +210413,7 @@ function SpatialSubscriber(props2) {
210388
210413
  locationsCount
210389
210414
  });
210390
210415
  const getExpressionValue = useExpressionValueGetter({
210391
- instanceObsIndex: obsSegmentationsIndex,
210416
+ instanceObsIndex: obsSegmentationsIndex ? obsSegmentationsIndex : obsCentroidsIndex,
210392
210417
  matrixObsIndex,
210393
210418
  expressionData
210394
210419
  });
@@ -210398,7 +210423,7 @@ function SpatialSubscriber(props2) {
210398
210423
  const canShow3DOptions = canLoad3DLayers && !((disable3d == null ? void 0 : disable3d.length) === imageLayerLoaders.length) && !globalDisable3d;
210399
210424
  const options = useMemo(() => {
210400
210425
  if (canShow3DOptions || hasExpressionData) {
210401
- return jsx(SpatialOptions, { observationsLabel, cellColorEncoding, setCellColorEncoding, setSpatialAxisFixed, spatialAxisFixed, use3d, geneExpressionColormap, setGeneExpressionColormap, geneExpressionColormapRange, setGeneExpressionColormapRange, canShowExpressionOptions: hasExpressionData, canShowColorEncodingOption: hasCellsData && hasExpressionData, canShow3DOptions });
210426
+ return jsx(SpatialOptions, { observationsLabel, cellColorEncoding, setCellColorEncoding, setSpatialAxisFixed, spatialAxisFixed, use3d, geneExpressionColormap, setGeneExpressionColormap, geneExpressionColormapRange, setGeneExpressionColormapRange, canShowExpressionOptions: hasExpressionData, canShowColorEncodingOption: (hasLocationsData || hasSegmentationsData) && hasExpressionData, canShow3DOptions });
210402
210427
  }
210403
210428
  return null;
210404
210429
  }, [
@@ -210407,7 +210432,8 @@ function SpatialSubscriber(props2) {
210407
210432
  geneExpressionColormap,
210408
210433
  geneExpressionColormapRange,
210409
210434
  setGeneExpressionColormap,
210410
- hasCellsData,
210435
+ hasLocationsData,
210436
+ hasSegmentationsData,
210411
210437
  hasExpressionData,
210412
210438
  observationsLabel,
210413
210439
  setCellColorEncoding,
@@ -210417,11 +210443,11 @@ function SpatialSubscriber(props2) {
210417
210443
  use3d
210418
210444
  ]);
210419
210445
  useEffect(() => {
210420
- if (!hasCellsData && cellsLayer && !obsSegmentations && !obsSegmentationsIndex && obsCentroids && obsCentroidsIndex) {
210446
+ if (!hasSegmentationsData && cellsLayer && !obsSegmentations && !obsSegmentationsIndex && obsCentroids && obsCentroidsIndex) {
210421
210447
  console.warn("Rendering cell segmentation diamonds for backwards compatibility.");
210422
210448
  }
210423
210449
  }, [
210424
- hasCellsData,
210450
+ hasSegmentationsData,
210425
210451
  cellsLayer,
210426
210452
  obsSegmentations,
210427
210453
  obsSegmentationsIndex,
@@ -210436,7 +210462,7 @@ function SpatialSubscriber(props2) {
210436
210462
  rotationZ,
210437
210463
  rotationOrbit,
210438
210464
  orbitAxis
210439
- }, setViewState, imageLayerDefs: imageLayers, obsSegmentationsLayerDefs: cellsLayer, obsLocationsLayerDefs: moleculesLayer, neighborhoodLayerDefs: neighborhoodsLayer, obsLocationsIndex, obsSegmentationsIndex, obsLocations, obsLocationsLabels, obsLocationsFeatureIndex, hasSegmentations: hasCellsData, obsSegmentations, obsSegmentationsType, obsCentroids, obsCentroidsIndex, cellFilter, cellSelection, cellHighlight, cellColors, neighborhoods, imageLayerLoaders, setCellFilter, setCellSelection: setCellSelectionProp, setCellHighlight, setMoleculeHighlight, setComponentHover: () => {
210465
+ }, setViewState, imageLayerDefs: imageLayers, obsSegmentationsLayerDefs: cellsLayer, obsLocationsLayerDefs: moleculesLayer, neighborhoodLayerDefs: neighborhoodsLayer, obsLocationsIndex, obsSegmentationsIndex, obsLocations, obsLocationsLabels, obsLocationsFeatureIndex, hasSegmentations: hasSegmentationsData, obsSegmentations, obsSegmentationsType, obsCentroids, obsCentroidsIndex, cellFilter, cellSelection, cellHighlight, cellColors, neighborhoods, imageLayerLoaders, setCellFilter, setCellSelection: setCellSelectionProp, setCellHighlight, setMoleculeHighlight, setComponentHover: () => {
210440
210466
  setComponentHover(uuid);
210441
210467
  }, updateViewInfo: setComponentViewInfo, imageLayerCallbacks, segmentationLayerCallbacks, spatialAxisFixed, geneExpressionColormap, geneExpressionColormapRange, expressionData: shiftedExpressionDataForBitmask, cellColorEncoding, getExpressionValue, theme }), !disableTooltip && jsx(SpatialTooltipSubscriber, { parentUuid: uuid, obsHighlight: cellHighlight, width: width2, height: height2, getObsInfo })] });
210442
210468
  }
@@ -271750,7 +271776,7 @@ function CellSetExpressionPlot(props2) {
271750
271776
  orient: "left",
271751
271777
  scale: "yscale",
271752
271778
  zindex: 1,
271753
- title: featureValueTransformName ? [`${featureValueTransformName}-Transformed`, `Normalized ${capitalize$2(featureValueType)} Values`] : `Normalized ${capitalize$2(featureValueType)} Values`
271779
+ title: featureValueTransformName && featureValueTransformName !== "None" ? [`${featureValueTransformName}-Transformed`, `Normalized ${capitalize$2(featureValueType)} Values`] : `Normalized ${capitalize$2(featureValueType)} Values`
271754
271780
  },
271755
271781
  {
271756
271782
  orient: "bottom",
@@ -271914,15 +271940,17 @@ function CellSetExpressionPlotSubscriber(props2) {
271914
271940
  const [urls2, addUrl2] = useUrls(loaders, dataset);
271915
271941
  const transformOptions = VALUE_TRANSFORM_OPTIONS;
271916
271942
  const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(loaders, dataset, false, geneSelection, { obsType, featureType, featureValueType });
271943
+ const [{ featureLabelsMap }, featureLabelsStatus] = useFeatureLabelsData(loaders, dataset, addUrl2, false, {}, {}, { featureType });
271917
271944
  const [{ obsIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(loaders, dataset, addUrl2, false, { obsType, featureType, featureValueType });
271918
271945
  const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(loaders, dataset, addUrl2, true, {}, {}, { obsType });
271919
271946
  const isReady = useReady([
271920
271947
  featureSelectionStatus,
271921
271948
  matrixIndicesStatus,
271922
- obsSetsStatus
271949
+ obsSetsStatus,
271950
+ featureLabelsStatus
271923
271951
  ]);
271924
271952
  const [expressionArr, setArr, expressionMax] = useExpressionByCellSet(expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme);
271925
- const firstGeneSelected = geneSelection && geneSelection.length >= 1 ? geneSelection[0] : null;
271953
+ const firstGeneSelected = geneSelection && geneSelection.length >= 1 ? (featureLabelsMap == null ? void 0 : featureLabelsMap.get(geneSelection[0])) || geneSelection[0] : null;
271926
271954
  const selectedTransformName = (_a3 = transformOptions.find((o2) => o2.value === featureValueTransform)) == null ? void 0 : _a3.name;
271927
271955
  return jsx(TitleInfo, { title: `Expression by ${capitalize$2(obsType)} Set${firstGeneSelected ? ` (${firstGeneSelected})` : ""}`, removeGridComponent, urls: urls2, theme, isReady, options: jsx(CellSetExpressionPlotOptions, { featureValueTransform, setFeatureValueTransform, featureValueTransformCoefficient, setFeatureValueTransformCoefficient, transformOptions }), children: jsx("div", { ref: containerRef, className: classes.vegaContainer, children: expressionArr ? jsx(CellSetExpressionPlot, { domainMax: expressionMax, colors: setArr, data: expressionArr, theme, width: width2, height: height2, obsType, featureValueType, featureValueTransformName: selectedTransformName }) : jsxs("span", { children: ["Select a ", featureType, "."] }) }) });
271928
271956
  }
package/dist/index.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { C, D, F, V, c, b, d, e, h, v } from "./index.4511cb5d.mjs";
1
+ import { C, D, F, V, c, b, d, e, h, v } from "./index.879a4eb2.mjs";
2
2
  import "react";
3
3
  import "react-dom";
4
4
  export {
package/dist/index.umd.js CHANGED
@@ -61023,11 +61023,19 @@ If these are plugin file types, ensure that they have been properly registered.`
61023
61023
  return true;
61024
61024
  }
61025
61025
  };
61026
- var _descriptors = !_fails(function() {
61027
- return Object.defineProperty({}, "a", { get: function() {
61028
- return 7;
61029
- } }).a != 7;
61030
- });
61026
+ var _descriptors;
61027
+ var hasRequired_descriptors;
61028
+ function require_descriptors() {
61029
+ if (hasRequired_descriptors)
61030
+ return _descriptors;
61031
+ hasRequired_descriptors = 1;
61032
+ _descriptors = !_fails(function() {
61033
+ return Object.defineProperty({}, "a", { get: function() {
61034
+ return 7;
61035
+ } }).a != 7;
61036
+ });
61037
+ return _descriptors;
61038
+ }
61031
61039
  var _domCreate;
61032
61040
  var hasRequired_domCreate;
61033
61041
  function require_domCreate() {
@@ -61042,11 +61050,19 @@ If these are plugin file types, ensure that they have been properly registered.`
61042
61050
  };
61043
61051
  return _domCreate;
61044
61052
  }
61045
- var _ie8DomDefine = !_descriptors && !_fails(function() {
61046
- return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
61047
- return 7;
61048
- } }).a != 7;
61049
- });
61053
+ var _ie8DomDefine;
61054
+ var hasRequired_ie8DomDefine;
61055
+ function require_ie8DomDefine() {
61056
+ if (hasRequired_ie8DomDefine)
61057
+ return _ie8DomDefine;
61058
+ hasRequired_ie8DomDefine = 1;
61059
+ _ie8DomDefine = !require_descriptors() && !_fails(function() {
61060
+ return Object.defineProperty(require_domCreate()("div"), "a", { get: function() {
61061
+ return 7;
61062
+ } }).a != 7;
61063
+ });
61064
+ return _ie8DomDefine;
61065
+ }
61050
61066
  var isObject$f = _isObject;
61051
61067
  var _toPrimitive = function(it, S) {
61052
61068
  if (!isObject$f(it))
@@ -61060,25 +61076,32 @@ If these are plugin file types, ensure that they have been properly registered.`
61060
61076
  return val;
61061
61077
  throw TypeError("Can't convert object to primitive value");
61062
61078
  };
61063
- var anObject$3 = _anObject;
61064
- var IE8_DOM_DEFINE$1 = _ie8DomDefine;
61065
- var toPrimitive$2 = _toPrimitive;
61066
- var dP$3 = Object.defineProperty;
61067
- _objectDp.f = _descriptors ? Object.defineProperty : function defineProperty2(O, P2, Attributes2) {
61068
- anObject$3(O);
61069
- P2 = toPrimitive$2(P2, true);
61070
- anObject$3(Attributes2);
61071
- if (IE8_DOM_DEFINE$1)
61072
- try {
61073
- return dP$3(O, P2, Attributes2);
61074
- } catch (e3) {
61075
- }
61076
- if ("get" in Attributes2 || "set" in Attributes2)
61077
- throw TypeError("Accessors not supported!");
61078
- if ("value" in Attributes2)
61079
- O[P2] = Attributes2.value;
61080
- return O;
61081
- };
61079
+ var hasRequired_objectDp;
61080
+ function require_objectDp() {
61081
+ if (hasRequired_objectDp)
61082
+ return _objectDp;
61083
+ hasRequired_objectDp = 1;
61084
+ var anObject2 = _anObject;
61085
+ var IE8_DOM_DEFINE2 = require_ie8DomDefine();
61086
+ var toPrimitive2 = _toPrimitive;
61087
+ var dP2 = Object.defineProperty;
61088
+ _objectDp.f = require_descriptors() ? Object.defineProperty : function defineProperty2(O, P2, Attributes2) {
61089
+ anObject2(O);
61090
+ P2 = toPrimitive2(P2, true);
61091
+ anObject2(Attributes2);
61092
+ if (IE8_DOM_DEFINE2)
61093
+ try {
61094
+ return dP2(O, P2, Attributes2);
61095
+ } catch (e3) {
61096
+ }
61097
+ if ("get" in Attributes2 || "set" in Attributes2)
61098
+ throw TypeError("Accessors not supported!");
61099
+ if ("value" in Attributes2)
61100
+ O[P2] = Attributes2.value;
61101
+ return O;
61102
+ };
61103
+ return _objectDp;
61104
+ }
61082
61105
  var _propertyDesc = function(bitmap, value2) {
61083
61106
  return {
61084
61107
  enumerable: !(bitmap & 1),
@@ -61087,9 +61110,9 @@ If these are plugin file types, ensure that they have been properly registered.`
61087
61110
  value: value2
61088
61111
  };
61089
61112
  };
61090
- var dP$2 = _objectDp;
61113
+ var dP$2 = require_objectDp();
61091
61114
  var createDesc$2 = _propertyDesc;
61092
- var _hide = _descriptors ? function(object2, key2, value2) {
61115
+ var _hide = require_descriptors() ? function(object2, key2, value2) {
61093
61116
  return dP$2.f(object2, key2, createDesc$2(1, value2));
61094
61117
  } : function(object2, key2, value2) {
61095
61118
  object2[key2] = value2;
@@ -61292,7 +61315,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61292
61315
  if (hasRequired_objectAssign)
61293
61316
  return _objectAssign;
61294
61317
  hasRequired_objectAssign = 1;
61295
- var DESCRIPTORS2 = _descriptors;
61318
+ var DESCRIPTORS2 = require_descriptors();
61296
61319
  var getKeys2 = _objectKeys$1;
61297
61320
  var gOPS2 = _objectGops;
61298
61321
  var pIE2 = require_objectPie();
@@ -61355,7 +61378,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61355
61378
  };
61356
61379
  var defineProperty$6 = { exports: {} };
61357
61380
  var $export$4 = _export;
61358
- $export$4($export$4.S + $export$4.F * !_descriptors, "Object", { defineProperty: _objectDp.f });
61381
+ $export$4($export$4.S + $export$4.F * !require_descriptors(), "Object", { defineProperty: require_objectDp().f });
61359
61382
  var $Object$1 = _core.exports.Object;
61360
61383
  var defineProperty$5 = function defineProperty2(it, key2, desc) {
61361
61384
  return $Object$1.defineProperty(it, key2, desc);
@@ -61431,10 +61454,10 @@ If these are plugin file types, ensure that they have been properly registered.`
61431
61454
  module3.exports = _hide;
61432
61455
  })(_redefine);
61433
61456
  var _iterators = {};
61434
- var dP$1 = _objectDp;
61457
+ var dP$1 = require_objectDp();
61435
61458
  var anObject$2 = _anObject;
61436
61459
  var getKeys$1 = _objectKeys$1;
61437
- var _objectDps = _descriptors ? Object.defineProperties : function defineProperties2(O, Properties) {
61460
+ var _objectDps = require_descriptors() ? Object.defineProperties : function defineProperties2(O, Properties) {
61438
61461
  anObject$2(O);
61439
61462
  var keys2 = getKeys$1(Properties);
61440
61463
  var length2 = keys2.length;
@@ -61499,7 +61522,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61499
61522
  return store[name2] || (store[name2] = USE_SYMBOL && Symbol$7[name2] || (USE_SYMBOL ? Symbol$7 : uid$2)("Symbol." + name2));
61500
61523
  };
61501
61524
  $exports.store = store;
61502
- var def$1 = _objectDp.f;
61525
+ var def$1 = require_objectDp().f;
61503
61526
  var has$8 = _has$2;
61504
61527
  var TAG = _wks.exports("toStringTag");
61505
61528
  var _setToStringTag = function(it, tag2, stat) {
@@ -61669,7 +61692,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61669
61692
  var META$1 = _uid("meta");
61670
61693
  var isObject$e = _isObject;
61671
61694
  var has$6 = _has$2;
61672
- var setDesc = _objectDp.f;
61695
+ var setDesc = require_objectDp().f;
61673
61696
  var id$2 = 0;
61674
61697
  var isExtensible = Object.isExtensible || function() {
61675
61698
  return true;
@@ -61719,7 +61742,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61719
61742
  };
61720
61743
  var core$1 = _core.exports;
61721
61744
  var wksExt$1 = _wksExt;
61722
- var defineProperty$4 = _objectDp.f;
61745
+ var defineProperty$4 = require_objectDp().f;
61723
61746
  var _wksDefine = function(name2) {
61724
61747
  var $Symbol2 = core$1.Symbol || (core$1.Symbol = {});
61725
61748
  if (name2.charAt(0) != "_" && !(name2 in $Symbol2))
@@ -61773,9 +61796,9 @@ If these are plugin file types, ensure that they have been properly registered.`
61773
61796
  var toIObject$1 = _toIobject;
61774
61797
  var toPrimitive$1 = _toPrimitive;
61775
61798
  var has$5 = _has$2;
61776
- var IE8_DOM_DEFINE = _ie8DomDefine;
61799
+ var IE8_DOM_DEFINE = require_ie8DomDefine();
61777
61800
  var gOPD$4 = Object.getOwnPropertyDescriptor;
61778
- _objectGopd.f = _descriptors ? gOPD$4 : function getOwnPropertyDescriptor2(O, P2) {
61801
+ _objectGopd.f = require_descriptors() ? gOPD$4 : function getOwnPropertyDescriptor2(O, P2) {
61779
61802
  O = toIObject$1(O);
61780
61803
  P2 = toPrimitive$1(P2, true);
61781
61804
  if (IE8_DOM_DEFINE)
@@ -61788,7 +61811,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61788
61811
  };
61789
61812
  var global$2 = _global.exports;
61790
61813
  var has$4 = _has$2;
61791
- var DESCRIPTORS = _descriptors;
61814
+ var DESCRIPTORS = require_descriptors();
61792
61815
  var $export$2 = _export;
61793
61816
  var redefine = _redefine.exports;
61794
61817
  var META = _meta$3.exports.KEY;
@@ -61811,7 +61834,7 @@ If these are plugin file types, ensure that they have been properly registered.`
61811
61834
  var gOPNExt = _objectGopnExt;
61812
61835
  var $GOPD = _objectGopd;
61813
61836
  var $GOPS = _objectGops;
61814
- var $DP = _objectDp;
61837
+ var $DP = require_objectDp();
61815
61838
  var $keys = _objectKeys$1;
61816
61839
  var gOPD$3 = $GOPD.f;
61817
61840
  var dP = $DP.f;
@@ -192608,6 +192631,7 @@ attribute float isSelected;
192608
192631
  }
192609
192632
  };
192610
192633
  MinimumIntensityProjectionExtension.extensionName = "MinimumIntensityProjectionExtension";
192634
+ const AdditiveColormap3DExtensions = { BaseExtension, AdditiveBlendExtension, MaximumIntensityProjectionExtension, MinimumIntensityProjectionExtension };
192611
192635
  const defaultProps$5 = { pickable: { type: "boolean", value: true, compare: true }, coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, contrastLimits: { type: "array", value: [], compare: true }, channelsVisible: { type: "array", value: [], compare: true }, selections: { type: "array", value: [], compare: true }, domain: { type: "array", value: [], compare: true }, viewportId: { type: "string", value: "", compare: true }, loader: { type: "object", value: { getRaster: async () => ({ data: [], height: 0, width: 0 }), dtype: "Uint16" }, compare: true }, onClick: { type: "function", value: null, compare: true }, onViewportLoad: { type: "function", value: null, compare: true }, interpolation: { type: "number", value: GL$1.NEAREST, compare: true }, extensions: { type: "array", value: [new ColorPaletteExtension()], compare: true } };
192612
192636
  const ImageLayer = class extends CompositeLayer {
192613
192637
  finalizeState() {
@@ -209716,20 +209740,20 @@ void main() {
209716
209740
  if (use3d) {
209717
209741
  if (colormap) {
209718
209742
  if (renderingMode === "Minimum Intensity Projection") {
209719
- return [new (void 0)()];
209743
+ return [new AdditiveColormap3DExtensions.MinimumIntensityProjectionExtension()];
209720
209744
  }
209721
209745
  if (renderingMode === "Maximum Intensity Projection") {
209722
- return [new (void 0)()];
209746
+ return [new AdditiveColormap3DExtensions.MaximumIntensityProjectionExtension()];
209723
209747
  }
209724
- return [new (void 0)()];
209748
+ return [new AdditiveColormap3DExtensions.AdditiveBlendExtension()];
209725
209749
  }
209726
209750
  if (renderingMode === "Minimum Intensity Projection") {
209727
- return [new (void 0)()];
209751
+ return [new ColorPalette3DExtensions.MinimumIntensityProjectionExtension()];
209728
209752
  }
209729
209753
  if (renderingMode === "Maximum Intensity Projection") {
209730
- return [new (void 0)()];
209754
+ return [new ColorPalette3DExtensions.MaximumIntensityProjectionExtension()];
209731
209755
  }
209732
- return [new (void 0)()];
209756
+ return [new ColorPalette3DExtensions.AdditiveBlendExtension()];
209733
209757
  }
209734
209758
  if (colormap) {
209735
209759
  return [new AdditiveColormapExtension()];
@@ -210289,7 +210313,8 @@ void main() {
210289
210313
  const [width2, height2, deckRef] = useDeckCanvasSize();
210290
210314
  const [obsLabelsTypes, obsLabelsData] = useMultiObsLabels(coordinationScopes, obsType, loaders, dataset, addUrl2);
210291
210315
  const hasExpressionData = useHasLoader(loaders, dataset, DataType$3.OBS_FEATURE_MATRIX, { obsType, featureType, featureValueType });
210292
- const hasCellsData = useHasLoader(loaders, dataset, DataType$3.OBS_SEGMENTATIONS, { obsType });
210316
+ const hasSegmentationsData = useHasLoader(loaders, dataset, DataType$3.OBS_SEGMENTATIONS, { obsType });
210317
+ const hasLocationsData = useHasLoader(loaders, dataset, DataType$3.OBS_LOCATIONS, { obsType });
210293
210318
  const hasImageData = useHasLoader(loaders, dataset, DataType$3.IMAGE, {});
210294
210319
  const [{ obsIndex: obsLocationsIndex, obsLocations }, obsLocationsStatus] = useObsLocationsData(loaders, dataset, addUrl2, false, { setSpatialPointLayer: setMoleculesLayer }, { spatialPointLayer: moleculesLayer }, { obsType: "molecule" });
210295
210320
  const [{ obsLabels: obsLocationsLabels }, obsLabelsStatus] = useObsLabelsData(loaders, dataset, addUrl2, false, {}, {}, { obsType: "molecule" });
@@ -210411,7 +210436,7 @@ void main() {
210411
210436
  locationsCount
210412
210437
  });
210413
210438
  const getExpressionValue = useExpressionValueGetter({
210414
- instanceObsIndex: obsSegmentationsIndex,
210439
+ instanceObsIndex: obsSegmentationsIndex ? obsSegmentationsIndex : obsCentroidsIndex,
210415
210440
  matrixObsIndex,
210416
210441
  expressionData
210417
210442
  });
@@ -210421,7 +210446,7 @@ void main() {
210421
210446
  const canShow3DOptions = canLoad3DLayers && !((disable3d == null ? void 0 : disable3d.length) === imageLayerLoaders.length) && !globalDisable3d;
210422
210447
  const options = React$i.useMemo(() => {
210423
210448
  if (canShow3DOptions || hasExpressionData) {
210424
- return jsx(SpatialOptions, { observationsLabel, cellColorEncoding, setCellColorEncoding, setSpatialAxisFixed, spatialAxisFixed, use3d, geneExpressionColormap, setGeneExpressionColormap, geneExpressionColormapRange, setGeneExpressionColormapRange, canShowExpressionOptions: hasExpressionData, canShowColorEncodingOption: hasCellsData && hasExpressionData, canShow3DOptions });
210449
+ return jsx(SpatialOptions, { observationsLabel, cellColorEncoding, setCellColorEncoding, setSpatialAxisFixed, spatialAxisFixed, use3d, geneExpressionColormap, setGeneExpressionColormap, geneExpressionColormapRange, setGeneExpressionColormapRange, canShowExpressionOptions: hasExpressionData, canShowColorEncodingOption: (hasLocationsData || hasSegmentationsData) && hasExpressionData, canShow3DOptions });
210425
210450
  }
210426
210451
  return null;
210427
210452
  }, [
@@ -210430,7 +210455,8 @@ void main() {
210430
210455
  geneExpressionColormap,
210431
210456
  geneExpressionColormapRange,
210432
210457
  setGeneExpressionColormap,
210433
- hasCellsData,
210458
+ hasLocationsData,
210459
+ hasSegmentationsData,
210434
210460
  hasExpressionData,
210435
210461
  observationsLabel,
210436
210462
  setCellColorEncoding,
@@ -210440,11 +210466,11 @@ void main() {
210440
210466
  use3d
210441
210467
  ]);
210442
210468
  React$i.useEffect(() => {
210443
- if (!hasCellsData && cellsLayer && !obsSegmentations && !obsSegmentationsIndex && obsCentroids && obsCentroidsIndex) {
210469
+ if (!hasSegmentationsData && cellsLayer && !obsSegmentations && !obsSegmentationsIndex && obsCentroids && obsCentroidsIndex) {
210444
210470
  console.warn("Rendering cell segmentation diamonds for backwards compatibility.");
210445
210471
  }
210446
210472
  }, [
210447
- hasCellsData,
210473
+ hasSegmentationsData,
210448
210474
  cellsLayer,
210449
210475
  obsSegmentations,
210450
210476
  obsSegmentationsIndex,
@@ -210459,7 +210485,7 @@ void main() {
210459
210485
  rotationZ,
210460
210486
  rotationOrbit,
210461
210487
  orbitAxis
210462
- }, setViewState, imageLayerDefs: imageLayers, obsSegmentationsLayerDefs: cellsLayer, obsLocationsLayerDefs: moleculesLayer, neighborhoodLayerDefs: neighborhoodsLayer, obsLocationsIndex, obsSegmentationsIndex, obsLocations, obsLocationsLabels, obsLocationsFeatureIndex, hasSegmentations: hasCellsData, obsSegmentations, obsSegmentationsType, obsCentroids, obsCentroidsIndex, cellFilter, cellSelection, cellHighlight, cellColors, neighborhoods, imageLayerLoaders, setCellFilter, setCellSelection: setCellSelectionProp, setCellHighlight, setMoleculeHighlight, setComponentHover: () => {
210488
+ }, setViewState, imageLayerDefs: imageLayers, obsSegmentationsLayerDefs: cellsLayer, obsLocationsLayerDefs: moleculesLayer, neighborhoodLayerDefs: neighborhoodsLayer, obsLocationsIndex, obsSegmentationsIndex, obsLocations, obsLocationsLabels, obsLocationsFeatureIndex, hasSegmentations: hasSegmentationsData, obsSegmentations, obsSegmentationsType, obsCentroids, obsCentroidsIndex, cellFilter, cellSelection, cellHighlight, cellColors, neighborhoods, imageLayerLoaders, setCellFilter, setCellSelection: setCellSelectionProp, setCellHighlight, setMoleculeHighlight, setComponentHover: () => {
210463
210489
  setComponentHover(uuid);
210464
210490
  }, updateViewInfo: setComponentViewInfo, imageLayerCallbacks, segmentationLayerCallbacks, spatialAxisFixed, geneExpressionColormap, geneExpressionColormapRange, expressionData: shiftedExpressionDataForBitmask, cellColorEncoding, getExpressionValue, theme }), !disableTooltip && jsx(SpatialTooltipSubscriber, { parentUuid: uuid, obsHighlight: cellHighlight, width: width2, height: height2, getObsInfo })] });
210465
210491
  }
@@ -271773,7 +271799,7 @@ void main() {
271773
271799
  orient: "left",
271774
271800
  scale: "yscale",
271775
271801
  zindex: 1,
271776
- title: featureValueTransformName ? [`${featureValueTransformName}-Transformed`, `Normalized ${capitalize$2(featureValueType)} Values`] : `Normalized ${capitalize$2(featureValueType)} Values`
271802
+ title: featureValueTransformName && featureValueTransformName !== "None" ? [`${featureValueTransformName}-Transformed`, `Normalized ${capitalize$2(featureValueType)} Values`] : `Normalized ${capitalize$2(featureValueType)} Values`
271777
271803
  },
271778
271804
  {
271779
271805
  orient: "bottom",
@@ -271937,15 +271963,17 @@ void main() {
271937
271963
  const [urls2, addUrl2] = useUrls(loaders, dataset);
271938
271964
  const transformOptions = VALUE_TRANSFORM_OPTIONS;
271939
271965
  const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(loaders, dataset, false, geneSelection, { obsType, featureType, featureValueType });
271966
+ const [{ featureLabelsMap }, featureLabelsStatus] = useFeatureLabelsData(loaders, dataset, addUrl2, false, {}, {}, { featureType });
271940
271967
  const [{ obsIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(loaders, dataset, addUrl2, false, { obsType, featureType, featureValueType });
271941
271968
  const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(loaders, dataset, addUrl2, true, {}, {}, { obsType });
271942
271969
  const isReady = useReady([
271943
271970
  featureSelectionStatus,
271944
271971
  matrixIndicesStatus,
271945
- obsSetsStatus
271972
+ obsSetsStatus,
271973
+ featureLabelsStatus
271946
271974
  ]);
271947
271975
  const [expressionArr, setArr, expressionMax] = useExpressionByCellSet(expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme);
271948
- const firstGeneSelected = geneSelection && geneSelection.length >= 1 ? geneSelection[0] : null;
271976
+ const firstGeneSelected = geneSelection && geneSelection.length >= 1 ? (featureLabelsMap == null ? void 0 : featureLabelsMap.get(geneSelection[0])) || geneSelection[0] : null;
271949
271977
  const selectedTransformName = (_a3 = transformOptions.find((o2) => o2.value === featureValueTransform)) == null ? void 0 : _a3.name;
271950
271978
  return jsx(TitleInfo, { title: `Expression by ${capitalize$2(obsType)} Set${firstGeneSelected ? ` (${firstGeneSelected})` : ""}`, removeGridComponent, urls: urls2, theme, isReady, options: jsx(CellSetExpressionPlotOptions, { featureValueTransform, setFeatureValueTransform, featureValueTransformCoefficient, setFeatureValueTransformCoefficient, transformOptions }), children: jsx("div", { ref: containerRef, className: classes.vegaContainer, children: expressionArr ? jsx(CellSetExpressionPlot, { domainMax: expressionMax, colors: setArr, data: expressionArr, theme, width: width2, height: height2, obsType, featureValueType, featureValueTransformName: selectedTransformName }) : jsxs("span", { children: ["Select a ", featureType, "."] }) }) });
271951
271979
  }
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index.4511cb5d.mjs";
1
+ import { B as BaseDecoder } from "./index.879a4eb2.mjs";
2
2
  import "react";
3
3
  import "react-dom";
4
4
  const dctZigZag = new Int32Array([
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm.4b234125.mjs";
2
- import { B as BaseDecoder, L as LercParameters, a as LercAddCompression } from "./index.4511cb5d.mjs";
2
+ import { B as BaseDecoder, L as LercParameters, a as LercAddCompression } from "./index.879a4eb2.mjs";
3
3
  import "react";
4
4
  import "react-dom";
5
5
  var LercDecode = { exports: {} };
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index.4511cb5d.mjs";
1
+ import { B as BaseDecoder } from "./index.879a4eb2.mjs";
2
2
  import "react";
3
3
  import "react-dom";
4
4
  const MIN_BITS = 9;
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index.4511cb5d.mjs";
1
+ import { B as BaseDecoder } from "./index.879a4eb2.mjs";
2
2
  import "react";
3
3
  import "react-dom";
4
4
  class PackbitsDecoder extends BaseDecoder {
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index.4511cb5d.mjs";
1
+ import { B as BaseDecoder } from "./index.879a4eb2.mjs";
2
2
  import "react";
3
3
  import "react-dom";
4
4
  class RawDecoder extends BaseDecoder {
@@ -1,4 +1,4 @@
1
- import { B as BaseDecoder } from "./index.4511cb5d.mjs";
1
+ import { B as BaseDecoder } from "./index.879a4eb2.mjs";
2
2
  import "react";
3
3
  import "react-dom";
4
4
  class WebImageDecoder extends BaseDecoder {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vitessce/dev",
3
- "version": "2.0.0-beta.1",
3
+ "version": "2.0.0-beta.2",
4
4
  "author": "Gehlenborg Lab",
5
5
  "homepage": "http://vitessce.io",
6
6
  "repository": {
@@ -13,10 +13,10 @@
13
13
  "dist"
14
14
  ],
15
15
  "dependencies": {
16
- "@vitessce/all": "2.0.0-beta.1",
17
- "@vitessce/config": "2.0.0-beta.1",
18
- "@vitessce/constants": "2.0.0-beta.1",
19
- "@vitessce/export-utils": "2.0.0-beta.1"
16
+ "@vitessce/all": "2.0.0-beta.2",
17
+ "@vitessce/config": "2.0.0-beta.2",
18
+ "@vitessce/constants": "2.0.0-beta.2",
19
+ "@vitessce/export-utils": "2.0.0-beta.2"
20
20
  },
21
21
  "devDependencies": {
22
22
  "@vitejs/plugin-react": "^1.3.2",