@aics/vole-app 2.13.0 → 2.13.1

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

@@ -3,9 +3,6 @@ function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArra
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-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 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -18,22 +15,18 @@ 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; }
 // 3rd Party Imports
-import { LoadSpec, PrefetchDirection, RENDERMODE_PATHTRACE, RENDERMODE_RAYMARCH, View3d, VolumeFileFormat, VolumeLoaderContext } from "@aics/vole-core";
+import { RENDERMODE_PATHTRACE, RENDERMODE_RAYMARCH, View3d } from "@aics/vole-core";
 import { Layout } from "antd";
 import { debounce, isEqual } from "lodash";
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
-import { Box3, Vector3 } from "three";
-import { AXIS_MARGIN_DEFAULT, CACHE_MAX_SIZE, CLIPPING_PANEL_HEIGHT_DEFAULT, CLIPPING_PANEL_HEIGHT_TALL, CONTROL_PANEL_CLOSE_WIDTH, DTYPE_RANGE, getDefaultChannelColor, getDefaultViewerState, QUEUE_MAX_LOW_PRIORITY_SIZE, QUEUE_MAX_SIZE, SCALE_BAR_MARGIN_DEFAULT } from "../../shared/constants";
+import { AXIS_MARGIN_DEFAULT, CLIPPING_PANEL_HEIGHT_DEFAULT, CLIPPING_PANEL_HEIGHT_TALL, CONTROL_PANEL_CLOSE_WIDTH, DTYPE_RANGE, getDefaultViewerState, SCALE_BAR_MARGIN_DEFAULT } from "../../shared/constants";
 import { ImageType, RenderMode, ViewMode } from "../../shared/enums";
 import { activeAxisMap } from "../../shared/types";
 import { colorArrayToFloats } from "../../shared/utils/colorRepresentations";
 import { controlPointsToRamp, initializeLut, rampToControlPoints, remapControlPointsForChannel } from "../../shared/utils/controlPointsToLut";
-import { useConstructor, useStateWithGetter } from "../../shared/utils/hooks";
-import PlayControls from "../../shared/utils/playControls";
-import SceneStore from "../../shared/utils/sceneStore";
+import { useConstructor } from "../../shared/utils/hooks";
 import { alphaSliderToImageValue, brightnessSliderToImageValue, densitySliderToImageValue, gammaSliderToImageValues } from "../../shared/utils/sliderValuesToImageValues";
-import { getDisplayName, makeChannelIndexGrouping } from "../../shared/utils/viewerChannelSettings";
-import { initializeOneChannelSetting } from "../../shared/utils/viewerState";
+import useVolume, { ImageLoadStatus } from "../useVolume";
 import CellViewerCanvasWrapper from "../CellViewerCanvasWrapper";
 import ControlPanel from "../ControlPanel";
 import { useErrorAlert } from "../ErrorAlert";
@@ -81,12 +74,6 @@ var defaultProps = {
   canvasMargin: "0 0 0 0",
   view3dRef: undefined
 };
-var axisToLoaderPriority = {
-  t: PrefetchDirection.T_PLUS,
-  z: PrefetchDirection.Z_PLUS,
-  y: PrefetchDirection.Y_PLUS,
-  x: PrefetchDirection.X_PLUS
-};
 var CLIPPING_PANEL_ANIMATION_DURATION_MS = 300;
 var setIndicatorPositions = function setIndicatorPositions(view3d, panelOpen, hasTime, hasScenes, isMode3d) {
   // The height of the clipping panel includes the button, but we're trying to put these elements next to the button
@@ -116,59 +103,41 @@ var setIndicatorPositions = function setIndicatorPositions(view3d, panelOpen, ha
   view3d.setTimestepIndicatorPosition(SCALE_BAR_MARGIN_DEFAULT[0], scaleBarY);
   view3d.setScaleBarPosition(scaleBarX, scaleBarY);
 };
-
-// TODO this component, specifically its volume loading behavior, is way out of compliance with react-hooks lints
-//   and will need a larger refactoring pass to fix that.
-/* eslint-disable react-hooks/exhaustive-deps */
-/* eslint-disable react-hooks/rules-of-hooks */
 var App = function App(props) {
-  var _scenes$length, _scenes, _image$imageInfo$volu, _image$imageInfo$subr, _image$imageInfo$time, _props$transform2, _props$transform4;
+  var _getCurrentViewerChan, _scenes$length, _scenes2, _image$imageInfo$volu, _image$imageInfo$subr, _image$imageInfo$time, _props$transform2, _props$transform4;
   props = _objectSpread(_objectSpread({}, defaultProps), props);
 
   // State management /////////////////////////////////////////////////////////
   var viewerState = useContext(ViewerStateContext).ref;
   var _viewerState$current = viewerState.current,
+    imageType = _viewerState$current.imageType,
+    viewMode = _viewerState$current.viewMode,
     channelSettings = _viewerState$current.channelSettings,
-    setChannelSettings = _viewerState$current.setChannelSettings,
-    changeViewerSetting = _viewerState$current.changeViewerSetting,
     changeChannelSetting = _viewerState$current.changeChannelSetting,
     applyColorPresets = _viewerState$current.applyColorPresets,
     setSavedViewerChannelSettings = _viewerState$current.setSavedViewerChannelSettings,
     getCurrentViewerChannelSettings = _viewerState$current.getCurrentViewerChannelSettings,
     getChannelsAwaitingReset = _viewerState$current.getChannelsAwaitingReset,
-    getChannelsAwaitingResetOnLoad = _viewerState$current.getChannelsAwaitingResetOnLoad,
     onResetChannel = _viewerState$current.onResetChannel;
+  var _props = props,
+    onControlPanelToggle = _props.onControlPanelToggle,
+    metadata = _props.metadata,
+    metadataFormatter = _props.metadataFormatter;
   useMemo(function () {
     if (props.viewerChannelSettings) {
       setSavedViewerChannelSettings(props.viewerChannelSettings);
     }
-  }, [props.viewerChannelSettings]);
+  }, [props.viewerChannelSettings, setSavedViewerChannelSettings]);
   var view3d = useConstructor(function () {
     return new View3d();
   });
   if (props.view3dRef !== undefined) {
     props.view3dRef.current = view3d;
   }
