@haniffalab/cherita-react 1.4.1 → 1.4.2

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

@@ -1,32 +1,36 @@
-const _excluded = ["isPseudospatial", "searchDiseases", "defaultPlotType"];
-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); }
+const _excluded = ["searchDiseases", "defaultPlotType"];
+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 _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; }
-import React, { useEffect, useMemo, useState } from "react";
-import { useMediaQuery } from "@mui/material";
-import { Card, Container, Modal } from "react-bootstrap";
-import { BREAKPOINTS, PLOT_TYPES, SELECTION_MODES, VIOLIN_MODES } from "../../constants/constants";
-import { DatasetProvider } from "../../context/DatasetContext";
-import { Dotplot } from "../dotplot/Dotplot";
-import { DotplotControls } from "../dotplot/DotplotControls";
-import { PlotTypeSelector } from "../full-page/PlotTypeSelector";
-import { Heatmap } from "../heatmap/Heatmap";
-import { HeatmapControls } from "../heatmap/HeatmapControls";
-import { Matrixplot } from "../matrixplot/Matrixplot";
-import { MatrixplotControls } from "../matrixplot/MatrixplotControls";
-import { ObsColsList } from "../obs-list/ObsList";
-import { OffcanvasControls, OffcanvasObs, OffcanvasObsm, OffcanvasVars } from "../offcanvas";
-import { Pseudospatial } from "../pseudospatial/Pseudospatial";
-import { PseudospatialToolbar } from "../pseudospatial/PseudospatialToolbar";
-import { Scatterplot } from "../scatterplot/Scatterplot";
-import { ScatterplotControls } from "../scatterplot/ScatterplotControls";
-import { SearchBar } from "../search-bar/SearchBar";
-import { VarNamesList } from "../var-list/VarList";
-import { Violin } from "../violin/Violin";
-import { ViolinControls } from "../violin/ViolinControls";
+import { useEffect, useMemo, useState } from 'react';
+import { useMediaQuery } from '@mui/material';
+import { Card, Container, Modal } from 'react-bootstrap';
+import { BREAKPOINTS, PLOT_TYPES, SELECTION_MODES, VIOLIN_MODES } from '../../constants/constants';
+import { DatasetProvider } from '../../context/DatasetContext';
+import { Dotplot } from '../dotplot/Dotplot';
+import { DotplotControls } from '../dotplot/DotplotControls';
+import { Heatmap } from '../heatmap/Heatmap';
+import { HeatmapControls } from '../heatmap/HeatmapControls';
+import { Matrixplot } from '../matrixplot/Matrixplot';
+import { MatrixplotControls } from '../matrixplot/MatrixplotControls';
+import { ObsColsList } from '../obs-list/ObsList';
+import { OffcanvasControls, OffcanvasObs, OffcanvasObsm, OffcanvasVars } from '../offcanvas';
+import { PlotTypeSelector } from './PlotTypeSelector';
+import { Pseudospatial } from '../pseudospatial/Pseudospatial';
+import { PseudospatialToolbar } from '../pseudospatial/PseudospatialToolbar';
+import { Scatterplot } from '../scatterplot/Scatterplot';
+import { ScatterplotControls } from '../scatterplot/ScatterplotControls';
+import { SearchBar } from '../search-bar/SearchBar';
+import { VarNamesList } from '../var-list/VarList';
+import { Violin } from '../violin/Violin';
+import { ViolinControls } from '../violin/ViolinControls';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export function FullPage(_ref) {
   let {
-      isPseudospatial = false,
       searchDiseases = true,
       defaultPlotType = PLOT_TYPES.SCATTERPLOT
     } = _ref,
@@ -39,6 +43,9 @@ export function FullPage(_ref) {
   const [plotType, setPlotType] = useState(defaultPlotType || PLOT_TYPES.SCATTERPLOT);
   const [showPseudospatialControls, setShowPseudospatialControls] = useState(false);
   const [pseudospatialPlotType, setpseudospatialPlotType] = useState(null);
+  const {
+    isPseudospatial = false
+  } = props;
   useEffect(() => {
     setPlotType(defaultPlotType || PLOT_TYPES.SCATTERPLOT);
   }, [defaultPlotType]);
@@ -82,88 +89,108 @@ export function FullPage(_ref) {
       showObsBtn,
       showVarsBtn,
       showCtrlsBtn: true,
+      plotType,
       setShowObs,
       setShowVars,
-      setShowControls
+      setShowControls,
+      setPlotType
     };
     switch (plotType) {
       case PLOT_TYPES.DOTPLOT:
-        return /*#__PURE__*/React.createElement(Dotplot, commonProps);
+        return /*#__PURE__*/_jsx(Dotplot, _objectSpread({}, commonProps));
       case PLOT_TYPES.MATRIXPLOT:
-        return /*#__PURE__*/React.createElement(Matrixplot, commonProps);
+        return /*#__PURE__*/_jsx(Matrixplot, _objectSpread({}, commonProps));
       case PLOT_TYPES.HEATMAP:
-        return /*#__PURE__*/React.createElement(Heatmap, commonProps);
+        return /*#__PURE__*/_jsx(Heatmap, _objectSpread({}, commonProps));
       case PLOT_TYPES.VIOLINPLOT:
-        return /*#__PURE__*/React.createElement(Violin, _extends({
+        return /*#__PURE__*/_jsx(Violin, _objectSpread({
           mode: VIOLIN_MODES.MULTIKEY
         }, commonProps));
       case PLOT_TYPES.SCATTERPLOT:
       default:
-        return /*#__PURE__*/React.createElement(Scatterplot, _extends({}, commonProps, {
+        return /*#__PURE__*/_jsx(Scatterplot, _objectSpread(_objectSpread({}, commonProps), {}, {
           isFullscreen: true
         }));
     }
   }, [plotType, showObsBtn, showVarsBtn]);
-  return /*#__PURE__*/React.createElement("div", {
-    className: "cherita-app"
-  }, /*#__PURE__*/React.createElement(DatasetProvider, props, /*#__PURE__*/React.createElement(Container, {
-    fluid: true,
-    className: "cherita-app-container"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "cherita-app-obs modern-scrollbars border-end h-100"
-  }, /*#__PURE__*/React.createElement(ObsColsList, _extends({}, props, {
-    showSelectedAsActive: showSelectedAsActive,
-    showHistograms: varMode === SELECTION_MODES.SINGLE,
-    showColor: varMode === SELECTION_MODES.SINGLE
-  }))), /*#__PURE__*/React.createElement("div", {
-    className: "cherita-app-canvas"
-  }, plot), /*#__PURE__*/React.createElement("div", {
-    className: "cherita-app-sidebar p-3"
-  }, /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(Card.Body, null, /*#__PURE__*/React.createElement("div", {
-    className: "sidebar-plotselector"
-  }, /*#__PURE__*/React.createElement(PlotTypeSelector, {
-    currentType: plotType,
-    onChange: type => setPlotType(type)
-  })), plotType === PLOT_TYPES.SCATTERPLOT && isPseudospatial ? /*#__PURE__*/React.createElement("div", {
-    className: "sidebar-pseudospatial"
-  }, /*#__PURE__*/React.createElement(Pseudospatial, {
-    plotType: pseudospatialPlotType,
-    setPlotType: setpseudospatialPlotType,
-    setShowControls: setShowPseudospatialControls
-  })) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement("div", {
-    className: "sidebar-features"
-  }, /*#__PURE__*/React.createElement(SearchBar, {
-    searchDiseases: searchDiseases,
-    searchVar: true
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "sidebar-features-list"
-  }, /*#__PURE__*/React.createElement(VarNamesList, {
-    mode: varMode
-  }))))))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Modal, {
-    show: showModal,
-    onHide: () => setShowModal(false),
-    centered: true
-  }, /*#__PURE__*/React.createElement(Modal.Header, {
-    closeButton: true
-  }), /*#__PURE__*/React.createElement(Modal.Body, null)), /*#__PURE__*/React.createElement(OffcanvasObs, _extends({}, props, {
-    showSelectedAsActive: showSelectedAsActive,
-    show: showObs,
-    handleClose: () => setShowObs(false)
-  })), /*#__PURE__*/React.createElement(OffcanvasVars, {
-    show: showVars,
-    handleClose: () => setShowVars(false),
-    mode: varMode
-  }), plotControls && /*#__PURE__*/React.createElement(OffcanvasControls, {
-    show: showControls,
-    handleClose: () => setShowControls(false),
-    Controls: plotControls
-  }), /*#__PURE__*/React.createElement(OffcanvasObsm, {
-    show: showObsm,
-    handleClose: () => setShowObsm(false)
-  }), /*#__PURE__*/React.createElement(OffcanvasControls, {
-    show: showPseudospatialControls,
-    handleClose: () => setShowPseudospatialControls(false),
-    Controls: PseudospatialToolbar,
-    plotType: pseudospatialPlotType
-  }))));
+  return /*#__PURE__*/_jsx("div", {
+    className: "cherita-app",
+    children: /*#__PURE__*/_jsxs(DatasetProvider, _objectSpread(_objectSpread({}, props), {}, {
+      children: [/*#__PURE__*/_jsxs(Container, {
+        fluid: true,
+        className: "cherita-app-container",
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "cherita-app-obs modern-scrollbars border-end h-100",
+          children: /*#__PURE__*/_jsx(ObsColsList, _objectSpread(_objectSpread({}, props), {}, {
+            showSelectedAsActive: showSelectedAsActive,
+            showHistograms: varMode === SELECTION_MODES.SINGLE,
+            showColor: varMode === SELECTION_MODES.SINGLE
+          }))
+        }), /*#__PURE__*/_jsx("div", {
+          className: "cherita-app-canvas",
+          children: plot
+        }), /*#__PURE__*/_jsx("div", {
+          className: "cherita-app-sidebar p-3",
+          children: /*#__PURE__*/_jsx(Card, {
+            children: /*#__PURE__*/_jsxs(Card.Body, {
+              children: [/*#__PURE__*/_jsx("div", {
+                className: "plotselector",
+                children: /*#__PURE__*/_jsx(PlotTypeSelector, {
+                  currentType: plotType,
+                  onChange: type => setPlotType(type)
+                })
+              }), plotType === PLOT_TYPES.SCATTERPLOT && isPseudospatial ? /*#__PURE__*/_jsx("div", {
+                className: "sidebar-pseudospatial",
+                children: /*#__PURE__*/_jsx(Pseudospatial, {
+                  plotType: pseudospatialPlotType,
+                  setPlotType: setpseudospatialPlotType,
+                  setShowControls: setShowPseudospatialControls
+                })
+              }) : /*#__PURE__*/_jsx(_Fragment, {}), /*#__PURE__*/_jsxs("div", {
+                className: "sidebar-features",
+                children: [/*#__PURE__*/_jsx(SearchBar, {
+                  searchDiseases: searchDiseases,
+                  searchVar: true
+                }), /*#__PURE__*/_jsx("div", {
+                  className: "sidebar-features-list",
+                  children: /*#__PURE__*/_jsx(VarNamesList, {
+                    mode: varMode
+                  })
+                })]
+              })]
+            })
+          })
+        })]
+      }), /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsxs(Modal, {
+          show: showModal,
+          onHide: () => setShowModal(false),
+          centered: true,
+          children: [/*#__PURE__*/_jsx(Modal.Header, {
+            closeButton: true
+          }), /*#__PURE__*/_jsx(Modal.Body, {})]
+        }), /*#__PURE__*/_jsx(OffcanvasObs, _objectSpread(_objectSpread({}, props), {}, {
+          showSelectedAsActive: showSelectedAsActive,
+          show: showObs,
+          handleClose: () => setShowObs(false)
+        })), /*#__PURE__*/_jsx(OffcanvasVars, {
+          show: showVars,
+          handleClose: () => setShowVars(false),
+          mode: varMode
+        }), plotControls && /*#__PURE__*/_jsx(OffcanvasControls, {
+          show: showControls,
+          handleClose: () => setShowControls(false),
+          Controls: plotControls
+        }), /*#__PURE__*/_jsx(OffcanvasObsm, {
+          show: showObsm,
+          handleClose: () => setShowObsm(false)
+        }), /*#__PURE__*/_jsx(OffcanvasControls, {
+          show: showPseudospatialControls,
+          handleClose: () => setShowPseudospatialControls(false),
+          Controls: PseudospatialToolbar,
+          plotType: pseudospatialPlotType
+        })]
+      })]
+    }))
+  });
 }

