@haniffalab/cherita-react 1.3.0-dev.2025-05-29.ee7e9b72 → 1.3.0-dev.2025-06-04.d986a94b

package/dist/cjs/components/dotplot/Dotplot.js

@@ -8,11 +8,13 @@ var _react = _interopRequireWildcard(require("react"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
+var _constants = require("../../constants/constants");
 var _DatasetContext = require("../../context/DatasetContext");
 var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
@@ -20,8 +22,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 Dotplot() {
+function Dotplot(_ref) {
   var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
+  let {
+    showObsBtn = false,
+    showVarsBtn = false,
+    showCtrlsBtn = false,
+    setShowObs,
+    setShowVars,
+    setShowControls
+  } = _ref;
   const ENDPOINT = "dotplot";
   const dataset = (0, _DatasetContext.useDataset)();
   const settings = (0, _SettingsContext.useSettings)();
@@ -126,17 +136,29 @@ function Dotplot() {
       });
     });
   }, [settings.controls.colorAxis.cmin, settings.controls.colorAxis.cmax]);
+  const customModeBarButtons = _lodash.default.compact([showObsBtn && (0, _Toolbar.ObsPlotlyToolbar)({
+    onClick: setShowObs
+  }), showVarsBtn && (0, _Toolbar.VarPlotlyToolbar)({
+    onClick: setShowVars
+  }), showCtrlsBtn && (0, _Toolbar.ControlsPlotlyToolbar)({
+    onClick: setShowControls
+  })]);
+  const modeBarButtons = customModeBarButtons.length ? [customModeBarButtons, _constants.PLOTLY_MODEBAR_BUTTONS] : [_constants.PLOTLY_MODEBAR_BUTTONS];
   if (!serverError) {
     if (hasSelections) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: "cherita-dotplot position-relative"
+        className: "cherita-plot cherita-dotplot position-relative"
       }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingIndicators.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
         data: data,
         layout: layout,
         useResizeHandler: true,
         style: {
-          maxWidth: "100%",
-          maxHeight: "100%"
+          width: "100%",
+          height: "100%"
+        },
+        config: {
+          displaylogo: false,
+          modeBarButtons: modeBarButtons
         }
       }));
     }
@@ -144,7 +166,15 @@ function Dotplot() {
       className: "cherita-dotplot"
     }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "light"
