@vitessce/scatterplot-embedding 3.8.8 → 3.8.9

package/dist/{deflate-Dr6bxD0w.js → deflate-YIIHzd8y.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-SxljTded.js";
-import { B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { B as BaseDecoder } from "./index-DYO3tfis.js";
 class DeflateDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     return inflate_1(new Uint8Array(buffer)).buffer;

package/dist/{index-DXCCF6LM.js → index-DYO3tfis.js}

@@ -3098,6 +3098,59 @@ const PALETTE = [
   [136, 34, 85],
   [170, 68, 153]
 ];
+function aggregateFeatureArrays(arrays, strategy) {
+  if (!arrays || arrays.length === 0)
+    return null;
+  let targetArray;
+  if (strategy === "first" || typeof strategy === "number" && strategy === 0) {
+    targetArray = arrays[0];
+  } else if (strategy === "last") {
+    targetArray = arrays[arrays.length - 1];
+  } else if (typeof strategy === "number") {
+    if (strategy >= 0 && strategy < arrays.length) {
+      targetArray = arrays[strategy];
+    } else {
+      throw new Error(`Array index out of bounds: ${strategy}`);
+    }
+  }
+  if (targetArray) {
+    return targetArray;
+  }
+  const numArrays = arrays.length;
+  const firstArrayLength = arrays[0].length;
+  if (arrays.some((arr) => arr.length !== firstArrayLength)) {
+    throw new Error("All arrays must have the same length for aggregation.");
+  }
+  if (strategy === "sum" || strategy === "mean") {
+    const resultArray = new Float64Array(firstArrayLength);
+    for (let i2 = 0; i2 < numArrays; i2++) {
+      const arr = arrays[i2];
+      for (let j = 0; j < firstArrayLength; j++) {
+        resultArray[j] += arr[j];
+      }
+    }
+    if (strategy === "mean") {
+      for (let i2 = 0; i2 < firstArrayLength; i2++) {
+        resultArray[i2] /= numArrays;
+      }
+    }
+    return resultArray;
+  }
+  if (strategy === "difference") {
+    if (numArrays !== 2) {
+      console.warn("Difference strategy requires exactly 2 arrays.");
+      return arrays[0];
+    }
+    const arr0 = arrays[0];
+    const arr1 = arrays[1];
+    const resultArray = new Float64Array(firstArrayLength);
+    for (let i2 = 0; i2 < firstArrayLength; i2++) {
+      resultArray[i2] = arr0[i2] - arr1[i2];
+    }
+    return resultArray;
+  }
+  throw new Error(`Unknown aggregation strategy: ${strategy}`);
+}
 var util;
 (function(util2) {
   util2.assertEqual = (val) => val;
@@ -123348,22 +123401,22 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-CBdLq0ga.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-Dbo7OpaS.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-xM2f2nBA.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-B2nz96hr.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-UKzKGs1t.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-Dr6bxD0w.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-0X-GrQId.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-BBSvSY8b.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-YIIHzd8y.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-JodEChjB.js").then((m2) => m2.default));
 addDecoder(
   34887,
-  () => import("./lerc-D62tGpqi.js").then(async (m2) => {
+  () => import("./lerc-DsiDEIic.js").then(async (m2) => {
     await m2.zstd.init();
     return m2;
   }).then((m2) => m2.default)
 );
-addDecoder(50001, () => import("./webimage-C2vUudNG.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-Bk5jq0He.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset2 = 0;
@@ -153768,11 +153821,18 @@ function EmbeddingScatterplotSubscriber(props) {
   const getCellIsSelected = useCallback((object2, { index: index2 }) => (cellSelectionSet || /* @__PURE__ */ new Set([])).has(obsEmbeddingIndex[index2]) ? 1 : 0, [cellSelectionSet, obsEmbeddingIndex]);
   const cellRadius = cellRadiusMode === "manual" ? cellRadiusFixed : dynamicCellRadius;
   const cellOpacity = cellOpacityMode === "manual" ? cellOpacityFixed : dynamicCellOpacity;
+  const aggregatedExpressionData = useMemo(() => {
+    if (featureAggregationStrategyToUse != null && expressionData && expressionData.length > 1) {
+      const aggregated = aggregateFeatureArrays(expressionData, featureAggregationStrategyToUse);
+      return [aggregated];
+    }
+    return expressionData;
+  }, [expressionData, featureAggregationStrategyToUse]);
   const {
     normData: uint8ExpressionData,
     extents: expressionExtents,
     missing: expressionMissing
-  } = useUint8FeatureSelection(expressionData);
+  } = useUint8FeatureSelection(aggregatedExpressionData);
   const getExpressionValue = useExpressionValueGetter({
     instanceObsIndex: obsEmbeddingIndex,
     matrixObsIndex,

package/dist/index.js

@@ -1,4 +1,4 @@
-import { D, E } from "./index-DXCCF6LM.js";
+import { D, E } from "./index-DYO3tfis.js";
 export {
   D as DualEmbeddingScatterplotSubscriber,
   E as EmbeddingScatterplotSubscriber

package/dist/{jpeg-UKzKGs1t.js → jpeg-BBSvSY8b.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { B as BaseDecoder } from "./index-DYO3tfis.js";
 const dctZigZag = new Int32Array([
   0,
   1,

package/dist/{lerc-D62tGpqi.js → lerc-DsiDEIic.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-SxljTded.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-DYO3tfis.js";
 const LercParameters = {
   AddCompression: 1
 };

package/dist/{lzw-Dbo7OpaS.js → lzw-B2nz96hr.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { B as BaseDecoder } from "./index-DYO3tfis.js";
 const MIN_BITS = 9;
 const CLEAR_CODE = 256;
 const EOI_CODE = 257;

package/dist/{packbits-0X-GrQId.js → packbits-JodEChjB.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { B as BaseDecoder } from "./index-DYO3tfis.js";
 class PackbitsDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     const dataView = new DataView(buffer);

package/dist/{raw-CBdLq0ga.js → raw-xM2f2nBA.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { B as BaseDecoder } from "./index-DYO3tfis.js";
 class RawDecoder extends BaseDecoder {
   decodeBlock(buffer) {
     return buffer;

package/dist/{webimage-C2vUudNG.js → webimage-Bk5jq0He.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-DXCCF6LM.js";
+import { B as BaseDecoder } from "./index-DYO3tfis.js";
 class WebImageDecoder extends BaseDecoder {
   constructor() {
     super();

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

@@ -1 +1 @@
-{"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AA6CA;;;;;;;;;;;;GAYG;AACH,sDAVG;IAAsB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,eAimBA"}
+{"version":3,"file":"EmbeddingScatterplotSubscriber.d.ts","sourceRoot":"","sources":["../src/EmbeddingScatterplotSubscriber.js"],"names":[],"mappings":"AA6CA;;;;;;;;;;;;GAYG;AACH,sDAVG;IAAsB,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAEU,mBAAmB;IAErB,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;CAEhB,eA4mBA"}

package/dist-tsc/EmbeddingScatterplotSubscriber.js

@@ -5,7 +5,7 @@ import { isEqual } from 'lodash-es';
 import { circle } from '@turf/circle';
 import { TitleInfo, useReady, useUrls, useDeckCanvasSize, useUint8FeatureSelection, useExpressionValueGetter, useGetObsInfo, useObsEmbeddingData, useObsSetsData, useFeatureSelection, useObsFeatureMatrixIndices, useFeatureLabelsData, useMultiObsLabels, useSampleSetsData, useSampleEdgesData, useCoordination, useLoaders, useSetComponentHover, useSetComponentViewInfo, useInitialCoordination, useExpandedFeatureLabelsMap, useCoordinationScopes, } from '@vitessce/vit-s';
 import { setObsSelection, mergeObsSets, getCellSetPolygons, getCellColors, stratifyArrays, } from '@vitessce/sets-utils';
-import { pluralize as plur, commaNumber } from '@vitessce/utils';
+import { pluralize as plur, commaNumber, aggregateFeatureArrays } from '@vitessce/utils';
 import { Scatterplot, ScatterplotTooltipSubscriber, ScatterplotOptions, getPointSizeDevicePixels, getPointOpacity, } from '@vitessce/scatterplot';
 import { Legend } from '@vitessce/legend';
 import { ViewType, COMPONENT_COORDINATION_TYPES, ViewHelpMapping } from '@vitessce/constants-internal';
@@ -182,7 +182,17 @@ export function EmbeddingScatterplotSubscriber(props) {
     const getCellIsSelected = useCallback((object, { index }) => ((cellSelectionSet || new Set([])).has(obsEmbeddingIndex[index]) ? 1.0 : 0.0), [cellSelectionSet, obsEmbeddingIndex]);
     const cellRadius = (cellRadiusMode === 'manual' ? cellRadiusFixed : dynamicCellRadius);
     const cellOpacity = (cellOpacityMode === 'manual' ? cellOpacityFixed : dynamicCellOpacity);
-    const { normData: uint8ExpressionData, extents: expressionExtents, missing: expressionMissing, } = useUint8FeatureSelection(expressionData);
+    // Compute aggregated expression data if featureAggregationStrategyToUse is not null
+    // and we have multiple features to aggregate.
+    const aggregatedExpressionData = useMemo(() => {
+        if (featureAggregationStrategyToUse != null && expressionData && expressionData.length > 1) {
+            const aggregated = aggregateFeatureArrays(expressionData, featureAggregationStrategyToUse);
+            // Return as array with single element to match expressionData structure
+            return [aggregated];
+        }
+        return expressionData;
+    }, [expressionData, featureAggregationStrategyToUse]);
+    const { normData: uint8ExpressionData, extents: expressionExtents, missing: expressionMissing, } = useUint8FeatureSelection(aggregatedExpressionData);
     // Set up a getter function for gene expression values, to be used
     // by the DeckGL layer to obtain values for instanced attributes.
     const getExpressionValue = useExpressionValueGetter({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-embedding",
-  "version": "3.8.8",
+  "version": "3.8.9",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -20,13 +20,13 @@
     "lodash-es": "^4.17.21",
     "react-aria": "^3.28.0",
     "@turf/circle": "^7.2.0",
-    "@vitessce/styles": "3.8.8",
-    "@vitessce/constants-internal": "3.8.8",
-    "@vitessce/legend": "3.8.8",
-    "@vitessce/sets-utils": "3.8.8",
-    "@vitessce/utils": "3.8.8",
-    "@vitessce/vit-s": "3.8.8",
-    "@vitessce/scatterplot": "3.8.8"
+    "@vitessce/styles": "3.8.9",
+    "@vitessce/constants-internal": "3.8.9",
+    "@vitessce/legend": "3.8.9",
+    "@vitessce/scatterplot": "3.8.9",
+    "@vitessce/sets-utils": "3.8.9",
+    "@vitessce/utils": "3.8.9",
+    "@vitessce/vit-s": "3.8.9"
   },
   "devDependencies": {
     "react": "18.3.1",

package/src/EmbeddingScatterplotSubscriber.js

@@ -31,7 +31,7 @@ import {
   setObsSelection, mergeObsSets, getCellSetPolygons, getCellColors,
   stratifyArrays,
 } from '@vitessce/sets-utils';
-import { pluralize as plur, commaNumber } from '@vitessce/utils';
+import { pluralize as plur, commaNumber, aggregateFeatureArrays } from '@vitessce/utils';
 import {
   Scatterplot, ScatterplotTooltipSubscriber, ScatterplotOptions,
   getPointSizeDevicePixels,
@@ -365,7 +365,7 @@ export function EmbeddingScatterplotSubscriber(props) {
         setOriginalViewState({ target: [initialTargetX, initialTargetY, 0], zoom: initialZoom });
       }
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [xRange, yRange, xExtent, yExtent, numCells,
     width, height, initialZoom, zoom, initialTargetX, initialTargetY, averageFillDensity]);
 
@@ -381,11 +381,22 @@ export function EmbeddingScatterplotSubscriber(props) {
   const cellRadius = (cellRadiusMode === 'manual' ? cellRadiusFixed : dynamicCellRadius);
   const cellOpacity = (cellOpacityMode === 'manual' ? cellOpacityFixed : dynamicCellOpacity);
 
+  // Compute aggregated expression data if featureAggregationStrategyToUse is not null
+  // and we have multiple features to aggregate.
+  const aggregatedExpressionData = useMemo(() => {
+    if (featureAggregationStrategyToUse != null && expressionData && expressionData.length > 1) {
+      const aggregated = aggregateFeatureArrays(expressionData, featureAggregationStrategyToUse);
+      // Return as array with single element to match expressionData structure
+      return [aggregated];
+    }
+    return expressionData;
+  }, [expressionData, featureAggregationStrategyToUse]);
+
   const {
     normData: uint8ExpressionData,
     extents: expressionExtents,
     missing: expressionMissing,
-  } = useUint8FeatureSelection(expressionData);
+  } = useUint8FeatureSelection(aggregatedExpressionData);
 
   // Set up a getter function for gene expression values, to be used
   // by the DeckGL layer to obtain values for instanced attributes.