@haniffalab/cherita-react 1.2.0 → 1.3.0-dev.2025-05-28.9afc380f

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

@@ -1,16 +1,26 @@
-import React, { useState, useEffect, useMemo, useDeferredValue } from "react";
+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); }
+import React, { useDeferredValue, useEffect, useMemo, useState } from "react";
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import _ from "lodash";
-import { Dropdown } from "react-bootstrap";
-import { useDatasetDispatch } from "../../context/DatasetContext";
+import { Button, ListGroup } from "react-bootstrap";
+import { useSettingsDispatch } from "../../context/SettingsContext";
 import { useDiseaseSearch, useVarSearch } from "../../utils/search";
+import { VirtualizedList } from "../../utils/VirtualizedList";
 export function VarSearchResults(_ref) {
   let {
     text,
-    setShowSuggestions,
-    handleSelect
+    handleSelect,
+    selectedResult,
+    setSelectedResult,
+    setResultsLength
   } = _ref;
   const [suggestions, setSuggestions] = useState([]);
-  const dispatch = useDatasetDispatch();
+  const dispatch = useSettingsDispatch();
   const {
     setParams,
     data: {
@@ -25,57 +35,76 @@ export function VarSearchResults(_ref) {
     const setData = text => {
       if (text.length) {
         setParams(p => {
-          return {
-            ...p,
+          return _objectSpread(_objectSpread({}, p), {}, {
             text: text
-          };
+          });
         });
       } else {
         setSuggestions([]);
-        setShowSuggestions(false);
       }
     };
     return _.debounce(setData, 300);
-  }, [setParams, setShowSuggestions]);
+  }, [setParams]);
   useEffect(() => {
     updateParams(text);
   }, [text, updateParams]);
   useEffect(() => {
     if (!isPending && !serverError) {
       setSuggestions(fetchedData);
-      setShowSuggestions(true);
+      setResultsLength(fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.length);
+    }
+  }, [fetchedData, isPending, serverError, setResultsLength]);
+  const getDataAtIndex = index => deferredData[index];
+  const ItemComponent = item => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "virtualized-list-wrapper"
+  }, /*#__PURE__*/React.createElement(ListGroup.Item, {
+    key: item,
+    onClick: () => {
+      setSelectedResult(item);
+    },
+    active: (selectedResult === null || selectedResult === void 0 ? void 0 : selectedResult.index) === item.index
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "d-flex justify-content-between align-items-center w-100"
+  }, /*#__PURE__*/React.createElement("div", null, item.name), /*#__PURE__*/React.createElement("div", {
+    className: "d-flex align-items-center gap-1"
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "button",
+    className: "m-0 p-0 px-1",
+    variant: "outline-secondary",
+    title: "Add to list",
+    disabled: isStale,
+    onClick: () => {
+      handleSelect(dispatch, item);
     }
-  }, [fetchedData, isPending, serverError, setShowSuggestions]);
-  const suggestionsList = useMemo(() => {
-    return deferredData?.map(item => {
-      return /*#__PURE__*/React.createElement(Dropdown.Item, {
-        key: item.name,
-        as: "button",
-        disabled: isStale,
-        onClick: () => {
-          handleSelect(dispatch, item);
-          _.delay(() => {
-            setShowSuggestions(false);
-          }, 150);
-        }
-      }, item.name);
-    });
-  }, [deferredData, dispatch, handleSelect, isStale, setShowSuggestions]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown.Header, null, "Features"), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+    icon: faPlus
+  })))))));
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "search-results"
-  }, deferredData?.length ? suggestionsList : /*#__PURE__*/React.createElement(Dropdown.Item, {
+  }, /*#__PURE__*/React.createElement(ListGroup, {
+    variant: "flush",
+    className: "cherita-list"
+  }, deferredData !== null && deferredData !== void 0 && deferredData.length ? /*#__PURE__*/React.createElement(VirtualizedList, {
+    getDataAtIndex: getDataAtIndex,
+    count: deferredData.length,
+    ItemComponent: ItemComponent,
+    overscan: 500,
+    estimateSize: 42,
+    maxHeight: "70vh"
+  }) : /*#__PURE__*/React.createElement(ListGroup.Item, {
     key: "empty",
     as: "button",
     disabled: true
-  }, !serverError ? isStale || isPending ? "Loading..." : "No items found" : "Failed to fetch data")));
+  }, !text.length ? "Search features" : !serverError ? isStale || isPending ? "Loading..." : "No items found" : "Failed to fetch data"))));
 }
 export function DiseasesSearchResults(_ref2) {
   let {
     text,
-    setShowSuggestions
+    selectedResult,
+    setSelectedResult,
+    setResultsLength
   } = _ref2;
   const [suggestions, setSuggestions] = useState([]);
-  const dispatch = useDatasetDispatch();
   const {
     setParams,
     data: {
@@ -90,10 +119,9 @@ export function DiseasesSearchResults(_ref2) {
     const setData = text => {
       if (text.length) {
         setParams(p => {
-          return {
-            ...p,
+          return _objectSpread(_objectSpread({}, p), {}, {
             text: text
-          };
+          });
         });
       } else {
         setSuggestions([]);
@@ -107,33 +135,36 @@ export function DiseasesSearchResults(_ref2) {
   useEffect(() => {
     if (!isPending && !serverError) {
       setSuggestions(fetchedData);
-      setShowSuggestions(true);
+      setResultsLength(fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.length);
     }
-  }, [fetchedData, isPending, serverError, setShowSuggestions]);
-  const suggestionsList = useMemo(() => {
-    return deferredData?.map(item => {
-      return /*#__PURE__*/React.createElement(Dropdown.Item, {
-        key: item.id,
-        as: "button",
-        disabled: isStale,
-        onClick: () => {
-          dispatch({
-            type: "select.disease",
-            id: item.disease_id,
-            name: item.disease_name
-          });
-          _.delay(() => {
-            setShowSuggestions(false);
-          }, 150);
-        }
-      }, item.disease_name);
-    });
-  }, [deferredData, dispatch, isStale, setShowSuggestions]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown.Header, null, "Diseases"), /*#__PURE__*/React.createElement("div", {
+  }, [fetchedData, isPending, serverError, setResultsLength]);
+  const getDataAtIndex = index => deferredData[index];
+  const ItemComponent = item => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "virtualized-list-wrapper"
+  }, /*#__PURE__*/React.createElement(ListGroup.Item, {
+    key: item.name,
+    onClick: () => {
+      setSelectedResult(item);
+    },
+    active: (selectedResult === null || selectedResult === void 0 ? void 0 : selectedResult.id) === item.id
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "d-flex justify-content-between align-items-center w-100"
+  }, /*#__PURE__*/React.createElement("div", null, item.disease_name)))));
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: "search-results"
-  }, deferredData?.length ? suggestionsList : /*#__PURE__*/React.createElement(Dropdown.Item, {
+  }, /*#__PURE__*/React.createElement(ListGroup, {
+    variant: "flush",
+    className: "cherita-list"
+  }, deferredData !== null && deferredData !== void 0 && deferredData.length ? /*#__PURE__*/React.createElement(VirtualizedList, {
+    getDataAtIndex: getDataAtIndex,
+    count: deferredData.length,
+    ItemComponent: ItemComponent,
+    overscan: 250,
+    estimateSize: 32,
+    maxHeight: "70vh"
+  }) : /*#__PURE__*/React.createElement(ListGroup.Item, {
     key: "empty",
     as: "button",
     disabled: true
-  }, !serverError ? isStale || isPending ? "Loading..." : "No items found" : "Failed to fetch data")));
+  }, !text.length ? "Search diseases" : !serverError ? isStale || isPending ? "Loading..." : "No items found" : "Failed to fetch data"))));
 }

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

