@haniffalab/cherita-react 0.1.12-dev.2023-12-12.6e6b2de2 → 0.1.12-dev.2023-12-19.edfc4091

package/dist/components/dotplot/Dotplot.js

@@ -10,7 +10,6 @@ require("bootstrap/dist/css/bootstrap.min.css");
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _requests = require("../../utils/requests");
@@ -173,6 +172,7 @@ function DotplotControls() {
   }, "Autoscale"))));
 }
 function Dotplot() {
+  var ENDPOINT = "dotplot";
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
   var colorscale = (0, _react.useRef)(dataset.controls.colorScale);
@@ -188,8 +188,40 @@ function Dotplot() {
     _useState8 = _slicedToArray(_useState7, 2),
     hasSelections = _useState8[0],
     setHasSelections = _useState8[1];
+  var _useState9 = (0, _react.useState)({
+      url: dataset.url,
+      selectedObs: dataset.selectedObs,
+      selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+        return i.name;
+      }),
+      standardScale: dataset.controls.standardScale,
+      meanOnlyExpressed: dataset.controls.meanOnlyExpressed,
+      expressionCutoff: dataset.controls.expressionCutoff
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    params = _useState10[0],
+    setParams = _useState10[1];
   // @TODO: set default scale
 
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+      setHasSelections(true);
+    } else {
+      setHasSelections(false);
+    }
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url,
+        selectedObs: dataset.selectedObs,
+        selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+          return i.name;
+        }),
+        standardScale: dataset.controls.standardScale,
+        meanOnlyExpressed: dataset.controls.meanOnlyExpressed,
+        expressionCutoff: dataset.controls.expressionCutoff
+      });
+    });
+  }, [dataset.url, dataset.selectedObs, dataset.selectedMultiVar, dataset.controls.standardScale, dataset.controls.meanOnlyExpressed, dataset.controls.expressionCutoff]);
   var updateColorscale = (0, _react.useCallback)(function (colorscale) {
     setLayout(function (l) {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -199,56 +231,28 @@ function Dotplot() {
       });
     });
   }, []);
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (dataset.selectedObs && dataset.selectedMultiVar.length) {
-        setHasSelections(true);
-        (0, _requests.fetchData)("dotplot", {
-          url: dataset.url,
-          selectedObs: dataset.selectedObs,
-          selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
-            return i.name;
-          }),
-          standardScale: dataset.controls.standardScale,
-          meanOnlyExpressed: dataset.controls.meanOnlyExpressed,
-          expressionCutoff: dataset.controls.expressionCutoff
-        }, abortController.signal).then(function (data) {
-          setData(data.data);
-          setLayout(data.layout);
-          dispatch({
-            type: "set.controls.colorAxis",
-            colorAxis: {
-              dmin: data.range.min.toFixed(1),
-              dmax: data.range.max.toFixed(1),
-              cmin: data.range.min.toFixed(1),
-              cmax: data.range.max.toFixed(1)
-            }
-          });
-          updateColorscale(colorscale.current);
-        }).catch(function (response) {
-          if (response.name !== "AbortError") {
-            response.json().then(function (json) {
-              console.log(json.message);
-            });
-          }
-        });
-      } else {
-        setHasSelections(false);
-      }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [dataset.url, dataset.selectedObs, dataset.selectedMultiVar, dataset.controls.standardScale, dataset.controls.meanOnlyExpressed, dataset.controls.expressionCutoff, updateColorscale, dispatch]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: !!params.selectedObs && !!params.selectedMultiVar.length
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+      dispatch({
+        type: "set.controls.colorAxis",
+        colorAxis: {
+          dmin: fetchedData.range.min.toFixed(1),
+          dmax: fetchedData.range.max.toFixed(1),
+          cmin: fetchedData.range.min.toFixed(1),
+          cmax: fetchedData.range.max.toFixed(1)
+        }
+      });
+      updateColorscale(colorscale.current);
+    }
+  }, [fetchedData, isPending, serverError, hasSelections, dispatch, updateColorscale]);
   (0, _react.useEffect)(function () {
     colorscale.current = dataset.controls.colorScale;
     updateColorscale(colorscale.current);

package/dist/components/heatmap/Heatmap.js

@@ -10,7 +10,6 @@ require("bootstrap/dist/css/bootstrap.min.css");
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _requests = require("../../utils/requests");
@@ -49,6 +48,7 @@ function HeatmapControls() {
   }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, colormapList));
 }
 function Heatmap() {
+  var ENDPOINT = "heatmap";
   var dataset = (0, _DatasetContext.useDataset)();
   var colorscale = (0, _react.useRef)(dataset.controls.colorScale);
   var _useState = (0, _react.useState)([]),
@@ -63,6 +63,32 @@ function Heatmap() {
     _useState6 = _slicedToArray(_useState5, 2),
     hasSelections = _useState6[0],
     setHasSelections = _useState6[1];
+  var _useState7 = (0, _react.useState)({
+      url: dataset.url,
+      selectedObs: dataset.selectedObs,
+      selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+        return i.name;
+      })
+    }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    params = _useState8[0],
+    setParams = _useState8[1];
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+      setHasSelections(true);
+    } else {
+      setHasSelections(false);
+    }
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url,
+        selectedObs: dataset.selectedObs,
+        selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+          return i.name;
+        })
+      });
+    });
+  }, [dataset.selectedMultiVar, dataset.selectedObs, dataset.url]);
   var updateColorscale = (0, _react.useCallback)(function (colorscale) {
     setLayout(function (l) {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -72,44 +98,19 @@ function Heatmap() {
       });
     });
   }, []);
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (dataset.selectedObs && dataset.selectedMultiVar.length) {
-        setHasSelections(true);
-        (0, _requests.fetchData)("heatmap", {
-          url: dataset.url,
-          selectedObs: dataset.selectedObs,
-          selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
-            return i.name;
-          })
-        }, abortController.signal).then(function (data) {
-          setData(data.data);
-          setLayout(data.layout);
-          updateColorscale(colorscale.current);
-        }).catch(function (response) {
-          if (response.name !== "AbortError") {
-            response.json().then(function (json) {
-              console.log(json.message);
-            });
-          }
-        });
-      } else {
-        setHasSelections(false);
-      }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [dataset.selectedMultiVar, dataset.selectedObs, dataset.url, updateColorscale]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: !!params.selectedObs && !!params.selectedMultiVar.length
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+      updateColorscale(colorscale.current);
+    }
+  }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(function () {
     colorscale.current = dataset.controls.colorScale;
     updateColorscale(colorscale.current);

package/dist/components/matrixplot/Matrixplot.js

@@ -10,7 +10,6 @@ require("bootstrap/dist/css/bootstrap.min.css");
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _reactBootstrap = require("react-bootstrap");
@@ -65,6 +64,7 @@ function MatrixplotControls() {
   }, dataset.controls.standardScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, standardScaleList)))));
 }
 function Matrixplot() {
+  var ENDPOINT = "matrixplot";
   var dataset = (0, _DatasetContext.useDataset)();
   var colorscale = (0, _react.useRef)(dataset.controls.colorScale);
   var _useState = (0, _react.useState)([]),
@@ -79,6 +79,34 @@ function Matrixplot() {
     _useState6 = _slicedToArray(_useState5, 2),
     hasSelections = _useState6[0],
     setHasSelections = _useState6[1];
+  var _useState7 = (0, _react.useState)({
+      url: dataset.url,
+      selectedObs: dataset.selectedObs,
+      selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+        return i.name;
+      }),
+      standardScale: dataset.controls.standardScale
+    }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    params = _useState8[0],
+    setParams = _useState8[1];
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+      setHasSelections(true);
+    } else {
+      setHasSelections(false);
+    }
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url,
+        selectedObs: dataset.selectedObs,
+        selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+          return i.name;
+        }),
+        standardScale: dataset.controls.standardScale
+      });
+    });
+  }, [dataset.controls.standardScale, dataset.selectedMultiVar, dataset.selectedObs, dataset.url]);
   var updateColorscale = (0, _react.useCallback)(function (colorscale) {
     setLayout(function (l) {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -88,45 +116,19 @@ function Matrixplot() {
       });
     });
   }, []);
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (dataset.selectedObs && dataset.selectedMultiVar.length) {
-        setHasSelections(true);
-        (0, _requests.fetchData)("matrixplot", {
-          url: dataset.url,
-          selectedObs: dataset.selectedObs,
-          selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
-            return i.name;
-          }),
-          standardScale: dataset.controls.standardScale
-        }, abortController.signal).then(function (data) {
-          setData(data.data);
-          setLayout(data.layout);
-          updateColorscale(colorscale.current);
-        }).catch(function (response) {
-          if (response.name !== "AbortError") {
-            response.json().then(function (json) {
-              console.log(json.message);
-            });
-          }
-        });
-      } else {
-        setHasSelections(false);
-      }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [dataset.url, dataset.selectedObs, dataset.selectedMultiVar, dataset.controls.standardScale, updateColorscale]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: !!params.selectedObs && !!params.selectedMultiVar.length
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+      updateColorscale(colorscale.current);
+    }
+  }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(function () {
     colorscale.current = dataset.controls.colorScale;
     updateColorscale(colorscale.current);

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

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,12 +14,18 @@ var _reactBootstrap = require("react-bootstrap");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var N_BINS = 5;
 function binContinuous(data) {
   var nBins = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : N_BINS;
@@ -28,23 +33,24 @@ function binContinuous(data) {
   var thresholds = _lodash.default.range(nBins + 1).map(function (b) {
     return data.min + binSize * b;
   });
-  data.bins = {
+  var bins = {
     nBins: nBins,
     binSize: binSize,
     thresholds: thresholds
   };
-  return data;
+  return _objectSpread(_objectSpread({}, data), bins);
 }
 function binDiscrete(data) {
   var nBins = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : N_BINS;
   var binSize = _lodash.default.round(data.n_values * (1 / nBins));
-  data.bins = {
+  var bins = {
     nBins: nBins,
     binSize: binSize
   };
-  return data;
+  return _objectSpread(_objectSpread({}, data), bins);
 }
 function ObsColsList() {
+  var ENDPOINT = "obs/cols";
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
   var _useState = (0, _react.useState)([]),
@@ -55,11 +61,28 @@ function ObsColsList() {
     _useState4 = _slicedToArray(_useState3, 2),
     active = _useState4[0],
     setActive = _useState4[1];
-  (0, _react.useEffect)(function () {
-    (0, _requests.fetchData)("obs/cols", {
+  var _useState5 = (0, _react.useState)({
       url: dataset.url
-    }).then(function (data) {
-      setObsColsList(data.map(function (d) {
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    params = _useState6[0],
+    setParams = _useState6[1];
+  (0, _react.useEffect)(function () {
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url
+      });
+    });
+  }, [dataset.url]);
+  var _useFetch = (0, _requests.useFetch)(ENDPOINT, params, {
+      refetchOnMount: false
+    }),
+    fetchedData = _useFetch.fetchedData,
+    isPending = _useFetch.isPending,
+    serverError = _useFetch.serverError;
+  (0, _react.useEffect)(function () {
+    if (!isPending && !serverError) {
+      setObsColsList(fetchedData.map(function (d) {
         if (d.type === "continuous") {
           d = binContinuous(d);
         }
@@ -68,12 +91,8 @@ function ObsColsList() {
         }
         return d;
       }));
-    }).catch(function (response) {
-      response.json().then(function (json) {
-        console.log(json.message);
-      });
-    });
-  }, [dataset.url]);
+    }
+  }, [fetchedData, isPending, serverError]);
   (0, _react.useEffect)(function () {
     if (dataset.selectedObs) {
       setActive(dataset.selectedObs.name);
@@ -93,7 +112,7 @@ function ObsColsList() {
     return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Item, {
       key: item.name,
       eventKey: item.name
-    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Header, null, item.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Body, null, /*#__PURE__*/_react.default.createElement("p", null, "Min: ", item.min), /*#__PURE__*/_react.default.createElement("p", null, "Max: ", item.max), /*#__PURE__*/_react.default.createElement("p", null, "Mean: ", item.mean), /*#__PURE__*/_react.default.createElement("p", null, "Median: ", item.median), /*#__PURE__*/_react.default.createElement("p", null, "NBins: ", item.bins.nBins)));
+    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Header, null, item.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Body, null, /*#__PURE__*/_react.default.createElement("p", null, "Min: ", item.min), /*#__PURE__*/_react.default.createElement("p", null, "Max: ", item.max), /*#__PURE__*/_react.default.createElement("p", null, "Mean: ", item.mean), /*#__PURE__*/_react.default.createElement("p", null, "Median: ", item.median), /*#__PURE__*/_react.default.createElement("p", null, "NBins: ", item.nBins)));
   }
   function otherList(item) {
     return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Item, {

package/dist/components/obsm-list/ObsmList.js

@@ -11,6 +11,11 @@ var _requests = require("../../utils/requests");
 var _DatasetContext = require("../../context/DatasetContext");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,6 +23,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ObsmKeysList() {
+  var ENDPOINT = "obsm/keys";
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
   var _useState = (0, _react.useState)([]),
@@ -28,17 +34,30 @@ function ObsmKeysList() {
     _useState4 = _slicedToArray(_useState3, 2),
     active = _useState4[0],
     setActive = _useState4[1];
-  (0, _react.useEffect)(function () {
-    (0, _requests.fetchData)("obsm/keys", {
+  var _useState5 = (0, _react.useState)({
       url: dataset.url
-    }).then(function (data) {
-      setObsmKeysList(data);
-    }).catch(function (response) {
-      response.json().then(function (json) {
-        console.log(json.message);
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    params = _useState6[0],
+    setParams = _useState6[1];
+  (0, _react.useEffect)(function () {
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url
       });
     });
   }, [dataset.url]);
+  var _useFetch = (0, _requests.useFetch)(ENDPOINT, params, {
+      refetchOnMount: false
+    }),
+    fetchedData = _useFetch.fetchedData,
+    isPending = _useFetch.isPending,
+    serverError = _useFetch.serverError;
+  (0, _react.useEffect)(function () {
+    if (!isPending && !serverError) {
+      setObsmKeysList(fetchedData);
+    }
+  }, [fetchedData, isPending, serverError]);
   (0, _react.useEffect)(function () {
     if (dataset.selectedObsm) {
       setActive(dataset.selectedObsm);

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

@@ -5,43 +5,145 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VarNamesList = VarNamesList;
+exports.VarSearchBar = VarSearchBar;
 require("bootstrap/dist/css/bootstrap.min.css");
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = _interopRequireDefault(require("lodash"));
 var _requests = require("../../utils/requests");
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
+var _reactBootstrap = require("react-bootstrap");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function VarNamesList(_ref) {
-  var _ref$mode = _ref.mode,
-    mode = _ref$mode === void 0 ? _constants.SELECTION_MODES.SINGLE : _ref$mode;
-  var dataset = (0, _DatasetContext.useDataset)();
-  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
+function VarSearchBar(_ref) {
+  var _ref$varNames = _ref.varNames,
+    varNames = _ref$varNames === void 0 ? [] : _ref$varNames,
+    onSelect = _ref.onSelect;
   var _useState = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
-    varNames = _useState2[0],
-    setVarNames = _useState2[1];
-  var _useState3 = (0, _react.useState)(mode === _constants.SELECTION_MODES.SINGLE ? null : []),
+    suggestions = _useState2[0],
+    setSuggestions = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    active = _useState4[0],
-    setActive = _useState4[1];
+    showSuggestions = _useState4[0],
+    setShowSuggestions = _useState4[1];
+  var _useState5 = (0, _react.useState)(""),
+    _useState6 = _slicedToArray(_useState5, 2),
+    text = _useState6[0],
+    setText = _useState6[1];
+  var getSuggestions = (0, _react.useMemo)(function () {
+    var filter = function filter(text) {
+      if (text.length > 0) {
+        var regex = new RegExp("^".concat(text), "i");
+        var _filter = varNames.sort().filter(function (v) {
+          return regex.test(v.name);
+        });
+        setSuggestions(_filter);
+        setShowSuggestions(true);
+      } else {
+        setShowSuggestions(false);
+      }
+    };
+    return _lodash.default.debounce(filter, 300);
+  }, [varNames]);
   (0, _react.useEffect)(function () {
-    (0, _requests.fetchData)("var/names", {
+    getSuggestions(text);
+  }, [getSuggestions, text]);
+  var suggestionsList = suggestions.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
+      key: item.name,
+      as: "button",
+      onClick: function onClick() {
+        onSelect(item);
+      }
+    }, item.name);
+  });
+  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Form, {
+    onSubmit: function onSubmit(e) {
+      e.preventDefault();
+    }
+  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.FormGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Form.Label, null, "Feature:"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Form.Control, {
+    onFocus: function onFocus() {
+      setShowSuggestions(text.length > 0);
+    },
+    onBlur: function onBlur() {
+      _lodash.default.delay(function () {
+        setShowSuggestions(false);
+      }, 150);
+    },
+    type: "text",
+    placeholder: "Search for a feature",
+    value: text,
+    onChange: function onChange(e) {
+      setText(e.target.value);
+    }
+  }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, {
+    style: {
+      width: "90%",
+      maxHeight: "25vh",
+      overflowY: "scroll"
+    },
+    show: showSuggestions
+  }, suggestionsList))));
+}
+function VarNamesList(_ref2) {
+  var _ref2$mode = _ref2.mode,
+    mode = _ref2$mode === void 0 ? _constants.SELECTION_MODES.SINGLE : _ref2$mode;
+  var ENDPOINT = "var/names";
+  var dataset = (0, _DatasetContext.useDataset)();
+  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
+  var _useState7 = (0, _react.useState)([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    varNames = _useState8[0],
+    setVarNames = _useState8[1];
+  var _useState9 = (0, _react.useState)(mode ? mode === _constants.SELECTION_MODES.SINGLE ? [dataset.selectVar] : dataset.selectedMultiVar : []),
+    _useState10 = _slicedToArray(_useState9, 2),
+    varButtons = _useState10[0],
+    setVarButtons = _useState10[1];
+  var _useState11 = (0, _react.useState)(mode === _constants.SELECTION_MODES.SINGLE ? null : []),
+    _useState12 = _slicedToArray(_useState11, 2),
+    active = _useState12[0],
+    setActive = _useState12[1];
+  var _useState13 = (0, _react.useState)({
       url: dataset.url
-    }).then(function (data) {
-      setVarNames(data);
-    }).catch(function (response) {
-      response.json().then(function (json) {
-        console.log(json.message);
+    }),
+    _useState14 = _slicedToArray(_useState13, 2),
+    params = _useState14[0],
+    setParams = _useState14[1];
+  (0, _react.useEffect)(function () {
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url
       });
     });
   }, [dataset.url]);
+  var _useFetch = (0, _requests.useFetch)(ENDPOINT, params, {
+      refetchOnMount: false
+    }),
+    fetchedData = _useFetch.fetchedData,
+    isPending = _useFetch.isPending,
+    serverError = _useFetch.serverError;
+  (0, _react.useEffect)(function () {
+    if (!isPending && !serverError) {
+      setVarNames(fetchedData);
+    }
+  }, [fetchedData, isPending, serverError]);
   (0, _react.useEffect)(function () {
     if (mode === _constants.SELECTION_MODES.SINGLE && dataset.selectedVar) {
       setActive(dataset.selectedVar.matrix_index);
@@ -54,45 +156,74 @@ function VarNamesList(_ref) {
       }));
     }
   }, [mode, dataset.selectedMultiVar]);
-  var varList = varNames.map(function (item) {
+  var selectVar = function selectVar(item) {
+    setVarButtons(function () {
+      if (varButtons.find(function (v) {
+        return v.matrix_index === item.matrix_index;
+      })) {
+        return varButtons;
+      } else {
+        return [].concat(_toConsumableArray(varButtons), [item]);
+      }
+    });
     if (mode === _constants.SELECTION_MODES.SINGLE) {
-      return /*#__PURE__*/_react.default.createElement("button", {
-        type: "button",
-        key: item.matrix_index,
-        className: "list-group-item list-grou-item-action ".concat(active === item.matrix_index && "active"),
-        onClick: function onClick() {
-          dispatch({
-            type: "varSelected",
-            var: item
-          });
-        }
-      }, item.name);
+      dispatch({
+        type: "varSelected",
+        var: item
+      });
     } else if (mode === _constants.SELECTION_MODES.MULTIPLE) {
-      return /*#__PURE__*/_react.default.createElement("button", {
-        type: "button",
-        key: item.matrix_index,
-        className: "list-group-item list-grou-item-action ".concat(active.includes(item.matrix_index) && "active"),
-        onClick: function onClick() {
-          if (active.includes(item.matrix_index)) {
-            dispatch({
-              type: "multiVarDeselected",
-              var: item
-            });
-          } else {
+      dispatch({
+        type: "multiVarSelected",
+        var: item
+      });
+    }
+  };
+  var varList = (0, _react.useMemo)(function () {
+    return varButtons.map(function (item) {
+      if (mode === _constants.SELECTION_MODES.SINGLE) {
+        return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+          type: "button",
+          key: item.matrix_index,
+          variant: "outline-primary",
+          className: "".concat(active === item.matrix_index && "active", " m-1"),
+          onClick: function onClick() {
             dispatch({
-              type: "multiVarSelected",
+              type: "varSelected",
               var: item
             });
           }
-        }
-      }, item.name);
-    } else {
-      return null;
-    }
-  });
+        }, item.name);
+      } else if (mode === _constants.SELECTION_MODES.MULTIPLE) {
+        return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+          type: "button",
+          key: item.matrix_index,
+          variant: "outline-primary",
+          className: "".concat(active.includes(item.matrix_index) && "active", " m-1"),
+          onClick: function onClick() {
+            if (active.includes(item.matrix_index)) {
+              dispatch({
+                type: "multiVarDeselected",
+                var: item
+              });
+            } else {
+              dispatch({
+                type: "multiVarSelected",
+                var: item
+              });
+            }
+          }
+        }, item.name);
+      } else {
+        return null;
+      }
+    });
+  }, [active, dispatch, mode, varButtons]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: ""
-  }, /*#__PURE__*/_react.default.createElement("h4", null, mode), /*#__PURE__*/_react.default.createElement("div", {
-    className: "list-group overflow-auto mh-100"
+  }, /*#__PURE__*/_react.default.createElement("h4", null, mode), /*#__PURE__*/_react.default.createElement(VarSearchBar, {
+    varNames: varNames,
+    onSelect: selectVar
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "overflow-auto mt-2"
   }, varList));
 }

package/dist/components/violin/Violin.js

@@ -10,7 +10,6 @@ require("bootstrap/dist/css/bootstrap.min.css");
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _reactBootstrap = require("react-bootstrap");
@@ -18,6 +17,11 @@ var _requests = require("../../utils/requests");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -58,6 +62,7 @@ function ViolinControls() {
 function Violin(_ref) {
   var _ref$mode = _ref.mode,
     mode = _ref$mode === void 0 ? _constants.VIOLIN_MODES.MULTIKEY : _ref$mode;
+  var ENDPOINT = "violin";
   var dataset = (0, _DatasetContext.useDataset)();
   var _useState3 = (0, _react.useState)([]),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -71,68 +76,60 @@ function Violin(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     hasSelections = _useState8[0],
     setHasSelections = _useState8[1];
+  var _useState9 = (0, _react.useState)({
+      url: dataset.url,
+      keys: [],
+      scale: dataset.controls.standardScale
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    params = _useState10[0],
+    setParams = _useState10[1];
   // @TODO: set default scale
 
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (mode === _constants.VIOLIN_MODES.MULTIKEY) {
-        if (dataset.selectedMultiVar.length) {
-          setHasSelections(true);
-          (0, _requests.fetchData)("violin", {
-            url: dataset.url,
-            keys: dataset.selectedMultiVar.map(function (i) {
-              return i.name;
-            }),
-            scale: dataset.controls.standardScale
-          }, abortController.signal).then(function (data) {
-            setData(data.data);
-            setLayout(data.layout);
-          }).catch(function (response) {
-            if (response.name !== "AbortError") {
-              response.json().then(function (json) {
-                console.log(json.message);
-              });
-            }
-          });
-        } else {
-          setHasSelections(false);
-        }
-      } else if (mode === _constants.VIOLIN_MODES.GROUPBY) {
-        if (dataset.selectedObs && dataset.selectedVar) {
-          setHasSelections(true);
-          (0, _requests.fetchData)("violin", {
-            url: dataset.url,
-            keys: dataset.selectedVar.name,
-            selectedObs: dataset.selectedObs,
-            scale: dataset.controls.standardScale
-          }).then(function (data) {
-            setData(data.data);
-            setLayout(data.layout);
-          }).catch(function (response) {
-            if (response.name !== "AbortError") {
-              response.json().then(function (json) {
-                console.log(json.message);
-              });
-            }
-          });
-        } else {
-          setHasSelections(false);
-        }
+  (0, _react.useEffect)(function () {
+    if (mode === _constants.VIOLIN_MODES.MULTIKEY) {
+      if (dataset.selectedMultiVar.length) {
+        setHasSelections(true);
+      } else {
+        setHasSelections(false);
+      }
+      setParams(function (p) {
+        return _objectSpread(_objectSpread({}, p), {}, {
+          url: dataset.url,
+          keys: dataset.selectedMultiVar.map(function (i) {
+            return i.name;
+          }),
+          scale: dataset.controls.standardScale
+        });
+      });
+    } else if (mode === _constants.VIOLIN_MODES.GROUPBY) {
+      if (dataset.selectedObs && dataset.selectedVar) {
+        setHasSelections(true);
+      } else {
+        setHasSelections(false);
       }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [mode, dataset.url, dataset.selectedObs, dataset.selectedVar, dataset.selectedMultiVar, dataset.controls.standardScale]);
+      setParams(function (p) {
+        return _objectSpread(_objectSpread({}, p), {}, {
+          url: dataset.url,
+          keys: dataset.selectedVar.name,
+          selectedObs: dataset.selectedObs,
+          scale: dataset.controls.standardScale
+        });
+      });
+    }
+  }, [dataset.controls.standardScale, dataset.selectedMultiVar, dataset.selectedObs, dataset.selectedVar, dataset.url, mode]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: mode === _constants.VIOLIN_MODES.MULTIKEY && !!params.keys || mode === _constants.VIOLIN_MODES.GROUPBY && !!params.keys.length && !!params.selectedObs
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+    }
+  }, [fetchedData, hasSelections, isPending, serverError]);
   if (hasSelections) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "cherita-violin"

package/dist/context/DatasetContext.js

@@ -9,6 +9,9 @@ exports.DatasetProvider = DatasetProvider;
 exports.useDataset = useDataset;
 exports.useDatasetDispatch = useDatasetDispatch;
 var _react = _interopRequireWildcard(require("react"));
+var _reactQuery = require("@tanstack/react-query");
+var _reactQueryPersistClient = require("@tanstack/react-query-persist-client");
+var _querySyncStoragePersister = require("@tanstack/query-sync-storage-persister");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -30,9 +33,32 @@ var DatasetContext = /*#__PURE__*/(0, _react.createContext)(null);
 exports.DatasetContext = DatasetContext;
 var DatasetDispatchContext = /*#__PURE__*/(0, _react.createContext)(null);
 exports.DatasetDispatchContext = DatasetDispatchContext;
-function DatasetProvider(_ref) {
-  var dataset_url = _ref.dataset_url,
-    children = _ref.children;
+var queryClient = new _reactQuery.QueryClient({
+  defaultOptions: {
+    queries: {
+      gcTime: 1000 * 60 * 60 * 24
+    }
+  }
+});
+var persistKeys = ["obs/cols", "var/names", "obsm/keys"];
+var persistOptions = {
+  persister: (0, _querySyncStoragePersister.createSyncStoragePersister)({
+    storage: window.localStorage
+  }),
+  dehydrateOptions: {
+    shouldDehydrateQuery: function shouldDehydrateQuery(_ref) {
+      var queryKey = _ref.queryKey,
+        state = _ref.state;
+      if (state.status === "success") {
+        return persistKeys.includes(queryKey === null || queryKey === void 0 ? void 0 : queryKey[0]);
+      }
+      return false;
+    }
+  }
+};
+function DatasetProvider(_ref2) {
+  var dataset_url = _ref2.dataset_url,
+    children = _ref2.children;
   var _useReducer = (0, _react.useReducer)(datasetReducer, {
       url: dataset_url,
       selectedObs: null,
@@ -60,7 +86,10 @@ function DatasetProvider(_ref) {
     value: dataset
   }, /*#__PURE__*/_react.default.createElement(DatasetDispatchContext.Provider, {
     value: dispatch
-  }, children));
+  }, /*#__PURE__*/_react.default.createElement(_reactQueryPersistClient.PersistQueryClientProvider, {
+    client: queryClient,
+    persistOptions: persistOptions
+  }, children)));
 }
 function useDataset() {
   return (0, _react.useContext)(DatasetContext);
@@ -94,9 +123,15 @@ function datasetReducer(dataset, action) {
       }
     case "multiVarSelected":
       {
-        return _objectSpread(_objectSpread({}, dataset), {}, {
-          selectedMultiVar: [].concat(_toConsumableArray(dataset.selectedMultiVar), [action.var])
-        });
+        if (dataset.selectedMultiVar.find(function (i) {
+          return i === action.var;
+        })) {
+          return dataset;
+        } else {
+          return _objectSpread(_objectSpread({}, dataset), {}, {
+            selectedMultiVar: [].concat(_toConsumableArray(dataset.selectedMultiVar), [action.var])
+          });
+        }
       }
     case "multiVarDeselected":
       {

package/dist/utils/requests.js

@@ -1,11 +1,19 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fetchData = fetchData;
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+exports.useFetch = exports.useDebouncedFetch = void 0;
+var _usehooks = require("@uidotdev/usehooks");
+var _reactQuery = require("@tanstack/react-query");
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function fetchData(_x, _x2) {
@@ -52,4 +60,44 @@ function _fetchData() {
     }, _callee);
   }));
   return _fetchData.apply(this, arguments);
-}
+}
+var useFetch = function useFetch(endpoint, params) {
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var _useQuery = (0, _reactQuery.useQuery)(_objectSpread({
+      queryKey: [endpoint, params],
+      queryFn: function queryFn(_ref) {
+        var signal = _ref.signal;
+        return fetchData(endpoint, params, signal);
+      }
+    }, opts)),
+    fetchedData = _useQuery.data,
+    isPending = _useQuery.isPending,
+    serverError = _useQuery.error;
+  return {
+    fetchedData: fetchedData,
+    isPending: isPending,
+    serverError: serverError
+  };
+};
+exports.useFetch = useFetch;
+var useDebouncedFetch = function useDebouncedFetch(endpoint, params) {
+  var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 500;
+  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  var debouncedParams = (0, _usehooks.useDebounce)(params, delay);
+  var _useQuery2 = (0, _reactQuery.useQuery)(_objectSpread({
+      queryKey: [endpoint, debouncedParams],
+      queryFn: function queryFn(_ref2) {
+        var signal = _ref2.signal;
+        return fetchData(endpoint, debouncedParams, signal);
+      }
+    }, opts)),
+    fetchedData = _useQuery2.data,
+    isPending = _useQuery2.isPending,
+    serverError = _useQuery2.error;
+  return {
+    fetchedData: fetchedData,
+    isPending: isPending,
+    serverError: serverError
+  };
+};
+exports.useDebouncedFetch = useDebouncedFetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "0.1.12-dev.2023-12-12.6e6b2de2",
+  "version": "0.1.12-dev.2023-12-19.edfc4091",
   "author": "",
   "license": "",
   "main": "dist/index.js",
@@ -14,6 +14,10 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@nebula.gl/editor": "^1.0.4",
     "@nebula.gl/layers": "^1.0.4",
+    "@tanstack/query-sync-storage-persister": "^5.13.4",
+    "@tanstack/react-query": "^5.13.4",
+    "@tanstack/react-query-persist-client": "^5.13.4",
+    "@uidotdev/usehooks": "^2.4.1",
     "bootstrap": "^5.3.0",
     "chroma-js": "^2.4.2",
     "deck.gl": "^8.9.19",
@@ -74,5 +78,5 @@
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
   "homepage": "https://github.com/haniffalab/cherita-react#readme",
-  "prereleaseSha": "6e6b2de215f5887606dd41e2630f29a20b7c2388"
+  "prereleaseSha": "edfc40913a8d9d9358dda442c8aeb8dc52c10acc"
 }