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

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,51 +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 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
-        }
-      }), (fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.resampled) && /*#__PURE__*/React.createElement(Alert, {
-        variant: "warning"
-      }, /*#__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.'
+    });
   }
 }

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

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

package/dist/esm/constants/colorscales.js

@@ -1,22 +1,22 @@
 // From plotly https://github.com/plotly/plotly.js/blob/5bc25b490702e5ed61265207833dbd58e8ab27f1/src/components/colorscale/scales.js
 export const COLORSCALES = {
-  Greys: ["#000000", "#ffffff"],
-  YlGnBu: ["#081d58", "#253494", "#225ea8", "#1d91c0", "#41b6c4", "#7fcdbb", "#c7e9b4", "#edf8d9", "#ffffd9"],
-  Greens: ["#00441b", "#006d2c", "#238b45", "#41ab5d", "#74c476", "#a1d9a5", "#c7e9c0", "#e5f5e0", "#f7fcf5"],
-  YlOrRd: ["#800026", "#bd0026", "#e31a1c", "#fc4e2a", "#fd8d3c", "#feb24c", "#fed976", "#ffed9f", "#ffffcc"],
-  Bluered: ["#0000ff", "#ff0000"],
-  RdBu: ["#050aac", "#6a89f7", "#bebebe", "#dcaa84", "#e6915a", "#b20a1c"],
-  Reds: ["#dcdcdc", "#f5c39d", "#f5a069", "#b20a1c"],
-  Blues: ["#050aac", "#283cba", "#4664f5", "#5a78f5", "#6a89f7", "#dcdcdc"],
-  Picnic: ["#0000ff", "#3399ff", "#66ccff", "#99ccff", "#ccccff", "#ffffff", "#ffccff", "#ff99ff", "#ff66cc", "#ff6666", "#ff0000"],
-  Rainbow: ["#96005a", "#0000c8", "#0019ff", "#0098ff", "#2cff96", "#97ff00", "#ffe600", "#ff6f00", "#ff0000"],
-  Portland: ["#0c3383", "#0a88ba", "#f2d338", "#f28f38", "#d91e1e"],
-  Jet: ["#000083", "#003caa", "#05ffff", "#ffff00", "#fa0000", "#800000"],
-  Hot: ["#000000", "#e60000", "#ffd200", "#ffffff"],
-  Blackbody: ["#000000", "#e60000", "#e6d200", "#ffffff", "#a0c8ff"],
-  Earth: ["#000082", "#00b4b4", "#28d228", "#e6e632", "#784614", "#ffffff"],
-  Electric: ["#000000", "#1e0064", "#780064", "#a05a00", "#e6c800", "#fffadc"],
-  Viridis: ["#440154", "#48186a", "#472d7b", "#424086", "#3b528b", "#33638d", "#2c728e", "#26828e", "#21918c", "#1fa088", "#28ae80", "#3fbc73", "#5ec962", "#84d44b", "#addc30", "#d8e219", "#fde725"],
-  Cividis: ["#00204c", "#002a66", "#00346e", "#273f6c", "#3c4a6c", "#4c556b", "#5b5f6d", "#686a70", "#757575", "#838178", "#929c78", "#a19676", "#b0a572", "#c0af6d", "#d1ba65", "#e1c75c", "#f3db4f", "#ffe945"],
-  Accent: ["#7fc97f", "#beaed4", "#fdc086", "#ffff99", "#386cb0", "#f0027f", "#bf5b17", "#666666"]
+  Greys: ['#000000', '#ffffff'],
+  YlGnBu: ['#081d58', '#253494', '#225ea8', '#1d91c0', '#41b6c4', '#7fcdbb', '#c7e9b4', '#edf8d9', '#ffffd9'],
+  Greens: ['#00441b', '#006d2c', '#238b45', '#41ab5d', '#74c476', '#a1d9a5', '#c7e9c0', '#e5f5e0', '#f7fcf5'],
+  YlOrRd: ['#800026', '#bd0026', '#e31a1c', '#fc4e2a', '#fd8d3c', '#feb24c', '#fed976', '#ffed9f', '#ffffcc'],
+  Bluered: ['#0000ff', '#ff0000'],
+  RdBu: ['#050aac', '#6a89f7', '#bebebe', '#dcaa84', '#e6915a', '#b20a1c'],
+  Reds: ['#dcdcdc', '#f5c39d', '#f5a069', '#b20a1c'],
+  Blues: ['#050aac', '#283cba', '#4664f5', '#5a78f5', '#6a89f7', '#dcdcdc'],
+  Picnic: ['#0000ff', '#3399ff', '#66ccff', '#99ccff', '#ccccff', '#ffffff', '#ffccff', '#ff99ff', '#ff66cc', '#ff6666', '#ff0000'],
+  Rainbow: ['#96005a', '#0000c8', '#0019ff', '#0098ff', '#2cff96', '#97ff00', '#ffe600', '#ff6f00', '#ff0000'],
+  Portland: ['#0c3383', '#0a88ba', '#f2d338', '#f28f38', '#d91e1e'],
+  Jet: ['#000083', '#003caa', '#05ffff', '#ffff00', '#fa0000', '#800000'],
+  Hot: ['#000000', '#e60000', '#ffd200', '#ffffff'],
+  Blackbody: ['#000000', '#e60000', '#e6d200', '#ffffff', '#a0c8ff'],
+  Earth: ['#000082', '#00b4b4', '#28d228', '#e6e632', '#784614', '#ffffff'],
+  Electric: ['#000000', '#1e0064', '#780064', '#a05a00', '#e6c800', '#fffadc'],
+  Viridis: ['#440154', '#48186a', '#472d7b', '#424086', '#3b528b', '#33638d', '#2c728e', '#26828e', '#21918c', '#1fa088', '#28ae80', '#3fbc73', '#5ec962', '#84d44b', '#addc30', '#d8e219', '#fde725'],
+  Cividis: ['#00204c', '#002a66', '#00346e', '#273f6c', '#3c4a6c', '#4c556b', '#5b5f6d', '#686a70', '#757575', '#838178', '#929c78', '#a19676', '#b0a572', '#c0af6d', '#d1ba65', '#e1c75c', '#f3db4f', '#ffe945'],
+  Accent: ['#7fc97f', '#beaed4', '#fdc086', '#ffff99', '#386cb0', '#f0027f', '#bf5b17', '#666666']
 };

package/dist/esm/constants/constants.js

@@ -1,100 +1,103 @@
-export const LOCAL_STORAGE_KEY = "CHERITA";
+export const LOCAL_STORAGE_KEY = 'CHERITA';
 export const PLOT_TYPES = {
-  SCATTERPLOT: "scatterplot",
-  DOTPLOT: "dotplot",
-  HEATMAP: "heatmap",
-  MATRIXPLOT: "matrixplot",
-  VIOLINPLOT: "violinplot"
+  SCATTERPLOT: 'scatterplot',
+  DOTPLOT: 'dotplot',
+  HEATMAP: 'heatmap',
+  MATRIXPLOT: 'matrixplot',
+  VIOLINPLOT: 'violinplot'
 };
 export const COLOR_ENCODINGS = {
-  VAR: "var",
-  OBS: "obs"
+  VAR: 'var',
+  OBS: 'obs'
 };
 export const OBS_TYPES = {
-  CATEGORICAL: "categorical",
-  DISCRETE: "discrete",
-  CONTINUOUS: "continuous",
-  BOOLEAN: "boolean"
+  CATEGORICAL: 'categorical',
+  DISCRETE: 'discrete',
+  CONTINUOUS: 'continuous',
+  BOOLEAN: 'boolean'
 };
 export const VAR_SORT = {
   NONE: null,
-  NAME: "name",
-  MATRIX: "matrix"
+  NAME: 'name',
+  MATRIX: 'matrix'
 };
 export const VAR_SORT_ORDER = {
-  ASC: "asc",
-  DESC: "desc"
+  ASC: 'asc',
+  DESC: 'desc'
 };
 export const SELECTED_POLYGON_FILLCOLOR = [107, 170, 209, 255 / 2];
 export const UNSELECTED_POLYGON_FILLCOLOR = [167, 191, 211, 255 / 3];
 export const SELECTION_MODES = {
-  SINGLE: "single",
-  MULTIPLE: "multiple"
+  SINGLE: 'single',
+  MULTIPLE: 'multiple'
 };
 export const VIOLIN_MODES = {
-  MULTIKEY: "multikey",
-  GROUPBY: "groupby"
+  MULTIKEY: 'multikey',
+  GROUPBY: 'groupby'
 };
 export const MATRIXPLOT_SCALES = {
   NONE: {
     value: null,
-    name: "None"
+    name: 'None'
   },
   GROUP: {
-    value: "group",
-    name: "Group"
+    value: 'group',
+    name: 'Group'
   },
   VAR: {
-    value: "var",
-    name: "Var"
+    value: 'var',
+    name: 'Var'
   }
 };
 export const DOTPLOT_SCALES = {
   NONE: {
     value: null,
-    name: "None"
+    name: 'None'
   },
   GROUP: {
-    value: "group",
-    name: "Group"
+    value: 'group',
+    name: 'Group'
   },
   VAR: {
-    value: "var",
-    name: "Var"
+    value: 'var',
+    name: 'Var'
   }
 };
 export const VIOLINPLOT_SCALES = {
   WIDTH: {
-    value: "width",
-    name: "Width"
+    value: 'width',
+    name: 'Width'
   },
   COUNT: {
-    value: "count",
-    name: "Count"
+    value: 'count',
+    name: 'Count'
   }
 };
 export const PSEUDOSPATIAL_PLOT_TYPES = {
-  GENE: "gene",
-  CATEGORICAL: "categorical",
-  CONTINUOUS: "continuous",
-  MASKS: "masks"
+  GENE: 'gene',
+  CATEGORICAL: 'categorical',
+  CONTINUOUS: 'continuous',
+  MASKS: 'masks'
 };
 export const PSEUDOSPATIAL_CATEGORICAL_MODES = {
   ACROSS: {
-    value: "across",
-    name: "% across sections"
+    value: 'across',
+    name: '% across sections'
   },
   WITHIN: {
-    value: "within",
-    name: "% within section"
+    value: 'within',
+    name: '% within section'
   }
 };
 
 // `default` cols to be shown out of accordion, at top of obslist
 // default values from cellxgene schema
-export const DEFAULT_OBS_GROUP = ["assay", "cell_type", "development_stage", "disease", "donor_id", "organism", "self_reported_ethnicity", "sex", "suspension_type", "tissue", "tissue_type"];
-export const PLOTLY_MODEBAR_BUTTONS = ["toImage", "zoom2d", "pan2d", "zoomIn2d", "zoomOut2d", "autoScale2d", "resetScale2d"];
+export const DEFAULT_OBS_GROUP = ['assay', 'cell_type', 'development_stage', 'disease', 'donor_id', 'organism', 'self_reported_ethnicity', 'sex', 'suspension_type', 'tissue', 'tissue_type'];
+export const PLOTLY_MODEBAR_BUTTONS = ['toImage', 'zoom2d', 'pan2d', 'zoomIn2d', 'zoomOut2d', 'autoScale2d', 'resetScale2d'];
 export const BREAKPOINTS = {
-  LG: "(max-width: 991.98px)",
-  XL: "(max-width: 1199.98px)"
-};
+  LG: '(max-width: 991.98px)',
+  XL: '(max-width: 1199.98px)'
+};
+
+// In order of priority
+export const DEFAULT_OBSM_KEYS = ['x_umap', 'x_tsne', 'x_scvi', 'x_pca'];

package/dist/esm/context/DatasetContext.js

@@ -6,14 +6,15 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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, { createContext, useContext } from "react";
-import { createSyncStoragePersister } from "@tanstack/query-sync-storage-persister";
-import { QueryClient, QueryCache } from "@tanstack/react-query";
-import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
-import _ from "lodash";
-import { FilterProvider } from "./FilterContext";
-import { SettingsProvider } from "./SettingsContext";
-import { ZarrDataProvider } from "./ZarrDataContext";
+import { createContext, useContext } from 'react';
+import { createSyncStoragePersister } from '@tanstack/query-sync-storage-persister';
+import { QueryClient, QueryCache } from '@tanstack/react-query';
+import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
+import _ from 'lodash';
+import { FilterProvider } from './FilterContext';
+import { SettingsProvider } from './SettingsContext';
+import { ZarrDataProvider } from './ZarrDataContext';
+import { jsx as _jsx } from "react/jsx-runtime";
 export const DatasetContext = /*#__PURE__*/createContext(null);
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -33,7 +34,7 @@ const queryClient = new QueryClient({
   })
 });
 // Type of queries to store responses
