@vitessce/scatterplot-gating 3.6.6 → 3.6.8

package/dist/{deflate-0khwfeEa.js → deflate-CfBCa-sD.js}

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

package/dist/{index-Ceq7OIVC.js → index-W40dIkpk.js}

@@ -7011,6 +7011,9 @@ const configSchema1_0_16 = configSchema1_0_13.extend({
 const configSchema1_0_17 = configSchema1_0_16.extend({
   version: z.literal("1.0.17")
 });
+const configSchema1_0_18 = configSchema1_0_17.extend({
+  version: z.literal("1.0.18")
+});
 configSchema1_0_0.shape.coordinationSpace.unwrap();
 configSchema1_0_0.shape.layout.element.shape.coordinationScopes.unwrap();
 function upgradeReplaceViewProp(prefix2, view, coordinationSpace) {
@@ -7518,7 +7521,54 @@ function upgradeFrom1_0_16(config2) {
     version: "1.0.17"
   };
 }
-const latestConfigSchema = configSchema1_0_17;
+function upgradeFrom1_0_17(config2) {
+  const newConfig = cloneDeep(config2);
+  const { datasets } = newConfig;
+  const newDatasets = datasets.map((datasetDef) => {
+    const { files } = datasetDef;
+    const newFiles = files.map((fileDef) => {
+      const { fileType, options } = fileDef;
+      if (fileType === "spatialdata.zarr" || fileType === "spatialdata.zarr.zip") {
+        if (options.labels && options.shapes) {
+          throw new Error("Cannot upgrade both labels and shapes at the same time. For now, a workaround is to include two separate spatialdata.zarr file definitions, one for labels and one for shapes.");
+        }
+        if (options.labels) {
+          const newOptions = {
+            ...options,
+            obsSegmentations: options.labels
+          };
+          delete newOptions.labels;
+          return {
+            ...fileDef,
+            options: newOptions
+          };
+        }
+        if (options.shapes) {
+          const newOptions = {
+            ...options,
+            obsSegmentations: options.shapes
+          };
+          delete newOptions.shapes;
+          return {
+            ...fileDef,
+            options: newOptions
+          };
+        }
+      }
+      return fileDef;
+    });
+    return {
+      ...datasetDef,
+      files: newFiles
+    };
+  });
+  return {
+    ...newConfig,
+    datasets: newDatasets,
+    version: "1.0.18"
+  };
+}
+const latestConfigSchema = configSchema1_0_18;
 const SCHEMA_HANDLERS = [
   [configSchema0_1_0, upgradeFrom0_1_0],
   [configSchema1_0_0, upgradeFrom1_0_0],
@@ -7537,7 +7587,8 @@ const SCHEMA_HANDLERS = [
   [configSchema1_0_13, upgradeFrom1_0_13],
   [configSchema1_0_14, upgradeFrom1_0_14],
   [configSchema1_0_15, upgradeFrom1_0_15],
-  [configSchema1_0_16, upgradeFrom1_0_16]
+  [configSchema1_0_16, upgradeFrom1_0_16],
+  [configSchema1_0_17, upgradeFrom1_0_17]
 ];
 var re = { exports: {} };
 var constants$1;
@@ -9569,9 +9620,7 @@ const FileType$1 = {
   OBS_SETS_SPATIALDATA_ZARR: "obsSets.spatialdata.zarr",
   OBS_SPOTS_SPATIALDATA_ZARR: "obsSpots.spatialdata.zarr",
   FEATURE_LABELS_SPATIALDATA_ZARR: "featureLabels.spatialdata.zarr",
-  // TODO:
-  // OBS_POINTS_SPATIALDATA_ZARR: 'obsPoints.spatialdata.zarr',
-  // OBS_LOCATIONS_SPATIALDATA_ZARR: 'obsLocations.spatialdata.zarr',
+  OBS_POINTS_SPATIALDATA_ZARR: "obsPoints.spatialdata.zarr",
   // SpatialData - zipped
   IMAGE_SPATIALDATA_ZARR_ZIP: "image.spatialdata.zarr.zip",
   LABELS_SPATIALDATA_ZARR_ZIP: "labels.spatialdata.zarr.zip",
@@ -9580,6 +9629,7 @@ const FileType$1 = {
   OBS_SETS_SPATIALDATA_ZARR_ZIP: "obsSets.spatialdata.zarr.zip",
   OBS_SPOTS_SPATIALDATA_ZARR_ZIP: "obsSpots.spatialdata.zarr.zip",
   FEATURE_LABELS_SPATIALDATA_ZARR_ZIP: "featureLabels.spatialdata.zarr.zip",
+  OBS_POINTS_SPATIALDATA_ZARR_ZIP: "obsPoints.spatialdata.zarr.zip",
   // MuData
   OBS_FEATURE_MATRIX_MUDATA_ZARR: "obsFeatureMatrix.mudata.zarr",
   OBS_SETS_MUDATA_ZARR: "obsSets.mudata.zarr",
@@ -9829,6 +9879,7 @@ const ViewHelpMapping = {
   [FileType$1.OBS_FEATURE_MATRIX_SPATIALDATA_ZARR]: DataType$2.OBS_FEATURE_MATRIX,
   [FileType$1.OBS_SETS_SPATIALDATA_ZARR]: DataType$2.OBS_SETS,
   [FileType$1.FEATURE_LABELS_SPATIALDATA_ZARR]: DataType$2.FEATURE_LABELS,
+  [FileType$1.OBS_POINTS_SPATIALDATA_ZARR]: DataType$2.OBS_POINTS,
   // For new file types to support old file types
   [FileType$1.OBS_EMBEDDING_CELLS_JSON]: DataType$2.OBS_EMBEDDING,
   [FileType$1.OBS_LOCATIONS_CELLS_JSON]: DataType$2.OBS_LOCATIONS,
@@ -10002,6 +10053,9 @@ const ViewHelpMapping = {
   },
   [FileType$1.FEATURE_LABELS_SPATIALDATA_ZARR]: {
     zip: FileType$1.FEATURE_LABELS_SPATIALDATA_ZARR_ZIP
+  },
+  [FileType$1.OBS_POINTS_SPATIALDATA_ZARR]: {
+    zip: FileType$1.OBS_POINTS_SPATIALDATA_ZARR_ZIP
   }
 });
 [
@@ -11021,10 +11075,14 @@ const imageSpatialdataSchema = z.object({
   coordinateSystem: z.string().optional().describe('The name of a coordinate transformation output used to transform the image. If not provided, the "global" coordinate system is assumed.')
 });
 const obsSegmentationsSpatialdataSchema = z.object({
-  // TODO: should this be renamed labelsSpatialdataSchema?
-  // TODO: support obsTypesFromChannelNames?
-  path: z.string(),
-  tablePath: z.string().optional().describe("The path to a table which annotates the labels. If available but not specified, the spot identifiers may not be aligned with associated tabular data as expected."),
+  // TODO: support obsTypesFromElementNames?
+  path: z.string().describe("The path to the segmentation data, stored in either shapes/ or labels/."),
+  tablePath: z.string().optional().describe("The path to a table which annotates the labels or shapes. If available but not specified, the spot identifiers may not be aligned with associated tabular data as expected."),
+  coordinateSystem: z.string().optional().describe('The name of a coordinate transformation output used to transform the image. If not provided, the "global" coordinate system is assumed.')
+});
+const obsPointsSpatialdataSchema = z.object({
+  path: z.string().describe("The path to the point data."),
+  tablePath: z.string().optional().describe("The path to a table which annotates the points. If available but not specified, the spot identifiers may not be aligned with associated tabular data as expected."),
   coordinateSystem: z.string().optional().describe('The name of a coordinate transformation output used to transform the image. If not provided, the "global" coordinate system is assumed.')
 });
 z.object({
@@ -11144,13 +11202,10 @@ z.object({
   image: imageSpatialdataSchema,
   // TODO: should this be a special schema
   // to allow specifying fileUid (like for embeddingType)?
-  // TODO: allow multiple labels?
-  labels: obsSegmentationsSpatialdataSchema,
+  // TODO: allow multiple labels/shapes?
+  obsSegmentations: obsSegmentationsSpatialdataSchema,
+  obsPoints: obsPointsSpatialdataSchema,
   // TODO: allow multiple shapes?
-  // TODO: unify labels and shapes to obsSegmentations,
-  // then distinguish in expand function based on
-  // "labels/*" vs. "shapes/*" in path?
-  shapes: obsSegmentationsSpatialdataSchema,
   obsFeatureMatrix: obsFeatureMatrixSpatialdataSchema,
   obsSpots: obsSpotsSpatialdataSchema,
   // TODO: obsPoints
@@ -123051,22 +123106,22 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-DtEUssqa.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-DxtPY-6B.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-Cumc1mfn.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-D_qPkuE6.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-BIWhN5Z_.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-0khwfeEa.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-BwpCwQeA.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-CopckebW.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-CfBCa-sD.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-Dhz_WVRw.js").then((m2) => m2.default));
 addDecoder(
   34887,
-  () => import("./lerc-F_eWR4uk.js").then(async (m2) => {
+  () => import("./lerc-DEsPnFq8.js").then(async (m2) => {
     await m2.zstd.init();
     return m2;
   }).then((m2) => m2.default)
 );
-addDecoder(50001, () => import("./webimage-DTHl4ms3.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-yuc72XBP.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset2 = 0;
@@ -145723,6 +145778,23 @@ ButtonBase.propTypes = {
    */
   type: PropTypes.oneOfType([PropTypes.oneOf(["button", "reset", "submit"]), PropTypes.string])
 };
+function hasCorrectMainProperty(obj) {
+  return typeof obj.main === "string";
+}
+function checkSimplePaletteColorValues(obj, additionalPropertiesToCheck = []) {
+  if (!hasCorrectMainProperty(obj)) {
+    return false;
+  }
+  for (const value of additionalPropertiesToCheck) {
+    if (!obj.hasOwnProperty(value) || typeof obj[value] !== "string") {
+      return false;
+    }
+  }
+  return true;
+}
+function createSimplePaletteValueFilter(additionalPropertiesToCheck = []) {
+  return ([, value]) => value && checkSimplePaletteColorValues(value, additionalPropertiesToCheck);
+}
 function HTMLElementType(props, propName, componentName, location, propFullName) {
   const propValue = props[propName];
   const safePropName = propFullName || propName;
@@ -145830,23 +145902,6 @@ Portal.propTypes = {
 {
   Portal["propTypes"] = exactProp(Portal.propTypes);
 }
-function hasCorrectMainProperty(obj) {
-  return typeof obj.main === "string";
-}
-function checkSimplePaletteColorValues(obj, additionalPropertiesToCheck = []) {
-  if (!hasCorrectMainProperty(obj)) {
-    return false;
-  }
-  for (const value of additionalPropertiesToCheck) {
-    if (!obj.hasOwnProperty(value) || typeof obj[value] !== "string") {
-      return false;
-    }
-  }
-  return true;
-}
-function createSimplePaletteValueFilter(additionalPropertiesToCheck = []) {
-  return ([, value]) => value && checkSimplePaletteColorValues(value, additionalPropertiesToCheck);
-}
 function getStyleValue(value) {
   return parseInt(value, 10) || 0;
 }
@@ -159388,7 +159443,7 @@ function GatingSubscriber(props) {
   }, [titleOverride, gatingFeatureSelectionX, gatingFeatureSelectionY]);
   const featureSelectionX = useMemo(() => gatingFeatureSelectionX ? [gatingFeatureSelectionX] : null, [gatingFeatureSelectionX]);
   const featureSelectionY = useMemo(() => gatingFeatureSelectionY ? [gatingFeatureSelectionY] : null, [gatingFeatureSelectionY]);
-  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(
+  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls, obsSetsError] = useObsSetsData(
     loaders,
     dataset,
     false,
@@ -159396,21 +159451,39 @@ function GatingSubscriber(props) {
     { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor },
     { obsType }
   );
-  const [expressionDataColor, loadedColor, featureSelectionColorStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionDataColor,
+    loadedColor,
+    featureSelectionColorStatus,
+    featureSelectionColorErrors
+  ] = useFeatureSelection(
     loaders,
     dataset,
     false,
     gatingFeatureSelectionColor,
     { obsType, featureType, featureValueType }
   );
-  const [expressionDataX, loadedX, featureSelectionXStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionDataX,
+    loadedX,
+    featureSelectionXStatus,
+    featureSelectionXErrors
+  ] = useFeatureSelection(
     loaders,
     dataset,
     false,
     featureSelectionX,
     { obsType, featureType, featureValueType }
   );
-  const [expressionDataY, loadedY, featureSelectionYStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionDataY,
+    loadedY,
+    featureSelectionYStatus,
+    featureSelectionYErrors
+  ] = useFeatureSelection(
     loaders,
     dataset,
     false,
@@ -159420,13 +159493,21 @@ function GatingSubscriber(props) {
   const [
     { obsIndex, featureIndex },
     matrixIndicesStatus,
-    matrixIndicesUrls
+    matrixIndicesUrls,
+    matrixIndicesError
   ] = useObsFeatureMatrixIndices(
     loaders,
     dataset,
     false,
     { obsType, featureType, featureValueType }
   );
+  const errors = [
+    obsSetsError,
+    ...featureSelectionColorErrors,
+    ...featureSelectionXErrors,
+    ...featureSelectionYErrors,
+    matrixIndicesError
+  ];
   const cellsCount = (obsIndex == null ? void 0 : obsIndex.length) || 0;
   const isReady = useReady([
     obsSetsStatus,
@@ -159636,6 +159717,7 @@ function GatingSubscriber(props) {
       theme,
       isReady,
       helpText,
+      errors,
       options: /* @__PURE__ */ React__default.createElement(
         ScatterplotOptions,
         {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { G } from "./index-Ceq7OIVC.js";
+import { G } from "./index-W40dIkpk.js";
 export {
   G as GatingSubscriber
 };

package/dist/{jpeg-BIWhN5Z_.js → jpeg-CopckebW.js}

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

package/dist/{lerc-F_eWR4uk.js → lerc-DEsPnFq8.js}

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

package/dist/{lzw-DxtPY-6B.js → lzw-D_qPkuE6.js}

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

package/dist/{packbits-BwpCwQeA.js → packbits-Dhz_WVRw.js}

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

package/dist/{raw-DtEUssqa.js → raw-Cumc1mfn.js}

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

package/dist/{webimage-DTHl4ms3.js → webimage-yuc72XBP.js}

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

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

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

package/dist-tsc/GatingSubscriber.js

@@ -43,14 +43,25 @@ 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, obsSetsUrls] = useObsSetsData(loaders, dataset, false, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor }, { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor }, { obsType });
+    const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls, obsSetsError] = useObsSetsData(loaders, dataset, false, { setObsSetSelection: setCellSetSelection, setObsSetColor: setCellSetColor }, { obsSetSelection: cellSetSelection, obsSetColor: cellSetColor }, { obsType });
+    const [
     // eslint-disable-next-line no-unused-vars
-    const [expressionDataColor, loadedColor, featureSelectionColorStatus] = useFeatureSelection(loaders, dataset, false, gatingFeatureSelectionColor, { obsType, featureType, featureValueType });
+    expressionDataColor, loadedColor, featureSelectionColorStatus, featureSelectionColorErrors,] = useFeatureSelection(loaders, dataset, false, gatingFeatureSelectionColor, { obsType, featureType, featureValueType });
+    const [
     // eslint-disable-next-line no-unused-vars
-    const [expressionDataX, loadedX, featureSelectionXStatus] = useFeatureSelection(loaders, dataset, false, featureSelectionX, { obsType, featureType, featureValueType });
+    expressionDataX, loadedX, featureSelectionXStatus, featureSelectionXErrors,] = useFeatureSelection(loaders, dataset, false, featureSelectionX, { obsType, featureType, featureValueType });
+    const [
     // eslint-disable-next-line no-unused-vars
-    const [expressionDataY, loadedY, featureSelectionYStatus] = useFeatureSelection(loaders, dataset, false, featureSelectionY, { obsType, featureType, featureValueType });
-    const [{ obsIndex, featureIndex }, matrixIndicesStatus, matrixIndicesUrls,] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
+    expressionDataY, loadedY, featureSelectionYStatus, featureSelectionYErrors,] = useFeatureSelection(loaders, dataset, false, featureSelectionY, { obsType, featureType, featureValueType });
+    const [{ obsIndex, featureIndex }, matrixIndicesStatus, matrixIndicesUrls, matrixIndicesError,] = useObsFeatureMatrixIndices(loaders, dataset, false, { obsType, featureType, featureValueType });
+    // Consolidate error values from data hooks.
+    const errors = [
+        obsSetsError,
+        ...featureSelectionColorErrors,
+        ...featureSelectionXErrors,
+        ...featureSelectionYErrors,
+        matrixIndicesError,
+    ];
     const cellsCount = obsIndex?.length || 0;
     const isReady = useReady([
         obsSetsStatus,
@@ -192,7 +203,7 @@ export function GatingSubscriber(props) {
     }, [obsXY, obsIndex, featureValueTransform,
         gatingFeatureSelectionX, gatingFeatureSelectionY, obsType,
     ]);
-    return (_jsxs(TitleInfo, { title: title, info: `${commaNumber(cellsCount)} ${plur(obsType, cellsCount)}`, closeButtonVisible: closeButtonVisible, downloadButtonVisible: downloadButtonVisible, removeGridComponent: removeGridComponent, urls: urls, theme: theme, isReady: isReady, helpText: helpText, options: (_jsx(ScatterplotOptions, { observationsLabel: obsType, cellRadius: cellRadiusFixed, setCellRadius: setCellRadiusFixed, cellRadiusMode: cellRadiusMode, setCellRadiusMode: setCellRadiusMode, cellOpacity: cellOpacityFixed, setCellOpacity: setCellOpacityFixed, cellOpacityMode: cellOpacityMode, setCellOpacityMode: setCellOpacityMode, cellSetLabelsVisible: cellSetLabelsVisible, setCellSetLabelsVisible: setCellSetLabelsVisible, cellSetLabelSize: cellSetLabelSize, setCellSetLabelSize: setCellSetLabelSize, cellSetPolygonsVisible: cellSetPolygonsVisible, setCellSetPolygonsVisible: setCellSetPolygonsVisible, cellColorEncoding: cellColorEncoding, setCellColorEncoding: setCellColorEncoding, geneExpressionColormap: geneExpressionColormap, setGeneExpressionColormap: setGeneExpressionColormap, geneExpressionColormapRange: geneExpressionColormapRange, setGeneExpressionColormapRange: setGeneExpressionColormapRange, children: _jsx(GatingScatterplotOptions, { featureType: featureType, gatingFeatureSelectionX: gatingFeatureSelectionX, setGatingFeatureSelectionX: setGatingFeatureSelectionX, gatingFeatureSelectionY: gatingFeatureSelectionY, setGatingFeatureSelectionY: setGatingFeatureSelectionY, gatingFeatureValueTransform: featureValueTransform, setGatingFeatureValueTransform: (newValue) => {
+    return (_jsxs(TitleInfo, { title: title, info: `${commaNumber(cellsCount)} ${plur(obsType, cellsCount)}`, closeButtonVisible: closeButtonVisible, downloadButtonVisible: downloadButtonVisible, removeGridComponent: removeGridComponent, urls: urls, theme: theme, isReady: isReady, helpText: helpText, errors: errors, options: (_jsx(ScatterplotOptions, { observationsLabel: obsType, cellRadius: cellRadiusFixed, setCellRadius: setCellRadiusFixed, cellRadiusMode: cellRadiusMode, setCellRadiusMode: setCellRadiusMode, cellOpacity: cellOpacityFixed, setCellOpacity: setCellOpacityFixed, cellOpacityMode: cellOpacityMode, setCellOpacityMode: setCellOpacityMode, cellSetLabelsVisible: cellSetLabelsVisible, setCellSetLabelsVisible: setCellSetLabelsVisible, cellSetLabelSize: cellSetLabelSize, setCellSetLabelSize: setCellSetLabelSize, cellSetPolygonsVisible: cellSetPolygonsVisible, setCellSetPolygonsVisible: setCellSetPolygonsVisible, cellColorEncoding: cellColorEncoding, setCellColorEncoding: setCellColorEncoding, geneExpressionColormap: geneExpressionColormap, setGeneExpressionColormap: setGeneExpressionColormap, geneExpressionColormapRange: geneExpressionColormapRange, setGeneExpressionColormapRange: setGeneExpressionColormapRange, children: _jsx(GatingScatterplotOptions, { featureType: featureType, gatingFeatureSelectionX: gatingFeatureSelectionX, setGatingFeatureSelectionX: setGatingFeatureSelectionX, gatingFeatureSelectionY: gatingFeatureSelectionY, setGatingFeatureSelectionY: setGatingFeatureSelectionY, gatingFeatureValueTransform: featureValueTransform, setGatingFeatureValueTransform: (newValue) => {
                     setFeatureValueTransform(newValue);
                     setTargetX(null);
                     setTargetY(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-gating",
-  "version": "3.6.6",
+  "version": "3.6.8",
   "author": "HIDIVE Lab at HMS",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -19,12 +19,12 @@
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
     "react-aria": "^3.28.0",
-    "@vitessce/styles": "3.6.6",
-    "@vitessce/constants-internal": "3.6.6",
-    "@vitessce/scatterplot": "3.6.6",
-    "@vitessce/sets-utils": "3.6.6",
-    "@vitessce/utils": "3.6.6",
-    "@vitessce/vit-s": "3.6.6"
+    "@vitessce/styles": "3.6.8",
+    "@vitessce/constants-internal": "3.6.8",
+    "@vitessce/scatterplot": "3.6.8",
+    "@vitessce/sets-utils": "3.6.8",
+    "@vitessce/utils": "3.6.8",
+    "@vitessce/vit-s": "3.6.8"
   },
   "devDependencies": {
     "react": "^18.0.0",

package/src/GatingSubscriber.js

@@ -144,33 +144,51 @@ export function GatingSubscriber(props) {
   ), [gatingFeatureSelectionY]);
 
   // Get data from loaders using the data hooks.
-  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls] = useObsSetsData(
+  const [{ obsSets: cellSets }, obsSetsStatus, obsSetsUrls, obsSetsError] = 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(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionDataColor, loadedColor, featureSelectionColorStatus, featureSelectionColorErrors,
+  ] = useFeatureSelection(
     loaders, dataset, false, gatingFeatureSelectionColor,
     { obsType, featureType, featureValueType },
   );
-  // eslint-disable-next-line no-unused-vars
-  const [expressionDataX, loadedX, featureSelectionXStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionDataX, loadedX, featureSelectionXStatus, featureSelectionXErrors,
+  ] = useFeatureSelection(
     loaders, dataset, false, featureSelectionX,
     { obsType, featureType, featureValueType },
   );
-  // eslint-disable-next-line no-unused-vars
-  const [expressionDataY, loadedY, featureSelectionYStatus] = useFeatureSelection(
+  const [
+    // eslint-disable-next-line no-unused-vars
+    expressionDataY, loadedY, featureSelectionYStatus, featureSelectionYErrors,
+  ] = useFeatureSelection(
     loaders, dataset, false, featureSelectionY,
     { obsType, featureType, featureValueType },
   );
   const [
     { obsIndex, featureIndex }, matrixIndicesStatus, matrixIndicesUrls,
+    matrixIndicesError,
   ] = useObsFeatureMatrixIndices(
     loaders, dataset, false,
     { obsType, featureType, featureValueType },
   );
+
+  // Consolidate error values from data hooks.
+  const errors = [
+    obsSetsError,
+    ...featureSelectionColorErrors,
+    ...featureSelectionXErrors,
+    ...featureSelectionYErrors,
+    matrixIndicesError,
+  ];
+
+
   const cellsCount = obsIndex?.length || 0;
 
   const isReady = useReady([
@@ -363,6 +381,7 @@ export function GatingSubscriber(props) {
       theme={theme}
       isReady={isReady}
       helpText={helpText}
+      errors={errors}
       options={(
         <ScatterplotOptions
           observationsLabel={obsType}