@haniffalab/cherita-react 1.3.0 → 1.3.1-dev.2025-10-29.6de4119f

package/dist/cjs/utils/Resolver.js

@@ -0,0 +1,213 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSettingsVars = exports.useSelectedVar = exports.useSelectedObs = exports.useSelectedMultiVar = exports.useResolver = void 0;
+var _react = require("react");
+var _lodash = _interopRequireDefault(require("lodash"));
+var _requests = require("./requests");
+var _constants = require("../constants/constants");
+var _DatasetContext = require("../context/DatasetContext");
+var _SettingsContext = require("../context/SettingsContext");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+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; }
+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); }
+const cleanSettings = settings => {
+  var _settings$data$pseudo;
+  // Remove obs and vars from settings that are not in data
+
+  const selectedObs = settings.selectedObs && settings.data.obs[settings.selectedObs.name] ? settings.selectedObs : null;
+  const labelObs = _lodash.default.filter(settings.labelObs, obsName => settings.data.obs[obsName]);
+  const selectedVar = settings.selectedVar && (settings.selectedVar.isSet ? _lodash.default.every(settings.selectedVar.vars, vv => settings.data.vars[vv.name]) : settings.data.vars[settings.selectedVar.name]) ? settings.selectedVar : null;
+  const selectedMultiVar = _lodash.default.filter(settings.selectedMultiVar, v => {
+    if (v.isSet) {
+      return _lodash.default.every(v.vars, vv => settings.data.vars[vv.name]);
+    } else {
+      return settings.data.vars[v.name];
+    }
+  });
+  const vars = _lodash.default.filter(settings.vars, v => {
+    if (v.isSet) {
+      return _lodash.default.every(v.vars, vv => settings.data.vars[vv.name]);
+    } else {
+      return settings.data.vars[v.name];
+    }
+  });
+  let pseudospatial = settings.pseudospatial;
+  if (!_lodash.default.keys(settings.data.pseudospatial).length) {
+    pseudospatial = {
+      maskSet: null,
+      maskValues: null,
+      categoricalMode: _constants.PSEUDOSPATIAL_CATEGORICAL_MODES.ACROSS.value
+    };
+  }
+  if (pseudospatial.maskSet && !_lodash.default.includes(_lodash.default.keys(settings.data.pseudospatial), pseudospatial.maskSet)) {
+    pseudospatial = _objectSpread(_objectSpread({}, pseudospatial), {}, {
+      maskSet: null
+    });
+  }
+  if (pseudospatial.maskValues && !!_lodash.default.difference(pseudospatial.maskValues, ((_settings$data$pseudo = settings.data.pseudospatial) === null || _settings$data$pseudo === void 0 ? void 0 : _settings$data$pseudo[pseudospatial.maskSet]) || []).length) {
+    pseudospatial = _objectSpread(_objectSpread({}, pseudospatial), {}, {
+      maskValues: null
+    });
+  }
+  return _objectSpread(_objectSpread({}, settings), {}, {
+    selectedObs: selectedObs,
+    labelObs: labelObs,
+    selectedVar: selectedVar,
+    selectedMultiVar: selectedMultiVar,
+    vars: vars,
+    pseudospatial: pseudospatial
+  });
+};
+const useResolver = initSettings => {
+  const dataset = (0, _DatasetContext.useDataset)();
+  const {
+    isPseudospatial = false
+  } = dataset;
+  const [isPending, setisPending] = (0, _react.useState)(true);
+  const [resolvedSettings, setResolvedSettings] = (0, _react.useState)(null);
+
+  // obs
+  // all obs should be in initSettings.selectedObs and initSettings.labelObs
+  const initObs = _lodash.default.uniqBy(_lodash.default.compact([initSettings.selectedObs, ..._lodash.default.map(initSettings.labelObs, o => ({
+    name: o
+  }))]), 'name');
+  const initObsNames = _lodash.default.map(initObs, o => o.name);
+  const [obsParams] = (0, _react.useState)({
+    url: dataset.url,
+    cols: initObsNames,
+    obsParams: _lodash.default.fromPairs(_lodash.default.map(initObs, o => [o.name, {
+      bins: o.bins || {}
+    }]))
+  });
+  const {
+    fetchedData: obsData,
+    isPending: obsDataPending,
+    serverError: obsDataError
+  } = (0, _requests.useFetch)('obs/cols', obsParams, {
+    enabled: !!initObsNames.length
+  });
+
+  // vars
+  // all vars should be in initSettings.vars from validation
+  const initVars = initSettings.vars;
+  const initVarsNames = _lodash.default.flatMap(initVars, v => v.isSet ? _lodash.default.map(v.vars, vv => vv.name) : v.name);
+  const [varParams] = (0, _react.useState)({
+    url: dataset.url,
+    col: dataset.varNamesCol,
+    names: initVarsNames
+  });
+  const {
+    fetchedData: varData,
+    isPending: varDataPending,
+    serverError: varDataError
+  } = (0, _requests.useFetch)('var/cols/names', varParams, {
+    enabled: !!varParams.names.length
+  });
+
+  // pseudospatial
+  const [pseudospatialParams] = (0, _react.useState)({
+    url: dataset.url
+  });
+  const pseudospatialEnabled = isPseudospatial;
+  const {
+    fetchedData: pseudospatialData,
+    isPending: pseudospatialDataPending,
+    serverError: pseudospatialDataError
+  } = (0, _requests.useFetch)('masks', pseudospatialParams, {
+    enabled: pseudospatialEnabled,
+    retry: false
+  });
+
+  // Use isPending to help set initial state to true
+  (0, _react.useEffect)(() => {
+    setisPending(obsDataPending || varDataPending || pseudospatialDataPending);
+  }, [obsDataPending, pseudospatialDataPending, varDataPending]);
+
+  // Use isPending along with other pending states
+  // to ensure they've all converged after state updates
+  (0, _react.useEffect)(() => {
+    if (isPending || obsDataPending || varDataPending || pseudospatialDataPending) {
+      return;
+    }
+    if (obsDataError) {
+      console.error('Error fetching obs data:', obsDataError);
+    }
+    if (varDataError) {
+      console.error('Error fetching var data:', varDataError);
+    }
+    if (pseudospatialDataError) {
+      console.error('Error fetching pseudospatial masks data:', pseudospatialDataError);
+    }
+    const data = {
+      obs: obsData ? _lodash.default.fromPairs(_lodash.default.map(obsData, o => [o.name, o])) : {},
+      vars: varData ? _lodash.default.fromPairs(_lodash.default.map(varData, v => [v.name, v])) : {},
+      pseudospatial: pseudospatialData || {}
+    };
+    const cleanedSettings = cleanSettings(_objectSpread(_objectSpread({}, initSettings), {}, {
+      data: data
+    }));
+    setResolvedSettings(cleanedSettings);
+  }, [initSettings, isPending, obsData, obsDataError, obsDataPending, pseudospatialData, pseudospatialDataError, pseudospatialDataPending, pseudospatialEnabled, varData, varDataError, varDataPending]);
+  return resolvedSettings;
+};
+exports.useResolver = useResolver;
+const useSelectedObs = () => {
+  const settings = (0, _SettingsContext.useSettings)();
+  return (0, _react.useMemo)(() => {
+    return settings.selectedObs ? _objectSpread(_objectSpread({}, settings.selectedObs), settings.data.obs[settings.selectedObs.name]) : null;
+  }, [settings.data.obs, settings.selectedObs]);
+};
+exports.useSelectedObs = useSelectedObs;
+const useSelectedVar = () => {
+  const settings = (0, _SettingsContext.useSettings)();
+  return (0, _react.useMemo)(() => {
+    if (settings.selectedVar) {
+      if (settings.selectedVar.isSet) {
+        return _objectSpread(_objectSpread({}, settings.selectedVar), {}, {
+          vars: settings.selectedVar.vars.map(v => _objectSpread({}, settings.data.vars[v.name]))
+        });
+      } else {
+        return _objectSpread(_objectSpread({}, settings.selectedVar), settings.data.vars[settings.selectedVar.name]);
+      }
+    } else {
+      return null;
+    }
+  }, [settings.data.vars, settings.selectedVar]);
+};
+exports.useSelectedVar = useSelectedVar;
+const useSelectedMultiVar = () => {
+  const settings = (0, _SettingsContext.useSettings)();
+  return (0, _react.useMemo)(() => {
+    return _lodash.default.map(settings.selectedMultiVar, v => {
+      if (v.isSet) {
+        return _objectSpread(_objectSpread({}, v), {}, {
+          vars: v.vars.map(vv => _objectSpread({}, settings.data.vars[vv.name]))
+        });
+      } else {
+        return _objectSpread(_objectSpread({}, v), settings.data.vars[v.name]);
+      }
+    });
+  }, [settings.data.vars, settings.selectedMultiVar]);
+};
+exports.useSelectedMultiVar = useSelectedMultiVar;
+const useSettingsVars = () => {
+  const settings = (0, _SettingsContext.useSettings)();
+  return (0, _react.useMemo)(() => {
+    return _lodash.default.map(settings.vars, v => {
+      if (v.isSet) {
+        return _objectSpread(_objectSpread({}, v), {}, {
+          vars: v.vars.map(vv => _objectSpread({}, settings.data.vars[vv.name]))
+        });
+      } else {
+        return _objectSpread(_objectSpread({}, v), settings.data.vars[v.name]);
+      }
+    });
+  }, [settings.data.vars, settings.vars]);
+};
+exports.useSettingsVars = useSettingsVars;

