@haniffalab/cherita-react 1.3.0 → 1.3.1-dev.2025-10-29.def77f5f

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VarNamesList = VarNamesList;
-var _react = _interopRequireWildcard(require("react"));
+exports.useVarMean = exports.sortMeans = void 0;
+var _react = require("react");
 var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
 var _reactFontawesome = require("@fortawesome/react-fontawesome");
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -15,11 +16,13 @@ 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");
+var _Resolver = require("../../utils/Resolver");
+var _jsxRuntime = require("react/jsx-runtime");
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -27,15 +30,18 @@ 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); }
 const useVarMean = function (varKeys) {
   let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  const ENDPOINT = "matrix/mean";
+  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)
+      indices: v.vars.map(vv => vv.index)
     } : v.index),
-    // obsIndices:
+    obsIndices: obsIndices,
     varNamesCol: dataset.varNamesCol
   });
   (0, _react.useEffect)(() => {
@@ -43,11 +49,12 @@ const useVarMean = function (varKeys) {
       return _objectSpread(_objectSpread({}, p), {}, {
         varKeys: _lodash.default.map(varKeys, v => v.isSet ? {
           name: v.name,
-          indices: v.vars.map(v => v.index)
-        } : v.index)
+          indices: v.vars.map(vv => vv.index)
+        } : v.index),
+        obsIndices: obsIndices
       });
     });