@@ -1,27 +1,34 @@
+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); }
 import React, { useEffect, useState } from "react";
-import { faDroplet, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faDroplet, faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { MoreVert } from "@mui/icons-material";
 import _ from "lodash";
 import { Button, Collapse, ListGroup, Table } from "react-bootstrap";
 import { COLOR_ENCODINGS, SELECTION_MODES } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
+import { useDataset } from "../../context/DatasetContext";
 import { useFilteredData } from "../../context/FilterContext";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { Histogram } from "../../utils/Histogram";
-import { useFetch, useDebouncedFetch } from "../../utils/requests";
-import { VirtualizedList } from "../../utils/VirtualizedList";
+import { useDebouncedFetch, useFetch } from "../../utils/requests";
 function VarHistogram(_ref) {
   let {
     item
   } = _ref;
   const ENDPOINT = "var/histograms";
   const dataset = useDataset();
+  const settings = useSettings();
   const {
     obsIndices
   } = useFilteredData();
   // @TODO: consider using Filter's isSliced; would trigger more re-renders/requests
   // const { obsIndices, isSliced } = useFilteredData();
-  const isSliced = dataset.sliceBy.obs || dataset.sliceBy.polygons;
+  const isSliced = settings.sliceBy.obs || settings.sliceBy.polygons;
   const [params, setParams] = useState({
     url: dataset.url,
     varKey: item.matrix_index,
@@ -29,10 +36,9 @@ function VarHistogram(_ref) {
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         obsIndices: isSliced ? [...(obsIndices || [])] : null
-      };
+      });
     });
   }, [obsIndices, isSliced]);
   const {
@@ -49,20 +55,12 @@ function VarHistogram(_ref) {
   });
 }
 function VarDiseaseInfoItem(item) {
-  const dispatch = useDatasetDispatch();
   return /*#__PURE__*/React.createElement(ListGroup.Item, {
     key: item.disease_id,
     className: "feature-disease-info"
   }, /*#__PURE__*/React.createElement("button", {
     type: "button",
-    className: "btn btn-link disease-link",
-    onClick: () => {
-      dispatch({
-        type: "select.disease",
-        id: item.disease_id,
-        name: item.disease_name
-      });
-    }
+    className: "btn btn-link disease-link"
   }, item.disease_name), /*#__PURE__*/React.createElement(Table, {
     striped: true,
     size: "sm",
@@ -75,27 +73,27 @@ function VarDiseaseInfoItem(item) {
     }
   }))));
 }