package/dist/cjs/utils/Skeleton.js

@@ -4,18 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ObsmKeysListBtn = void 0;
-var _react = _interopRequireDefault(require("react"));
 var _reactBootstrap = require("react-bootstrap");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _jsxRuntime = require("react/jsx-runtime");
 const ObsmKeysListBtn = () => {
-  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Placeholder, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Placeholder, {
     as: _reactBootstrap.Button,
-    animation: "glow"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Placeholder, {
-    xs: 6,
-    style: {
-      width: "40px"
-    }
-  }));
+    animation: "glow",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Placeholder, {
+      xs: 6,
+      style: {
+        width: '40px'
+      }
+    })
+  });
 };
 exports.ObsmKeysListBtn = ObsmKeysListBtn;

package/dist/cjs/utils/StyledTooltip.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StyledTooltip = void 0;
+var _material = require("@mui/material");
+var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["className"];
+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; }
+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 _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+const StyledTooltip = exports.StyledTooltip = (0, _material.styled)(_ref => {
+  let {
+      className
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, _objectSpread(_objectSpread({}, props), {}, {
+    classes: {
+      popper: className
+    }
+  }));
+})(_ref2 => {
+  let {
+    theme
+  } = _ref2;
+  return {
+    ["& .".concat(_material.tooltipClasses.tooltip)]: {
+      backgroundColor: '#000',
+      color: '#fff',
+      maxWidth: 220,
+      fontSize: 13,
+      borderRadius: 4,
+      padding: theme.spacing(0.5, 1),
+      whiteSpace: 'pre-line',
+      textAlign: 'center',
+      boxShadow: '0 0.25rem 0.75rem rgba(0, 0, 0, 0.1)'
+    }
+  };
+});

