@haniffalab/cherita-react 1.4.1 → 1.4.2

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

@@ -1,18 +1,18 @@
-import React, { useState } from "react";
-import { faChevronDown, faChevronUp, faCircleInfo, faDroplet, faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-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 { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
-import { SearchModal } from "../search-bar/SearchBar";
+import { useState } from 'react';
+import { faChevronDown, faChevronUp, faCircleInfo, faDroplet, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+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 { useSettings, useSettingsDispatch } from '../../context/SettingsContext';
+import { SearchModal } from '../search-bar/SearchBar';
 
 // @TODO: add button to score genes and plot
-
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const addVarToSet = (dispatch, set, v) => {
   dispatch({
-    type: "add.varSet.var",
+    type: 'add.varSet.var',
     varSet: set,
     var: v
   });
@@ -28,100 +28,119 @@ function SelectionSet(_ref) {
   } = _ref;
   const [openSet, setOpenSet] = useState(false);
   const [showModal, setShowModal] = useState(false);
-  const [searchText, setSearchText] = useState("");
+  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(SelectionItem, {
-      item: v,
-      showSetColorEncoding: false,
-      removeVar: () => removeSetVar(v)
-    }));
-  }) : /*#__PURE__*/React.createElement(ListGroup.Item, null, /*#__PURE__*/React.createElement("div", {
-    className: "text-muted"
-  }, "No features in this set"));
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "d-flex justify-content-between cursor-pointer",
-    onClick: () => {
-      setOpenSet(o => !o);
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "d-flex justify-content-between align-items-center w-100"
-  }, /*#__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(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",
-    variant: isActive ? "primary" : "outline-primary",
-    className: "m-0 p-0 px-1",
-    onClick: e => {
-      e.stopPropagation();
-      selectSet();
-    },
-    disabled: !set.vars.length,
-    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",
-    variant: "outline-secondary",
-    title: "Remove from list",
-    onClick: e => {
-      e.stopPropagation();
-      removeSet();
-    }
-  }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-    icon: faTrash
-  }))))), /*#__PURE__*/React.createElement(Collapse, {
-    in: openSet
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "mt-2"
-  }, /*#__PURE__*/React.createElement(ListGroup, {
-    variant: "flush",
-    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
-  }));
+    return /*#__PURE__*/_jsx(ListGroup.Item, {
+      children: /*#__PURE__*/_jsx(SelectionItem, {
+        item: v,
+        showSetColorEncoding: false,
+        removeVar: () => removeSetVar(v)
+      })
+    }, v.name);
+  }) : /*#__PURE__*/_jsx(ListGroup.Item, {
+    children: /*#__PURE__*/_jsx("div", {
+      className: "text-muted",
+      children: "No features in this set"
+    })
+  });
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx("div", {
+      className: "d-flex justify-content-between cursor-pointer",
+      onClick: () => {
+        setOpenSet(o => !o);
+      },
+      children: /*#__PURE__*/_jsxs("div", {
+        className: "d-flex justify-content-between align-items-center w-100",
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "ellipsis-text",
+          title: set.name,
+          children: set.name
+        }), /*#__PURE__*/_jsxs("div", {
+          className: "d-flex align-items-center gap-1",
+          children: [/*#__PURE__*/_jsx(OverlayTrigger, {
+            placement: "top",
+            overlay: /*#__PURE__*/_jsx(Tooltip, {
+              children: "This set represents the mean value of its features"
+            }),
+            children: /*#__PURE__*/_jsx(FontAwesomeIcon, {
+              icon: faCircleInfo
+            })
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "button",
+            variant: "outline-primary",
+            className: "m-0 p-0 px-1",
+            disabled: !set.vars.length,
+            title: "Open set",
+            children: /*#__PURE__*/_jsx(FontAwesomeIcon, {
+              icon: openSet ? faChevronUp : faChevronDown
+            })
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "button",
+            variant: "outline-primary",
+            className: "m-0 p-0 px-1",
+            onClick: e => {
+              e.stopPropagation();
+              setShowModal(true);
+            },
+            title: "Add to set",
+            children: /*#__PURE__*/_jsx(FontAwesomeIcon, {
+              icon: faPlus
+            })
+          }), /*#__PURE__*/_jsxs(Button, {
+            type: "button",
+            variant: isActive ? 'primary' : 'outline-primary',
+            className: "m-0 p-0 px-1",
+            onClick: e => {
+              e.stopPropagation();
+              selectSet();
+            },
+            disabled: !set.vars.length,
+            title: "Set as color encoding",
+            children: [/*#__PURE__*/_jsx(FontAwesomeIcon, {
+              icon: faDroplet
+            }), isMultiple && /*#__PURE__*/_jsx(FontAwesomeIcon, {
+              icon: faPlus,
+              size: "xs",
+              className: "ps-xs-1"
+            })]
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "button",
+            className: "m-0 p-0 px-1",
+            variant: "outline-secondary",
+            title: "Remove from list",
+            onClick: e => {
+              e.stopPropagation();
+              removeSet();
+            },
+            children: /*#__PURE__*/_jsx(FontAwesomeIcon, {
+              icon: faTrash
+            })
+          })]
+        })]
+      })
+    }), /*#__PURE__*/_jsx(Collapse, {
+      in: openSet,
+      children: /*#__PURE__*/_jsx("div", {
+        className: "mt-2",
+        children: /*#__PURE__*/_jsx(ListGroup, {
+          variant: "flush",
+          className: "cherita-list var-set-list",
+          children: varList
+        })
+      })
+    }), /*#__PURE__*/_jsx(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(_ref2) {
   let {
@@ -134,16 +153,16 @@ export function VarSet(_ref2) {
   const selectSet = () => {
     if (mode === SELECTION_MODES.SINGLE) {
       dispatch({
-        type: "select.var",
+        type: 'select.var',
         var: set
       });
       dispatch({
-        type: "set.colorEncoding",
-        value: "var"
+        type: 'set.colorEncoding',
+        value: 'var'
       });
     } else if (mode === SELECTION_MODES.MULTIPLE) {
       dispatch({
-        type: "select.multivar",
+        type: 'select.multivar',
         var: set
       });
     }
@@ -152,37 +171,37 @@ export function VarSet(_ref2) {
     if (mode === SELECTION_MODES.SINGLE) {
       if (active === set.name) {
         dispatch({
-          type: "reset.var"
+          type: 'reset.var'
         });
       }
     } else if (mode === SELECTION_MODES.MULTIPLE) {
       if (active.includes(set.name)) {
         dispatch({
-          type: "deselect.multivar",
+          type: 'deselect.multivar',
           var: set
         });
       }
     }
     dispatch({
-      type: "remove.var",
+      type: 'remove.var',
       var: set
     });
   };
   const removeSetVar = v => {
     dispatch({
-      type: "remove.varSet.var",
+      type: 'remove.varSet.var',
       varSet: set,
       var: v
     });
   };
   const toggleSet = () => {
     dispatch({
-      type: "toggle.multivar",
+      type: 'toggle.multivar',
       var: set
     });
   };
   if (set && mode === SELECTION_MODES.SINGLE) {
-    return /*#__PURE__*/React.createElement(SelectionSet, {
+    return /*#__PURE__*/_jsx(SelectionSet, {
       set: set,
       isActive: settings.colorEncoding === COLOR_ENCODINGS.VAR && active === set.name,
       selectSet: selectSet,
@@ -190,7 +209,7 @@ export function VarSet(_ref2) {
       removeSetVar: v => removeSetVar(v)
     });
   } else if (mode === SELECTION_MODES.MULTIPLE) {
-    return /*#__PURE__*/React.createElement(SelectionSet, {
+    return /*#__PURE__*/_jsx(SelectionSet, {
       set: set,
       isActive: _.includes(active, set.name),
       selectSet: toggleSet,

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

@@ -3,21 +3,24 @@ 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, { useEffect, useState } from "react";
-import { faCircleInfo } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import _ from "lodash";
-import { Alert, Button, OverlayTrigger, Tooltip } from "react-bootstrap";
-import Plot from "react-plotly.js";
-import { PLOTLY_MODEBAR_BUTTONS, VIOLIN_MODES } 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 { useEffect, useMemo, useState } from 'react';
+import { faCircleInfo } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import _ from 'lodash';
+import { Badge, Button } from 'react-bootstrap';
+import Plot from 'react-plotly.js';
+import { PLOTLY_MODEBAR_BUTTONS, VIOLIN_MODES } 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, useSelectedVar } from '../../utils/Resolver';
+import { StyledTooltip } from '../../utils/StyledTooltip';
+import { PlotAlert } from '../full-page/PlotAlert';
+import { ControlsPlotlyToolbar, ObsPlotlyToolbar, VarPlotlyToolbar } from '../toolbar/Toolbar';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export function Violin(_ref) {
-  var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     mode = VIOLIN_MODES.MULTIKEY,
     showObsBtn = false,
@@ -25,9 +28,11 @@ export function Violin(_ref) {
     showCtrlsBtn = false,
     setShowObs,
     setShowVars,
-    setShowControls
+    setShowControls,
+    plotType,
+    setPlotType
   } = _ref;
-  const ENDPOINT = "violin";
+  const ENDPOINT = 'violin';
   const dataset = useDataset();
   const settings = useSettings();
   const {
@@ -37,91 +42,63 @@ export function Violin(_ref) {
   const [data, setData] = useState([]);
   const [layout, setLayout] = useState({});
   const [hasSelections, setHasSelections] = useState(false);
-  const [params, setParams] = useState(_objectSpread({
+  const selectedMultiVar = useSelectedMultiVar();
+  const selectedVar = useSelectedVar();
+  const selectedObs = useSelectedObs();
+  const params = useMemo(() => _objectSpread({
     url: dataset.url,
     mode: mode,
     scale: settings.controls.scale.violinplot,
     varNamesCol: dataset.varNamesCol
   }, {
     [VIOLIN_MODES.MULTIKEY]: {
-      varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+      varKeys: selectedMultiVar.map(i => i.isSet ? {
         name: i.name,
         indices: i.vars.map(v => v.index)
       } : i.index),
       obsKeys: [] // @TODO: implement
     },
     [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 : _.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];
-      }),
+      varKey: selectedVar !== null && selectedVar !== void 0 && selectedVar.isSet ? {
+        name: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name,
+        indices: selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars.map(v => v.index)
+      } : selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index,
+      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),
       obsIndices: isSliced ? [...(obsIndices || [])] : null
     }
-  }[mode]));
+  }[mode]), [dataset.url, dataset.varNamesCol, isSliced, mode, obsIndices, selectedMultiVar, selectedObs, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.index, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.isSet, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.name, selectedVar === null || selectedVar === void 0 ? void 0 : selectedVar.vars, settings.controls.scale.violinplot]);
   // @TODO: set default scale
 
   useEffect(() => {
     if (mode === VIOLIN_MODES.MULTIKEY) {
-      if (settings.selectedMultiVar.length) {
+      if (selectedMultiVar.length) {
         setHasSelections(true);
       } else {
         setHasSelections(false);
       }
-      setParams(p => {
-        return _objectSpread(_objectSpread({}, p), {}, {
-          url: dataset.url,
-          mode: mode,
-          varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
-            name: i.name,
-            indices: i.vars.map(v => v.index)
-          } : i.index),
-          scale: settings.controls.scale.violinplot,
-          varNamesCol: dataset.varNamesCol
-        });
-      });
     } else if (mode === VIOLIN_MODES.GROUPBY) {
-      if (settings.selectedObs && settings.selectedVar) {
+      if (selectedObs && selectedVar) {
         setHasSelections(true);
       } else {
         setHasSelections(false);
       }
-      setParams(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$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$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];
-          }),
-          obsIndices: isSliced ? [...(obsIndices || [])] : null,
-          scale: settings.controls.scale.violinplot,
-          varNamesCol: dataset.varNamesCol
-        });
-      });
     }
-  }, [settings.controls.scale.violinplot, settings.selectedMultiVar, settings.selectedObs, settings.selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
+  }, [settings.controls.scale.violinplot, selectedMultiVar, selectedObs, selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
   const {
     fetchedData,
     isPending,
     serverError
   } = useDebouncedFetch(ENDPOINT, params, 500, {
-    enabled: mode === VIOLIN_MODES.MULTIKEY && (!!params.varKeys.length || !!params.obsKeys.length) || mode === VIOLIN_MODES.GROUPBY && !!params.varKey && !!params.obsCol
+    isEnabled: mode === VIOLIN_MODES.MULTIKEY && (params => !!params.varKeys.length || !!params.obsKeys.length) || mode === VIOLIN_MODES.GROUPBY && (params => !!params.varKey && !!params.obsCol)
   });
   useEffect(() => {
-    if (hasSelections && !isPending && !serverError) {
+    if (hasSelections && !!fetchedData && !isPending && !serverError) {
       setData(fetchedData.data);
       setLayout(fetchedData.layout);
+    } else {
+      setData([]);
+      setLayout({});
     }
   }, [fetchedData, hasSelections, isPending, serverError]);
   const customModeBarButtons = _.compact([showObsBtn && ObsPlotlyToolbar({
@@ -134,61 +111,87 @@ export function Violin(_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-violin"
-      }, isPending && /*#__PURE__*/React.createElement(LoadingSpinner, null), /*#__PURE__*/React.createElement("div", {
-        className: "d-flex flex-column h-100"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "flex-grow-1 position-relative",
-        style: {
-          minHeight: "0"
-        }
-      }, /*#__PURE__*/React.createElement(Plot, {
-        data: data,
-        layout: layout,
-        useResizeHandler: true,
-        style: {
-          width: "100%",
-          height: "100%"
-        },
-        config: {
-          displaylogo: false,
-          modeBarButtons: modeBarButtons
-        }
-      })), (fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.resampled) && /*#__PURE__*/React.createElement("div", {
-        className: "flex-shrink-0"
-      }, /*#__PURE__*/React.createElement(Alert, {
-        variant: "warning",
-        className: "mb-1"
-      }, /*#__PURE__*/React.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.createElement(OverlayTrigger, {
-        placement: "top",
-        overlay: /*#__PURE__*/React.createElement(Tooltip, null, "Resampled to 100K values following a Monte Carlo style approach to help ensure resampled data is a good representation of the original dataset's distribution.")
-      }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
-        icon: faCircleInfo
-      }))))));
+      return /*#__PURE__*/_jsxs("div", {
+        className: "cherita-plot cherita-violin",
+        children: [isPending && /*#__PURE__*/_jsx(LoadingSpinner, {}), /*#__PURE__*/_jsxs("div", {
+          className: "d-flex flex-column h-100",
+          children: [/*#__PURE__*/_jsx("div", {
+            className: "flex-grow-1 position-relative",
+            style: {
+              minHeight: '0'
+            },
+            children: /*#__PURE__*/_jsx(Plot, {
+              data: data,
+              layout: layout,
+              useResizeHandler: true,
+              style: {
+                width: '100%',
+                height: '100%'
+              },
+              config: {
+                displaylogo: false,
+                modeBarButtons: modeBarButtons
+              }
+            })
+          }), (fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.resampled) && /*#__PURE__*/_jsx("div", {
+            className: "resampled-tooltip-container",
+            children: /*#__PURE__*/_jsx(StyledTooltip, {
+              title: /*#__PURE__*/_jsxs(_Fragment, {
+                children: [/*#__PURE__*/_jsx("strong", {
+                  children: "Note:"
+                }), " This plot uses resampled data to improve performance, so values may differ slightly from the full dataset. The data were resampled to exactly 100,000 values using a Monte Carlo\u2013style approach to provide a representative view of the full distribution while reducing processing time."]
+              }),
+              placement: "bottom",
+              children: /*#__PURE__*/_jsxs(Badge, {
+                bg: "info",
+                children: [/*#__PURE__*/_jsx(FontAwesomeIcon, {
+                  className: "fs-6",
+                  icon: faCircleInfo
+                }), /*#__PURE__*/_jsx("span", {
+                  className: "d-none d-lg-inline ms-2 fs-6 text-uppercase",
+                  children: "Resampled"
+                })]
+              })
+            })
+          })]
+        })]
+      });
     }
-    return /*#__PURE__*/React.createElement("div", {
-      className: "cherita-violin"
-    }, mode === VIOLIN_MODES.MULTIKEY && /*#__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"), mode === VIOLIN_MODES.GROUPBY && /*#__PURE__*/React.createElement(Alert, {
-      variant: "light"
-    }, "Select", " ", showObsBtn ? /*#__PURE__*/React.createElement(Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowObs
-    }, "categories") : "categories", " ", "and a", " ", showVarsBtn ? /*#__PURE__*/React.createElement(Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowVars
-    }, "feature") : "feature"));
+    return /*#__PURE__*/_jsxs(PlotAlert, {
+      variant: "info",
+      heading: "Set up your violin plot",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: [mode === VIOLIN_MODES.MULTIKEY && /*#__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 distributions across all observations."]
+      }), mode === VIOLIN_MODES.GROUPBY && /*#__PURE__*/_jsxs("p", {
+        className: "p-0 m-0",
+        children: ["Select a", ' ', showObsBtn ? /*#__PURE__*/_jsx(Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowObs,
+          children: "category"
+        }) : 'category', ' ', "to group observations, and choose a", ' ', showVarsBtn ? /*#__PURE__*/_jsx(Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowVars,
+          children: "feature"
+        }) : 'feature', ' ', "to view its distribution within each group."]
+      })]
+    });
   } 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 violin plot",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: serverError.message || 'An unexpected error occurred while generating the plot.'
+    });
   }
 }