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

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

@@ -1,16 +1,22 @@
+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";
 import _ from "lodash";
 import { Alert, Button, ListGroup } from "react-bootstrap";
 import ButtonGroup from "react-bootstrap/ButtonGroup";
-import { SELECTION_MODES, VAR_SORT } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
-import { LoadingSpinner } from "../../utils/LoadingIndicators";
-import { useFetch } from "../../utils/requests";
 import { VarItem } from "./VarItem";
 import { VarListToolbar } from "./VarListToolbar";
 import { VarSet } from "./VarSet";
+import { SELECTION_MODES, VAR_SORT } from "../../constants/constants";
+import { useDataset } from "../../context/DatasetContext";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
+import { LoadingSpinner } from "../../utils/LoadingIndicators";
+import { useFetch } from "../../utils/requests";
 const useVarMean = function (varKeys) {
   let enabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   const ENDPOINT = "matrix/mean";
@@ -26,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, {
@@ -45,173 +50,50 @@ const useVarMean = function (varKeys) {
 const sortMeans = (i, means) => {
   return means[i.name] || _.min(_.values(means)) - 1;
 };
-
-// @TODO: display where disease data comes from
-// add to disease dataset metadata
-function DiseaseVarList(_ref) {
-  let {
-    makeListItem
-  } = _ref;
-  const ENDPOINT = "disease/genes";
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
-  const [diseaseVars, setDiseaseVars] = useState([]);
-  const [sortedDiseaseVars, setSortedDiseaseVars] = useState([]);
-  const [params, setParams] = useState({
-    url: dataset.url,
-    col: dataset.varNamesCol,
-    diseaseId: dataset.selectedDisease?.id,
-    diseaseDatasets: dataset.diseaseDatasets
-  });
-  useEffect(() => {
-    setParams(p => {
-      return {
-        ...p,
-        diseaseId: dataset.selectedDisease?.id
-      };
-    });
-  }, [dataset.selectedDisease]);
-  const diseaseData = useFetch(ENDPOINT, params, {
-    enabled: !!params.diseaseId,
-    refetchOnMount: false
-  });
-  useEffect(() => {
-    if (!diseaseData.isPending && !diseaseData.serverError) {
-      setDiseaseVars(diseaseData.fetchedData);
-    }
-  }, [diseaseData.fetchedData, diseaseData.isPending, diseaseData.serverError]);
-  const varMeans = useVarMean(diseaseVars, !!diseaseVars?.length && dataset.varSort.disease.sort === VAR_SORT.MATRIX);
-  useEffect(() => {
-    if (dataset.varSort.disease.sort === VAR_SORT.MATRIX) {
-      if (!varMeans.isPending && !varMeans.serverError) {
-        setSortedDiseaseVars(_.orderBy(diseaseVars, o => {
-          return sortMeans(o, varMeans.fetchedData);
-        }, dataset.varSort.disease.sortOrder));
-      }
-    } else if (dataset.varSort.disease.sort === VAR_SORT.NAME) {
-      setSortedDiseaseVars(_.orderBy(diseaseVars, "name", dataset.varSort.disease.sortOrder));
-    } else {
-      setSortedDiseaseVars(diseaseVars);
-    }
-  }, [dataset.varSort.disease.sort, dataset.varSort.disease.sortOrder, diseaseVars, varMeans.fetchedData, varMeans.isPending, varMeans.serverError]);
-  const diseaseVarList = _.map(sortedDiseaseVars, item => {
-    return makeListItem(item, true);
-  });
-  const isPending = diseaseData.isPending || varMeans.isPending && dataset.varSort.disease.sort === VAR_SORT.MATRIX;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, dataset.selectedDisease && (!isPending && !diseaseVars?.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "d-flex justify-content-between mt-3"
-  }, /*#__PURE__*/React.createElement("h5", null, "Disease genes")), /*#__PURE__*/React.createElement(Alert, {
-    variant: "light"
-  }, "No disease genes found.")) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "d-flex justify-content-between my-2"
-  }, /*#__PURE__*/React.createElement("h5", null, "Disease genes"), /*#__PURE__*/React.createElement(ButtonGroup, {
-    "aria-label": "Feature options",
-    size: "sm"
-  }, /*#__PURE__*/React.createElement(Button, {
-    variant: "info",
-    onClick: () => {
-      dispatch({
-        type: "reset.disease"
-      });
-    }
-  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-    icon: faTimes,
-    className: "me-1"
-  }), "Clear"))), /*#__PURE__*/React.createElement("p", null, dataset.selectedDisease?.name), /*#__PURE__*/React.createElement(VarListToolbar, {
-    varType: "disease"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "position-relative"
-  }, isPending && /*#__PURE__*/React.createElement(LoadingSpinner, null), /*#__PURE__*/React.createElement(ListGroup, {
-    variant: "flush",
-    className: "cherita-list"
-  }, diseaseVarList)))));
-}
-export function VarNamesList(_ref2) {
+export function VarNamesList(_ref) {
+  var _settings$selectedVar, _settings$selectedVar2;
   let {
     mode = SELECTION_MODES.SINGLE,
-    displayName = "genes",
-    showDiseaseVarList = true
-  } = _ref2;
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
-  const [varButtons, setVarButtons] = useState(mode === SELECTION_MODES.SINGLE ? dataset.selectedVar ? _.unionWith([dataset.selectedVar], dataset.varSets, _.isEqual) : [...dataset.varSets] : [...dataset.selectedMultiVar, ...dataset.varSets]);
-  const [active, setActive] = useState(mode === SELECTION_MODES.SINGLE ? dataset.selectedVar?.matrix_index || dataset.selectedVar?.name : dataset.selectedMultiVar.map(i => i.matrix_index || i.name));
-  const [sortedVarButtons, setSortedVarButtons] = useState([]);
+    displayName = "genes"
+  } = _ref;
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
+  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) {
-      setVarButtons(v => {
-        if (dataset.selectedVar) {
-          return _.unionWith(v, [dataset.selectedVar], _.isEqual);
-        } else {
-          return v;
-        }
-      });
-      setActive(dataset.selectedVar?.matrix_index || dataset.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, dataset.selectedVar]);
+  }, [mode, settings.selectedVar]);
   useEffect(() => {
     if (mode === SELECTION_MODES.MULTIPLE) {
-      setVarButtons(v => {
-        if (dataset.selectedMultiVar.length) {
-          return _.unionWith(v, dataset.selectedMultiVar, _.isEqual);
-        } else {
-          return v;
-        }
-      });
-      setActive(dataset.selectedMultiVar.map(i => i.matrix_index || i.name));
+      setActive(settings.selectedMultiVar.map(i => i.matrix_index || i.name));
     }
-  }, [mode, dataset.selectedMultiVar]);
-  useEffect(() => {
-    setVarButtons(v => {
-      const updated = _.compact(_.map(v, i => {
-        if (i.isSet) {
-          return dataset.varSets.find(s => s.name === i.name);
-        } else return i;
-      }));
-      const newSets = _.difference(dataset.varSets, updated);
-      return [...updated, ...newSets];
-    });
-    if (mode === SELECTION_MODES.SINGLE) {
-      if (dataset.selectedVar?.isSet) {
-        const selectedSet = dataset.varSets.find(s => s.name === dataset.selectedVar.name);
-        dispatch({
-          type: "select.var",
-          var: selectedSet
-        });
-      }
-    } else {
-      dispatch({
-        type: "update.multivar",
-        vars: dataset.varSets
-      });
-    }
-  }, [mode, dataset.varSets, dataset.selectedVar?.isSet, dataset.selectedVar?.name, dispatch]);
-  const varMeans = useVarMean(varButtons, dataset.varSort.var.sort === VAR_SORT.MATRIX);
+  }, [mode, settings.selectedMultiVar]);
+  const varMeans = useVarMean(settings.vars, settings.varSort.var.sort === VAR_SORT.MATRIX);
 