package/dist/cjs/utils/VirtualizedList.js

@@ -4,11 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VirtualizedList = VirtualizedList;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _reactVirtual = require("@tanstack/react-virtual");
+var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["getDataAtIndex", "count", "ItemComponent", "estimateSize", "overscan", "maxHeight"];
-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 _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+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; }
+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 _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 function VirtualizedList(_ref) {
@@ -17,16 +21,16 @@ function VirtualizedList(_ref) {
       getDataAtIndex,
       count,
       ItemComponent,
-      estimateSize = 45,
+      estimateSize = () => 45,
       overscan = 25,
-      maxHeight = "65vh"
+      maxHeight = '65vh'
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const [parentNode, setParentNode] = (0, _react.useState)(null);
   const itemVirtualizer = (0, _reactVirtual.useVirtualizer)({
     count: count,
     getScrollElement: () => parentNode,
-    estimateSize: () => estimateSize,
+    estimateSize: i => estimateSize(i),
     overscan: overscan
   });
   const refCallback = (0, _react.useCallback)(node => {
@@ -36,31 +40,34 @@ function VirtualizedList(_ref) {
   (0, _react.useEffect)(() => {
     itemVirtualizer.measure();
   }, [itemVirtualizer, parentNode === null || parentNode === void 0 ? void 0 : parentNode.clientHeight, getDataAtIndex]);
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     ref: refCallback,
     style: {
-      overflowY: "auto",
+      overflowY: 'auto',
       maxHeight: maxHeight
     },
-    className: "modern-scrollbars"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      height: "".concat(itemVirtualizer.getTotalSize(), "px"),
-      width: "100%",
-      position: "relative",
-      willChange: "transform"
-    }
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      position: "absolute",
-      top: 0,
-      left: 0,
-      width: "100%",
-      transform: "translateY(".concat((_virtualItems$0$start = (_virtualItems$ = virtualItems[0]) === null || _virtualItems$ === void 0 ? void 0 : _virtualItems$.start) !== null && _virtualItems$0$start !== void 0 ? _virtualItems$0$start : 0, "px)")
-    }
-  }, virtualItems.map(virtualItem => /*#__PURE__*/_react.default.createElement("div", {
-    key: virtualItem.key,
-    "data-index": virtualItem.index,
-    ref: itemVirtualizer.measureElement
-  }, /*#__PURE__*/_react.default.createElement(ItemComponent, _extends({}, getDataAtIndex(virtualItem.index), props)))))));
+    className: "modern-scrollbars",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      style: {
+        height: "".concat(itemVirtualizer.getTotalSize(), "px"),
+        width: '100%',
+        position: 'relative',
+        willChange: 'transform'
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        style: {
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          width: '100%',
+          transform: "translateY(".concat((_virtualItems$0$start = (_virtualItems$ = virtualItems[0]) === null || _virtualItems$ === void 0 ? void 0 : _virtualItems$.start) !== null && _virtualItems$0$start !== void 0 ? _virtualItems$0$start : 0, "px)")
+        },
+        children: virtualItems.map(virtualItem => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          "data-index": virtualItem.index,
+          ref: itemVirtualizer.measureElement,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ItemComponent, _objectSpread(_objectSpread({}, getDataAtIndex(virtualItem.index)), props))
+        }, virtualItem.key))
+      })
+    })
+  });
 }