-    }, "Select features and a category"));
+    }, "Select", " ", showVarsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+      variant: "link",
+      className: "border-0 p-0 align-baseline",
+      onClick: setShowVars
+    }, "features") : "features", " ", "and a", " ", showObsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+      variant: "link",
+      className: "border-0 p-0 align-baseline",
+      onClick: setShowObs
+    }, "category") : "category"));
   } else {
     return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "danger"

package/dist/cjs/components/full-page/FullPage.js

@@ -4,32 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FullPage = FullPage;
-exports.FullPagePlots = FullPagePlots;
-exports.FullPageScatterplot = FullPageScatterplot;
 var _react = _interopRequireWildcard(require("react"));
+var _material = require("@mui/material");
 var _reactBootstrap = require("react-bootstrap");
 var _constants = require("../../constants/constants");
 var _DatasetContext = require("../../context/DatasetContext");
 var _Dotplot = require("../dotplot/Dotplot");
+var _DotplotControls = require("../dotplot/DotplotControls");
+var _PlotTypeSelector = require("../full-page/PlotTypeSelector");
 var _Heatmap = require("../heatmap/Heatmap");
+var _HeatmapControls = require("../heatmap/HeatmapControls");
 var _Matrixplot = require("../matrixplot/Matrixplot");
+var _MatrixplotControls = require("../matrixplot/MatrixplotControls");
 var _ObsList = require("../obs-list/ObsList");
 var _offcanvas = require("../offcanvas");
+var _Pseudospatial = require("../pseudospatial/Pseudospatial");
+var _PseudospatialToolbar = require("../pseudospatial/PseudospatialToolbar");
 var _Scatterplot = require("../scatterplot/Scatterplot");
 var _ScatterplotControls = require("../scatterplot/ScatterplotControls");
 var _SearchBar = require("../search-bar/SearchBar");
 var _VarList = require("../var-list/VarList");
 var _Violin = require("../violin/Violin");
-const _excluded = ["children", "varMode", "searchDiseases"];
+var _ViolinControls = require("../violin/ViolinControls");
+const _excluded = ["isPseudospatial", "searchDiseases", "defaultPlotType"];
 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 _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 function FullPage(_ref) {
   let {
-      children,
-      varMode = _constants.SELECTION_MODES.SINGLE,
-      searchDiseases = false
+      isPseudospatial = false,
+      searchDiseases = true,
+      defaultPlotType = _constants.PLOT_TYPES.SCATTERPLOT
     } = _ref,
     props = _objectWithoutProperties(_ref, _excluded);
   const appRef = (0, _react.useRef)();
@@ -42,6 +48,16 @@ function FullPage(_ref) {
   const [showVars, setShowVars] = (0, _react.useState)(false);
   const [showControls, setShowControls] = (0, _react.useState)(false);
   const [showModal, setShowModal] = (0, _react.useState)(false);
+  const [plotType, setPlotType] = (0, _react.useState)(defaultPlotType || _constants.PLOT_TYPES.SCATTERPLOT);
+  const [showPseudospatialControls, setShowPseudospatialControls] = (0, _react.useState)(false);
+  const [pseudospatialPlotType, setpseudospatialPlotType] = (0, _react.useState)(null);
+  (0, _react.useEffect)(() => {
+    setPlotType(defaultPlotType || _constants.PLOT_TYPES.SCATTERPLOT);
+  }, [defaultPlotType]);
+  const LgBreakpoint = (0, _material.useMediaQuery)(_constants.BREAKPOINTS.LG);
+  const XlBreakpoint = (0, _material.useMediaQuery)(_constants.BREAKPOINTS.XL);
+  const showObsBtn = LgBreakpoint;
+  const showVarsBtn = XlBreakpoint;
   (0, _react.useEffect)(() => {
     const updateDimensions = () => {
       if (appRef.current) {
@@ -60,9 +76,67 @@ function FullPage(_ref) {
       }
     };
     window.addEventListener("resize", updateDimensions);
-    updateDimensions(); // Initial update
+    updateDimensions();
     return () => window.removeEventListener("resize", updateDimensions);
   }, []);
+  const {
+    plotControls,
+    varMode,
+    showSelectedAsActive
+  } = {
+    [_constants.PLOT_TYPES.SCATTERPLOT]: {
+      plotControls: _ScatterplotControls.ScatterplotControls,
+      varMode: _constants.SELECTION_MODES.SINGLE,
+      showSelectedAsActive: false
+    },
+    [_constants.PLOT_TYPES.DOTPLOT]: {
+      plotControls: _DotplotControls.DotplotControls,
+      varMode: _constants.SELECTION_MODES.MULTIPLE,
+      showSelectedAsActive: true
+    },
+    [_constants.PLOT_TYPES.MATRIXPLOT]: {
+      plotControls: _MatrixplotControls.MatrixplotControls,
+      varMode: _constants.SELECTION_MODES.MULTIPLE,
+      showSelectedAsActive: true
+    },
+    [_constants.PLOT_TYPES.HEATMAP]: {
+      plotControls: _HeatmapControls.HeatmapControls,
+      varMode: _constants.SELECTION_MODES.MULTIPLE,
+      showSelectedAsActive: true
+    },
+    [_constants.PLOT_TYPES.VIOLINPLOT]: {
+      plotControls: _ViolinControls.ViolinControls,
+      varMode: _constants.SELECTION_MODES.MULTIPLE,
+      showSelectedAsActive: false
+    }
+  }[plotType];
+  const plot = (0, _react.useMemo)(() => {
+    const commonProps = {
+      showObsBtn,
+      showVarsBtn,
+      showCtrlsBtn: true,
+      setShowObs,
+      setShowVars,
+      setShowControls
+    };
+    switch (plotType) {
+      case _constants.PLOT_TYPES.DOTPLOT:
+        return /*#__PURE__*/_react.default.createElement(_Dotplot.Dotplot, commonProps);
+      case _constants.PLOT_TYPES.MATRIXPLOT:
+        return /*#__PURE__*/_react.default.createElement(_Matrixplot.Matrixplot, commonProps);
+      case _constants.PLOT_TYPES.HEATMAP:
+        return /*#__PURE__*/_react.default.createElement(_Heatmap.Heatmap, commonProps);
+      case _constants.PLOT_TYPES.VIOLINPLOT:
+        return /*#__PURE__*/_react.default.createElement(_Violin.Violin, _extends({
+          mode: _constants.VIOLIN_MODES.MULTIKEY
+        }, commonProps));
+      case _constants.PLOT_TYPES.SCATTERPLOT:
+      default:
+        return /*#__PURE__*/_react.default.createElement(_Scatterplot.Scatterplot, _extends({}, commonProps, {
+          isFullscreen: true
+        }));
+    }
+  }, [plotType, showObsBtn, showVarsBtn]);
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: appRef,
     className: "cherita-app",
@@ -71,22 +145,32 @@ function FullPage(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement(_DatasetContext.DatasetProvider, props, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Container, {
     fluid: true,
-    className: "d-flex g-0",
+    className: "cherita-app-container",
     style: {
       height: appDimensions.height
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "cherita-app-obs modern-scrollbars border-end h-100"
-  }, /*#__PURE__*/_react.default.createElement(_ObsList.ObsColsList, props)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "cherita-app-canvas flex-grow-1"
-  }, children({
-    setShowObs,
-    setShowVars
-  })), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_ObsList.ObsColsList, _extends({}, props, {
+    showSelectedAsActive: showSelectedAsActive
+  }))), /*#__PURE__*/_react.default.createElement("div", {
+    className: "cherita-app-canvas"
+  }, plot), /*#__PURE__*/_react.default.createElement("div", {
     className: "cherita-app-sidebar p-3"
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Card, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Card.Body, {
     className: "d-flex flex-column p-0"
   }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "sidebar-plotselector"
+  }, /*#__PURE__*/_react.default.createElement(_PlotTypeSelector.PlotTypeSelector, {
+    currentType: plotType,
+    onChange: type => setPlotType(type)
+  })), plotType === _constants.PLOT_TYPES.SCATTERPLOT && isPseudospatial ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "sidebar-pseudospatial"
+  }, /*#__PURE__*/_react.default.createElement(_Pseudospatial.Pseudospatial, {
+    plotType: pseudospatialPlotType,
+    setPlotType: setpseudospatialPlotType,
+    setShowControls: setShowPseudospatialControls
+  })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement("div", {
     className: "sidebar-features modern-scrollbars"
   }, /*#__PURE__*/_react.default.createElement(_SearchBar.SearchBar, {
     searchDiseases: searchDiseases,
@@ -99,51 +183,25 @@ function FullPage(_ref) {
     centered: true
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Modal.Header, {
     closeButton: true
-  }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Modal.Body, null)), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasObs, {
+  }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Modal.Body, null)), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasObs, _extends({}, props, {
+    showSelectedAsActive: showSelectedAsActive,
     show: showObs,
     handleClose: () => setShowObs(false)
-  }), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasVars, {
+  })), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasVars, {
     show: showVars,
     handleClose: () => setShowVars(false),
     mode: varMode
-  }), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasControls, {
+  }), plotControls && /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasControls, {
     show: showControls,
     handleClose: () => setShowControls(false),
-    Controls: _ScatterplotControls.ScatterplotControls
+    Controls: plotControls
   }), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasObsm, {
     show: showObsm,
     handleClose: () => setShowObsm(false)
-  }))));
-}
-function FullPageScatterplot(props) {
-  return /*#__PURE__*/_react.default.createElement(FullPage, _extends({}, props, {
-    varMode: _constants.SELECTION_MODES.SINGLE
-  }), _ref2 => {
-    let {
-      setShowObs,
-      setShowVars
-    } = _ref2;
-    return /*#__PURE__*/_react.default.createElement(_Scatterplot.Scatterplot, {
-      setShowObs: setShowObs,
-      setShowVars: setShowVars,
-      isFullscreen: true
-    });
-  });
-}
-function FullPagePlots(props) {
-  return /*#__PURE__*/_react.default.createElement(FullPage, _extends({}, props, {
-    varMode: _constants.SELECTION_MODES.MULTIPLE
-  }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "container-fluid w-100 h-100 d-flex flex-column overflow-y-auto"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "row flex-grow-1"
-  }, /*#__PURE__*/_react.default.createElement(_Heatmap.Heatmap, null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "row flex-grow-1"
-  }, /*#__PURE__*/_react.default.createElement(_Matrixplot.Matrixplot, null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "row flex-grow-1"
-  }, /*#__PURE__*/_react.default.createElement(_Dotplot.Dotplot, null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "row flex-grow-1"
-  }, /*#__PURE__*/_react.default.createElement(_Violin.Violin, {
-    mode: _constants.VIOLIN_MODES.GROUPBY
+  }), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasControls, {
+    show: showPseudospatialControls,
+    handleClose: () => setShowPseudospatialControls(false),
+    Controls: _PseudospatialToolbar.PseudospatialToolbar,
+    plotType: pseudospatialPlotType
   }))));
 }

