@vitessce/vit-s 3.3.5 → 3.3.7

package/dist/index.js

@@ -27788,11 +27788,14 @@ const DataType$1 = {
   GENOMIC_PROFILES: "genomic-profiles",
   OBS_SPOTS: "obsSpots",
   OBS_POINTS: "obsPoints",
-  OBS_LOCATIONS: "obsLocations"
+  OBS_LOCATIONS: "obsLocations",
+  SAMPLE_SETS: "sampleSets",
+  SAMPLE_EDGES: "sampleEdges"
 };
 const FileType$1 = {
   // Joint file types
   ANNDATA_ZARR: "anndata.zarr",
+  ANNDATA_ZARR_ZIP: "anndata.zarr.zip",
   SPATIALDATA_ZARR: "spatialdata.zarr",
   // Atomic file types
   OBS_EMBEDDING_CSV: "obsEmbedding.csv",
@@ -27805,6 +27808,7 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_JSON: "obsSegmentations.json",
   OBS_SETS_CSV: "obsSets.csv",
   OBS_SETS_JSON: "obsSets.json",
+  SAMPLE_SETS_CSV: "sampleSets.csv",
   // OME-Zarr
   IMAGE_OME_ZARR: "image.ome-zarr",
   OBS_SEGMENTATIONS_OME_ZARR: "obsSegmentations.ome-zarr",
@@ -27819,6 +27823,19 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_ANNDATA_ZARR: "obsSegmentations.anndata.zarr",
   OBS_LABELS_ANNDATA_ZARR: "obsLabels.anndata.zarr",
   FEATURE_LABELS_ANNDATA_ZARR: "featureLabels.anndata.zarr",
+  SAMPLE_EDGES_ANNDATA_ZARR: "sampleEdges.anndata.zarr",
+  // AnnData - zipped
+  OBS_FEATURE_MATRIX_ANNDATA_ZARR_ZIP: "obsFeatureMatrix.anndata.zarr.zip",
+  OBS_FEATURE_COLUMNS_ANNDATA_ZARR_ZIP: "obsFeatureColumns.anndata.zarr.zip",
+  OBS_SETS_ANNDATA_ZARR_ZIP: "obsSets.anndata.zarr.zip",
+  OBS_EMBEDDING_ANNDATA_ZARR_ZIP: "obsEmbedding.anndata.zarr.zip",
+  OBS_SPOTS_ANNDATA_ZARR_ZIP: "obsSpots.anndata.zarr.zip",
+  OBS_POINTS_ANNDATA_ZARR_ZIP: "obsPoints.anndata.zarr.zip",
+  OBS_LOCATIONS_ANNDATA_ZARR_ZIP: "obsLocations.anndata.zarr.zip",
+  OBS_SEGMENTATIONS_ANNDATA_ZARR_ZIP: "obsSegmentations.anndata.zarr.zip",
+  OBS_LABELS_ANNDATA_ZARR_ZIP: "obsLabels.anndata.zarr.zip",
+  FEATURE_LABELS_ANNDATA_ZARR_ZIP: "featureLabels.anndata.zarr.zip",
+  SAMPLE_EDGES_ANNDATA_ZARR_ZIP: "sampleEdges.anndata.zarr.zip",
   // SpatialData
   IMAGE_SPATIALDATA_ZARR: "image.spatialdata.zarr",
   LABELS_SPATIALDATA_ZARR: "labels.spatialdata.zarr",
@@ -27826,6 +27843,7 @@ const FileType$1 = {
   OBS_FEATURE_MATRIX_SPATIALDATA_ZARR: "obsFeatureMatrix.spatialdata.zarr",
   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',
@@ -27982,7 +28000,10 @@ const CoordinationType$1 = {
   LEGEND_VISIBLE: "legendVisible",
   SPATIAL_CHANNEL_LABELS_VISIBLE: "spatialChannelLabelsVisible",
   SPATIAL_CHANNEL_LABELS_ORIENTATION: "spatialChannelLabelsOrientation",
-  SPATIAL_CHANNEL_LABEL_SIZE: "spatialChannelLabelSize"
+  SPATIAL_CHANNEL_LABEL_SIZE: "spatialChannelLabelSize",
+  // Multi-sample / comparative
+  SAMPLE_TYPE: "sampleType",
+  SAMPLE_SET_SELECTION: "sampleSetSelection"
 };
 const STATUS = {
   LOADING: "loading",
@@ -28026,7 +28047,14 @@ const DATA_TYPE_COORDINATION_VALUE_USAGE = {
   [DataType$1.IMAGE]: [
     CoordinationType$1.FILE_UID
   ],
-  [DataType$1.NEIGHBORHOODS]: []
+  [DataType$1.NEIGHBORHOODS]: [],
+  [DataType$1.SAMPLE_SETS]: [
+    CoordinationType$1.SAMPLE_TYPE
+  ],
+  [DataType$1.SAMPLE_EDGES]: [
+    CoordinationType$1.OBS_TYPE,
+    CoordinationType$1.SAMPLE_TYPE
+  ]
 };
 const AUTO_INDEPENDENT_COORDINATION_TYPES = [
   CoordinationType$1.HEATMAP_ZOOM_X,
@@ -28044,10 +28072,10 @@ const AUTO_INDEPENDENT_COORDINATION_TYPES = [
   CoordinationType$1.EMBEDDING_OBS_OPACITY
 ];
 const note = "This file is autogenerated by .changeset/post-changelog.mjs.";
-const version = "3.3.5";
-const date = "2024-02-21";
+const version = "3.3.7";
+const date = "2024-03-04";
 const branch = "changeset-release/main";
-const hash = "effc2322";
+const hash = "c82b4395";
 const META_VERSION = {
   note,
   version,
@@ -28481,6 +28509,17 @@ z.object({
     scoreColumn: z.string().optional()
   }))
 });
+z.object({
+  sampleIndex: z.string(),
+  sampleSets: z.array(z.object({
+    name: z.string(),
+    column: z.union([
+      z.string(),
+      z.array(z.string())
+    ]),
+    scoreColumn: z.string().optional()
+  }))
+});
 z.object({
   obsLabels: z.union([
     annDataObsLabels,
@@ -36754,6 +36793,7 @@ function createLoaders(datasets, configDescription, fileTypes, coordinationTypes
       if (!dataSources.has(dataSourceKey)) {
         dataSources.set(dataSourceKey, new DataSourceClass({
           url,
+          fileType,
           requestInit: requestInit2,
           // Optionally, pass a Zarrita store to the data source,
           // if one was mapped to this URL.
@@ -37729,6 +37769,7 @@ function VitS(props) {
     validateOnConfigChange = false,
     isBounded = false,
     uid = null,
+    remountOnUidChange = true,
     viewTypes: viewTypesProp,
     fileTypes: fileTypesProp,
     jointFileTypes: jointFileTypesProp,
@@ -37833,34 +37874,41 @@ function VitS(props) {
     }
     return createViewConfigStore(null, null);
   }, [success, configKey]);
-  return success ? /* @__PURE__ */ jsxRuntimeExports.jsx(StylesProvider, { generateClassName: generateClassName2, children: /* @__PURE__ */ jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: /* @__PURE__ */ jsxRuntimeExports.jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsxRuntimeExports.jsx(ViewConfigProvider, { createStore: createViewConfigStoreClosure, children: /* @__PURE__ */ jsxRuntimeExports.jsxs(AuxiliaryProvider, { createStore: createAuxiliaryStore, children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx(
-      VitessceGrid,
-      {
-        success,
-        configKey,
-        viewTypes,
-        fileTypes,
-        coordinationTypes,
-        config: configOrWarning,
-        rowHeight,
-        height: height2,
-        theme,
-        isBounded,
-        stores
-      }
-    ),
-    /* @__PURE__ */ jsxRuntimeExports.jsx(
-      CallbackPublisher,
-      {
-        onWarn,
-        onConfigChange,
-        onLoaderChange,
-        validateOnConfigChange,
-        pluginSpecificConfigSchema
-      }
-    )
-  ] }) }, configKey) }) }) }) : /* @__PURE__ */ jsxRuntimeExports.jsx(StylesProvider, { generateClassName: generateClassName2, children: /* @__PURE__ */ jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: /* @__PURE__ */ jsxRuntimeExports.jsx(Warning, { ...configOrWarning }) }) });
+  return success ? /* @__PURE__ */ jsxRuntimeExports.jsx(StylesProvider, { generateClassName: generateClassName2, children: /* @__PURE__ */ jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: /* @__PURE__ */ jsxRuntimeExports.jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+    ViewConfigProvider,
+    {
+      createStore: createViewConfigStoreClosure,
+      ...remountOnUidChange ? { key: configKey } : {},
+      children: /* @__PURE__ */ jsxRuntimeExports.jsxs(AuxiliaryProvider, { createStore: createAuxiliaryStore, children: [
+        /* @__PURE__ */ jsxRuntimeExports.jsx(
+          VitessceGrid,
+          {
+            success,
+            configKey,
+            viewTypes,
+            fileTypes,
+            coordinationTypes,
+            config: configOrWarning,
+            rowHeight,
+            height: height2,
+            theme,
+            isBounded,
+            stores
+          }
+        ),
+        /* @__PURE__ */ jsxRuntimeExports.jsx(
+          CallbackPublisher,
+          {
+            onWarn,
+            onConfigChange,
+            onLoaderChange,
+            validateOnConfigChange,
+            pluginSpecificConfigSchema
+          }
+        )
+      ] })
+    }
+  ) }) }) }) : /* @__PURE__ */ jsxRuntimeExports.jsx(StylesProvider, { generateClassName: generateClassName2, children: /* @__PURE__ */ jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: /* @__PURE__ */ jsxRuntimeExports.jsx(Warning, { ...configOrWarning }) }) });
 }
 const ArrowDropDownIcon = createSvgIcon(/* @__PURE__ */ React$6.createElement("path", {
   d: "M7 10l5 5 5-5z"
@@ -38458,6 +38506,28 @@ function useObsSetsData(loaders, dataset, isRequired, coordinationSetters, initi
     matchOn
   );
 }
+function useSampleSetsData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
+  return useDataType(
+    DataType$1.SAMPLE_SETS,
+    loaders,
+    dataset,
+    isRequired,
+    coordinationSetters,
+    initialCoordinationValues,
+    matchOn
+  );
+}
+function useSampleEdgesData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
+  return useDataType(
+    DataType$1.SAMPLE_EDGES,
+    loaders,
+    dataset,
+    isRequired,
+    coordinationSetters,
+    initialCoordinationValues,
+    matchOn
+  );
+}
 function useObsFeatureMatrixData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
   return useDataType(
     DataType$1.OBS_FEATURE_MATRIX,
@@ -38733,6 +38803,33 @@ function useSpotMultiObsSets(coordinationScopes, coordinationScopesBy, loaders,
   );
   return [obsSetsData, obsSetsDataStatus, obsSetsUrls];
 }