package/dist/cjs/utils/errors.js

@@ -12,38 +12,38 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 const parseError = err => {
   if (err === DOMException.TIMEOUT_ERR) {
     return {
-      message: "Timeout error",
+      message: 'Timeout error',
       name: err
     };
   }
   switch (err === null || err === void 0 ? void 0 : err.name) {
-    case "TypeError":
+    case 'TypeError':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Failed to fetch data from server"
+        message: 'Failed to fetch data from server'
       });
-    case "ReadZarrError":
+    case 'ReadZarrError':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Failed to read AnnData-Zarr"
+        message: 'Failed to read AnnData-Zarr'
       });
-    case "InvalidObs":
+    case 'InvalidObs':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Observation not found in dataset"
+        message: 'Observation not found in dataset'
       });
-    case "InvalidVar":
+    case 'InvalidVar':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Feature not found in dataset"
+        message: 'Feature not found in dataset'
       });
-    case "InvalidKey":
+    case 'InvalidKey':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Key not found in datset"
+        message: 'Key not found in dataset'
       });
-    case "BadRequest":
+    case 'BadRequest':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Invalid request to server"
+        message: 'Invalid request to server'
       });
-    case "InternalServerError":
+    case 'InternalServerError':
       return _objectSpread(_objectSpread({}, err), {}, {
-        message: "Server error"
+        message: 'Server error'
       });
     default:
       return err;

package/dist/cjs/utils/requests.js