package/dist/cjs/components/full-page/PlotTypeSelector.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PlotTypeSelector = PlotTypeSelector;
+var _react = _interopRequireDefault(require("react"));
+var _dotplot = _interopRequireDefault(require("../../../assets/images/plots/dotplot.svg"));
+var _heatmap = _interopRequireDefault(require("../../../assets/images/plots/heatmap.svg"));
+var _matrixplot = _interopRequireDefault(require("../../../assets/images/plots/matrixplot.svg"));
+var _scatterplot = _interopRequireDefault(require("../../../assets/images/plots/scatterplot.svg"));
+var _violin = _interopRequireDefault(require("../../../assets/images/plots/violin.svg"));
+var _constants = require("../../constants/constants");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const iconMap = {
+  [_constants.PLOT_TYPES.DOTPLOT]: _dotplot.default,
+  [_constants.PLOT_TYPES.MATRIXPLOT]: _matrixplot.default,
+  [_constants.PLOT_TYPES.VIOLINPLOT]: _violin.default,
+  [_constants.PLOT_TYPES.SCATTERPLOT]: _scatterplot.default,
+  [_constants.PLOT_TYPES.HEATMAP]: _heatmap.default
+};
+const plotTypes = Object.entries(iconMap).map(_ref => {
+  let [type, icon] = _ref;
+  return {
+    type,
+    icon,
+    alt: type.charAt(0).toUpperCase() + type.slice(1)
+  };
+});
+function PlotTypeSelector(_ref2) {
+  let {
+    currentType,
+    onChange
+  } = _ref2;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "d-flex gap-2 justify-content-between"
+  }, plotTypes.map(_ref3 => {
+    let {
+      type,
+      icon,
+      alt
+    } = _ref3;
+    return /*#__PURE__*/_react.default.createElement("img", {
+      key: type,
+      src: icon,
+      alt: alt,
+      height: 32,
+      width: 32,
+      className: "plotselector-icon".concat(currentType === type ? " active" : ""),
+      onClick: () => onChange(type),
+      style: {
+        borderBottom: currentType === type ? "2px solid #007bff" : "none"
+      },
+      title: alt
+    });
+  }));
+}

