@haniffalab/cherita-react 1.4.1-dev.2025-08-13.6fc43290 → 1.4.1-dev.2025-08-13.8f63c242

package/dist/cjs/components/dotplot/Dotplot.js

@@ -14,6 +14,7 @@ var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Resolver = require("../../utils/Resolver");
 var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -23,7 +24,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function Dotplot(_ref) {
-  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     showObsBtn = false,
     showVarsBtn = false,
@@ -44,14 +44,13 @@ function Dotplot(_ref) {
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
+  const selectedObs = (0, _Resolver.useSelectedObs)();
+  const selectedMultiVar = (0, _Resolver.useSelectedMultiVar)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
-    obsCol: settings.selectedObs,
-    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-    }),
-    varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: selectedObs,
+    obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+    varKeys: selectedMultiVar.map(i => i.isSet ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
@@ -64,21 +63,17 @@ function Dotplot(_ref) {
   // @TODO: set default scale
 
   (0, _react.useEffect)(() => {
-    if (settings.selectedObs && settings.selectedMultiVar.length) {
+    if (selectedObs && selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
     setParams(p => {
-      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
       return _objectSpread(_objectSpread({}, p), {}, {
         url: dataset.url,
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-        }),
-        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+        obsCol: selectedObs,
+        obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+        varKeys: selectedMultiVar.map(i => i.isSet ? {
           name: i.name,
           indices: i.vars.map(v => v.index)
         } : i.index),
@@ -89,7 +84,7 @@ function Dotplot(_ref) {
         varNamesCol: dataset.varNamesCol
       });
     });
-  }, [dataset.url, settings.selectedObs, settings.selectedMultiVar, settings.controls.scale.dotplot, settings.controls.meanOnlyExpressed, settings.controls.expressionCutoff, dataset.varNamesCol, isSliced, obsIndices]);
+  }, [dataset.url, selectedObs, settings.controls.scale.dotplot, settings.controls.meanOnlyExpressed, settings.controls.expressionCutoff, dataset.varNamesCol, isSliced, obsIndices, selectedMultiVar]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -110,6 +105,7 @@ function Dotplot(_ref) {
     if (hasSelections && !isPending && !serverError) {
       setData(fetchedData.data);
       setLayout(fetchedData.layout);
+      // @TODO: keep colorAxis range from settings
       dispatch({
         type: "set.controls.colorAxis",
         colorAxis: {

package/dist/cjs/components/heatmap/Heatmap.js

@@ -14,6 +14,7 @@ var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Resolver = require("../../utils/Resolver");
 var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -23,7 +24,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function Heatmap(_ref) {
-  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     showObsBtn = false,
     showVarsBtn = false,
@@ -43,14 +43,13 @@ function Heatmap(_ref) {
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
+  const selectedObs = (0, _Resolver.useSelectedObs)();
+  const selectedMultiVar = (0, _Resolver.useSelectedMultiVar)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
-    obsCol: settings.selectedObs,
-    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-    }),
-    varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: selectedObs,
+    obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+    varKeys: selectedMultiVar.map(i => i.isSet ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
@@ -58,21 +57,17 @@ function Heatmap(_ref) {
     varNamesCol: dataset.varNamesCol
   });
   (0, _react.useEffect)(() => {
-    if (settings.selectedObs && settings.selectedMultiVar.length) {
+    if (selectedObs && selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
     setParams(p => {
-      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
       return _objectSpread(_objectSpread({}, p), {}, {
         url: dataset.url,
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-        }),
-        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+        obsCol: selectedObs,
+        obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+        varKeys: selectedMultiVar.map(i => i.isSet ? {
           name: i.name,
           indices: i.vars.map(v => v.index)
         } : i.index),
@@ -80,7 +75,7 @@ function Heatmap(_ref) {
         varNamesCol: dataset.varNamesCol
       });
     });
-  }, [settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [selectedMultiVar, selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {

package/dist/cjs/components/matrixplot/Matrixplot.js

@@ -14,6 +14,7 @@ var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Resolver = require("../../utils/Resolver");
 var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -23,7 +24,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function Matrixplot(_ref) {
-  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     showObsBtn = false,
     showVarsBtn = false,
@@ -43,14 +43,13 @@ function Matrixplot(_ref) {
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
+  const selectedObs = (0, _Resolver.useSelectedObs)();
+  const selectedMultiVar = (0, _Resolver.useSelectedMultiVar)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
-    obsCol: settings.selectedObs,
-    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-    }),
-    varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: selectedObs,
+    obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+    varKeys: selectedMultiVar.map(i => i.isSet ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
@@ -59,21 +58,17 @@ function Matrixplot(_ref) {
     varNamesCol: dataset.varNamesCol
   });
   (0, _react.useEffect)(() => {
-    if (settings.selectedObs && settings.selectedMultiVar.length) {
+    if (selectedObs && selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
     setParams(p => {
-      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
       return _objectSpread(_objectSpread({}, p), {}, {
         url: dataset.url,
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-        }),
-        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+        obsCol: selectedObs,
+        obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+        varKeys: selectedMultiVar.map(i => i.isSet ? {
           name: i.name,
           indices: i.vars.map(v => v.index)
         } : i.index),
@@ -82,7 +77,7 @@ function Matrixplot(_ref) {
         varNamesCol: dataset.varNamesCol
       });
     });
-  }, [settings.controls.scale.matrixplot, settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [settings.controls.scale.matrixplot, selectedMultiVar, selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {

package/dist/cjs/components/obs-list/ObsItem.js

@@ -19,6 +19,7 @@ var _colorHelper = require("../../helpers/color-helper");
 var _Histogram = require("../../utils/Histogram");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Resolver = require("../../utils/Resolver");
 var _string = require("../../utils/string");
 var _VirtualizedList = require("../../utils/VirtualizedList");
 var _zarrData = require("../../utils/zarrData");
@@ -53,7 +54,6 @@ function getContinuousLabel(code, binEdges) {
   return "[ ".concat((0, _string.formatNumerical)(binEdges[code][0]), ", ").concat((0, _string.formatNumerical)(binEdges[code][1], _string.FORMATS.EXPONENTIAL)).concat(code === binEdges.length - 1 ? " ]" : " )");
 }
 const useObsHistogram = (obs, _ref) => {
-  var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedVar9, _settings$selectedVar0, _settings$selectedVar1, _settings$selectedVar10;
   let {
     enabled = true
   } = _ref;
@@ -64,31 +64,31 @@ const useObsHistogram = (obs, _ref) => {
     obsIndices,
     isSliced
   } = (0, _FilterContext.useFilteredData)();
+  const selectedVar = (0, _Resolver.useSelectedVar)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
     obsCol: _lodash.default.omit(obs, "omit"),
     // avoid re-rendering when toggling unselected obs
-    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,
+    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,
     obsIndices: isSliced ? [...(obsIndices || [])] : null
   });
   (0, _react.useEffect)(() => {
     setParams(p => {
-      var _settings$selectedVar5, _settings$selectedVar6, _settings$selectedVar7, _settings$selectedVar8;
       return _objectSpread(_objectSpread({}, p), {}, {
         obsCol: _lodash.default.omit(obs, "omit"),
-        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,
+        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,
         obsIndices: isSliced ? [...(obsIndices || [])] : null
       });
     });
-  }, [(_settings$selectedVar9 = settings.selectedVar) === null || _settings$selectedVar9 === void 0 ? void 0 : _settings$selectedVar9.index, (_settings$selectedVar0 = settings.selectedVar) === null || _settings$selectedVar0 === void 0 ? void 0 : _settings$selectedVar0.isSet, (_settings$selectedVar1 = settings.selectedVar) === null || _settings$selectedVar1 === void 0 ? void 0 : _settings$selectedVar1.name, (_settings$selectedVar10 = settings.selectedVar) === null || _settings$selectedVar10 === void 0 ? void 0 : _settings$selectedVar10.vars, obsIndices, isSliced, obs]);
+  }, [selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.isSet, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars, obsIndices, isSliced, obs]);
   return (0, _requests.useFetch)(ENDPOINT, params, {
-    enabled: enabled && !!settings.selectedVar && settings.colorEncoding === _constants.COLOR_ENCODINGS.VAR,
+    enabled: enabled && !!selectedVar && settings.colorEncoding === _constants.COLOR_ENCODINGS.VAR,
     refetchOnMount: false
   });
 };
@@ -291,7 +291,7 @@ function CategoricalObs(_ref3) {
         value_counts: obs.value_counts[obs.values[index]],
         pct: obs.value_counts[obs.values[index]] / totalCounts * 100
       },
-      isOmitted: _lodash.default.includes(obs.omit, obs.codes[obs.values[index]]),
+      isOmitted: _lodash.default.includes(obs.omit, obs.values[index]),
       label: obs.values[index],
       histogramData: enabledHistograms ? {
         data: (_obsHistograms$fetche = obsHistograms.fetchedData) === null || _obsHistograms$fetche === void 0 ? void 0 : _obsHistograms$fetche[obs.values[index]],
@@ -428,7 +428,7 @@ function ContinuousObs(_ref5) {
         value_counts: obs.value_counts[obs.values[index]],
         pct: obs.value_counts[obs.values[index]] / totalCounts * 100
       },
-      isOmitted: _lodash.default.includes(obs.omit, obs.codes[obs.values[index]]),
+      isOmitted: _lodash.default.includes(obs.omit, obs.values[index]),
       label: getLabel(index),
       histogramData: enabledHistograms ? {
         data: (_obsHistograms$fetche2 = obsHistograms.fetchedData) === null || _obsHistograms$fetche2 === void 0 ? void 0 : _obsHistograms$fetche2[obs.values[index]],

package/dist/cjs/components/obs-list/ObsList.js

@@ -53,7 +53,7 @@ const ObsAccordionToggle = _ref => {
   }, children));
 };
 function ObsColsList(_ref2) {
-  var _settings$selectedObs;
+  var _settings$selectedObs, _settings$selectedObs3, _settings$selectedObs4;
   let {
     showColor = true,
     enableObsGroups = true,
@@ -112,17 +112,22 @@ function ObsColsList(_ref2) {
         return d.type !== _constants.OBS_TYPES.DISCRETE;
       });
       setObsCols(_lodash.default.keyBy(_lodash.default.map(filteredData, d => {
+        var _settings$selectedObs2;
+        if (((_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.name) === d.name) {
+          return _objectSpread(_objectSpread({}, d), {}, {
+            omit: settings.selectedObs.omit || []
+          });
+        }
         return _objectSpread(_objectSpread({}, d), {}, {
-          codesMap: _lodash.default.invert(d.codes),
           omit: []
         });
       }), "name"));
     }
-  }, [fetchedData, isPending, obsGroups, serverError, enableGroups]);
+  }, [fetchedData, isPending, obsGroups, serverError, enableGroups, (_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.name, (_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.omit]);
   (0, _react.useEffect)(() => {
     if (obsCols) {
-      var _settings$selectedObs2;
-      if (!obsCols[(_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.name]) {
+      var _settings$selectedObs5;
+      if (!obsCols[(_settings$selectedObs5 = settings.selectedObs) === null || _settings$selectedObs5 === void 0 ? void 0 : _settings$selectedObs5.name]) {
         setActive([]);
         dispatch({
           type: "select.obs",
@@ -139,8 +144,8 @@ function ObsColsList(_ref2) {
     }
   };
   const toggleAll = item => {
-    var _settings$selectedObs3;
-    const omit = item.omit.length ? [] : _lodash.default.map(item.values, v => item.codes[v]);
+    var _settings$selectedObs6;
+    const omit = item.omit.length ? [] : item.values;
     setObsCols(o => {
       return _objectSpread(_objectSpread({}, o), {}, {
         [item.name]: _objectSpread(_objectSpread({}, item), {}, {
@@ -148,7 +153,7 @@ function ObsColsList(_ref2) {
         })
       });
     });
-    if (((_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.name) === item.name) {
+    if (((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.name) === item.name) {
       dispatch({
         type: "select.obs",
         obs: _objectSpread(_objectSpread({}, item), {}, {
@@ -158,7 +163,7 @@ function ObsColsList(_ref2) {
     }
   };
   const toggleLabel = item => {
-    const inLabelObs = _lodash.default.some(settings.labelObs, i => i.name === item.name);
+    const inLabelObs = _lodash.default.includes(settings.labelObs, item.name);
     if (inLabelObs) {
       dispatch({
         type: "remove.label.obs",
@@ -167,11 +172,7 @@ function ObsColsList(_ref2) {
     } else {
       dispatch({
         type: "add.label.obs",
-        obs: {
-          name: item.name,
-          type: item.type,
-          codesMap: item.codesMap
-        }
+        obs: item
       });
     }
   };
@@ -192,12 +193,12 @@ function ObsColsList(_ref2) {
     });
   };
   const toggleObs = (item, value) => {
-    var _settings$selectedObs4;
+    var _settings$selectedObs7;
     let omit;
-    if (_lodash.default.includes(item.omit, item.codes[value])) {
-      omit = item.omit.filter(i => i !== item.codes[value]);
+    if (_lodash.default.includes(item.omit, value)) {
+      omit = item.omit.filter(i => i !== value);
     } else {
-      omit = [...item.omit, item.codes[value]];
+      omit = [...item.omit, value];
     }
     setObsCols(o => {
       return _objectSpread(_objectSpread({}, o), {}, {
@@ -206,7 +207,7 @@ function ObsColsList(_ref2) {
         })
       });
     });
-    if (((_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.name) === item.name) {
+    if (((_settings$selectedObs7 = settings.selectedObs) === null || _settings$selectedObs7 === void 0 ? void 0 : _settings$selectedObs7.name) === item.name) {
       dispatch({
         type: "select.obs",
         obs: _objectSpread(_objectSpread({}, item), {}, {
@@ -216,16 +217,16 @@ function ObsColsList(_ref2) {
     }
   };
   const obsItem = item => {
-    var _settings$selectedObs5, _settings$selectedObs6;
+    var _settings$selectedObs8, _settings$selectedObs9;
     if (!item) {
       return null;
     }
     if (item.type === _constants.OBS_TYPES.DISCRETE) {
       return null;
     }
-    const inLabelObs = _lodash.default.some(settings.labelObs, i => i.name === item.name);
-    const inSliceObs = settings.sliceBy.obs && ((_settings$selectedObs5 = settings.selectedObs) === null || _settings$selectedObs5 === void 0 ? void 0 : _settings$selectedObs5.name) === item.name;
-    const isColorEncoding = (showSelectedAsActive || settings.colorEncoding === _constants.COLOR_ENCODINGS.OBS) && ((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.name) === item.name;
+    const inLabelObs = _lodash.default.includes(settings.labelObs, item.name);
+    const inSliceObs = settings.sliceBy.obs && ((_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.name) === item.name;
+    const isColorEncoding = (showSelectedAsActive || settings.colorEncoding === _constants.COLOR_ENCODINGS.OBS) && ((_settings$selectedObs9 = settings.selectedObs) === null || _settings$selectedObs9 === void 0 ? void 0 : _settings$selectedObs9.name) === item.name;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "accordion-item",
       key: item.name

package/dist/cjs/components/pseudospatial/Pseudospatial.js

@@ -20,6 +20,7 @@ var _ImageViewer = require("../../utils/ImageViewer");
 var _Legend = require("../../utils/Legend");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Resolver = require("../../utils/Resolver");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -29,7 +30,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 _fontawesomeSvgCore.library.add(_freeSolidSvgIcons.faSliders);
 function usePseudospatialData(plotType) {
-  var _settings$selectedVar5, _settings$selectedVar6, _settings$selectedVar7, _settings$selectedVar8;
   const ENDPOINT = "pseudospatial";
   const dataset = (0, _DatasetContext.useDataset)();
   const settings = (0, _SettingsContext.useSettings)();
@@ -37,6 +37,8 @@ function usePseudospatialData(plotType) {
     obsIndices,
     isSliced
   } = (0, _FilterContext.useFilteredData)();
+  const selectedVar = (0, _Resolver.useSelectedVar)();
+  const selectedObs = (0, _Resolver.useSelectedObs)();
   const baseParams = (0, _react.useMemo)(() => {
     return {
       url: dataset.url,
@@ -50,40 +52,28 @@ function usePseudospatialData(plotType) {
   }, [dataset.url, settings.pseudospatial.maskSet, settings.pseudospatial.maskValues, dataset.varNamesCol, isSliced, obsIndices]);
   const getPlotParams = (0, _react.useCallback)(() => {
     if (plotType === _constants.PSEUDOSPATIAL_PLOT_TYPES.GENE) {
-      var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
       return _objectSpread({
-        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
+        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
       }, settings.sliceBy.obs ? {
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-        })
+        obsCol: selectedObs,
+        obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit)
       } : {});
     } else if (plotType === _constants.PSEUDOSPATIAL_PLOT_TYPES.CATEGORICAL) {
-      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
       return {
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-        }),
+        obsCol: selectedObs,
+        obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
         mode: settings.pseudospatial.categoricalMode
       };
     } else if (plotType === "continuous") {
-      var _settings$selectedObs9, _settings$selectedObs0, _settings$selectedObs1;
       return {
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs9 = settings.selectedObs) !== null && _settings$selectedObs9 !== void 0 && _settings$selectedObs9.omit.length) ? null : _lodash.default.difference(_lodash.default.values((_settings$selectedObs0 = settings.selectedObs) === null || _settings$selectedObs0 === void 0 ? void 0 : _settings$selectedObs0.codes), (_settings$selectedObs1 = settings.selectedObs) === null || _settings$selectedObs1 === void 0 ? void 0 : _settings$selectedObs1.omit).map(c => {
-          var _settings$selectedObs10;
-          return (_settings$selectedObs10 = settings.selectedObs) === null || _settings$selectedObs10 === void 0 ? void 0 : _settings$selectedObs10.codesMap[c];
-        })
+        obsCol: selectedObs,
+        obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit)
       };
     }
-  }, [settings.pseudospatial.categoricalMode, settings.selectedObs, (_settings$selectedVar5 = settings.selectedVar) === null || _settings$selectedVar5 === void 0 ? void 0 : _settings$selectedVar5.index, (_settings$selectedVar6 = settings.selectedVar) === null || _settings$selectedVar6 === void 0 ? void 0 : _settings$selectedVar6.isSet, (_settings$selectedVar7 = settings.selectedVar) === null || _settings$selectedVar7 === void 0 ? void 0 : _settings$selectedVar7.name, (_settings$selectedVar8 = settings.selectedVar) === null || _settings$selectedVar8 === void 0 ? void 0 : _settings$selectedVar8.vars, settings.sliceBy.obs, plotType]);
+  }, [settings.pseudospatial.categoricalMode, selectedObs, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.isSet, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars, settings.sliceBy.obs, plotType]);
   const params = (0, _react.useMemo)(() => {
     return _objectSpread(_objectSpread({}, baseParams), getPlotParams());
   }, [baseParams, getPlotParams]);
@@ -92,7 +82,7 @@ function usePseudospatialData(plotType) {
   });
 }
 function Pseudospatial(_ref) {
-  var _settings$selectedObs14, _layout$coloraxis3, _layout$coloraxis4;
+  var _layout$coloraxis3, _layout$coloraxis4;
   let {
     showLegend = true,
     sharedScaleRange = false,
@@ -108,10 +98,14 @@ function Pseudospatial(_ref) {
     getColor
   } = (0, _colorHelper.useColor)();
   const colorscale = (0, _react.useRef)(settings.controls.colorScale);
+  const {
+    valueMin,
+    valueMax
+  } = (0, _FilterContext.useFilteredData)();
+  const selectedObs = (0, _Resolver.useSelectedObs)();
   (0, _react.useEffect)(() => {
-    var _settings$selectedObs11, _settings$selectedObs12, _settings$selectedObs13;
-    setPlotType(settings.colorEncoding === _constants.COLOR_ENCODINGS.VAR ? _constants.PSEUDOSPATIAL_PLOT_TYPES.GENE : ((_settings$selectedObs11 = settings.selectedObs) === null || _settings$selectedObs11 === void 0 ? void 0 : _settings$selectedObs11.type) === _constants.OBS_TYPES.CATEGORICAL || ((_settings$selectedObs12 = settings.selectedObs) === null || _settings$selectedObs12 === void 0 ? void 0 : _settings$selectedObs12.type) === _constants.OBS_TYPES.BOOLEAN ? _constants.PSEUDOSPATIAL_PLOT_TYPES.CATEGORICAL : ((_settings$selectedObs13 = settings.selectedObs) === null || _settings$selectedObs13 === void 0 ? void 0 : _settings$selectedObs13.type) === _constants.OBS_TYPES.CONTINUOUS ? _constants.PSEUDOSPATIAL_PLOT_TYPES.CONTINUOUS : _constants.PSEUDOSPATIAL_PLOT_TYPES.MASKS);
-  }, [settings.colorEncoding, (_settings$selectedObs14 = settings.selectedObs) === null || _settings$selectedObs14 === void 0 ? void 0 : _settings$selectedObs14.type, setPlotType]);
+    setPlotType(settings.colorEncoding === _constants.COLOR_ENCODINGS.VAR ? _constants.PSEUDOSPATIAL_PLOT_TYPES.GENE : (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === _constants.OBS_TYPES.CATEGORICAL || (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === _constants.OBS_TYPES.BOOLEAN ? _constants.PSEUDOSPATIAL_PLOT_TYPES.CATEGORICAL : (selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type) === _constants.OBS_TYPES.CONTINUOUS ? _constants.PSEUDOSPATIAL_PLOT_TYPES.CONTINUOUS : _constants.PSEUDOSPATIAL_PLOT_TYPES.MASKS);
+  }, [settings.colorEncoding, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.type, setPlotType]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -163,8 +157,8 @@ function Pseudospatial(_ref) {
         min,
         max
       } = {
-        min: settings.controls.range[0] * (settings.controls.valueRange[1] - settings.controls.valueRange[0]) + settings.controls.valueRange[0],
-        max: settings.controls.range[1] * (settings.controls.valueRange[1] - settings.controls.valueRange[0]) + settings.controls.valueRange[0]
+        min: settings.controls.range[0] * (valueMax - valueMin) + valueMin,
+        max: settings.controls.range[1] * (valueMax - valueMin) + valueMin
       };
       setData(d => {
         return _lodash.default.map(d, trace => {
@@ -192,7 +186,7 @@ function Pseudospatial(_ref) {
         });
       });
     }
-  }, [settings.controls.range, settings.controls.valueMax, settings.controls.valueMin, settings.controls.valueRange, getColor, sharedScaleRange]);
+  }, [settings.controls.range, settings.controls.valueMax, settings.controls.valueMin, getColor, sharedScaleRange, valueMax, valueMin]);
   const hasSelections = !!plotType && !!settings.pseudospatial.maskSet;
   const faSlidersPath = _freeSolidSvgIcons.faSliders.icon[4];
   if (!serverError) {