@@ -22,13 +22,13 @@ async function fetchData(endpoint, params) {
   const timeout = setTimeout(() => {
     controller.abort(DOMException.TIMEOUT_ERR);
   }, ms || 300000);
-  if (signal) signal.addEventListener("abort", () => controller.abort());
+  if (signal) signal.addEventListener('abort', () => controller.abort());
   const response = await fetch(new URL(endpoint, apiUrl), {
-    method: "POST",
-    mode: "cors",
+    method: 'POST',
+    mode: 'cors',
     headers: {
-      "Content-Type": "application/json",
-      Accept: "application/json"
+      'Content-Type': 'application/json',
+      Accept: 'application/json'
     },
     body: JSON.stringify(params),
     signal: controller.signal
@@ -44,12 +44,17 @@ async function fetchData(endpoint, params) {
   }
   return await response.json();
 }
+
+// @TODO: update to match isLoading
 const useFetch = function (endpoint, params) {
   let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
     refetchOnMount: false,
     refetchOnWindowFocus: false
   };
   let apiUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  const {
+    retry = null
+  } = opts;
   const {
     data: fetchedData = null,
     isLoading: isPending = false,
@@ -62,13 +67,13 @@ const useFetch = function (endpoint, params) {
       } = _ref;
       return fetchData(endpoint, params, signal, apiUrl);
     },
-    retry: (failureCount, _ref2) => {
+    retry: retry || ((failureCount, _ref2) => {
       let {
         error
       } = _ref2;
       if ([400, 401, 403, 404, 422].includes(error === null || error === void 0 ? void 0 : error.status)) return false;
       return failureCount < 3;
-    }
+    })
   }, opts));
   return {
     fetchedData,
@@ -84,12 +89,17 @@ const useDebouncedFetch = function (endpoint, params) {
     refetchOnWindowFocus: false
   };
   let apiUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+  // Optional isEnabled function to determine if enabled based on debouncedParams instead of params
+  const {
+    enabled = true,
+    isEnabled = () => true
+  } = opts;
   const debouncedParams = (0, _usehooks.useDebounce)(params, delay);
   const {
     data: fetchedData = null,
     isLoading: isPending = false,
     error: serverError = null
-  } = (0, _reactQuery.useQuery)(_objectSpread({
+  } = (0, _reactQuery.useQuery)(_objectSpread(_objectSpread({
     queryKey: [endpoint, debouncedParams],
     queryFn: _ref3 => {
       let {
@@ -104,7 +114,9 @@ const useDebouncedFetch = function (endpoint, params) {
       if ([400, 401, 403, 404, 422].includes(error === null || error === void 0 ? void 0 : error.status)) return false;
       return failureCount < 3;
     }
-  }, opts));
+  }, opts), {}, {
+    enabled: enabled && isEnabled(debouncedParams)
+  }));
   return {
     fetchedData,
     isPending,

package/dist/cjs/utils/search.js

@@ -8,12 +8,12 @@ var _react = require("react");
 var _requests = require("./requests");
 var _DatasetContext = require("../context/DatasetContext");
 const useDiseaseSearch = () => {
-  const ENDPOINT = "diseases";
+  const ENDPOINT = 'diseases';
   const dataset = (0, _DatasetContext.useDataset)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
     diseaseDatasets: dataset.diseaseDatasets,
-    text: ""
+    text: ''
   });
   const data = (0, _requests.useFetch)(ENDPOINT, params, {
     enabled: !!params.text.length,
@@ -27,12 +27,12 @@ const useDiseaseSearch = () => {
 };
 exports.useDiseaseSearch = useDiseaseSearch;
 const useVarSearch = () => {
-  const ENDPOINT = "var/names";
+  const ENDPOINT = 'var/names';
   const dataset = (0, _DatasetContext.useDataset)();
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
     col: dataset.varNamesCol,
-    text: ""
+    text: ''
   });
   const data = (0, _requests.useFetch)(ENDPOINT, params, {
     enabled: !!params.text.length,

package/dist/cjs/utils/string.js

@@ -9,9 +9,9 @@ exports.formatString = formatString;
 var _numbro = _interopRequireDefault(require("numbro"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const FORMATS = exports.FORMATS = {
-  EXPONENTIAL: "exponential",
-  ABBREVIATION: "abbreviation",
-  THOUSAND: "thousand"
+  EXPONENTIAL: 'exponential',
+  ABBREVIATION: 'abbreviation',
+  THOUSAND: 'thousand'
 };
 function formatThousand(n) {
   let precision = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3;
@@ -41,9 +41,9 @@ function formatNumerical(n) {
   let format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : FORMATS.THOUSAND;
   let precision = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3;
   if (n === 0) {
-    return "0";
+    return '0';
   } else if (!n || n === undefined || isNaN(n)) {
-    return "NaN";
+    return 'NaN';
   }
   switch (format) {
     case FORMATS.EXPONENTIAL:
@@ -64,5 +64,5 @@ function formatNumerical(n) {
   }
 }
 function formatString(s) {
-  return s.trim().replace(/_/g, " ");
+  return s.trim().replace(/_/g, ' ');
 }