package/dist/cjs/components/heatmap/Heatmap.js

@@ -8,11 +8,13 @@ var _react = _interopRequireWildcard(require("react"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
+var _constants = require("../../constants/constants");
 var _DatasetContext = require("../../context/DatasetContext");
 var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
@@ -20,8 +22,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 Heatmap() {
+function Heatmap(_ref) {
   var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
+  let {
+    showObsBtn = false,
+    showVarsBtn = false,
+    showCtrlsBtn = false,
+    setShowObs,
+    setShowVars,
+    setShowControls
+  } = _ref;
   const ENDPOINT = "heatmap";
   const dataset = (0, _DatasetContext.useDataset)();
   const settings = (0, _SettingsContext.useSettings)();
@@ -98,17 +108,29 @@ function Heatmap() {
     colorscale.current = settings.controls.colorScale;
     updateColorscale(colorscale.current);
   }, [settings.controls.colorScale, updateColorscale]);
+  const customModeBarButtons = _lodash.default.compact([showObsBtn && (0, _Toolbar.ObsPlotlyToolbar)({
+    onClick: setShowObs
+  }), showVarsBtn && (0, _Toolbar.VarPlotlyToolbar)({
+    onClick: setShowVars
+  }), showCtrlsBtn && (0, _Toolbar.ControlsPlotlyToolbar)({
+    onClick: setShowControls
+  })]);
+  const modeBarButtons = customModeBarButtons.length ? [customModeBarButtons, _constants.PLOTLY_MODEBAR_BUTTONS] : [_constants.PLOTLY_MODEBAR_BUTTONS];
   if (!serverError) {
     if (hasSelections) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: "cherita-heatmap position-relative"
+        className: "cherita-plot cherita-heatmap position-relative"
       }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingIndicators.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
         data: data,
         layout: layout,
         useResizeHandler: true,
         style: {
-          maxWidth: "100%",
-          maxHeight: "100%"
+          width: "100%",
+          height: "100%"
+        },
+        config: {
+          displaylogo: false,
+          modeBarButtons: modeBarButtons
         }
       }));
     }