-function VarDiseaseInfo(_ref2) {
+export function VarDiseaseInfo(_ref2) {
   let {
     data
   } = _ref2;
-  return /*#__PURE__*/React.createElement(VirtualizedList, {
-    getDataAtIndex: index => data[index],
-    count: data.length,
-    estimateSize: 140,
-    maxHeight: "40vh",
-    ItemComponent: VarDiseaseInfoItem
-  });
+  return /*#__PURE__*/React.createElement(ListGroup, {
+    className: "feature-disease-info-list"
+  }, data.map(item => {
+    return /*#__PURE__*/React.createElement(VarDiseaseInfoItem, _extends({
+      key: item.disease_id
+    }, item));
+  }));
 }
-export function SingleSelectionItem(_ref3) {
+export function SelectionItem(_ref3) {
   let {
     item,
     isActive,
     selectVar,
     removeVar,
-    isDiseaseGene = false,
     showSetColorEncoding = true,
-    showRemove = true
+    showRemove = true,
+    isMultiple = false
   } = _ref3;
   const ENDPOINT = "disease/gene";
   const [openInfo, setOpenInfo] = useState(false);
@@ -113,9 +111,9 @@ export function SingleSelectionItem(_ref3) {
     refetchOnMount: false,
     enabled: !!dataset.diseaseDatasets.length
   });
-  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData?.length;
+  const hasDiseaseInfo = !isPending && !serverError && !!(fetchedData !== null && fetchedData !== void 0 && fetchedData.length);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: `d-flex justify-content-between ${hasDiseaseInfo ? "cursor-pointer" : ""}`,
+    className: "d-flex justify-content-between ".concat(hasDiseaseInfo ? "cursor-pointer" : ""),
     onClick: () => {
       setOpenInfo(o => !o);
     }
@@ -123,7 +121,7 @@ export function SingleSelectionItem(_ref3) {
     className: "d-flex justify-content-between align-items-center w-100"
   }, /*#__PURE__*/React.createElement("div", null, item.name), /*#__PURE__*/React.createElement("div", {
     className: "d-flex align-items-center gap-1"
-  }, hasDiseaseInfo && /*#__PURE__*/React.createElement(MoreVert, null), !isDiseaseGene && /*#__PURE__*/React.createElement(VarHistogram, {
+  }, hasDiseaseInfo && /*#__PURE__*/React.createElement(MoreVert, null), /*#__PURE__*/React.createElement(VarHistogram, {
     item: item
   }), showSetColorEncoding && /*#__PURE__*/React.createElement(Button, {
     type: "button",
@@ -138,7 +136,11 @@ export function SingleSelectionItem(_ref3) {
     title: isNotInData ? "Not present in data" : "Set as color encoding"
   }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
     icon: faDroplet
-  })), (!isDiseaseGene || !showRemove) && /*#__PURE__*/React.createElement(Button, {
+  }), isMultiple && /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+    icon: faPlus,
+    size: "xs",
+    className: "ps-xs-1"
+  })), showRemove && /*#__PURE__*/React.createElement(Button, {
     type: "button",
     className: "m-0 p-0 px-1",
     variant: "outline-secondary",
@@ -157,37 +159,14 @@ export function SingleSelectionItem(_ref3) {
     data: fetchedData
   }))));
 }
