@haniffalab/cherita-react 1.2.0-dev.2025-05-21.31931945 → 1.2.0-dev.2025-05-21.e57ef5f2

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

@@ -1,3 +1,8 @@
+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, { useState, useEffect } from "react";
 import { faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -20,10 +25,9 @@ export function VarInfo(_ref) {
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         geneName: varItem.name
-      };
+      });
     });
   }, [varItem.name]);
   const {
@@ -34,7 +38,7 @@ export function VarInfo(_ref) {
     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("div", null, /*#__PURE__*/React.createElement("h5", null, varItem.name), !!dataset.diseaseDatasets.length && isPending && /*#__PURE__*/React.createElement("p", null, "Loading..."), hasDiseaseInfo && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("h6", null, "Associated diseases"), /*#__PURE__*/React.createElement(VarDiseaseInfo, {
     data: fetchedData
   })));
@@ -54,13 +58,12 @@ const useVarMean = function (varKeys) {
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         varKeys: _.map(varKeys, v => v.isSet ? {
           name: v.name,
           indices: v.vars.map(v => v.index)
         } : v.index)
-      };
+      });
     });
   }, [varKeys]);
   return useFetch(ENDPOINT, params, {
@@ -93,10 +96,9 @@ export function DiseaseInfo(_ref2) {
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         diseaseId: disease.id
-      };
+      });
     });
   }, [disease]);
   const diseaseData = useFetch(ENDPOINT, params, {
@@ -108,7 +110,7 @@ export function DiseaseInfo(_ref2) {
       setDiseaseVars(diseaseData.fetchedData);
     }
   }, [diseaseData.fetchedData, diseaseData.isPending, diseaseData.serverError]);