-  var loadContext = useConstructor(function () {
-    return new VolumeLoaderContext(CACHE_MAX_SIZE, QUEUE_MAX_SIZE, QUEUE_MAX_LOW_PRIORITY_SIZE);
-  });
-
-  // install loadContext into view3d
-  view3d.loaderContext = loadContext;
-  var loader = useRef();
-  var _useState = useState(null),
-    _useState2 = _slicedToArray(_useState, 2),
-    image = _useState2[0],
-    setImage = _useState2[1];
-  var imageUrlRef = useRef("");
   var _useErrorAlert = useErrorAlert(),
     _useErrorAlert2 = _slicedToArray(_useErrorAlert, 2),
     errorAlert = _useErrorAlert2[0],
-    _showError = _useErrorAlert2[1];
-  var showError = function showError(error) {
-    _showError(error);
-    setSendingQueryRequest(false);
-  };
+    showError = _useErrorAlert2[1];
   useEffect(function () {
     // Get notifications of loading errors which occur after the initial load, e.g. on time change or new channel load
     view3d.setLoadErrorHandler(function (_vol, e) {
@@ -177,142 +146,67 @@ var App = function App(props) {
     return function () {
       return view3d.setLoadErrorHandler(undefined);
     };
-  }, [view3d]);
-  var hasRawImage = !!(props.rawData && props.rawDims);
-  var numScenes = hasRawImage ? 1 : (_scenes$length = (_scenes = props.imageUrl.scenes) === null || _scenes === void 0 ? void 0 : _scenes.length) !== null && _scenes$length !== void 0 ? _scenes$length : 1;
-  var numSlices = (_image$imageInfo$volu = image === null || image === void 0 ? void 0 : image.imageInfo.volumeSize) !== null && _image$imageInfo$volu !== void 0 ? _image$imageInfo$volu : {
-    x: 0,
-    y: 0,
-    z: 0
-  };
-  var numSlicesLoaded = (_image$imageInfo$subr = image === null || image === void 0 ? void 0 : image.imageInfo.subregionSize) !== null && _image$imageInfo$subr !== void 0 ? _image$imageInfo$subr : {
-    x: 0,
-    y: 0,
-    z: 0
-  };
-  var numTimesteps = (_image$imageInfo$time = image === null || image === void 0 ? void 0 : image.imageInfo.times) !== null && _image$imageInfo$time !== void 0 ? _image$imageInfo$time : 1;
-
-  // State for image loading/reloading
-
-  /** `true` when a channel's data has been loaded for the current image. */
-  var hasChannelLoadedRef = useRef([]);
-  // `true` when image data has been requested, but no data has been received yet
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    sendingQueryRequest = _useState4[0],
-    setSendingQueryRequest = _useState4[1];
-  // `true` when all channels of the current image are loaded
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    imageLoaded = _useState6[0],
-    setImageLoaded = _useState6[1];
-  // tracks which channels have been loaded
-  var _useStateWithGetter = useStateWithGetter([]),
-    _useStateWithGetter2 = _slicedToArray(_useStateWithGetter, 3),
-    channelVersions = _useStateWithGetter2[0],
-    setChannelVersions = _useStateWithGetter2[1],
-    getChannelVersions = _useStateWithGetter2[2];
-  // we need to keep track of channel ranges for remapping
-  var channelRangesRef = useRef([]);
-  var _useState7 = useState({}),
-    _useState8 = _slicedToArray(_useState7, 2),
-    channelGroupedByType = _useState8[0],
-    setChannelGroupedByType = _useState8[1];
-  var _useState9 = useState(function () {
-      return window.innerWidth < CONTROL_PANEL_CLOSE_WIDTH;
-    }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    controlPanelClosed = _useState10[0],
-    setControlPanelClosed = _useState10[1];
-  // Only allow auto-close once while the screen is too narrow.
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    hasAutoClosedControlPanel = _useState12[0],
-    setHasAutoClosedControlPanel = _useState12[1];
-  var _useState13 = useState(true),
-    _useState14 = _slicedToArray(_useState13, 2),
-    clippingPanelOpen = _useState14[0],
-    setClippingPanelOpen = _useState14[1];
-  var clippingPanelOpenTimeout = useRef(0);
-
-  // `PlayControls` manages playing through time and spatial axes, which isn't practical with "pure" React
-  // Playback state goes here, but the play/pause buttons that mainly control this class are down in `AxisClipSliders`
-  var playControls = useConstructor(function () {
-    return new PlayControls();
-  });
-  var _useState15 = useState(null),
-    _useState16 = _slicedToArray(_useState15, 2),
-    playingAxis = _useState16[0],
-    setPlayingAxis = _useState16[1];
-  playControls.onPlayingAxisChanged = function (axis) {
-    var _loader$current, _loader$current2;
-    (_loader$current = loader.current) === null || _loader$current === void 0 || _loader$current.setPrefetchPriority(axis ? [axisToLoaderPriority[axis]] : []);
-    (_loader$current2 = loader.current) === null || _loader$current2 === void 0 || _loader$current2.syncMultichannelLoading(axis ? true : false);
-    if (image) {
-      if (axis === null) {
-        // Playback has stopped - reset scale level bias
-        view3d.setScaleLevelBias(image, 0);
-      } else {
-        // Playback has started - unless entire axis is in memory (typical in X and Y), downlevel to speed things up
-        var shouldDownlevel = axis === "t" || numSlices[axis] !== numSlicesLoaded[axis];
-        view3d.setScaleLevelBias(image, shouldDownlevel ? 1 : 0);
+  }, [view3d, showError]);
+  var imageUrlRef = useRef("");
+  var scenesRef = useRef([]);
+  var _props2 = props,
+    imageUrl = _props2.imageUrl,
+    parentImageUrl = _props2.parentImageUrl,
+    rawData = _props2.rawData,
+    rawDims = _props2.rawDims;
+  var scenes = useMemo(function () {
+    if (rawData && rawDims) {
+      return [{
+        data: rawData,
+        metadata: rawDims
+      }];
+    } else {
+      var _scenes;
+      var showParentImage = imageType === ImageType.fullField && parentImageUrl !== undefined;
+      var path = showParentImage ? parentImageUrl : imageUrl;
+      // Don't reload if we're already looking at this image
+      if (isEqual(path, imageUrlRef.current)) {
+        return scenesRef.current;
       }
+      imageUrlRef.current = path;
+      var result = (_scenes = path.scenes) !== null && _scenes !== void 0 ? _scenes : [path];
+      scenesRef.current = result;
+      return result;
     }
-    setPlayingAxis(axis);
-  };
+  }, [imageUrl, parentImageUrl, rawData, rawDims, imageType]);
+  var maskChannelName = (_getCurrentViewerChan = getCurrentViewerChannelSettings()) === null || _getCurrentViewerChan === void 0 ? void 0 : _getCurrentViewerChan.maskChannelName;
 
-  // These last state functions are only ever used within this component - no need for a `useCallback`
-
-  var getOneChannelSetting = function getOneChannelSetting(channelName, settings) {
-    return (settings || viewerState.current.channelSettings).find(function (channel) {
-      return channel.name === channelName;
-    });
-  };
-  var setAllChannelsUnloaded = function setAllChannelsUnloaded(numberOfChannels) {
-    setChannelVersions(new Array(numberOfChannels).fill(0));
-  };
-  var setOneChannelLoaded = function setOneChannelLoaded(index) {
-    var newVersions = getChannelVersions().slice();
-    newVersions[index]++;
-    setChannelVersions(newVersions);
-  };
-
-  // Image loading/initialization functions ///////////////////////////////////
-
-  /**
-   * Updates a channel's ramp and control points after new data has been loaded.
-   *
-   * Also handles initializing the ramp/control points on initial load and resetting
-   * them when the channel is reset.
-   */
-  var updateChannelTransferFunction = function updateChannelTransferFunction(aimg, thisChannelsSettings, channelIndex) {
-    var thisChannel = aimg.getChannel(channelIndex);
-
-    // If this is the first load of this image, auto-generate initial LUTs
-    if (!hasChannelLoadedRef.current[channelIndex] || !thisChannelsSettings.controlPoints || !thisChannelsSettings.ramp || getChannelsAwaitingResetOnLoad().has(channelIndex)) {
-      var viewerChannelSettings = getCurrentViewerChannelSettings();
-      var _initializeLut = initializeLut(aimg, channelIndex, viewerChannelSettings),
-        ramp = _initializeLut.ramp,
-        controlPoints = _initializeLut.controlPoints;
+  // we need to keep track of channel ranges for remapping control points
+  var channelRangesRef = useRef([]);
+  var onChannelLoaded = useCallback(function (image, channelIndex, isInitialLoad) {
+    // TODO this was once a search by name - is that still necessary or will the index always be correct?
+    var thisChannelSettings = channelSettings[channelIndex];
+    var _viewerState$current2 = viewerState.current,
+      getChannelsAwaitingResetOnLoad = _viewerState$current2.getChannelsAwaitingResetOnLoad,
+      getCurrentViewerChannelSettings = _viewerState$current2.getCurrentViewerChannelSettings,
+      changeChannelSetting = _viewerState$current2.changeChannelSetting;
+    var ramp = thisChannelSettings.ramp,
+      controlPoints = thisChannelSettings.controlPoints;
+    var thisChannel = image.getChannel(channelIndex);
+    if (isInitialLoad || !controlPoints || !ramp || getChannelsAwaitingResetOnLoad().has(channelIndex)) {
+      // This channel needs its LUT initialized
+      var _initializeLut = initializeLut(image, channelIndex, getCurrentViewerChannelSettings()),
+        _ramp = _initializeLut.ramp,
+        _controlPoints = _initializeLut.controlPoints;
+      var dtype = thisChannel.dtype;
       changeChannelSetting(channelIndex, {
-        controlPoints: controlPoints,
-        ramp: controlPointsToRamp(ramp),
+        controlPoints: _controlPoints,
+        ramp: controlPointsToRamp(_ramp),
         // set the default range of the transfer function editor to cover the full range of the data type
-        plotMin: DTYPE_RANGE[thisChannel.dtype].min,
-        plotMax: DTYPE_RANGE[thisChannel.dtype].max
+        plotMin: DTYPE_RANGE[dtype].min,
+        plotMax: DTYPE_RANGE[dtype].max
       });
-      onResetChannel(channelIndex);
     } else {
-      // try not to update lut from here if we are in play mode
-      // if (playingAxis !== null) {
-      // do nothing here?
-      // tell gui that we have updated control pts?
-      //changeChannelSetting(channelIndex, "controlPoints", aimg.getChannel(channelIndex).lut.controlPoints);
-      // }
+      // This channel has already been initialized, but its LUT was just remapped and we need to update some things
       var oldRange = channelRangesRef.current[channelIndex];
-      if (thisChannelsSettings.useControlPoints) {
+      if (thisChannelSettings.useControlPoints) {
         // control points were just automatically remapped - update in state
-        var rampControlPoints = rampToControlPoints(thisChannelsSettings.ramp);
+        var rampControlPoints = rampToControlPoints(thisChannelSettings.ramp);
         // now manually remap ramp using the channel's old range
         var remappedRampControlPoints = remapControlPointsForChannel(rampControlPoints, oldRange, thisChannel);
         changeChannelSetting(channelIndex, {
@@ -321,76 +215,52 @@ var App = function App(props) {
         });
       } else {
         // ramp was just automatically remapped - update in state
-        var _ramp = controlPointsToRamp(thisChannel.lut.controlPoints);
+        var _ramp2 = controlPointsToRamp(thisChannel.lut.controlPoints);
         // now manually remap control points using the channel's old range
-        var _controlPoints = thisChannelsSettings.controlPoints;
-        var remappedControlPoints = remapControlPointsForChannel(_controlPoints, oldRange, thisChannel);
+        var _controlPoints2 = thisChannelSettings.controlPoints;
+        var remappedControlPoints = remapControlPointsForChannel(_controlPoints2, oldRange, thisChannel);
         changeChannelSetting(channelIndex, {
           controlPoints: remappedControlPoints,
-          ramp: _ramp
+          ramp: _ramp2
         });
       }
     }
-  };
-  var onChannelDataLoaded = function onChannelDataLoaded(aimg, thisChannelsSettings, channelIndex) {
-    var _getCurrentViewerChan;
-    var thisChannel = aimg.getChannel(channelIndex);
-    updateChannelTransferFunction(aimg, thisChannelsSettings, channelIndex);
 
     // save the channel's new range for remapping next time
     channelRangesRef.current[channelIndex] = [thisChannel.rawMin, thisChannel.rawMax];
-    view3d.updateLuts(aimg);
-    view3d.onVolumeData(aimg, [channelIndex]);
-    view3d.setVolumeChannelEnabled(aimg, channelIndex, thisChannelsSettings.volumeEnabled);
-    if (aimg.channelNames[channelIndex] === ((_getCurrentViewerChan = getCurrentViewerChannelSettings()) === null || _getCurrentViewerChan === void 0 ? void 0 : _getCurrentViewerChan.maskChannelName)) {
-      view3d.setVolumeChannelAsMask(aimg, channelIndex);
+    view3d.updateLuts(image);
+    view3d.onVolumeData(image, [channelIndex]);
+    view3d.setVolumeChannelEnabled(image, channelIndex, thisChannelSettings.volumeEnabled);
+    if (image.channelNames[channelIndex] === maskChannelName) {
+      view3d.setVolumeChannelAsMask(image, channelIndex);
     }
-    hasChannelLoadedRef.current[channelIndex] = true;
-
-    // when any channel data has arrived:
-    setSendingQueryRequest(false);
-    setOneChannelLoaded(channelIndex);
-    if (aimg.isLoaded()) {
-      view3d.updateActiveChannels(aimg);
-      setImageLoaded(true);
-      playControls.onImageLoaded();
+    if (image.isLoaded()) {
+      view3d.updateActiveChannels(image);
     }
-  };
-  var setChannelStateForNewImage = function setChannelStateForNewImage(channelNames) {
-    var grouping = makeChannelIndexGrouping(channelNames, getCurrentViewerChannelSettings());
-    setChannelGroupedByType(grouping);
+  }, [view3d, channelSettings, maskChannelName, viewerState]);
+  var volume = useVolume(scenes, {
+    onChannelLoaded: onChannelLoaded,
+    onError: showError,
+    maskChannelName: maskChannelName
+  });
+  var image = volume.image,
+    setTime = volume.setTime,
+    setScene = volume.setScene;
 
-    // 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, getCurrentViewerChannelSettings());
-      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;
+  // add the image to the viewer on load
+  useEffect(function () {
+    if (image === null) {
+      return;
     }
-    var newChannelSettings = channelNames.map(function (channel, index) {
-      var color = getDefaultChannelColor(index);
-      return initializeOneChannelSetting(channel, index, color, getCurrentViewerChannelSettings());
-    });
-    setChannelSettings(newChannelSettings);
-    return newChannelSettings;
-  };
-  var placeImageInViewer = function placeImageInViewer(aimg, newChannelSettings) {
-    setImage(aimg);
-    var channelSetting = newChannelSettings || channelSettings;
-    view3d.removeAllVolumes();
-    view3d.addVolume(aimg, {
+    channelRangesRef.current = new Array(image.channelNames.length).fill(undefined);
+    var channelSettings = viewerState.current.channelSettings;
+    view3d.addVolume(image, {
       // Immediately passing down channel parameters isn't strictly necessary, but keeps things looking consistent on load
-      channels: aimg.channelNames.map(function (name) {
-        var ch = getOneChannelSetting(name, channelSetting);
+      channels: image.channelNames.map(function (name) {
+        // TODO do we really need to be searching by name here?
+        var ch = channelSettings.find(function (channel) {
+          return channel.name === name;
+        });
         if (!ch) {
           return {};
         }
@@ -403,151 +273,47 @@ var App = function App(props) {
         };
       })
     });
-    var mode3d = viewerSettings.viewMode === ViewMode.threeD;
-    setIndicatorPositions(view3d, clippingPanelOpen, aimg.imageInfo.times > 1, numScenes > 1, mode3d);
-    imageLoadHandlers.current.forEach(function (effect) {
-      return effect(aimg);
-    });
-    playControls.stepAxis = function (axis) {
-      if (axis === "t") {
-        changeViewerSetting("time", (viewerState.current.time + 1) % aimg.imageInfo.times);
-      } else {
-        var max = aimg.imageInfo.volumeSize[axis];
-        var current = viewerState.current.slice[axis] * max;
-        changeViewerSetting("slice", _objectSpread(_objectSpread({}, viewerState.current.slice), {}, _defineProperty({}, axis, (current + 1) % max / max)));
-      }
-    };
-    playControls.getVolumeIsLoaded = function () {
-      return aimg.isLoaded();
-    };
-    view3d.updateActiveChannels(aimg);
-    // make sure we pick up whether the image needs to be in single-slice mode
-    view3d.setCameraMode(viewerSettings.viewMode);
+    view3d.updateActiveChannels(image);
+    return view3d.removeAllVolumes.bind(view3d);
+  }, [image, view3d, viewerState]);
+  var hasRawImage = !!(props.rawData && props.rawDims);
+  var numScenes = hasRawImage ? 1 : (_scenes$length = (_scenes2 = props.imageUrl.scenes) === null || _scenes2 === void 0 ? void 0 : _scenes2.length) !== null && _scenes$length !== void 0 ? _scenes$length : 1;
+  var numSlices = (_image$imageInfo$volu = image === null || image === void 0 ? void 0 : image.imageInfo.volumeSize) !== null && _image$imageInfo$volu !== void 0 ? _image$imageInfo$volu : {
+    x: 1,
+    y: 1,
+    z: 1
   };
-  var openImage = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _getCurrentViewerChan2;
-      var _props, imageUrl, parentImageUrl, rawData, rawDims, scene, scenePaths, _scenes2, showParentImage, path, loadSpec, options, aimg, channelNames, newChannelSettings, requiredLoadSpec, requiredChannelsToLoad, maskChannelName, maskChannelIndex, slice;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _props = props, imageUrl = _props.imageUrl, parentImageUrl = _props.parentImageUrl, rawData = _props.rawData, rawDims = _props.rawDims;
-            scene = viewerState.current.scene;
-            if (!(rawData && rawDims)) {
-              _context.next = 6;
-              break;
-            }
-            scenePaths = [{
-              data: rawData,
-              metadata: rawDims
-            }];
-            _context.next = 12;
-            break;
-          case 6:
-            showParentImage = viewerState.current.imageType === ImageType.fullField && parentImageUrl !== undefined;
-            path = showParentImage ? parentImageUrl : imageUrl; // Don't reload if we're already looking at this image
-            if (!isEqual(path, imageUrlRef.current)) {
-              _context.next = 10;
-              break;
-            }
-            return _context.abrupt("return");
-          case 10:
-            imageUrlRef.current = path;
-            scenePaths = (_scenes2 = path.scenes) !== null && _scenes2 !== void 0 ? _scenes2 : [path];
-          case 12:
-            setSendingQueryRequest(true);
-            setImageLoaded(false);
-            hasChannelLoadedRef.current = [];
-            loadSpec = new LoadSpec();
-            loadSpec.time = viewerState.current.time;
-            options = {};
-            if (rawData && rawDims) {
-              options.fileType = VolumeFileFormat.DATA;
-              options.rawArrayOptions = {
-                data: rawData,
-                metadata: rawDims
-              };
-            }
-            _context.prev = 19;
-            loader.current = new SceneStore(loadContext, scenePaths);
-            _context.next = 23;
-            return loader.current.createVolume(scene, loadSpec, function (v, channelIndex) {
-              // NOTE: this callback runs *after* `onNewVolumeCreated` below, for every loaded channel
-              // TODO is this search by name necessary or will the `channelIndex` passed to the callback always match state?
-              var thisChannelSettings = viewerState.current.channelSettings[channelIndex];
-              onChannelDataLoaded(v, thisChannelSettings, channelIndex);
-            });
-          case 23:
-            aimg = _context.sent;
-            _context.next = 30;
-            break;
-          case 26:
-            _context.prev = 26;
-            _context.t0 = _context["catch"](19);
-            showError(_context.t0);
-            throw _context.t0;
-          case 30:
-            channelNames = aimg.imageInfo.channelNames;
-            newChannelSettings = setChannelStateForNewImage(channelNames); // order is important:
-            // we need to remove the old volume before triggering channels unloaded,
-            // which may cause calls on View3d to the old volume.
-            view3d.removeAllVolumes();
-            setAllChannelsUnloaded(channelNames.length);
-            placeImageInViewer(aimg, newChannelSettings);
-            channelRangesRef.current = new Array(channelNames.length).fill(undefined);
-            requiredLoadSpec = new LoadSpec();
-            requiredLoadSpec.time = viewerState.current.time;
-
-            // make the currently enabled channels "required":
-            // find all enabled indices in newChannelSettings:
-            requiredChannelsToLoad = newChannelSettings ? newChannelSettings.map(function (channel, index) {
-              return channel.volumeEnabled ? index : -1;
-            }).filter(function (index) {
-              return index >= 0;
-            }) : []; // add mask channel to required channels, if specified
-            maskChannelName = (_getCurrentViewerChan2 = getCurrentViewerChannelSettings()) === null || _getCurrentViewerChan2 === void 0 ? void 0 : _getCurrentViewerChan2.maskChannelName;
-            if (maskChannelName) {
-              maskChannelIndex = channelNames.indexOf(maskChannelName);
-              if (maskChannelIndex >= 0 && !requiredChannelsToLoad.includes(maskChannelIndex)) {
-                requiredChannelsToLoad.push(maskChannelIndex);
-              }
-            }
-            requiredLoadSpec.channels = requiredChannelsToLoad;
-
-            // 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 (viewerSettings.viewMode === ViewMode.xy) {
-              slice = viewerSettings.slice;
-              requiredLoadSpec.subregion = new Box3(new Vector3(0, 0, slice.z), new Vector3(1, 1, slice.z));
-            }
+  var numSlicesLoaded = (_image$imageInfo$subr = image === null || image === void 0 ? void 0 : image.imageInfo.subregionSize) !== null && _image$imageInfo$subr !== void 0 ? _image$imageInfo$subr : {
+    x: 0,
+    y: 0,
+    z: 0
+  };
+  var numTimesteps = (_image$imageInfo$time = image === null || image === void 0 ? void 0 : image.imageInfo.times) !== null && _image$imageInfo$time !== void 0 ? _image$imageInfo$time : 1;
 
-            // initiate loading only after setting up new channel settings,
-            // in case the loader callback fires before the state is set
-            loader.current.loadScene(scene, aimg, requiredLoadSpec)["catch"](function (e) {
-              showError(e);
-              throw e;
-            });
-          case 44:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[19, 26]]);
-    }));
-    return function openImage() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  // const [channelGroupedByType, setChannelGroupedByType] = useState<ChannelGrouping>({});
+  var _useState = useState(function () {
+      return window.innerWidth < CONTROL_PANEL_CLOSE_WIDTH;
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    controlPanelClosed = _useState2[0],
+    setControlPanelClosed = _useState2[1];
+  // Only allow auto-close once while the screen is too narrow.
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    hasAutoClosedControlPanel = _useState4[0],
+    setHasAutoClosedControlPanel = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    clippingPanelOpen = _useState6[0],
+    setClippingPanelOpen = _useState6[1];
+  var clippingPanelOpenTimeout = useRef(0);
 
   // Imperative callbacks /////////////////////////////////////////////////////
 
   var viewerSettings = viewerState.current;
   var saveIsosurface = useCallback(function (channelIndex, type) {
     if (image) view3d.saveChannelIsosurface(image, channelIndex, type);
-  }, [image]);
+  }, [image, view3d]);
   var saveScreenshot = useCallback(function () {
     view3d.capture(function (dataUrl) {
       var anchor = document.createElement("a");
@@ -555,36 +321,8 @@ var App = function App(props) {
       anchor.download = "screenshot.png";
       anchor.click();
     });
-  }, []);
-  var onClippingPanelOpenChange = useCallback(function (panelOpen) {
-    if (panelOpen === clippingPanelOpen) {
-      return;
-    }
-    var hasTime = numTimesteps > 1;
-    var hasScenes = numScenes > 1;
-    var mode3d = viewerSettings.viewMode === ViewMode.threeD;
-    setClippingPanelOpen(panelOpen);
-    setIndicatorPositions(view3d, panelOpen, hasTime, hasScenes, mode3d);
-
-    // Hide indicators while clipping panel is in motion - otherwise they pop to the right place prematurely
-    if (panelOpen) {
-      view3d.setShowScaleBar(false);
-      view3d.setShowTimestepIndicator(false);
-      view3d.setShowAxis(false);
-      window.clearTimeout(clippingPanelOpenTimeout.current);
-      clippingPanelOpenTimeout.current = window.setTimeout(function () {
-        view3d.setShowScaleBar(true);
-        view3d.setShowTimestepIndicator(true);
-        if (viewerSettings.showAxes) {
-          view3d.setShowAxis(true);
-        }
-      }, CLIPPING_PANEL_ANIMATION_DURATION_MS);
-    }
-  }, [view3d, numTimesteps, numScenes, viewerSettings.viewMode, viewerSettings.showAxes, clippingPanelOpen]);
+  }, [view3d]);
   var getMetadata = useCallback(function () {
-    var _props2 = props,
-      metadata = _props2.metadata,
-      metadataFormatter = _props2.metadataFormatter;
     var imageMetadata = image === null || image === void 0 ? void 0 : image.imageMetadata;
     if (imageMetadata && metadataFormatter) {
       imageMetadata = metadataFormatter(imageMetadata);
@@ -608,7 +346,28 @@ var App = function App(props) {
       var _sceneMeta;
       return (_sceneMeta = sceneMeta) !== null && _sceneMeta !== void 0 ? _sceneMeta : {};
     }
-  }, [props.metadata, props.metadataFormatter, image]);
+  }, [metadata, metadataFormatter, image, numScenes, viewerState]);
+  useEffect(function () {
+    var hasTime = numTimesteps > 1;
+    var hasScenes = numScenes > 1;
+    var mode3d = viewerSettings.viewMode === ViewMode.threeD;
+    setIndicatorPositions(view3d, clippingPanelOpen, hasTime, hasScenes, mode3d);
+
+    // Hide indicators while clipping panel is in motion - otherwise they pop to the right place prematurely
+    if (clippingPanelOpen) {
+      view3d.setShowScaleBar(false);
+      view3d.setShowTimestepIndicator(false);
+      view3d.setShowAxis(false);
+      window.clearTimeout(clippingPanelOpenTimeout.current);
+      clippingPanelOpenTimeout.current = window.setTimeout(function () {
+        view3d.setShowScaleBar(true);
+        view3d.setShowTimestepIndicator(true);
+        if (viewerSettings.showAxes) {
+          view3d.setShowAxis(true);
+        }
+      }, CLIPPING_PANEL_ANIMATION_DURATION_MS);
+    }
+  }, [view3d, numTimesteps, numScenes, viewerSettings.viewMode, viewerSettings.showAxes, clippingPanelOpen]);
 
   // Effects //////////////////////////////////////////////////////////////////
 
@@ -630,19 +389,9 @@ var App = function App(props) {
       return window.removeEventListener("resize", onResizeDebounced);
     };
   }, [hasAutoClosedControlPanel]);
-
-  // one-time init after view3d exists and before we start loading images
-  useEffect(function () {
-    view3d.setCameraMode(viewerSettings.viewMode);
-  }, []);
-
-  // Hook to trigger image load: on mount, when image source props/state change (`cellId`, `imageType`, `rawData`, etc)
-  useEffect(function () {
-    openImage();
-  }, [props.imageUrl, props.cellId, viewerSettings.imageType, props.rawDims, props.rawData]);
   useEffect(function () {
-    return props.onControlPanelToggle && props.onControlPanelToggle(controlPanelClosed);
-  }, [controlPanelClosed, props.onControlPanelToggle]);
+    return onControlPanelToggle && onControlPanelToggle(controlPanelClosed);
+  }, [controlPanelClosed, onControlPanelToggle]);
   useEffect(function () {
     // delayed for the animation to finish
     window.setTimeout(function () {
@@ -653,44 +402,39 @@ var App = function App(props) {
   /** Custom effect hook for viewer updates that depend on `image`, so we don't have to repeatedly null-check it */
   var useImageEffect = function useImageEffect(effect, deps) {
     useEffect(function () {
-      if (image && imageLoaded) {
+      if (image && volume.imageLoadStatus === ImageLoadStatus.LOADED) {
         return effect(image);
       }
-    }, [].concat(_toConsumableArray(deps), [image, imageLoaded]));
-  };
-  var imageLoadHandlers = useRef([]);
-  imageLoadHandlers.current = [];
-  /** `ImageEffect`s that also run right on image creation, so the image doesn't first render with default settings */
-  var useImageLoadEffect = function useImageLoadEffect(effect, deps) {
-    useImageEffect(effect, deps);
-    imageLoadHandlers.current.push(effect);
+      // react-hooks will check that `deps` match `effect`'s dependencies, so we can safely exclude `effect` here
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [].concat(_toConsumableArray(deps), [image, volume.imageLoadStatus]));
   };
 
   // Effects to imperatively sync `viewerSettings` to `view3d`
   useImageEffect(function (_currentImage) {
     view3d.setCameraMode(viewerSettings.viewMode);
     view3d.resize(null);
-  }, [viewerSettings.viewMode]);
+  }, [viewerSettings.viewMode, view3d]);
   useImageEffect(function (_currentImage) {
     if (viewerSettings.cameraState) {
       view3d.setCameraState(viewerSettings.cameraState);
     }
-  }, [viewerSettings.cameraState]);
+  }, [viewerSettings.cameraState, view3d]);
   useImageEffect(function (_currentImage) {
     return view3d.setAutoRotate(viewerSettings.autorotate);
-  }, [viewerSettings.autorotate]);
+  }, [viewerSettings.autorotate, view3d]);
   useImageEffect(function (_currentImage) {
     return view3d.setShowAxis(viewerSettings.showAxes);
-  }, [viewerSettings.showAxes]);
+  }, [viewerSettings.showAxes, view3d]);
   useImageEffect(function (_currentImage) {
     return view3d.setBackgroundColor(colorArrayToFloats(viewerSettings.backgroundColor));
-  }, [viewerSettings.backgroundColor]);
+  }, [viewerSettings.backgroundColor, view3d]);
   useImageEffect(function (currentImage) {
     return view3d.setBoundingBoxColor(currentImage, colorArrayToFloats(viewerSettings.boundingBoxColor));
-  }, [viewerSettings.boundingBoxColor]);
+  }, [viewerSettings.boundingBoxColor, view3d]);
   useImageEffect(function (currentImage) {
     return view3d.setShowBoundingBox(currentImage, viewerSettings.showBoundingBox);
-  }, [viewerSettings.showBoundingBox]);
+  }, [viewerSettings.showBoundingBox, view3d]);
   useImageEffect(function (image) {
     // Check whether any channels are marked to be reset and apply it.
     var channelsAwaitingReset = getChannelsAwaitingReset();
@@ -706,64 +450,52 @@ var App = function App(props) {
         onResetChannel(i);
       }
     }
-  }, [channelSettings]);
-  useImageLoadEffect(function (currentImage) {
+  }, [changeChannelSetting, channelSettings, getChannelsAwaitingReset, getCurrentViewerChannelSettings, onResetChannel]);
+  useImageEffect(function (currentImage) {
     var renderMode = viewerSettings.renderMode;
     view3d.setMaxProjectMode(currentImage, renderMode === RenderMode.maxProject);
     view3d.setVolumeRenderMode(renderMode === RenderMode.pathTrace ? RENDERMODE_PATHTRACE : RENDERMODE_RAYMARCH);
     view3d.updateActiveChannels(currentImage);
-  }, [viewerSettings.renderMode]);
+  }, [viewerSettings.renderMode, view3d]);
   useImageEffect(function (currentImage) {
     view3d.updateMaskAlpha(currentImage, alphaSliderToImageValue(viewerSettings.maskAlpha));
     view3d.updateActiveChannels(currentImage);
-  }, [viewerSettings.maskAlpha]);
-  useImageLoadEffect(function (_currentImage) {
-    var isPathTracing = viewerSettings.renderMode === RenderMode.pathTrace;
-    var brightness = brightnessSliderToImageValue(viewerSettings.brightness, isPathTracing);
+  }, [viewerSettings.maskAlpha, view3d]);
+  useImageEffect(function (_currentImage) {
+    var brightness = brightnessSliderToImageValue(viewerSettings.brightness);
     view3d.updateExposure(brightness);
-  }, [viewerSettings.brightness]);
-  useImageLoadEffect(function (currentImage) {
-    var isPathTracing = viewerSettings.renderMode === RenderMode.pathTrace;
-    var density = densitySliderToImageValue(viewerSettings.density, isPathTracing);
+  }, [viewerSettings.brightness, view3d]);
+  useImageEffect(function (currentImage) {
+    var density = densitySliderToImageValue(viewerSettings.density);
     view3d.updateDensity(currentImage, density);
-  }, [viewerSettings.density]);
-  useImageLoadEffect(function (currentImage) {
+  }, [viewerSettings.density, view3d]);
+  useImageEffect(function (currentImage) {
     var imageValues = gammaSliderToImageValues(viewerSettings.levels);
     view3d.setGamma(currentImage, imageValues.min, imageValues.scale, imageValues.max);
-  }, [viewerSettings.levels]);
+  }, [viewerSettings.levels, view3d]);
 