package/dist/esm/components/full-page/PlotAlert.js

@@ -0,0 +1,39 @@
+import { useMediaQuery } from '@mui/material';
+import { Alert } from 'react-bootstrap';
+import { PlotTypeSelector } from './PlotTypeSelector';
+import { BREAKPOINTS, PLOT_TYPES } from '../../constants/constants';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+export function PlotAlert(_ref) {
+  let {
+    variant = 'warning',
+    plotType = PLOT_TYPES.SCATTERPLOT,
+    setPlotType,
+    heading,
+    children
+  } = _ref;
+  const XlBreakpoint = useMediaQuery(BREAKPOINTS.XL);
+  const showPlotSelector = XlBreakpoint;
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [showPlotSelector && /*#__PURE__*/_jsx("div", {
+      className: "plotselector",
+      children: /*#__PURE__*/_jsx(PlotTypeSelector, {
+        currentType: plotType,
+        onChange: type => {
+          if (setPlotType) setPlotType(type);
+        }
+      })
+    }), /*#__PURE__*/_jsx("div", {
+      className: "cherita-plot-alert h-100",
+      children: /*#__PURE__*/_jsx("div", {
+        className: "w-100 h-100 d-flex justify-content-center align-items-center",
+        children: /*#__PURE__*/_jsxs(Alert, {
+          variant: variant,
+          className: "m-0 w-75 w-lg-50 text-center",
+          children: [heading && /*#__PURE__*/_jsx(Alert.Heading, {
+            children: heading
+          }), " ", children]
+        })
+      })
+    })]
+  });
+}

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

