@haniffalab/cherita-react 1.4.1-dev.2025-08-13.6fc43290 → 1.4.1-dev.2025-08-18.6fbf7a74

package/dist/esm/components/scatterplot/Scatterplot.js

@@ -23,6 +23,7 @@ import { rgbToHex, useColor } from "../../helpers/color-helper";
 import { MapHelper } from "../../helpers/map-helper";
 import { Legend } from "../../utils/Legend";
 import { LoadingLinear, LoadingSpinner } from "../../utils/LoadingIndicators";
+import { useSelectedObs } from "../../utils/Resolver";
 import { formatNumerical } from "../../utils/string";
 import { useLabelObsData } from "../../utils/zarrData";
 window.deck.log.level = 1;
@@ -35,7 +36,7 @@ const INITIAL_VIEW_STATE = {
   bearing: 0
 };
 export function Scatterplot(_ref) {
-  var _settings$selectedObs2, _settings$selectedObs5, _settings$selectedObs8, _features$features2, _obsmData$serverError, _xData$serverError, _obsData$serverError, _labelObsData$serverE, _settings$selectedVar, _settings$selectedObs9, _data$positions;
+  var _features$features2, _obsmData$serverError, _labelObsData$serverE, _settings$selectedVar, _data$positions;
   let {
     radius = null,
     setShowObs,
@@ -66,6 +67,8 @@ export function Scatterplot(_ref) {
     values: []
   });
   const [coordsError, setCoordsError] = useState(null);
+  const [dataError, setDataError] = useState(null);
+  const selectedObs = useSelectedObs();
 
   // EditableGeoJsonLayer
   const [mode, setMode] = useState(() => ViewMode);
@@ -99,9 +102,21 @@ export function Scatterplot(_ref) {
       setData(d => {
         let values = d.values;
         if (settings.colorEncoding === COLOR_ENCODINGS.VAR) {
-          values = !xData.serverError ? xData.data : values;
+          if (!xData.serverError) {
+            values = xData.data;
+            setDataError(null);
+          } else {
+            values = [];
+            setDataError(xData.serverError);
+          }
         } else if (settings.colorEncoding === COLOR_ENCODINGS.OBS) {
-          values = !obsData.serverError ? obsData.data : values;
+          if (!obsData.serverError) {
+            values = obsData.data;
+            setDataError(null);
+          } else {
+            values = [];
+            setDataError(obsData.serverError);
+          }
         }
         if (!obsmData.serverError && obsmData.data) {
           if (obsmData.data[0].length !== 2) {
@@ -174,8 +189,7 @@ export function Scatterplot(_ref) {
     getOriginalIndex,
     sortedIndexMap
   } = useMemo(() => {
-    var _settings$selectedObs;
-    if ((settings.colorEncoding === COLOR_ENCODINGS.VAR || settings.colorEncoding === COLOR_ENCODINGS.OBS && ((_settings$selectedObs = settings.selectedObs) === null || _settings$selectedObs === void 0 ? void 0 : _settings$selectedObs.type) === OBS_TYPES.CONTINUOUS) && data.positions && data.values && data.positions.length === data.values.length) {
+    if ((settings.colorEncoding === COLOR_ENCODINGS.VAR || settings.colorEncoding === COLOR_ENCODINGS.OBS && (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.CONTINUOUS) && data.positions && data.values && data.positions.length === data.values.length) {
       const sortedIndices = _.map(data.values, (_v, i) => i).sort((a, b) => data.values[a] - data.values[b]);
       const sortedIndexMap = new Map(_.map(sortedIndices, (originalIndex, sortedIndex) => [originalIndex, sortedIndex]));
       return {
@@ -192,24 +206,17 @@ export function Scatterplot(_ref) {
       // return original index
       sortedIndexMap: identitySortedIndexMap // return original index
     };
-  }, [data, identityGetOriginalIndex, identitySortedIndexMap, settings.colorEncoding, (_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.type]);
+  }, [data, identityGetOriginalIndex, identitySortedIndexMap, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type, settings.colorEncoding]);
   const sortedObsIndices = useMemo(() => {
     return obsIndices ? new Set(Array.from(obsIndices, i => sortedIndexMap.get(i))) : obsIndices;
   }, [obsIndices, sortedIndexMap]);
   const isCategorical = useMemo(() => {
     if (settings.colorEncoding === COLOR_ENCODINGS.OBS) {
-      var _settings$selectedObs3, _settings$selectedObs4;
-      return ((_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.type) === OBS_TYPES.CATEGORICAL || ((_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.type) === OBS_TYPES.BOOLEAN;
+      return (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.CATEGORICAL || (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.BOOLEAN;
     } else {
       return false;
     }
-  }, [settings.colorEncoding, (_settings$selectedObs5 = settings.selectedObs) === null || _settings$selectedObs5 === void 0 ? void 0 : _settings$selectedObs5.type]);
-  useEffect(() => {
-    dispatch({
-      type: "set.controls.valueRange",
-      valueRange: [valueMin, valueMax]
-    });
-  }, [dispatch, valueMax, valueMin]);
+  }, [settings.colorEncoding, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type]);
   const {
     min,
     max
@@ -218,7 +225,6 @@ export function Scatterplot(_ref) {
     max: settings.controls.range[1] * (valueMax - valueMin) + valueMin
   };
   const getFillColor = useCallback((_d, _ref2) => {
-    var _settings$selectedObs6, _settings$selectedObs7;
     let {
       index
     } = _ref2;
@@ -227,10 +233,10 @@ export function Scatterplot(_ref) {
       value: (sortedData.values[index] - min) / (max - min),
       categorical: isCategorical,
       grayOut: grayOut
-    }, useUnsColors && settings.colorEncoding === COLOR_ENCODINGS.OBS && (_settings$selectedObs6 = settings.selectedObs) !== null && _settings$selectedObs6 !== void 0 && _settings$selectedObs6.colors ? {
-      colorscale: (_settings$selectedObs7 = settings.selectedObs) === null || _settings$selectedObs7 === void 0 ? void 0 : _settings$selectedObs7.colors
+    }, useUnsColors && settings.colorEncoding === COLOR_ENCODINGS.OBS && selectedObs !== null && selectedObs !== void 0 && selectedObs.colors ? {
+      colorscale: selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.colors
     } : {})) || [0, 0, 0, 100];
-  }, [isPending, sortedObsIndices, getColor, sortedData.values, min, max, isCategorical, useUnsColors, settings.colorEncoding, (_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.colors]);
+  }, [isPending, sortedObsIndices, getColor, sortedData.values, min, max, isCategorical, useUnsColors, settings.colorEncoding, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.colors]);
 
   // @TODO: add support for pseudospatial hover to reflect in radius
   const getRadius = useCallback((_d, _ref3) => {
@@ -328,11 +334,9 @@ export function Scatterplot(_ref) {
     } = _ref5;
     if (!object || (object === null || object === void 0 ? void 0 : object.type) === "Feature") return;
     const text = [];
-    if (settings.colorEncoding === COLOR_ENCODINGS.OBS && settings.selectedObs && !_.some(settings.labelObs, {
-      name: settings.selectedObs.name
-    })) {
+    if (settings.colorEncoding === COLOR_ENCODINGS.OBS && selectedObs && !_.includes(settings.labelObs, selectedObs.name)) {
       var _data$values;
-      text.push(getLabel(settings.selectedObs, (_data$values = data.values) === null || _data$values === void 0 ? void 0 : _data$values[getOriginalIndex(index)]));
+      text.push(getLabel(selectedObs, (_data$values = data.values) === null || _data$values === void 0 ? void 0 : _data$values[getOriginalIndex(index)]));
     }
     if (settings.colorEncoding === COLOR_ENCODINGS.VAR && settings.selectedVar) {
       var _data$values2;
@@ -340,7 +344,7 @@ export function Scatterplot(_ref) {
     }
     if (settings.labelObs.length) {
       text.push(..._.map(labelObsData.data, (v, k) => {
-        const labelObs = _.find(settings.labelObs, o => o.name === k);
+        const labelObs = settings.data.obs[k];
         return getLabel(labelObs, v[getOriginalIndex(index)]);
       }));
     }
@@ -358,7 +362,7 @@ export function Scatterplot(_ref) {
       }
     };
   };
-  const error = settings.selectedObsm && ((_obsmData$serverError = obsmData.serverError) === null || _obsmData$serverError === void 0 ? void 0 : _obsmData$serverError.length) || settings.colorEncoding === COLOR_ENCODINGS.VAR && ((_xData$serverError = xData.serverError) === null || _xData$serverError === void 0 ? void 0 : _xData$serverError.length) || settings.colorEncoding === COLOR_ENCODINGS.OBS && ((_obsData$serverError = obsData.serverError) === null || _obsData$serverError === void 0 ? void 0 : _obsData$serverError.length) || settings.labelObs.length && ((_labelObsData$serverE = labelObsData.serverError) === null || _labelObsData$serverE === void 0 ? void 0 : _labelObsData$serverE.length) || coordsError;
+  const error = settings.selectedObsm && ((_obsmData$serverError = obsmData.serverError) === null || _obsmData$serverError === void 0 ? void 0 : _obsmData$serverError.length) || dataError || settings.labelObs.length && ((_labelObsData$serverE = labelObsData.serverError) === null || _labelObsData$serverE === void 0 ? void 0 : _labelObsData$serverE.length) || coordsError;
   return /*#__PURE__*/React.createElement("div", {
     className: "cherita-container-scatterplot"
   }, /*#__PURE__*/React.createElement("div", {
@@ -407,13 +411,15 @@ export function Scatterplot(_ref) {
     className: "cherita-toolbox-footer"
   }, !!error && !isRendering && /*#__PURE__*/React.createElement(Alert, {
     variant: "danger"
-  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+  }, /*#__PURE__*/React.createElement(Alert.Heading, null, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
     icon: faTriangleExclamation
-  }), "\xA0Error loading data"), /*#__PURE__*/React.createElement(Toolbox, {
-    mode: settings.colorEncoding === COLOR_ENCODINGS.VAR ? (_settings$selectedVar = settings.selectedVar) === null || _settings$selectedVar === void 0 ? void 0 : _settings$selectedVar.name : settings.colorEncoding === COLOR_ENCODINGS.OBS ? (_settings$selectedObs9 = settings.selectedObs) === null || _settings$selectedObs9 === void 0 ? void 0 : _settings$selectedObs9.name : null,
+  }), "\xA0Error loading data"), /*#__PURE__*/React.createElement("p", {
+    className: "mb-0"
+  }, error.message)), /*#__PURE__*/React.createElement(Toolbox, {
+    mode: settings.colorEncoding === COLOR_ENCODINGS.VAR ? (_settings$selectedVar = settings.selectedVar) === null || _settings$selectedVar === void 0 ? void 0 : _settings$selectedVar.name : settings.colorEncoding === COLOR_ENCODINGS.OBS ? selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.name : null,
     obsLength: parseInt((_data$positions = data.positions) === null || _data$positions === void 0 ? void 0 : _data$positions.length),
     slicedLength: parseInt(slicedLength)
-  })), /*#__PURE__*/React.createElement(Legend, {
+  })), !error && /*#__PURE__*/React.createElement(Legend, {
     isCategorical: isCategorical,
     min: min,
     max: max

package/dist/esm/components/scatterplot/ScatterplotControls.js

@@ -2,16 +2,22 @@ import React, { useEffect } from "react";
 import { Box, Slider, Typography } from "@mui/material";
 import { Form } from "react-bootstrap";
 import { COLOR_ENCODINGS, OBS_TYPES } from "../../constants/constants";
+import { useFilteredData } from "../../context/FilterContext";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
+import { useSelectedObs } from "../../utils/Resolver";
 import { ColorscaleSelect } from "../controls/Controls";
 export const ScatterplotControls = () => {
-  var _settings$selectedObs;
   const settings = useSettings();
   const dispatch = useSettingsDispatch();
   const [sliderValue, setSliderValue] = React.useState(settings.controls.range || [0, 1]);
-  const isCategorical = settings.colorEncoding === COLOR_ENCODINGS.OBS ? ((_settings$selectedObs = settings.selectedObs) === null || _settings$selectedObs === void 0 ? void 0 : _settings$selectedObs.type) === OBS_TYPES.CATEGORICAL : false;
+  const {
+    valueMin,
+    valueMax
+  } = useFilteredData();
+  const selectedObs = useSelectedObs();
+  const isCategorical = settings.colorEncoding === COLOR_ENCODINGS.OBS ? (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === OBS_TYPES.CATEGORICAL : false;
   const valueLabelFormat = value => {
-    return (value * (settings.controls.valueRange[1] - settings.controls.valueRange[0]) + settings.controls.valueRange[0]).toFixed(2);
+    return (value * (valueMax - valueMin) + valueMin).toFixed(2);
   };
   const marks = [{
     value: 0,

package/dist/esm/components/var-list/VarList.js

@@ -18,6 +18,7 @@ import { useFilteredData } from "../../context/FilterContext";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { LoadingSpinner } from "../../utils/LoadingIndicators";
 import { useFetch } from "../../utils/requests";
+import { useSelectedMultiVar, useSelectedVar, useSettingsVars } from "../../utils/Resolver";
 export const useVarMean = function (varKeys) {
   let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const ENDPOINT = "matrix/mean";
@@ -29,7 +30,7 @@ export const useVarMean = function (varKeys) {
     url: dataset.url,
     varKeys: _.map(varKeys, v => v.isSet ? {
       name: v.name,
-      indices: v.vars.map(v => v.index)
+      indices: v.vars.map(vv => vv.index)
     } : v.index),
     obsIndices: obsIndices,
     varNamesCol: dataset.varNamesCol
@@ -39,7 +40,7 @@ export const useVarMean = function (varKeys) {
       return _objectSpread(_objectSpread({}, p), {}, {
         varKeys: _.map(varKeys, v => v.isSet ? {
           name: v.name,
-          indices: v.vars.map(v => v.index)
+          indices: v.vars.map(vv => vv.index)
         } : v.index),
         obsIndices: obsIndices
       });
@@ -56,42 +57,43 @@ export const sortMeans = (i, means) => {
   return means[i.name] || _.min(_.values(means)) - 1;
 };
 export function VarNamesList(_ref) {
-  var _settings$selectedVar, _settings$selectedVar2;
   let {
     mode = SELECTION_MODES.SINGLE,
     displayName = "genes"
   } = _ref;
   const settings = useSettings();
   const dispatch = useSettingsDispatch();
-  const [active, setActive] = useState(mode === SELECTION_MODES.SINGLE ? ((_settings$selectedVar = settings.selectedVar) === null || _settings$selectedVar === void 0 ? void 0 : _settings$selectedVar.matrix_index) || ((_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.name) : settings.selectedMultiVar.map(i => i.matrix_index || i.name));
+  const selectedVar = useSelectedVar();
+  const selectedMultiVar = useSelectedMultiVar();
+  const settingsVars = useSettingsVars();
+  const [active, setActive] = useState(mode === SELECTION_MODES.SINGLE ? (selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.matrix_index) || (selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name) : selectedMultiVar.map(i => i.matrix_index || i.name));
   const [sortedVars, setSortedVars] = useState([]);
   useEffect(() => {
     if (mode === SELECTION_MODES.SINGLE) {
-      var _settings$selectedVar3, _settings$selectedVar4;
-      setActive(((_settings$selectedVar3 = settings.selectedVar) === null || _settings$selectedVar3 === void 0 ? void 0 : _settings$selectedVar3.matrix_index) || ((_settings$selectedVar4 = settings.selectedVar) === null || _settings$selectedVar4 === void 0 ? void 0 : _settings$selectedVar4.name));
+      setActive((selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.matrix_index) || (selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name));
     }
-  }, [mode, settings.selectedVar]);
+  }, [mode, selectedVar]);
   useEffect(() => {
     if (mode === SELECTION_MODES.MULTIPLE) {
-      setActive(settings.selectedMultiVar.map(i => i.matrix_index || i.name));
+      setActive(selectedMultiVar.map(i => i.matrix_index || i.name));
     }
-  }, [mode, settings.selectedMultiVar]);
-  const varMeans = useVarMean(settings.vars, settings.varSort.var.sort === VAR_SORT.MATRIX);
+  }, [mode, selectedMultiVar]);
+  const varMeans = useVarMean(settingsVars, settings.varSort.var.sort === VAR_SORT.MATRIX);
 
   // @TODO: deferr sortedVars ?
   useEffect(() => {
     if (settings.varSort.var.sort === VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError && varMeans.fetchedData) {
-        setSortedVars(_.orderBy(settings.vars, o => {
+        setSortedVars(_.orderBy(settingsVars, o => {
           return sortMeans(o, varMeans.fetchedData);
         }, settings.varSort.var.sortOrder));
       }
     } else if (settings.varSort.var.sort === VAR_SORT.NAME) {
-      setSortedVars(_.orderBy(settings.vars, "name", settings.varSort.var.sortOrder));
+      setSortedVars(_.orderBy(settingsVars, "name", settings.varSort.var.sortOrder));
     } else {
-      setSortedVars(settings.vars);
+      setSortedVars(settingsVars);
     }
-  }, [settings.varSort.var.sort, settings.varSort.var.sortOrder, varMeans.isPending, varMeans.serverError, varMeans.fetchedData, settings.vars]);
+  }, [settings.varSort.var.sort, settings.varSort.var.sortOrder, varMeans.isPending, varMeans.serverError, varMeans.fetchedData, settingsVars]);
   const makeListItem = item => {
     return /*#__PURE__*/React.createElement(ListGroup.Item, {
       key: item.matrix_index

package/dist/esm/components/violin/Violin.js

@@ -15,9 +15,9 @@ import { useFilteredData } from "../../context/FilterContext";
 import { useSettings } from "../../context/SettingsContext";
 import { LoadingSpinner } from "../../utils/LoadingIndicators";
 import { useDebouncedFetch } from "../../utils/requests";
+import { useSelectedMultiVar, useSelectedObs, useSelectedVar } from "../../utils/Resolver";
 import { ControlsPlotlyToolbar, ObsPlotlyToolbar, VarPlotlyToolbar } from "../toolbar/Toolbar";
 export function Violin(_ref) {
-  var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     mode = VIOLIN_MODES.MULTIKEY,
     showObsBtn = false,
@@ -37,6 +37,9 @@ export function Violin(_ref) {
   const [data, setData] = useState([]);
   const [layout, setLayout] = useState({});
   const [hasSelections, setHasSelections] = useState(false);
+  const selectedMultiVar = useSelectedMultiVar();
+  const selectedVar = useSelectedVar();
+  const selectedObs = useSelectedObs();
   const [params, setParams] = useState(_objectSpread({
     url: dataset.url,
     mode: mode,
@@ -44,22 +47,19 @@ export function Violin(_ref) {
     varNamesCol: dataset.varNamesCol
   }, {
     [VIOLIN_MODES.MULTIKEY]: {
-      varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+      varKeys: selectedMultiVar.map(i => i.isSet ? {
         name: i.name,
         indices: i.vars.map(v => v.index)
       } : i.index),
       obsKeys: [] // @TODO: implement
     },
     [VIOLIN_MODES.GROUPBY]: {
-      varKey: (_settings$selectedVar = settings.selectedVar) !== null && _settings$selectedVar !== void 0 && _settings$selectedVar.isSet ? {
-        name: (_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.name,
-        indices: (_settings$selectedVar3 = settings.selectedVar) === null || _settings$selectedVar3 === void 0 ? void 0 : _settings$selectedVar3.vars.map(v => v.index)
-      } : (_settings$selectedVar4 = settings.selectedVar) === null || _settings$selectedVar4 === void 0 ? void 0 : _settings$selectedVar4.index,
-      obsCol: settings.selectedObs,
-      obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _.difference(_.values((_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.codes), (_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.omit).map(c => {
-        var _settings$selectedObs4;
-        return (_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.codesMap[c];
-      }),
+      varKey: selectedVar !== null && selectedVar !== void 0 && selectedVar.isSet ? {
+        name: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name,
+        indices: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars.map(v => v.index)
+      } : selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index,
+      obsCol: selectedObs,
+      obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
       obsIndices: isSliced ? [...(obsIndices || [])] : null
     }
   }[mode]));
@@ -67,7 +67,7 @@ export function Violin(_ref) {
 
   useEffect(() => {
     if (mode === VIOLIN_MODES.MULTIKEY) {
-      if (settings.selectedMultiVar.length) {
+      if (selectedMultiVar.length) {
         setHasSelections(true);
       } else {
         setHasSelections(false);
@@ -76,7 +76,7 @@ export function Violin(_ref) {
         return _objectSpread(_objectSpread({}, p), {}, {
           url: dataset.url,
           mode: mode,
-          varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+          varKeys: selectedMultiVar.map(i => i.isSet ? {
             name: i.name,
             indices: i.vars.map(v => v.index)
           } : i.index),
@@ -85,32 +85,28 @@ export function Violin(_ref) {
         });
       });
     } else if (mode === VIOLIN_MODES.GROUPBY) {
-      if (settings.selectedObs && settings.selectedVar) {
+      if (selectedObs && selectedVar) {
         setHasSelections(true);
       } else {
         setHasSelections(false);
       }
       setParams(p => {
-        var _settings$selectedVar5, _settings$selectedVar6, _settings$selectedVar7, _settings$selectedVar8, _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
         return _objectSpread(_objectSpread({}, p), {}, {
           url: dataset.url,
           mode: mode,
-          varKey: (_settings$selectedVar5 = settings.selectedVar) !== null && _settings$selectedVar5 !== void 0 && _settings$selectedVar5.isSet ? {
-            name: (_settings$selectedVar6 = settings.selectedVar) === null || _settings$selectedVar6 === void 0 ? void 0 : _settings$selectedVar6.name,
-            indices: (_settings$selectedVar7 = settings.selectedVar) === null || _settings$selectedVar7 === void 0 ? void 0 : _settings$selectedVar7.vars.map(v => v.index)
-          } : (_settings$selectedVar8 = settings.selectedVar) === null || _settings$selectedVar8 === void 0 ? void 0 : _settings$selectedVar8.index,
-          obsCol: settings.selectedObs,
-          obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _.difference(_.values((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.codes), (_settings$selectedObs7 = settings.selectedObs) === null || _settings$selectedObs7 === void 0 ? void 0 : _settings$selectedObs7.omit).map(c => {
-            var _settings$selectedObs8;
-            return (_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.codesMap[c];
-          }),
+          varKey: selectedVar !== null && selectedVar !== void 0 && selectedVar.isSet ? {
+            name: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name,
+            indices: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars.map(v => v.index)
+          } : selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index,
+          obsCol: selectedObs,
+          obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
           obsIndices: isSliced ? [...(obsIndices || [])] : null,
           scale: settings.controls.scale.violinplot,
           varNamesCol: dataset.varNamesCol
         });
       });
     }
-  }, [settings.controls.scale.violinplot, settings.selectedMultiVar, settings.selectedObs, settings.selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
+  }, [settings.controls.scale.violinplot, selectedMultiVar, selectedObs, selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
   const {
     fetchedData,
     isPending,

package/dist/esm/context/DatasetContext.js

@@ -50,7 +50,7 @@ const persistOptions = {
       return false;
     }
   },
-  buster: "1.4.1-dev.2025-08-13.6fc43290" || "0.0.0"
+  buster: "1.4.1-dev.2025-08-18.6fbf7a74" || "0.0.0"
   // @TODO: add maxAge and api version numbers as buster
 };
 const initialDataset = {
@@ -74,13 +74,13 @@ export function DatasetProvider(_ref2) {
   }, dataset_params));
   return /*#__PURE__*/React.createElement(DatasetContext.Provider, {
     value: dataset
+  }, /*#__PURE__*/React.createElement(PersistQueryClientProvider, {
+    client: queryClient,
+    persistOptions: persistOptions
   }, /*#__PURE__*/React.createElement(SettingsProvider, {
     dataset_url: dataset.url,
     defaultSettings: dataset.defaultSettings,
     canOverrideSettings: dataset.canOverrideSettings
-  }, /*#__PURE__*/React.createElement(PersistQueryClientProvider, {
-    client: queryClient,
-    persistOptions: persistOptions
   }, /*#__PURE__*/React.createElement(FilterProvider, null, /*#__PURE__*/React.createElement(ZarrDataProvider, null, children)))));
 }
 export function useDataset() {