-  const varMeans = useVarMean(diseaseVars, !!diseaseVars?.length && settings.varSort.disease.sort === VAR_SORT.MATRIX);
+  const varMeans = useVarMean(diseaseVars, !!(diseaseVars !== null && diseaseVars !== void 0 && diseaseVars.length) && settings.varSort.disease.sort === VAR_SORT.MATRIX);
   useEffect(() => {
     if (settings.varSort.disease.sort === VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError) {

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

@@ -1,3 +1,8 @@
+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";
@@ -30,10 +35,9 @@ export function VarSearchResults(_ref) {
     const setData = text => {
       if (text.length) {
         setParams(p => {
-          return {
-            ...p,
+          return _objectSpread(_objectSpread({}, p), {}, {
             text: text
-          };
+          });
         });
       } else {
         setSuggestions([]);
@@ -47,7 +51,7 @@ export function VarSearchResults(_ref) {
   useEffect(() => {
     if (!isPending && !serverError) {
       setSuggestions(fetchedData);
-      setResultsLength(fetchedData?.length);
+      setResultsLength(fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.length);
     }
   }, [fetchedData, isPending, serverError, setResultsLength]);
   const getDataAtIndex = index => deferredData[index];
@@ -58,7 +62,7 @@ export function VarSearchResults(_ref) {
     onClick: () => {
       setSelectedResult(item);
     },
-    active: selectedResult?.index === item.index
+    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", {
@@ -80,7 +84,7 @@ export function VarSearchResults(_ref) {
   }, /*#__PURE__*/React.createElement(ListGroup, {
     variant: "flush",
     className: "cherita-list"
-  }, deferredData?.length ? /*#__PURE__*/React.createElement(VirtualizedList, {
+  }, deferredData !== null && deferredData !== void 0 && deferredData.length ? /*#__PURE__*/React.createElement(VirtualizedList, {
     getDataAtIndex: getDataAtIndex,
     count: deferredData.length,
     ItemComponent: ItemComponent,
@@ -115,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([]);
@@ -132,7 +135,7 @@ export function DiseasesSearchResults(_ref2) {
   useEffect(() => {
     if (!isPending && !serverError) {
       setSuggestions(fetchedData);
-      setResultsLength(fetchedData?.length);
+      setResultsLength(fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.length);
     }
   }, [fetchedData, isPending, serverError, setResultsLength]);
   const getDataAtIndex = index => deferredData[index];
@@ -143,7 +146,7 @@ export function DiseasesSearchResults(_ref2) {
     onClick: () => {
       setSelectedResult(item);
     },
-    active: selectedResult?.id === item.id
+    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)))));
@@ -152,7 +155,7 @@ export function DiseasesSearchResults(_ref2) {
   }, /*#__PURE__*/React.createElement(ListGroup, {
     variant: "flush",
     className: "cherita-list"
-  }, deferredData?.length ? /*#__PURE__*/React.createElement(VirtualizedList, {
+  }, deferredData !== null && deferredData !== void 0 && deferredData.length ? /*#__PURE__*/React.createElement(VirtualizedList, {
     getDataAtIndex: getDataAtIndex,
     count: deferredData.length,
     ItemComponent: ItemComponent,

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

@@ -1,5 +1,11 @@
+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";
@@ -10,7 +16,6 @@ import { useFilteredData } from "../../context/FilterContext";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { Histogram } from "../../utils/Histogram";
 import { useDebouncedFetch, useFetch } from "../../utils/requests";
-import { VirtualizedList } from "../../utils/VirtualizedList";
 function VarHistogram(_ref) {
   let {
     item
@@ -31,10 +36,9 @@ function VarHistogram(_ref) {
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         obsIndices: isSliced ? [...(obsIndices || [])] : null
-      };
+      });
     });
   }, [obsIndices, isSliced]);
   const {
@@ -73,23 +77,23 @@ 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);
@@ -107,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);
     }
@@ -117,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",
@@ -132,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",
@@ -151,34 +159,12 @@ 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,
-    mode = SELECTION_MODES.SINGLE,
-    isDiseaseGene = false
-  } = _ref5;
+    mode = SELECTION_MODES.SINGLE
+  } = _ref4;
   const settings = useSettings();
   const dispatch = useSettingsDispatch();
   const selectVar = () => {
@@ -229,88 +215,21 @@ export function VarItem(_ref5) {
     });
   };
   if (item && mode === SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/React.createElement(SingleSelectionItem, {
+    return /*#__PURE__*/React.createElement(SelectionItem, {
       item: item,
       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;
   }
-}
-export function SearchResultItem(_ref6) {
-  let {
-    item,
-    isActive,
-    selectVar,
-    removeVar,
-    isDiseaseGene = false,
-    showSetColorEncoding = true,
-    showRemove = true
-  } = _ref6;
-  const ENDPOINT = "disease/gene";
-  const [openInfo, setOpenInfo] = useState(false);
-  const dataset = useDataset();
-  const params = {
-    geneName: item.name,
-    diseaseDatasets: dataset.diseaseDatasets
-  };
-  const isNotInData = item.matrix_index === -1;
-  const {
-    fetchedData,
-    isPending,
-    serverError
-  } = useFetch(ENDPOINT, params, {
-    refetchOnMount: false,
-    enabled: !!dataset.diseaseDatasets.length
-  });
-  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData?.length;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: `d-flex justify-content-between ${hasDiseaseInfo ? "cursor-pointer" : ""}`,
-    onClick: () => {
-      setOpenInfo(o => !o);
-    }
-  }, /*#__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"
-  }, hasDiseaseInfo && /*#__PURE__*/React.createElement(MoreVert, null), showSetColorEncoding && /*#__PURE__*/React.createElement(Button, {
-    type: "button",
-    key: item.matrix_index,
-    variant: isActive ? "primary" : isNotInData ? "outline-secondary" : "outline-primary",
-    className: "m-0 p-0 px-1",
-    onClick: e => {
-      e.stopPropagation();
-      selectVar();
-    },
-    disabled: isNotInData,
-    title: isNotInData ? "Not present in data" : "Set as color encoding"
-  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-    icon: faDroplet
-  })), (!isDiseaseGene || !showRemove) && /*#__PURE__*/React.createElement(Button, {
-    type: "button",
-    className: "m-0 p-0 px-1",
-    variant: "outline-secondary",
-    title: "Remove from list",
-    onClick: e => {
-      e.stopPropagation();
-      removeVar();
-    }
-  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-    icon: faTrash
-  }))))), hasDiseaseInfo && /*#__PURE__*/React.createElement(Collapse, {
-    in: openInfo
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "mt-2 var-disease-info-collapse"
-  }, /*#__PURE__*/React.createElement(VarDiseaseInfo, {
-    data: fetchedData
-  }))));
 }

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

