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

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

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SearchResultItem = SearchResultItem;
-exports.SingleSelectionItem = SingleSelectionItem;
+exports.SelectionItem = SelectionItem;
 exports.VarDiseaseInfo = VarDiseaseInfo;
 exports.VarItem = VarItem;
 var _react = _interopRequireWildcard(require("react"));
@@ -19,10 +18,14 @@ var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _Histogram = require("../../utils/Histogram");
 var _requests = require("../../utils/requests");
-var _VirtualizedList = require("../../utils/VirtualizedList");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function VarHistogram(_ref) {
   let {
     item
@@ -43,10 +46,9 @@ function VarHistogram(_ref) {
   });
   (0, _react.useEffect)(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         obsIndices: isSliced ? [...(obsIndices || [])] : null
-      };
+      });
     });
   }, [obsIndices, isSliced]);
   const {
@@ -85,23 +87,23 @@ function VarDiseaseInfo(_ref2) {
   let {
     data
   } = _ref2;
-  return /*#__PURE__*/_react.default.createElement(_VirtualizedList.VirtualizedList, {
-    getDataAtIndex: index => data[index],
-    count: data.length,
-    estimateSize: 140,
-    maxHeight: "40vh",
-    ItemComponent: VarDiseaseInfoItem
-  });
+  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup, {
+    className: "feature-disease-info-list"
+  }, data.map(item => {
+    return /*#__PURE__*/_react.default.createElement(VarDiseaseInfoItem, _extends({
+      key: item.disease_id
+    }, item));
+  }));
 }
-function SingleSelectionItem(_ref3) {
+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] = (0, _react.useState)(false);
@@ -119,9 +121,9 @@ 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.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.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);
     }
@@ -129,7 +131,7 @@ function SingleSelectionItem(_ref3) {
     className: "d-flex justify-content-between align-items-center w-100"
   }, /*#__PURE__*/_react.default.createElement("div", null, item.name), /*#__PURE__*/_react.default.createElement("div", {
     className: "d-flex align-items-center gap-1"
-  }, hasDiseaseInfo && /*#__PURE__*/_react.default.createElement(_iconsMaterial.MoreVert, null), !isDiseaseGene && /*#__PURE__*/_react.default.createElement(VarHistogram, {
+  }, hasDiseaseInfo && /*#__PURE__*/_react.default.createElement(_iconsMaterial.MoreVert, null), /*#__PURE__*/_react.default.createElement(VarHistogram, {
     item: item
   }), showSetColorEncoding && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
     type: "button",
@@ -144,7 +146,11 @@ function SingleSelectionItem(_ref3) {
     title: isNotInData ? "Not present in data" : "Set as color encoding"
   }, /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
     icon: _freeSolidSvgIcons.faDroplet
-  })), (!isDiseaseGene || !showRemove) && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+  }), isMultiple && /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
+    icon: _freeSolidSvgIcons.faPlus,
+    size: "xs",
+    className: "ps-xs-1"
+  })), showRemove && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
     type: "button",
     className: "m-0 p-0 px-1",
     variant: "outline-secondary",
@@ -163,34 +169,12 @@ function SingleSelectionItem(_ref3) {
     data: fetchedData
   }))));
 }