@@ -116,7 +138,15 @@ function Heatmap() {
       className: "cherita-heatmap"
     }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "light"
-    }, "Select features and a category"));
+    }, "Select", " ", showVarsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+      variant: "link",
+      className: "border-0 p-0 align-baseline",
+      onClick: setShowVars
+    }, "features") : "features", " ", "and a", " ", showObsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+      variant: "link",
+      className: "border-0 p-0 align-baseline",
+      onClick: setShowObs
+    }, "category") : "category"));
   } else {
     return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "danger"

package/dist/cjs/components/matrixplot/Matrixplot.js

@@ -8,11 +8,13 @@ var _react = _interopRequireWildcard(require("react"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
+var _constants = require("../../constants/constants");
 var _DatasetContext = require("../../context/DatasetContext");
 var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
@@ -20,8 +22,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 Matrixplot() {
+function Matrixplot(_ref) {
   var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
+  let {
+    showObsBtn = false,
+    showVarsBtn = false,
+    showCtrlsBtn = false,
+    setShowObs,
+    setShowVars,
+    setShowControls
+  } = _ref;
   const ENDPOINT = "matrixplot";
   const dataset = (0, _DatasetContext.useDataset)();
   const settings = (0, _SettingsContext.useSettings)();
@@ -100,17 +110,29 @@ function Matrixplot() {
     colorscale.current = settings.controls.colorScale;
     updateColorscale(colorscale.current);
   }, [settings.controls.colorScale, updateColorscale]);
+  const customModeBarButtons = _lodash.default.compact([showObsBtn && (0, _Toolbar.ObsPlotlyToolbar)({
+    onClick: setShowObs
+  }), showVarsBtn && (0, _Toolbar.VarPlotlyToolbar)({
+    onClick: setShowVars
+  }), showCtrlsBtn && (0, _Toolbar.ControlsPlotlyToolbar)({
+    onClick: setShowControls
+  })]);
+  const modeBarButtons = customModeBarButtons.length ? [customModeBarButtons, _constants.PLOTLY_MODEBAR_BUTTONS] : [_constants.PLOTLY_MODEBAR_BUTTONS];
   if (!serverError) {
     if (hasSelections) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: "cherita-matrixplot position-relative"
+        className: "cherita-plot cherita-matrixplot position-relative"
       }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingIndicators.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
         data: data,
         layout: layout,
         useResizeHandler: true,
         style: {
-          maxWidth: "100%",
-          maxHeight: "100%"
+          width: "100%",
+          height: "100%"
+        },
+        config: {
+          displaylogo: false,
+          modeBarButtons: modeBarButtons
         }
       }));
     }
