@vitessce/scatterplot-gating 3.0.0 → 3.1.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { G } from "./index-6f1cc356.js";
+import { G } from "./index-c974ea79.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-a72c0702.js → jpeg-108c168d.js}

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

package/dist/{lerc-27230ebf.js → lerc-d4cf2fcd.js}

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

package/dist/{lzw-e71d3b12.js → lzw-18e51214.js}

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

package/dist/{packbits-5ddf3db9.js → packbits-c341c469.js}

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

package/dist/{raw-424e77e0.js → raw-2ff96293.js}

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

package/dist/{webimage-93e70904.js → webimage-51ac6f70.js}

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

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

@@ -1 +1 @@
-{"version":3,"file":"GatingSubscriber.d.ts","sourceRoot":"","sources":["../src/GatingSubscriber.js"],"names":[],"mappings":"AAkCA;;;;;;;;;;;;KAYK;AACL;IAV2B,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAES,cAAc,EAA7B,OAAO;IACS,mBAAmB;IAErB,kBAAkB,EAAhC,MAAM;gBAuZlB"}
+{"version":3,"file":"GatingSubscriber.d.ts","sourceRoot":"","sources":["../src/GatingSubscriber.js"],"names":[],"mappings":"AAkCA;;;;;;;;;;;;KAYK;AACL;IAV2B,IAAI,EAAlB,MAAM;IACQ,KAAK,EAAnB,MAAM;IACQ,kBAAkB,EAAhC,MAAM;IAES,cAAc,EAA7B,OAAO;IACS,mBAAmB;IAErB,kBAAkB,EAAhC,MAAM;gBA4ZlB"}

package/dist-tsc/GatingSubscriber.js