-function MultipleSelectionItem(_ref4) {
-  let {
-    item,
-    isActive,
-    toggleVar
-  } = _ref4;
-  const isNotInData = item.matrix_index === -1;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "d-flex"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "flex-grow-1"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.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))));
-}
-function VarItem(_ref5) {
+function VarItem(_ref4) {
   let {
     item,
     active,
-    mode = _constants.SELECTION_MODES.SINGLE,
-    isDiseaseGene = false
-  } = _ref5;
+    mode = _constants.SELECTION_MODES.SINGLE
+  } = _ref4;
   const settings = (0, _SettingsContext.useSettings)();
   const dispatch = (0, _SettingsContext.useSettingsDispatch)();
   const selectVar = () => {
@@ -241,88 +225,21 @@ function VarItem(_ref5) {
     });
   };
   if (item && mode === _constants.SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/_react.default.createElement(SingleSelectionItem, {
+    return /*#__PURE__*/_react.default.createElement(SelectionItem, {
       item: item,
       isActive: settings.colorEncoding === _constants.COLOR_ENCODINGS.VAR && active === item.matrix_index,
       selectVar: selectVar,
-      removeVar: removeVar,
-      isDiseaseGene: isDiseaseGene
+      removeVar: removeVar
     });
   } else if (mode === _constants.SELECTION_MODES.MULTIPLE) {
-    return /*#__PURE__*/_react.default.createElement(MultipleSelectionItem, {
+    return /*#__PURE__*/_react.default.createElement(SelectionItem, {
       item: item,
       isActive: item.matrix_index !== -1 && _lodash.default.includes(active, item.matrix_index),
-      toggleVar: toggleVar
+      selectVar: toggleVar,
+      removeVar: removeVar,
+      isMultiple: true
     });
   } else {
     return null;
   }
-}
-function SearchResultItem(_ref6) {
-  let {
-    item,
-    isActive,
-    selectVar,
-    removeVar,
-    isDiseaseGene = false,
-    showSetColorEncoding = true,
-    showRemove = true
-  } = _ref6;
-  const ENDPOINT = "disease/gene";
-  const [openInfo, setOpenInfo] = (0, _react.useState)(false);
-  const dataset = (0, _DatasetContext.useDataset)();
-  const params = {
-    geneName: item.name,
-    diseaseDatasets: dataset.diseaseDatasets
-  };
-  const isNotInData = item.matrix_index === -1;
-  const {
-    fetchedData,
-    isPending,
-    serverError
-  } = (0, _requests.useFetch)(ENDPOINT, params, {
-    refetchOnMount: false,
-    enabled: !!dataset.diseaseDatasets.length
-  });
-  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData?.length;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: `d-flex justify-content-between ${hasDiseaseInfo ? "cursor-pointer" : ""}`,
-    onClick: () => {
-      setOpenInfo(o => !o);
-    }
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "d-flex justify-content-between align-items-center w-100"
-  }, /*#__PURE__*/_react.default.createElement("div", null, item.name), /*#__PURE__*/_react.default.createElement("div", {
-    className: "d-flex align-items-center gap-1"
-  }, hasDiseaseInfo && /*#__PURE__*/_react.default.createElement(_iconsMaterial.MoreVert, null), showSetColorEncoding && /*#__PURE__*/_react.default.createElement(_reactBootstrap.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.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faDroplet
-  })), (!isDiseaseGene || !showRemove) && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-    type: "button",
-    className: "m-0 p-0 px-1",
-    variant: "outline-secondary",
-    title: "Remove from list",
-    onClick: e => {
-      e.stopPropagation();
-      removeVar();
-    }
-  }, /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faTrash
-  }))))), hasDiseaseInfo && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Collapse, {
-    in: openInfo
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "mt-2 var-disease-info-collapse"
-  }, /*#__PURE__*/_react.default.createElement(VarDiseaseInfo, {
-    data: fetchedData
-  }))));
 }

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

