@haniffalab/cherita-react 1.3.0-dev.2025-06-06.0b38976b → 1.3.0-dev.2025-06-06.9f7ff5ad

package/dist/cjs/components/search-bar/SearchInfo.js

@@ -15,6 +15,7 @@ var _DatasetContext = require("../../context/DatasetContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _requests = require("../../utils/requests");
 var _VarItem = require("../var-list/VarItem");
+var _VarList = require("../var-list/VarList");
 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; }
@@ -52,39 +53,6 @@ function VarInfo(_ref) {
     data: fetchedData
   })));
 }
-const useVarMean = function (varKeys) {
-  let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  const ENDPOINT = "matrix/mean";
-  const dataset = (0, _DatasetContext.useDataset)();
-  const [params, setParams] = (0, _react.useState)({
-    url: dataset.url,
-    varKeys: _lodash.default.map(varKeys, v => v.isSet ? {
-      name: v.name,
-      indices: v.vars.map(v => v.index)
-    } : v.index),
-    // obsIndices:
-    varNamesCol: dataset.varNamesCol
-  });
-  (0, _react.useEffect)(() => {
-    setParams(p => {
-      return _objectSpread(_objectSpread({}, p), {}, {
-        varKeys: _lodash.default.map(varKeys, v => v.isSet ? {
-          name: v.name,
-          indices: v.vars.map(v => v.index)
-        } : v.index)
-      });
-    });
-  }, [varKeys]);
-  return (0, _requests.useFetch)(ENDPOINT, params, {
-    enabled: enabled,
-    refetchOnMount: false
-  });
-};
-
-// ensure nulls are lowest values
-const sortMeans = (i, means) => {
-  return means[i.name] || _lodash.default.min(_lodash.default.values(means)) - 1;
-};
 function DiseaseInfo(_ref2) {
   let {
     disease,
@@ -119,12 +87,12 @@ function DiseaseInfo(_ref2) {
       setDiseaseVars(diseaseData.fetchedData);
     }
   }, [diseaseData.fetchedData, diseaseData.isPending, diseaseData.serverError]);
-  const varMeans = useVarMean(diseaseVars, !!(diseaseVars !== null && diseaseVars !== void 0 && diseaseVars.length) && settings.varSort.disease.sort === _constants.VAR_SORT.MATRIX);
+  const varMeans = (0, _VarList.useVarMean)(diseaseVars, !!(diseaseVars !== null && diseaseVars !== void 0 && diseaseVars.length) && settings.varSort.disease.sort === _constants.VAR_SORT.MATRIX);
   (0, _react.useEffect)(() => {
     if (settings.varSort.disease.sort === _constants.VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError) {
         setSortedDiseaseVars(_lodash.default.orderBy(diseaseVars, o => {
-          return sortMeans(o, varMeans.fetchedData);
+          return (0, _VarList.sortMeans)(o, varMeans.fetchedData);
         }, settings.varSort.disease.sortOrder));
       }
     } else if (settings.varSort.disease.sort === _constants.VAR_SORT.NAME) {

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VarNamesList = VarNamesList;
+exports.useVarMean = exports.sortMeans = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
 var _reactFontawesome = require("@fortawesome/react-fontawesome");
@@ -15,6 +16,7 @@ var _VarListToolbar = require("./VarListToolbar");
 var _VarSet = require("./VarSet");
 var _constants = require("../../constants/constants");
 var _DatasetContext = require("../../context/DatasetContext");
+var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
@@ -29,13 +31,16 @@ const useVarMean = function (varKeys) {
   let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const ENDPOINT = "matrix/mean";
   const dataset = (0, _DatasetContext.useDataset)();
+  const {
+    obsIndices
+  } = (0, _FilterContext.useFilteredData)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
     varKeys: _lodash.default.map(varKeys, v => v.isSet ? {
       name: v.name,
       indices: v.vars.map(v => v.index)
     } : v.index),
-    // obsIndices:
+    obsIndices: obsIndices,
     varNamesCol: dataset.varNamesCol
   });
   (0, _react.useEffect)(() => {
@@ -44,10 +49,11 @@ const useVarMean = function (varKeys) {
         varKeys: _lodash.default.map(varKeys, v => v.isSet ? {
           name: v.name,
           indices: v.vars.map(v => v.index)
-        } : v.index)
+        } : v.index),
+        obsIndices: obsIndices
       });
     });
