@haniffalab/cherita-react 1.2.0 → 1.3.0-dev.2025-05-28.9afc380f

package/dist/cjs/components/full-page/FullPagePseudospatial.js

@@ -19,14 +19,18 @@ var _Scatterplot = require("../scatterplot/Scatterplot");
 var _ScatterplotControls = require("../scatterplot/ScatterplotControls");
 var _SearchBar = require("../search-bar/SearchBar");
 var _VarList = require("../var-list/VarList");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const _excluded = ["children", "varMode", "searchDiseases"];
+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 _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+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; }
 function FullPage(_ref) {
   let {
-    children,
-    varMode = _constants.SELECTION_MODES.SINGLE,
-    ...props
-  } = _ref;
+      children,
+      varMode = _constants.SELECTION_MODES.SINGLE,
+      searchDiseases = false
+    } = _ref,
+    props = _objectWithoutProperties(_ref, _excluded);
   const appRef = (0, _react.useRef)();
   const [appDimensions, setAppDimensions] = (0, _react.useState)({
     width: 0,
@@ -72,34 +76,14 @@ function FullPage(_ref) {
     style: {
       height: appDimensions.height
     }
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar, {
-    expand: "sm",
-    bg: "primary",
-    className: "cherita-navbar"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "container-fluid"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
-    "aria-controls": "navbarScroll"
-  }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Collapse, {
-    id: "navbarScroll"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav, {
-    className: "me-auto my-0",
-    navbarScroll: true
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Item, {
-    className: "d-block d-lg-none"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-    onClick: () => setShowObs(true)
-  }, "Observations")), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Item, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-    onClick: () => setShowVars(true)
-  }, "Features"))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav, {
-    className: "d-flex"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Item, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-    onClick: () => setShowControls(true)
-  }, "Controls")))))), /*#__PURE__*/_react.default.createElement("div", {
     className: "cherita-app-obs modern-scrollbars border-end h-100"
   }, /*#__PURE__*/_react.default.createElement(_ObsList.ObsColsList, props)), /*#__PURE__*/_react.default.createElement("div", {
     className: "cherita-app-canvas flex-grow-1"
-  }, children), /*#__PURE__*/_react.default.createElement("div", {
+  }, children({
+    setShowObs,
+    setShowVars
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: "cherita-app-sidebar p-3"
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Card, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Card.Header, {
     className: "d-flex justify-content-evenly align-items-center"
@@ -120,7 +104,7 @@ function FullPage(_ref) {
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "sidebar-features modern-scrollbars"
   }, /*#__PURE__*/_react.default.createElement(_SearchBar.SearchBar, {
-    searchDiseases: true,
+    searchDiseases: searchDiseases,
     searchVar: true
   }), /*#__PURE__*/_react.default.createElement(_VarList.VarNamesList, {
     mode: varMode
@@ -140,7 +124,8 @@ function FullPage(_ref) {
     handleClose: () => setShowObs(false)
   }), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasVars, {
     show: showVars,
-    handleClose: () => setShowVars(false)
+    handleClose: () => setShowVars(false),
+    mode: varMode
   }), /*#__PURE__*/_react.default.createElement(_offcanvas.OffcanvasControls, {
     show: showControls,
     handleClose: () => setShowControls(false),
@@ -156,5 +141,17 @@ function FullPage(_ref) {
   }))));
 }
 function FullPagePseudospatial(props) {
-  return /*#__PURE__*/_react.default.createElement(FullPage, props, /*#__PURE__*/_react.default.createElement(_Scatterplot.Scatterplot, null));
+  return /*#__PURE__*/_react.default.createElement(FullPage, _extends({}, props, {
+    varMode: _constants.SELECTION_MODES.SINGLE
+  }), _ref2 => {
+    let {
+      setShowObs,
+      setShowVars
+    } = _ref2;
+    return /*#__PURE__*/_react.default.createElement(_Scatterplot.Scatterplot, {
+      setShowObs: setShowObs,
+      setShowVars: setShowVars,
+      isFullscreen: true
+    });
+  });
 }

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

@@ -10,27 +10,37 @@ var _reactBootstrap = require("react-bootstrap");
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _FilterContext = require("../../context/FilterContext");
+var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function Heatmap() {
+  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   const ENDPOINT = "heatmap";
   const dataset = (0, _DatasetContext.useDataset)();
+  const settings = (0, _SettingsContext.useSettings)();
   const {
     obsIndices,
     isSliced
   } = (0, _FilterContext.useFilteredData)();
-  const colorscale = (0, _react.useRef)(dataset.controls.colorScale);
+  const colorscale = (0, _react.useRef)(settings.controls.colorScale);
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
-    obsCol: dataset.selectedObs,
-    obsValues: !dataset.selectedObs?.omit.length ? null : _lodash.default.difference(_lodash.default.values(dataset.selectedObs?.codes), dataset.selectedObs?.omit).map(c => dataset.selectedObs?.codesMap[c]),
-    varKeys: dataset.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: settings.selectedObs,
+    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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 ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
@@ -38,35 +48,36 @@ function Heatmap() {
     varNamesCol: dataset.varNamesCol
   });
   (0, _react.useEffect)(() => {
-    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+    if (settings.selectedObs && settings.selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
     setParams(p => {
-      return {
-        ...p,
+      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
+      return _objectSpread(_objectSpread({}, p), {}, {
         url: dataset.url,
-        obsCol: dataset.selectedObs,
-        obsValues: !dataset.selectedObs?.omit.length ? null : _lodash.default.difference(_lodash.default.values(dataset.selectedObs?.codes), dataset.selectedObs?.omit).map(c => dataset.selectedObs?.codesMap[c]),
-        varKeys: dataset.selectedMultiVar.map(i => i.isSet ? {
+        obsCol: settings.selectedObs,
+        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.values((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.codes), (_settings$selectedObs7 = settings.selectedObs) === null || _settings$selectedObs7 === void 0 ? void 0 : _settings$selectedObs7.omit).map(c => {
+          var _settings$selectedObs8;
+          return (_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.codesMap[c];
+        }),
+        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
           name: i.name,
           indices: i.vars.map(v => v.index)
         } : i.index),
         obsIndices: isSliced ? [...(obsIndices || [])] : null,
         varNamesCol: dataset.varNamesCol
-      };
+      });
     });
-  }, [dataset.selectedMultiVar, dataset.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
-      return {
-        ...l,
-        coloraxis: {
-          ...l.coloraxis,
+      return _objectSpread(_objectSpread({}, l), {}, {
+        coloraxis: _objectSpread(_objectSpread({}, l.coloraxis), {}, {
           colorscale: colorscale
-        }
-      };
+        })
+      });
     });
   }, []);
   const {
@@ -84,9 +95,9 @@ function Heatmap() {
     }
   }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(() => {
-    colorscale.current = dataset.controls.colorScale;
+    colorscale.current = settings.controls.colorScale;
     updateColorscale(colorscale.current);
-  }, [dataset.controls.colorScale, updateColorscale]);
+  }, [settings.controls.colorScale, updateColorscale]);
   if (!serverError) {
     if (hasSelections) {
       return /*#__PURE__*/_react.default.createElement("div", {

package/dist/cjs/components/heatmap/HeatmapControls.js

@@ -5,26 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HeatmapControls = HeatmapControls;
 var _react = _interopRequireDefault(require("react"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
-var _colorscales = require("../../constants/colorscales");
-var _DatasetContext = require("../../context/DatasetContext");
+var _Controls = require("../controls/Controls");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function HeatmapControls() {
-  const dataset = (0, _DatasetContext.useDataset)();
-  const dispatch = (0, _DatasetContext.useDatasetDispatch)();
-  const colormapList = _lodash.default.keys(_colorscales.COLORSCALES).map(key => /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
-    key: key,
-    active: dataset.controls.colorScale === key,
-    onClick: () => {
-      dispatch({
-        type: "set.controls.colorScale",
-        colorScale: key
-      });
-    }
-  }, key));
-  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
-    id: "dropdownColorscale",
-    variant: "light"
-  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, colormapList));
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Form, null, /*#__PURE__*/_react.default.createElement(_Controls.ColorscaleSelect, null)));
 }

