@vitessce/scatterplot 3.5.10 → 3.5.11

package/dist/{deflate-c5f0776b.js → deflate-f6d73584.js}

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

package/dist/{index-d522aebb.js → index-54d5c6e0.js}

@@ -110842,8 +110842,15 @@ class SelectionLayer extends CompositeLayer {
         if (!nodePolygonContainsSelectedPolygon && !nodePolygonWithinSelectedPolygon && !nodePolygonOverlapsSelectedPolgyon) {
           return true;
         }
-        if (node.data && booleanPointInPolygon$1(point$1([].slice.call(getObsCoords(node.data))), selectedPolygon)) {
-          pickingInfos.push(node.data);
+        if (node.data) {
+          let current = node;
+          while (current) {
+            const pointCoords = [].slice.call(getObsCoords(current.data));
+            if (booleanPointInPolygon$1(point$1(pointCoords), selectedPolygon)) {
+              pickingInfos.push(current.data);
+            }
+            current = current.next;
+          }
         }
         return false;
       });
@@ -112055,16 +112062,16 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-8fb6d135.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-723527e2.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-4aa2df23.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-7efc2185.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-59437681.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-c5f0776b.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-74a934fa.js").then((m2) => m2.default));
-addDecoder(34887, () => import("./lerc-124acb2f.js").then((m2) => m2.default));
-addDecoder(50001, () => import("./webimage-cdc82395.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-8d0a6c28.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-f6d73584.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-4c889da6.js").then((m2) => m2.default));
+addDecoder(34887, () => import("./lerc-71eafedf.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-19762a61.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset5 = 0;
@@ -137484,7 +137491,10 @@ const getPosition = (object2, { index: index2, data, target }) => {
   target[2] = POINT_LAYER_Z_INDEX;
   return target;
 };
-const contourGetWeight = (object2, { index: index2, data }) => data.src.featureValues[index2];
+const contourGetWeight = (object2, { index: index2, data }) => {
+  var _a3;
+  return (_a3 = data.src.featureValues) == null ? void 0 : _a3[index2];
+};
 const contourGetPosition = (object2, { index: index2, data, target }) => {
   target[0] = data.src.embeddingX[index2];
   target[1] = -data.src.embeddingY[index2];
@@ -137822,6 +137832,16 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
       makeFlippedGetObsCoords
     );
   }
+  componentWillUnmount() {
+    delete this.cellsQuadTree;
+    delete this.cellsLayer;
+    delete this.cellsData;
+    delete this.stratifiedData;
+    delete this.cellSetsForceSimulation;
+    delete this.cellSetsLabelPrevZoom;
+    delete this.cellSetsLayers;
+    delete this.contourLayers;
+  }
   /**
    * Here, asynchronously check whether props have
    * updated which require re-computing memoized variables,
@@ -138035,6 +138055,7 @@ if (typeof document !== "undefined") {
   else
     document.addEventListener("DOMContentLoaded", $bbed8b41f857bcc0$var$setupGlobalEvents);
 }
+const FEATURE_AGGREGATION_STRATEGIES = ["first", "last", "sum", "mean"];
 function ScatterplotOptions(props) {
   const {
     children,
@@ -138071,7 +138092,9 @@ function ScatterplotOptions(props) {
     setContourPercentiles,
     defaultContourPercentiles,
     contourColorEncoding,
-    setContourColorEncoding
+    setContourColorEncoding,
+    featureAggregationStrategy,
+    setFeatureAggregationStrategy
   } = props;
   const scatterplotOptionsId = $bdb11010cef70236$export$f680877a34711e37();
   const observationsLabelNice = capitalize$1(observationsLabel);
@@ -138129,6 +138152,9 @@ function ScatterplotOptions(props) {
     debounce$2(handlePercentilesChange, 5, { trailing: true }),
     [handlePercentilesChange]
   );
+  function handleFeatureAggregationStrategyChange(event) {
+    setFeatureAggregationStrategy(event.target.value);
+  }
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(OptionsContainer, { children: [
     children,
     /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -138515,7 +138541,28 @@ function ScatterplotOptions(props) {
           max: 0.999
         }
       ) })
-    ] })
+    ] }),
+    setFeatureAggregationStrategy ? /* @__PURE__ */ jsxRuntimeExports.jsxs(TableRow$1, { children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx(TableCell$1, { className: classes.labelCell, variant: "head", scope: "row", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        "label",
+        {
+          htmlFor: `feature-aggregation-strategy-${scatterplotOptionsId}`,
+          children: "Feature Aggregation Strategy"
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(TableCell$1, { className: classes.inputCell, variant: "body", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        OptionSelect,
+        {
+          className: classes.select,
+          value: featureAggregationStrategy ?? "first",
+          onChange: handleFeatureAggregationStrategyChange,
+          inputProps: {
+            id: `feature-aggregation-strategy-${scatterplotOptionsId}`
+          },
+          children: FEATURE_AGGREGATION_STRATEGIES.map((opt) => /* @__PURE__ */ jsxRuntimeExports.jsx("option", { value: opt, children: capitalize$1(opt) }, opt))
+        }
+      ) })
+    ] }) : null
   ] });
 }
 const styles10 = makeStyles((theme) => ({

package/dist/index.js

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

package/dist/{jpeg-59437681.js → jpeg-8d0a6c28.js}

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

package/dist/{lerc-124acb2f.js → lerc-71eafedf.js}

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

package/dist/{lzw-723527e2.js → lzw-7efc2185.js}

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

package/dist/{packbits-74a934fa.js → packbits-4c889da6.js}

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

package/dist/{raw-8fb6d135.js → raw-4aa2df23.js}

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

package/dist/{webimage-cdc82395.js → webimage-19762a61.js}

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

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

@@ -1 +1 @@
-{"version":3,"file":"Scatterplot.d.ts","sourceRoot":"","sources":["../src/Scatterplot.js"],"names":[],"mappings":";AA+jBA;;;;;;GAMG;AACH,sCAKG"}
+{"version":3,"file":"Scatterplot.d.ts","sourceRoot":"","sources":["../src/Scatterplot.js"],"names":[],"mappings":";AA0kBA;;;;;;GAMG;AACH,sCAKG"}

package/dist-tsc/Scatterplot.js

@@ -41,7 +41,7 @@ const getPosition = (object, { index, data, target }) => {
     target[2] = POINT_LAYER_Z_INDEX;
     return target;
 };
-const contourGetWeight = (object, { index, data }) => data.src.featureValues[index];
+const contourGetWeight = (object, { index, data }) => data.src.featureValues?.[index];
 const contourGetPosition = (object, { index, data, target }) => {
     target[0] = data.src.embeddingX[index];
     target[1] = -data.src.embeddingY[index];
@@ -399,6 +399,16 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
         const { obsEmbeddingIndex, obsEmbedding, } = this.props;
         super.viewInfoDidUpdate(obsEmbeddingIndex, obsEmbedding, makeFlippedGetObsCoords);
     }
+    componentWillUnmount() {
+        delete this.cellsQuadTree;
+        delete this.cellsLayer;
+        delete this.cellsData;
+        delete this.stratifiedData;
+        delete this.cellSetsForceSimulation;
+        delete this.cellSetsLabelPrevZoom;
+        delete this.cellSetsLayers;
+        delete this.contourLayers;
+    }
     /**
      * Here, asynchronously check whether props have
      * updated which require re-computing memoized variables,

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

@@ -1 +1 @@
-{"version":3,"file":"ScatterplotOptions.d.ts","sourceRoot":"","sources":["../src/ScatterplotOptions.js"],"names":[],"mappings":"AAUA,oEAqdC"}
+{"version":3,"file":"ScatterplotOptions.d.ts","sourceRoot":"","sources":["../src/ScatterplotOptions.js"],"names":[],"mappings":"AAYA,oEAufC"}

package/dist-tsc/ScatterplotOptions.js

@@ -6,8 +6,9 @@ import { Checkbox, Slider, TableCell, TableRow } from '@material-ui/core';
 import { capitalize } from '@vitessce/utils';
 import { usePlotOptionsStyles, CellColorEncodingOption, OptionsContainer, OptionSelect, } from '@vitessce/vit-s';
 import { GLSL_COLORMAPS } from '@vitessce/gl';
+const FEATURE_AGGREGATION_STRATEGIES = ['first', 'last', 'sum', 'mean'];
 export default function ScatterplotOptions(props) {
-    const { children, observationsLabel, cellRadius, setCellRadius, cellRadiusMode, setCellRadiusMode, cellOpacity, setCellOpacity, cellOpacityMode, setCellOpacityMode, cellSetLabelsVisible, setCellSetLabelsVisible, tooltipsVisible, setTooltipsVisible, cellSetLabelSize, setCellSetLabelSize, cellSetPolygonsVisible, setCellSetPolygonsVisible, cellColorEncoding, setCellColorEncoding, geneExpressionColormap, setGeneExpressionColormap, geneExpressionColormapRange, setGeneExpressionColormapRange, embeddingPointsVisible, setEmbeddingPointsVisible, embeddingContoursVisible, setEmbeddingContoursVisible, embeddingContoursFilled, setEmbeddingContoursFilled, contourPercentiles, setContourPercentiles, defaultContourPercentiles, contourColorEncoding, setContourColorEncoding, } = props;
+    const { children, observationsLabel, cellRadius, setCellRadius, cellRadiusMode, setCellRadiusMode, cellOpacity, setCellOpacity, cellOpacityMode, setCellOpacityMode, cellSetLabelsVisible, setCellSetLabelsVisible, tooltipsVisible, setTooltipsVisible, cellSetLabelSize, setCellSetLabelSize, cellSetPolygonsVisible, setCellSetPolygonsVisible, cellColorEncoding, setCellColorEncoding, geneExpressionColormap, setGeneExpressionColormap, geneExpressionColormapRange, setGeneExpressionColormapRange, embeddingPointsVisible, setEmbeddingPointsVisible, embeddingContoursVisible, setEmbeddingContoursVisible, embeddingContoursFilled, setEmbeddingContoursFilled, contourPercentiles, setContourPercentiles, defaultContourPercentiles, contourColorEncoding, setContourColorEncoding, featureAggregationStrategy, setFeatureAggregationStrategy, } = props;
     const scatterplotOptionsId = useId();
     const observationsLabelNice = capitalize(observationsLabel);
     const classes = usePlotOptionsStyles();
@@ -58,6 +59,9 @@ export default function ScatterplotOptions(props) {
         setContourPercentiles(values);
     }
     const handlePercentilesChangeDebounced = useCallback(debounce(handlePercentilesChange, 5, { trailing: true }), [handlePercentilesChange]);
+    function handleFeatureAggregationStrategyChange(event) {
+        setFeatureAggregationStrategy(event.target.value);
+    }
     return (_jsxs(OptionsContainer, { children: [children, _jsx(CellColorEncodingOption, { observationsLabel: observationsLabel, cellColorEncoding: cellColorEncoding, setCellColorEncoding: setCellColorEncoding }), _jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, variant: "head", scope: "row", children: _jsxs("label", { htmlFor: `scatterplot-set-labels-visible-${scatterplotOptionsId}`, children: [observationsLabelNice, " Set Labels Visible"] }) }), _jsx(TableCell, { className: classes.inputCell, variant: "body", children: _jsx(Checkbox, { className: classes.checkbox, checked: cellSetLabelsVisible, onChange: handleLabelVisibilityChange, name: "scatterplot-option-cell-set-labels", color: "default", inputProps: {
                                 'aria-label': 'Show or hide set labels',
                                 id: `scatterplot-set-labels-visible-${scatterplotOptionsId}`,
@@ -93,5 +97,7 @@ export default function ScatterplotOptions(props) {
                                 id: `scatterplot-contours-filled-${scatterplotOptionsId}`,
                             } }) })] }), _jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, variant: "head", scope: "row", children: _jsx("label", { htmlFor: `scatterplot-contour-color-encoding-${scatterplotOptionsId}`, children: "Contour Color Encoding" }) }), _jsx(TableCell, { className: classes.inputCell, variant: "body", children: _jsxs(OptionSelect, { className: classes.select, value: contourColorEncoding, onChange: handleContourColorEncodingChange, inputProps: {
                                 id: `scatterplot-contour-color-encoding-${scatterplotOptionsId}`,
-                            }, children: [_jsx("option", { value: "sampleSetSelection", children: "Sample Sets" }), _jsxs("option", { value: "cellSetSelection", children: [observationsLabelNice, " Sets"] }), _jsx("option", { value: "staticColor", children: "Static Color" })] }) })] }), _jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, variant: "head", scope: "row", children: _jsx("label", { htmlFor: `scatterplot-contour-percentiles-${scatterplotOptionsId}`, children: "Contour Percentiles" }) }), _jsx(TableCell, { className: classes.inputCell, variant: "body", children: _jsx(Slider, { classes: { root: classes.slider, valueLabel: classes.sliderValueLabel }, value: contourPercentiles || defaultContourPercentiles, onChange: handlePercentilesChangeDebounced, "aria-label": "Scatterplot sliders for contour percentile thresholds", id: `scatterplot-contour-percentiles-${scatterplotOptionsId}`, valueLabelDisplay: "auto", step: 0.005, min: 0.009, max: 0.999 }) })] })] }));
+                            }, children: [_jsx("option", { value: "sampleSetSelection", children: "Sample Sets" }), _jsxs("option", { value: "cellSetSelection", children: [observationsLabelNice, " Sets"] }), _jsx("option", { value: "staticColor", children: "Static Color" })] }) })] }), _jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, variant: "head", scope: "row", children: _jsx("label", { htmlFor: `scatterplot-contour-percentiles-${scatterplotOptionsId}`, children: "Contour Percentiles" }) }), _jsx(TableCell, { className: classes.inputCell, variant: "body", children: _jsx(Slider, { classes: { root: classes.slider, valueLabel: classes.sliderValueLabel }, value: contourPercentiles || defaultContourPercentiles, onChange: handlePercentilesChangeDebounced, "aria-label": "Scatterplot sliders for contour percentile thresholds", id: `scatterplot-contour-percentiles-${scatterplotOptionsId}`, valueLabelDisplay: "auto", step: 0.005, min: 0.009, max: 0.999 }) })] }), setFeatureAggregationStrategy ? (_jsxs(TableRow, { children: [_jsx(TableCell, { className: classes.labelCell, variant: "head", scope: "row", children: _jsx("label", { htmlFor: `feature-aggregation-strategy-${scatterplotOptionsId}`, children: "Feature Aggregation Strategy" }) }), _jsx(TableCell, { className: classes.inputCell, variant: "body", children: _jsx(OptionSelect, { className: classes.select, value: featureAggregationStrategy ?? 'first', onChange: handleFeatureAggregationStrategyChange, inputProps: {
+                                id: `feature-aggregation-strategy-${scatterplotOptionsId}`,
+                            }, children: FEATURE_AGGREGATION_STRATEGIES.map(opt => (_jsx("option", { value: opt, children: capitalize(opt) }, opt))) }) })] })) : null] }));
 }

package/package.json

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

package/src/Scatterplot.js

@@ -50,7 +50,7 @@ const getPosition = (object, { index, data, target }) => {
 };
 
 
-const contourGetWeight = (object, { index, data }) => data.src.featureValues[index];
+const contourGetWeight = (object, { index, data }) => data.src.featureValues?.[index];
 
 const contourGetPosition = (object, { index, data, target }) => {
   target[0] = data.src.embeddingX[index];
@@ -496,6 +496,17 @@ class Scatterplot extends AbstractSpatialOrScatterplot {
     );
   }
 
+  componentWillUnmount() {
+    delete this.cellsQuadTree;
+    delete this.cellsLayer;
+    delete this.cellsData;
+    delete this.stratifiedData;
+    delete this.cellSetsForceSimulation;
+    delete this.cellSetsLabelPrevZoom;
+    delete this.cellSetsLayers;
+    delete this.contourLayers;
+  }
+
   /**
    * Here, asynchronously check whether props have
    * updated which require re-computing memoized variables,

package/src/ScatterplotOptions.js

@@ -8,6 +8,8 @@ import {
 } from '@vitessce/vit-s';
 import { GLSL_COLORMAPS } from '@vitessce/gl';
 
+const FEATURE_AGGREGATION_STRATEGIES = ['first', 'last', 'sum', 'mean'];
+
 export default function ScatterplotOptions(props) {
   const {
     children,
@@ -48,6 +50,9 @@ export default function ScatterplotOptions(props) {
 
     contourColorEncoding,
     setContourColorEncoding,
+
+    featureAggregationStrategy,
+    setFeatureAggregationStrategy,
   } = props;
 
   const scatterplotOptionsId = useId();
@@ -124,6 +129,10 @@ export default function ScatterplotOptions(props) {
     [handlePercentilesChange],
   );
 
+  function handleFeatureAggregationStrategyChange(event) {
+    setFeatureAggregationStrategy(event.target.value);
+  }
+
   return (
     <OptionsContainer>
       {children}
@@ -475,6 +484,33 @@ export default function ScatterplotOptions(props) {
           />
         </TableCell>
       </TableRow>
+      {setFeatureAggregationStrategy ? (
+        <TableRow>
+          <TableCell className={classes.labelCell} variant="head" scope="row">
+            <label
+              htmlFor={`feature-aggregation-strategy-${scatterplotOptionsId}`}
+            >
+              Feature Aggregation Strategy
+            </label>
+          </TableCell>
+          <TableCell className={classes.inputCell} variant="body">
+            <OptionSelect
+              className={classes.select}
+              value={featureAggregationStrategy ?? 'first'}
+              onChange={handleFeatureAggregationStrategyChange}
+              inputProps={{
+                id: `feature-aggregation-strategy-${scatterplotOptionsId}`,
+              }}
+            >
+              {FEATURE_AGGREGATION_STRATEGIES.map(opt => (
+                <option key={opt} value={opt}>
+                  {capitalize(opt)}
+                </option>
+              ))}
+            </OptionSelect>
+          </TableCell>
+        </TableRow>
+      ) : null}
     </OptionsContainer>
   );
 }