@vitessce/dev 3.9.0 → 3.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import { aI as getDefaultExportFromCjs, aJ as Raycaster, W as OrthographicCamera, K as PerspectiveCamera, av as Scene, aK as PCFSoftShadowMap, aL as VSMShadowMap, aM as PCFShadowMap, aN as BasicShadowMap, aO as NoToneMapping, aP as ACESFilmicToneMapping, e as Vector3, V as Vector2, aQ as Clock, aR as WebGLRenderer, aS as Camera, x as BufferGeometry, r as Material, aT as Layers, a1 as Texture, aE as RGBAFormat, az as UnsignedByteType, C as Color, aj as _extends, aU as THREE, aV as EventDispatcher, aW as MOUSE, aX as TOUCH, aY as Spherical, Q as Quaternion, an as Ray, ak as Plane } from "./index-P1FfHDqS.js";
1
+ import { aI as getDefaultExportFromCjs, aJ as Raycaster, W as OrthographicCamera, K as PerspectiveCamera, av as Scene, aK as PCFSoftShadowMap, aL as VSMShadowMap, aM as PCFShadowMap, aN as BasicShadowMap, aO as NoToneMapping, aP as ACESFilmicToneMapping, e as Vector3, V as Vector2, aQ as Clock, aR as WebGLRenderer, aS as Camera, x as BufferGeometry, r as Material, aT as Layers, a1 as Texture, aE as RGBAFormat, az as UnsignedByteType, C as Color, aj as _extends, aU as THREE, aV as EventDispatcher, aW as MOUSE, aX as TOUCH, aY as Spherical, Q as Quaternion, an as Ray, ak as Plane } from "./index-B_ya-V9U.js";
2
2
  import * as React from "react";
3
3
  import React__default, { useReducer, useRef, useEffect, useLayoutEffect, useDebugValue, useState, useMemo } from "react";
4
4
  var constants = { exports: {} };
@@ -1,7 +1,7 @@
1
1
  var __defProp = Object.defineProperty;
2
2
  var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
3
3
  var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
4
- import { aI as getDefaultExportFromCjs, b3 as requireAssign, b4 as require_export, b5 as require_core, b6 as require_fails, b7 as require_toObject, b8 as require_objectKeys, b9 as require_cof, ba as require_wks, bb as require_iterators, bc as requireWeb_dom_iterable, bd as requireEs6_string_iterator, be as require_anObject, bf as require_hide, bg as require_ctx, bh as require_toLength, bi as require_global, bj as require_objectDp, bk as require_descriptors, bl as require_isObject, bm as require_objectCreate, bn as require_iterDefine, bo as require_iterStep, bp as require_meta, bq as require_isArray, br as require_iobject, bs as require_setToStringTag, bt as require_aFunction, bu as requireIterator, bv as require_propertyDesc, bw as require_root, bx as require_baseGetTag, by as requireIsObjectLike, bz as requireIsObject, bA as requireEs6_symbol, bB as requireDefineProperty, bC as require_toIobject, bD as require_objectGopd, bE as require_html, bF as require_domCreate, bG as require_library, bH as requireSymbol, bI as require_objectPie, bJ as require_has, bK as require_redefine, bL as require_objectAssign, bM as diffCameraState, ao as jsxRuntimeExports } from "./index-P1FfHDqS.js";
4
+ import { aI as getDefaultExportFromCjs, b3 as requireAssign, b4 as require_export, b5 as require_core, b6 as require_fails, b7 as require_toObject, b8 as require_objectKeys, b9 as require_cof, ba as require_wks, bb as require_iterators, bc as requireWeb_dom_iterable, bd as requireEs6_string_iterator, be as require_anObject, bf as require_hide, bg as require_ctx, bh as require_toLength, bi as require_global, bj as require_objectDp, bk as require_descriptors, bl as require_isObject, bm as require_objectCreate, bn as require_iterDefine, bo as require_iterStep, bp as require_meta, bq as require_isArray, br as require_iobject, bs as require_setToStringTag, bt as require_aFunction, bu as requireIterator, bv as require_propertyDesc, bw as require_root, bx as require_baseGetTag, by as requireIsObjectLike, bz as requireIsObject, bA as requireEs6_symbol, bB as requireDefineProperty, bC as require_toIobject, bD as require_objectGopd, bE as require_html, bF as require_domCreate, bG as require_library, bH as requireSymbol, bI as require_objectPie, bJ as require_has, bK as require_redefine, bL as require_objectAssign, bM as diffCameraState, ao as jsxRuntimeExports } from "./index-B_ya-V9U.js";
5
5
  import React__default from "react";
6
6
  var assignExports = requireAssign();
