@haniffalab/cherita-react 0.1.12-dev.2023-12-19.edfc4091 → 0.1.12-dev.2024-02-12.f6d21b70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,6 +14,7 @@ var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _requests = require("../../utils/requests");
16
16
  var _reactBootstrap = require("react-bootstrap");
17
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
18
  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); }
18
19
  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; }
19
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -269,8 +270,8 @@ function Dotplot() {
269
270
  }, [dataset.controls.colorAxis.cmin, dataset.controls.colorAxis.cmax]);
270
271
  if (hasSelections) {
271
272
  return /*#__PURE__*/_react.default.createElement("div", {
272
- className: "cherita-dotplot"
273
- }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
273
+ className: "cherita-dotplot position-relative"
274
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
274
275
  data: data,
275
276
  layout: layout,
276
277
  useResizeHandler: true,
@@ -13,6 +13,7 @@ var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
13
13
  var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _requests = require("../../utils/requests");
16
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
16
17
  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); }
17
18
  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; }
18
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -117,8 +118,8 @@ function Heatmap() {
117
118
  }, [dataset.controls.colorScale, updateColorscale]);
118
119
  if (hasSelections) {
119
120
  return /*#__PURE__*/_react.default.createElement("div", {
120
- className: "cherita-heatmap"
121
- }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
121
+ className: "cherita-heatmap position-relative"
122
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
122
123
  data: data,
123
124
  layout: layout,
124
125
  useResizeHandler: true,
@@ -14,6 +14,7 @@ var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _reactBootstrap = require("react-bootstrap");
16
16
  var _requests = require("../../utils/requests");
17
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
18
  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); }
18
19
  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; }
19
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -135,8 +136,8 @@ function Matrixplot() {
135
136
  }, [dataset.controls.colorScale, updateColorscale]);
136
137
  if (hasSelections) {
137
138
  return /*#__PURE__*/_react.default.createElement("div", {
138
- className: "cherita-matrixplot"
139
- }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
139
+ className: "cherita-matrixplot position-relative"
140
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
140
141
  data: data,
141
142
  layout: layout,
142
143
  useResizeHandler: true,
@@ -11,6 +11,9 @@ var _react = _interopRequireWildcard(require("react"));
11
11
  var _DatasetContext = require("../../context/DatasetContext");
12
12
  var _requests = require("../../utils/requests");
13
13
  var _reactBootstrap = require("react-bootstrap");
14
+ var _chromaJs = _interopRequireDefault(require("chroma-js"));
15
+ var _color = require("../../helpers/color");
16
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
14
17
  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); }
15
18
  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; }
