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

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

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

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

@@ -14,9 +14,9 @@ var _reactBootstrap = require("react-bootstrap");
 var _Button = _interopRequireDefault(require("react-bootstrap/Button"));
 var _ButtonGroup = _interopRequireDefault(require("react-bootstrap/ButtonGroup"));
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
+var _DatasetContext = require("../../context/DatasetContext");
 var _offcanvas = require("../offcanvas");
 var _ScatterplotControls = require("./ScatterplotControls");
-var _constants = require("../../constants/constants");
 var _SettingsContext = require("../../context/SettingsContext");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -40,8 +40,8 @@ function SpatialControls(_ref) {
   const [showControls, setShowControls] = (0, _react.useState)(false);
   const handleCloseControls = () => setShowControls(false);
   const handleShowControls = () => setShowControls(true);
-  const LgBreakpoint = (0, _useMediaQuery.default)(_constants.BREAKPOINTS.LG);
-  const XlBreakpoint = (0, _useMediaQuery.default)(_constants.BREAKPOINTS.XL);
+  const LgBreakpoint = (0, _useMediaQuery.default)("(max-width: 991.98px)");
+  const XlBreakpoint = (0, _useMediaQuery.default)("(max-width: 1199.98px)");
   const showObsBtn = isFullscreen ? LgBreakpoint : true;
   const showVarsBtn = isFullscreen ? XlBreakpoint : true;
   const onSelect = (eventKey, event) => {

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

@@ -16,7 +16,6 @@ var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
-var _Toolbar = require("../toolbar/Toolbar");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -27,13 +26,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 function Violin(_ref) {
   var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
-    mode = _constants.VIOLIN_MODES.MULTIKEY,
-    showObsBtn = false,
-    showVarsBtn = false,
-    showCtrlsBtn = false,
-    setShowObs,
-    setShowVars,
-    setShowControls
+    mode = _constants.VIOLIN_MODES.MULTIKEY
   } = _ref;
   const ENDPOINT = "violin";
   const dataset = (0, _DatasetContext.useDataset)();
@@ -132,29 +125,17 @@ function Violin(_ref) {
       setLayout(fetchedData.layout);
     }
   }, [fetchedData, hasSelections, isPending, serverError]);
-  const customModeBarButtons = _lodash.default.compact([showObsBtn && (0, _Toolbar.ObsPlotlyToolbar)({
-    onClick: setShowObs
-  }), showVarsBtn && (0, _Toolbar.VarPlotlyToolbar)({
-    onClick: setShowVars
-  }), showCtrlsBtn && (0, _Toolbar.ControlsPlotlyToolbar)({
-    onClick: setShowControls
-  })]);
-  const modeBarButtons = customModeBarButtons.length ? [customModeBarButtons, _constants.PLOTLY_MODEBAR_BUTTONS] : [_constants.PLOTLY_MODEBAR_BUTTONS];
   if (!serverError) {
     if (hasSelections) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: "cherita-plot cherita-violin position-relative"
+        className: "cherita-violin position-relative"
       }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingIndicators.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
         data: data,
         layout: layout,
         useResizeHandler: true,
         style: {
-          width: "100%",
-          height: "100%"
-        },
-        config: {
-          displaylogo: false,
-          modeBarButtons: modeBarButtons
+          maxWidth: "100%",
+          maxHeight: "100%"
         }
       }), (fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.resampled) && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
         variant: "warning"
@@ -169,21 +150,9 @@ function Violin(_ref) {
       className: "cherita-violin"
     }, mode === _constants.VIOLIN_MODES.MULTIKEY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "light"