-  // @TODO: deferr sortedVarButtons ?
+  // @TODO: deferr sortedVars ?
   useEffect(() => {
-    if (dataset.varSort.var.sort === VAR_SORT.MATRIX) {
+    if (settings.varSort.var.sort === VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError && varMeans.fetchedData) {
-        setSortedVarButtons(_.orderBy(varButtons, o => {
+        setSortedVars(_.orderBy(settings.vars, o => {
           return sortMeans(o, varMeans.fetchedData);
-        }, dataset.varSort.var.sortOrder));
+        }, settings.varSort.var.sortOrder));
       }
-    } else if (dataset.varSort.var.sort === VAR_SORT.NAME) {
-      setSortedVarButtons(_.orderBy(varButtons, "name", dataset.varSort.var.sortOrder));
+    } else if (settings.varSort.var.sort === VAR_SORT.NAME) {
+      setSortedVars(_.orderBy(settings.vars, "name", settings.varSort.var.sortOrder));
     } else {
-      setSortedVarButtons(varButtons);
+      setSortedVars(settings.vars);
     }
-  }, [dataset.varSort.var.sort, dataset.varSort.var.sortOrder, varButtons, varMeans.isPending, varMeans.serverError, varMeans.fetchedData]);
-  const makeListItem = function (item) {
-    let isDiseaseGene = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  }, [settings.varSort.var.sort, settings.varSort.var.sortOrder, varMeans.isPending, varMeans.serverError, varMeans.fetchedData, settings.vars]);
+  const makeListItem = item => {
     return /*#__PURE__*/React.createElement(ListGroup.Item, {
       key: item.matrix_index
     }, /*#__PURE__*/React.createElement(VarItem, {
       item: item,
       active: active,
-      setVarButtons: setVarButtons,
-      mode: mode,
-      isDiseaseGene: isDiseaseGene
+      mode: mode
     }));
   };
   const makeSetListItem = set => {
@@ -223,7 +105,7 @@ export function VarNamesList(_ref2) {
       mode: mode
     }));
   };