-  }, [varKeys]);
+  }, [obsIndices, varKeys]);
   return (0, _requests.useFetch)(ENDPOINT, params, {
     enabled: enabled,
     refetchOnMount: false
@@ -55,9 +61,11 @@ const useVarMean = function (varKeys) {
 };
 
 // ensure nulls are lowest values
+exports.useVarMean = useVarMean;
 const sortMeans = (i, means) => {
   return means[i.name] || _lodash.default.min(_lodash.default.values(means)) - 1;
 };
+exports.sortMeans = sortMeans;
 function VarNamesList(_ref) {
   var _settings$selectedVar, _settings$selectedVar2;
   let {

package/dist/esm/components/search-bar/SearchInfo.js

@@ -13,6 +13,7 @@ import { useDataset } from "../../context/DatasetContext";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { useFetch } from "../../utils/requests";
 import { VarDiseaseInfo } from "../var-list/VarItem";
+import { sortMeans, useVarMean } from "../var-list/VarList";
 export function VarInfo(_ref) {
   let {
     varItem
@@ -43,39 +44,6 @@ export function VarInfo(_ref) {
     data: fetchedData
   })));
 }
-const useVarMean = function (varKeys) {
-  let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  const ENDPOINT = "matrix/mean";
-  const dataset = useDataset();
-  const [params, setParams] = useState({
-    url: dataset.url,
-    varKeys: _.map(varKeys, v => v.isSet ? {
-      name: v.name,
-      indices: v.vars.map(v => v.index)
-    } : v.index),
-    // obsIndices:
-    varNamesCol: dataset.varNamesCol
-  });
-  useEffect(() => {
-    setParams(p => {
-      return _objectSpread(_objectSpread({}, p), {}, {
-        varKeys: _.map(varKeys, v => v.isSet ? {
-          name: v.name,
-          indices: v.vars.map(v => v.index)
-        } : v.index)
-      });
-    });
-  }, [varKeys]);
-  return useFetch(ENDPOINT, params, {
-    enabled: enabled,
-    refetchOnMount: false
-  });
-};
-
-// ensure nulls are lowest values
-const sortMeans = (i, means) => {
-  return means[i.name] || _.min(_.values(means)) - 1;
-};
 export function DiseaseInfo(_ref2) {
   let {
     disease,

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

@@ -14,20 +14,24 @@ import { VarListToolbar } from "./VarListToolbar";
 import { VarSet } from "./VarSet";
 import { SELECTION_MODES, VAR_SORT } from "../../constants/constants";
 import { useDataset } from "../../context/DatasetContext";
+import { useFilteredData } from "../../context/FilterContext";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { LoadingSpinner } from "../../utils/LoadingIndicators";
 import { useFetch } from "../../utils/requests";
-const useVarMean = function (varKeys) {
+export const useVarMean = function (varKeys) {
   let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const ENDPOINT = "matrix/mean";
   const dataset = useDataset();
+  const {
+    obsIndices
+  } = useFilteredData();
   const [params, setParams] = useState({
     url: dataset.url,
     varKeys: _.map(varKeys, v => v.isSet ? {
       name: v.name,
       indices: v.vars.map(v => v.index)
     } : v.index),
-    // obsIndices:
+    obsIndices: obsIndices,
     varNamesCol: dataset.varNamesCol
   });
   useEffect(() => {
@@ -36,10 +40,11 @@ const useVarMean = function (varKeys) {
         varKeys: _.map(varKeys, v => v.isSet ? {
           name: v.name,
           indices: v.vars.map(v => v.index)
-        } : v.index)
+        } : v.index),
+        obsIndices: obsIndices
       });
     });
-  }, [varKeys]);
+  }, [obsIndices, varKeys]);
   return useFetch(ENDPOINT, params, {
     enabled: enabled,
     refetchOnMount: false
@@ -47,7 +52,7 @@ const useVarMean = function (varKeys) {
 };
 
 // ensure nulls are lowest values
-const sortMeans = (i, means) => {
+export const sortMeans = (i, means) => {
   return means[i.name] || _.min(_.values(means)) - 1;
 };
 export function VarNamesList(_ref) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "1.3.0-dev.2025-06-06.0b38976b",
+  "version": "1.3.0-dev.2025-06-06.9f7ff5ad",
   "author": "Haniffa Lab",
   "license": "MIT",
   "keywords": [
@@ -127,5 +127,5 @@
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
   "homepage": "https://github.com/haniffalab/cherita-react#readme",
-  "prereleaseSha": "0b38976bfa4499c6f24545ed2f278f078633d27b"
+  "prereleaseSha": "9f7ff5ad72d373bccc11058ca146ba13811cfa70"
 }