@@ -31,7 +31,6 @@ export function GatingSubscriber(props) {
     const setComponentViewInfo = useSetComponentViewInfo(uuid);
     // Get "props" from the coordination space.
     const [{ dataset, obsType, featureType, featureValueType, embeddingZoom: zoom, embeddingTargetX: targetX, embeddingTargetY: targetY, embeddingTargetZ: targetZ, obsFilter: cellFilter, obsHighlight: cellHighlight, obsSetSelection: cellSetSelection, obsSetColor: cellSetColor, obsColorEncoding: cellColorEncoding, additionalObsSets: additionalCellSets, embeddingObsSetPolygonsVisible: cellSetPolygonsVisible, embeddingObsSetLabelsVisible: cellSetLabelsVisible, embeddingObsSetLabelSize: cellSetLabelSize, embeddingObsRadius: cellRadiusFixed, embeddingObsRadiusMode: cellRadiusMode, embeddingObsOpacity: cellOpacityFixed, embeddingObsOpacityMode: cellOpacityMode, featureValueColormap: geneExpressionColormap, featureValueColormapRange: geneExpressionColormapRange, featureSelection: gatingFeatureSelectionColor, featureValueTransform, featureValueTransformCoefficient, gatingFeatureSelectionX, gatingFeatureSelectionY, }, { setEmbeddingZoom: setZoom, setEmbeddingTargetX: setTargetX, setEmbeddingTargetY: setTargetY, setEmbeddingTargetZ: setTargetZ, setObsFilter: setCellFilter, setObsSetSelection: setCellSetSelection, setObsHighlight: setCellHighlight, setObsSetColor: setCellSetColor, setObsColorEncoding: setCellColorEncoding, setAdditionalObsSets: setAdditionalCellSets, setEmbeddingObsSetPolygonsVisible: setCellSetPolygonsVisible, setEmbeddingObsSetLabelsVisible: setCellSetLabelsVisible, setEmbeddingObsSetLabelSize: setCellSetLabelSize, setEmbeddingObsRadius: setCellRadiusFixed, setEmbeddingObsRadiusMode: setCellRadiusMode, setEmbeddingObsOpacity: setCellOpacityFixed, setEmbeddingObsOpacityMode: setCellOpacityMode, setFeatureValueColormap: setGeneExpressionColormap, setFeatureValueColormapRange: setGeneExpressionColormapRange, setFeatureValueTransform, setFeatureValueTransformCoefficient, setGatingFeatureSelectionX, setGatingFeatureSelectionY, }] = useCoordination(COMPONENT_COORDINATION_TYPES[ViewType.GATING], coordinationScopes);
-    const [urls, addUrl] = useUrls(loaders, dataset);
     const [width, height, deckRef] = useDeckCanvasSize();
     const title = useMemo(() => {
         if (titleOverride) {
@@ -45,14 +44,14 @@ export function GatingSubscriber(props) {
     const featureSelectionX = useMemo(() => (gatingFeatureSelectionX ? [gatingFeatureSelectionX] : null), [gatingFeatureSelectionX]);
     const featureSelectionY = useMemo(() => (gatingFeatureSelectionY ? [gatingFeatureSelectionY] : null), [gatingFeatureSelectionY]);
     // Get data from loaders using the data hooks.
-    const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(loaders, dataset, addUrl, false, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor }, { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor }, { obsType });
+    const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(loaders, dataset, false, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor }, { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor }, { obsType });
     // eslint-disable-next-line no-unused-vars
     const [expressionDataColor, loadedColor, featureSelectionColorStatus] = useFeatureSelection(loaders, dataset, false, gatingFeatureSelectionColor, { obsType, featureType, featureValueType });
     // eslint-disable-next-line no-unused-vars
     const [expressionDataX, loadedX, featureSelectionXStatus] = useFeatureSelection(loaders, dataset, false, featureSelectionX, { obsType, featureType, featureValueType });
     // eslint-disable-next-line no-unused-vars
     const [expressionDataY, loadedY, featureSelectionYStatus] = useFeatureSelection(loaders, dataset, false, featureSelectionY, { obsType, featureType, featureValueType });
-    const [{ obsIndex, featureIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(loaders, dataset, addUrl, false, { obsType, featureType, featureValueType });
+    const [{ obsIndex, featureIndex }, matrixIndicesStatus, matrixIndicesUrls,] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
     const cellsCount = obsIndex?.length || 0;
     const isReady = useReady([
         obsSetsStatus,
@@ -61,6 +60,10 @@ export function GatingSubscriber(props) {
         featureSelectionYStatus,
         matrixIndicesStatus,
     ]);
+    const urls = useUrls([
+        obsSetsUrls,
+        matrixIndicesUrls,
+    ]);
     // Generate a new cells object with a mapping added for the user selected genes.
     const obsXY = useMemo(() => {
         if (!(cellsCount && expressionDataX?.[0] && expressionDataY?.[0]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-gating",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -20,23 +20,23 @@
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
     "plur": "^5.1.0",
-    "@vitessce/constants-internal": "3.0.0",
-    "@vitessce/sets-utils": "3.0.0",
-    "@vitessce/scatterplot": "3.0.0",
-    "@vitessce/vit-s": "3.0.0",
-    "@vitessce/utils": "3.0.0"
+    "@vitessce/constants-internal": "3.1.0",
+    "@vitessce/scatterplot": "3.1.0",
+    "@vitessce/sets-utils": "3.1.0",
+    "@vitessce/utils": "3.1.0",
+    "@vitessce/vit-s": "3.1.0"
   },
   "devDependencies": {
     "react": "^18.0.0",
     "vite": "^4.3.0",
-    "vitest": "^0.23.4"
+    "vitest": "^0.32.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "scripts": {
     "bundle": "pnpm exec vite build -c ../../../scripts/vite.config.js",
-    "test": "pnpm exec vitest --run -r ../../../ --dir ."
+    "test": "pnpm exec vitest --run"
   },
   "module": "dist/index.js",
   "exports": {

package/src/GatingSubscriber.js

@@ -120,7 +120,6 @@ export function GatingSubscriber(props) {
     coordinationScopes,
   );
 
-  const [urls, addUrl] = useUrls(loaders, dataset);
   const [width, height, deckRef] = useDeckCanvasSize();
 
   const title = useMemo(() => {
@@ -141,8 +140,8 @@ export function GatingSubscriber(props) {
   ), [gatingFeatureSelectionY]);
 
   // Get data from loaders using the data hooks.
-  const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(
-    loaders, dataset, addUrl, false,
+  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(
+    loaders, dataset, false,
     { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor },
     { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor },
     { obsType },
@@ -162,8 +161,10 @@ export function GatingSubscriber(props) {
     loaders, dataset, false, featureSelectionY,
     { obsType, featureType, featureValueType },
   );
-  const [{ obsIndex, featureIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(
-    loaders, dataset, addUrl, false,
+  const [
+    { obsIndex, featureIndex }, matrixIndicesStatus, matrixIndicesUrls,
+  ] = useObsFeatureMatrixIndices(
+    loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
   const cellsCount = obsIndex?.length || 0;
@@ -175,6 +176,10 @@ export function GatingSubscriber(props) {
     featureSelectionYStatus,
     matrixIndicesStatus,
   ]);
+  const urls = useUrls([
+    obsSetsUrls,
+    matrixIndicesUrls,
+  ]);
 
   // Generate a new cells object with a mapping added for the user selected genes.
   const obsXY = useMemo(() => {