16
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -57,16 +60,21 @@ function ObsColsList() {
57
60
  _useState2 = _slicedToArray(_useState, 2),
58
61
  obsColsList = _useState2[0],
59
62
  setObsColsList = _useState2[1];
60
- var _useState3 = (0, _react.useState)(null),
63
+ var _useState3 = (0, _react.useState)([]),
61
64
  _useState4 = _slicedToArray(_useState3, 2),
62
- active = _useState4[0],
63
- setActive = _useState4[1];
64
- var _useState5 = (0, _react.useState)({
65
+ obs = _useState4[0],
66
+ setObs = _useState4[1];
67
+ var _useState5 = (0, _react.useState)(null),
68
+ _useState6 = _slicedToArray(_useState5, 2),
69
+ active = _useState6[0],
70
+ setActive = _useState6[1];
71
+ var _useState7 = (0, _react.useState)({
65
72
  url: dataset.url
66
73
  }),
67
- _useState6 = _slicedToArray(_useState5, 2),
68
- params = _useState6[0],
69
- setParams = _useState6[1];
74
+ _useState8 = _slicedToArray(_useState7, 2),
75
+ params = _useState8[0],
76
+ setParams = _useState8[1];
77
+ var colorHelper = new _color.ColorHelper();
70
78
  (0, _react.useEffect)(function () {
71
79
  setParams(function (p) {
72
80
  return _objectSpread(_objectSpread({}, p), {}, {
@@ -82,6 +90,23 @@ function ObsColsList() {
82
90
  serverError = _useFetch.serverError;
83
91
  (0, _react.useEffect)(function () {
84
92
  if (!isPending && !serverError) {
93
+ setObs(fetchedData.reduce(function (result, key) {
94
+ var colors = _chromaJs.default.scale("Accent").colors(key.n_values, "rgb");
95
+ result[key.name] = {
96
+ is_truncated: key.is_truncated,
97
+ n_values: key.n_values,
98
+ type: key.type,
99
+ values: key.values,
100
+ state: key.values.map(function (value, index) {
101
+ return {
102
+ value: value,
103
+ color: (0, _chromaJs.default)(colors[index]).rgb(),
104
+ checked: true
105
+ };
106
+ })
107
+ };
108
+ return result;
109
+ }, {}));
85
110
  setObsColsList(fetchedData.map(function (d) {
86
111
  if (d.type === "continuous") {
87
112
  d = binContinuous(d);
@@ -98,14 +123,28 @@ function ObsColsList() {
98
123
  setActive(dataset.selectedObs.name);
99
124
  }
100
125
  }, [dataset.selectedObs]);
126
+ (0, _react.useEffect)(function () {
127
+ dispatch({
128
+ type: "set.obs",
129
+ value: obs
130
+ });
131
+ }, [obs, dispatch]);
101
132
  function categoricalList(item) {
133
+ console.log(obs);
102
134
  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Item, {
103
135
  key: item.name,
104
136
  eventKey: item.name
105
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Header, null, item.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Body, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup, null, item.values.map(function (val) {
137
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Header, null, item.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Body, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup, {
138
+ variant: "flush"
139
+ }, item.values.map(function (value, index) {
106
140
  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup.Item, {
107
- key: val
108
- }, val);
141
+ key: index
142
+ }, value, /*#__PURE__*/_react.default.createElement("span", {
143
+ className: "cm-string cm-color",
144
+ style: {
145
+ backgroundColor: "rgb(".concat(obs[item.name]["state"][index]["color"], ")")
146
+ }
147
+ }));
109
148
  }))));
110
149
  }
111
150
  function continuousList(item) {
@@ -132,18 +171,21 @@ function ObsColsList() {
132
171
  });
133
172
  }, [obsColsList]);
134
173
  return /*#__PURE__*/_react.default.createElement("div", {
135
- className: ""
136
- }, /*#__PURE__*/_react.default.createElement("div", {
174
+ className: "position-relative"
175
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("div", {
137
176
  className: "list-group overflow-auto"
138
177
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, {
178
+ flush: true,
139
179
  activeKey: active,
140
180
  onSelect: function onSelect(key) {
141
- dispatch({
142
- type: "obsSelected",
143
- obs: obsColsList.find(function (obs) {
144
- return obs.name === key;
145
- })
146
- });
181
+ if (key != null) {
182
+ dispatch({
183
+ type: "obsSelected",
184
+ obs: obsColsList.find(function (obs) {
185
+ return obs.name === key;
186
+ })
187
+ });
188
+ }
147
189
  }
148
190
  }, obsList)));
149
191
  }
@@ -0,0 +1,58 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.Legend = Legend;
7
+ require("bootstrap/dist/css/bootstrap.min.css");
8
+ var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
9
+ var _react = require("react");
10
+ var _DatasetContext = require("../../context/DatasetContext");
11
+ var _lodash = _interopRequireDefault(require("lodash"));
12
+ var _color = require("../../helpers/color");
13
+ var _OverlayTrigger = _interopRequireDefault(require("react-bootstrap/OverlayTrigger"));
14
+ var _layers = require("@nebula.gl/layers");
15
+ var _chromaJs = _interopRequireDefault(require("chroma-js"));
16
+ var _Tooltip = _interopRequireDefault(require("react-bootstrap/Tooltip"));
17
+ var _constants = require("../../constants/constants");
18
+ var _editModes = require("@nebula.gl/edit-modes");
19
+ var _Button = _interopRequireDefault(require("react-bootstrap/Button"));
20
+ var _DropdownButton = _interopRequireDefault(require("react-bootstrap/DropdownButton"));
21
+ var _ButtonGroup = _interopRequireDefault(require("react-bootstrap/ButtonGroup"));
22
+ var _reactFontawesome = require("@fortawesome/react-fontawesome");
23
+ var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
24
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
+ function Legend(_ref) {
26
+ var values = _ref.values;
27
+ var dataset = (0, _DatasetContext.useDataset)();
28
+ var colorHelper = new _color.ColorHelper();
29
+ if (dataset.colorEncoding === "var") {
30
+ var c = colorHelper.getScale(dataset, values);
31
+ var dom = c.domain ? c.domain() : [0, 1],
32
+ dmin = Math.min(dom[0], dom[dom.length - 1]),
33
+ dmax = Math.max(dom[dom.length - 1], dom[0]);
34
+ var legendList = [];
35
+ for (var i = 0; i <= 100; i++) {
36
+ var color = c(dmin + i / 100 * (dmax - dmin));
37
+ //console.log(color.hex());
38
+ legendList.push( /*#__PURE__*/_react.React.createElement("span", {
39
+ className: "grad-step",
40
+ style: {
41
+ backgroundColor: color.hex()
42
+ }
43
+ }));
44
+ }
45
+ return /*#__PURE__*/_react.React.createElement("div", {
46
+ className: "cherita-legend"
47
+ }, /*#__PURE__*/_react.React.createElement("div", {
48
+ className: "gradient"
49
+ }, legendList, /*#__PURE__*/_react.React.createElement("span", {
50
+ className: "domain-min"
51
+ }, dmin), /*#__PURE__*/_react.React.createElement("span", {
52
+ className: "domain-med"
53
+ }, (dmin + dmax) * 0.5), /*#__PURE__*/_react.React.createElement("span", {
54
+ className: "domain-max"
55
+ }, dmax)));
56
+ }
57
+ return /*#__PURE__*/_react.React.createElement(_react.React.Fragment, null);
58
+ }
@@ -7,21 +7,28 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.Scatterplot = Scatterplot;
8
8
  exports.ScatterplotControls = ScatterplotControls;
9
9
  require("bootstrap/dist/css/bootstrap.min.css");
10
- var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
11
- var _react = require("react");
10
+ var _react = _interopRequireWildcard(require("react"));
12
11
  var _lodash = _interopRequireDefault(require("lodash"));
13
12
  var _chromaJs = _interopRequireDefault(require("chroma-js"));
14
13
  var _react2 = _interopRequireDefault(require("@deck.gl/react"));
15
14
  var _layers = require("@deck.gl/layers");
16
- var _DatasetContext = require("../../context/DatasetContext");
17
- var _map = require("../../helpers/map");
18
- var _zarr = require("../../helpers/zarr");
19
- var _Button = _interopRequireDefault(require("react-bootstrap/Button"));
20
15
  var _layers2 = require("@nebula.gl/layers");
21
16
  var _editModes = require("@nebula.gl/edit-modes");
22
- var _editor = require("@nebula.gl/editor");
17
+ var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
23
18
  var _Toolbox = require("./Toolbox");
19
+ var _Legend = require("./Legend");
20
+ var _constants = require("../../constants/constants");
21
+ var _DatasetContext = require("../../context/DatasetContext");
22
+ var _map = require("../../helpers/map");
23
+ var _zarr = require("../../helpers/zarr");
24
+ var _color = require("../../helpers/color");
24
25
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
26
+ 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); }
27
+ 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; }
28
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
29
+ 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."); }
30
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
31
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
25
32
  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; }
26
33
  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); } }
27
34
  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,12 +42,28 @@ window.deck.log.level = 1;
35
42
  function ScatterplotControls() {
36
43
  var dataset = (0, _DatasetContext.useDataset)();
37
44
  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
38
- return /*#__PURE__*/_react.React.createElement(_react.React.Fragment, null);
45
+ var colormapList = _constants.PLOTLY_COLORSCALES.map(function (item) {
46
+ return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
47
+ key: item,
48
+ active: dataset.controls.colorScale === item,
49
+ onClick: function onClick() {
50
+ dispatch({
51
+ type: "set.controls.colorScale",
52
+ colorScale: item
53
+ });
54
+ }
55
+ }, item);
56
+ });
57
+ return /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
58
+ id: "dropdownColorscale",
59
+ variant: "light"
60
+ }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, colormapList));
39
61
  }