@@ -1,3 +1,8 @@
+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 { faTimes } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -27,13 +32,12 @@ const useVarMean = function (varKeys) {
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         varKeys: _.map(varKeys, v => v.isSet ? {
           name: v.name,
           indices: v.vars.map(v => v.index)
         } : v.index)
-      };
+      });
     });
   }, [varKeys]);
   return useFetch(ENDPOINT, params, {
@@ -47,17 +51,19 @@ const sortMeans = (i, means) => {
   return means[i.name] || _.min(_.values(means)) - 1;
 };
 export function VarNamesList(_ref) {
+  var _settings$selectedVar, _settings$selectedVar2;
   let {
     mode = SELECTION_MODES.SINGLE,
     displayName = "genes"
   } = _ref;
   const settings = useSettings();
   const dispatch = useSettingsDispatch();
-  const [active, setActive] = useState(mode === SELECTION_MODES.SINGLE ? settings.selectedVar?.matrix_index || settings.selectedVar?.name : settings.selectedMultiVar.map(i => i.matrix_index || i.name));
+  const [active, setActive] = useState(mode === SELECTION_MODES.SINGLE ? ((_settings$selectedVar = settings.selectedVar) === null || _settings$selectedVar === void 0 ? void 0 : _settings$selectedVar.matrix_index) || ((_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.name) : settings.selectedMultiVar.map(i => i.matrix_index || i.name));
   const [sortedVars, setSortedVars] = useState([]);
   useEffect(() => {
     if (mode === SELECTION_MODES.SINGLE) {
-      setActive(settings.selectedVar?.matrix_index || settings.selectedVar?.name);
+      var _settings$selectedVar3, _settings$selectedVar4;
+      setActive(((_settings$selectedVar3 = settings.selectedVar) === null || _settings$selectedVar3 === void 0 ? void 0 : _settings$selectedVar3.matrix_index) || ((_settings$selectedVar4 = settings.selectedVar) === null || _settings$selectedVar4 === void 0 ? void 0 : _settings$selectedVar4.name));
     }
   }, [mode, settings.selectedVar]);
   useEffect(() => {
@@ -81,15 +87,13 @@ export function VarNamesList(_ref) {
       setSortedVars(settings.vars);
     }
   }, [settings.varSort.var.sort, settings.varSort.var.sortOrder, varMeans.isPending, varMeans.serverError, varMeans.fetchedData, settings.vars]);
-  const makeListItem = function (item) {
-    let isDiseaseGene = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  const makeListItem = item => {
     return /*#__PURE__*/React.createElement(ListGroup.Item, {
       key: item.matrix_index
     }, /*#__PURE__*/React.createElement(VarItem, {
       item: item,
       active: active,
-      mode: mode,
-      isDiseaseGene: isDiseaseGene
+      mode: mode
     }));
   };
   const makeSetListItem = set => {
@@ -110,13 +114,13 @@ export function VarNamesList(_ref) {
   });
   const newSetName = () => {
     let n = 1;
-    let setName = `Set ${n}`;
+    let setName = "Set ".concat(n);
     const nameExists = name => {
       return settings.vars.some(v => v.name === name);
     };
     while (nameExists(setName)) {
       n++;
-      setName = `Set ${n}`;
+      setName = "Set ".concat(n);
     }
     return setName;
   };

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

@@ -3,7 +3,7 @@ import { faChevronDown, faChevronUp, faCircleInfo, faDroplet, faPlus, faTrash }
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import _ from "lodash";
 import { Button, Collapse, ListGroup, OverlayTrigger, Tooltip } from "react-bootstrap";
-import { SingleSelectionItem } from "./VarItem";
+import { SelectionItem } from "./VarItem";
 import { COLOR_ENCODINGS, SELECTION_MODES } from "../../constants/constants";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { SearchModal } from "../search-bar/SearchBar";
@@ -17,13 +17,14 @@ const addVarToSet = (dispatch, set, v) => {
     var: v
   });
 };
-function SingleSelectionSet(_ref) {
+function SelectionSet(_ref) {
   let {
     set,
     isActive,
     selectSet,
     removeSet,
-    removeSetVar
+    removeSetVar,
+    isMultiple = false
   } = _ref;
   const [openSet, setOpenSet] = useState(false);
   const [showModal, setShowModal] = useState(false);
@@ -31,7 +32,7 @@ function SingleSelectionSet(_ref) {
   const varList = set.vars.length ? _.map(set.vars, v => {
     return /*#__PURE__*/React.createElement(ListGroup.Item, {
       key: v.name
-    }, /*#__PURE__*/React.createElement(SingleSelectionItem, {
+    }, /*#__PURE__*/React.createElement(SelectionItem, {
       item: v,
       showSetColorEncoding: false,
       removeVar: () => removeSetVar(v)
@@ -87,6 +88,10 @@ function SingleSelectionSet(_ref) {
     title: "Set as color encoding"
   }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
     icon: faDroplet
+  }), isMultiple && /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+    icon: faPlus,
+    size: "xs",
+    className: "ps-xs-1"
   })), /*#__PURE__*/React.createElement(Button, {
     type: "button",
     className: "m-0 p-0 px-1",
@@ -118,31 +123,12 @@ function SingleSelectionSet(_ref) {
     searchDiseases: false
   }));
 }
-function MultipleSelectionSet(_ref2) {
-  let {
-    set,
-    isActive,
-    toggleSet
-  } = _ref2;
-  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: set.name,
-    variant: isActive ? "primary" : "outline-primary",
-    className: "m-0 p-0 px-1",
-    onClick: toggleSet,
-    title: set.name
-  }, set.name))));
-}
-export function VarSet(_ref3) {
+export function VarSet(_ref2) {
   let {
     set,
     active,
     mode = SELECTION_MODES.SINGLE
-  } = _ref3;
+  } = _ref2;
   const settings = useSettings();
   const dispatch = useSettingsDispatch();
   const selectSet = () => {
@@ -196,7 +182,7 @@ export function VarSet(_ref3) {
     });
   };
   if (set && mode === SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/React.createElement(SingleSelectionSet, {
+    return /*#__PURE__*/React.createElement(SelectionSet, {
       set: set,
       isActive: settings.colorEncoding === COLOR_ENCODINGS.VAR && active === set.name,
       selectSet: selectSet,
@@ -204,10 +190,13 @@ export function VarSet(_ref3) {
       removeSetVar: v => removeSetVar(v)
     });
   } else if (mode === SELECTION_MODES.MULTIPLE) {
-    return /*#__PURE__*/React.createElement(MultipleSelectionSet, {
+    return /*#__PURE__*/React.createElement(SelectionSet, {
       set: set,
       isActive: _.includes(active, set.name),
-      toggleSet: toggleSet
+      selectSet: toggleSet,
+      removeSet: removeSet,
+      removeSetVar: v => removeSetVar(v),
+      isMultiple: true
     });
   } else {
     return null;