@@ -1,50 +1,95 @@
-import React from "react";
-import dotplotIcon from "../../../assets/images/plots/dotplot.svg";
-import heatmapIcon from "../../../assets/images/plots/heatmap.svg";
-import matrixplotIcon from "../../../assets/images/plots/matrixplot.svg";
-import scatterplotIcon from "../../../assets/images/plots/scatterplot.svg";
-import violinIcon from "../../../assets/images/plots/violin.svg";
-import { PLOT_TYPES } from "../../constants/constants";
-const iconMap = {
-  [PLOT_TYPES.SCATTERPLOT]: scatterplotIcon,
-  [PLOT_TYPES.MATRIXPLOT]: matrixplotIcon,
-  [PLOT_TYPES.HEATMAP]: heatmapIcon,
-  [PLOT_TYPES.DOTPLOT]: dotplotIcon,
-  [PLOT_TYPES.VIOLINPLOT]: violinIcon
-};
-const plotTypes = Object.entries(iconMap).map(_ref => {
-  let [type, icon] = _ref;
-  return {
-    type,
-    icon,
-    alt: type.charAt(0).toUpperCase() + type.slice(1)
-  };
-});
-export function PlotTypeSelector(_ref2) {
+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 { useState } from 'react';
+import { PLOT_TYPES } from '../../constants/constants';
+import { StyledTooltip } from '../../utils/StyledTooltip';
+import DotPlotIcon from '../icons/DotPlotIcon';
+import HeatmapIcon from '../icons/HeatmapIcon';
+import MatrixPlotIcon from '../icons/MatrixPlotIcon';
+import ScatterplotIcon from '../icons/ScatterplotIcon';
+import ViolinPlotIcon from '../icons/ViolinPlotIcon';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+const plotTypes = [{
+  type: PLOT_TYPES.SCATTERPLOT,
+  icon: ScatterplotIcon,
+  name: 'Scatterplot',
+  description: 'Displays cells in 2D based on dimensionality reduction.'
+}, {
+  type: PLOT_TYPES.MATRIXPLOT,
+  icon: MatrixPlotIcon,
+  name: 'Matrix Plot',
+  description: 'Shows expression values of genes across categories.'
+}, {
+  type: PLOT_TYPES.DOTPLOT,
+  icon: DotPlotIcon,
+  name: 'Dot Plot',
+  description: 'Shows proportion and expression of genes across groups.'
+}, {
+  type: PLOT_TYPES.HEATMAP,
+  icon: HeatmapIcon,
+  name: 'Heatmap',
+  description: 'Visualises gene expression or feature activity as a colour-coded matrix.'
+}, {
+  type: PLOT_TYPES.VIOLINPLOT,
+  icon: ViolinPlotIcon,
+  name: 'Violin Plot',
+  description: 'Displays distribution of gene expression across categories.'
+}];
+export function PlotTypeSelector(_ref) {
   let {
     currentType,
     onChange
-  } = _ref2;
-  return /*#__PURE__*/React.createElement("div", {
-    className: "d-flex gap-2 justify-content-between"
-  }, plotTypes.map(_ref3 => {
-    let {
-      type,
-      icon,
-      alt
-    } = _ref3;
-    return /*#__PURE__*/React.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
-    });
+  } = _ref;
+  const [hoveredMap, setHoveredMap] = useState({});
+  const handleMouseEnter = type => setHoveredMap(prev => _objectSpread(_objectSpread({}, prev), {}, {
+    [type]: true
   }));
+  const handleMouseLeave = type => setHoveredMap(prev => _objectSpread(_objectSpread({}, prev), {}, {
+    [type]: false
+  }));
+  return /*#__PURE__*/_jsx("div", {
+    className: "d-flex gap-2 justify-content-between",
+    children: plotTypes.map(_ref2 => {
+      let {
+        type,
+        icon: Icon,
+        name,
+        description
+      } = _ref2;
+      const isActive = currentType === type;
+      const hovered = hoveredMap[type] || false;
+      const colour = isActive ? '#005a86' : hovered ? '#0071a7' : '#000';
+      return /*#__PURE__*/_jsx(StyledTooltip, {
+        title: /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsx("strong", {
+            children: name
+          }), /*#__PURE__*/_jsx("br", {}), description]
+        }),
+        placement: "bottom",
+        slotProps: {
+          popper: {
+            modifiers: [{
+              name: 'offset',
+              options: {
+                offset: [0, -12]
+              }
+            }]
+          }
+        },
+        children: /*#__PURE__*/_jsx("div", {
+          onMouseEnter: () => handleMouseEnter(type),
+          onMouseLeave: () => handleMouseLeave(type),
+          onClick: () => onChange(type),
+          className: "plotselector-icon".concat(isActive ? ' active' : ''),
+          children: /*#__PURE__*/_jsx(Icon, {
+            size: 34,
+            colour: colour
+          })
+        })
+      }, type);
+    })
+  });
 }

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

