@vitessce/statistical-plots 3.0.0 → 3.1.0

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

@@ -1 +1 @@
-{"version":3,"file":"CellSetExpressionPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"AAiGA;;;;;;;;;GASG;AACH;IAL2B,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;gBAkHhB"}
+{"version":3,"file":"CellSetExpressionPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetExpressionPlotSubscriber.js"],"names":[],"mappings":"AAiGA;;;;;;;;;GASG;AACH;IAL2B,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;gBAsHhB"}

package/dist-tsc/CellSetExpressionPlotSubscriber.js

@@ -83,21 +83,25 @@ export function CellSetExpressionPlotSubscriber(props) {
     // Get "props" from the coordination space.
     const [{ dataset, obsType, featureType, featureValueType, featureSelection: geneSelection, featureValueTransform, featureValueTransformCoefficient, obsSetSelection: cellSetSelection, obsSetColor: cellSetColor, additionalObsSets: additionalCellSets, }, { setFeatureValueTransform, setFeatureValueTransformCoefficient, }] = useCoordination(COMPONENT_COORDINATION_TYPES[ViewType.OBS_SET_FEATURE_VALUE_DISTRIBUTION], coordinationScopes);
     const [width, height, containerRef] = useGridItemSize();
-    const [urls, addUrl] = useUrls(loaders, dataset);
     const transformOptions = VALUE_TRANSFORM_OPTIONS;
     // Get data from loaders using the data hooks.
     // eslint-disable-next-line no-unused-vars
     const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(loaders, dataset, false, geneSelection, { obsType, featureType, featureValueType });
     // TODO: support multiple feature labels using featureLabelsType coordination values.
-    const [{ featureLabelsMap }, featureLabelsStatus] = useFeatureLabelsData(loaders, dataset, addUrl, false, {}, {}, { featureType });
-    const [{ obsIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(loaders, dataset, addUrl, false, { obsType, featureType, featureValueType });
-    const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(loaders, dataset, addUrl, true, {}, {}, { obsType });
+    const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(loaders, dataset, false, {}, {}, { featureType });
+    const [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrls] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
+    const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(loaders, dataset, true, {}, {}, { obsType });
     const isReady = useReady([
         featureSelectionStatus,
         matrixIndicesStatus,
         obsSetsStatus,
         featureLabelsStatus,
     ]);
+    const urls = useUrls([
+        featureLabelsUrls,
+        matrixIndicesUrls,
+        obsSetsUrls,
+    ]);
     const [expressionArr, setArr, expressionMax] = useExpressionByCellSet(expressionData, obsIndex, cellSets, additionalCellSets, geneSelection, cellSetSelection, cellSetColor, featureValueTransform, featureValueTransformCoefficient, theme);
     const firstGeneSelected = geneSelection && geneSelection.length >= 1
         ? (featureLabelsMap?.get(geneSelection[0]) || geneSelection[0])

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

@@ -1 +1 @@
-{"version":3,"file":"CellSetSizesPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetSizesPlotSubscriber.js"],"names":[],"mappings":"AAgBA;;;;;;;;;;GAUG;AACH;IAN2B,mBAAmB;IACnB,OAAO;IAET,KAAK,EAAnB,MAAM;IACQ,KAAK,EAAnB,MAAM;gBA6HhB"}
+{"version":3,"file":"CellSetSizesPlotSubscriber.d.ts","sourceRoot":"","sources":["../src/CellSetSizesPlotSubscriber.js"],"names":[],"mappings":"AAgBA;;;;;;;;;;GAUG;AACH;IAN2B,mBAAmB;IACnB,OAAO;IAET,KAAK,EAAnB,MAAM;IACQ,KAAK,EAAnB,MAAM;gBA2HhB"}

package/dist-tsc/CellSetSizesPlotSubscriber.js

@@ -26,16 +26,14 @@ export function CellSetSizesPlotSubscriber(props) {
     const [{ dataset, obsType, obsSetSelection: cellSetSelection, obsSetColor: cellSetColor, additionalObsSets: additionalCellSets, obsSetExpansion: cellSetExpansion, }, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor, }] = useCoordination(COMPONENT_COORDINATION_TYPES[ViewType.OBS_SET_SIZES], coordinationScopes);
     const title = titleOverride || `${capitalize(obsType)} Set Sizes`;
     const [width, height, containerRef] = useGridItemSize();
-    const [urls, addUrl] = useUrls(loaders, dataset);
     // the name of the hierarchy that was clicked on last
     const [currentHierarchy, setCurrentHierarchy] = useState([]);
     // the previous cell set that was selected
     const [prevCellSetSelection, setPrevCellSetSelection] = useState([]);
     // Get data from loaders using the data hooks.
-    const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(loaders, dataset, addUrl, true, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor }, { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor }, { obsType });
-    const isReady = useReady([
-        obsSetsStatus,
-    ]);
+    const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(loaders, dataset, true, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor }, { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor }, { obsType });
+    const isReady = useReady([obsSetsStatus]);
+    const urls = useUrls([obsSetsUrls]);
     const mergedCellSets = useMemo(() => mergeObsSets(cellSets, additionalCellSets), [cellSets, additionalCellSets]);
     const data = useMemo(() => {
         if (cellSetSelection && cellSetColor && mergedCellSets && cellSets) {

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

@@ -1 +1 @@
-{"version":3,"file":"ExpressionHistogramSubscriber.d.ts","sourceRoot":"","sources":["../src/ExpressionHistogramSubscriber.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AACH;IAL2B,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;gBAiHhB"}
+{"version":3,"file":"ExpressionHistogramSubscriber.d.ts","sourceRoot":"","sources":["../src/ExpressionHistogramSubscriber.js"],"names":[],"mappings":"AAcA;;;;;;;;;GASG;AACH;IAL2B,mBAAmB;IACrB,kBAAkB,EAAhC,MAAM;IAEQ,KAAK,EAAnB,MAAM;gBAqHhB"}

package/dist-tsc/ExpressionHistogramSubscriber.js

@@ -23,15 +23,17 @@ export function ExpressionHistogramSubscriber(props) {
     // Get "props" from the coordination space.
     const [{ dataset, obsType, featureType, featureValueType, featureSelection: geneSelection, additionalObsSets: additionalCellSets, obsSetColor: cellSetColor, }, { setAdditionalObsSets: setAdditionalCellSets, setObsSetColor: setCellSetColor, setObsColorEncoding: setCellColorEncoding, setObsSetSelection: setCellSetSelection, }] = useCoordination(COMPONENT_COORDINATION_TYPES[ViewType.FEATURE_VALUE_HISTOGRAM], coordinationScopes);
     const [width, height, containerRef] = useGridItemSize();
-    const [urls, addUrl] = useUrls(loaders, dataset);
     // Get data from loaders using the data hooks.
-    const [{ obsIndex, featureIndex, obsFeatureMatrix }, matrixStatus] = useObsFeatureMatrixData(loaders, dataset, addUrl, true, {}, {}, { obsType, featureType, featureValueType });
+    const [{ obsIndex, featureIndex, obsFeatureMatrix }, matrixStatus, matrixUrls,] = useObsFeatureMatrixData(loaders, dataset, true, {}, {}, { obsType, featureType, featureValueType });
     // eslint-disable-next-line no-unused-vars
     const [expressionData, loadedFeatureSelection, featureSelectionStatus] = useFeatureSelection(loaders, dataset, false, geneSelection, { obsType, featureType, featureValueType });
     const isReady = useReady([
         matrixStatus,
         featureSelectionStatus,
     ]);
+    const urls = useUrls([
+        matrixUrls,
+    ]);
     const firstGeneSelected = geneSelection && geneSelection.length >= 1
         ? geneSelection[0]
         : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/statistical-plots",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -19,23 +19,23 @@
     "@material-ui/core": "~4.12.3",
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
-    "@vitessce/constants-internal": "3.0.0",
-    "@vitessce/sets-utils": "3.0.0",
-    "@vitessce/utils": "3.0.0",
-    "@vitessce/vega": "3.0.0",
-    "@vitessce/vit-s": "3.0.0"
+    "@vitessce/constants-internal": "3.1.0",
+    "@vitessce/sets-utils": "3.1.0",
+    "@vitessce/utils": "3.1.0",
+    "@vitessce/vega": "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/CellSetExpressionPlotSubscriber.js

@@ -136,7 +136,6 @@ export function CellSetExpressionPlotSubscriber(props) {
   );
 
   const [width, height, containerRef] = useGridItemSize();
-  const [urls, addUrl] = useUrls(loaders, dataset);
 
   const transformOptions = VALUE_TRANSFORM_OPTIONS;
 
@@ -147,16 +146,16 @@ export function CellSetExpressionPlotSubscriber(props) {
     { obsType, featureType, featureValueType },
   );
   // TODO: support multiple feature labels using featureLabelsType coordination values.
-  const [{ featureLabelsMap }, featureLabelsStatus] = useFeatureLabelsData(
-    loaders, dataset, addUrl, false, {}, {},
+  const [{ featureLabelsMap }, featureLabelsStatus, featureLabelsUrls] = useFeatureLabelsData(
+    loaders, dataset, false, {}, {},
     { featureType },
   );
-  const [{ obsIndex }, matrixIndicesStatus] = useObsFeatureMatrixIndices(
-    loaders, dataset, addUrl, false,
+  const [{ obsIndex }, matrixIndicesStatus, matrixIndicesUrls] = useObsFeatureMatrixIndices(
+    loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
-  const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(
-    loaders, dataset, addUrl, true, {}, {},
+  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(
+    loaders, dataset, true, {}, {},
     { obsType },
   );
   const isReady = useReady([
@@ -165,6 +164,11 @@ export function CellSetExpressionPlotSubscriber(props) {
     obsSetsStatus,
     featureLabelsStatus,
   ]);
+  const urls = useUrls([
+    featureLabelsUrls,
+    matrixIndicesUrls,
+    obsSetsUrls,
+  ]);
 
   const [expressionArr, setArr, expressionMax] = useExpressionByCellSet(
     expressionData, obsIndex, cellSets, additionalCellSets,

package/src/CellSetSizesPlotSubscriber.js

@@ -53,7 +53,6 @@ export function CellSetSizesPlotSubscriber(props) {
   const title = titleOverride || `${capitalize(obsType)} Set Sizes`;
 
   const [width, height, containerRef] = useGridItemSize();
-  const [urls, addUrl] = useUrls(loaders, dataset);
 
   // the name of the hierarchy that was clicked on last
   const [currentHierarchy, setCurrentHierarchy] = useState([]);
@@ -61,15 +60,14 @@ export function CellSetSizesPlotSubscriber(props) {
   const [prevCellSetSelection, setPrevCellSetSelection] = useState([]);
 
   // Get data from loaders using the data hooks.
-  const [{ obsSets: cellSets }, obsSetsStatus] = useObsSetsData(
-    loaders, dataset, addUrl, true,
+  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(
+    loaders, dataset, true,
     { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor },
     { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor },
     { obsType },
   );
-  const isReady = useReady([
-    obsSetsStatus,
-  ]);
+  const isReady = useReady([obsSetsStatus]);
+  const urls = useUrls([obsSetsUrls]);
 
   const mergedCellSets = useMemo(
     () => mergeObsSets(cellSets, additionalCellSets),

package/src/ExpressionHistogramSubscriber.js

@@ -52,11 +52,12 @@ export function ExpressionHistogramSubscriber(props) {
   );
 
   const [width, height, containerRef] = useGridItemSize();
-  const [urls, addUrl] = useUrls(loaders, dataset);
 
   // Get data from loaders using the data hooks.
-  const [{ obsIndex, featureIndex, obsFeatureMatrix }, matrixStatus] = useObsFeatureMatrixData(
-    loaders, dataset, addUrl, true, {}, {},
+  const [
+    { obsIndex, featureIndex, obsFeatureMatrix }, matrixStatus, matrixUrls,
+  ] = useObsFeatureMatrixData(
+    loaders, dataset, true, {}, {},
     { obsType, featureType, featureValueType },
   );
   // eslint-disable-next-line no-unused-vars
@@ -68,6 +69,9 @@ export function ExpressionHistogramSubscriber(props) {
     matrixStatus,
     featureSelectionStatus,
   ]);
+  const urls = useUrls([
+    matrixUrls,
+  ]);
 
   const firstGeneSelected = geneSelection && geneSelection.length >= 1
     ? geneSelection[0]