@haniffalab/cherita-react 1.2.0 → 1.3.0-dev.2025-05-29.ee7e9b72

package/dist/esm/components/pseudospatial/PseudospatialToolbar.js

@@ -1,17 +1,21 @@
+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 React, { useEffect, useState } from "react";
-import { faChevronDown } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import _ from "lodash";
 import { ButtonGroup, Dropdown, Form } from "react-bootstrap";
 import { PSEUDOSPATIAL_CATEGORICAL_MODES as MODES, PSEUDOSPATIAL_PLOT_TYPES as PLOT_TYPES } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
+import { useDataset } from "../../context/DatasetContext";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { useFetch } from "../../utils/requests";
 function CategoricalMode() {
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
   const modeList = _.map(MODES, (m, key) => /*#__PURE__*/React.createElement(Dropdown.Item, {
     key: key,
-    active: dataset.pseudospatial.categoricalMode === m,
+    active: settings.pseudospatial.categoricalMode === m,
     onClick: () => {
       dispatch({
         type: "set.pseudospatial.categoricalMode",
@@ -20,26 +24,27 @@ function CategoricalMode() {
     }
   }, _.capitalize(m.name)));
   const mode = _.find(MODES, {
-    value: dataset.pseudospatial.categoricalMode
+    value: settings.pseudospatial.categoricalMode
   });
   return /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Toggle, {
     variant: "light"
   }, _.capitalize(mode.name)), /*#__PURE__*/React.createElement(Dropdown.Menu, null, modeList));
 }
 function MaskSet() {
+  var _settings$pseudospati5, _settings$pseudospati6, _maskSets$settings$ps2, _settings$pseudospati7, _settings$pseudospati8, _maskSets$settings$ps3, _settings$pseudospati9;
   const ENDPOINT = "masks";
   const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
   const [maskSets, setMaskSets] = useState(null);
   const [params, setParams] = useState({
     url: dataset.url
   });
   useEffect(() => {
     setParams(p => {
-      return {
-        ...p,
+      return _objectSpread(_objectSpread({}, p), {}, {
         url: dataset.url
-      };
+      });
     });
   }, [dataset.url]);
   const {
@@ -56,7 +61,7 @@ function MaskSet() {
   }, [fetchedData, isPending, serverError]);
   const maskSetList = _.map(maskSets, (ms, key) => /*#__PURE__*/React.createElement(Dropdown.Item, {
     key: key,
-    active: dataset.pseudospatial.maskSet === key,
+    active: settings.pseudospatial.maskSet === key,
     onClick: () => {
       dispatch({
         type: "set.pseudospatial.maskSet",
@@ -65,9 +70,10 @@ function MaskSet() {
     }
   }, _.capitalize(key)));
   const handleMaskChange = mask => {
-    let newMasks = dataset.pseudospatial.maskValues || maskSets?.[dataset.pseudospatial?.maskSet];
+    var _settings$pseudospati, _settings$pseudospati2;
+    let newMasks = settings.pseudospatial.maskValues || (maskSets === null || maskSets === void 0 ? void 0 : maskSets[(_settings$pseudospati = settings.pseudospatial) === null || _settings$pseudospati === void 0 ? void 0 : _settings$pseudospati.maskSet]);
     newMasks = newMasks.includes(mask) ? newMasks.filter(m => m !== mask) : [...newMasks, mask];
-    if (!_.difference(maskSets?.[dataset.pseudospatial?.maskSet], newMasks).length) {
+    if (!_.difference(maskSets === null || maskSets === void 0 ? void 0 : maskSets[(_settings$pseudospati2 = settings.pseudospatial) === null || _settings$pseudospati2 === void 0 ? void 0 : _settings$pseudospati2.maskSet], newMasks).length) {
       newMasks = null;
     }
     dispatch({
@@ -76,7 +82,8 @@ function MaskSet() {
     });
   };
   const toggleMasks = () => {
-    if (!dataset.pseudospatial.maskValues || dataset.pseudospatial.maskValues?.length === maskSets?.[dataset.pseudospatial?.maskSet]?.length) {
+    var _settings$pseudospati3, _maskSets$settings$ps, _settings$pseudospati4;
+    if (!settings.pseudospatial.maskValues || ((_settings$pseudospati3 = settings.pseudospatial.maskValues) === null || _settings$pseudospati3 === void 0 ? void 0 : _settings$pseudospati3.length) === (maskSets === null || maskSets === void 0 || (_maskSets$settings$ps = maskSets[(_settings$pseudospati4 = settings.pseudospatial) === null || _settings$pseudospati4 === void 0 ? void 0 : _settings$pseudospati4.maskSet]) === null || _maskSets$settings$ps === void 0 ? void 0 : _maskSets$settings$ps.length)) {
       dispatch({
         type: "set.pseudospatial.maskValues",
         maskValues: []
@@ -88,19 +95,19 @@ function MaskSet() {
       });
     }
   };
-  const masksList = _.map(maskSets?.[dataset.pseudospatial?.maskSet], mask => /*#__PURE__*/React.createElement(Dropdown.ItemText, {
+  const masksList = _.map(maskSets === null || maskSets === void 0 ? void 0 : maskSets[(_settings$pseudospati5 = settings.pseudospatial) === null || _settings$pseudospati5 === void 0 ? void 0 : _settings$pseudospati5.maskSet], mask => /*#__PURE__*/React.createElement(Dropdown.ItemText, {
     key: mask
   }, /*#__PURE__*/React.createElement(Form.Check, {
     type: "checkbox",
     label: mask,
-    checked: !dataset.pseudospatial.maskValues || dataset.pseudospatial.maskValues.includes(mask),
+    checked: !settings.pseudospatial.maskValues || settings.pseudospatial.maskValues.includes(mask),
     onChange: () => handleMaskChange(mask)
   })));
-  const nMasks = dataset.pseudospatial.maskValues ? dataset.pseudospatial.maskValues?.length : maskSets?.[dataset.pseudospatial?.maskSet]?.length || "No";
-  const toggleAllChecked = !dataset.pseudospatial.maskValues || dataset.pseudospatial.maskValues?.length === maskSets?.[dataset.pseudospatial?.maskSet]?.length;
+  const nMasks = settings.pseudospatial.maskValues ? (_settings$pseudospati6 = settings.pseudospatial.maskValues) === null || _settings$pseudospati6 === void 0 ? void 0 : _settings$pseudospati6.length : (maskSets === null || maskSets === void 0 || (_maskSets$settings$ps2 = maskSets[(_settings$pseudospati7 = settings.pseudospatial) === null || _settings$pseudospati7 === void 0 ? void 0 : _settings$pseudospati7.maskSet]) === null || _maskSets$settings$ps2 === void 0 ? void 0 : _maskSets$settings$ps2.length) || "No";
+  const toggleAllChecked = !settings.pseudospatial.maskValues || ((_settings$pseudospati8 = settings.pseudospatial.maskValues) === null || _settings$pseudospati8 === void 0 ? void 0 : _settings$pseudospati8.length) === (maskSets === null || maskSets === void 0 || (_maskSets$settings$ps3 = maskSets[(_settings$pseudospati9 = settings.pseudospatial) === null || _settings$pseudospati9 === void 0 ? void 0 : _settings$pseudospati9.maskSet]) === null || _maskSets$settings$ps3 === void 0 ? void 0 : _maskSets$settings$ps3.length);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Toggle, {
     variant: "light"
-  }, _.capitalize(dataset.pseudospatial.maskSet || "Select a mask set")), /*#__PURE__*/React.createElement(Dropdown.Menu, null, /*#__PURE__*/React.createElement(Dropdown.Header, null, "Mask set"), maskSetList)), /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Toggle, {
+  }, _.capitalize(settings.pseudospatial.maskSet || "Select a mask set")), /*#__PURE__*/React.createElement(Dropdown.Menu, null, /*#__PURE__*/React.createElement(Dropdown.Header, null, "Mask set"), maskSetList)), /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Toggle, {
     variant: "light"
   }, nMasks, " masks selected"), /*#__PURE__*/React.createElement(Dropdown.Menu, null, /*#__PURE__*/React.createElement(Dropdown.Header, null, "Masks"), /*#__PURE__*/React.createElement(Dropdown.ItemText, {
     key: "toggle-all"

package/dist/esm/components/scatterplot/Scatterplot.js

@@ -1,3 +1,8 @@
+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 React, { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } from "react";
 import { ScatterplotLayer } from "@deck.gl/layers";
 import { DeckGL } from "@deck.gl/react";
@@ -7,9 +12,11 @@ import { ViewMode } from "@nebula.gl/edit-modes";
 import { EditableGeoJsonLayer } from "@nebula.gl/layers";
 import _ from "lodash";
 import { Alert } from "react-bootstrap";
+import { SpatialControls } from "./SpatialControls";
+import { Toolbox } from "./Toolbox";
 import { COLOR_ENCODINGS, OBS_TYPES, SELECTED_POLYGON_FILLCOLOR, UNSELECTED_POLYGON_FILLCOLOR } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
 import { useFilteredData } from "../../context/FilterContext";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { useZarrData } from "../../context/ZarrDataContext";
 import { rgbToHex, useColor } from "../../helpers/color-helper";
 import { MapHelper } from "../../helpers/map-helper";
@@ -17,8 +24,6 @@ import { Legend } from "../../utils/Legend";
 import { LoadingLinear, LoadingSpinner } from "../../utils/LoadingIndicators";
 import { formatNumerical } from "../../utils/string";
 import { useLabelObsData } from "../../utils/zarrData";
-import { SpatialControls } from "./SpatialControls";
-import { Toolbox } from "./Toolbox";
 window.deck.log.level = 1;
 const INITIAL_VIEW_STATE = {
   longitude: 0,
@@ -29,17 +34,21 @@ const INITIAL_VIEW_STATE = {
   bearing: 0
 };
 export function Scatterplot(_ref) {
+  var _settings$selectedObs3, _features$features2, _obsmData$serverError, _xData$serverError, _obsData$serverError, _labelObsData$serverE, _settings$selectedVar, _settings$selectedObs4, _obsmData$data;
   let {
-    radius = 30
+    radius = 30,
+    setShowObs,
+    setShowVars,
+    isFullscreen = false
   } = _ref;
-  const dataset = useDataset();
+  const settings = useSettings();
   const {
     obsIndices,
     valueMin,
     valueMax,
     slicedLength
   } = useFilteredData();
-  const dispatch = useDatasetDispatch();
+  const dispatch = useSettingsDispatch();
   const {
     getColor
   } = useColor();
@@ -57,7 +66,7 @@ export function Scatterplot(_ref) {
   const [mode, setMode] = useState(() => ViewMode);
   const [features, setFeatures] = useState({
     type: "FeatureCollection",
-    features: dataset.polygons[dataset.selectedObsm] || []
+    features: settings.polygons[settings.selectedObsm] || []
   });
   const [selectedFeatureIndexes, setSelectedFeatureIndexes] = useState([]);
   const {
@@ -70,12 +79,12 @@ export function Scatterplot(_ref) {
 
   useEffect(() => {
     if (!obsmData.isPending && !obsmData.serverError) {
+      var _deckRef$current, _deckRef$current2;
       setIsRendering(true);
       setData(d => {
-        return {
-          ...d,
+        return _objectSpread(_objectSpread({}, d), {}, {
           positions: obsmData.data
-        };
+        });
       });
       const mapHelper = new MapHelper();
       const {
@@ -83,35 +92,34 @@ export function Scatterplot(_ref) {
         longitude,
         zoom
       } = mapHelper.fitBounds(obsmData.data, {
-        width: deckRef?.current?.deck?.width,
-        height: deckRef?.current?.deck?.height
+        width: deckRef === null || deckRef === void 0 || (_deckRef$current = deckRef.current) === null || _deckRef$current === void 0 || (_deckRef$current = _deckRef$current.deck) === null || _deckRef$current === void 0 ? void 0 : _deckRef$current.width,
+        height: deckRef === null || deckRef === void 0 || (_deckRef$current2 = deckRef.current) === null || _deckRef$current2 === void 0 || (_deckRef$current2 = _deckRef$current2.deck) === null || _deckRef$current2 === void 0 ? void 0 : _deckRef$current2.height
       });
       setViewState(v => {
-        return {
-          ...v,
+        return _objectSpread(_objectSpread({}, v), {}, {
           longitude: longitude,
           latitude: latitude,
           zoom: zoom
-        };
+        });
       });
     } else if (!obsmData.isPending && obsmData.serverError) {
       setIsRendering(true);
       setData(d => {
-        return {
-          ...d,
+        return _objectSpread(_objectSpread({}, d), {}, {
           positions: []
-        };
+        });
       });
     }
-  }, [dataset.selectedObsm, obsmData.data, obsmData.isPending, obsmData.serverError]);
+  }, [settings.selectedObsm, obsmData.data, obsmData.isPending, obsmData.serverError]);
   const getBounds = useCallback(() => {
+    var _deckRef$current3, _deckRef$current4;
     const {
       latitude,
       longitude,
       zoom
     } = new MapHelper().fitBounds(data.positions, {
-      width: deckRef?.current?.deck?.width,
-      height: deckRef?.current?.deck?.height
+      width: deckRef === null || deckRef === void 0 || (_deckRef$current3 = deckRef.current) === null || _deckRef$current3 === void 0 || (_deckRef$current3 = _deckRef$current3.deck) === null || _deckRef$current3 === void 0 ? void 0 : _deckRef$current3.width,
+      height: deckRef === null || deckRef === void 0 || (_deckRef$current4 = deckRef.current) === null || _deckRef$current4 === void 0 || (_deckRef$current4 = _deckRef$current4.deck) === null || _deckRef$current4 === void 0 ? void 0 : _deckRef$current4.height
     });
     return {
       latitude,
@@ -120,69 +128,64 @@ export function Scatterplot(_ref) {
     };
   }, [data.positions]);
   useEffect(() => {
-    if (dataset.colorEncoding === COLOR_ENCODINGS.VAR) {
+    if (settings.colorEncoding === COLOR_ENCODINGS.VAR) {
       setIsRendering(true);
       if (!xData.isPending && !xData.serverError) {
         // @TODO: add condition to check obs slicing
         setData(d => {
-          return {
-            ...d,
+          return _objectSpread(_objectSpread({}, d), {}, {
             values: xData.data
-          };
+          });
         });
       } else if (!xData.isPending && xData.serverError) {
         setData(d => {
-          return {
-            ...d,
+          return _objectSpread(_objectSpread({}, d), {}, {
             values: []
-          };
+          });
         });
       }
     }
-  }, [dataset.colorEncoding, xData.data, xData.isPending, xData.serverError, getColor]);
+  }, [settings.colorEncoding, xData.data, xData.isPending, xData.serverError, getColor]);
   useEffect(() => {
-    if (dataset.colorEncoding === COLOR_ENCODINGS.OBS) {
+    if (settings.colorEncoding === COLOR_ENCODINGS.OBS) {
       setIsRendering(true);
       if (!obsData.isPending && !obsData.serverError) {
         setData(d => {
-          return {
-            ...d,
+          return _objectSpread(_objectSpread({}, d), {}, {
             values: obsData.data
-          };
+          });
         });
       } else if (!obsData.isPending && obsData.serverError) {
         setData(d => {
-          return {
-            ...d,
+          return _objectSpread(_objectSpread({}, d), {}, {
             values: []
-          };
+          });
         });
       }
-    } else if (dataset.colorEncoding === COLOR_ENCODINGS.VAR && dataset.sliceBy.obs) {
+    } else if (settings.colorEncoding === COLOR_ENCODINGS.VAR && settings.sliceBy.obs) {
       if (!obsData.isPending && !obsData.serverError) {
         setData(d => {
-          return {
-            ...d,
+          return _objectSpread(_objectSpread({}, d), {}, {
             sliceValues: obsData.data
-          };
+          });
         });
       } else if (!obsData.isPending && obsData.serverError) {
         setData(d => {
-          return {
-            ...d,
+          return _objectSpread(_objectSpread({}, d), {}, {
             sliceValues: []
-          };
+          });
         });
       }
     }
-  }, [dataset.colorEncoding, obsData.data, obsData.isPending, obsData.serverError, dataset.sliceBy.obs]);
+  }, [settings.colorEncoding, obsData.data, obsData.isPending, obsData.serverError, settings.sliceBy.obs]);
   const isCategorical = useMemo(() => {
-    if (dataset.colorEncoding === COLOR_ENCODINGS.OBS) {
-      return dataset.selectedObs?.type === OBS_TYPES.CATEGORICAL || dataset.selectedObs?.type === OBS_TYPES.BOOLEAN;
+    if (settings.colorEncoding === COLOR_ENCODINGS.OBS) {
+      var _settings$selectedObs, _settings$selectedObs2;
+      return ((_settings$selectedObs = settings.selectedObs) === null || _settings$selectedObs === void 0 ? void 0 : _settings$selectedObs.type) === OBS_TYPES.CATEGORICAL || ((_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.type) === OBS_TYPES.BOOLEAN;
     } else {
       return false;
     }
-  }, [dataset.colorEncoding, dataset.selectedObs?.type]);
+  }, [settings.colorEncoding, (_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.type]);
   useEffect(() => {
     dispatch({
       type: "set.controls.valueRange",
@@ -193,8 +196,8 @@ export function Scatterplot(_ref) {
     min,
     max
   } = {
-    min: dataset.controls.range[0] * (valueMax - valueMin) + valueMin,
-    max: dataset.controls.range[1] * (valueMax - valueMin) + valueMin
+    min: settings.controls.range[0] * (valueMax - valueMin) + valueMin,
+    max: settings.controls.range[1] * (valueMax - valueMin) + valueMin
   };
   const getFillColor = useCallback((_d, _ref2) => {
     let {
@@ -268,19 +271,20 @@ export function Scatterplot(_ref) {
   const layers = useDeferredValue(mode === ViewMode ? memoizedLayers.reverse() : memoizedLayers); // draw scatterplot on top of polygons when in ViewMode
 
   useEffect(() => {
-    if (!features?.features?.length) {
+    var _features$features;
+    if (!(features !== null && features !== void 0 && (_features$features = features.features) !== null && _features$features !== void 0 && _features$features.length)) {
       dispatch({
         type: "disable.slice.polygons"
       });
     }
-  }, [dispatch, features?.features?.length]);
+  }, [dispatch, features === null || features === void 0 || (_features$features2 = features.features) === null || _features$features2 === void 0 ? void 0 : _features$features2.length]);
   useEffect(() => {
     dispatch({
       type: "set.polygons",
-      obsm: dataset.selectedObsm,
-      polygons: features?.features || []
+      obsm: settings.selectedObsm,
+      polygons: (features === null || features === void 0 ? void 0 : features.features) || []
     });
-  }, [dataset.selectedObsm, dispatch, features.features]);
+  }, [settings.selectedObsm, dispatch, features.features]);
   function onLayerClick(info) {
     if (mode !== ViewMode) {
       // don't change selection while editing
@@ -291,9 +295,9 @@ export function Scatterplot(_ref) {
   const getLabel = function (o, v) {
     let isVar = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     if (isVar || o.type === OBS_TYPES.CONTINUOUS) {
-      return `${o.name}: ${formatNumerical(parseFloat(v))}`;
+      return "".concat(o.name, ": ").concat(formatNumerical(parseFloat(v)));
     } else {
-      return `${o.name}: ${o.codesMap[v]}`;
+      return "".concat(o.name, ": ").concat(o.codesMap[v]);
     }
   };
   const getTooltip = _ref5 => {
@@ -301,19 +305,21 @@ export function Scatterplot(_ref) {
       object,
       index
     } = _ref5;
-    if (!object || object?.type === "Feature") return;
+    if (!object || (object === null || object === void 0 ? void 0 : object.type) === "Feature") return;
     const text = [];
-    if (dataset.colorEncoding === COLOR_ENCODINGS.OBS && dataset.selectedObs && !_.some(dataset.labelObs, {
-      name: dataset.selectedObs.name
+    if (settings.colorEncoding === COLOR_ENCODINGS.OBS && settings.selectedObs && !_.some(settings.labelObs, {
+      name: settings.selectedObs.name
     })) {
-      text.push(getLabel(dataset.selectedObs, obsData.data?.[index]));
+      var _obsData$data;
+      text.push(getLabel(settings.selectedObs, (_obsData$data = obsData.data) === null || _obsData$data === void 0 ? void 0 : _obsData$data[index]));
     }
-    if (dataset.colorEncoding === COLOR_ENCODINGS.VAR && dataset.selectedVar) {
-      text.push(getLabel(dataset.selectedVar, xData.data?.[index], true));
+    if (settings.colorEncoding === COLOR_ENCODINGS.VAR && settings.selectedVar) {
+      var _xData$data;
+      text.push(getLabel(settings.selectedVar, (_xData$data = xData.data) === null || _xData$data === void 0 ? void 0 : _xData$data[index], true));
     }
-    if (dataset.labelObs.length) {
+    if (settings.labelObs.length) {
       text.push(..._.map(labelObsData.data, (v, k) => {
-        const labelObs = _.find(dataset.labelObs, o => o.name === k);
+        const labelObs = _.find(settings.labelObs, o => o.name === k);
         return getLabel(labelObs, v[index]);
       }));
     }
@@ -323,16 +329,16 @@ export function Scatterplot(_ref) {
       text: text.length ? _.compact(text).join("\n") : null,
       className: grayOut ? "tooltip-grayout" : "deck-tooltip",
       style: !grayOut ? {
-        "border-left": `3px solid ${rgbToHex(getFillColor(null, {
+        "border-left": "3px solid ".concat(rgbToHex(getFillColor(null, {
           index
-        }))}`
+        })))
       } : {
         "border-left": "none"
       }
     };
   };
   const isPending = (isRendering || xData.isPending || obsmData.isPending) && !obsmData.isPending;
-  const error = dataset.selectedObsm && obsmData.serverError?.length || dataset.colorEncoding === COLOR_ENCODINGS.VAR && xData.serverError?.length || dataset.colorEncoding === COLOR_ENCODINGS.OBS && obsData.serverError?.length || dataset.labelObs.lengh && labelObsData.serverError?.length;
+  const error = settings.selectedObsm && ((_obsmData$serverError = obsmData.serverError) === null || _obsmData$serverError === void 0 ? void 0 : _obsmData$serverError.length) || settings.colorEncoding === COLOR_ENCODINGS.VAR && ((_xData$serverError = xData.serverError) === null || _xData$serverError === void 0 ? void 0 : _xData$serverError.length) || settings.colorEncoding === COLOR_ENCODINGS.OBS && ((_obsData$serverError = obsData.serverError) === null || _obsData$serverError === void 0 ? void 0 : _obsData$serverError.length) || settings.labelObs.lengh && ((_labelObsData$serverE = labelObsData.serverError) === null || _labelObsData$serverE === void 0 ? void 0 : _labelObsData$serverE.length);
   return /*#__PURE__*/React.createElement("div", {
     className: "cherita-container-scatterplot"
   }, /*#__PURE__*/React.createElement("div", {
@@ -366,14 +372,15 @@ export function Scatterplot(_ref) {
     setFeatures: setFeatures,
     selectedFeatureIndexes: selectedFeatureIndexes,
     resetBounds: () => setViewState(getBounds()),
-    increaseZoom: () => setViewState(v => ({
-      ...v,
+    increaseZoom: () => setViewState(v => _objectSpread(_objectSpread({}, v), {}, {
       zoom: v.zoom + 1
     })),
-    decreaseZoom: () => setViewState(v => ({
-      ...v,
+    decreaseZoom: () => setViewState(v => _objectSpread(_objectSpread({}, v), {}, {
       zoom: v.zoom - 1
-    }))
+    })),
+    setShowObs: setShowObs,
+    setShowVars: setShowVars,
+    isFullscreen: isFullscreen
   }), /*#__PURE__*/React.createElement("div", {
     className: "cherita-spatial-footer"
   }, /*#__PURE__*/React.createElement("div", {
@@ -383,8 +390,8 @@ export function Scatterplot(_ref) {
   }, /*#__PURE__*/React.createElement(FontAwesomeIcon, {
     icon: faTriangleExclamation
   }), "\xA0Error loading data"), /*#__PURE__*/React.createElement(Toolbox, {
-    mode: dataset.colorEncoding === COLOR_ENCODINGS.VAR ? dataset.selectedVar.name : dataset.colorEncoding === COLOR_ENCODINGS.OBS ? dataset.selectedObs.name : null,
-    obsLength: parseInt(obsmData.data?.length),
+    mode: settings.colorEncoding === COLOR_ENCODINGS.VAR ? (_settings$selectedVar = settings.selectedVar) === null || _settings$selectedVar === void 0 ? void 0 : _settings$selectedVar.name : settings.colorEncoding === COLOR_ENCODINGS.OBS ? (_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.name : null,
+    obsLength: parseInt((_obsmData$data = obsmData.data) === null || _obsmData$data === void 0 ? void 0 : _obsmData$data.length),
     slicedLength: parseInt(slicedLength)
   })), /*#__PURE__*/React.createElement(Legend, {
     isCategorical: isCategorical,

package/dist/esm/components/scatterplot/ScatterplotControls.js

@@ -1,27 +1,17 @@
 import React, { useEffect } from "react";
 import { Box, Slider, Typography } from "@mui/material";
-import _ from "lodash";
-import { Dropdown } from "react-bootstrap";
-import { COLORSCALES } from "../../constants/colorscales";
+import { Form } from "react-bootstrap";
 import { COLOR_ENCODINGS, OBS_TYPES } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
+import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
+import { ColorscaleSelect } from "../controls/Controls";
 export const ScatterplotControls = () => {
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
-  const [sliderValue, setSliderValue] = React.useState(dataset.controls.range || [0, 1]);
-  const isCategorical = dataset.colorEncoding === COLOR_ENCODINGS.OBS ? dataset.selectedObs?.type === OBS_TYPES.CATEGORICAL : false;
-  const colormapList = _.keys(COLORSCALES).map(key => /*#__PURE__*/React.createElement(Dropdown.Item, {
-    key: key,
-    active: dataset.controls.colorScale === key,
-    onClick: () => {
-      dispatch({
-        type: "set.controls.colorScale",
-        colorScale: key
-      });
-    }
-  }, key));
+  var _settings$selectedObs;
+  const settings = useSettings();
+  const dispatch = useSettingsDispatch();
+  const [sliderValue, setSliderValue] = React.useState(settings.controls.range || [0, 1]);
+  const isCategorical = settings.colorEncoding === COLOR_ENCODINGS.OBS ? ((_settings$selectedObs = settings.selectedObs) === null || _settings$selectedObs === void 0 ? void 0 : _settings$selectedObs.type) === OBS_TYPES.CATEGORICAL : false;
   const valueLabelFormat = value => {
-    return (value * (dataset.controls.valueRange[1] - dataset.controls.valueRange[0]) + dataset.controls.valueRange[0]).toFixed(2);
+    return (value * (settings.controls.valueRange[1] - settings.controls.valueRange[0]) + settings.controls.valueRange[0]).toFixed(2);
   };
   const marks = [{
     value: 0,
@@ -41,14 +31,16 @@ export const ScatterplotControls = () => {
     });
   };
   useEffect(() => {
-    setSliderValue(dataset.controls.range);
-  }, [dataset.controls.range]);
+    setSliderValue(settings.controls.range);
+  }, [settings.controls.range]);
   const rangeSlider = /*#__PURE__*/React.createElement(Box, {
     className: "w-100"
   }, /*#__PURE__*/React.createElement(Typography, {
     id: "colorscale-range",
     gutterBottom: true
-  }, "Colorscale range"), /*#__PURE__*/React.createElement(Slider, {
+  }, "Colorscale range"), /*#__PURE__*/React.createElement("div", {
+    className: "px-4"
+  }, /*#__PURE__*/React.createElement(Slider, {
     "aria-labelledby": "colorscale-range",
     min: 0,
     max: 1,
@@ -61,11 +53,8 @@ export const ScatterplotControls = () => {
     valueLabelFormat: valueLabelFormat,
     marks: marks,
     disabled: isCategorical
-  }));
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Toggle, {
-    id: "dropdownColorscale",
-    variant: "light"
-  }, dataset.controls.colorScale), /*#__PURE__*/React.createElement(Dropdown.Menu, null, colormapList)), /*#__PURE__*/React.createElement("div", {
-    className: "m-4"
-  }, rangeSlider));
+  })));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, null, /*#__PURE__*/React.createElement(ColorscaleSelect, null), /*#__PURE__*/React.createElement(Form.Group, {
+    className: "mb-2"
+  }, rangeSlider)));
 };