-    }, "Select", " ", showVarsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowVars
-    }, "features") : "features"), mode === _constants.VIOLIN_MODES.GROUPBY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+    }, "Select features"), mode === _constants.VIOLIN_MODES.GROUPBY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "light"
-    }, "Select", " ", showObsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowObs
-    }, "categories") : "categories", " ", "and a", " ", showVarsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowVars
-    }, "feature") : "feature"));
+    }, "Select categories and a feature"));
   } else {
     return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
       variant: "danger"

package/dist/cjs/constants/constants.js

@@ -3,15 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VIOLIN_MODES = exports.VIOLINPLOT_SCALES = exports.VAR_SORT_ORDER = exports.VAR_SORT = exports.UNSELECTED_POLYGON_FILLCOLOR = exports.SELECTION_MODES = exports.SELECTED_POLYGON_FILLCOLOR = exports.PSEUDOSPATIAL_PLOT_TYPES = exports.PSEUDOSPATIAL_CATEGORICAL_MODES = exports.PLOT_TYPES = exports.PLOTLY_MODEBAR_BUTTONS = exports.OBS_TYPES = exports.MATRIXPLOT_SCALES = exports.LOCAL_STORAGE_KEY = exports.DOTPLOT_SCALES = exports.DEFAULT_OBS_GROUP = exports.COLOR_ENCODINGS = exports.BREAKPOINTS = void 0;
+exports.VIOLIN_MODES = exports.VIOLINPLOT_SCALES = exports.VAR_SORT_ORDER = exports.VAR_SORT = exports.UNSELECTED_POLYGON_FILLCOLOR = exports.SELECTION_MODES = exports.SELECTED_POLYGON_FILLCOLOR = exports.PSEUDOSPATIAL_PLOT_TYPES = exports.PSEUDOSPATIAL_CATEGORICAL_MODES = exports.OBS_TYPES = exports.MATRIXPLOT_SCALES = exports.LOCAL_STORAGE_KEY = exports.DOTPLOT_SCALES = exports.DEFAULT_OBS_GROUP = exports.COLOR_ENCODINGS = void 0;
 const LOCAL_STORAGE_KEY = exports.LOCAL_STORAGE_KEY = "CHERITA";
-const PLOT_TYPES = exports.PLOT_TYPES = {
-  SCATTERPLOT: "scatterplot",
-  DOTPLOT: "dotplot",
-  HEATMAP: "heatmap",
-  MATRIXPLOT: "matrixplot",
-  VIOLINPLOT: "violinplot"
-};
 const COLOR_ENCODINGS = exports.COLOR_ENCODINGS = {
   VAR: "var",
   OBS: "obs"
@@ -98,9 +91,4 @@ const PSEUDOSPATIAL_CATEGORICAL_MODES = exports.PSEUDOSPATIAL_CATEGORICAL_MODES
 
 // `default` cols to be shown out of accordion, at top of obslist
 // default values from cellxgene schema
-const DEFAULT_OBS_GROUP = exports.DEFAULT_OBS_GROUP = ["assay", "cell_type", "development_stage", "disease", "donor_id", "organism", "self_reported_ethnicity", "sex", "suspension_type", "tissue", "tissue_type"];
-const PLOTLY_MODEBAR_BUTTONS = exports.PLOTLY_MODEBAR_BUTTONS = ["toImage", "zoom2d", "pan2d", "zoomIn2d", "zoomOut2d", "autoScale2d", "resetScale2d"];
-const BREAKPOINTS = exports.BREAKPOINTS = {
-  LG: "(max-width: 991.98px)",
-  XL: "(max-width: 1199.98px)"
-};
+const DEFAULT_OBS_GROUP = exports.DEFAULT_OBS_GROUP = ["assay", "cell_type", "development_stage", "disease", "donor_id", "organism", "self_reported_ethnicity", "sex", "suspension_type", "tissue", "tissue_type"];

package/dist/cjs/index.js

@@ -39,6 +39,24 @@ Object.defineProperty(exports, "FullPage", {
     return _FullPage.FullPage;
   }
 });
+Object.defineProperty(exports, "FullPagePlots", {
+  enumerable: true,
+  get: function () {
+    return _FullPage.FullPagePlots;
+  }
+});
+Object.defineProperty(exports, "FullPagePseudospatial", {
+  enumerable: true,
+  get: function () {
+    return _FullPagePseudospatial.FullPagePseudospatial;
+  }
+});
+Object.defineProperty(exports, "FullPageScatterplot", {
+  enumerable: true,
+  get: function () {
+    return _FullPage.FullPageScatterplot;
+  }
+});
 Object.defineProperty(exports, "Heatmap", {
   enumerable: true,
   get: function () {
@@ -99,12 +117,6 @@ Object.defineProperty(exports, "OffcanvasVars", {
     return _offcanvas.OffcanvasVars;
   }
 });
-Object.defineProperty(exports, "PLOT_TYPES", {
-  enumerable: true,
-  get: function () {
-    return _constants.PLOT_TYPES;
-  }
-});
 Object.defineProperty(exports, "Pseudospatial", {
   enumerable: true,
   get: function () {
@@ -135,12 +147,6 @@ Object.defineProperty(exports, "SearchBar", {
     return _SearchBar.SearchBar;
   }
 });
-Object.defineProperty(exports, "Toolbar", {
-  enumerable: true,
-  get: function () {
-    return _Toolbar.Toolbar;
-  }
-});
 Object.defineProperty(exports, "VIOLIN_MODES", {
   enumerable: true,
   get: function () {
@@ -167,22 +173,22 @@ Object.defineProperty(exports, "ViolinControls", {
 });
 var _Dotplot = require("./components/dotplot/Dotplot");
 var _DotplotControls = require("./components/dotplot/DotplotControls");
-var _FullPage = require("./components/full-page/FullPage");
 var _Heatmap = require("./components/heatmap/Heatmap");
 var _HeatmapControls = require("./components/heatmap/HeatmapControls");
 var _Matrixplot = require("./components/matrixplot/Matrixplot");
 var _MatrixplotControls = require("./components/matrixplot/MatrixplotControls");
 var _ObsList = require("./components/obs-list/ObsList");
 var _ObsmList = require("./components/obsm-list/ObsmList");
-var _offcanvas = require("./components/offcanvas");
 var _Pseudospatial = require("./components/pseudospatial/Pseudospatial");
 var _Scatterplot = require("./components/scatterplot/Scatterplot");
 var _ScatterplotControls = require("./components/scatterplot/ScatterplotControls");
 var _SearchBar = require("./components/search-bar/SearchBar");
-var _Toolbar = require("./components/toolbar/Toolbar");
 var _VarList = require("./components/var-list/VarList");
 var _Violin = require("./components/violin/Violin");
 var _ViolinControls = require("./components/violin/ViolinControls");
+var _FullPage = require("./components/full-page/FullPage");
+var _FullPagePseudospatial = require("./components/full-page/FullPagePseudospatial");
+var _offcanvas = require("./components/offcanvas");
 var _colorscales = require("./constants/colorscales");
 var _constants = require("./constants/constants");
 var _DatasetContext = require("./context/DatasetContext");

package/dist/css/cherita.css

@@ -7216,7 +7216,7 @@ textarea.form-control-lg {
   display: inline-block !important;
 }
 
-.d-block, .cherita-app .cherita-navbar, .cherita-app-container .cherita-app-canvas .cherita-navbar {
+.d-block, .cherita-app .cherita-navbar {
   display: block !important;
 }
 
@@ -7778,7 +7778,7 @@ textarea.form-control-lg {
   order: 6 !important;
 }
 
-.m-0, .cherita-app-container .cherita-app-canvas .cherita-navbar {
+.m-0 {
   margin: 0 !important;
 }
 
@@ -7811,7 +7811,7 @@ textarea.form-control-lg {
   margin-left: 0 !important;
 }
 
-.mx-1, .js-plotly-plot .plotly .modebar .modebar-group {
+.mx-1 {
   margin-right: 0.25rem !important;
   margin-left: 0.25rem !important;
 }
@@ -7988,11 +7988,11 @@ textarea.form-control-lg {
   margin-left: auto !important;
 }
 
-.p-0, .cherita-app-container {
+.p-0 {
   padding: 0 !important;
 }
 
-.p-1, .cherita-app-container .cherita-app-canvas {
+.p-1 {
   padding: 0.25rem !important;
 }
 
@@ -8666,7 +8666,7 @@ textarea.form-control-lg {
   --bs-link-underline-opacity: 1;
 }
 
-.bg-primary, .js-plotly-plot .plotly .modebar .modebar-group {
+.bg-primary {
   --bs-bg-opacity: 1;
   background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;
 }
@@ -11927,7 +11927,6 @@ textarea.form-control-lg {
 
 .cherita-app {
   position: relative;
-  width: 100%;
 }
 
 .cherita-app .cherita-navbar {
@@ -11962,18 +11961,6 @@ textarea.form-control-lg {
 .cherita-app-sidebar .card-body {
   overflow-y: hidden;
 }
-.cherita-app-sidebar .sidebar-plotselector {
-  padding: 6px;
-  border-bottom: 1px solid #dee2e6;
-}
-.cherita-app-sidebar .sidebar-plotselector .plotselector-icon {
-  padding-bottom: 2px;
-  cursor: pointer;
-}
-.cherita-app-sidebar .sidebar-plotselector .plotselector-icon .active {
-  opacity: 1;
-  border-bottom: 2px solid #007bff;
-}
 .cherita-app-sidebar .sidebar-pseudospatial {
   padding: 10px;
   border-bottom: 1px solid #dee2e6;
@@ -12024,77 +12011,36 @@ textarea.form-control-lg {
   border-left: 1px solid #dee2e6;
 }
 
-.cherita-app-canvas .cherita-plot {
-  height: 100%;
-  min-height: 400px;
-}
-
-.cherita-app-container {
-  display: flex;
-  flex-wrap: nowrap;
-  width: 100%;
-  height: 100%;
-}
-.cherita-app-container .cherita-app-obs {
-  flex: 0 0 auto;
-  min-width: 350px;
-  max-width: 20%;
-  overflow-y: auto;
-}
-.cherita-app-container .cherita-app-canvas {
-  flex: 1 1 auto;
-  min-width: 400px;
-  position: relative;
-  max-height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-.cherita-app-container .cherita-app-canvas .cherita-navbar {
-  position: relative;
-}
-.cherita-app-container .cherita-app-sidebar {
-  flex: 0 0 auto;
-  min-width: 350px;
-  max-width: 20%;
-  position: relative;
-}
-@media (max-width: 1400px) {
-  .cherita-app-container .cherita-app-obs,
-  .cherita-app-container .cherita-app-sidebar {
-    max-width: 25%;
-  }
-}
-
 .ps-xs-1 {
   padding-left: 0.15rem !important;
 }
 
-.js-plotly-plot .plotly .modebar .modebar-group {
+.js-plotly-plot .plotly .modebar {
   border-radius: 5px;
-  padding: 4px !important;
+  background-color: rgba(0, 0, 0, 0.6);
+  padding: 0 4px !important;
+}
+.js-plotly-plot .plotly .modebar .modebar-group {
+  margin: 0 !important;
+  padding: 0 !important;
+  background-color: transparent !important;
 }
 .js-plotly-plot .plotly .modebar .modebar-group .modebar-btn {
-  display: inline-flex;
-  justify-content: center;
+  fill: white !important; /* Ensures white icons */
+  color: white !important; /* Ensures text/icons are visible */
   position: relative;
-  font-size: 1.25rem;
-  padding: 0.25rem;
+  font-size: 16px;
+  padding: 4px;
   height: auto;
   cursor: pointer;
   line-height: normal;
 }
 .js-plotly-plot .plotly .modebar .modebar-group .modebar-btn svg {
   position: relative;
-  top: 1px;
-}
-.js-plotly-plot .plotly .modebar .modebar-group .modebar-btn svg path {
-  fill: white !important;
-  color: white !important;
-}
-
-.js-plotly-plot .plotly .modebar--hover > :not(.watermark) {
-  opacity: 0.5;
-  transition: opacity 0.3s;
+  top: auto;
+  bottom: auto;
+  left: auto;
+  right: auto;
 }
 
 .cherita-spatial-controls {
@@ -12172,6 +12118,7 @@ textarea.form-control-lg {
 
 /* End scrollbar styling */
 .cherita-container-plot {
+  margin-top: 76px;
   padding: 20px;
   position: relative;
   min-height: 400px;