@@ -3,28 +3,32 @@ 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); }
-import React, { useCallback, useEffect, useRef, useState } from "react";
-import _ from "lodash";
-import { Alert, Button } from "react-bootstrap";
-import Plot from "react-plotly.js";
-import { PLOTLY_MODEBAR_BUTTONS } from "../../constants/constants";
-import { useDataset } from "../../context/DatasetContext";
-import { useFilteredData } from "../../context/FilterContext";
-import { useSettings } from "../../context/SettingsContext";
-import { LoadingSpinner } from "../../utils/LoadingIndicators";
-import { useDebouncedFetch } from "../../utils/requests";
-import { ControlsPlotlyToolbar, ObsPlotlyToolbar, VarPlotlyToolbar } from "../toolbar/Toolbar";
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import _ from 'lodash';
+import { Button } from 'react-bootstrap';
+import Plot from 'react-plotly.js';
+import { PLOTLY_MODEBAR_BUTTONS } from '../../constants/constants';
+import { useDataset } from '../../context/DatasetContext';
+import { useFilteredData } from '../../context/FilterContext';
+import { useSettings } from '../../context/SettingsContext';
+import { LoadingSpinner } from '../../utils/LoadingIndicators';
+import { useDebouncedFetch } from '../../utils/requests';
+import { useSelectedMultiVar, useSelectedObs } from '../../utils/Resolver';
+import { PlotAlert } from '../full-page/PlotAlert';
+import { ControlsPlotlyToolbar, ObsPlotlyToolbar, VarPlotlyToolbar } from '../toolbar/Toolbar';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export function Heatmap(_ref) {
-  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     showObsBtn = false,
     showVarsBtn = false,
     showCtrlsBtn = false,
     setShowObs,
     setShowVars,
-    setShowControls
+    setShowControls,
+    plotType,
+    setPlotType
   } = _ref;