-  const varList = _.map(sortedVarButtons, item => {
+  const varList = _.map(sortedVars, item => {
     if (item.isSet) {
       return makeSetListItem(item);
     } else {
@@ -232,17 +114,17 @@ export function VarNamesList(_ref2) {
   });
   const newSetName = () => {
     let n = 1;
-    let setName = `Set ${n}`;
-    const setNameExists = name => {
-      return dataset.varSets.some(set => set.name === name);
+    let setName = "Set ".concat(n);
+    const nameExists = name => {
+      return settings.vars.some(v => v.name === name);
     };
-    while (setNameExists(setName)) {
+    while (nameExists(setName)) {
       n++;
-      setName = `Set ${n}`;
+      setName = "Set ".concat(n);
     }
     return setName;
   };
-  const isPending = varMeans.isPending && dataset.varSort.var.sort === VAR_SORT.MATRIX;
+  const isPending = varMeans.isPending && settings.varSort.var.sort === VAR_SORT.MATRIX;
   return /*#__PURE__*/React.createElement("div", {
     className: "position-relative"
   }, /*#__PURE__*/React.createElement("div", {
@@ -256,8 +138,8 @@ export function VarNamesList(_ref2) {
     variant: "info",
     onClick: () => {
       dispatch({
-        type: "add.varSet",
-        varSet: {
+        type: "add.var",
+        var: {
           name: newSetName(),
           vars: [],
           isSet: true
@@ -267,12 +149,8 @@ export function VarNamesList(_ref2) {
   }, "New set"), /*#__PURE__*/React.createElement(Button, {
     variant: "info",
     onClick: () => {
-      setVarButtons([]);
-      dispatch({
-        type: mode === SELECTION_MODES.SINGLE ? "reset.var" : "reset.multiVar"
-      });
       dispatch({
-        type: "reset.varSets"
+        type: "reset.vars"
       });
     }
   }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
@@ -285,7 +163,5 @@ export function VarNamesList(_ref2) {
   }, isPending && /*#__PURE__*/React.createElement(LoadingSpinner, null), /*#__PURE__*/React.createElement(ListGroup, {
     variant: "flush",
     className: "cherita-list"
-  }, varList)))), /*#__PURE__*/React.createElement(React.Fragment, null, showDiseaseVarList && /*#__PURE__*/React.createElement(DiseaseVarList, {
-    makeListItem: makeListItem
-  }))));
+  }, varList))))));
 }

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

@@ -3,18 +3,18 @@ import { faArrowDown19, faArrowDownAZ, faArrowUp91, faArrowUpZA, faXmark } from
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ToggleButton, ToggleButtonGroup } from "react-bootstrap";
 import { VAR_SORT, VAR_SORT_ORDER } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 
 // @TODO: set option for "var" and "disease"
 export function VarListToolbar(_ref) {
   let {
     varType = "var"
   } = _ref;
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
-  const [sort, setSort] = useState(dataset.varSort.var.sort);
-  const [nameSortOrder, setNameSortOrder] = useState(dataset.varSort.var.sortOrder);
-  const [matrixSortOrder, setMatrixSortOrder] = useState(dataset.varSort.var.sortOrder);
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
+  const [sort, setSort] = useState(settings.varSort.var.sort);
+  const [nameSortOrder, setNameSortOrder] = useState(settings.varSort.var.sortOrder);
+  const [matrixSortOrder, setMatrixSortOrder] = useState(settings.varSort.var.sortOrder);
   const handleSort = (sortValue, sortOrder, setSortOrder) => {
     if (sort !== sortValue) {
       setSort(sortValue);

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

@@ -1,13 +1,12 @@
 import React, { useState } from "react";
-import { faCircleInfo, faDroplet, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faChevronDown, faChevronUp, faCircleInfo, faDroplet, faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { List } from "@mui/icons-material";
 import _ from "lodash";
 import { Button, Collapse, ListGroup, OverlayTrigger, Tooltip } from "react-bootstrap";
+import { SelectionItem } from "./VarItem";
 import { COLOR_ENCODINGS, SELECTION_MODES } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
-import { SearchBar } from "../search-bar/SearchBar";
-import { SingleSelectionItem } from "./VarItem";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
+import { SearchModal } from "../search-bar/SearchBar";
 
 // @TODO: add button to score genes and plot
 
@@ -18,20 +17,22 @@ const addVarToSet = (dispatch, set, v) => {
     var: v
   });
 };
-function SingleSelectionSet(_ref) {
+function SelectionSet(_ref) {
   let {
     set,
     isActive,
     selectSet,
     removeSet,
     removeSetVar,
-    showSearchBar = true
+    isMultiple = false
   } = _ref;
   const [openSet, setOpenSet] = useState(false);
+  const [showModal, setShowModal] = useState(false);
+  const [searchText, setSearchText] = useState("");
   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)
@@ -46,16 +47,37 @@ function SingleSelectionSet(_ref) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "d-flex justify-content-between align-items-center w-100"
-  }, /*#__PURE__*/React.createElement("div", null, set.name), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "ellipsis-text",
+    title: set.name
+  }, set.name), /*#__PURE__*/React.createElement("div", {
     className: "d-flex align-items-center gap-1"
   }, /*#__PURE__*/React.createElement(OverlayTrigger, {
     placement: "top",
     overlay: /*#__PURE__*/React.createElement(Tooltip, null, "This set represents the mean value of its features")
   }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
     icon: faCircleInfo
-  })), /*#__PURE__*/React.createElement(List, null), /*#__PURE__*/React.createElement(Button, {
+  })), /*#__PURE__*/React.createElement(Button, {
+    type: "button",
+    variant: "outline-primary",
+    className: "m-0 p-0 px-1",
+    disabled: !set.vars.length,
+    title: "Open set"
+  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+    icon: openSet ? faChevronUp : faChevronDown
+  })), /*#__PURE__*/React.createElement(Button, {
+    type: "button",
+    variant: "outline-primary",
+    className: "m-0 p-0 px-1",
+    onClick: e => {
+      e.stopPropagation();
+      setShowModal(true);
+    },
+    title: "Add to set"
+  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
+    icon: faPlus
+  })), /*#__PURE__*/React.createElement(Button, {
     type: "button",
-    key: set.name,
     variant: isActive ? "primary" : "outline-primary",
     className: "m-0 p-0 px-1",
     onClick: e => {
@@ -66,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",
@@ -81,45 +107,30 @@ function SingleSelectionSet(_ref) {
     in: openSet
   }, /*#__PURE__*/React.createElement("div", {
     className: "mt-2"
-  }, showSearchBar &&
-  /*#__PURE__*/
-  // @TODO: fix how results are displayed, should be placed on top of parent components
-  React.createElement(SearchBar, {
-    handleSelect: (d, i) => addVarToSet(d, set, i)
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "mx-2"
   }, /*#__PURE__*/React.createElement(ListGroup, {
     variant: "flush",
-    className: "cherita-list"
-  }, varList)))));
-}
-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))));
+    className: "cherita-list var-set-list"
+  }, varList))), /*#__PURE__*/React.createElement(SearchModal, {
+    show: showModal,
+    handleClose: () => setShowModal(false),
+    text: searchText,
+    setText: setSearchText,
+    displayText: "features",
+    handleSelect: (d, i) => {
+      addVarToSet(d, set, i);
+    },
+    searchVar: true,
+    searchDiseases: false
+  }));
 }