-  }, [varKeys]);
+  }, [obsIndices, varKeys]);
   return (0, _requests.useFetch)(ENDPOINT, params, {
     enabled: enabled,
     refetchOnMount: false
@@ -55,63 +62,66 @@ 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 {
     mode = _constants.SELECTION_MODES.SINGLE,
-    displayName = "genes"
+    displayName = 'genes'
   } = _ref;
   const settings = (0, _SettingsContext.useSettings)();
   const dispatch = (0, _SettingsContext.useSettingsDispatch)();
-  const [active, setActive] = (0, _react.useState)(mode === _constants.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 = (0, _Resolver.useSelectedVar)();
+  const selectedMultiVar = (0, _Resolver.useSelectedMultiVar)();
+  const settingsVars = (0, _Resolver.useSettingsVars)();
+  const [active, setActive] = (0, _react.useState)(mode === _constants.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] = (0, _react.useState)([]);
   (0, _react.useEffect)(() => {
     if (mode === _constants.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]);
   (0, _react.useEffect)(() => {
     if (mode === _constants.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 === _constants.VAR_SORT.MATRIX);
+  }, [mode, selectedMultiVar]);
+  const varMeans = useVarMean(settingsVars, settings.varSort.var.sort === _constants.VAR_SORT.MATRIX);
 
   // @TODO: deferr sortedVars ?
   (0, _react.useEffect)(() => {
     if (settings.varSort.var.sort === _constants.VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError && varMeans.fetchedData) {
-        setSortedVars(_lodash.default.orderBy(settings.vars, o => {
+        setSortedVars(_lodash.default.orderBy(settingsVars, o => {
           return sortMeans(o, varMeans.fetchedData);
         }, settings.varSort.var.sortOrder));
       }
     } else if (settings.varSort.var.sort === _constants.VAR_SORT.NAME) {
-      setSortedVars(_lodash.default.orderBy(settings.vars, "name", settings.varSort.var.sortOrder));
+      setSortedVars(_lodash.default.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.default.createElement(_reactBootstrap.ListGroup.Item, {
-      key: item.matrix_index
-    }, /*#__PURE__*/_react.default.createElement(_VarItem.VarItem, {
-      item: item,
-      active: active,
-      mode: mode
-    }));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.ListGroup.Item, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_VarItem.VarItem, {
+        item: item,
+        active: active,
+        mode: mode
+      })
+    }, item.matrix_index);
   };
   const makeSetListItem = set => {
-    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup.Item, {
-      key: set.name
-    }, /*#__PURE__*/_react.default.createElement(_VarSet.VarSet, {
-      set: set,
-      active: active,
-      mode: mode
-    }));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.ListGroup.Item, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_VarSet.VarSet, {
+        set: set,
+        active: active,
+        mode: mode
+      })
+    }, set.name);
   };
   const varList = _lodash.default.map(sortedVars, item => {
     if (item.isSet) {
@@ -133,43 +143,55 @@ function VarNamesList(_ref) {
     return setName;
   };
   const isPending = varMeans.isPending && settings.varSort.var.sort === _constants.VAR_SORT.MATRIX;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "position-relative"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "overflow-auto mt-3"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "d-flex justify-content-between mb-2"
-  }, /*#__PURE__*/_react.default.createElement("h5", null, _lodash.default.capitalize(displayName)), /*#__PURE__*/_react.default.createElement(_ButtonGroup.default, {
-    "aria-label": "Feature options",
-    size: "sm"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-    variant: "info",
-    onClick: () => {
-      dispatch({
-        type: "add.var",
-        var: {
-          name: newSetName(),
-          vars: [],
-          isSet: true
-        }
-      });
-    }
-  }, "New set"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-    variant: "info",
-    onClick: () => {
-      dispatch({
-        type: "reset.vars"
-      });
-    }
-  }, /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faTimes,
-    className: "me-1"
-  }), "Clear"))), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !varList.length ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
-    variant: "light"
-  }, "Search for a feature.") : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_VarListToolbar.VarListToolbar, null), /*#__PURE__*/_react.default.createElement("div", {
-    className: "position-relative"
-  }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingIndicators.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup, {
-    variant: "flush",
-    className: "cherita-list"
-  }, varList))))));
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "mt-3 d-flex flex-column h-100",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "d-flex justify-content-between mb-2",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h5", {
+        children: _lodash.default.capitalize(displayName)
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.default, {
+        "aria-label": "Feature options",
+        size: "sm",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Button, {
+          variant: "info",
+          onClick: () => {
+            dispatch({
+              type: 'add.var',
+              var: {
+                name: newSetName(),
+                vars: [],
+                isSet: true
+              }
+            });
+          },
+          children: "New set"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactBootstrap.Button, {
+          variant: "info",
+          onClick: () => {
+            dispatch({
+              type: 'reset.vars'
+            });
+          },
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+            icon: _freeSolidSvgIcons.faTimes,
+            className: "me-1"
+          }), "Clear"]
+        })]
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: !varList.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Alert, {
+        variant: "light",
+        children: "Search for a feature."
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_VarListToolbar.VarListToolbar, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "overflow-auto flex-grow-1 modern-scrollbars",
+          children: [isPending && /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingIndicators.LoadingSpinner, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.ListGroup, {
+            variant: "flush",
+            className: "cherita-list",
+            children: varList
+          })]
+        })]
+      })
+    })]
+  });
 }

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

@@ -4,17 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VarListToolbar = VarListToolbar;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
 var _reactFontawesome = require("@fortawesome/react-fontawesome");
 var _reactBootstrap = require("react-bootstrap");
 var _constants = require("../../constants/constants");
 var _SettingsContext = require("../../context/SettingsContext");