-  const ENDPOINT = "heatmap";
+  const ENDPOINT = 'heatmap';
   const dataset = useDataset();
   const settings = useSettings();
   const {
@@ -35,44 +39,26 @@ export function Heatmap(_ref) {
   const [data, setData] = useState([]);
   const [layout, setLayout] = useState({});
   const [hasSelections, setHasSelections] = useState(false);
-  const [params, setParams] = useState({
+  const selectedObs = useSelectedObs();
+  const selectedMultiVar = useSelectedMultiVar();
+  const params = useMemo(() => ({
     url: dataset.url,
-    obsCol: settings.selectedObs,
-    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _.difference(_.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];
-    }),
-    varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: selectedObs,
+    obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+    varKeys: selectedMultiVar.map(i => i.isSet ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
     obsIndices: isSliced ? [...(obsIndices || [])] : null,
     varNamesCol: dataset.varNamesCol
-  });
+  }), [dataset.url, dataset.varNamesCol, isSliced, obsIndices, selectedMultiVar, selectedObs]);
   useEffect(() => {
-    if (settings.selectedObs && settings.selectedMultiVar.length) {
+    if (selectedObs && selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
-    setParams(p => {
-      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
-      return _objectSpread(_objectSpread({}, p), {}, {
-        url: dataset.url,
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _.difference(_.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];
-        }),
-        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
-          name: i.name,
-          indices: i.vars.map(v => v.index)
-        } : i.index),
-        obsIndices: isSliced ? [...(obsIndices || [])] : null,
-        varNamesCol: dataset.varNamesCol
-      });
-    });
-  }, [settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [selectedMultiVar, selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
   const updateColorscale = useCallback(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -87,13 +73,16 @@ export function Heatmap(_ref) {
     isPending,
     serverError
   } = useDebouncedFetch(ENDPOINT, params, 500, {
-    enabled: !!params.obsCol && !!params.varKeys.length
+    isEnabled: params => !!params.obsCol && !!params.varKeys.length
   });
   useEffect(() => {
-    if (hasSelections && !isPending && !serverError) {
+    if (hasSelections && !!fetchedData && !isPending && !serverError) {
       setData(fetchedData.data);
       setLayout(fetchedData.layout);
       updateColorscale(colorscale.current);
+    } else {
+      setData([]);
+      setLayout({});
     }
   }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   useEffect(() => {
@@ -110,38 +99,50 @@ export function Heatmap(_ref) {
   const modeBarButtons = customModeBarButtons.length ? [customModeBarButtons, PLOTLY_MODEBAR_BUTTONS] : [PLOTLY_MODEBAR_BUTTONS];
   if (!serverError) {
     if (hasSelections) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "cherita-plot cherita-heatmap position-relative"
-      }, isPending && /*#__PURE__*/React.createElement(LoadingSpinner, null), /*#__PURE__*/React.createElement(Plot, {
-        data: data,
-        layout: layout,
-        useResizeHandler: true,
-        style: {
-          width: "100%",
-          height: "100%"
-        },
-        config: {
-          displaylogo: false,
-          modeBarButtons: modeBarButtons
-        }
-      }));
+      return /*#__PURE__*/_jsxs("div", {
+        className: "cherita-plot cherita-heatmap position-relative",
+        children: [isPending && /*#__PURE__*/_jsx(LoadingSpinner, {}), /*#__PURE__*/_jsx(Plot, {
+          data: data,
+          layout: layout,
+          useResizeHandler: true,
+          style: {
+            width: '100%',
+            height: '100%'
+          },
+          config: {
+            displaylogo: false,
+            modeBarButtons: modeBarButtons
+          }
+        })]
+      });
     }
-    return /*#__PURE__*/React.createElement("div", {
-      className: "cherita-heatmap"
-    }, /*#__PURE__*/React.createElement(Alert, {
-      variant: "light"
-    }, "Select", " ", showVarsBtn ? /*#__PURE__*/React.createElement(Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowVars
-    }, "features") : "features", " ", "and a", " ", showObsBtn ? /*#__PURE__*/React.createElement(Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowObs
-    }, "category") : "category"));
+    return /*#__PURE__*/_jsx(PlotAlert, {
+      variant: "info",
+      heading: "Set up your heatmap",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: /*#__PURE__*/_jsxs("p", {
+        className: "p-0 m-0",
+        children: ["Select one or more", ' ', showVarsBtn ? /*#__PURE__*/_jsx(Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowVars,
+          children: "features"
+        }) : 'features', ' ', "to display their expression, then choose a", ' ', showObsBtn ? /*#__PURE__*/_jsx(Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowObs,
+          children: "category"
+        }) : 'category', ' ', "to group observations in the heatmap."]
+      })
+    });
   } else {
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Alert, {
-      variant: "danger"
-    }, serverError.message));
+    return /*#__PURE__*/_jsx(PlotAlert, {
+      variant: "danger",
+      heading: "Error displaying the heatmap",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: serverError.message || 'An unexpected error occurred while generating the plot.'
+    });
   }
 }