@aics/vole-app 2.15.0 → 3.1.2

package/es/aics-image-viewer/components/TfEditor/styles.css

@@ -1,18 +1,22 @@
-.channel-row .tf-editor-svg.dragging.basic{
-      cursor:ew-resize;
-    }
+.channel-row .tf-editor{
+  margin-top:27px;
+}
 
-.channel-row .tf-editor-svg.dragging.advanced{
-      cursor:move;
-    }
+.channel-row .tf-editor .tf-editor-svg.dragging-slider{
+    cursor:ew-resize;
+  }
 
-.channel-row .tf-editor-popover{
+.channel-row .tf-editor .tf-editor-svg.dragging-point{
+    cursor:move;
+  }
+
+.channel-row .tf-editor .tf-editor-popover{
     position:absolute;
     z-index:9999;
     width:100%;
   }
 
-.channel-row .tf-editor-cover{
+.channel-row .tf-editor .tf-editor-cover{
     position:fixed;
     top:0;
     left:0;
@@ -20,32 +24,39 @@
     bottom:0;
   }
 
-.channel-row .tf-editor-control-row{
+.channel-row .tf-editor .tf-editor-control-row{
     display:flex;
     color:var(--color-controlpanel-text);
+    justify-content:space-between;
     align-items:center;
     min-height:24px;
-    gap:5px;
   }
 
-.channel-row .tf-editor-control-row.ramp-row{
-      margin-top:15px;
+.channel-row .tf-editor .tf-editor-control-row:not(:first-child){
+      margin-bottom:12px;
     }
 
-.channel-row .tf-editor-control-row.plot-range-row{
-      margin-bottom:20px;
+.channel-row .tf-editor .tf-editor-control-row > div{
+      display:flex;
+      gap:5px;
     }
 
-.channel-row .tf-editor-control-row .ant-input-number{
+.channel-row .tf-editor .tf-editor-control-row .ant-input-number{
       border-color:var(--color-button-tertiary-outline);
       width:64px;
     }
 
-.channel-row .tf-editor-control-row .ant-input-number input{
+.channel-row .tf-editor .tf-editor-control-row .ant-input-number input{
         text-align:right;
       }
 
-.channel-row .tick text{
+.channel-row .tf-editor h4{
+    font-size:16px;
+    margin-top:0;
+    margin-bottom:12px;
+  }
+
+.channel-row .tf-editor .tick text{
     fill:var(--color-controlpanel-text);
     user-select:none;
     -o-user-select:none;
@@ -54,47 +65,58 @@
     -webkit-user-select:none;
   }
 
-.channel-row rect.bar{
+.channel-row .tf-editor rect.bar{
     fill:var(--color-controlpanel-border);
   }
 
-.channel-row .axis path,
-  .channel-row .axis line{
+.channel-row .tf-editor .axis path,
+  .channel-row .tf-editor .axis line{
     stroke:var(--color-controlpanel-border);
   }
 
-.channel-row rect{
+.channel-row .tf-editor rect{
     fill:none;
     pointer-events:all;
   }
 
-.channel-row .line{
+.channel-row .tf-editor .line{
     stroke:#aeacae;
     stroke-width:1px;
   }
 
-.channel-row .ramp-sliders path{
-      fill:var(--color-controlpanel-ramp-slider);
+.channel-row .tf-editor .sliders path,
+    .channel-row .tf-editor .sliders line{
       cursor:ew-resize;
     }
 
-.channel-row .ramp-sliders line{
-      stroke:var(--color-controlpanel-ramp-slider);
-      cursor:ew-resize;
+.channel-row .tf-editor .sliders line.slider-click-target{
+      stroke:transparent;
     }
 
-.channel-row .ramp-sliders line.ramp-slider-click-target{
-        stroke:transparent;
+.channel-row .tf-editor .sliders.sliders-ramp path{
+        fill:var(--color-controlpanel-ramp-slider);
+      }
+
+.channel-row .tf-editor .sliders.sliders-ramp line:not(.slider-click-target){
+        stroke:var(--color-controlpanel-ramp-slider);
+      }
+
+.channel-row .tf-editor .sliders.sliders-isovalue path{
+        fill:var(--color-controlpanel-isovalue-slider);
+      }
+
+.channel-row .tf-editor .sliders.sliders-isovalue line:not(.slider-click-target){
+        stroke:var(--color-controlpanel-isovalue-slider);
       }
 
-.channel-row circle{
+.channel-row .tf-editor circle{
     fill-opacity:0.6;
     cursor:move;
     stroke:#aeacae;
     stroke-width:1.5px;
   }
 
-.channel-row circle.selected{
+.channel-row .tf-editor circle.selected{
       fill:white;
       stroke:white;
     }

package/es/aics-image-viewer/components/Toolbar/DownloadButton.js

@@ -1,5 +1,5 @@
+import { Button, Dropdown, Tooltip } from "antd";
 import React from "react";
-import { Dropdown, Button, Tooltip } from "antd";
 import ViewerIcon from "../shared/ViewerIcon";
 var DownloadButton = function DownloadButton(_ref) {
   var fovDownloadHref = _ref.fovDownloadHref,

package/es/aics-image-viewer/components/Toolbar/index.js

@@ -9,8 +9,8 @@ import { Button, Radio, Select, Tooltip } from "antd";
 import { debounce } from "lodash";
 import React from "react";
 import { ImageType, RenderMode, ViewMode } from "../../shared/enums";
+import { select, useViewerState } from "../../state/store";
 import ViewerIcon from "../shared/ViewerIcon";
-import { connectToViewerState } from "../ViewerStateProvider";
 import DownloadButton from "./DownloadButton";
 import ViewModeRadioButtons from "./ViewModeRadioButtons";
 import "./styles.css";
@@ -44,6 +44,13 @@ var Toolbar = function Toolbar(props) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     showScrollBtnRight = _React$useState6[0],
     setScrollBtnRight = _React$useState6[1];
+  var imageType = useViewerState(select("imageType"));
+  var renderMode = useViewerState(select("renderMode"));
+  var viewMode = useViewerState(select("viewMode"));
+  var autorotate = useViewerState(select("autorotate"));
+  var showAxes = useViewerState(select("showAxes"));
+  var showBoundingBox = useViewerState(select("showBoundingBox"));
+  var changeViewerSetting = useViewerState(select("changeViewerSetting"));
 
   // Scroll buttons are only visible when toolbar can be scrolled in that direction.
   // This may change on either scroll or resize.
@@ -105,22 +112,17 @@ var Toolbar = function Toolbar(props) {
     scrollX(e.deltaY);
   };
   var toggleAxis = function toggleAxis() {
-    return props.changeViewerSetting("showAxes", !props.showAxes);
+    return changeViewerSetting("showAxes", !showAxes);
   };
   var toggleBoundingBox = function toggleBoundingBox() {
-    return props.changeViewerSetting("showBoundingBox", !props.showBoundingBox);
+    return changeViewerSetting("showBoundingBox", !showBoundingBox);
   };
   // TODO remove ant-btn-icon-only hack when upgrading antd
   var classForToggleBtn = function classForToggleBtn(active) {
     return "ant-btn-icon-only btn-borderless" + (active ? " btn-active" : "");
   };
-  var changeViewerSetting = props.changeViewerSetting,
-    resetToSavedViewerState = props.resetToSavedViewerState,
-    visibleControls = props.visibleControls,
-    showAxes = props.showAxes,
-    showBoundingBox = props.showBoundingBox,
-    autorotate = props.autorotate;
-  var twoDMode = props.viewMode !== ViewMode.threeD;
+  var visibleControls = props.visibleControls;
+  var twoDMode = viewMode !== ViewMode.threeD;
   var renderGroup1 = visibleControls.viewModeRadioButtons || visibleControls.resetCameraButton || visibleControls.autoRotateButton;
   var renderGroup4 = visibleControls.showAxesButton || visibleControls.showBoundingBoxButton;
   var axesToggleTitle = showAxes ? "Hide axes" : "Show axes";
@@ -160,7 +162,7 @@ var Toolbar = function Toolbar(props) {
     trigger: ["focus", "hover"]
   }, /*#__PURE__*/React.createElement(Button, {
     className: "ant-btn-icon-only btn-borderless",
-    onClick: resetToSavedViewerState
+    onClick: props.resetToSavedViewerState
   }, /*#__PURE__*/React.createElement(ReloadOutlined, null), /*#__PURE__*/React.createElement("span", {
     style: visuallyHiddenStyle
   }, "Reset to initial settings")))), /*#__PURE__*/React.createElement("div", {
@@ -169,7 +171,7 @@ var Toolbar = function Toolbar(props) {
   }, renderGroup1 && /*#__PURE__*/React.createElement("div", {
     className: "viewer-toolbar-group"
   }, visibleControls.viewModeRadioButtons && /*#__PURE__*/React.createElement(ViewModeRadioButtons, {
-    mode: props.viewMode,
+    mode: viewMode,
     onViewModeChange: function onViewModeChange(newMode) {
       return changeViewerSetting("viewMode", newMode);
     }
@@ -186,7 +188,7 @@ var Toolbar = function Toolbar(props) {
     title: turntableToggleTitle
   }, /*#__PURE__*/React.createElement(Button, {
     className: classForToggleBtn(autorotate && !twoDMode),
-    disabled: twoDMode || props.renderMode === RenderMode.pathTrace,
+    disabled: twoDMode || renderMode === RenderMode.pathTrace,
     onClick: function onClick() {
       return changeViewerSetting("autorotate", !autorotate);
     }
@@ -195,7 +197,7 @@ var Toolbar = function Toolbar(props) {
   })))), visibleControls.fovCellSwitchControls && props.hasCellId && props.hasParentImage && /*#__PURE__*/React.createElement("div", {
     className: "viewer-toolbar-group"
   }, /*#__PURE__*/React.createElement(Radio.Group, {
-    value: props.imageType,
+    value: imageType,
     onChange: function onChange(_ref) {
       var target = _ref.target;
       return changeViewerSetting("imageType", target.value);
@@ -209,7 +211,7 @@ var Toolbar = function Toolbar(props) {
   }, /*#__PURE__*/React.createElement(Select, {
     className: "select-render-setting",
     popupClassName: "viewer-toolbar-dropdown",
-    value: props.renderMode,
+    value: renderMode,
     onChange: function onChange(value) {
       return changeViewerSetting("renderMode", value);
     },
@@ -275,4 +277,4 @@ var Toolbar = function Toolbar(props) {
     }
   })));
 };
-export default connectToViewerState(Toolbar, ["imageType", "renderMode", "viewMode", "autorotate", "showAxes", "showBoundingBox", "changeViewerSetting", "resetToSavedViewerState"]);
+export default Toolbar;

package/es/aics-image-viewer/components/shared/SharedCheckBox.js

@@ -1,5 +1,5 @@
-import React from "react";
 import { Checkbox } from "antd";
+import React from "react";
 var SharedCheckbox = function SharedCheckbox(props) {
   var onCheckAllChange = function onCheckAllChange(_ref) {
     var target = _ref.target;

package/es/aics-image-viewer/components/shared/SliderRow/styles.css

@@ -2,6 +2,7 @@
   display:flex;
   align-items:center;
   margin-right:10px;
+  gap:5px;
 }
 
   .viewer-control-row:not(:last-child){

package/es/aics-image-viewer/components/shared/SmarterSlider.js

@@ -10,8 +10,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import React from "react";
 import Nouislider from "nouislider-react";
+import React from "react";
 var MemoedNouislider = /*#__PURE__*/React.memo(Nouislider, function (_prevProps, _ref) {
   var noUpdate = _ref.noUpdate;
   return noUpdate;

package/es/aics-image-viewer/components/shared/ViewerIcon.js

@@ -5,8 +5,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React from "react";
 import Icon from "@ant-design/icons";
+import React from "react";
 import ICONS from "../../assets/icons";
 var STYLE = {
   fontSize: "19px"

package/es/aics-image-viewer/components/useVolume.js

@@ -1,5 +1,13 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _regeneratorRuntime() { "use strict"; var r = _regenerator(), e = r.m(_regeneratorRuntime), t = (Object.getPrototypeOf ? Object.getPrototypeOf(e) : e.__proto__).constructor; function n(r) { var e = "function" == typeof r && r.constructor; return !!e && (e === t || "GeneratorFunction" === (e.displayName || e.name)); } var o = { "throw": 1, "return": 2, "break": 3, "continue": 3 }; function a(r) { var e, t; return function (n) { e || (e = { stop: function stop() { return t(n.a, 2); }, "catch": function _catch() { return n.v; }, abrupt: function abrupt(r, e) { return t(n.a, o[r], e); }, delegateYield: function delegateYield(r, o, a) { return e.resultName = o, t(n.d, _regeneratorValues(r), a); }, finish: function finish(r) { return t(n.f, r); } }, t = function t(r, _t, o) { n.p = e.prev, n.n = e.next; try { return r(_t, o); } finally { e.next = n.n; } }), e.resultName && (e[e.resultName] = n.v, e.resultName = void 0), e.sent = n.v, e.next = n.n; try { return r.call(this, e); } finally { n.p = e.prev, n.n = e.next; } }; } return (_regeneratorRuntime = function _regeneratorRuntime() { return { wrap: function wrap(e, t, n, o) { return r.w(a(e), t, n, o && o.reverse()); }, isGeneratorFunction: n, mark: r.m, awrap: function awrap(r, e) { return new _OverloadYield(r, e); }, AsyncIterator: _regeneratorAsyncIterator, async: function async(r, e, t, o, u) { return (n(e) ? _regeneratorAsyncGen : _regeneratorAsync)(a(r), e, t, o, u); }, keys: _regeneratorKeys, values: _regeneratorValues }; })(); }
+function _regeneratorValues(e) { if (null != e) { var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"], r = 0; if (t) return t.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) return { next: function next() { return e && r >= e.length && (e = void 0), { value: e && e[r++], done: !e }; } }; } throw new TypeError(_typeof(e) + " is not iterable"); }
+function _regeneratorKeys(e) { var n = Object(e), r = []; for (var t in n) r.unshift(t); return function e() { for (; r.length;) if ((t = r.pop()) in n) return e.value = t, e.done = !1, e; return e.done = !0, e; }; }
+function _regeneratorAsync(n, e, r, t, o) { var a = _regeneratorAsyncGen(n, e, r, t, o); return a.next().then(function (n) { return n.done ? n.value : a.next(); }); }
+function _regeneratorAsyncGen(r, e, t, o, n) { return new _regeneratorAsyncIterator(_regenerator().w(r, e, t, o), n || Promise); }
+function _regeneratorAsyncIterator(t, e) { function n(r, o, i, f) { try { var c = t[r](o), u = c.value; return u instanceof _OverloadYield ? e.resolve(u.v).then(function (t) { n("next", t, i, f); }, function (t) { n("throw", t, i, f); }) : e.resolve(u).then(function (t) { c.value = t, i(c); }, function (t) { return n("throw", t, i, f); }); } catch (t) { f(t); } } var r; this.next || (_regeneratorDefine2(_regeneratorAsyncIterator.prototype), _regeneratorDefine2(_regeneratorAsyncIterator.prototype, "function" == typeof Symbol && Symbol.asyncIterator || "@asyncIterator", function () { return this; })), _regeneratorDefine2(this, "_invoke", function (t, o, i) { function f() { return new e(function (e, r) { n(t, i, e, r); }); } return r = r ? r.then(f, f) : f(); }, !0); }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+function _OverloadYield(e, d) { this.v = e, this.k = d; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -14,16 +22,16 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { LoadSpec, VolumeLoaderContext } from "@aics/vole-core";
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Box3, Vector3 } from "three";
-import { AXIS_TO_LOADER_PRIORITY, CACHE_MAX_SIZE, getDefaultChannelColor, QUEUE_MAX_LOW_PRIORITY_SIZE, QUEUE_MAX_SIZE } from "../shared/constants";
+import { AXIS_TO_LOADER_PRIORITY, CACHE_MAX_SIZE, getDefaultChannelColor, getDefaultViewerChannelSettings, QUEUE_MAX_LOW_PRIORITY_SIZE, QUEUE_MAX_SIZE } from "../shared/constants";
 import { ViewMode } from "../shared/enums";
 import { useConstructor, useRefWithSetter } from "../shared/utils/hooks";
 import PlayControls from "../shared/utils/playControls";
 import SceneStore from "../shared/utils/sceneStore";
-import { getDisplayName, makeChannelIndexGrouping } from "../shared/utils/viewerChannelSettings";
+import { makeChannelIndexGrouping } from "../shared/utils/viewerChannelSettings";
 import { initializeOneChannelSetting } from "../shared/utils/viewerState";
-import { ViewerStateContext } from "./ViewerStateProvider";
+import { select, useViewerState } from "../state/store";
 export var ImageLoadStatus = /*#__PURE__*/function (ImageLoadStatus) {
   ImageLoadStatus[ImageLoadStatus["REQUESTED"] = 0] = "REQUESTED";
   ImageLoadStatus[ImageLoadStatus["LOADING"] = 1] = "LOADING";
@@ -31,8 +39,11 @@ export var ImageLoadStatus = /*#__PURE__*/function (ImageLoadStatus) {
   ImageLoadStatus[ImageLoadStatus["ERROR"] = 3] = "ERROR";
   return ImageLoadStatus;
 }({});
-
-// Used by `channelVersions` (see below)
+var LoadType = /*#__PURE__*/function (LoadType) {
+  LoadType[LoadType["TIME"] = 0] = "TIME";
+  LoadType[LoadType["SCENE"] = 1] = "SCENE";
+  return LoadType;
+}(LoadType || {}); // Used by `channelVersions` (see below)
 var CHANNEL_INITIAL_LOAD = -1;
 var CHANNEL_RELOAD = 0;
 /**
@@ -63,9 +74,12 @@ var useEffectEventRef = function useEffectEventRef(callback) {
  * @returns An object with the current image, its load status, and controls for playback and loading.
  */
 var useVolume = function useVolume(scenePaths, options) {
-  var viewerStateRef = useContext(ViewerStateContext).ref;
+  var channelSettings = useViewerState(select("channelSettings"));
+  var changeViewerSetting = useViewerState(select("changeViewerSetting"));
+  var replaceAllChannelSettings = useViewerState(select("replaceAllChannelSettings"));
   var onErrorRef = useEffectEventRef(options === null || options === void 0 ? void 0 : options.onError);
   var onChannelLoadedRef = useEffectEventRef(options === null || options === void 0 ? void 0 : options.onChannelLoaded);
+  var onChangeSceneRef = useEffectEventRef(options === null || options === void 0 ? void 0 : options.onChangeScene);
   var onCreateImageRef = useEffectEventRef(options === null || options === void 0 ? void 0 : options.onCreateImage);
   var maskChannelName = options === null || options === void 0 ? void 0 : options.maskChannelName;
 
@@ -117,7 +131,7 @@ var useVolume = function useVolume(scenePaths, options) {
     _useRefWithSetter2 = _slicedToArray(_useRefWithSetter, 2),
     channelVersionsRef = _useRefWithSetter2[0],
     setChannelVersions = _useRefWithSetter2[1];
-  var channelSettings = viewerStateRef.current.channelSettings;
+
   // Some extra items for tracking load status
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -149,10 +163,13 @@ var useVolume = function useVolume(scenePaths, options) {
     }
     return noneLoaded ? ImageLoadStatus.REQUESTED : allLoaded ? ImageLoadStatus.LOADED : ImageLoadStatus.LOADING;
   }, [channelVersions, channelSettings, maskChannelName, loadThrewError]);
-  var setIsLoading = useCallback(function () {
+  var setIsLoading = useCallback(function (loadType) {
     setLoadThrewError(false);
     setChannelVersions(channelVersionsRef.current.map(function (version) {
-      return Math.min(version, CHANNEL_RELOAD);
+      return (
+        // For scenes, reinitialize all channels.
+        Math.min(version, loadType === LoadType.SCENE ? CHANNEL_INITIAL_LOAD : CHANNEL_RELOAD)
+      );
     }));
   }, [channelVersionsRef, setChannelVersions]);
   var onError = useCallback(function (e) {
@@ -186,55 +203,41 @@ var useVolume = function useVolume(scenePaths, options) {
 
   // effect to start the initial load of the image
   useEffect(function () {
-    var _viewerStateRef$curre = viewerStateRef.current,
-      changeViewerSetting = _viewerStateRef$curre.changeViewerSetting,
-      channelSettings = _viewerStateRef$curre.channelSettings,
-      getCurrentViewerChannelSettings = _viewerStateRef$curre.getCurrentViewerChannelSettings,
-      setChannelSettings = _viewerStateRef$curre.setChannelSettings;
+    var channelSettings = useViewerState.getState().channelSettings;
     setChannelVersions(new Array(channelVersionsRef.current.length).fill(CHANNEL_INITIAL_LOAD));
     setLoadThrewError(false);
     inInitialLoadRef.current = true;
     var setChannelStateForNewImage = function setChannelStateForNewImage(channelNames) {
-      var viewerChannelSettings = getCurrentViewerChannelSettings();
+      var _useViewerState$getSt = useViewerState.getState(),
+        useDefaultViewerChannelSettings = _useViewerState$getSt.useDefaultViewerChannelSettings;
+      var viewerChannelSettings = useDefaultViewerChannelSettings ? getDefaultViewerChannelSettings() : options === null || options === void 0 ? void 0 : options.viewerChannelSettings;
       var grouping = makeChannelIndexGrouping(channelNames, viewerChannelSettings);
       setChannelGroupedByType(grouping);
-
-      // compare each channel's new displayName to the old displayNames currently in state:
-      // same number of channels, and each channel has same displayName
-      var allNamesAreEqual = channelNames.every(function (name, idx) {
-        var _channelSettings$idx;
-        var displayName = getDisplayName(name, idx, viewerChannelSettings);
-        return displayName === ((_channelSettings$idx = channelSettings[idx]) === null || _channelSettings$idx === void 0 ? void 0 : _channelSettings$idx.displayName);
-      });
-      if (allNamesAreEqual) {
-        var _newChannelSettings = channelNames.map(function (channel, index) {
-          return _objectSpread(_objectSpread({}, channelSettings[index]), {}, {
-            name: channel
-          });
-        });
-        setChannelSettings(_newChannelSettings);
-        return _newChannelSettings;
-      }
-      var newChannelSettings = channelNames.map(function (channel, index) {
+      var newChannelSettings = channelNames.map(function (name, index) {
+        var _channelSettings$inde;
         var color = getDefaultChannelColor(index);
-        return initializeOneChannelSetting(channel, index, color, viewerChannelSettings);
+        var channelSetting = (_channelSettings$inde = channelSettings[index]) !== null && _channelSettings$inde !== void 0 ? _channelSettings$inde : initializeOneChannelSetting(name, index, color, viewerChannelSettings);
+        return _objectSpread(_objectSpread({}, channelSetting), {}, {
+          name: name
+        });
       });
-      setChannelSettings(newChannelSettings);
+      replaceAllChannelSettings(newChannelSettings);
       return newChannelSettings;
     };
     var openImage = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _onCreateImageRef$cur, _getCurrentViewerChan;
-        var _viewerStateRef$curre2, scene, time, loadSpec, aimg, channelNames, newChannelSettings, requiredLoadSpec, requiredChannelsToLoad, maskChannelName, maskChannelIndex, slice;
+        var _onCreateImageRef$cur;
+        var scene, time, loadSpec, aimg, channelNames, newChannelSettings, requiredLoadSpec, requiredChannelsToLoad, _useViewerState$getSt2, useDefaultViewerChannelSettings, viewerChannelSettings, maskChannelName, maskChannelIndex, viewMode, slice, onCreateScene;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _viewerStateRef$curre2 = viewerStateRef.current, scene = _viewerStateRef$curre2.scene, time = _viewerStateRef$curre2.time;
+              scene = useViewerState.getState().scene;
+              time = useViewerState.getState().time;
               loadSpec = new LoadSpec();
               loadSpec.time = time;
-              _context.next = 5;
+              _context.next = 6;
               return sceneLoader.createVolume(scene, loadSpec, onChannelDataLoaded)["catch"](onError);
-            case 5:
+            case 6:
               aimg = _context.sent;
               channelNames = aimg.imageInfo.channelNames;
               newChannelSettings = setChannelStateForNewImage(channelNames);
@@ -242,9 +245,8 @@ var useVolume = function useVolume(scenePaths, options) {
               setImage(aimg);
               (_onCreateImageRef$cur = onCreateImageRef.current) === null || _onCreateImageRef$cur === void 0 || _onCreateImageRef$cur.call(onCreateImageRef, aimg);
               playControls.stepAxis = function (axis) {
-                var _viewerStateRef$curre3 = viewerStateRef.current,
-                  time = _viewerStateRef$curre3.time,
-                  slice = _viewerStateRef$curre3.slice;
+                var time = useViewerState.getState().time;
+                var slice = useViewerState.getState().slice;
                 if (axis === "t") {
                   changeViewerSetting("time", (time + 1) % aimg.imageInfo.times);
                 } else {
@@ -264,7 +266,9 @@ var useVolume = function useVolume(scenePaths, options) {
               }).filter(function (index) {
                 return index >= 0;
               }) : []; // add mask channel to required channels, if specified
-              maskChannelName = (_getCurrentViewerChan = getCurrentViewerChannelSettings()) === null || _getCurrentViewerChan === void 0 ? void 0 : _getCurrentViewerChan.maskChannelName;
+              _useViewerState$getSt2 = useViewerState.getState(), useDefaultViewerChannelSettings = _useViewerState$getSt2.useDefaultViewerChannelSettings;
+              viewerChannelSettings = useDefaultViewerChannelSettings ? getDefaultViewerChannelSettings() : options === null || options === void 0 ? void 0 : options.viewerChannelSettings;
+              maskChannelName = viewerChannelSettings === null || viewerChannelSettings === void 0 ? void 0 : viewerChannelSettings.maskChannelName;
               if (maskChannelName) {
                 maskChannelIndex = channelNames.indexOf(maskChannelName);
                 if (maskChannelIndex >= 0 && !requiredChannelsToLoad.includes(maskChannelIndex)) {
@@ -272,22 +276,24 @@ var useVolume = function useVolume(scenePaths, options) {
                 }
               }
               requiredLoadSpec.channels = requiredChannelsToLoad;
-
-              // When in 2D Z-axis view mode, we restrict the subregion to only the current slice. This is
+              viewMode = useViewerState.getState().viewMode;
+              slice = useViewerState.getState().slice; // When in 2D Z-axis view mode, we restrict the subregion to only the current slice. This is
               // to match an optimization that volume viewer does by loading Z-slices at a higher resolution,
               // and ensures the very first volume that is loaded is the same as the one that
               // will be shown whenever we switch back to the same viewer settings (2D Z-axis view mode).
               // (We don't do this for ZX and YZ modes because we assume that the data won't be chunked along the
               // X or Y axes in ways that would improve loading resolution, and we load the full 3D volume instead.)
-              if (viewerStateRef.current.viewMode === ViewMode.xy) {
-                slice = viewerStateRef.current.slice;
+              if (viewMode === ViewMode.xy) {
                 requiredLoadSpec.subregion = new Box3(new Vector3(0, 0, slice.z), new Vector3(1, 1, slice.z));
               }
 
               // initiate loading only after setting up new channel settings,
               // in case the loader callback fires before the state is set
-              sceneLoader.loadScene(scene, aimg, requiredLoadSpec)["catch"](onError);
-            case 21:
+              onCreateScene = onChangeSceneRef.current;
+              sceneLoader.loadScene(scene, aimg, requiredLoadSpec, {
+                onCreateScene: onCreateScene
+              })["catch"](onError);
+            case 27:
             case "end":
               return _context.stop();
           }
@@ -298,21 +304,24 @@ var useVolume = function useVolume(scenePaths, options) {
       };
     }();
     openImage();
-  }, [sceneLoader, onError, onCreateImageRef, onChannelLoadedRef, viewerStateRef, channelVersionsRef, setChannelVersions, playControls, setIsLoading, onChannelDataLoaded]);
+  }, [sceneLoader, onError, onCreateImageRef, onChangeSceneRef, onChannelLoadedRef, channelVersionsRef, setChannelVersions, playControls, setIsLoading, onChannelDataLoaded, changeViewerSetting, replaceAllChannelSettings, options === null || options === void 0 ? void 0 : options.viewerChannelSettings]);
   // of the above dependencies, we expect only `sceneLoader` to change.
 
   var setTime = useCallback(function (view3d, time) {
     if (image && !inInitialLoadRef.current) {
-      view3d.setTime(image, time, onChannelDataLoaded)["catch"](onError);
-      setIsLoading();
+      view3d.setTime(image, time)["catch"](onError);
+      setIsLoading(LoadType.TIME);
     }
-  }, [image, onError, setIsLoading, inInitialLoadRef, onChannelDataLoaded]);
+  }, [image, onError, setIsLoading, inInitialLoadRef]);
   var setScene = useCallback(function (scene) {
     if (image && !inInitialLoadRef.current) {
-      sceneLoader.loadScene(scene, image, undefined, onChannelDataLoaded)["catch"](onError);
-      setIsLoading();
+      var onCreateScene = onChangeSceneRef.current;
+      sceneLoader.loadScene(scene, image, undefined, {
+        onCreateScene: onCreateScene
+      })["catch"](onError);
+      setIsLoading(LoadType.SCENE);
     }
-  }, [image, onError, sceneLoader, setIsLoading, inInitialLoadRef, onChannelDataLoaded]);
+  }, [image, onError, sceneLoader, setIsLoading, inInitialLoadRef, onChangeSceneRef]);
   return useMemo(function () {
     return {
       image: image,

package/es/aics-image-viewer/shared/constants.js

@@ -19,7 +19,6 @@ export var
   // and linearly increase intensity up to the LUT_MAX_PERCENTILE fraction of pixels.
   LUT_MIN_PERCENTILE = 0.5,
   LUT_MAX_PERCENTILE = 0.983,
-  ISOSURFACE_OPACITY_SLIDER_MAX = 255.0,
   ALPHA_MASK_SLIDER_DEFAULT = 0,
   BRIGHTNESS_SLIDER_LEVEL_DEFAULT = 70,
   DENSITY_SLIDER_LEVEL_DEFAULT = 50,
@@ -208,6 +207,7 @@ export var getDefaultChannelState = function getDefaultChannelState() {
       color: [255, 255, 255]
     }],
     plotMin: 0,
-    plotMax: TFEDITOR_MAX_BIN
+    plotMax: TFEDITOR_MAX_BIN,
+    keepIntensityRange: false
   };
 };