40
62
  function Scatterplot(_ref) {
41
63
  var _ref$radius = _ref.radius,
42
64
  radius = _ref$radius === void 0 ? 30 : _ref$radius;
43
65
  var dataset = (0, _DatasetContext.useDataset)();
66
+ var dispatch = (0, _DatasetContext.useDatasetDispatch)();
44
67
  var _useState = (0, _react.useState)({
45
68
  type: "FeatureCollection",
46
69
  features: []
@@ -54,14 +77,14 @@ function Scatterplot(_ref) {
54
77
  _useState4 = _slicedToArray(_useState3, 2),
55
78
  mode = _useState4[0],
56
79
  setMode = _useState4[1];
57
- var _useState5 = (0, _react.useState)({}),
80
+ var _useState5 = (0, _react.useState)([]),
58
81
  _useState6 = _slicedToArray(_useState5, 2),
59
- modeConfig = _useState6[0],
60
- setModeConfig = _useState6[1];
82
+ selectedFeatureIndexes = _useState6[0],
83
+ setSelectedFeatureIndexes = _useState6[1];
61
84
  var _useState7 = (0, _react.useState)([]),
62
85
  _useState8 = _slicedToArray(_useState7, 2),
63
- selectedFeatureIndexes = _useState8[0],
64
- setSelectedFeatureIndexes = _useState8[1];
86
+ featureState = _useState8[0],
87
+ setFeatureState = _useState8[1];
65
88
  var _useState9 = (0, _react.useState)([]),
66
89
  _useState10 = _slicedToArray(_useState9, 2),
67
90
  data = _useState10[0],
@@ -87,18 +110,19 @@ function Scatterplot(_ref) {
87
110
  setViewport = _useState16[1];
88
111
  (0, _react.useEffect)(function () {
89
112
  setData(function (prevState, props) {
90
- var colorScale = _chromaJs.default.scale(["yellow", "008ae5"]).domain([_lodash.default.min(values), _lodash.default.max(values)]);
113
+ var colorHelper = new _color.ColorHelper();
114
+ var scale = dataset.colorEncoding === "var" ? colorHelper.getScale(dataset, values) : null;
91
115
  var data = position.map(function (e, i) {
92
116
  return {
93
117
  index: i,
94
118
  position: [position[i][0], position[i][1]],
95
119
  value: values[i],
96
- color: colorScale(values[i]).rgb()
120
+ color: colorHelper.getColor(dataset, values[i], scale)
97
121
  };
98
122
  });
99
123
  return data;
100
124
  });
101
- }, [position, values]);
125
+ }, [position, values, dataset.controls.colorScale]);
102
126
  (0, _react.useEffect)(function () {
103
127
  if (dataset.selectedObsm) {
104
128
  var helper = new _map.MapHelper();
@@ -158,6 +182,10 @@ function Scatterplot(_ref) {
158
182
  _context2.next = 5;
159
183
  return z.get([null, dataset.selectedVar.matrix_index], _zarr.GET_OPTIONS).then(function (result) {
160
184
  setValues(result.data);
185
+ dispatch({
186
+ type: "set.colorEncoding",
187
+ value: "var"
188
+ });
161
189
  });
162
190
  case 5:
163
191
  case "end":
@@ -171,9 +199,43 @@ function Scatterplot(_ref) {
171
199
  }();
172
200
  fetchData().catch(console.error);
173
201
  }
174
- }, [dataset.url, dataset.selectedObs, dataset.selectedVar]);
202
+ }, [dataset.url, dataset.selectedVar]);
203
+ (0, _react.useEffect)(function () {
204
+ if (dataset.selectedObs) {
205
+ var zarrHelper = new _zarr.ZarrHelper();
206
+ var fetchData = /*#__PURE__*/function () {
207
+ var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
208
+ var z;
209
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
210
+ while (1) switch (_context3.prev = _context3.next) {
211
+ case 0:
212
+ _context3.next = 2;
213
+ return zarrHelper.open(dataset.url, "obs/" + dataset.selectedObs.name + "/codes");
214
+ case 2:
215
+ z = _context3.sent;
216
+ _context3.next = 5;
217
+ return z.get().then(function (result) {
218
+ setValues(result.data);
219
+ dispatch({
220
+ type: "set.colorEncoding",
221
+ value: "obs"
222
+ });
223
+ });
224
+ case 5:
225
+ case "end":
226
+ return _context3.stop();
227
+ }
228
+ }, _callee3);
229
+ }));
230
+ return function fetchData() {
231
+ return _ref4.apply(this, arguments);
232
+ };
233
+ }();
234
+ fetchData().catch(console.error);
235
+ }
236
+ }, [dataset.url, dataset.selectedObs]);
175
237
  var layers = [new _layers.ScatterplotLayer({
176
- id: "scatter-plot",
238
+ id: "cherita-layer-scatterplot",
177
239
  data: data,
178
240
  radiusScale: radius,
179
241
  radiusMinPixels: 1,
@@ -185,16 +247,28 @@ function Scatterplot(_ref) {
185
247
  },
186
248
  getRadius: 1
187
249
  }), new _layers2.EditableGeoJsonLayer({
188
- // id: "geojson-layer",
250
+ id: "cherita-layer-draw",
189
251
  data: features,
190
252
  mode: mode,
191
- modeConfig: modeConfig,
192
253
  selectedFeatureIndexes: selectedFeatureIndexes,
193
- onEdit: function onEdit(_ref4) {
194
- var updatedData = _ref4.updatedData;
254
+ onEdit: function onEdit(_ref5) {
255
+ var updatedData = _ref5.updatedData,
256
+ editType = _ref5.editType,
257
+ editContext = _ref5.editContext;
195
258
  setFeatures(updatedData);
259
+ var updatedSelectedFeatureIndexes = selectedFeatureIndexes;
260
+ setFeatureState({
261
+ data: updatedData
262
+ });
263
+ if (editType === "addFeature") {
264
+ // when a drawing is complete, the value of editType becomes addFeature
265
+ var featureIndexes = editContext.featureIndexes; //extracting indexes of current features selected
266
+ updatedSelectedFeatureIndexes = [].concat(_toConsumableArray(selectedFeatureIndexes), _toConsumableArray(featureIndexes));
267
+ }
268
+ setSelectedFeatureIndexes(updatedSelectedFeatureIndexes); //now update your state
196
269
  }
197
270
  })];
271
+
198
272
  function onLayerClick(info) {
199
273
  if (mode !== _editModes.ViewMode) {
200
274
  // don't change selection while editing
@@ -202,19 +276,19 @@ function Scatterplot(_ref) {
202
276
  }
203
277
  setSelectedFeatureIndexes(info.object ? [info.index] : []);
204
278
  }
205
- return /*#__PURE__*/_react.React.createElement(_react.React.Fragment, null, /*#__PURE__*/_react.React.createElement("div", {
279
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
206
280
  className: "cherita-scatterplot"
207
- }, /*#__PURE__*/_react.React.createElement(_react2.default, {
281
+ }, /*#__PURE__*/_react.default.createElement(_react2.default, {
208
282
  layers: layers,
209
283
  initialViewState: viewport,
210
284
  controller: true,
211
285
  onClick: onLayerClick
212
- }), /*#__PURE__*/_react.React.createElement(_Toolbox.Toolbox2, {
286
+ }), /*#__PURE__*/_react.default.createElement(_Toolbox.Toolbox, {
213
287
  mode: mode,
214
288
  setMode: setMode,
215
- modeConfig: modeConfig,
216
- setModeConfig: setModeConfig,
217
289
  features: mode,
218
290
  setFeatures: setFeatures
291
+ }), /*#__PURE__*/_react.default.createElement(_Legend.Legend, {
292
+ values: values
219
293
  })));
220
294
  }
@@ -3,12 +3,10 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.Toolbox2 = Toolbox2;
6
+ exports.Toolbox = Toolbox;
7
7
  require("bootstrap/dist/css/bootstrap.min.css");
8
8
  var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
9
9
  var _react = require("react");
10
- var _DatasetContext = require("../../context/DatasetContext");
11
- var _layers = require("@nebula.gl/layers");
12
10
  var _editModes = require("@nebula.gl/edit-modes");
13
11
  var _Button = _interopRequireDefault(require("react-bootstrap/Button"));
14
12
  var _DropdownButton = _interopRequireDefault(require("react-bootstrap/DropdownButton"));
@@ -16,7 +14,7 @@ var _ButtonGroup = _interopRequireDefault(require("react-bootstrap/ButtonGroup")
16
14
  var _reactFontawesome = require("@fortawesome/react-fontawesome");
17
15
  var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
18
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
- function Toolbox2(_ref) {
17
+ function Toolbox(_ref) {
20
18
  var mode = _ref.mode,
21
19
  setMode = _ref.setMode,
22
20
  features = _ref.features,
@@ -62,14 +60,6 @@ function Toolbox2(_ref) {
62
60
  features: []
63
61
  });
64
62
  };
65
- var undo = function undo(eventKey, event) {
66
- console.log(features); // selected event will trigger
67
- // setFeatures({
68
- // type: "FeatureCollection",
69
- // features: [],
70
- // });
71
- };
72
-
73
63
  return /*#__PURE__*/_react.React.createElement("div", {
74
64
  className: "cherita-toolbox"
75
65
  }, /*#__PURE__*/_react.React.createElement(_ButtonGroup.default, null, /*#__PURE__*/_react.React.createElement(_DropdownButton.default, {
@@ -94,8 +84,5 @@ function Toolbox2(_ref) {
94
84
  }, "ViewMode")), /*#__PURE__*/_react.React.createElement(_Button.default, {
95
85
  variant: "primary",
96
86
  onClick: deleteFeatures
97
- }, "Delete"), /*#__PURE__*/_react.React.createElement(_Button.default, {
98
- variant: "primary",
99
- onClick: undo
100
- }, "Undo")));
87
+ }, "Delete")));
101
88
  }
