@haniffalab/cherita-react 1.3.0-dev.2025-06-06.f1eddad0 → 1.3.1

package/dist/esm/components/icons/ScatterplotIcon.1.js

@@ -0,0 +1,158 @@
+const _excluded = ["size", "colour"];
+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 { jsx as _jsx } from "react/jsx-runtime";
+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; }
+export default function ScatterplotIcon(_ref) {
+  let {
+      size = 40,
+      colour = '#000'
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
+  // Points with cluster assignments
+  const points = [
+  // Cluster 0
+  {
+    x: 15.2,
+    y: 35.9,
+    cluster: 0
+  }, {
+    x: 10.0,
+    y: 38.0,
+    cluster: 0
+  }, {
+    x: 12.3,
+    y: 40.7,
+    cluster: 0
+  }, {
+    x: 15.7,
+    y: 39.9,
+    cluster: 0
+  }, {
+    x: 8.1,
+    y: 42.2,
+    cluster: 0
+  }, {
+    x: 10.8,
+    y: 44.5,
+    cluster: 0
+  }, {
+    x: 14.3,
+    y: 44.6,
+    cluster: 0
+  }, {
+    x: 7.4,
+    y: 46.7,
+    cluster: 0
+  }, {
+    x: 11.1,
+    y: 48.8,
+    cluster: 0
+  }, {
+    x: 14.8,
+    y: 48.5,
+    cluster: 0
+  }, {
+    x: 12.6,
+    y: 52.1,
+    cluster: 0
+  },
+  // Cluster 1
+  {
+    x: 29.4,
+    y: 37.0,
+    cluster: 1
+  }, {
+    x: 26.1,
+    y: 40.2,
+    cluster: 1
+  }, {
+    x: 29.8,
+    y: 42.0,
+    cluster: 1
+  }, {
+    x: 33.0,
+    y: 39.5,
+    cluster: 1
+  }, {
+    x: 34.9,
+    y: 43.6,
+    cluster: 1
+  }, {
+    x: 31.5,
+    y: 46.2,
+    cluster: 1
+  }, {
+    x: 29.3,
+    y: 49.5,
+    cluster: 1
+  }, {
+    x: 26.7,
+    y: 45.2,
+    cluster: 1
+  },
+  // Cluster 2
+  {
+    x: 21.6,
+    y: 53.1,
+    cluster: 2
+  }, {
+    x: 25.3,
+    y: 53.9,
+    cluster: 2
+  }, {
+    x: 25.8,
+    y: 57.9,
+    cluster: 2
+  }, {
+    x: 22.1,
+    y: 57.4,
+    cluster: 2
+  }, {
+    x: 18.4,
+    y: 56.0,
+    cluster: 2
+  }, {
+    x: 18.6,
+    y: 59.8,
+    cluster: 2
+  }, {
+    x: 22.5,
+    y: 61.7,
+    cluster: 2
+  }];
+  const radius = 1.8;
+  const opacity = 1.0; // uniform expression
+
+  // Compute viewBox dynamically
+  const xs = points.map(p => p.x);
+  const ys = points.map(p => p.y);
+  const minX = Math.min(...xs) - radius;
+  const minY = Math.min(...ys) - radius;
+  const maxX = Math.max(...xs) + radius;
+  const maxY = Math.max(...ys) + radius;
+  return /*#__PURE__*/_jsx("svg", _objectSpread(_objectSpread({
+    width: size,
+    height: size,
+    viewBox: "".concat(minX, " ").concat(minY, " ").concat(maxX - minX, " ").concat(maxY - minY),
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), {}, {
+    children: points.map((_ref2, i) => {
+      let {
+        x,
+        y
+      } = _ref2;
+      return /*#__PURE__*/_jsx("circle", {
+        cx: x,
+        cy: y,
+        r: radius,
+        fill: colour,
+        opacity: opacity
+      }, i);
+    })
+  }));
+}

package/dist/esm/components/icons/ScatterplotIcon.js

@@ -0,0 +1,138 @@
+const _excluded = ["size", "colour"];
+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 { jsx as _jsx } from "react/jsx-runtime";
+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; }
+export default function ScatterplotIcon(_ref) {
+  let {
+      size = 40,
+      colour = '#000'
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
+  // Points with cluster assignments
+  const points = [
+  // Cluster 0
+  {
+    x: 15.2,
+    y: 35.9,
+    cluster: 0
+  }, {
+    x: 10.0,
+    y: 38.0,
+    cluster: 0
+  }, {
+    x: 12.3,
+    y: 40.7,
+    cluster: 0
+  }, {
+    x: 15.7,
+    y: 39.9,
+    cluster: 0
+  }, {
+    x: 8.1,
+    y: 42.2,
+    cluster: 0
+  }, {
+    x: 10.8,
+    y: 44.5,
+    cluster: 0
+  }, {
+    x: 14.3,
+    y: 44.6,
+    cluster: 0
+  }, {
+    x: 7.4,
+    y: 46.7,
+    cluster: 0
+  }, {
+    x: 11.1,
+    y: 48.8,
+    cluster: 0
+  },
+  // Cluster 1
+  {
+    x: 29.4,
+    y: 37.0,
+    cluster: 1
+  }, {
+    x: 26.1,
+    y: 40.2,
+    cluster: 1
+  }, {
+    x: 29.8,
+    y: 42.0,
+    cluster: 1
+  }, {
+    x: 33.0,
+    y: 39.5,
+    cluster: 1
+  }, {
+    x: 34.9,
+    y: 43.6,
+    cluster: 1
+  }, {
+    x: 31.5,
+    y: 46.2,
+    cluster: 1
+  },
+  // Cluster 2
+  {
+    x: 21.6,
+    y: 53.1,
+    cluster: 2
+  }, {
+    x: 25.3,
+    y: 53.9,
+    cluster: 2
+  }, {
+    x: 25.8,
+    y: 57.9,
+    cluster: 2
+  }, {
+    x: 22.1,
+    y: 57.4,
+    cluster: 2
+  }, {
+    x: 18.4,
+    y: 56.0,
+    cluster: 2
+  }, {
+    x: 22.5,
+    y: 61.7,
+    cluster: 2
+  }];
+  const radius = 1.8;
+  const opacity = 1.0; // uniform expression
+
+  // Compute viewBox dynamically
+  const xs = points.map(p => p.x);
+  const ys = points.map(p => p.y);
+  const minX = Math.min(...xs) - radius;
+  const minY = Math.min(...ys) - radius;
+  const maxX = Math.max(...xs) + radius;
+  const maxY = Math.max(...ys) + radius;
+  return /*#__PURE__*/_jsx("svg", _objectSpread(_objectSpread({
+    width: size,
+    height: size,
+    viewBox: "".concat(minX, " ").concat(minY, " ").concat(maxX - minX, " ").concat(maxY - minY),
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), {}, {
+    children: points.map((_ref2, i) => {
+      let {
+        x,
+        y
+      } = _ref2;
+      return /*#__PURE__*/_jsx("circle", {
+        cx: x,
+        cy: y,
+        r: radius,
+        fill: colour,
+        opacity: opacity
+      }, i);
+    })
+  }));
+}

package/dist/esm/components/icons/ViolinPlotIcon.js

@@ -0,0 +1,36 @@
+const _excluded = ["size", "colour"];
+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 { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+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; }
+export default function ViolinPlotIcon(_ref) {
+  let {
+      size = 40,
+      colour = '#000'
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return /*#__PURE__*/_jsx("svg", _objectSpread(_objectSpread({
+    viewBox: "0 0 37 40",
+    width: size,
+    height: size,
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), {}, {
+    children: /*#__PURE__*/_jsxs("g", {
+      fill: colour,
+      stroke: colour,
+      strokeWidth: "0.5",
+      transform: "translate(-12 -8)",
+      children: [/*#__PURE__*/_jsx("path", {
+        d: "M19.9971,24.5 A6.3078,6.3078 0 0 0 18.5732,20.8389 7.1479,7.1479 0 0 1 16.9971,16.5 V16.0029 H16.0029 V16.5 a7.1479,7.1479 0 0 1 -1.5761,4.3389 6.3078,6.3078 0 0 0 -1.4239,3.6611 12.4967,12.4967 0 0 1 -0.4853,3.38 13.5076,13.5076 0 0 0 -0.5147,3.62 6.3078,6.3078 0 0 0 1.4239,3.6611 7.1479,7.1479 0 0 1 1.5761,4.3389 19.2486,19.2486 0 0 0 0.5664,4.7246 13.6883,13.6883 0 0 1 0.4336,3.2754 v0.4971 h0.9942 V47.5 A13.6883,13.6883 0 0 1 17.4307,44.2246 19.2486,19.2486 0 0 0 17.9971,39.5 7.1479,7.1479 0 0 1 19.5732,35.1611 6.3078,6.3078 0 0 0 20.9971,31.5 13.5076,13.5076 0 0 0 20.4824,27.88 12.4967,12.4967 0 0 1 19.9971,24.5 Z"
+      }), /*#__PURE__*/_jsx("path", {
+        d: "M34.6436,12.6963 C32.8506,11.5537 30.9971,10.3711 30.9971,8.5 V8.0029 H30.0029 V8.5 c0,1.8711 -1.8535,3.0537 -3.6465,4.1963 -1.7246,1.1006 -3.3535,2.1387 -3.3535,3.8037 0,1.6152 1.2188,2.7031 2.3975,3.7549 1.2793,1.1426 2.6025,2.3242 2.6025,4.2451 a18.1508,18.1508 0 0 1 -0.542,4.5068 14.5,14.5 0 0 0 -0.458,3.4932 6.038,6.038 0 0 0 1.6,3.7979 5.179,5.179 0 0 1 1.4,3.2021 v0.4971 h0.9942 V39.5 a5.179,5.179 0 0 1 1.4,-3.2021 6.038,6.038 0 0 0 1.6,-3.7979 14.5,14.5 0 0 0 -0.458,-3.4932 18.1508,18.1508 0 0 1 -0.542,-4.5068 c0,-1.9209 1.3232,-3.1025 2.6025,-4.2451 1.1787,-1.0518 2.3975,-2.14 2.3975,-3.7549 0,-1.665 -1.6289,-2.7031 -3.3535,-3.8037 z"
+      }), /*#__PURE__*/_jsx("path", {
+        d: "M47.3975,35.7021 A5.179,5.179 0 0 1 45.9975,32.5 14.5,14.5 0 0 0 45.5395,29.0068 18.1508,18.1508 0 0 1 44.9975,24.5 V24.0029 H44.0033 V24.5 a18.1508,18.1508 0 0 1 -0.542,4.5068 14.5,14.5 0 0 0 -0.458,3.4932 5.179,5.179 0 0 1 -1.4,3.2021 6.038,6.038 0 0 0 -1.6,3.7979 c0,1.582 0.9717,2.667 1.9121,3.7158 1.0264,1.1455 2.0879,2.3311 2.0879,4.2842 v0.4971 h0.9942 V47.5 c0,-1.9531 1.0615,-3.1387 2.0879,-4.2842 0.94,-1.0488 1.9121,-2.1338 1.9121,-3.7158 a6.038,6.038 0 0 0 -1.6,-3.7979 z"
+      })]
+    })
+  }));
+}

package/dist/esm/components/matrixplot/Matrixplot.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 Matrixplot(_ref) {
-  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     showObsBtn = false,
     showVarsBtn = false,
     showCtrlsBtn = false,
     setShowObs,
     setShowVars,
-    setShowControls
+    setShowControls,
+    plotType,
+    setPlotType
   } = _ref;
-  const ENDPOINT = "matrixplot";
+  const ENDPOINT = 'matrixplot';
   const dataset = useDataset();
   const settings = useSettings();
   const {
@@ -35,46 +39,27 @@ export function Matrixplot(_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,
     standardScale: settings.controls.scale.matrixplot,
     varNamesCol: dataset.varNamesCol
-  });
+  }), [dataset.url, dataset.varNamesCol, isSliced, obsIndices, selectedMultiVar, selectedObs, settings.controls.scale.matrixplot]);
   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,
-        standardScale: settings.controls.scale.matrixplot,
-        varNamesCol: dataset.varNamesCol
-      });
-    });
-  }, [settings.controls.scale.matrixplot, settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [selectedMultiVar.length, selectedObs]);
   const updateColorscale = useCallback(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -89,13 +74,16 @@ export function Matrixplot(_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(() => {
@@ -112,38 +100,50 @@ export function Matrixplot(_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-matrixplot 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-matrixplot 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-matrixplot"
-    }, /*#__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 matrix plot",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: /*#__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, then choose one or more", ' ', showVarsBtn ? /*#__PURE__*/_jsx(Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowVars,
+          children: "features"
+        }) : 'features', ' ', "to display the matrix plot."]
+      })
+    });
   } 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 matrix plot",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: serverError.message || 'An unexpected error occurred while generating the plot.'
+    });
   }
 }

package/dist/esm/components/matrixplot/MatrixplotControls.js

@@ -1,8 +1,12 @@
-import React from "react";
-import { Form } from "react-bootstrap";
-import { ColorscaleSelect, ScaleSelect } from "../controls/Controls";
+import { Form } from 'react-bootstrap';
+import { ColorscaleSelect, ScaleSelect } from '../controls/Controls';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export function MatrixplotControls() {
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, null, /*#__PURE__*/React.createElement(ColorscaleSelect, null), /*#__PURE__*/React.createElement(ScaleSelect, {
-    plot: "matrixplot"
-  })));
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: /*#__PURE__*/_jsxs(Form, {
+      children: [/*#__PURE__*/_jsx(ColorscaleSelect, {}), /*#__PURE__*/_jsx(ScaleSelect, {
+        plot: "matrixplot"
+      })]
+    })
+  });
 }