@@ -118,7 +140,15 @@ function Matrixplot() {
       className: "cherita-matrixplot"
     }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "light"
-    }, "Select features and a category"));
+    }, "Select", " ", showVarsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+      variant: "link",
+      className: "border-0 p-0 align-baseline",
+      onClick: setShowVars
+    }, "features") : "features", " ", "and a", " ", showObsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
+      variant: "link",
+      className: "border-0 p-0 align-baseline",
+      onClick: setShowObs
+    }, "category") : "category"));
   } else {
     return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "danger"

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

@@ -56,7 +56,8 @@ function ObsColsList(_ref2) {
   var _settings$selectedObs;
   let {
     showColor = true,
-    enableObsGroups = true
+    enableObsGroups = true,
+    showSelectedAsActive = false
   } = _ref2;
   const ENDPOINT = "obs/cols";
   const dataset = (0, _DatasetContext.useDataset)();
@@ -223,7 +224,7 @@ function ObsColsList(_ref2) {
     }
     const inLabelObs = _lodash.default.some(settings.labelObs, i => i.name === item.name);
     const inSliceObs = settings.sliceBy.obs && ((_settings$selectedObs5 = settings.selectedObs) === null || _settings$selectedObs5 === void 0 ? void 0 : _settings$selectedObs5.name) === item.name;
-    const isColorEncoding = settings.colorEncoding === _constants.COLOR_ENCODINGS.OBS && ((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.name) === item.name;
+    const isColorEncoding = (showSelectedAsActive || settings.colorEncoding === _constants.COLOR_ENCODINGS.OBS) && ((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.name) === item.name;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "accordion-item",
       key: item.name
@@ -250,7 +251,7 @@ function ObsColsList(_ref2) {
         event.stopPropagation();
         toggleColor(item);
       },
-      title: "Is color encoding"
+      title: showSelectedAsActive ? "Is selected" : "Is color encoding"
     }, /*#__PURE__*/_react.default.createElement(_WaterDrop.default, null)))), /*#__PURE__*/_react.default.createElement(_Accordion.default.Collapse, {
       eventKey: item.name
     }, /*#__PURE__*/_react.default.createElement("div", {

package/dist/cjs/components/scatterplot/SpatialControls.js

@@ -14,9 +14,9 @@ var _reactBootstrap = require("react-bootstrap");
 var _Button = _interopRequireDefault(require("react-bootstrap/Button"));
 var _ButtonGroup = _interopRequireDefault(require("react-bootstrap/ButtonGroup"));
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
-var _DatasetContext = require("../../context/DatasetContext");
 var _offcanvas = require("../offcanvas");
 var _ScatterplotControls = require("./ScatterplotControls");
+var _constants = require("../../constants/constants");
 var _SettingsContext = require("../../context/SettingsContext");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
@@ -40,8 +40,8 @@ function SpatialControls(_ref) {
   const [showControls, setShowControls] = (0, _react.useState)(false);
   const handleCloseControls = () => setShowControls(false);
   const handleShowControls = () => setShowControls(true);
-  const LgBreakpoint = (0, _useMediaQuery.default)("(max-width: 991.98px)");
-  const XlBreakpoint = (0, _useMediaQuery.default)("(max-width: 1199.98px)");
+  const LgBreakpoint = (0, _useMediaQuery.default)(_constants.BREAKPOINTS.LG);
+  const XlBreakpoint = (0, _useMediaQuery.default)(_constants.BREAKPOINTS.XL);
   const showObsBtn = isFullscreen ? LgBreakpoint : true;
   const showVarsBtn = isFullscreen ? XlBreakpoint : true;
   const onSelect = (eventKey, event) => {