@@ -19,8 +19,12 @@ var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const useVarMean = function (varKeys) {
   let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const ENDPOINT = "matrix/mean";
@@ -36,13 +40,12 @@ const useVarMean = function (varKeys) {
   });
   (0, _react.useEffect)(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         varKeys: _lodash.default.map(varKeys, v => v.isSet ? {
           name: v.name,
           indices: v.vars.map(v => v.index)
         } : v.index)
-      };
+      });
     });
   }, [varKeys]);
   return (0, _requests.useFetch)(ENDPOINT, params, {
@@ -56,17 +59,19 @@ const sortMeans = (i, means) => {
   return means[i.name] || _lodash.default.min(_lodash.default.values(means)) - 1;
 };
 function VarNamesList(_ref) {
+  var _settings$selectedVar, _settings$selectedVar2;
   let {
     mode = _constants.SELECTION_MODES.SINGLE,
     displayName = "genes"
   } = _ref;
   const settings = (0, _SettingsContext.useSettings)();
   const dispatch = (0, _SettingsContext.useSettingsDispatch)();
-  const [active, setActive] = (0, _react.useState)(mode === _constants.SELECTION_MODES.SINGLE ? settings.selectedVar?.matrix_index || settings.selectedVar?.name : settings.selectedMultiVar.map(i => i.matrix_index || i.name));
+  const [active, setActive] = (0, _react.useState)(mode === _constants.SELECTION_MODES.SINGLE ? ((_settings$selectedVar = settings.selectedVar) === null || _settings$selectedVar === void 0 ? void 0 : _settings$selectedVar.matrix_index) || ((_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.name) : settings.selectedMultiVar.map(i => i.matrix_index || i.name));
   const [sortedVars, setSortedVars] = (0, _react.useState)([]);
   (0, _react.useEffect)(() => {
     if (mode === _constants.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]);
   (0, _react.useEffect)(() => {
@@ -90,15 +95,13 @@ 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.default.createElement(_reactBootstrap.ListGroup.Item, {
       key: item.matrix_index
     }, /*#__PURE__*/_react.default.createElement(_VarItem.VarItem, {
       item: item,
       active: active,
-      mode: mode,
-      isDiseaseGene: isDiseaseGene
+      mode: mode
     }));
   };
   const makeSetListItem = set => {
@@ -119,13 +122,13 @@ 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/cjs/components/var-list/VarListToolbar.js

@@ -10,8 +10,7 @@ var _reactFontawesome = require("@fortawesome/react-fontawesome");
 var _reactBootstrap = require("react-bootstrap");
 var _constants = require("../../constants/constants");
 var _SettingsContext = require("../../context/SettingsContext");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // @TODO: set option for "var" and "disease"
 function VarListToolbar(_ref) {
   let {

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

@@ -14,8 +14,7 @@ var _constants = require("../../constants/constants");
 var _SettingsContext = require("../../context/SettingsContext");
 var _SearchBar = require("../search-bar/SearchBar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // @TODO: add button to score genes and plot
 
 const addVarToSet = (dispatch, set, v) => {
@@ -25,13 +24,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] = (0, _react.useState)(false);
   const [showModal, setShowModal] = (0, _react.useState)(false);
@@ -39,7 +39,7 @@ function SingleSelectionSet(_ref) {
   const varList = set.vars.length ? _lodash.default.map(set.vars, v => {
     return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup.Item, {
       key: v.name
-    }, /*#__PURE__*/_react.default.createElement(_VarItem.SingleSelectionItem, {
+    }, /*#__PURE__*/_react.default.createElement(_VarItem.SelectionItem, {
       item: v,
       showSetColorEncoding: false,
       removeVar: () => removeSetVar(v)
@@ -95,6 +95,10 @@ function SingleSelectionSet(_ref) {
     title: "Set as color encoding"
   }, /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
     icon: _freeSolidSvgIcons.faDroplet
+  }), isMultiple && /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
+    icon: _freeSolidSvgIcons.faPlus,
+    size: "xs",
+    className: "ps-xs-1"
   })), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
     type: "button",
     className: "m-0 p-0 px-1",
@@ -126,31 +130,12 @@ function SingleSelectionSet(_ref) {
     searchDiseases: false
   }));
 }
-function MultipleSelectionSet(_ref2) {
-  let {
-    set,
-    isActive,
-    toggleSet
-  } = _ref2;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "d-flex"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "flex-grow-1"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.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))));
-}
-function VarSet(_ref3) {
+function VarSet(_ref2) {
   let {
     set,
     active,
     mode = _constants.SELECTION_MODES.SINGLE
-  } = _ref3;
+  } = _ref2;
   const settings = (0, _SettingsContext.useSettings)();
   const dispatch = (0, _SettingsContext.useSettingsDispatch)();
   const selectSet = () => {
@@ -204,7 +189,7 @@ function VarSet(_ref3) {
     });
   };
   if (set && mode === _constants.SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/_react.default.createElement(SingleSelectionSet, {
+    return /*#__PURE__*/_react.default.createElement(SelectionSet, {
       set: set,
       isActive: settings.colorEncoding === _constants.COLOR_ENCODINGS.VAR && active === set.name,
       selectSet: selectSet,
@@ -212,10 +197,13 @@ function VarSet(_ref3) {
       removeSetVar: v => removeSetVar(v)
     });
   } else if (mode === _constants.SELECTION_MODES.MULTIPLE) {
-    return /*#__PURE__*/_react.default.createElement(MultipleSelectionSet, {
+    return /*#__PURE__*/_react.default.createElement(SelectionSet, {
       set: set,
       isActive: _lodash.default.includes(active, set.name),
-      toggleSet: toggleSet
+      selectSet: toggleSet,
+      removeSet: removeSet,
+      removeSetVar: v => removeSetVar(v),
+      isMultiple: true
     });
   } else {
     return null;

package/dist/cjs/components/violin/Violin.js

@@ -17,9 +17,14 @@ var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function Violin(_ref) {
+  var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     mode = _constants.VIOLIN_MODES.MULTIKEY
   } = _ref;
@@ -33,30 +38,32 @@ function Violin(_ref) {
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
-  const [params, setParams] = (0, _react.useState)({
+  const [params, setParams] = (0, _react.useState)(_objectSpread({
     url: dataset.url,
     mode: mode,
     scale: settings.controls.scale.violinplot.value,
-    varNamesCol: dataset.varNamesCol,
-    ...{
-      [_constants.VIOLIN_MODES.MULTIKEY]: {
-        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
-          name: i.name,
-          indices: i.vars.map(v => v.index)
-        } : i.index),
-        obsKeys: [] // @TODO: implement
-      },
-      [_constants.VIOLIN_MODES.GROUPBY]: {
-        varKey: settings.selectedVar?.isSet ? {
-          name: settings.selectedVar?.name,
-          indices: settings.selectedVar?.vars.map(v => v.index)
-        } : settings.selectedVar?.index,
-        obsCol: settings.selectedObs,
-        obsValues: !settings.selectedObs?.omit.length ? null : _lodash.default.difference(_lodash.default.values(settings.selectedObs?.codes), settings.selectedObs?.omit).map(c => settings.selectedObs?.codesMap[c]),
-        obsIndices: isSliced ? [...(obsIndices || [])] : null
-      }
-    }[mode]
-  });
+    varNamesCol: dataset.varNamesCol
+  }, {
+    [_constants.VIOLIN_MODES.MULTIKEY]: {
+      varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+        name: i.name,
+        indices: i.vars.map(v => v.index)
+      } : i.index),
+      obsKeys: [] // @TODO: implement
+    },
+    [_constants.VIOLIN_MODES.GROUPBY]: {
+      varKey: (_settings$selectedVar = settings.selectedVar) !== null && _settings$selectedVar !== void 0 && _settings$selectedVar.isSet ? {
+        name: (_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.name,
+        indices: (_settings$selectedVar3 = settings.selectedVar) === null || _settings$selectedVar3 === void 0 ? void 0 : _settings$selectedVar3.vars.map(v => v.index)
+      } : (_settings$selectedVar4 = settings.selectedVar) === null || _settings$selectedVar4 === void 0 ? void 0 : _settings$selectedVar4.index,
+      obsCol: settings.selectedObs,
+      obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.values((_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.codes), (_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.omit).map(c => {
+        var _settings$selectedObs4;
+        return (_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.codesMap[c];
+      }),
+      obsIndices: isSliced ? [...(obsIndices || [])] : null
+    }
+  }[mode]));
   // @TODO: set default scale
 
   (0, _react.useEffect)(() => {
@@ -67,8 +74,7 @@ function Violin(_ref) {
         setHasSelections(false);
       }
       setParams(p => {
-        return {
-          ...p,
+        return _objectSpread(_objectSpread({}, p), {}, {
           url: dataset.url,
           mode: mode,
           varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
@@ -77,7 +83,7 @@ function Violin(_ref) {
           } : i.index),
           scale: settings.controls.scale.violinplot.value,
           varNamesCol: dataset.varNamesCol
-        };
+        });
       });
     } else if (mode === _constants.VIOLIN_MODES.GROUPBY) {
       if (settings.selectedObs && settings.selectedVar) {
@@ -86,20 +92,23 @@ function Violin(_ref) {
         setHasSelections(false);
       }
       setParams(p => {
-        return {
-          ...p,
+        var _settings$selectedVar5, _settings$selectedVar6, _settings$selectedVar7, _settings$selectedVar8, _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
+        return _objectSpread(_objectSpread({}, p), {}, {
           url: dataset.url,
           mode: mode,
-          varKey: settings.selectedVar?.isSet ? {
-            name: settings.selectedVar?.name,
-            indices: settings.selectedVar?.vars.map(v => v.index)
-          } : settings.selectedVar?.index,
+          varKey: (_settings$selectedVar5 = settings.selectedVar) !== null && _settings$selectedVar5 !== void 0 && _settings$selectedVar5.isSet ? {
+            name: (_settings$selectedVar6 = settings.selectedVar) === null || _settings$selectedVar6 === void 0 ? void 0 : _settings$selectedVar6.name,
+            indices: (_settings$selectedVar7 = settings.selectedVar) === null || _settings$selectedVar7 === void 0 ? void 0 : _settings$selectedVar7.vars.map(v => v.index)
+          } : (_settings$selectedVar8 = settings.selectedVar) === null || _settings$selectedVar8 === void 0 ? void 0 : _settings$selectedVar8.index,
           obsCol: settings.selectedObs,
-          obsValues: !settings.selectedObs?.omit.length ? null : _lodash.default.difference(_lodash.default.values(settings.selectedObs?.codes), settings.selectedObs?.omit).map(c => settings.selectedObs?.codesMap[c]),
+          obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.values((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.codes), (_settings$selectedObs7 = settings.selectedObs) === null || _settings$selectedObs7 === void 0 ? void 0 : _settings$selectedObs7.omit).map(c => {
+            var _settings$selectedObs8;
+            return (_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.codesMap[c];
+          }),
           obsIndices: isSliced ? [...(obsIndices || [])] : null,
           scale: settings.controls.scale.violinplot.value,
           varNamesCol: dataset.varNamesCol
-        };
+        });
       });
     }
   }, [settings.controls.scale.violinplot.value, settings.selectedMultiVar, settings.selectedObs, settings.selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
@@ -128,7 +137,7 @@ function Violin(_ref) {
           maxWidth: "100%",
           maxHeight: "100%"
         }
-      }), fetchedData?.resampled && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      }), (fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.resampled) && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
         variant: "warning"
       }, /*#__PURE__*/_react.default.createElement("b", null, "Warning:"), " For performance reasons this plot was generated with resampled data. It will not be exactly the same as one produced with the entire dataset. \xA0", /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
         placement: "top",