7
7
  const _Object$assign = /* @__PURE__ */ getDefaultExportFromCjs(assignExports);
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm-SxljTded.js";
2
- import { aZ as BaseDecoder } from "./index-P1FfHDqS.js";
2
+ import { aZ as BaseDecoder } from "./index-B_ya-V9U.js";
3
3
  class DeflateDecoder extends BaseDecoder {
4
4
  decodeBlock(buffer) {
5
5
  return inflate_1(new Uint8Array(buffer)).buffer;
@@ -1,7 +1,7 @@
1
1
  import * as React$7 from "react";
2
2
  import React__default, { isValidElement, PureComponent, Component, createElement, createContext, createRef } from "react";
3
3
  import ReactDOM__default, { findDOMNode as findDOMNode$1 } from "react-dom";
4
- import { b0 as commonjsGlobal$1, b1 as requireObjectAssign, aI as getDefaultExportFromCjs$1, b2 as earcut } from "./index-P1FfHDqS.js";
4
+ import { b0 as commonjsGlobal$1, b1 as requireObjectAssign, aI as getDefaultExportFromCjs$1, b2 as earcut } from "./index-B_ya-V9U.js";
5
5
  var promise = {};
6
6
  var hasRequiredPromise;
7
7
  function requirePromise() {
@@ -1345,7 +1345,7 @@ const COMPONENT_COORDINATION_TYPES = {
1345
1345
  CoordinationType$2.HIERARCHY_LEVELS
1346
1346
  ]
1347
1347
  };
1348
- const version$6 = "3.9.0";
1348
+ const version$6 = "3.9.2";
1349
1349
  const META_VERSION = {
1350
1350
  version: version$6
1351
1351
  };
@@ -71072,21 +71072,20 @@ Popper$1.Utils = (typeof window !== "undefined" ? window : global).PopperUtils;
71072
71072
  Popper$1.placements = placements$1;
71073
71073
  Popper$1.Defaults = Defaults;
71074
71074
  function createChainedFunction(...funcs) {
71075
- return funcs.reduce((acc, func) => {
71076
- if (func == null) {
71077
- return acc;
71078
- }
71079
- {
71080
- if (typeof func !== "function") {
71081
- console.error("Material-UI: Invalid Argument Type, must only provide functions, undefined, or null.");
71075
+ return funcs.reduce(
71076
+ (acc, func) => {
71077
+ if (func == null) {
71078
+ return acc;
71082
71079
  }
71080
+ return function chainedFunction(...args) {
71081
+ acc.apply(this, args);
71082
+ func.apply(this, args);
71083
+ };
71084
+ },
71085
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
71086
+ () => {
71083
71087
  }
71084
- return function chainedFunction(...args) {
71085
- acc.apply(this, args);
71086
- func.apply(this, args);
71087
- };
71088
- }, () => {
71089
- });
71088
+ );
71090
71089
  }
71091
71090
  function setRef(ref2, value2) {
71092
71091
  if (typeof ref2 === "function") {
@@ -71125,7 +71124,7 @@ function flipPlacement(placement, theme) {
71125
71124
  }
71126
71125
  }
71127
71126
  function getAnchorEl(anchorEl) {
71128
- return typeof anchorEl === "function" ? anchorEl() : anchorEl;
71127
+ return typeof anchorEl === "function" ? anchorEl(document.body) : anchorEl;
71129
71128
  }
71130
71129
  const useEnhancedEffect = typeof window !== "undefined" ? React.useLayoutEffect : React.useEffect;
71131
71130
  const defaultPopperOptions = {};
@@ -71155,25 +71154,18 @@ const Popper = React.forwardRef((props, ref2) => {
71155
71154
  }
71156
71155
  if (popperRef.current) {
71157
71156
  popperRef.current.destroy();
71158
- handlePopperRefRef.current(null);
71157
+ if (handlePopperRefRef.current) {
71158
+ setRef(handlePopperRefRef.current, null);
71159
+ }
71159
71160
  }
71160
71161
  const handlePopperUpdate = (data2) => {
71161
71162
  setPlacement(data2.placement);
71162
71163
  };
71163
- const resolvedAnchorEl = getAnchorEl(anchorEl);
71164
- {
71165
- if (resolvedAnchorEl && resolvedAnchorEl.nodeType === 1) {
71166
- const box = resolvedAnchorEl.getBoundingClientRect();
71167
- if (box.top === 0 && box.left === 0 && box.right === 0 && box.bottom === 0) {
71168
- console.warn([
71169
- "Material-UI: The `anchorEl` prop provided to the component is invalid.",
71170
- "The anchor element should be part of the document layout.",
71171
- "Make sure the element is present in the document or that it's not display none."
71172
- ].join("\n"));
71173
- }
71174
- }
71164
+ const anchorElement = getAnchorEl(anchorEl);
71165
+ if (!anchorElement) {
71166
+ return;
71175
71167
  }
71176
- const popper2 = new Popper$1(getAnchorEl(anchorEl), tooltipRef.current, {
71168
+ const popper2 = new Popper$1(anchorElement, tooltipRef.current, {
71177
71169
  placement: rtlPlacement,
71178
71170
  ...popperOptions,
71179
71171
  modifiers: {
@@ -71191,7 +71183,9 @@ const Popper = React.forwardRef((props, ref2) => {
71191
71183
  onCreate: createChainedFunction(handlePopperUpdate, popperOptions.onCreate),
71192
71184
  onUpdate: createChainedFunction(handlePopperUpdate, popperOptions.onUpdate)
71193
71185
  });
71194
- handlePopperRefRef.current(popper2);
71186
+ if (handlePopperRefRef.current) {
71187
+ setRef(handlePopperRefRef.current, popper2);
71188
+ }
71195
71189
  }, [anchorEl, disablePortal, modifiers2, open2, rtlPlacement, popperOptions]);
71196
71190
  const handleRef = React.useCallback((node2) => {
71197
71191
  setRef(ownRef, node2);
@@ -71205,7 +71199,9 @@ const Popper = React.forwardRef((props, ref2) => {
71205
71199
  return;
71206
71200
  }
71207
71201
  popperRef.current.destroy();
71208
- handlePopperRefRef.current(null);
71202
+ if (handlePopperRefRef.current) {
71203
+ setRef(handlePopperRefRef.current, null);
71204
+ }
71209
71205
  };
71210
71206
  const handleExited = () => {
71211
71207
  setExited(true);
@@ -71236,7 +71232,7 @@ const Popper = React.forwardRef((props, ref2) => {
71236
71232
  // Fix Popper.js display issue
71237
71233
  top: 0,
71238
71234
  left: 0,
71239
- display: !open2 && keepMounted && !transition3 ? "none" : null,
71235
+ display: !open2 && keepMounted && !transition3 ? "none" : void 0,
71240
71236
  ...style2
71241
71237
  }, children: typeof children3 === "function" ? children3(childProps) : children3 }) });
71242
71238
  });
@@ -71251,7 +71247,7 @@ function ScopedGlobalStyles(props) {
71251
71247
  const component = useMemo$1(() => {
71252
71248
  const computedStyles = prependParentClassName(styles2, parentClassName);
71253
71249
  return jsxRuntimeExports.jsx(GlobalStyles$3, { styles: computedStyles });
71254
- }, [parentClassName]);
71250
+ }, [parentClassName, styles2]);
71255
71251
  return component;
71256
71252
  }
71257
71253
  var Subscribable = class {
@@ -82356,7 +82352,9 @@ const obsSegmentationsSpatialdataSchema = z.object({
82356
82352
  const obsPointsSpatialdataSchema = z.object({
82357
82353
  path: z.string().describe("The path to the point data."),
82358
82354
  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."),
82359
- 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.')
82355
+ 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.'),
82356
+ featureIndexColumn: z.string().optional().describe("The name of the column in the table which contains the feature (e.g., gene) indices associated with each point (aligned with the table var.index dataframe column)."),
82357
+ mortonCodeColumn: z.string().optional().describe('The name of the column in the table which contains the Morton codes for each point, used for efficient spatial querying. If not provided, Vitessce will assume the default column name "morton_code_2d".')
82360
82358
  });
82361
82359
  z.object({
82362
82360
  path: z.string(),
@@ -82677,6 +82675,7 @@ const lightPalette = {
82677
82675
  gridLayoutBackground: "#FFFFFF",
82678
82676
  paperBackground: "#FFFFFF",
82679
82677
  cardBorder: "rgba(241, 241, 241, 0.125)",
82678
+ cardInfoBorder: "#ccc",
82680
82679
  tooltipText: "rgba(0, 0, 0, 0.87)"
82681
82680
  };
82682
82681
  const muiTheme = {
@@ -82702,6 +82701,7 @@ const muiTheme = {
82702
82701
  gridLayoutBackground: "#333333",
82703
82702
  paperBackground: "#2b2b2b",
82704
82703
  cardBorder: "rgba(0, 0, 0, 0.125)",
82704
+ cardInfoBorder: "#222222",
82705
82705
  tooltipText: "#FFFFFF",
82706
82706
  ...globalColors
82707
82707
  },
@@ -82711,6 +82711,7 @@ const muiTheme = {
82711
82711
  light: createTheme({
82712
82712
  palette: {
82713
82713
  ...lightPalette,
82714
+ cardInfoBorder: "#F1F1F1",
82714
82715
  ...globalColors
82715
82716
  },
82716
82717
  ...sharedThemeOptions,
@@ -82728,7 +82729,7 @@ const muiTheme = {
82728
82729
  ...globalColors
82729
82730
  },
82730
82731
  ...sharedThemeOptions,
82731
- cardBorderSize: "2px"
82732
+ cardBorderSize: "1px"
82732
82733
  })
82733
82734
  };
82734
82735
  const createStoreImpl = (createState2) => {
@@ -91028,7 +91029,7 @@ const gridLayoutStyles = {
91028
91029
  },
91029
91030
  ".react-grid-item > .react-resizable-handle.react-resizable-handle-se": {
91030
91031
  bottom: "0",
91031
- right: "0",
91032
+ right: "10px",
91032
91033
  cursor: "se-resize"
91033
91034
  },
91034
91035
  ".react-grid-item > .react-resizable-handle.react-resizable-handle-nw": {
@@ -91164,18 +91165,23 @@ const useTitleStyles = makeStyles()((theme) => ({
91164
91165
  textOverflow: "ellipsis",
91165
91166
  whiteSpace: "nowrap"
91166
91167
  },
91167
- titleInfo: {
91168
+ infoText: {
91169
+ color: theme.palette.primaryForeground,
91168
91170
  width: "100%",
91169
91171
  textOverflow: "ellipsis",
91170
91172
  whiteSpace: "nowrap",
91171
91173
  overflow: "hidden",
91172
- fontSize: "80% !important",
91174
+ fontSize: "60% !important",
91173
91175
  opacity: ".8",
91174
- padding: "0 4px",
91176
+ padding: "0",
91175
91177
  justifyContent: "center",
91176
- lineHeight: "25px !important",
91177
- flexShrink: "1",
91178
- textAlign: "right !important"
91178
+ textAlign: "center !important",
91179
+ borderTop: "0px",
91180
+ borderBottom: `1px solid ${theme.palette.cardInfoBorder}`,
91181
+ borderLeft: `1px solid ${theme.palette.cardInfoBorder}`,
91182
+ borderRight: `1px solid ${theme.palette.cardInfoBorder}`,
91183
+ borderBottomLeftRadius: "4px",
91184
+ borderBottomRightRadius: "4px"
91179
91185
  },
91180
91186
  titleButtons: {
91181
91187
  display: "flex",
@@ -91191,15 +91197,20 @@ const useTitleStyles = makeStyles()((theme) => ({
91191
91197
  border: `${theme.cardBorderSize} solid ${theme.palette.cardBorder}`,
91192
91198
  flex: "1 1 auto",
91193
91199
  minHeight: "1px",
91194
- marginTop: "8px",
91195
- marginBottom: "8px",
91200
+ marginTop: "0",
91201
+ marginBottom: "0",
91196
91202
  position: "relative",
91197
91203
  display: "flex",
91198
91204
  flexDirection: "column",
91199
91205
  minWidth: "0",
91200
91206
  wordWrap: "break-word",
91201
91207
  backgroundClip: "border-box",
91202
- borderRadius: "4px"
91208
+ borderTopLeftRadius: "4px",
91209
+ borderTopRightRadius: "4px"
91210
+ },
91211
+ cardWithoutInfoText: {
91212
+ borderBottomLeftRadius: "4px",
91213
+ borderBottomRightRadius: "4px"
91203
91214
  },
91204
91215
  paddingCard: {
91205
91216
  padding: "12px"
@@ -91525,7 +91536,7 @@ function initialize$2(config3, jointFileTypes, coordinationTypes, viewTypes) {
91525
91536
  return assignViewUids(newConfig);
91526
91537
  }
91527
91538
  function VitS(props) {
91528
- const { config: config3, stores, rowHeight, height: height2, theme, onWarn, onConfigChange, onLoaderChange, validateConfig = true, validateOnConfigChange = false, isBounded = false, uid: uid2 = null, styleContainer, remountOnUidChange = true, viewTypes: viewTypesProp, fileTypes: fileTypesProp, jointFileTypes: jointFileTypesProp, coordinationTypes: coordinationTypesProp, asyncFunctions: asyncFunctionsProp, warning: warning2, pageMode = false, children: children3, debugMode = DEFAULT_DEBUG_MODE, logLevel = DEFAULT_LOG_LEVEL } = props;
91539
+ const { config: config3, stores: storesProp, rowHeight, height: height2, theme, onWarn, onConfigChange, onLoaderChange, validateConfig = true, validateOnConfigChange = false, isBounded = false, uid: uid2 = null, styleContainer, remountOnUidChange = true, viewTypes: viewTypesProp, fileTypes: fileTypesProp, jointFileTypes: jointFileTypesProp, coordinationTypes: coordinationTypesProp, asyncFunctions: asyncFunctionsProp, warning: warning2, pageMode = false, children: children3, debugMode = DEFAULT_DEBUG_MODE, logLevel = DEFAULT_LOG_LEVEL } = props;
91529
91540
  const [debugErrors, setDebugErrors] = useState([]);
91530
91541
  const viewTypes = useMemo$1(() => viewTypesProp || [], [viewTypesProp]);
91531
91542
  const fileTypes = useMemo$1(() => fileTypesProp || [], [fileTypesProp]);
@@ -91545,6 +91556,30 @@ function VitS(props) {
91545
91556
  return JSON.stringify(config3);
91546
91557
  }, [config3]);
91547
91558
  const pluginSpecificConfigSchema = useMemo$1(() => buildConfigSchema(fileTypes, jointFileTypes, coordinationTypes, viewTypes), [viewTypes, fileTypes, jointFileTypes, coordinationTypes]);
91559
+ const mergedStores = useMemo$1(() => {
91560
+ const result = storesProp ?? {};
91561
+ const urlMap = /* @__PURE__ */ new Map();
91562
+ if (Array.isArray(config3.datasets)) {
91563
+ config3.datasets.forEach((dataset) => {
91564
+ dataset.files?.forEach((file) => {
91565
+ if (file.fileType?.endsWith(".zip") && file.url) {
91566
+ if (!urlMap.has(file.url)) {
91567
+ urlMap.set(file.url, file.requestInit);
91568
+ }
91569
+ }
91570
+ });
91571
+ });
91572
+ }
91573
+ urlMap.forEach((requestInit2, url) => {
91574
+ if (!result[url]) {
91575
+ result[url] = ZipFileStore.fromUrl(url, {
91576
+ overrides: requestInit2,
91577
+ transformEntries: transformEntriesForZipFileStore
91578
+ });
91579
+ }
91580
+ });
91581
+ return result;
91582
+ }, [configKey]);
91548
91583
  const [configOrWarning, success] = useMemo$1(() => {
91549
91584
  if (warning2) {
91550
91585
  return [warning2, false];
@@ -91627,7 +91662,7 @@ function VitS(props) {
91627
91662
  }, [success, configKey, configOrWarning, onConfigChange]);
91628
91663
  const createViewConfigStoreClosure = useCallback(() => {
91629
91664
  if (success) {
91630
- const loaders = createLoaders(configOrWarning.datasets, configOrWarning.description, fileTypes, coordinationTypes, stores, queryClient);
91665
+ const loaders = createLoaders(configOrWarning.datasets, configOrWarning.description, fileTypes, coordinationTypes, mergedStores, queryClient);
91631
91666
  return createViewConfigStore(loaders, configOrWarning);
91632
91667
  }
91633
91668
  return createViewConfigStore(null, null);
@@ -91635,7 +91670,7 @@ function VitS(props) {
91635
91670
  if (debugMode && debugErrors.length > 0) {
91636
91671
  return jsxRuntimeExports.jsx(CacheProvider, { value: muiCache, children: jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: jsxRuntimeExports.jsx(DebugWindow, { debugErrors }) }) });
91637
91672
  }
91638
- return success ? jsxRuntimeExports.jsx(CacheProvider, { value: muiCache, children: jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: jsxRuntimeExports.jsx(QueryClientProvider, { client: queryClient, children: jsxRuntimeExports.jsx(ViewConfigProvider, { createStore: createViewConfigStoreClosure, children: jsxRuntimeExports.jsx(AuxiliaryProvider, { createStore: createAuxiliaryStore, children: jsxRuntimeExports.jsxs(AsyncFunctionsContext.Provider, { value: asyncFunctions, children: [jsxRuntimeExports.jsx(VitessceGrid, { pageMode, success, configKey, viewTypes, fileTypes, coordinationTypes, config: configOrWarning, rowHeight, height: height2, theme, isBounded, stores, queryClient, children: children3 }), jsxRuntimeExports.jsx(CallbackPublisher, { onWarn, onConfigChange, onLoaderChange, validateOnConfigChange, pluginSpecificConfigSchema })] }) }) }, remountOnUidChange ? configKey : void 0) }) }) }) : jsxRuntimeExports.jsx(CacheProvider, { value: muiCache, children: jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: jsxRuntimeExports.jsx(Warning, { ...configOrWarning }) }) });
91673
+ return success ? jsxRuntimeExports.jsx(CacheProvider, { value: muiCache, children: jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: jsxRuntimeExports.jsx(QueryClientProvider, { client: queryClient, children: jsxRuntimeExports.jsx(ViewConfigProvider, { createStore: createViewConfigStoreClosure, children: jsxRuntimeExports.jsx(AuxiliaryProvider, { createStore: createAuxiliaryStore, children: jsxRuntimeExports.jsxs(AsyncFunctionsContext.Provider, { value: asyncFunctions, children: [jsxRuntimeExports.jsx(VitessceGrid, { pageMode, success, configKey, viewTypes, fileTypes, coordinationTypes, config: configOrWarning, rowHeight, height: height2, theme, isBounded, stores: mergedStores, queryClient, children: children3 }), jsxRuntimeExports.jsx(CallbackPublisher, { onWarn, onConfigChange, onLoaderChange, validateOnConfigChange, pluginSpecificConfigSchema })] }) }) }, remountOnUidChange ? configKey : void 0) }) }) }) : jsxRuntimeExports.jsx(CacheProvider, { value: muiCache, children: jsxRuntimeExports.jsx(ThemeProvider, { theme: muiTheme[theme], children: jsxRuntimeExports.jsx(Warning, { ...configOrWarning }) }) });
91639
91674
  }
91640
91675
  function FallbackForVitS(props) {
91641
91676
  const {
@@ -91805,15 +91840,17 @@ function TitleInfo(props) {
91805
91840
  const { title: title2, info: info2, children: children3, isScroll, isSpatial, removeGridComponent, urls: urls2, isReady, options, closeButtonVisible = true, downloadButtonVisible = true, helpText, withPadding = true, errors: errorsProp } = props;
91806
91841
  const errors = errorsProp?.filter(Boolean);
91807
91842
  const { classes: classes2 } = useTitleStyles();
91843
+ const hasInfoText = Boolean(info2);
91808
91844
  return (
91809
91845
  // d-flex without wrapping div is not always full height; I don't understand the root cause.
91810
- jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [jsxRuntimeExports.jsxs("div", { className: classes2.title, role: "banner", children: [jsxRuntimeExports.jsx("div", { className: classes2.titleLeft, role: "heading", "aria-level": "1", children: title2 }), jsxRuntimeExports.jsx("div", { className: classes2.titleInfo, title: info2, role: "note", children: info2 }), jsxRuntimeExports.jsxs("div", { className: classes2.titleButtons, role: "toolbar", "aria-label": "Plot options and controls", children: [jsxRuntimeExports.jsx(PlotOptions, { options }), downloadButtonVisible ? jsxRuntimeExports.jsx(DownloadOptions, { urls: urls2 }) : null, Array.isArray(errors) && errors.length > 0 ? jsxRuntimeExports.jsx(ErrorInfo, { errors }) : null, helpText ? jsxRuntimeExports.jsx(HelpButton, { helpText }) : null, closeButtonVisible && removeGridComponent ? jsxRuntimeExports.jsx(ClosePaneButton, { removeGridComponent }) : null] })] }), jsxRuntimeExports.jsxs("div", { className: clsx(TOOLTIP_ANCESTOR, classes2.card, {
91846
+ jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [jsxRuntimeExports.jsxs("div", { className: classes2.title, role: "banner", children: [jsxRuntimeExports.jsx("div", { className: classes2.titleLeft, role: "heading", "aria-level": "1", children: title2 }), jsxRuntimeExports.jsxs("div", { className: classes2.titleButtons, role: "toolbar", "aria-label": "Plot options and controls", children: [jsxRuntimeExports.jsx(PlotOptions, { options }), downloadButtonVisible ? jsxRuntimeExports.jsx(DownloadOptions, { urls: urls2 }) : null, Array.isArray(errors) && errors.length > 0 ? jsxRuntimeExports.jsx(ErrorInfo, { errors }) : null, helpText ? jsxRuntimeExports.jsx(HelpButton, { helpText }) : null, closeButtonVisible && removeGridComponent ? jsxRuntimeExports.jsx(ClosePaneButton, { removeGridComponent }) : null] })] }), jsxRuntimeExports.jsxs("div", { className: clsx(TOOLTIP_ANCESTOR, classes2.card, {
91811
91847
  [classes2.scrollCard]: isScroll,
91812
91848
  [classes2.spatialCard]: isSpatial,
91813
91849
  [classes2.noScrollCard]: !isScroll && !isSpatial,
91814
91850
  [classes2.noPaddingCard]: !withPadding,
91815
- [classes2.paddingCard]: withPadding
91816
- }), "aria-busy": !isReady, role: "main", children: [!isReady ? jsxRuntimeExports.jsx(LoadingIndicator, {}) : null, children3] })] })
91851
+ [classes2.paddingCard]: withPadding,
91852
+ [classes2.cardWithoutInfoText]: !hasInfoText
91853
+ }), "aria-busy": !isReady, role: "main", children: [!isReady ? jsxRuntimeExports.jsx(LoadingIndicator, {}) : null, children3] }), hasInfoText ? jsxRuntimeExports.jsx("div", { className: classes2.infoText, title: info2, role: "note", children: info2 }) : null] })
91817
91854
  );
91818
91855
  }
91819
91856
  class VitessceError extends Error {
@@ -229036,22 +229073,22 @@ async function getDecoder(fileDirectory) {
229036
229073
  const Decoder = await importFn();
229037
229074
  return new Decoder(fileDirectory);
229038
229075
  }
229039
- addDecoder([void 0, 1], () => import("./raw-DgICW0IR.js").then((m2) => m2.default));
229040
- addDecoder(5, () => import("./lzw-CdFWMxJD.js").then((m2) => m2.default));
229076
+ addDecoder([void 0, 1], () => import("./raw-CDLaLCyf.js").then((m2) => m2.default));
229077
+ addDecoder(5, () => import("./lzw-II1TrWs9.js").then((m2) => m2.default));
229041
229078
  addDecoder(6, () => {
229042
229079
  throw new Error("old style JPEG compression is not supported.");
229043
229080
  });
229044
- addDecoder(7, () => import("./jpeg-B-cJrwmt.js").then((m2) => m2.default));
229045
- addDecoder([8, 32946], () => import("./deflate-0UC3wUc7.js").then((m2) => m2.default));
229046
- addDecoder(32773, () => import("./packbits-C-CYBJdL.js").then((m2) => m2.default));
229081
+ addDecoder(7, () => import("./jpeg-DnHzjtjh.js").then((m2) => m2.default));
229082
+ addDecoder([8, 32946], () => import("./deflate-Bc4Fa1GF.js").then((m2) => m2.default));
229083
+ addDecoder(32773, () => import("./packbits-BuDro0Xt.js").then((m2) => m2.default));
229047
229084
  addDecoder(
229048
229085
  34887,
229049
- () => import("./lerc-BdcQu2oQ.js").then(async (m2) => {
229086
+ () => import("./lerc-pBYHs7LI.js").then(async (m2) => {
229050
229087
  await m2.zstd.init();
229051
229088
  return m2;
229052
229089
  }).then((m2) => m2.default)
229053
229090
  );
229054
- addDecoder(50001, () => import("./webimage-B0Qn48pR.js").then((m2) => m2.default));
229091
+ addDecoder(50001, () => import("./webimage-C2W4yjEt.js").then((m2) => m2.default));
229055
229092
  function copyNewSize(array2, width2, height2, samplesPerPixel = 1) {
229056
229093
  return new (Object.getPrototypeOf(array2)).constructor(width2 * height2 * samplesPerPixel);
229057
229094
  }
@@ -269340,21 +269377,18 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
269340
269377
  };
269341
269378
  }
269342
269379
  }
269343
- const isStaticColor = obsColorEncoding === "spatialLayerColor";
269344
- const getMoleculeColor = (object2, { data: data2, index: index2, target: target2 }) => {
269345
- const obsId = data2.src.obsIndex[index2];
269346
- if (data2.src.obsLabelsMap && data2.src.uniqueObsLabels && data2.src.PALETTE) {
269347
- const obsLabel = data2.src.obsLabelsMap.get(obsId);
269348
- const labelIndex = data2.src.uniqueObsLabels.indexOf(obsLabel);
269349
- target2[0] = data2.src.PALETTE[labelIndex % data2.src.PALETTE.length]?.[0];
269350
- target2[1] = data2.src.PALETTE[labelIndex % data2.src.PALETTE.length]?.[1];
269351
- target2[2] = data2.src.PALETTE[labelIndex % data2.src.PALETTE.length]?.[2];
269352
- }
269353
- return target2;
269354
- };
269355
- const { obsPointsModelMatrix, obsPoints, obsPointsTilingType, loadPointsInRect } = this.obsPointsData?.[layerScope]?.src ?? {};
269380
+ const {
269381
+ obsPointsModelMatrix,
269382
+ obsPoints,
269383
+ // featureIndices: obsPointsFeatureIndices,
269384
+ obsPointsTilingType,
269385
+ loadPointsInRect
269386
+ } = this.obsPointsData?.[layerScope]?.src ?? {};
269356
269387
  obsPoints?.shape?.[0] === 3;
269357
269388
  const modelMatrix2 = obsPointsModelMatrix?.clone();
269389
+ const hasFeatureIndicesMinMax = !showUnselected && Array.isArray(featureIndices) && featureIndices.length === 1;
269390
+ const FILTER_PLACEHOLDER = 0;
269391
+ const featureIndicesMinMax = hasFeatureIndicesMinMax ? [featureIndices[0], featureIndices[0]] : [FILTER_PLACEHOLDER, FILTER_PLACEHOLDER];
269358
269392
  if (obsPointsTilingType === "tiled") {
269359
269393
  return new TileLayer({
269360
269394
  id: `Tiled-${POINT_LAYER_PREFIX}${layerScope}`,
@@ -269405,9 +269439,6 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
269405
269439
  renderSubLayers: (subLayerProps) => {
269406
269440
  const { bbox: bbox2, content: tileData } = subLayerProps.tile;
269407
269441
  const { left: left2, top: top2, right: right2, bottom: bottom2 } = bbox2;
269408
- const hasFeatureIndicesMinMax = !showUnselected && Array.isArray(featureIndices) && featureIndices.length === 1;
269409
- const FILTER_PLACEHOLDER = 0;
269410
- const featureIndicesMinMax = hasFeatureIndicesMinMax ? [featureIndices[0], featureIndices[0]] : [FILTER_PLACEHOLDER, FILTER_PLACEHOLDER];
269411
269442
  return new ScatterplotLayer(subLayerProps, {
269412
269443
  bounds: [left2, top2, right2, bottom2],
269413
269444
  data: tileData,
@@ -269484,26 +269515,44 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
269484
269515
  coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
269485
269516
  pickable: true,
269486
269517
  autoHighlight: AUTO_HIGHLIGHT,
269487
- radiusMaxPixels: 3,
269488
269518
  opacity: spatialLayerOpacity,
269489
269519
  visible: spatialLayerVisible,
269490
269520
  modelMatrix: modelMatrix2,
269491
- getRadius: 300,
269521
+ getRadius: 5,
269522
+ radiusMaxPixels: 3,
269492
269523
  getPosition: (object2, { data: data2, index: index2, target: target2 }) => {
269493
269524
  target2[0] = data2.src.obsPoints.data[0][index2];
269494
269525
  target2[1] = data2.src.obsPoints.data[1][index2];
269495
269526
  target2[2] = 0;
269496
269527
  return target2;
269497
269528
  },
269498
- getLineColor: isStaticColor ? staticColor : getMoleculeColor,
269499
- getFillColor: isStaticColor ? staticColor : getMoleculeColor,
269529
+ getFillColor,
269500
269530
  onHover: (info2) => delegateHover(info2, "point", layerScope),
269531
+ // Use GPU filtering to filter to only the points in the tile bounding box,
269532
+ // since the row groups may contain points from other tiles.
269533
+ // Note: this can be improved using filterCategories,
269534
+ // but it is not available until post-v9 deck.gl/extensions.
269535
+ filterRange: [featureIndicesMinMax],
269536
+ getFilterValue: hasFeatureIndicesMinMax ? (object2, { data: data2, index: index2 }) => [
269537
+ data2.src.featureIndices[index2]
269538
+ ] : (object2, { data: data2, index: index2 }) => [
269539
+ FILTER_PLACEHOLDER
269540
+ ],
269541
+ extensions: [
269542
+ new DataFilterExtension({ filterSize: 1 })
269543
+ ],
269501
269544
  updateTriggers: {
269502
- getRadius: [],
269503
- getFillColor: [obsColorEncoding, staticColor],
269504
- getLineColor: [obsColorEncoding, staticColor]
269505
- },
269506
- ...{}
269545
+ getFillColor: [
269546
+ showUnselected,
269547
+ featureColor,
269548
+ obsColorEncoding,
269549
+ spatialLayerColor,
269550
+ featureSelection,
269551
+ hasMultipleFeaturesSelected
269552
+ ],
269553
+ getFilterValue: [hasFeatureIndicesMinMax, showUnselected, featureSelection],
269554
+ filterRange: [hasFeatureIndicesMinMax, showUnselected, featureSelection]
269555
+ }
269507
269556
  });
269508
269557
  }
269509
269558
  createSelectionLayer() {
@@ -270042,8 +270091,8 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
270042
270091
  this.obsSegmentationsLayers = this.createSegmentationLayers();
270043
270092
  }
270044
270093
  onUpdatePointsData(layerScope) {
270045
- const { obsPoints, pointMultiObsLabels } = this.props;
270046
- const { obsIndex, obsPoints: layerObsPoints, obsPointsModelMatrix, loadPointsInRect, obsPointsTilingType } = obsPoints?.[layerScope] || {};
270094
+ const { obsPoints, pointMultiObsLabels, pointMatrixIndices } = this.props;
270095
+ const { obsIndex, obsPoints: layerObsPoints, featureIds: layerObsPointsFeatureIds, obsPointsModelMatrix, loadPointsInRect, obsPointsTilingType } = obsPoints?.[layerScope] || {};
270047
270096
  const { obsIndex: obsLabelsIndex, obsLabels } = pointMultiObsLabels?.[layerScope] || {};
270048
270097
  if (obsPointsTilingType === "tiled") {
270049
270098
  this.obsPointsData[layerScope] = {
@@ -270051,6 +270100,7 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
270051
270100
  obsPointsTilingType,
270052
270101
  obsIndex: null,
270053
270102
  obsPoints: null,
270103
+ featureIndices: null,
270054
270104
  obsPointsModelMatrix,
270055
270105
  obsLabelsMap: null,
270056
270106
  uniqueObsLabels: null,
@@ -270063,11 +270113,17 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
270063
270113
  if (layerObsPoints) {
270064
270114
  const getCellCoords = makeDefaultGetObsCoords(layerObsPoints);
270065
270115
  this.obsPointsQuadTree[layerScope] = createQuadTree(layerObsPoints, getCellCoords);
270116
+ let pointFeatureIndex = pointMatrixIndices?.[layerScope]?.featureIndex;
270117
+ if (!pointFeatureIndex) {
270118
+ pointFeatureIndex = Array.from(new Set(layerObsPointsFeatureIds));
270119
+ }
270120
+ const featureIndices = layerObsPointsFeatureIds.map((featureId2) => pointFeatureIndex?.indexOf(featureId2));
270066
270121
  this.obsPointsData[layerScope] = {
270067
270122
  src: {
270068
270123
  obsPointsTilingType,
270069
270124
  obsIndex,
270070
270125
  obsPoints: layerObsPoints,
270126
+ featureIndices,
270071
270127
  obsPointsModelMatrix,
270072
270128
  obsLabelsMap: null,
270073
270129
  uniqueObsLabels: null,
@@ -270280,7 +270336,7 @@ class Spatial2 extends AbstractSpatialOrScatterplot {
270280
270336
  forceUpdate = true;
270281
270337
  } else {
270282
270338
  this.props.pointLayerScopes.forEach((layerScope) => {
270283
- if (shallowDiffByLayer("obsPoints", layerScope) || shallowDiffByLayer("pointMultiObsLabels", layerScope)) {
270339
+ if (shallowDiffByLayer("obsPoints", layerScope) || shallowDiffByLayer("pointMultiObsLabels", layerScope) || shallowDiffByLayer("pointMatrixIndices", layerScope)) {
270284
270340
  this.onUpdatePointsData(layerScope);
270285
270341
  forceUpdate = true;
270286
270342
  }
@@ -270445,12 +270501,12 @@ class ErrorBoundary2 extends React__default.Component {
270445
270501
  }
270446
270502
  }
270447
270503
  const LazySpatialThree = React__default.lazy(async () => {
270448
- const { SpatialWrapper: SpatialWrapper2 } = await import("./index-B-7qLcpV.js");
270504
+ const { SpatialWrapper: SpatialWrapper2 } = await import("./index-DJmvz0Hs.js");
270449
270505
  return { default: SpatialWrapper2 };
270450
270506
  });
270451
270507
  const SpatialThreeAdapter = React__default.forwardRef((props, ref2) => jsxRuntimeExports.jsx("div", { ref: ref2, style: { width: "100%", height: "100%" }, children: jsxRuntimeExports.jsx(ErrorBoundary2, { children: jsxRuntimeExports.jsx(Suspense, { fallback: jsxRuntimeExports.jsx("div", { children: "Loading..." }), children: jsxRuntimeExports.jsx(LazySpatialThree, { ...props }) }) }) }));
270452
270508
  const LazySpatialAccelerated = React__default.lazy(async () => {
270453
- const { SpatialWrapper: SpatialWrapper2 } = await import("./index-4EtK005E.js");
270509
+ const { SpatialWrapper: SpatialWrapper2 } = await import("./index-C9zKxyci.js");
270454
270510
  return { default: SpatialWrapper2 };
270455
270511
  });
270456
270512
  const SpatialAcceleratedAdapter = React__default.forwardRef((props, ref2) => jsxRuntimeExports.jsx("div", { ref: ref2, style: { width: "100%", height: "100%" }, children: jsxRuntimeExports.jsx(ErrorBoundary2, { children: jsxRuntimeExports.jsx(Suspense, { fallback: jsxRuntimeExports.jsx("div", { children: "Loading..." }), children: jsxRuntimeExports.jsx(LazySpatialAccelerated, { ...props }) }) }) }));
@@ -282694,7 +282750,7 @@ function HiglassGlobalStyles(props) {
282694
282750
  }
282695
282751
  register({ dataFetcher: ZarrMultivecDataFetcher_default, config: ZarrMultivecDataFetcher_default.config }, { pluginType: "dataFetcher" });
282696
282752
  const LazyHiGlassComponent = React__default.lazy(async () => {
282697
- const { HiGlassComponent } = await import("./higlass-DTBEnOUt.js");
282753
+ const { HiGlassComponent } = await import("./higlass-B_NdD8MN.js");
282698
282754
  return { default: HiGlassComponent };
282699
282755
  });
282700
282756
  const HG_SIZE = 800;
@@ -285641,7 +285697,7 @@ function NeuroglancerGlobalStyles(props) {
285641
285697
  const { classes: classes2 } = props;
285642
285698
  return jsxRuntimeExports.jsxs(jsxRuntimeExports.Fragment, { children: [jsxRuntimeExports.jsx(GlobalStyles$3, { styles: globalNeuroglancerCss }), jsxRuntimeExports.jsx(ScopedGlobalStyles, { styles: globalNeuroglancerStyles, parentClassName: classes2.neuroglancerWrapper })] });
285643
285699
  }
285644
- const LazyReactNeuroglancer = React__default.lazy(() => import("./ReactNeuroglancer-BTLpuV09.js"));
285700
+ const LazyReactNeuroglancer = React__default.lazy(() => import("./ReactNeuroglancer-89UjQzAy.js"));
285645
285701
  function createWorker() {
285646
285702
  return new WorkerFactory();
285647
285703
  }
@@ -371452,6 +371508,9 @@ class AnnDataSource extends ZarrDataSource {
371452
371508
  async getFlatArrDecompressed(path2) {
371453
371509
  const { storeRoot } = this;
371454
371510
  const arr = await open$1(storeRoot.resolve(path2), { kind: "array" });
371511
+ if (arr.shape[0] === 0) {
371512
+ return [];
371513
+ }
371455
371514
  const data2 = await get$f(arr);
371456
371515
  if (data2.data?.[Symbol.iterator]) {
371457
371516
  return (
@@ -373798,12 +373857,31 @@ class SpatialDataObsPointsLoader extends AbstractTwoStepLoader {
373798
373857
  this.locations = locations;
373799
373858
  return this.locations;
373800
373859
  }
373801
- async loadPointsInRect(bounds2, signal) {
373860
+ /**
373861
+ * Class method for loading the feature index column for points.
373862
+ * @returns {Promise} A promise for a column array of integers.
373863
+ */
373864
+ async loadPointsFeatureIds() {
373802
373865
  const { path: path2 } = this.options;
373866
+ if (this.locationsFeatureIndex) {
373867
+ return this.locationsFeatureIndex;
373868
+ }
373869
+ let locationsFeatureIndex;
373870
+ const formatVersion = await this.dataSource.getPointsFormatVersion(path2);
373871
+ if (formatVersion === "0.1") {
373872
+ locationsFeatureIndex = await this.dataSource.loadPointsFeatureIds(path2);
373873
+ } else {
373874
+ throw new UnknownSpatialDataFormatError("Only points format version 0.1 is supported.");
373875
+ }
373876
+ this.locationsFeatureIndex = locationsFeatureIndex;
373877
+ return this.locationsFeatureIndex;
373878
+ }
373879
+ async loadPointsInRect(bounds2, signal) {
373880
+ const { path: path2, featureIndexColumn, mortonCodeColumn } = this.options;
373803
373881
  let locations;
373804
373882
  const formatVersion = await this.dataSource.getPointsFormatVersion(path2);
373805
373883
  if (formatVersion === "0.1") {
373806
- locations = await this.dataSource.loadPointsInRect(path2, bounds2, signal);
373884
+ locations = await this.dataSource.loadPointsInRect(path2, bounds2, signal, featureIndexColumn, mortonCodeColumn);
373807
373885
  } else {
373808
373886
  throw new UnknownSpatialDataFormatError("Only points format version 0.1 is supported.");
373809
373887
  }
@@ -373822,15 +373900,17 @@ class SpatialDataObsPointsLoader extends AbstractTwoStepLoader {
373822
373900
  return null;
373823
373901
  }
373824
373902
  async supportsTiling() {
373825
- const { path: path2 } = this.options;
373826
- const [formatVersion, zattrs, hasRequiredColumnsAndRowGroupSize] = await Promise.all([
373903
+ const { path: path2, featureIndexColumn: featureIndexColumnNameFromOptions, mortonCodeColumn } = this.options;
373904
+ const zattrs = await this.dataSource.loadSpatialDataElementAttrs(path2);
373905
+ const { spatialdata_attrs: spatialDataAttrs } = zattrs;
373906
+ const { feature_key: featureKey } = spatialDataAttrs;
373907
+ const featureIndexColumnName = featureIndexColumnNameFromOptions ?? `${featureKey}_codes`;
373908
+ const [formatVersion, hasRequiredColumnsAndRowGroupSize] = await Promise.all([
373827
373909
  // Check the points format version.
373828
373910
  this.dataSource.getPointsFormatVersion(path2),
373829
- // Check for the presence of bounding_box metadata.
373830
- this.dataSource.loadSpatialDataElementAttrs(path2),
373831
373911
  // Check the size of parquet row groups,
373832
373912
  // and for the presence of morton_code_2d and feature_index columns.
373833
- this.dataSource.supportsLoadPointsInRect(path2)
373913
+ this.dataSource.supportsLoadPointsInRect(path2, featureIndexColumnName, mortonCodeColumn)
373834
373914
  ]);
373835
373915
  const isSupportedVersion = formatVersion === "0.1";
373836
373916
  const boundingBox = zattrs?.bounding_box;
@@ -373858,23 +373938,19 @@ class SpatialDataObsPointsLoader extends AbstractTwoStepLoader {
373858
373938
  };
373859
373939
  let obsIndex = null;
373860
373940
  let obsPoints = null;
373861
- const featureIndices = null;
373941
+ let featureIds = null;
373862
373942
  if (!supportsTiling) {
373863
- [obsIndex, obsPoints] = await Promise.all([
373943
+ [obsIndex, obsPoints, featureIds] = await Promise.all([
373864
373944
  this.loadObsIndex(),
373865
- this.loadPoints()
373945
+ this.loadPoints(),
373946
+ this.loadPointsFeatureIds()
373866
373947
  ]);
373867
373948
  }
373868
373949
  return new LoaderResult({
373869
- /* obsIndex: ["1"], // TEMP
373870
- obsPoints: { // TEMP
373871
- shape: [2, 1],
373872
- data: [[0], [0]],
373873
- }, */
373874
373950
  // These will be null if tiling is supported.
373875
373951
  obsIndex,
373876
373952
  obsPoints,
373877
- featureIndices,
373953
+ featureIds,
373878
373954
  obsPointsModelMatrix: modelMatrix2,
373879
373955
  // Return 'tiled' if the morton_code_2d column
373880
373956
  // and bounding_box metadata are present,
@@ -383678,7 +383754,7 @@ async function _bisectRowGroupsRight({ queryClient, store }, parquetPath, column
383678
383754
  meta: { queryClient, store }
383679
383755
  });
383680
383756
  }
383681
- async function _rectToRowGroupIndices({ queryClient, store }, parquetPath, tileBbox, allPointsBbox) {
383757
+ async function _rectToRowGroupIndices({ queryClient, store }, parquetPath, tileBbox, allPointsBbox, mortonCodeColumnName) {
383682
383758
  return queryClient.fetchQuery({
383683
383759
  queryKey: ["SpatialDataTableSource", "_rectToRowGroupIndices", parquetPath, tileBbox, allPointsBbox],
383684
383760
  staleTime: Infinity,
@@ -383701,8 +383777,8 @@ async function _rectToRowGroupIndices({ queryClient, store }, parquetPath, tileB
383701
383777
  const [startMin, startMax] = mortonIntervals[startIndex];
383702
383778
  const [endMin, endMax] = mortonIntervals[endIndex];
383703
383779
  const [rowGroupIndexMin, rowGroupIndexMax] = await Promise.all([
383704
- _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, "morton_code_2d", startMin),
383705
- _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, "morton_code_2d", endMax)
383780
+ _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, mortonCodeColumnName, startMin),
383781
+ _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, mortonCodeColumnName, endMax)
383706
383782
  ]);
383707
383783
  if (rowGroupIndexMin === rowGroupIndexMax) {
383708
383784
  return [false, [rowGroupIndexMin]];
@@ -383724,8 +383800,8 @@ async function _rectToRowGroupIndices({ queryClient, store }, parquetPath, tileB
383724
383800
  if (startIndex === endIndex) {
383725
383801
  const [intervalMin, intervalMax] = mortonIntervals[startIndex];
383726
383802
  const [rowGroupIndexMin, rowGroupIndexMax] = await Promise.all([
383727
- _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, "morton_code_2d", intervalMin),
383728
- _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, "morton_code_2d", intervalMax)
383803
+ _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, mortonCodeColumnName, intervalMin),
383804
+ _bisectRowGroupsRight({ queryClient: queryClient2, store: store2 }, parquetPath, mortonCodeColumnName, intervalMax)
383729
383805
  ]);
383730
383806
  if (rowGroupIndexMin <= rowGroupIndexMax) {
383731
383807
  coveredRowGroupIndices = coveredRowGroupIndices.concat(range$b(rowGroupIndexMin, rowGroupIndexMax + 1));
@@ -384052,7 +384128,7 @@ class SpatialDataTableSource extends AnnDataSource {
384052
384128
  this.varAliases[varPath] = this.varAliases[varPath].map((val, ind) => val ? val.concat(` (${index2[ind]})`) : index2[ind]);
384053
384129
  return this.varAliases[varPath];
384054
384130
  }
384055
- async _supportsTiledPoints(parquetPath) {
384131
+ async _supportsTiledPoints(parquetPath, featureIndexColumnName, mortonCodeColumn) {
384056
384132
  const { queryClient } = this;
384057
384133
  const { store } = this.storeRoot;
384058
384134
  const allMetadata = await _loadParquetMetadataByPart({ queryClient, store }, parquetPath);
@@ -384064,7 +384140,8 @@ class SpatialDataTableSource extends AnnDataSource {
384064
384140
  }
384065
384141
  return false;
384066
384142
  }
384067
- const requiredColumns = ["x", "y", "feature_index", "morton_code_2d"];
384143
+ const mortonCodeColumnName = mortonCodeColumn ?? "morton_code_2d";
384144
+ const requiredColumns = ["x", "y", featureIndexColumnName, mortonCodeColumnName];
384068
384145
  const hasColumns = allMetadata?.schema?.fields?.map((f2) => f2.name);
384069
384146
  if (!hasColumns) {
384070
384147
  return false;
@@ -384083,9 +384160,10 @@ class SpatialDataTableSource extends AnnDataSource {
384083
384160
  * @param {string[]|undefined} columns An optional list of column names to load.
384084
384161
  * @returns
384085
384162
  */
384086
- async loadParquetTableInRect(parquetPath, tileBbox, allPointsBbox, signal) {
384163
+ async loadParquetTableInRect(parquetPath, tileBbox, allPointsBbox, signal, featureIndexColumnName, mortonCodeColumn) {
384087
384164
  const { queryClient } = this;
384088
384165
  const { store } = this.storeRoot;
384166
+ const mortonCodeColumnName = mortonCodeColumn ?? "morton_code_2d";
384089
384167
  const TILE_SIZE2 = 256;
384090
384168
  let tileBboxes = [];
384091
384169
  if (tileBbox.right - tileBbox.left > TILE_SIZE2 || tileBbox.bottom - tileBbox.top > TILE_SIZE2) {
@@ -384107,7 +384185,7 @@ class SpatialDataTableSource extends AnnDataSource {
384107
384185
  } else {
384108
384186
  tileBboxes = [tileBbox];
384109
384187
  }
384110
- const rowGroupIndicesPerTile = await Promise.all(tileBboxes.map(async (subTileBbox) => _rectToRowGroupIndices({ queryClient, store }, parquetPath, subTileBbox, allPointsBbox)));
384188
+ const rowGroupIndicesPerTile = await Promise.all(tileBboxes.map(async (subTileBbox) => _rectToRowGroupIndices({ queryClient, store }, parquetPath, subTileBbox, allPointsBbox, mortonCodeColumnName)));
384111
384189
  const uniqueCoveredRowGroupIndices = Array.from(new Set(rowGroupIndicesPerTile.flat())).toSorted((a2, b2) => a2 - b2);
384112
384190
  const allMetadata = await _loadParquetMetadataByPart({ queryClient, store }, parquetPath);
384113
384191
  const { numRowsPerGroup } = allMetadata;
@@ -384121,7 +384199,7 @@ class SpatialDataTableSource extends AnnDataSource {
384121
384199
  rowGroupTables.forEach((table2) => {
384122
384200
  const xColumn = table2.getChild("x");
384123
384201
  const yColumn = table2.getChild("y");
384124
- const featureIndexColumn = table2.getChild("feature_index");
384202
+ const featureIndexColumn = table2.getChild(featureIndexColumnName);
384125
384203
  if (!xColumn || !yColumn || !featureIndexColumn) {
384126
384204
  throw new Error(`Missing required column in parquet table at ${parquetPath}. Required columns: x, y, feature_index`);
384127
384205
  }
@@ -390276,11 +390354,10 @@ class SpatialDataPointsSource extends SpatialDataTableSource {
390276
390354
  async loadPoints(elementPath) {
390277
390355
  const parquetPath = getParquetPath(elementPath);
390278
390356
  const zattrs = await this.loadSpatialDataElementAttrs(elementPath);
390279
- const { axes, spatialdata_attrs: spatialDataAttrs } = zattrs;
390357
+ const { axes } = zattrs;
390280
390358
  const normAxes = normalizeAxes(axes);
390281
390359
  const axisNames = normAxes.map((axis2) => axis2.name);
390282
- const { feature_key: featureKey } = spatialDataAttrs;
390283
- const columnNames = [...axisNames, featureKey].filter(Boolean);
390360
+ const columnNames = axisNames.filter(Boolean);
390284
390361
  const arrowTable = await this.loadParquetTable(parquetPath, columnNames);
390285
390362
  const axisColumnArrs = axisNames.map((name2) => {
390286
390363
  const column2 = arrowTable.getChild(name2);
@@ -390294,6 +390371,30 @@ class SpatialDataPointsSource extends SpatialDataTableSource {
390294
390371
  data: axisColumnArrs
390295
390372
  };
390296
390373
  }
390374
+ /**
390375
+ *
390376
+ * @param {string} elementPath The path to the points element,
390377
+ * like "points/element_name".
390378
+ * @param {string|undefined} featureIndexColumnNameFromOptions The name
390379
+ * of the feature index column specified in the file definition options, if any.
390380
+ * @returns {Promise<number[]>} A promise for a zarr array containing the data.
390381
+ */
390382
+ async loadPointsFeatureIds(elementPath) {
390383
+ const parquetPath = getParquetPath(elementPath);
390384
+ const zattrs = await this.loadSpatialDataElementAttrs(elementPath);
390385
+ const { spatialdata_attrs: spatialDataAttrs } = zattrs;
390386
+ const { feature_key: featureKey } = spatialDataAttrs;
390387
+ const columnNames = [featureKey];
390388
+ const arrowTable = await this.loadParquetTable(parquetPath, columnNames);
390389
+ const axisColumnArrs = columnNames.map((name2) => {
390390
+ const column2 = arrowTable.getChild(name2);
390391
+ if (!column2) {
390392
+ throw new Error(`Column "${name2}" not found in the arrow table.`);
390393
+ }
390394
+ return column2.toArray();
390395
+ });
390396
+ return axisColumnArrs[0];
390397
+ }
390297
390398
  /**
390298
390399
  *
390299
390400
  * @param {string} elementPath
@@ -390303,23 +390404,25 @@ class SpatialDataPointsSource extends SpatialDataTableSource {
390303
390404
  * shape: [number, number],
390304
390405
  * }>} A promise for a zarr array containing the data.
390305
390406
  */
390306
- async loadPointsInRect(elementPath, tileBbox, signal) {
390407
+ async loadPointsInRect(elementPath, tileBbox, signal, featureIndexColumnNameFromOptions, mortonCodeColumn) {
390307
390408
  const parquetPath = getParquetPath(elementPath);
390308
390409
  const zattrs = await this.loadSpatialDataElementAttrs(elementPath);
390309
390410
  const {
390310
390411
  // axes,
390311
- // spatialdata_attrs: spatialDataAttrs,
390412
+ spatialdata_attrs: spatialDataAttrs,
390312
390413
  // The bounding box (extent) of all points.
390313
390414
  // Required for un-normalization from uints back to floats.
390314
390415
  // TODO: decide whether these will be stored here or somewhere else.
390315
390416
  // Reference: https://github.com/vitessce/vitessce-python/pull/476#issuecomment-3362656956
390316
390417
  bounding_box: allPointsBbox
390317
390418
  } = zattrs;
390318
- return this.loadParquetTableInRect(parquetPath, tileBbox, allPointsBbox, signal);
390419
+ const { feature_key: featureKey } = spatialDataAttrs;
390420
+ const featureIndexColumnName = featureIndexColumnNameFromOptions ?? `${featureKey}_codes`;
390421
+ return this.loadParquetTableInRect(parquetPath, tileBbox, allPointsBbox, signal, featureIndexColumnName, mortonCodeColumn);
390319
390422
  }
390320
- async supportsLoadPointsInRect(elementPath) {
390423
+ async supportsLoadPointsInRect(elementPath, featureIndexColumnName, mortonCodeColumn) {
390321
390424
  const parquetPath = getParquetPath(elementPath);
390322
- return this._supportsTiledPoints(parquetPath);
390425
+ return this._supportsTiledPoints(parquetPath, featureIndexColumnName, mortonCodeColumn);
390323
390426
  }
390324
390427
  }
390325
390428
  class OmeTiffSource {
@@ -1,6 +1,6 @@
1
- import { aw as log, ax as isEqual, ay as atLeastLogLevel, ar as Data3DTexture, as as RedFormat, az as UnsignedByteType, l as LinearFilter, aA as RedIntegerFormat, aB as UnsignedIntType, m as NearestFilter, aC as LogLevel, e as Vector3, V as Vector2, ag as Vector4, ae as UniformsUtils, aq as CoordinationType, aD as WebGLMultipleRenderTargets, aE as RGBAFormat, av as Scene, W as OrthographicCamera, ad as ShaderMaterial, z as Mesh, aF as PlaneGeometry, aG as useEventCallback, ao as jsxRuntimeExports, aH as GLSL3, am as BackSide } from "./index-P1FfHDqS.js";
1
+ import { aw as log, ax as isEqual, ay as atLeastLogLevel, ar as Data3DTexture, as as RedFormat, az as UnsignedByteType, l as LinearFilter, aA as RedIntegerFormat, aB as UnsignedIntType, m as NearestFilter, aC as LogLevel, e as Vector3, V as Vector2, ag as Vector4, ae as UniformsUtils, aq as CoordinationType, aD as WebGLMultipleRenderTargets, aE as RGBAFormat, av as Scene, W as OrthographicCamera, ad as ShaderMaterial, z as Mesh, aF as PlaneGeometry, aG as useEventCallback, ao as jsxRuntimeExports, aH as GLSL3, am as BackSide } from "./index-B_ya-V9U.js";
2
2
  import { useRef, useState, useMemo, useEffect, Suspense } from "react";
3
- import { u as useThree, a as useFrame, O as OrbitControls, C as Canvas } from "./OrbitControls-XnzJtnMh.js";
3
+ import { u as useThree, a as useFrame, O as OrbitControls, C as Canvas } from "./OrbitControls-BfPaE-Sg.js";
4
4
  const BRICK_SIZE = 32;
5
5
  const BRICK_CACHE_SIZE_X = 64;
6
6
  const BRICK_CACHE_SIZE_Y = 64;
@@ -1,7 +1,7 @@
1
- import { G as Group, M as Matrix4, T as TrianglesDrawMode, a as TriangleFanDrawMode, b as TriangleStripDrawMode, R as REVISION, L as Loader, c as LoaderUtils, F as FileLoader, d as MeshPhysicalMaterial, V as Vector2, C as Color, S as SpotLight, P as PointLight, D as DirectionalLight, e as Vector3, I as InstancedMesh, Q as Quaternion, O as Object3D, f as TextureLoader, g as ImageBitmapLoader, B as BufferAttribute, h as InterleavedBuffer, i as LinearMipmapLinearFilter, N as NearestMipmapLinearFilter, j as LinearMipmapNearestFilter, k as NearestMipmapNearestFilter, l as LinearFilter, m as NearestFilter, n as RepeatWrapping, o as MirroredRepeatWrapping, p as ClampToEdgeWrapping, q as PointsMaterial, r as Material, s as LineBasicMaterial, t as MeshStandardMaterial, u as DoubleSide, v as MeshBasicMaterial, w as PropertyBinding, x as BufferGeometry, y as SkinnedMesh, z as Mesh, A as LineSegments, E as Line$1, H as LineLoop, J as Points, K as PerspectiveCamera, U as MathUtils, W as OrthographicCamera, X as Skeleton, Y as InterpolateDiscrete, Z as InterpolateLinear, _ as AnimationClip, $ as Bone, a0 as InterleavedBufferAttribute, a1 as Texture, a2 as VectorKeyframeTrack, a3 as QuaternionKeyframeTrack, a4 as NumberKeyframeTrack, a5 as FrontSide, a6 as Interpolant, a7 as Box3, a8 as Sphere, a9 as InstancedBufferGeometry, aa as Float32BufferAttribute, ab as InstancedInterleavedBuffer, ac as WireframeGeometry, ad as ShaderMaterial, ae as UniformsUtils, af as UniformsLib, ag as Vector4, ah as Line3, ai as SphereGeometry, aj as _extends, ak as Plane, al as Triangle, am as BackSide, an as Ray$1, ao as jsxRuntimeExports, ap as Matrix3, aq as CoordinationType, ar as Data3DTexture, as as RedFormat, at as FloatType, au as getImageSize, av as Scene } from "./index-P1FfHDqS.js";
1
+ import { G as Group, M as Matrix4, T as TrianglesDrawMode, a as TriangleFanDrawMode, b as TriangleStripDrawMode, R as REVISION, L as Loader, c as LoaderUtils, F as FileLoader, d as MeshPhysicalMaterial, V as Vector2, C as Color, S as SpotLight, P as PointLight, D as DirectionalLight, e as Vector3, I as InstancedMesh, Q as Quaternion, O as Object3D, f as TextureLoader, g as ImageBitmapLoader, B as BufferAttribute, h as InterleavedBuffer, i as LinearMipmapLinearFilter, N as NearestMipmapLinearFilter, j as LinearMipmapNearestFilter, k as NearestMipmapNearestFilter, l as LinearFilter, m as NearestFilter, n as RepeatWrapping, o as MirroredRepeatWrapping, p as ClampToEdgeWrapping, q as PointsMaterial, r as Material, s as LineBasicMaterial, t as MeshStandardMaterial, u as DoubleSide, v as MeshBasicMaterial, w as PropertyBinding, x as BufferGeometry, y as SkinnedMesh, z as Mesh, A as LineSegments, E as Line$1, H as LineLoop, J as Points, K as PerspectiveCamera, U as MathUtils, W as OrthographicCamera, X as Skeleton, Y as InterpolateDiscrete, Z as InterpolateLinear, _ as AnimationClip, $ as Bone, a0 as InterleavedBufferAttribute, a1 as Texture, a2 as VectorKeyframeTrack, a3 as QuaternionKeyframeTrack, a4 as NumberKeyframeTrack, a5 as FrontSide, a6 as Interpolant, a7 as Box3, a8 as Sphere, a9 as InstancedBufferGeometry, aa as Float32BufferAttribute, ab as InstancedInterleavedBuffer, ac as WireframeGeometry, ad as ShaderMaterial, ae as UniformsUtils, af as UniformsLib, ag as Vector4, ah as Line3, ai as SphereGeometry, aj as _extends, ak as Plane, al as Triangle, am as BackSide, an as Ray$1, ao as jsxRuntimeExports, ap as Matrix3, aq as CoordinationType, ar as Data3DTexture, as as RedFormat, at as FloatType, au as getImageSize, av as Scene } from "./index-B_ya-V9U.js";
2
2
  import * as React from "react";
3
3
  import { useRef, useEffect, useState, forwardRef } from "react";
4
- import { u as useThree, a as useFrame, c as create, e as extend, b as createPortal, O as OrbitControls, C as Canvas } from "./OrbitControls-XnzJtnMh.js";
4
+ import { u as useThree, a as useFrame, c as create, e as extend, b as createPortal, O as OrbitControls, C as Canvas } from "./OrbitControls-BfPaE-Sg.js";
5
5
  const isPromise = (promise) => typeof promise === "object" && typeof promise.then === "function";
6
6
  const globalCache = [];
7
7
  function shallowEqualArrays(arrA, arrB, equal = (a, b) => a === b) {
@@ -5027,7 +5027,7 @@ const Text = /* @__PURE__ */ React.forwardRef(({
5027
5027
  const {
5028
5028
  Text: TextMeshImpl,
5029
5029
  preloadFont
5030
- } = suspend(async () => import("./troika-three-text.esm-Cz3t4bdh.js"), []);
5030
+ } = suspend(async () => import("./troika-three-text.esm-C2e9XS8V.js"), []);
5031
5031
  const invalidate = useThree(({
5032
5032
  invalidate: invalidate2
5033
5033
  }) => invalidate2);
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { c0, bX, bV, bW, c4, c5, bY, cg, ce, cc, cf, cd, bU, cb, bZ, bT, bS, c2, c8, c1, c3, c7, c6, b$, c9, ca, cl, co, ci, cp, cq, cj, cm, cn, ck, b_, ch } from "./index-P1FfHDqS.js";
1
+ import { c0, bX, bV, bW, c4, c5, bY, cg, ce, cc, cf, cd, bU, cb, bZ, bT, bS, c2, c8, c1, c3, c7, c6, b$, c9, ca, cl, co, ci, cp, cq, cj, cm, cn, ck, b_, ch } from "./index-B_ya-V9U.js";
2
2
  import "react";
3
3
  export {
4
4
  c0 as CoordinationLevel,
@@ -1,4 +1,4 @@
1
- import { aZ as BaseDecoder } from "./index-P1FfHDqS.js";
1
+ import { aZ as BaseDecoder } from "./index-B_ya-V9U.js";
2
2
  const dctZigZag = new Int32Array([
3
3
  0,
4
4
  1,
@@ -1,5 +1,5 @@
1
1
  import { i as inflate_1 } from "./pako.esm-SxljTded.js";
2
- import { aI as getDefaultExportFromCjs, aZ as BaseDecoder, a_ as LercParameters, a$ as LercAddCompression } from "./index-P1FfHDqS.js";
2
+ import { aI as getDefaultExportFromCjs, aZ as BaseDecoder, a_ as LercParameters, a$ as LercAddCompression } from "./index-B_ya-V9U.js";
3
3
  var LercDecode = { exports: {} };
4
4
  var hasRequiredLercDecode;
5
5
  function requireLercDecode() {
@@ -1,4 +1,4 @@
1
- import { aZ as BaseDecoder } from "./index-P1FfHDqS.js";
1
+ import { aZ as BaseDecoder } from "./index-B_ya-V9U.js";
2
2
  const MIN_BITS = 9;
3
3
  const CLEAR_CODE = 256;
4
4
  const EOI_CODE = 257;
@@ -1,4 +1,4 @@
1
- import { aZ as BaseDecoder } from "./index-P1FfHDqS.js";
1
+ import { aZ as BaseDecoder } from "./index-B_ya-V9U.js";
2
2
  class PackbitsDecoder extends BaseDecoder {
3
3
  decodeBlock(buffer) {
4
4
  const dataView = new DataView(buffer);
@@ -1,4 +1,4 @@
1
- import { aZ as BaseDecoder } from "./index-P1FfHDqS.js";
1
+ import { aZ as BaseDecoder } from "./index-B_ya-V9U.js";
2
2
  class RawDecoder extends BaseDecoder {
3
3
  decodeBlock(buffer) {
4
4
  return buffer;
@@ -1,4 +1,4 @@
1
- import { bN as MeshDistanceMaterial, bO as MeshDepthMaterial, bP as RGBADepthPacking, ae as UniformsUtils, bQ as ShaderChunk, a9 as InstancedBufferGeometry, a8 as Sphere, a7 as Box3, am as BackSide, u as DoubleSide, z as Mesh, a5 as FrontSide, v as MeshBasicMaterial, C as Color, e as Vector3, M as Matrix4, V as Vector2, ap as Matrix3, ag as Vector4, a1 as Texture, l as LinearFilter, aF as PlaneGeometry, x as BufferGeometry, aa as Float32BufferAttribute, bR as InstancedBufferAttribute } from "./index-P1FfHDqS.js";
1
+ import { bN as MeshDistanceMaterial, bO as MeshDepthMaterial, bP as RGBADepthPacking, ae as UniformsUtils, bQ as ShaderChunk, a9 as InstancedBufferGeometry, a8 as Sphere, a7 as Box3, am as BackSide, u as DoubleSide, z as Mesh, a5 as FrontSide, v as MeshBasicMaterial, C as Color, e as Vector3, M as Matrix4, V as Vector2, ap as Matrix3, ag as Vector4, a1 as Texture, l as LinearFilter, aF as PlaneGeometry, x as BufferGeometry, aa as Float32BufferAttribute, bR as InstancedBufferAttribute } from "./index-B_ya-V9U.js";
2
2
  function workerBootstrap() {
3
3
  var modules = /* @__PURE__ */ Object.create(null);
4
4
  function registerModule(ref, callback) {
@@ -1,4 +1,4 @@
1
- import { aZ as BaseDecoder } from "./index-P1FfHDqS.js";
1
+ import { aZ as BaseDecoder } from "./index-B_ya-V9U.js";
2
2
  class WebImageDecoder extends BaseDecoder {
3
3
  constructor() {
4
4
  super();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vitessce/dev",
3
- "version": "3.9.0",
3
+ "version": "3.9.2",
4
4
  "author": "HIDIVE Lab at HMS",
5
5
  "homepage": "http://vitessce.io",
6
6
  "repository": {
@@ -16,10 +16,10 @@
16
16
  "dist-tsc"
17
17
  ],
18
18
  "dependencies": {
19
- "@vitessce/all": "3.9.0",
20
- "@vitessce/config": "3.9.0",
21
- "@vitessce/constants": "3.9.0",
22
- "@vitessce/export-utils": "3.9.0"
19
+ "@vitessce/config": "3.9.2",
20
+ "@vitessce/constants": "3.9.2",
21
+ "@vitessce/export-utils": "3.9.2",
22
+ "@vitessce/all": "3.9.2"
23
23
  },
24
24
  "devDependencies": {
25
25
  "@vitejs/plugin-react": "^4.5.0",