@@ -158,7 +158,7 @@ function VarNamesList(_ref2) {
158
158
  }, [mode, dataset.selectedMultiVar]);
159
159
  var selectVar = function selectVar(item) {
160
160
  setVarButtons(function () {
161
- if (varButtons.find(function (v) {
161
+ if (varButtons[0] && varButtons.find(function (v) {
162
162
  return v.matrix_index === item.matrix_index;
163
163
  })) {
164
164
  return varButtons;
@@ -180,7 +180,7 @@ function VarNamesList(_ref2) {
180
180
  };
181
181
  var varList = (0, _react.useMemo)(function () {
182
182
  return varButtons.map(function (item) {
183
- if (mode === _constants.SELECTION_MODES.SINGLE) {
183
+ if (item && mode === _constants.SELECTION_MODES.SINGLE) {
184
184
  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
185
185
  type: "button",
186
186
  key: item.matrix_index,
@@ -14,6 +14,7 @@ var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _reactBootstrap = require("react-bootstrap");
16
16
  var _requests = require("../../utils/requests");
17
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
18
  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); }
18
19
  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; }
19
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -132,8 +133,8 @@ function Violin(_ref) {
132
133
  }, [fetchedData, hasSelections, isPending, serverError]);
133
134
  if (hasSelections) {
134
135
  return /*#__PURE__*/_react.default.createElement("div", {
135
- className: "cherita-violin"
136
- }, /*#__PURE__*/_react.default.createElement("h5", null, mode), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
136
+ className: "cherita-violin position-relative"
137
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("h5", null, mode), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
137
138
  data: data,
138
139
  layout: layout,
139
140
  useResizeHandler: true,
@@ -3,9 +3,52 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.VIOLIN_MODES = exports.VIOLINPLOT_STANDARDSCALES = exports.SELECTION_MODES = exports.PLOTLY_COLORSCALES = exports.MATRIXPLOT_STANDARDSCALES = exports.DOTPLOT_STANDARDSCALES = void 0;
6
+ exports.VIOLIN_MODES = exports.VIOLINPLOT_STANDARDSCALES = exports.SELECTION_MODES = exports.PLOTLY_COLORSCALES = exports.MATRIXPLOT_STANDARDSCALES = exports.DOTPLOT_STANDARDSCALES = exports.CHROMA_COLORSCALES = void 0;
7
7
  var PLOTLY_COLORSCALES = ["Blackbody", "Bluered", "Blues", "Cividis", "Earth", "Electric", "Greens", "Greys", "Hot", "Jet", "Picnic", "Portland", "Rainbow", "RdBu", "Reds", "Viridis", "YlGnBu", "YlOrRd"];
8
8
  exports.PLOTLY_COLORSCALES = PLOTLY_COLORSCALES;
9
+ var CHROMA_COLORSCALES = {
10
+ OrRd: ["#fff7ec", "#fee8c8", "#fdd49e", "#fdbb84", "#fc8d59", "#ef6548", "#d7301f", "#b30000", "#7f0000"],
11
+ PuBu: ["#fff7fb", "#ece7f2", "#d0d1e6", "#a6bddb", "#74a9cf", "#3690c0", "#0570b0", "#045a8d", "#023858"],
12
+ BuPu: ["#f7fcfd", "#e0ecf4", "#bfd3e6", "#9ebcda", "#8c96c6", "#8c6bb1", "#88419d", "#810f7c", "#4d004b"],
13
+ Oranges: ["#fff5eb", "#fee6ce", "#fdd0a2", "#fdae6b", "#fd8d3c", "#f16913", "#d94801", "#a63603", "#7f2704"],
14
+ BuGn: ["#f7fcfd", "#e5f5f9", "#ccece6", "#99d8c9", "#66c2a4", "#41ae76", "#238b45", "#006d2c", "#00441b"],
15
+ YlOrBr: ["#ffffe5", "#fff7bc", "#fee391", "#fec44f", "#fe9929", "#ec7014", "#cc4c02", "#993404", "#662506"],
16
+ YlGn: ["#ffffe5", "#f7fcb9", "#d9f0a3", "#addd8e", "#78c679", "#41ab5d", "#238443", "#006837", "#004529"],
17
+ Reds: ["#fff5f0", "#fee0d2", "#fcbba1", "#fc9272", "#fb6a4a", "#ef3b2c", "#cb181d", "#a50f15", "#67000d"],
18
+ RdPu: ["#fff7f3", "#fde0dd", "#fcc5c0", "#fa9fb5", "#f768a1", "#dd3497", "#ae017e", "#7a0177", "#49006a"],
19
+ Greens: ["#f7fcf5", "#e5f5e0", "#c7e9c0", "#a1d99b", "#74c476", "#41ab5d", "#238b45", "#006d2c", "#00441b"],
20
+ YlGnBu: ["#ffffd9", "#edf8b1", "#c7e9b4", "#7fcdbb", "#41b6c4", "#1d91c0", "#225ea8", "#253494", "#081d58"],
21
+ Purples: ["#fcfbfd", "#efedf5", "#dadaeb", "#bcbddc", "#9e9ac8", "#807dba", "#6a51a3", "#54278f", "#3f007d"],
22
+ GnBu: ["#f7fcf0", "#e0f3db", "#ccebc5", "#a8ddb5", "#7bccc4", "#4eb3d3", "#2b8cbe", "#0868ac", "#084081"],
23
+ Greys: ["#ffffff", "#f0f0f0", "#d9d9d9", "#bdbdbd", "#969696", "#737373", "#525252", "#252525", "#000000"],
24
+ YlOrRd: ["#ffffcc", "#ffeda0", "#fed976", "#feb24c", "#fd8d3c", "#fc4e2a", "#e31a1c", "#bd0026", "#800026"],
25
+ PuRd: ["#f7f4f9", "#e7e1ef", "#d4b9da", "#c994c7", "#df65b0", "#e7298a", "#ce1256", "#980043", "#67001f"],
26
+ Blues: ["#f7fbff", "#deebf7", "#c6dbef", "#9ecae1", "#6baed6", "#4292c6", "#2171b5", "#08519c", "#08306b"],
27
+ PuBuGn: ["#fff7fb", "#ece2f0", "#d0d1e6", "#a6bddb", "#67a9cf", "#3690c0", "#02818a", "#016c59", "#014636"],
28
+ Viridis: ["#440154", "#482777", "#3f4a8a", "#31678e", "#26838f", "#1f9d8a", "#6cce5a", "#b6de2b", "#fee825"],
29
+ // diverging
30
+
31
+ Spectral: ["#9e0142", "#d53e4f", "#f46d43", "#fdae61", "#fee08b", "#ffffbf", "#e6f598", "#abdda4", "#66c2a5", "#3288bd", "#5e4fa2"],
32
+ RdYlGn: ["#a50026", "#d73027", "#f46d43", "#fdae61", "#fee08b", "#ffffbf", "#d9ef8b", "#a6d96a", "#66bd63", "#1a9850", "#006837"],
33
+ RdBu: ["#67001f", "#b2182b", "#d6604d", "#f4a582", "#fddbc7", "#f7f7f7", "#d1e5f0", "#92c5de", "#4393c3", "#2166ac", "#053061"],
34
+ PiYG: ["#8e0152", "#c51b7d", "#de77ae", "#f1b6da", "#fde0ef", "#f7f7f7", "#e6f5d0", "#b8e186", "#7fbc41", "#4d9221", "#276419"],
35
+ PRGn: ["#40004b", "#762a83", "#9970ab", "#c2a5cf", "#e7d4e8", "#f7f7f7", "#d9f0d3", "#a6dba0", "#5aae61", "#1b7837", "#00441b"],
36
+ RdYlBu: ["#a50026", "#d73027", "#f46d43", "#fdae61", "#fee090", "#ffffbf", "#e0f3f8", "#abd9e9", "#74add1", "#4575b4", "#313695"],
37
+ BrBG: ["#543005", "#8c510a", "#bf812d", "#dfc27d", "#f6e8c3", "#f5f5f5", "#c7eae5", "#80cdc1", "#35978f", "#01665e", "#003c30"],
38
+ RdGy: ["#67001f", "#b2182b", "#d6604d", "#f4a582", "#fddbc7", "#ffffff", "#e0e0e0", "#bababa", "#878787", "#4d4d4d", "#1a1a1a"],
39
+ PuOr: ["#7f3b08", "#b35806", "#e08214", "#fdb863", "#fee0b6", "#f7f7f7", "#d8daeb", "#b2abd2", "#8073ac", "#542788", "#2d004b"],
40
+ // qualitative
41
+
42
+ Set2: ["#66c2a5", "#fc8d62", "#8da0cb", "#e78ac3", "#a6d854", "#ffd92f", "#e5c494", "#b3b3b3"],
43
+ Accent: ["#7fc97f", "#beaed4", "#fdc086", "#ffff99", "#386cb0", "#f0027f", "#bf5b17", "#666666"],
44
+ Set1: ["#e41a1c", "#377eb8", "#4daf4a", "#984ea3", "#ff7f00", "#ffff33", "#a65628", "#f781bf", "#999999"],
45
+ Set3: ["#8dd3c7", "#ffffb3", "#bebada", "#fb8072", "#80b1d3", "#fdb462", "#b3de69", "#fccde5", "#d9d9d9", "#bc80bd", "#ccebc5", "#ffed6f"],
46
+ Dark2: ["#1b9e77", "#d95f02", "#7570b3", "#e7298a", "#66a61e", "#e6ab02", "#a6761d", "#666666"],
47
+ Paired: ["#a6cee3", "#1f78b4", "#b2df8a", "#33a02c", "#fb9a99", "#e31a1c", "#fdbf6f", "#ff7f00", "#cab2d6", "#6a3d9a", "#ffff99", "#b15928"],
48
+ Pastel2: ["#b3e2cd", "#fdcdac", "#cbd5e8", "#f4cae4", "#e6f5c9", "#fff2ae", "#f1e2cc", "#cccccc"],
49
+ Pastel1: ["#fbb4ae", "#b3cde3", "#ccebc5", "#decbe4", "#fed9a6", "#ffffcc", "#e5d8bd", "#fddaec", "#f2f2f2"]
50
+ };
51
+ exports.CHROMA_COLORSCALES = CHROMA_COLORSCALES;
9
52
  var SELECTION_MODES = {
10
53
  SINGLE: "single",
11
54
  MULTIPLE: "multiple"
@@ -61,11 +61,13 @@ function DatasetProvider(_ref2) {
61
61
  children = _ref2.children;
62
62
  var _useReducer = (0, _react.useReducer)(datasetReducer, {
63
63
  url: dataset_url,
64
+ obs: {},
64
65
  selectedObs: null,
65
66
  selectedObsm: null,
66
67
  selectedVar: null,
67
68
  selectedMultiObs: [],
68
69
  selectedMultiVar: [],
70
+ colorEncoding: null,
69
71
  controls: {
70
72
  colorScale: "Viridis",
71
73
  colorAxis: {
@@ -77,6 +79,9 @@ function DatasetProvider(_ref2) {
77
79
  standardScale: null,
78
80
  meanOnlyExpressed: false,
79
81
  expressionCutoff: 0.0
82
+ },
83
+ state: {
84
+ obs: {}
80
85
  }
81
86
  }),
82
87
  _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -103,6 +108,12 @@ function datasetReducer(dataset, action) {
103
108
  {
104
109
  return action.dataset;
105
110
  }
111
+ case "set.obs":
112
+ {
113
+ return _objectSpread(_objectSpread({}, dataset), {}, {
114
+ obs: action.value
115
+ });
116
+ }
106
117
  case "obsSelected":
107
118
  {
108
119
  return _objectSpread(_objectSpread({}, dataset), {}, {
@@ -141,6 +152,12 @@ function datasetReducer(dataset, action) {
141
152
  })
142
153
  });
143
154
  }
155
+ case "set.colorEncoding":
156
+ {
157
+ return _objectSpread(_objectSpread({}, dataset), {}, {
158
+ colorEncoding: action.value
159
+ });
160
+ }
144
161
  case "set.controls.colorScale":
145
162
  {
146
163
  return _objectSpread(_objectSpread({}, dataset), {}, {
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.ColorHelper = void 0;
7
+ var _chromaJs = _interopRequireDefault(require("chroma-js"));
8
+ var _lodash = _interopRequireDefault(require("lodash"));
9
+ var _constants = require("../constants/constants");
10
+ var _DatasetContext = require("../context/DatasetContext");
11
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
13
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
14
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
15
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
16
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
17
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
18
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
19
+ var ColorHelper = /*#__PURE__*/_createClass(function ColorHelper() {
20
+ _classCallCheck(this, ColorHelper);
21
+ _defineProperty(this, "getScale", function (dataset, values) {
22
+ return _chromaJs.default.scale(_constants.CHROMA_COLORSCALES[dataset.controls.colorScale]).domain([_lodash.default.min(values), _lodash.default.max(values)]);
23
+ });
24
+ _defineProperty(this, "getColor", function (dataset, value) {
25
+ var scale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _chromaJs.default.scale();
26
+ if (dataset.colorEncoding === "var") {
27
+ return scale(value).rgb();
28
+ } else if (dataset.colorEncoding === "obs") {
29
+ //console.log(dataset.obs[dataset.selectedObs.name].state[value]["color"]);
30
+ return dataset.obs[dataset.selectedObs.name].state.hasOwnProperty(value) ? dataset.obs[dataset.selectedObs.name].state[value]["color"] : null;
31
+ }
32
+ });
33
+ });
34
+ exports.ColorHelper = ColorHelper;
@@ -12,7 +12,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
12
12
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
13
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
14
14
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
15
- window.deck.log.level = 1;
16
15
  var MapHelper = /*#__PURE__*/_createClass(function MapHelper() {
17
16
  _classCallCheck(this, MapHelper);
18
17
  _defineProperty(this, "fitBounds", function (coords) {
@@ -30,8 +29,8 @@ var MapHelper = /*#__PURE__*/_createClass(function MapHelper() {
30
29
  var lonMin = 180;
31
30
  var lonMax = -180;
32
31
  coords.forEach(function (coord) {
33
- var RECT_LAT_INDEX = '0';
34
- var RECT_LON_INDEX = '1';
32
+ var RECT_LAT_INDEX = "0";
33
+ var RECT_LON_INDEX = "1";
35
34
  if (coord[RECT_LAT_INDEX] < latMin) latMin = coord[RECT_LAT_INDEX];
36
35
  if (coord[RECT_LAT_INDEX] > latMax) latMax = coord[RECT_LAT_INDEX];
37
36
  if (coord[RECT_LON_INDEX] < lonMin) lonMin = coord[RECT_LON_INDEX];
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.LoadingSpinner = LoadingSpinner;
7
+ require("bootstrap/dist/css/bootstrap.min.css");
8
+ var _reactBootstrap = require("react-bootstrap");
9
+ function LoadingSpinner(_ref) {
10
+ var _ref$type = _ref.type,
11
+ type = _ref$type === void 0 ? "icon" : _ref$type,
12
+ _ref$text = _ref.text,
13
+ text = _ref$text === void 0 ? "Loading..." : _ref$text;
14
+ if (type === "message") {
15
+ return /*#__PURE__*/React.createElement("div", {
16
+ className: " h-100 w-100 d-flex z-1 bg-light opacity-75 position-absolute justify-content-center align-items-center "
17
+ }, /*#__PURE__*/React.createElement(_reactBootstrap.Button, {
18
+ variant: "primary",
19
+ disabled: true
20
+ }, /*#__PURE__*/React.createElement(_reactBootstrap.Spinner, {
21
+ as: "span",
22
+ animation: "border",
23
+ size: "sm",
24
+ role: "status",
25
+ "aria-hidden": "true"
26
+ }), text));
27
+ } else {
28
+ return /*#__PURE__*/React.createElement("div", {
29
+ className: " h-100 w-100 d-flex z-1 bg-light opacity-75 position-absolute justify-content-center align-items-center "
30
+ }, /*#__PURE__*/React.createElement(_reactBootstrap.Spinner, {
31
+ animation: "border",
32
+ variant: "primary",
33
+ role: "status"
34
+ }, /*#__PURE__*/React.createElement("span", {
35
+ className: "visually-hidden"
36
+ }, text)));
37
+ }
38
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haniffalab/cherita-react",
3
- "version": "0.1.12-dev.2023-12-19.edfc4091",
3
+ "version": "0.1.12-dev.2024-02-12.f6d21b70",
4
4
  "author": "",
5
5
  "license": "",
6
6
  "main": "dist/index.js",
@@ -78,5 +78,5 @@
78
78
  "url": "https://github.com/haniffalab/cherita-react/issues"
79
79
  },
80
80
  "homepage": "https://github.com/haniffalab/cherita-react#readme",
81
- "prereleaseSha": "edfc40913a8d9d9358dda442c8aeb8dc52c10acc"
81
+ "prereleaseSha": "f6d21b70934071cac3bb5899d8aead080a15b135"
82
82
  }