+function useSpotMultiFeatureLabels(coordinationScopes, coordinationScopesBy, loaders, dataset) {
+  const featureTypeCoordination = useComplexCoordination(
+    [
+      CoordinationType$1.FEATURE_TYPE
+    ],
+    coordinationScopes,
+    coordinationScopesBy,
+    CoordinationType$1.SPOT_LAYER
+  );
+  const matchOnObj = useMemo(
+    () => featureTypeCoordination[0],
+    // imageCoordination reference changes each render,
+    // use coordinationScopes and coordinationScopesBy which are
+    // indirect dependencies here.
+    [coordinationScopes, coordinationScopesBy]
+  );
+  const [featureLabelsData, featureLabelsStatus, featureLabelsUrls] = useDataTypeMulti(
+    DataType$1.FEATURE_LABELS,
+    loaders,
+    dataset,
+    false,
+    {},
+    {},
+    matchOnObj
+  );
+  return [featureLabelsData, featureLabelsStatus, featureLabelsUrls];
+}
 function useMultiObsLabels(coordinationScopes, obsType, loaders, dataset) {
   const obsLabelsTypes = useMultiCoordinationValues(
     CoordinationType$1.OBS_LABELS_TYPE,
@@ -39810,6 +39907,8 @@ export {
   usePointMultiObsLabels,
   useReady,
   useRemoveImageChannelInMetaCoordinationScopes,
+  useSampleEdgesData,
+  useSampleSetsData,
   useSegmentationMultiFeatureSelection,
   useSegmentationMultiObsFeatureMatrixIndices,
   useSegmentationMultiObsLocations,
@@ -39817,6 +39916,7 @@ export {
   useSetComponentHover,
   useSetComponentViewInfo,
   useSetWarning,
+  useSpotMultiFeatureLabels,
   useSpotMultiFeatureSelection,
   useSpotMultiObsFeatureMatrixIndices,
   useSpotMultiObsSets,

package/dist-tsc/VitS.d.ts

@@ -23,6 +23,8 @@
  * @param {null|string} props.uid A unique identifier for this Vitessce instance,
  * for the purpose of avoiding CSS autogenerated class name conflicts. Must be valid as part
  * of a CSS class name string.
+ * @param {boolean} props.remountOnUidChange Whether to remount the coordination provider
+ * upon changes to config.uid. By default, true.
  * @param {array} props.viewTypes Plugin view types.
  * @param {array} props.fileTypes Plugin file types.
  * @param {array} props.jointFileTypes Plugin joint file types.
@@ -41,6 +43,7 @@ export function VitS(props: {
     validateConfig: boolean;
     validateOnConfigChange: boolean;
     uid: null | string;
+    remountOnUidChange: boolean;
     viewTypes: array;
     fileTypes: array;
     jointFileTypes: array;

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

@@ -1 +1 @@
-{"version":3,"file":"VitS.d.ts","sourceRoot":"","sources":["../src/VitS.js"],"names":[],"mappings":"AA8BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH;IA7ByB,MAAM,EAApB,MAAM;IAGkB,SAAS,EAAjC,SAAS,GAAC,MAAM;IACF,MAAM,EAApB,MAAM;IACQ,KAAK,EAAnB,MAAM;IAEU,MAAM;IACN,cAAc;IAEd,cAAc;IAEf,cAAc,EAA7B,OAAO;IAIQ,sBAAsB,EAArC,OAAO;IAGY,GAAG,EAAtB,IAAI,GAAC,MAAM;IAGE,SAAS;IACT,SAAS;IACT,cAAc;IACd,iBAAiB;IACX,OAAO,EAA1B,IAAI,GAAC,MAAM;gBA4LrB"}
+{"version":3,"file":"VitS.d.ts","sourceRoot":"","sources":["../src/VitS.js"],"names":[],"mappings":"AA8BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH;IA/ByB,MAAM,EAApB,MAAM;IAGkB,SAAS,EAAjC,SAAS,GAAC,MAAM;IACF,MAAM,EAApB,MAAM;IACQ,KAAK,EAAnB,MAAM;IAEU,MAAM;IACN,cAAc;IAEd,cAAc;IAEf,cAAc,EAA7B,OAAO;IAIQ,sBAAsB,EAArC,OAAO;IAGY,GAAG,EAAtB,IAAI,GAAC,MAAM;IAGI,kBAAkB,EAAjC,OAAO;IAEM,SAAS;IACT,SAAS;IACT,cAAc;IACd,iBAAiB;IACX,OAAO,EAA1B,IAAI,GAAC,MAAM;gBAgMrB"}

package/dist-tsc/VitS.js

@@ -37,6 +37,8 @@ import { createGenerateClassName } from './mui-utils.js';
  * @param {null|string} props.uid A unique identifier for this Vitessce instance,
  * for the purpose of avoiding CSS autogenerated class name conflicts. Must be valid as part
  * of a CSS class name string.
+ * @param {boolean} props.remountOnUidChange Whether to remount the coordination provider
+ * upon changes to config.uid. By default, true.
  * @param {array} props.viewTypes Plugin view types.
  * @param {array} props.fileTypes Plugin file types.
  * @param {array} props.jointFileTypes Plugin joint file types.
@@ -45,7 +47,7 @@ import { createGenerateClassName } from './mui-utils.js';
  * provided by the parent.
  */
 export function VitS(props) {
-    const { config, stores, rowHeight, height, theme, onWarn, onConfigChange, onLoaderChange, validateConfig = true, validateOnConfigChange = false, isBounded = false, uid = null, viewTypes: viewTypesProp, fileTypes: fileTypesProp, jointFileTypes: jointFileTypesProp, coordinationTypes: coordinationTypesProp, warning, } = props;
+    const { config, stores, rowHeight, height, theme, onWarn, onConfigChange, onLoaderChange, validateConfig = true, validateOnConfigChange = false, isBounded = false, uid = null, remountOnUidChange = true, viewTypes: viewTypesProp, fileTypes: fileTypesProp, jointFileTypes: jointFileTypesProp, coordinationTypes: coordinationTypesProp, warning, } = props;
     const viewTypes = useMemo(() => (viewTypesProp || []), [viewTypesProp]);
     const fileTypes = useMemo(() => (fileTypesProp || []), [fileTypesProp]);
     const jointFileTypes = useMemo(() => (jointFileTypesProp || []), [jointFileTypesProp]);
@@ -142,5 +144,5 @@ export function VitS(props) {
         return createViewConfigStore(null, null);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [success, configKey]);
-    return success ? (_jsx(StylesProvider, { generateClassName: generateClassName, children: _jsx(ThemeProvider, { theme: muiTheme[theme], children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(ViewConfigProvider, { createStore: createViewConfigStoreClosure, children: _jsxs(AuxiliaryProvider, { createStore: createAuxiliaryStore, children: [_jsx(VitessceGrid, { success: success, configKey: configKey, viewTypes: viewTypes, fileTypes: fileTypes, coordinationTypes: coordinationTypes, config: configOrWarning, rowHeight: rowHeight, height: height, theme: theme, isBounded: isBounded, stores: stores }), _jsx(CallbackPublisher, { onWarn: onWarn, onConfigChange: onConfigChange, onLoaderChange: onLoaderChange, validateOnConfigChange: validateOnConfigChange, pluginSpecificConfigSchema: pluginSpecificConfigSchema })] }) }, configKey) }) }) })) : (_jsx(StylesProvider, { generateClassName: generateClassName, children: _jsx(ThemeProvider, { theme: muiTheme[theme], children: _jsx(Warning, { ...configOrWarning }) }) }));
+    return success ? (_jsx(StylesProvider, { generateClassName: generateClassName, children: _jsx(ThemeProvider, { theme: muiTheme[theme], children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(ViewConfigProvider, { createStore: createViewConfigStoreClosure, ...(remountOnUidChange ? ({ key: configKey }) : {}), children: _jsxs(AuxiliaryProvider, { createStore: createAuxiliaryStore, children: [_jsx(VitessceGrid, { success: success, configKey: configKey, viewTypes: viewTypes, fileTypes: fileTypes, coordinationTypes: coordinationTypes, config: configOrWarning, rowHeight: rowHeight, height: height, theme: theme, isBounded: isBounded, stores: stores }), _jsx(CallbackPublisher, { onWarn: onWarn, onConfigChange: onConfigChange, onLoaderChange: onLoaderChange, validateOnConfigChange: validateOnConfigChange, pluginSpecificConfigSchema: pluginSpecificConfigSchema })] }) }) }) }) })) : (_jsx(StylesProvider, { generateClassName: generateClassName, children: _jsx(ThemeProvider, { theme: muiTheme[theme], children: _jsx(Warning, { ...configOrWarning }) }) }));
 }

package/dist-tsc/data-hooks.d.ts

@@ -36,6 +36,8 @@ export function useObsLocationsData(loaders: any, dataset: any, isRequired: any,
 export function useObsLabelsData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
 export function useObsSegmentationsData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
 export function useObsSetsData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
+export function useSampleSetsData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
+export function useSampleEdgesData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
 export function useObsFeatureMatrixData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
 export function useFeatureLabelsData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
 export function useImageData(loaders: any, dataset: any, isRequired: any, coordinationSetters: any, initialCoordinationValues: any, matchOn: any): array;
@@ -74,6 +76,7 @@ export function useObsFeatureMatrixIndices(loaders: object, dataset: string, isR
 export function useMultiObsPoints(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any, mergeCoordination: any, viewUid: any): any[];
 export function useMultiObsSpots(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any, mergeCoordination: any, viewUid: any): any[];
 export function useSpotMultiObsSets(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
+export function useSpotMultiFeatureLabels(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any): any[];
 export function useMultiObsLabels(coordinationScopes: any, obsType: any, loaders: any, dataset: any): any[];
 export function useMultiObsSegmentations(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any, mergeCoordination: any, viewUid: any): any[];
 export function useMultiImages(coordinationScopes: any, coordinationScopesBy: any, loaders: any, dataset: any, mergeCoordination: any, viewUid: any): any[];

package/dist-tsc/data-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-hooks.d.ts","sourceRoot":"","sources":["../src/data-hooks.js"],"names":[],"mappings":"AAkBA;;;;;;;;GAQG;AACH,wCAPW,MAAM,WAEN,MAAM,SAsBhB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,6CAhBW,MAAM,WAEN,MAAM,cAEN,OAAO,uBAEP,MAAM,6BAGN,MAAM,uBAgBhB;AAED,4JASC;AAED,6JASC;AAED,gKASC;AAED,6JASC;AAED,oKASC;AAED,2JASC;AAED,oKASC;AAED,iKASC;AAED,yJASC;AAED,mKASC;AAED,iKASC;AAED;;;;;;;;;;;;;GAaG;AACH,6CAVW,MAAM,WAEN,MAAM,cAEN,OAAO,aAEP,OAAO,uBA4EjB;AAED;;;;;;;;;;;;;GAaG;AACH,oDARW,MAAM,WAEN,MAAM,cAEN,OAAO,iBAEL,MAAM,CA2ElB;AAED,+JAuBC;AAED,8JAuBC;AAED,2HAsBC;AAED,4GAmBC;AAED,sKA2BC;AAED,4JAyBC"}
+{"version":3,"file":"data-hooks.d.ts","sourceRoot":"","sources":["../src/data-hooks.js"],"names":[],"mappings":"AAkBA;;;;;;;;GAQG;AACH,wCAPW,MAAM,WAEN,MAAM,SAsBhB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,6CAhBW,MAAM,WAEN,MAAM,cAEN,OAAO,uBAEP,MAAM,6BAGN,MAAM,uBAgBhB;AAED,4JASC;AAED,6JASC;AAED,gKASC;AAED,6JASC;AAED,oKASC;AAED,2JASC;AAED,8JASC;AAED,+JASC;AAED,oKASC;AAED,iKASC;AAED,yJASC;AAED,mKASC;AAED,iKASC;AAED;;;;;;;;;;;;;GAaG;AACH,6CAVW,MAAM,WAEN,MAAM,cAEN,OAAO,aAEP,OAAO,uBA4EjB;AAED;;;;;;;;;;;;;GAaG;AACH,oDARW,MAAM,WAEN,MAAM,cAEN,OAAO,iBAEL,MAAM,CA2ElB;AAED,+JAuBC;AAED,8JAuBC;AAED,2HAsBC;AAGD,iIAsBC;AAGD,4GAmBC;AAED,sKA2BC;AAED,4JAyBC"}

package/dist-tsc/data-hooks.js

@@ -71,6 +71,12 @@ export function useObsSegmentationsData(loaders, dataset, isRequired, coordinati
 export function useObsSetsData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
     return useDataType(DataType.OBS_SETS, loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn);
 }
+export function useSampleSetsData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
+    return useDataType(DataType.SAMPLE_SETS, loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn);
+}
+export function useSampleEdgesData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
+    return useDataType(DataType.SAMPLE_EDGES, loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn);
+}
 export function useObsFeatureMatrixData(loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn) {
     return useDataType(DataType.OBS_FEATURE_MATRIX, loaders, dataset, isRequired, coordinationSetters, initialCoordinationValues, matchOn);
 }
@@ -285,6 +291,18 @@ export function useSpotMultiObsSets(coordinationScopes, coordinationScopesBy, lo
     const [obsSetsData, obsSetsDataStatus, obsSetsUrls] = useDataTypeMulti(DataType.OBS_SETS, loaders, dataset, false, {}, {}, matchOnObj);
     return [obsSetsData, obsSetsDataStatus, obsSetsUrls];
 }
+export function useSpotMultiFeatureLabels(coordinationScopes, coordinationScopesBy, loaders, dataset) {
+    const featureTypeCoordination = useComplexCoordination([
+        CoordinationType.FEATURE_TYPE,
+    ], coordinationScopes, coordinationScopesBy, CoordinationType.SPOT_LAYER);
+    const matchOnObj = useMemo(() => featureTypeCoordination[0], 
+    // imageCoordination reference changes each render,
+    // use coordinationScopes and coordinationScopesBy which are
+    // indirect dependencies here.
+    [coordinationScopes, coordinationScopesBy]);
+    const [featureLabelsData, featureLabelsStatus, featureLabelsUrls] = useDataTypeMulti(DataType.FEATURE_LABELS, loaders, dataset, false, {}, {}, matchOnObj);
+    return [featureLabelsData, featureLabelsStatus, featureLabelsUrls];
+}
 export function useMultiObsLabels(coordinationScopes, obsType, loaders, dataset) {
     const obsLabelsTypes = useMultiCoordinationValues(CoordinationType.OBS_LABELS_TYPE, coordinationScopes);
     const obsLabelsMatchOnObj = useMemo(() => Object.fromEntries(Object.entries(obsLabelsTypes).map(([scope, obsLabelsType]) => ([

package/dist-tsc/index.d.ts

@@ -5,7 +5,7 @@ export { useHasLoader } from "./data-hook-utils.js";
 export { logConfig } from "./view-config-utils.js";
 export { useReady, useUrls, useVitessceContainer, useDeckCanvasSize, useUint8ObsFeatureMatrix, useUint8FeatureSelection, useExpressionValueGetter, useGetObsMembership, useGetObsInfo, useClosestVitessceContainerSize, useWindowDimensions, useGridItemSize } from "./hooks.js";
 export { useCoordinationScopes, useCoordinationScopesBy, useInitialCoordination, useCoordination, useComplexCoordination, useComplexCoordinationSecondary, useMultiCoordinationScopes, useMultiCoordinationScopesNonNull, useMultiCoordinationScopesSecondary, useMultiCoordinationScopesSecondaryNonNull, useMultiCoordinationValues, useMultiDatasetCoordination, useDatasetUids, useLoaders, useMergeCoordination, useMatchingLoader, useViewConfigStore, useViewConfigStoreApi, useComponentHover, useSetComponentHover, useComponentViewInfo, useSetComponentViewInfo, useWarning, useSetWarning, useAuxiliaryCoordination, useComponentLayout, useRemoveImageChannelInMetaCoordinationScopes, useAddImageChannelInMetaCoordinationScopes } from "./state/hooks.js";
-export { useDescription, useImageData, useObsSetsData, useObsEmbeddingData, useFeatureSelection, useObsFeatureMatrixIndices, useMultiObsLabels, useMultiObsSpots, useMultiObsPoints, useSpotMultiObsSets, useMultiObsSegmentations, useMultiImages, useObsSpotsData, useObsPointsData, useObsLocationsData, useObsSegmentationsData, useNeighborhoodsData, useObsLabelsData, useObsFeatureMatrixData, useFeatureLabelsData, useGenomicProfilesData } from "./data-hooks.js";
+export { useDescription, useImageData, useObsSetsData, useObsEmbeddingData, useFeatureSelection, useObsFeatureMatrixIndices, useSampleSetsData, useSampleEdgesData, useMultiObsLabels, useMultiObsSpots, useMultiObsPoints, useSpotMultiObsSets, useSpotMultiFeatureLabels, useMultiObsSegmentations, useMultiImages, useObsSpotsData, useObsPointsData, useObsLocationsData, useObsSegmentationsData, useNeighborhoodsData, useObsLabelsData, useObsFeatureMatrixData, useFeatureLabelsData, useGenomicProfilesData } from "./data-hooks.js";
 export { usePointMultiObsLabels, useSpotMultiFeatureSelection, useSpotMultiObsFeatureMatrixIndices, useSegmentationMultiFeatureSelection, useSegmentationMultiObsFeatureMatrixIndices, useSegmentationMultiObsLocations, useSegmentationMultiObsSets } from "./data-hooks-multilevel.js";
 export { AbstractLoader, AbstractTwoStepLoader, LoaderResult } from "./data/index.js";
 export { AbstractLoaderError, DatasetNotFoundError, LoaderNotFoundError, LoaderValidationError, DataSourceFetchError } from "./errors/index.js";

package/dist-tsc/index.js

@@ -4,7 +4,7 @@ export { PopperMenu } from './shared-mui/components.js';
 // For plugin view types:
 export { useReady, useUrls, useVitessceContainer, useDeckCanvasSize, useUint8ObsFeatureMatrix, useUint8FeatureSelection, useExpressionValueGetter, useGetObsMembership, useGetObsInfo, useClosestVitessceContainerSize, useWindowDimensions, useGridItemSize, } from './hooks.js';
 export { useCoordinationScopes, useCoordinationScopesBy, useInitialCoordination, useCoordination, useComplexCoordination, useComplexCoordinationSecondary, useMultiCoordinationScopes, useMultiCoordinationScopesNonNull, useMultiCoordinationScopesSecondary, useMultiCoordinationScopesSecondaryNonNull, useMultiCoordinationValues, useMultiDatasetCoordination, useDatasetUids, useLoaders, useMergeCoordination, useMatchingLoader, useViewConfigStore, useViewConfigStoreApi, useComponentHover, useSetComponentHover, useComponentViewInfo, useSetComponentViewInfo, useWarning, useSetWarning, useAuxiliaryCoordination, useComponentLayout, useRemoveImageChannelInMetaCoordinationScopes, useAddImageChannelInMetaCoordinationScopes, } from './state/hooks.js';
-export { useDescription, useImageData, useObsSetsData, useObsEmbeddingData, useFeatureSelection, useObsFeatureMatrixIndices, useMultiObsLabels, useMultiObsSpots, useMultiObsPoints, useSpotMultiObsSets, useMultiObsSegmentations, useMultiImages, useObsSpotsData, useObsPointsData, useObsLocationsData, useObsSegmentationsData, useNeighborhoodsData, useObsLabelsData, useObsFeatureMatrixData, useFeatureLabelsData, useGenomicProfilesData, } from './data-hooks.js';
+export { useDescription, useImageData, useObsSetsData, useObsEmbeddingData, useFeatureSelection, useObsFeatureMatrixIndices, useSampleSetsData, useSampleEdgesData, useMultiObsLabels, useMultiObsSpots, useMultiObsPoints, useSpotMultiObsSets, useSpotMultiFeatureLabels, useMultiObsSegmentations, useMultiImages, useObsSpotsData, useObsPointsData, useObsLocationsData, useObsSegmentationsData, useNeighborhoodsData, useObsLabelsData, useObsFeatureMatrixData, useFeatureLabelsData, useGenomicProfilesData, } from './data-hooks.js';
 export { usePointMultiObsLabels, useSpotMultiFeatureSelection, useSpotMultiObsFeatureMatrixIndices, useSegmentationMultiFeatureSelection, useSegmentationMultiObsFeatureMatrixIndices, useSegmentationMultiObsLocations, useSegmentationMultiObsSets, } from './data-hooks-multilevel.js';
 export { useHasLoader, } from './data-hook-utils.js';
 export { AbstractLoader, AbstractTwoStepLoader, LoaderResult, } from './data/index.js';

package/dist-tsc/vitessce-grid-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vitessce-grid-utils.d.ts","sourceRoot":"","sources":["../src/vitessce-grid-utils.js"],"names":[],"mappings":"AAyCA,gHA6CC;AA4BD;;;;;;;;;;GAUG;AACH,wCATW,MAAM,EAAE,qBACR,MAAM,aAEN,gBAAgB,qBAChB,wBAAwB,UACxB,MAAM,GACJ,MAAM,CA4DlB"}
+{"version":3,"file":"vitessce-grid-utils.d.ts","sourceRoot":"","sources":["../src/vitessce-grid-utils.js"],"names":[],"mappings":"AAyCA,gHA6CC;AA4BD;;;;;;;;;;GAUG;AACH,wCATW,MAAM,EAAE,qBACR,MAAM,aAEN,gBAAgB,qBAChB,wBAAwB,UACxB,MAAM,GACJ,MAAM,CA6DlB"}

package/dist-tsc/vitessce-grid-utils.js

@@ -130,6 +130,7 @@ export function createLoaders(datasets, configDescription, fileTypes, coordinati
             if (!dataSources.has(dataSourceKey)) {
                 dataSources.set(dataSourceKey, new DataSourceClass({
                     url,
+                    fileType,
                     requestInit,
                     // Optionally, pass a Zarrita store to the data source,
                     // if one was mapped to this URL.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/vit-s",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -29,11 +29,11 @@
     "uuid": "^9.0.0",
     "zustand": "^3.5.10",
     "react-aria": "^3.28.0",
-    "@vitessce/plugins": "3.3.5",
-    "@vitessce/schemas": "3.3.5",
-    "@vitessce/constants-internal": "3.3.5",
-    "@vitessce/utils": "3.3.5",
-    "@vitessce/config": "3.3.5"
+    "@vitessce/constants-internal": "3.3.7",
+    "@vitessce/plugins": "3.3.7",
+    "@vitessce/schemas": "3.3.7",
+    "@vitessce/utils": "3.3.7",
+    "@vitessce/config": "3.3.7"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",

package/src/VitS.js

@@ -53,6 +53,8 @@ import { createGenerateClassName } from './mui-utils.js';
  * @param {null|string} props.uid A unique identifier for this Vitessce instance,
  * for the purpose of avoiding CSS autogenerated class name conflicts. Must be valid as part
  * of a CSS class name string.
+ * @param {boolean} props.remountOnUidChange Whether to remount the coordination provider
+ * upon changes to config.uid. By default, true.
  * @param {array} props.viewTypes Plugin view types.
  * @param {array} props.fileTypes Plugin file types.
  * @param {array} props.jointFileTypes Plugin joint file types.
@@ -74,6 +76,7 @@ export function VitS(props) {
     validateOnConfigChange = false,
     isBounded = false,
     uid = null,
+    remountOnUidChange = true,
     viewTypes: viewTypesProp,
     fileTypes: fileTypesProp,
     jointFileTypes: jointFileTypesProp,
@@ -211,7 +214,10 @@ export function VitS(props) {
     <StylesProvider generateClassName={generateClassName}>
       <ThemeProvider theme={muiTheme[theme]}>
         <QueryClientProvider client={queryClient}>
-          <ViewConfigProvider key={configKey} createStore={createViewConfigStoreClosure}>
+          <ViewConfigProvider
+            createStore={createViewConfigStoreClosure}
+            {...(remountOnUidChange ? ({ key: configKey }) : {})}
+          >
             <AuxiliaryProvider createStore={createAuxiliaryStore}>
               <VitessceGrid
                 success={success}

package/src/data-hooks.js

@@ -142,6 +142,28 @@ export function useObsSetsData(
   );
 }
 
+export function useSampleSetsData(
+  loaders, dataset, isRequired,
+  coordinationSetters, initialCoordinationValues, matchOn,
+) {
+  return useDataType(
+    DataType.SAMPLE_SETS,
+    loaders, dataset, isRequired,
+    coordinationSetters, initialCoordinationValues, matchOn,
+  );
+}
+
+export function useSampleEdgesData(
+  loaders, dataset, isRequired,
+  coordinationSetters, initialCoordinationValues, matchOn,
+) {
+  return useDataType(
+    DataType.SAMPLE_EDGES,
+    loaders, dataset, isRequired,
+    coordinationSetters, initialCoordinationValues, matchOn,
+  );
+}
+
 export function useObsFeatureMatrixData(
   loaders, dataset, isRequired,
   coordinationSetters, initialCoordinationValues, matchOn,
@@ -448,6 +470,32 @@ export function useSpotMultiObsSets(
   return [obsSetsData, obsSetsDataStatus, obsSetsUrls];
 }
 
+
+export function useSpotMultiFeatureLabels(
+  coordinationScopes, coordinationScopesBy, loaders, dataset,
+) {
+  const featureTypeCoordination = useComplexCoordination(
+    [
+      CoordinationType.FEATURE_TYPE,
+    ],
+    coordinationScopes,
+    coordinationScopesBy,
+    CoordinationType.SPOT_LAYER,
+  );
+  const matchOnObj = useMemo(() => featureTypeCoordination[0],
+    // imageCoordination reference changes each render,
+    // use coordinationScopes and coordinationScopesBy which are
+    // indirect dependencies here.
+    [coordinationScopes, coordinationScopesBy]);
+  const [featureLabelsData, featureLabelsStatus, featureLabelsUrls] = useDataTypeMulti(
+    DataType.FEATURE_LABELS, loaders, dataset,
+    false, {}, {},
+    matchOnObj,
+  );
+  return [featureLabelsData, featureLabelsStatus, featureLabelsUrls];
+}
+
+
 export function useMultiObsLabels(
   coordinationScopes, obsType, loaders, dataset,
 ) {

package/src/index.js

@@ -53,10 +53,13 @@ export {
   useObsEmbeddingData,
   useFeatureSelection,
   useObsFeatureMatrixIndices,
+  useSampleSetsData,
+  useSampleEdgesData,
   useMultiObsLabels,
   useMultiObsSpots,
   useMultiObsPoints,
   useSpotMultiObsSets,
+  useSpotMultiFeatureLabels,
   useMultiObsSegmentations,
   useMultiImages,
 

package/src/vitessce-grid-utils.js

@@ -162,6 +162,7 @@ export function createLoaders(datasets, configDescription, fileTypes, coordinati
       if (!dataSources.has(dataSourceKey)) {
         dataSources.set(dataSourceKey, new DataSourceClass({
           url,
+          fileType,
           requestInit,
           // Optionally, pass a Zarrita store to the data source,
           // if one was mapped to this URL.