-function MultipleSelectionItem(_ref4) {
-  let {
-    item,
-    isActive,
-    toggleVar
-  } = _ref4;
-  const isNotInData = item.matrix_index === -1;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "d-flex"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "flex-grow-1"
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "button",
-    key: item.matrix_index,
-    variant: isActive ? "primary" : "outline-primary",
-    className: "m-0 p-0 px-1",
-    onClick: toggleVar,
-    disabled: isNotInData,
-    title: isNotInData ? "Not present in data" : item.name
-  }, item.name))));
-}
-export function VarItem(_ref5) {
+export function VarItem(_ref4) {
   let {
     item,
     active,
-    setVarButtons,
-    mode = SELECTION_MODES.SINGLE,
-    isDiseaseGene = false
-  } = _ref5;
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
+    mode = SELECTION_MODES.SINGLE
+  } = _ref4;
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
   const selectVar = () => {
     if (mode === SELECTION_MODES.SINGLE) {
       dispatch({
@@ -210,8 +189,9 @@ export function VarItem(_ref5) {
     }
   };
   const removeVar = () => {
-    setVarButtons(b => {
-      return b.filter(i => i.name !== item.name);
+    dispatch({
+      type: "remove.var",
+      var: item
     });
     if (mode === SELECTION_MODES.SINGLE) {
       if (active === item.matrix_index) {
@@ -229,28 +209,25 @@ export function VarItem(_ref5) {
     }
   };
   const toggleVar = () => {
-    if (active.includes(item.matrix_index)) {
-      dispatch({
-        type: "deselect.multivar",
-        var: item
-      });
-    } else {
-      selectVar(item);
-    }
+    dispatch({
+      type: "toggle.multivar",
+      var: item
+    });
   };
   if (item && mode === SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/React.createElement(SingleSelectionItem, {
+    return /*#__PURE__*/React.createElement(SelectionItem, {
       item: item,
-      isActive: dataset.colorEncoding === COLOR_ENCODINGS.VAR && active === item.matrix_index,
+      isActive: settings.colorEncoding === COLOR_ENCODINGS.VAR && active === item.matrix_index,
       selectVar: selectVar,
-      removeVar: removeVar,
-      isDiseaseGene: isDiseaseGene
+      removeVar: removeVar
     });
   } else if (mode === SELECTION_MODES.MULTIPLE) {
-    return /*#__PURE__*/React.createElement(MultipleSelectionItem, {
+    return /*#__PURE__*/React.createElement(SelectionItem, {
       item: item,
       isActive: item.matrix_index !== -1 && _.includes(active, item.matrix_index),
-      toggleVar: toggleVar
+      selectVar: toggleVar,
+      removeVar: removeVar,
+      isMultiple: true
     });
   } else {
     return null;