-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); }
+var _jsxRuntime = require("react/jsx-runtime");
 // @TODO: set option for "var" and "disease"
 function VarListToolbar(_ref) {
   let {
-    varType = "var"
+    varType = 'var'
   } = _ref;
   const settings = (0, _SettingsContext.useSettings)();
   const dispatch = (0, _SettingsContext.useSettingsDispatch)();
@@ -25,7 +25,7 @@ function VarListToolbar(_ref) {
     if (sort !== sortValue) {
       setSort(sortValue);
       dispatch({
-        type: "set.varSort",
+        type: 'set.varSort',
         var: varType,
         sort: sortValue,
         sortOrder: sortOrder
@@ -34,60 +34,65 @@ function VarListToolbar(_ref) {
       const newSortOrder = sortOrder === _constants.VAR_SORT_ORDER.ASC ? _constants.VAR_SORT_ORDER.DESC : _constants.VAR_SORT_ORDER.ASC;
       setSortOrder(newSortOrder);
       dispatch({
-        type: "set.varSort",
+        type: 'set.varSort',
         var: varType,
         sort: sortValue,
         sortOrder: newSortOrder
       });
     }
   };
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "d-flex justify-content-end align-items-center mb-2"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ToggleButtonGroup, {
-    name: "sortfeatures",
-    "aria-label": "Sort features by",
-    size: "sm",
-    type: "radio"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ToggleButton, {
-    id: _constants.VAR_SORT.NAME,
-    value: _constants.VAR_SORT.NAME,
-    "aria-label": "alphabetical",
-    title: "Sort alphabetically",
-    selected: sort === _constants.VAR_SORT.NAME,
-    onChange: () => {
-      handleSort(_constants.VAR_SORT.NAME, nameSortOrder, setNameSortOrder);
-    }
-  }, nameSortOrder === _constants.VAR_SORT_ORDER.ASC ? /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faArrowDownAZ
-  }) : /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faArrowUpZA
-  })), /*#__PURE__*/_react.default.createElement(_reactBootstrap.ToggleButton, {
-    id: _constants.VAR_SORT.MATRIX,
-    value: _constants.VAR_SORT.MATRIX,
-    "aria-label": "matrix value",
-    title: "Sort by matrix value",
-    selected: sort === _constants.VAR_SORT.MATRIX,
-    onChange: () => {
-      handleSort(_constants.VAR_SORT.MATRIX, matrixSortOrder, setMatrixSortOrder);
-    }
-  }, matrixSortOrder === _constants.VAR_SORT_ORDER.ASC ? /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faArrowDown19
-  }) : /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faArrowUp91
-  })), /*#__PURE__*/_react.default.createElement(_reactBootstrap.ToggleButton, {
-    id: "none",
-    value: "none",
-    "aria-label": "none",
-    title: "No sorting",
-    onClick: () => {
-      setSort(_constants.VAR_SORT.NONE);
-      dispatch({
-        type: "set.varSort.sort",
-        var: varType,
-        sort: _constants.VAR_SORT.NONE
-      });
-    }
-  }, /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faXmark
-  }))));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: "d-flex justify-content-end align-items-center mb-2",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactBootstrap.ToggleButtonGroup, {
+      name: "sortfeatures",
+      "aria-label": "Sort features by",
+      size: "sm",
+      type: "radio",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.ToggleButton, {
+        id: _constants.VAR_SORT.NAME,
+        value: _constants.VAR_SORT.NAME,
+        "aria-label": "alphabetical",
+        title: "Sort alphabetically",
+        selected: sort === _constants.VAR_SORT.NAME,
+        onChange: () => {
+          handleSort(_constants.VAR_SORT.NAME, nameSortOrder, setNameSortOrder);
+        },
+        children: nameSortOrder === _constants.VAR_SORT_ORDER.ASC ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+          icon: _freeSolidSvgIcons.faArrowDownAZ
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+          icon: _freeSolidSvgIcons.faArrowUpZA
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.ToggleButton, {
+        id: _constants.VAR_SORT.MATRIX,
+        value: _constants.VAR_SORT.MATRIX,
+        "aria-label": "matrix value",
+        title: "Sort by matrix value",
+        selected: sort === _constants.VAR_SORT.MATRIX,
+        onChange: () => {
+          handleSort(_constants.VAR_SORT.MATRIX, matrixSortOrder, setMatrixSortOrder);
+        },
+        children: matrixSortOrder === _constants.VAR_SORT_ORDER.ASC ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+          icon: _freeSolidSvgIcons.faArrowDown19
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+          icon: _freeSolidSvgIcons.faArrowUp91
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.ToggleButton, {
+        id: "none",
+        value: "none",
+        "aria-label": "none",
+        title: "No sorting",
+        onClick: () => {
+          setSort(_constants.VAR_SORT.NONE);
+          dispatch({
+            type: 'set.varSort.sort',
+            var: varType,
+            sort: _constants.VAR_SORT.NONE
+          });
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+          icon: _freeSolidSvgIcons.faXmark
+        })
+      })]
+    })
+  });
 }