-  // `time` is special: because syncing it requires a load, it cannot be dependent on `image`
+  // `time` and `scene` have their own special handlers via `volume`, since they both trigger loads
   useEffect(function () {
-    if (image) {
-      setSendingQueryRequest(true);
-      setAllChannelsUnloaded(image.numChannels);
-      view3d.setTime(image, viewerSettings.time);
-    }
-  }, [viewerSettings.time]);
+    return setTime(view3d, viewerSettings.time);
+  }, [view3d, viewerSettings.time, setTime]);
   useEffect(function () {
-    if (image) {
-      var _loader$current3;
-      setSendingQueryRequest(true);
-      (_loader$current3 = loader.current) === null || _loader$current3 === void 0 || _loader$current3.loadScene(viewerSettings.scene, image)["catch"](function (e) {
-        return showError(e);
-      });
-    }
-  }, [viewerSettings.scene]);
-  useImageLoadEffect(function (currentImage) {
+    return setScene(viewerSettings.scene);
+  }, [viewerSettings.scene, setScene]);
+  useImageEffect(function (currentImage) {
     return view3d.setInterpolationEnabled(currentImage, viewerSettings.interpolationEnabled);
-  }, [viewerSettings.interpolationEnabled]);
-  useImageLoadEffect(function (currentImage) {
+  }, [viewerSettings.interpolationEnabled, view3d]);
+  useImageEffect(function (currentImage) {
     var _props$transform;
     return view3d.setVolumeTranslation(currentImage, ((_props$transform = props.transform) === null || _props$transform === void 0 ? void 0 : _props$transform.translation) || [0, 0, 0]);
-  }, [(_props$transform2 = props.transform) === null || _props$transform2 === void 0 ? void 0 : _props$transform2.translation]);
-  useImageLoadEffect(function (currentImage) {
+  }, [(_props$transform2 = props.transform) === null || _props$transform2 === void 0 ? void 0 : _props$transform2.translation, view3d]);
+  useImageEffect(function (currentImage) {
     var _props$transform3;
     return view3d.setVolumeRotation(currentImage, ((_props$transform3 = props.transform) === null || _props$transform3 === void 0 ? void 0 : _props$transform3.rotation) || [0, 0, 0]);
-  }, [(_props$transform4 = props.transform) === null || _props$transform4 === void 0 ? void 0 : _props$transform4.rotation]);
-  var usePerAxisClippingUpdater = function usePerAxisClippingUpdater(axis, _ref2, slice) {
-    var _ref3 = _slicedToArray(_ref2, 2),
-      minval = _ref3[0],
-      maxval = _ref3[1];
+  }, [(_props$transform4 = props.transform) === null || _props$transform4 === void 0 ? void 0 : _props$transform4.rotation, view3d]);
+  var usePerAxisClippingUpdater = function usePerAxisClippingUpdater(axis, _ref, slice, viewMode) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      minval = _ref2[0],
+      maxval = _ref2[1];
     useImageEffect(
     // Logic to determine axis clipping range, for each of x,y,z,3d slider:
     // if slider was same as active axis view mode:  [viewerSettings.slice[axis], viewerSettings.slice[axis] + 1.0/volumeSize[axis]]
@@ -773,30 +505,30 @@ var App = function App(props) {
       var isOrthoAxis = false;
       var axismin = 0.0;
       var axismax = 1.0;
-      if (viewerSettings.viewMode === ViewMode.threeD) {
+      if (viewMode === ViewMode.threeD) {
         axismin = minval;
         axismax = maxval;
         isOrthoAxis = false;
       } else {
-        isOrthoAxis = activeAxisMap[viewerSettings.viewMode] === axis;
+        isOrthoAxis = activeAxisMap[viewMode] === axis;
         var oneSlice = 1 / currentImage.imageInfo.volumeSize[axis];
         axismin = isOrthoAxis ? slice : 0.0;
         axismax = isOrthoAxis ? slice + oneSlice : 1.0;
-        if (axis === "z" && viewerSettings.viewMode === ViewMode.xy) {
+        if (axis === "z" && viewMode === ViewMode.xy) {
           view3d.setZSlice(currentImage, Math.floor(slice * currentImage.imageInfo.volumeSize.z));
-          if (!currentImage.isLoaded()) {
-            setImageLoaded(false);
-          }
         }
       }
       // view3d wants the coordinates in the -0.5 to 0.5 range
       view3d.setAxisClip(currentImage, axis, axismin - 0.5, axismax - 0.5, isOrthoAxis);
-      view3d.setCameraMode(viewerSettings.viewMode);
-    }, [minval, maxval, slice, viewerSettings.viewMode]);
+      view3d.setCameraMode(viewMode);
+      // TODO under some circumstances, this effect will trigger a load. Ideally, this would be reflected in the load
+      //   state managed by `useVolume`. This is complicated by the fact that the relevant methods (`setAxisClip` and
+      //   `setZSlice`) don't provide a channel load callback like other load-triggering methods (e.g. `setTime`).
+    }, [axis, minval, maxval, slice, viewMode]);
   };
