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

package/dist/esm/utils/zarrData.js

@@ -1,6 +1,7 @@
 import { useMemo } from "react";
 import _ from "lodash";
 import { slice } from "zarr";
+import { useSelectedObs, useSelectedVar } from "./Resolver";
 import { OBS_TYPES } from "../constants/constants";
 import { useDataset } from "../context/DatasetContext";
 import { useSettings } from "../context/SettingsContext";
@@ -32,21 +33,18 @@ const meanData = (_i, data) => {
 export const useXData = function () {
   let agg = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : meanData;
   const dataset = useDataset();
-  const settings = useSettings();
-  const xParams = useMemo(() => {
-    var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3;
-    return !settings.selectedVar ? [] : !((_settings$selectedVar = settings.selectedVar) !== null && _settings$selectedVar !== void 0 && _settings$selectedVar.isSet) ? [{
+  const selectedVar = useSelectedVar();
+  const xParams = useMemo(() => !selectedVar ? [] : !(selectedVar !== null && selectedVar !== void 0 && selectedVar.isSet) ? [{
+    url: dataset.url,
+    path: "X",
+    s: [null, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.matrix_index]
+  }] : _.map(selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars, v => {
+    return {
       url: dataset.url,
       path: "X",
-      s: [null, (_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.matrix_index]
-    }] : _.map((_settings$selectedVar3 = settings.selectedVar) === null || _settings$selectedVar3 === void 0 ? void 0 : _settings$selectedVar3.vars, v => {
-      return {
-        url: dataset.url,
-        path: "X",
-        s: [null, v.matrix_index]
-      };
-    });
-  }, [dataset.url, settings.selectedVar]);
+      s: [null, v.matrix_index]
+    };
+  }), [dataset.url, selectedVar]);
   return useMultipleZarr(xParams, GET_OPTIONS, {
     enabled: !!xParams.length
   }, agg);
@@ -55,8 +53,8 @@ export const useObsData = function () {
   var _obs3, _obs4;
   let obs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   const dataset = useDataset();
-  const settings = useSettings();
-  obs = obs || settings.selectedObs;
+  const selectedObs = useSelectedObs();
+  obs = obs || selectedObs;
   const obsParams = useMemo(() => {
     var _obs, _obs2;
     return {
@@ -71,13 +69,14 @@ export const useObsData = function () {
 export const useLabelObsData = () => {
   const dataset = useDataset();
   const settings = useSettings();
-  const labelObsParams = useMemo(() => _.map(settings.labelObs, obs => {
+  const labelObsParams = useMemo(() => _.map(settings.labelObs, obsName => {
+    const obs = settings.data.obs[obsName] || null;
     return {
       url: dataset.url,
       path: "obs/" + obs.name + (obs.type === OBS_TYPES.CATEGORICAL ? "/codes" : ""),
       key: obs.name
     };
-  }), [dataset.url, settings.labelObs]);
+  }), [dataset.url, settings.data.obs, settings.labelObs]);
   return useMultipleZarr(labelObsParams, GET_OPTIONS, {
     enabled: !!labelObsParams.length
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "1.4.1-dev.2025-08-13.6fc43290",
+  "version": "1.4.1-dev.2025-08-18.6fbf7a74",
   "author": "Haniffa Lab",
   "license": "MIT",
   "keywords": [
@@ -128,5 +128,5 @@
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
   "homepage": "https://github.com/haniffalab/cherita-react#readme",
-  "prereleaseSha": "6fc43290e91ef296e79a1fd7b3e5b6be1215fd3b"
+  "prereleaseSha": "6fbf7a74893c9385c9f23ecbef969792d6d34869"
 }