@haniffalab/cherita-react 0.1.12 → 0.2.0-dev.2024-02-12.4d768f57

package/dist/components/scatterplot/Scatterplot.js

@@ -7,21 +7,28 @@ Object.defineProperty(exports, "__esModule", {
 exports.Scatterplot = Scatterplot;
 exports.ScatterplotControls = ScatterplotControls;
 require("bootstrap/dist/css/bootstrap.min.css");
-var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _chromaJs = _interopRequireDefault(require("chroma-js"));
 var _react2 = _interopRequireDefault(require("@deck.gl/react"));
 var _layers = require("@deck.gl/layers");
-var _DatasetContext = require("../../context/DatasetContext");
-var _constants = require("../../constants/constants");
-var _map = require("../../helpers/map");
-var _zarr = require("../../helpers/zarr");
 var _layers2 = require("@nebula.gl/layers");
 var _editModes = require("@nebula.gl/edit-modes");
-var _editor = require("@nebula.gl/editor");
+var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _Toolbox = require("./Toolbox");
+var _Legend = require("./Legend");
+var _constants = require("../../constants/constants");
+var _DatasetContext = require("../../context/DatasetContext");
+var _map = require("../../helpers/map");
+var _zarr = require("../../helpers/zarr");
+var _color = require("../../helpers/color");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -35,69 +42,62 @@ window.deck.log.level = 1;
 function ScatterplotControls() {
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
-  var _useState = (0, _react.useState)(dataset.embedding),
-    _useState2 = _slicedToArray(_useState, 2),
-    active = _useState2[0],
-    setActive = _useState2[1];
-  (0, _react.useEffect)(function () {
-    setActive(dataset.embedding);
-  }, [dataset.embedding]);
-  var colormapList = _constants.EMBEDDINGS.map(function (item) {
-    return /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
+  var colormapList = _constants.PLOTLY_COLORSCALES.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
       key: item,
-      active: active === item,
+      active: dataset.controls.colorScale === item,
       onClick: function onClick() {
-        setActive(item);
         dispatch({
-          type: "embeddingSelected",
-          embedding: item
+          type: "set.controls.colorScale",
+          colorScale: item
         });
       }
     }, item);
   });
-  return /*#__PURE__*/_react.React.createElement(_Dropdown.default, null, /*#__PURE__*/_react.React.createElement(_Dropdown.default.Toggle, {
-    id: "dropdownEmbedding",
+  return /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
+    id: "dropdownColorscale",
     variant: "light"
-  }, dataset.embedding), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Menu, null, colormapList));
+  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, colormapList));
 }
 function Scatterplot(_ref) {
   var _ref$radius = _ref.radius,
     radius = _ref$radius === void 0 ? 30 : _ref$radius;
   var dataset = (0, _DatasetContext.useDataset)();
-  var _useState3 = (0, _react.useState)({
+  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
+  var _useState = (0, _react.useState)({
       type: "FeatureCollection",
       features: []
     }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    features = _useState4[0],
-    setFeatures = _useState4[1];
-  var _useState5 = (0, _react.useState)(function () {
-      return _editModes.DrawPolygonByDraggingMode;
+    _useState2 = _slicedToArray(_useState, 2),
+    features = _useState2[0],
+    setFeatures = _useState2[1];
+  var _useState3 = (0, _react.useState)(function () {
+      return _editModes.ViewMode;
     }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    mode = _useState4[0],
+    setMode = _useState4[1];
+  var _useState5 = (0, _react.useState)([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    mode = _useState6[0],
-    setMode = _useState6[1];
-  var _useState7 = (0, _react.useState)({}),
+    selectedFeatureIndexes = _useState6[0],
+    setSelectedFeatureIndexes = _useState6[1];
+  var _useState7 = (0, _react.useState)([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    modeConfig = _useState8[0],
-    setModeConfig = _useState8[1];
+    featureState = _useState8[0],
+    setFeatureState = _useState8[1];
   var _useState9 = (0, _react.useState)([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectedFeatureIndexes = _useState10[0],
-    setSelectedFeatureIndexes = _useState10[1];
+    data = _useState10[0],
+    setData = _useState10[1];
   var _useState11 = (0, _react.useState)([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    data = _useState12[0],
-    setData = _useState12[1];
+    position = _useState12[0],
+    setPosition = _useState12[1];
   var _useState13 = (0, _react.useState)([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    position = _useState14[0],
-    setPosition = _useState14[1];
-  var _useState15 = (0, _react.useState)([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    values = _useState16[0],
-    setValues = _useState16[1];
-  var _useState17 = (0, _react.useState)({
+    values = _useState14[0],
+    setValues = _useState14[1];
+  var _useState15 = (0, _react.useState)({
       longitude: 0,
       latitude: 0,
       zoom: 0,
@@ -105,25 +105,26 @@ function Scatterplot(_ref) {
       pitch: 0,
       bearing: 0
     }),
-    _useState18 = _slicedToArray(_useState17, 2),
-    viewport = _useState18[0],
-    setViewport = _useState18[1];
+    _useState16 = _slicedToArray(_useState15, 2),
+    viewport = _useState16[0],
+    setViewport = _useState16[1];
   (0, _react.useEffect)(function () {
     setData(function (prevState, props) {
-      var colorScale = _chromaJs.default.scale(["yellow", "008ae5"]).domain([_lodash.default.min(values), _lodash.default.max(values)]);
+      var colorHelper = new _color.ColorHelper();
+      var scale = dataset.colorEncoding === "var" ? colorHelper.getScale(dataset, values) : null;
       var data = position.map(function (e, i) {
         return {
           index: i,
           position: [position[i][0], position[i][1]],
           value: values[i],
-          color: colorScale(values[i]).rgb()
+          color: colorHelper.getColor(dataset, values[i], scale)
         };
       });
       return data;
     });
-  }, [position, values]);
+  }, [position, values, dataset.controls.colorScale]);
   (0, _react.useEffect)(function () {
-    if (dataset.embedding) {
+    if (dataset.selectedObsm) {
       var helper = new _map.MapHelper();
       var zarrHelper = new _zarr.ZarrHelper();
       var fetchObsm = /*#__PURE__*/function () {
@@ -133,7 +134,7 @@ function Scatterplot(_ref) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return zarrHelper.open(dataset.url, "obsm/" + dataset.embedding);
+                return zarrHelper.open(dataset.url, "obsm/" + dataset.selectedObsm);
               case 2:
                 z = _context.sent;
                 _context.next = 5;
@@ -164,7 +165,7 @@ function Scatterplot(_ref) {
       }();
       fetchObsm().catch(console.error);
     }
-  }, [dataset.url, dataset.embedding]);
+  }, [dataset.url, dataset.selectedObsm]);
   (0, _react.useEffect)(function () {
     if (dataset.selectedVar) {
       var zarrHelper = new _zarr.ZarrHelper();
@@ -181,6 +182,10 @@ function Scatterplot(_ref) {
                 _context2.next = 5;
                 return z.get([null, dataset.selectedVar.matrix_index], _zarr.GET_OPTIONS).then(function (result) {
                   setValues(result.data);
+                  dispatch({
+                    type: "set.colorEncoding",
+                    value: "var"
+                  });
                 });
               case 5:
               case "end":
@@ -194,9 +199,43 @@ function Scatterplot(_ref) {
       }();
       fetchData().catch(console.error);
     }
-  }, [dataset.url, dataset.selectedObs, dataset.selectedVar]);
+  }, [dataset.url, dataset.selectedVar]);
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs) {
+      var zarrHelper = new _zarr.ZarrHelper();
+      var fetchData = /*#__PURE__*/function () {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          var z;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return zarrHelper.open(dataset.url, "obs/" + dataset.selectedObs.name + "/codes");
+              case 2:
+                z = _context3.sent;
+                _context3.next = 5;
+                return z.get().then(function (result) {
+                  setValues(result.data);
+                  dispatch({
+                    type: "set.colorEncoding",
+                    value: "obs"
+                  });
+                });
+              case 5:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function fetchData() {
+          return _ref4.apply(this, arguments);
+        };
+      }();
+      fetchData().catch(console.error);
+    }
+  }, [dataset.url, dataset.selectedObs]);
   var layers = [new _layers.ScatterplotLayer({
-    id: "scatter-plot",
+    id: "cherita-layer-scatterplot",
     data: data,
     radiusScale: radius,
     radiusMinPixels: 1,
@@ -208,16 +247,28 @@ function Scatterplot(_ref) {
     },
     getRadius: 1
   }), new _layers2.EditableGeoJsonLayer({
-    // id: "geojson-layer",
+    id: "cherita-layer-draw",
     data: features,
     mode: mode,
-    modeConfig: modeConfig,
     selectedFeatureIndexes: selectedFeatureIndexes,
-    onEdit: function onEdit(_ref4) {
-      var updatedData = _ref4.updatedData;
+    onEdit: function onEdit(_ref5) {
+      var updatedData = _ref5.updatedData,
+        editType = _ref5.editType,
+        editContext = _ref5.editContext;
       setFeatures(updatedData);
+      var updatedSelectedFeatureIndexes = selectedFeatureIndexes;
+      setFeatureState({
+        data: updatedData
+      });
+      if (editType === "addFeature") {
+        // when a drawing is complete, the value of editType becomes addFeature
+        var featureIndexes = editContext.featureIndexes; //extracting indexes of current features selected
+        updatedSelectedFeatureIndexes = [].concat(_toConsumableArray(selectedFeatureIndexes), _toConsumableArray(featureIndexes));
+      }
+      setSelectedFeatureIndexes(updatedSelectedFeatureIndexes); //now update your state
     }
   })];
+
   function onLayerClick(info) {
     if (mode !== _editModes.ViewMode) {
       // don't change selection while editing
@@ -225,34 +276,19 @@ function Scatterplot(_ref) {
     }
     setSelectedFeatureIndexes(info.object ? [info.index] : []);
   }
-  return /*#__PURE__*/_react.React.createElement(_react.React.Fragment, null, /*#__PURE__*/_react.React.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "cherita-scatterplot"
-  }, /*#__PURE__*/_react.React.createElement(_react2.default, {
+  }, /*#__PURE__*/_react.default.createElement(_react2.default, {
     layers: layers,
     initialViewState: viewport,
     controller: true,
     onClick: onLayerClick
-  }), /*#__PURE__*/_react.React.createElement(_editor.Toolbox, {
+  }), /*#__PURE__*/_react.default.createElement(_Toolbox.Toolbox, {
     mode: mode,
-    onSetMode: function onSetMode(m) {
-      setModeConfig(null);
-      setMode(m);
-    },
-    modeConfig: modeConfig,
-    onSetModeConfig: setModeConfig,
-    geoJson: features,
-    onSetGeoJson: setFeatures,
-    onImport: setFeatures
-  }), /*#__PURE__*/_react.React.createElement(_Toolbox.Toolbox2, {
-    mode: mode,
-    onSetMode: function onSetMode(m) {
-      setModeConfig(null);
-      setMode(m);
-    },
-    modeConfig: modeConfig,
-    onSetModeConfig: setModeConfig,
-    geoJson: features,
-    onSetGeoJson: setFeatures,
-    onImport: setFeatures
+    setMode: setMode,
+    features: mode,
+    setFeatures: setFeatures
+  }), /*#__PURE__*/_react.default.createElement(_Legend.Legend, {
+    values: values
   })));
 }

package/dist/components/scatterplot/Toolbox.js

@@ -3,66 +3,86 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Toolbox2 = Toolbox2;
+exports.Toolbox = Toolbox;
 require("bootstrap/dist/css/bootstrap.min.css");
 var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = require("react");
-var _lodash = _interopRequireDefault(require("lodash"));
-var _chromaJs = _interopRequireDefault(require("chroma-js"));
-var _react2 = _interopRequireDefault(require("@deck.gl/react"));
-var _layers = require("@deck.gl/layers");
-var _DatasetContext = require("../../context/DatasetContext");
-var _constants = require("../../constants/constants");
-var _map = require("../../helpers/map");
-var _zarr = require("../../helpers/zarr");
-var _layers2 = require("@nebula.gl/layers");
 var _editModes = require("@nebula.gl/edit-modes");
-var _editor = require("@nebula.gl/editor");
 var _Button = _interopRequireDefault(require("react-bootstrap/Button"));
 var _DropdownButton = _interopRequireDefault(require("react-bootstrap/DropdownButton"));
 var _ButtonGroup = _interopRequireDefault(require("react-bootstrap/ButtonGroup"));
 var _reactFontawesome = require("@fortawesome/react-fontawesome");
 var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-window.deck.log.level = 1;
-function Toolbox2() {
-  var dataset = (0, _DatasetContext.useDataset)();
-  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
-  var _useState = (0, _react.useState)(dataset.embedding),
-    _useState2 = _slicedToArray(_useState, 2),
-    active = _useState2[0],
-    setActive = _useState2[1];
-  (0, _react.useEffect)(function () {
-    setActive(dataset.embedding);
-  }, [dataset.embedding]);
+function Toolbox(_ref) {
+  var mode = _ref.mode,
+    setMode = _ref.setMode,
+    features = _ref.features,
+    setFeatures = _ref.setFeatures;
+  var onSelect = function onSelect(eventKey, event) {
+    console.log(eventKey); // selected event will trigger
+    switch (eventKey) {
+      case "DrawPolygonMode":
+        setMode(function () {
+          return _editModes.DrawPolygonMode;
+        });
+        break;
+      case "DrawLineStringMode":
+        setMode(function () {
+          return _editModes.DrawLineStringMode;
+        });
+        break;
+      case "DrawPolygonByDraggingMode":
+        setMode(function () {
+          return _editModes.DrawPolygonByDraggingMode;
+        });
+        break;
+      case "DrawRectangleMode":
+        setMode(function () {
+          return _editModes.DrawRectangleMode;
+        });
+        break;
+      case "ModifyMode":
+        setMode(function () {
+          return _editModes.ModifyMode;
+        });
+        break;
+      default:
+        setMode(function () {
+          return _editModes.ViewMode;
+        });
+    }
+  };
+  var deleteFeatures = function deleteFeatures(eventKey, event) {
+    console.log(eventKey); // selected event will trigger
+    setFeatures({
+      type: "FeatureCollection",
+      features: []
+    });
+  };
   return /*#__PURE__*/_react.React.createElement("div", {
     className: "cherita-toolbox"
-  }, /*#__PURE__*/_react.React.createElement(_Dropdown.default, null, /*#__PURE__*/_react.React.createElement(_Dropdown.default.Toggle, {
-    variant: "success",
-    id: "dropdown-basic"
-  }, "Dropdown Button"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Menu, null, /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
-    href: "#/action-1"
-  }, "Action"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
-    href: "#/action-2"
-  }, "Another action"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
-    href: "#/action-3"
-  }, "Something else"))), /*#__PURE__*/_react.React.createElement(_ButtonGroup.default, null, /*#__PURE__*/_react.React.createElement(_Button.default, null, /*#__PURE__*/_react.React.createElement(_reactFontawesome.FontAwesomeIcon, {
-    icon: _freeSolidSvgIcons.faArrowPointer
-  }), " Mode"), /*#__PURE__*/_react.React.createElement(_Button.default, null, "2"), /*#__PURE__*/_react.React.createElement(_DropdownButton.default, {
+  }, /*#__PURE__*/_react.React.createElement(_ButtonGroup.default, null, /*#__PURE__*/_react.React.createElement(_DropdownButton.default, {
     as: _ButtonGroup.default,
-    title: "test" + /*#__PURE__*/_react.React.createElement(_reactFontawesome.FontAwesomeIcon, {
+    title: /*#__PURE__*/_react.React.createElement(_react.React.Fragment, null, /*#__PURE__*/_react.React.createElement(_reactFontawesome.FontAwesomeIcon, {
       icon: _freeSolidSvgIcons.faArrowPointer
-    }),
-    id: "bg-nested-dropdown"
+    }), " Mode"),
+    id: "bg-nested-dropdown",
+    onSelect: onSelect
   }, /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
-    eventKey: "1"
-  }, "Dropdown link"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
-    eventKey: "2"
-  }, "Dropdown link"))));
+    eventKey: "DrawPolygonMode"
+  }, "DrawPolygonMode"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
+    eventKey: "DrawLineStringMode"
+  }, "DrawLineStringMode"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
+    eventKey: "DrawPolygonByDraggingMode"
+  }, "DrawPolygonByDraggingMode"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
+    eventKey: "DrawRectangleMode"
+  }, "DrawRectangleMode"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
+    eventKey: "ModifyMode"
+  }, "ModifyMode"), /*#__PURE__*/_react.React.createElement(_Dropdown.default.Item, {
+    eventKey: "ViewMode"
+  }, "ViewMode")), /*#__PURE__*/_react.React.createElement(_Button.default, {
+    variant: "primary",
+    onClick: deleteFeatures
+  }, "Delete")));
 }