-  usePerAxisClippingUpdater("x", viewerSettings.region.x, viewerSettings.slice.x);
-  usePerAxisClippingUpdater("y", viewerSettings.region.y, viewerSettings.slice.y);
-  usePerAxisClippingUpdater("z", viewerSettings.region.z, viewerSettings.slice.z);
+  usePerAxisClippingUpdater("x", viewerSettings.region.x, viewerSettings.slice.x, viewMode);
+  usePerAxisClippingUpdater("y", viewerSettings.region.y, viewerSettings.slice.y, viewMode);
+  usePerAxisClippingUpdater("z", viewerSettings.region.z, viewerSettings.slice.z, viewMode);
 
   // Rendering ////////////////////////////////////////////////////////////////
 
@@ -805,7 +537,7 @@ var App = function App(props) {
   }, [props.visibleControls]);
   var pixelSize = useMemo(function () {
     return image ? image.imageInfo.physicalPixelSize.toArray() : [1, 1, 1];
-  }, [image === null || image === void 0 ? void 0 : image.imageInfo.physicalPixelSize]);
+  }, [image]);
   var resetCamera = useMemo(function () {
     return view3d.resetCamera.bind(view3d);
   }, [view3d]);
@@ -821,7 +553,7 @@ var App = function App(props) {
       index: index,
       view3d: view3d,
       image: image,
-      version: channelVersions[index]
+      version: volume.channelVersions[index]
     });
   }), /*#__PURE__*/React.createElement(Sider, {
     className: "control-panel-holder",
@@ -840,7 +572,7 @@ var App = function App(props) {
     hasImage: !!image,
     pixelSize: pixelSize,
     channelDataChannels: image === null || image === void 0 ? void 0 : image.channels,
-    channelGroupedByType: channelGroupedByType
+    channelGroupedByType: volume.channelGroupedByType
     // functions
     ,
     setCollapsed: setControlPanelClosed,
@@ -865,17 +597,17 @@ var App = function App(props) {
   }), /*#__PURE__*/React.createElement(CellViewerCanvasWrapper, {
     view3d: view3d,
     image: image,
-    loadingImage: sendingQueryRequest,
+    loadingImage: volume.imageLoadStatus === ImageLoadStatus.REQUESTED,
     numSlices: numSlices,
     numSlicesLoaded: numSlicesLoaded,
     numTimesteps: numTimesteps,
     numScenes: numScenes,
-    playControls: playControls,
-    playingAxis: playingAxis,
+    playControls: volume.playControls,
+    playingAxis: volume.playingAxis,
     appHeight: props.appHeight,
     visibleControls: visibleControls,
     clippingPanelOpen: clippingPanelOpen,
-    onClippingPanelOpenChange: onClippingPanelOpenChange
+    onClippingPanelOpenChange: setClippingPanelOpen
   })))));
 };
 export default App;