-export function VarSet(_ref3) {
+export function VarSet(_ref2) {
   let {
     set,
     active,
     mode = SELECTION_MODES.SINGLE
-  } = _ref3;
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
+  } = _ref2;
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
   const selectSet = () => {
     if (mode === SELECTION_MODES.SINGLE) {
       dispatch({
@@ -153,8 +164,8 @@ export function VarSet(_ref3) {
       }
     }
     dispatch({
-      type: "remove.varSet",
-      varSet: set
+      type: "remove.var",
+      var: set
     });
   };
   const removeSetVar = v => {
@@ -165,28 +176,27 @@ export function VarSet(_ref3) {
     });
   };
   const toggleSet = () => {
-    if (active.includes(set.name)) {
-      dispatch({
-        type: "deselect.multivar",
-        var: set
-      });
-    } else {
-      selectSet();
-    }
+    dispatch({
+      type: "toggle.multivar",
+      var: set
+    });
   };
   if (set && mode === SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/React.createElement(SingleSelectionSet, {
+    return /*#__PURE__*/React.createElement(SelectionSet, {
       set: set,
-      isActive: dataset.colorEncoding === COLOR_ENCODINGS.VAR && active === set.name,
+      isActive: settings.colorEncoding === COLOR_ENCODINGS.VAR && active === set.name,
       selectSet: selectSet,
       removeSet: removeSet,
       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(set)
+      selectSet: toggleSet,
+      removeSet: removeSet,
+      removeSetVar: v => removeSetVar(v),
+      isMultiple: true
     });
   } else {
     return null;