-const persistKeys = ["obs/cols", "var/names", "obsm/keys", "obs/bins", "obs/distribution"];
+const persistKeys = ['obs/cols', 'var/names', 'obsm/keys', 'obs/bins', 'obs/distribution'];
 const persistOptions = {
   persister: createSyncStoragePersister({
     storage: window.localStorage
@@ -44,13 +45,14 @@ const persistOptions = {
         queryKey,
         state
       } = _ref;
-      if (state.status === "success") {
+      if (state.status === 'success') {
         return persistKeys.includes(queryKey === null || queryKey === void 0 ? void 0 : queryKey[0]);
       }
       return false;
     }
-  }
-  // @TODO: add maxAge and buster (app and api version numbers as busters)
+  },
+  buster: "1.3.1" || '0.0.0'
+  // @TODO: add maxAge and api version numbers as buster
 };
 const initialDataset = {
   url: null,
@@ -60,7 +62,8 @@ const initialDataset = {
   imageUrl: null,
   defaultSettings: {},
   canOverrideSettings: true,
-  useUnsColors: false
+  useUnsColors: false,
+  isPseudospatial: false
 };
 export function DatasetProvider(_ref2) {
   let {
@@ -71,16 +74,23 @@ export function DatasetProvider(_ref2) {
   const dataset = _.assign(initialDataset, _objectSpread({
     url: dataset_url
   }, dataset_params));
-  return /*#__PURE__*/React.createElement(DatasetContext.Provider, {
-    value: dataset
-  }, /*#__PURE__*/React.createElement(SettingsProvider, {
-    dataset_url: dataset.url,
-    defaultSettings: dataset.defaultSettings,
-    canOverrideSettings: dataset.canOverrideSettings
-  }, /*#__PURE__*/React.createElement(PersistQueryClientProvider, {
-    client: queryClient,
-    persistOptions: persistOptions
-  }, /*#__PURE__*/React.createElement(FilterProvider, null, /*#__PURE__*/React.createElement(ZarrDataProvider, null, children)))));
+  return /*#__PURE__*/_jsx(DatasetContext.Provider, {
+    value: dataset,
+    children: /*#__PURE__*/_jsx(PersistQueryClientProvider, {
+      client: queryClient,
+      persistOptions: persistOptions,
+      children: /*#__PURE__*/_jsx(SettingsProvider, {
+        dataset_url: dataset.url,
+        defaultSettings: dataset.defaultSettings,
+        canOverrideSettings: dataset.canOverrideSettings,
+        children: /*#__PURE__*/_jsx(FilterProvider, {
+          children: /*#__PURE__*/_jsx(ZarrDataProvider, {
+            children: children
+          })
+        })
+      })
+    })
+  });
 }
 export function useDataset() {
   return useContext(DatasetContext);