package/dist/cjs/components/matrixplot/Matrixplot.js

@@ -10,65 +10,76 @@ var _reactBootstrap = require("react-bootstrap");
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _FilterContext = require("../../context/FilterContext");
+var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function Matrixplot() {
+  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   const ENDPOINT = "matrixplot";
   const dataset = (0, _DatasetContext.useDataset)();
+  const settings = (0, _SettingsContext.useSettings)();
   const {
     obsIndices,
     isSliced
   } = (0, _FilterContext.useFilteredData)();
-  const colorscale = (0, _react.useRef)(dataset.controls.colorScale);
+  const colorscale = (0, _react.useRef)(settings.controls.colorScale);
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
   const [params, setParams] = (0, _react.useState)({
     url: dataset.url,
-    obsCol: dataset.selectedObs,
-    obsValues: !dataset.selectedObs?.omit.length ? null : _lodash.default.difference(_lodash.default.values(dataset.selectedObs?.codes), dataset.selectedObs?.omit).map(c => dataset.selectedObs?.codesMap[c]),
-    varKeys: dataset.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: settings.selectedObs,
+    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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 ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
     obsIndices: isSliced ? [...(obsIndices || [])] : null,
-    standardScale: dataset.controls.standardScale,
+    standardScale: settings.controls.scale.matrixplot,
     varNamesCol: dataset.varNamesCol
   });
   (0, _react.useEffect)(() => {
-    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+    if (settings.selectedObs && settings.selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
     setParams(p => {
-      return {
-        ...p,
+      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
+      return _objectSpread(_objectSpread({}, p), {}, {
         url: dataset.url,
-        obsCol: dataset.selectedObs,
-        obsValues: !dataset.selectedObs?.omit.length ? null : _lodash.default.difference(_lodash.default.values(dataset.selectedObs?.codes), dataset.selectedObs?.omit).map(c => dataset.selectedObs?.codesMap[c]),
-        varKeys: dataset.selectedMultiVar.map(i => i.isSet ? {
+        obsCol: settings.selectedObs,
+        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.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: dataset.controls.standardScale,
+        standardScale: settings.controls.scale.matrixplot,
         varNamesCol: dataset.varNamesCol
-      };
+      });
     });
-  }, [dataset.controls.standardScale, dataset.selectedMultiVar, dataset.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [settings.controls.scale.matrixplot, settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
-      return {
-        ...l,
-        coloraxis: {
-          ...l.coloraxis,
+      return _objectSpread(_objectSpread({}, l), {}, {
+        coloraxis: _objectSpread(_objectSpread({}, l.coloraxis), {}, {
           colorscale: colorscale
-        }
-      };
+        })
+      });
     });
   }, []);
   const {
@@ -86,9 +97,9 @@ function Matrixplot() {
     }
   }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(() => {
-    colorscale.current = dataset.controls.colorScale;
+    colorscale.current = settings.controls.colorScale;
     updateColorscale(colorscale.current);
-  }, [dataset.controls.colorScale, updateColorscale]);
+  }, [settings.controls.colorScale, updateColorscale]);
   if (!serverError) {
     if (hasSelections) {
       return /*#__PURE__*/_react.default.createElement("div", {

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

@@ -5,41 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MatrixplotControls = MatrixplotControls;
 var _react = _interopRequireDefault(require("react"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
-var _colorscales = require("../../constants/colorscales");
-var _constants = require("../../constants/constants");
-var _DatasetContext = require("../../context/DatasetContext");
+var _Controls = require("../controls/Controls");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function MatrixplotControls() {
-  const dataset = (0, _DatasetContext.useDataset)();
-  const dispatch = (0, _DatasetContext.useDatasetDispatch)();
-  const colorScaleList = _lodash.default.keys(_colorscales.COLORSCALES).map(key => /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
-    key: key,
-    active: dataset.controls.colorScale === key,
-    onClick: () => {
-      dispatch({
-        type: "set.controls.colorScale",
-        colorScale: key
-      });
-    }
-  }, key));
-  const standardScaleList = _lodash.default.values(_constants.MATRIXPLOT_SCALES).map(scale => /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
-    key: scale.value,
-    active: dataset.controls.scale.matrixplot.name === scale.name,
-    onClick: () => {
-      dispatch({
-        type: "set.controls.scale",
-        plot: "matrixplot",
-        scale: scale
-      });
-    }
-  }, scale.name));
-  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonToolbar, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
-    id: "dropdownColorscale",
-    variant: "light"
-  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, colorScaleList))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup.Text, null, "Standard scale"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
-    id: "dropdownStandardScale",
-    variant: "light"
-  }, dataset.controls.scale.matrixplot.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, standardScaleList)))));
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Form, null, /*#__PURE__*/_react.default.createElement(_Controls.ColorscaleSelect, null), /*#__PURE__*/_react.default.createElement(_Controls.ScaleSelect, {
+    plot: "matrixplot"
+  })));
 }