@vitessce/neuroglancer 3.9.7 → 3.9.9

package/dist/{ReactNeuroglancer-pv4bM8Yp.js → ReactNeuroglancer-Bxe4YcLF.js}

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import React__default from "react";
-import { g as getDefaultExportFromCjs, c as commonjsGlobal, d as diffCameraState } from "./index-BEPd2Tds.js";
+import { g as getDefaultExportFromCjs, c as commonjsGlobal, d as diffCameraState } from "./index-anGvS-pL.js";
 var es6_object_assign = {};
 var _global = { exports: {} };
 var hasRequired_global;
@@ -66895,11 +66895,12 @@ class Neuroglancer extends React__default.Component {
       if (!this.viewer) return;
       const baseLayers = ((_a = this.props.viewerState) == null ? void 0 : _a.layers) ?? (this.viewer.state.toJSON().layers || []);
       const newLayers = baseLayers.map((layer) => {
+        var _a2;
         const layerScope = Object.keys(cellColorMappingByLayer).find((scope) => {
-          var _a2;
-          return (_a2 = layer.name) == null ? void 0 : _a2.includes(scope);
+          var _a3;
+          return (_a3 = layer.name) == null ? void 0 : _a3.includes(scope);
         });
-        const selected = { ...cellColorMappingByLayer[layerScope] || {} };
+        const selected = { ...((_a2 = cellColorMappingByLayer[layerScope]) == null ? void 0 : _a2.colors) || {} };
         if (!this.allKnownIdsByLayer) this.allKnownIdsByLayer = {};
         if (!this.allKnownIdsByLayer[layerScope]) {
           this.allKnownIdsByLayer[layerScope] = /* @__PURE__ */ new Set();
@@ -67064,9 +67065,41 @@ class Neuroglancer extends React__default.Component {
     } else {
       viewerNoKey = this.viewer;
     }
+    const { visibleChunksChanged } = this.viewer.chunkQueueManager;
+    let firstChunkLoaded = false;
+    this.disposers.push(visibleChunksChanged.add(() => {
+      var _a;
+      if (!firstChunkLoaded) {
+        for (const layer of this.viewer.layerManager.managedLayers) {
+          if (layer.layer instanceof SegmentationUserLayer) {
+            const hasVisibleChunk = (_a = layer.layer.renderLayers) == null ? void 0 : _a.some((rl) => {
+              const {
+                numVisibleChunksAvailable,
+                numVisibleChunksNeeded
+              } = rl.layerChunkProgressInfo || {};
+              if (!numVisibleChunksNeeded || !numVisibleChunksAvailable) return false;
+              return numVisibleChunksAvailable / numVisibleChunksNeeded > 0.25;
+            });
+            if (hasVisibleChunk) {
+              firstChunkLoaded = true;
+              requestAnimationFrame(() => {
+                requestAnimationFrame(() => {
+                  var _a2, _b;
+                  (_b = (_a2 = this.props).onLayerLoadingChange) == null ? void 0 : _b.call(_a2, true);
+                });
+              });
+              return;
+            }
+          }
+        }
+      }
+    }));
+    this.disposers.push(() => {
+      firstChunkLoaded = false;
+    });
   }
   componentDidUpdate(prevProps, prevState) {
-    var _a;
+    var _a, _b;
     const { viewerState, cellColorMapping: cellColorMappingByLayer } = this.props;
     const selectedSegments = {};
     for (const layer of this.viewer.layerManager.managedLayers) {
@@ -67079,6 +67112,27 @@ class Neuroglancer extends React__default.Component {
       if (layer.layer instanceof SegmentationUserLayer) {
         const { segmentSelectionState } = layer.layer.displayState;
         segmentSelectionState.set(selectedSegments[layer.name]);
+        const layerScope = Object.keys(cellColorMappingByLayer).find(
+          (scope) => {
+            var _a2;
+            return (_a2 = layer.name) == null ? void 0 : _a2.includes(scope);
+          }
+        );
+        if (layerScope) {
+          const opacity = ((_a = cellColorMappingByLayer[layerScope]) == null ? void 0 : _a.opacity) ?? 1;
+          layer.layer.displayState.objectAlpha.value = opacity;
+        }
+      }
+      if (layer.layer instanceof AnnotationUserLayer) {
+        const matchingLayer = ((viewerState == null ? void 0 : viewerState.layers) || []).find(
+          (l) => l.name === layer.name
+        );
+        if (matchingLayer == null ? void 0 : matchingLayer.shader) {
+          const currentShader = layer.layer.annotationDisplayState.shader.value_;
+          if (currentShader !== matchingLayer.shader) {
+            layer.layer.annotationDisplayState.shader.value = matchingLayer.shader;
+          }
+        }
       }
     }
     if (!viewerState) return;
@@ -67104,8 +67158,8 @@ class Neuroglancer extends React__default.Component {
         }
       });
     }
-    const prevSize = prevProps.cellColorMapping ? Object.keys(prevProps.cellColorMapping).length : 0;
-    const currSize = cellColorMappingByLayer ? Object.keys(cellColorMappingByLayer).length : 0;
+    const prevSize = prevProps.cellColorMapping ? Object.values(prevProps.cellColorMapping).reduce((acc, v) => acc + Object.keys((v == null ? void 0 : v.colors) || {}).length, 0) : 0;
+    const currSize = cellColorMappingByLayer ? Object.values(cellColorMappingByLayer).reduce((acc, v) => acc + Object.keys((v == null ? void 0 : v.colors) || {}).length, 0) : 0;
     const mappingRefChanged = prevProps.cellColorMapping !== this.props.cellColorMapping;
     if (!this.didLayersChange(prevVS, viewerState) && (mappingRefChanged || prevSize !== currSize)) {
       this.withoutEmitting(() => {
@@ -67114,10 +67168,10 @@ class Neuroglancer extends React__default.Component {
     }
     const stripSegFields = (layers) => (layers || []).map((l) => {
       if (!l) return l;
-      const { segments, segmentColors, ...rest } = l;
+      const { segments, segmentColors, objectAlpha, ...rest } = l;
       return rest;
     });
-    const prevLayers = (_a = prevProps.viewerState) == null ? void 0 : _a.layers;
+    const prevLayers = (_b = prevProps.viewerState) == null ? void 0 : _b.layers;
     const nextLayers = viewerState == null ? void 0 : viewerState.layers;
     const prevCore = JSON.stringify(stripSegFields(prevLayers));
     const nextCore = JSON.stringify(stripSegFields(nextLayers));
@@ -67181,6 +67235,7 @@ __publicField(Neuroglancer, "defaultProps", {
   onVisibleChanged: null,
   onSelectionDetailsStateChanged: null,
   onViewerStateChanged: null,
+  onLayerLoadingChange: null,
   key: null,
   callbacks: [],
   ngServer: "https://neuroglancer-demo.appspot.com/"