@mlightcad/cad-simple-viewer 1.7.6-preview.0 → 1.7.6

package/lib/view/AcTrView2d.js

@@ -180,6 +180,11 @@ var AcTrView2d = /** @class */ (function (_super) {
         var container = (_a = mergedOptions.container) !== null && _a !== void 0 ? _a : document.createElement('div');
         mergedOptions.container = container;
         container.style.overflow = 'hidden';
+        // Allow focusing the container after canvas clicks so document-level
+        // shortcuts stay scoped to this viewer without stealing host-page focus.
+        if (!container.hasAttribute('tabindex')) {
+            container.tabIndex = -1;
+        }
         var renderer = new THREE.WebGLRenderer({
             antialias: true,
             alpha: true
@@ -359,6 +364,12 @@ var AcTrView2d = /** @class */ (function (_super) {
          * ENTITY parse and linework convert; glyph jobs await this before draw.
          */
         _this._textStyleFontPreloadPromise = null;
+        /**
+         * Aborts canvas / document DOM listeners registered on this view.
+         * Custom singleton listeners are removed explicitly in {@link dispose}.
+         */
+        _this._viewDomAbort = new AbortController();
+        _this._viewDisposed = false;
         /** Transient reading mode forces black linework on a white canvas. */
         _this._readingMode = new AcApReadingModeState({
             getCurrentBackgroundColor: function () { return _this._renderer.currentBackgroundColor; },
@@ -442,16 +453,27 @@ var AcTrView2d = /** @class */ (function (_super) {
         };
         _this._disposeCanvasTouchCallout = disposeCanvasTouchCallout;
         var onProgressiveInput = function () { return _this.noteProgressiveUserInput(); };
-        renderer.domElement.addEventListener('pointerdown', onProgressiveInput, {
+        // Pointer and wheel both claim shortcut focus so undo/erase still work
+        // after zooming without a prior click, without stealing focus from host
+        // inputs/textareas/contenteditable fields.
+        var onCanvasPointerDown = function () {
+            onProgressiveInput();
+            _this.focusViewerForShortcuts();
+        };
+        var onCanvasWheel = function () {
+            onProgressiveInput();
+            _this.focusViewerForShortcuts();
+        };
+        renderer.domElement.addEventListener('pointerdown', onCanvasPointerDown, {
             capture: true
         });
-        renderer.domElement.addEventListener('wheel', onProgressiveInput, {
+        renderer.domElement.addEventListener('wheel', onCanvasWheel, {
             capture: true,
             passive: true
         });
         _this._disposeProgressiveInputWatch = function () {
-            renderer.domElement.removeEventListener('pointerdown', onProgressiveInput, { capture: true });
-            renderer.domElement.removeEventListener('wheel', onProgressiveInput, {
+            renderer.domElement.removeEventListener('pointerdown', onCanvasPointerDown, { capture: true });
+            renderer.domElement.removeEventListener('wheel', onCanvasWheel, {
                 capture: true
             });
         };
@@ -468,27 +490,32 @@ var AcTrView2d = /** @class */ (function (_super) {
         setAcTrDrawOrderZAllocator(function () { return _this._renderer.allocateDrawOrderZ(); });
         var fontMapping = AcApSettingManager.instance.fontMapping;
         _this._renderer.setFontMapping(fontMapping);
-        _this._renderer.events.fontNotFound.addEventListener(function (args) {
+        _this._onFontNotFound = function (args) {
             var _a;
             eventBus.emit('font-not-found', {
                 fontName: args.fontName,
                 count: (_a = args.count) !== null && _a !== void 0 ? _a : 0
             });
-        });
-        _this._renderer.events.fontLoaded.addEventListener(function (args) {
+        };
+        _this._onFontLoaded = function (args) {
             // Lazy load success clears FontManager.missedFonts; refresh status-bar state.
             eventBus.emit('missed-data-changed', {});
             // On-demand faces (e.g. style `malgun`) may finish after the first glyph
             // bake. Rebuild text so Hangul is not left as permanent '?'.
             _this.scheduleGlyphRedrawAfterFontLoad(args === null || args === void 0 ? void 0 : args.fontName);
-        });
+        };
+        _this._renderer.events.fontNotFound.addEventListener(_this._onFontNotFound);
+        _this._renderer.events.fontLoaded.addEventListener(_this._onFontLoaded);
         _this._scene = _this.createScene();
         _this._layerAppearance = new AcTrLayerAppearanceController(_this._scene, _this._renderer);
         _this._inheritedLayerMaterialMapper = new AcTrInheritedLayerMaterialMapper(function (layerName) { return _this._layerAppearance.getEffectiveLayerTraits(layerName); }, _this._renderer);
         // Initialize background color through setter to keep renderer/cursor in sync.
         _this.backgroundColor =
             (_b = mergedOptions.background) !== null && _b !== void 0 ? _b : ACGI_MODEL_SPACE_BACKGROUND;
-        _this._stats = _this.createStats(AcApSettingManager.instance.isShowStats && _this.isActiveManagedView());
+        // During main-view construction the manager singleton is not published yet,
+        // so treat a missing manager as "this is the primary canvas".
+        _this._stats = _this.createStats(AcApSettingManager.instance.isShowStats &&
+            (AcApDocManager.tryGetInstance() == null || _this.isActiveManagedView()));
         // Layout background sysvars drive the canvas clear colour and ACI-7
         // inversion (`MODELBKCOLOR` for model space, `PAPERBKCOLOR` for the
         // active layout). `COLORTHEME` only affects UI chrome — see
@@ -496,23 +523,28 @@ var AcTrView2d = /** @class */ (function (_super) {
         var sysVarManager = AcDbSysVarManager.instance();
         var modelBkVar = AcDbSystemVariables.MODELBKCOLOR.toLowerCase();
         var paperBkVar = AcDbSystemVariables.PAPERBKCOLOR.toLowerCase();
-        sysVarManager.events.sysVarChanged.addEventListener(function (args) {
+        _this._onSysVarChanged = function (args) {
             var nameLower = args.name.toLowerCase();
             if (nameLower === modelBkVar || nameLower === paperBkVar) {
-                var isModelSpace = _this.isModelSpaceLayout(args.database);
+                var database = args.database;
+                if (!database)
+                    return;
+                var isModelSpace = _this.isModelSpaceLayout(database);
                 var applies = (nameLower === modelBkVar && isModelSpace) ||
                     (nameLower === paperBkVar && !isModelSpace);
                 if (!applies) {
                     return;
                 }
-                _this.applyCanvasBackground(readLayoutBackgroundColor(args.database, isModelSpace));
+                _this.applyCanvasBackground(readLayoutBackgroundColor(database, isModelSpace));
             }
-        });
-        AcApSettingManager.instance.events.modified.addEventListener(function (args) {
+        };
+        sysVarManager.events.sysVarChanged.addEventListener(_this._onSysVarChanged);
+        _this._onSettingsModified = function (args) {
             if (args.key == 'isShowStats') {
                 _this.toggleStatsVisibility(_this._stats, args.value);
             }
-        });
+        };
+        AcApSettingManager.instance.events.modified.addEventListener(_this._onSettingsModified);
         var selectionStartWcs = null;
         var selectionStartCanvas = null;
         var selectionPreviewEl = null;
@@ -618,6 +650,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             selectionStartWcs = null;
             selectionStartCanvas = null;
         };
+        var viewDomSignal = _this._viewDomAbort.signal;
         _this.canvas.addEventListener('mousedown', function (e) {
             if (e.button !== 0)
                 return;
@@ -627,7 +660,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                 return;
             }
             beginSelectionPreview(e.clientX, e.clientY);
-        });
+        }, { signal: viewDomSignal });
         _this.canvas.addEventListener('mousemove', function (e) {
             if (!selectionStartWcs || !selectionPreviewEl || !selectionStartCanvas) {
                 return;
@@ -636,7 +669,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                 return;
             }
             updateSelectionPreview(e.clientX, e.clientY, _this.getPointerSelectionAction(e));
-        });
+        }, { signal: viewDomSignal });
         _this.canvas.addEventListener('mouseup', function (e) {
             if (_this._gripManager.isDragging) {
                 resetSelectionDrag();
@@ -653,8 +686,8 @@ var AcTrView2d = /** @class */ (function (_super) {
             });
             var action = _this.getPointerSelectionAction(e);
             finishSelection(e.clientX, e.clientY, action, _this.isSelectionClick(selectionStartCanvas, endCanvas));
-        });
-        acedAttachMobileBoxGesture({
+        }, { signal: viewDomSignal });
+        _this._disposeMobileBoxGesture = acedAttachMobileBoxGesture({
             element: _this.canvas,
             shouldStart: function () { return canHandleMobileBoxGesture(); },
             setNavigationEnabled: function (enabled) {
@@ -693,16 +726,19 @@ var AcTrView2d = /** @class */ (function (_super) {
                 return;
             }
             void _this.openPickedEntityEditor(e);
-        });
+        }, { signal: viewDomSignal });
         // When using OrbitControls in THREE.js, it attaches its own event listeners to the DOM elements,
         // such as the canvas or the entire document. This can interfere with other event listeners you
-        // add, including the keydown event.
+        // add, including the keydown event. Scope to this view's container so host-page shortcuts
+        // (and post-destroy key presses) are not captured.
         document.addEventListener('keydown', function (e) {
             if (!_this.isActiveManagedView())
                 return;
+            if (!_this.isShortcutEventInsideViewer(e))
+                return;
             _this._keyHandler.handleKeyDown(e);
-        });
-        acdbHostApplicationServices().layoutManager.events.layoutSwitched.addEventListener(function (args) {
+        }, { signal: viewDomSignal });
+        _this._onLayoutSwitched = function (args) {
             var _a, _b;
             if (!_this.isActiveManagedView())
                 return;
@@ -742,7 +778,8 @@ var AcTrView2d = /** @class */ (function (_super) {
             if (isFirstVisit) {
                 _this.applyInitialZoom(btrId, args.layout);
             }
-        });
+        };
+        acdbHostApplicationServices().layoutManager.events.layoutSwitched.addEventListener(_this._onLayoutSwitched);
         _this._css2dRenderer = new CSS2DRenderer();
         _this._css2dRenderer.setSize(_this.width, _this.height);
         _this._css2dRenderer.domElement.style.position = 'absolute';
@@ -841,12 +878,14 @@ var AcTrView2d = /** @class */ (function (_super) {
         // This method is called after camera and render are created.
         // Children class can override this method to add its own logic
         this.setCursor(AcEdCorsorType.Crosshair);
-        this.editor.events.commandWillStart.addEventListener(function () {
+        this._onCommandWillStartHitTest = function () {
             _this.htmlTransientManager.setHitTestEnabled(false);
-        });
-        this.editor.events.commandEnded.addEventListener(function () {
+        };
+        this._onCommandEndedHitTest = function () {
             _this.htmlTransientManager.setHitTestEnabled(true);
-        });
+        };
+        this.editor.events.commandWillStart.addEventListener(this._onCommandWillStartHitTest);
+        this.editor.events.commandEnded.addEventListener(this._onCommandEndedHitTest);
     };
     Object.defineProperty(AcTrView2d.prototype, "mode", {
         /**
@@ -2191,6 +2230,37 @@ var AcTrView2d = /** @class */ (function (_super) {
         var sortedResults = sortPickResults(results, point);
         return pickOneOnly ? sortedResults.slice(0, 1) : sortedResults;
     };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.getViewportCoordinateMapper = function (viewportId) {
+        var e_7, _a;
+        var _b, _c;
+        var vpView;
+        try {
+            for (var _d = __values((_c = (_b = this.activeLayoutView) === null || _b === void 0 ? void 0 : _b.viewportViews) !== null && _c !== void 0 ? _c : []), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var candidate = _e.value;
+                if (candidate.viewport.id === viewportId) {
+                    vpView = candidate;
+                    break;
+                }
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            }
+            finally { if (e_7) throw e_7.error; }
+        }
+        if (!vpView)
+            return undefined;
+        return {
+            paperToModel: function (point) { return vpView.paperPointToModel(point); },
+            modelToPaper: function (point) { return vpView.modelPointToPaper(point); },
+            containsPaperPoint: function (point) { return vpView.containsPaperPoint(point); }
+        };
+    };
     /**
      * Resolves hits against the model-space layout for each viewport the
      * click drills through. Appends the matches into `results` (caller
@@ -2208,7 +2278,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper-space pick.
      */
     AcTrView2d.prototype.pickThroughViewports = function (paperPoint, paperBox, viewports, results) {
-        var e_7, _a;
+        var e_8, _a;
         var modelLayout = this._scene.modelSpaceLayout;
         if (!modelLayout)
             return;
@@ -2233,7 +2303,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                 if (!isEffectiveSpatialQueryHit(item))
                     return;
                 if (modelLayout.isIntersectWith(item.id, vpRaycaster)) {
-                    results.push(item);
+                    results.push(__assign(__assign({}, item), { viewportId: vpView.viewport.id }));
                 }
             });
         };
@@ -2243,12 +2313,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _loop_1(vpView);
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (viewports_1_1 && !viewports_1_1.done && (_a = viewports_1.return)) _a.call(viewports_1);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
     };
     /**
@@ -2281,7 +2351,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * that interior also selects those polylines and can stall highlight work.
      */
     AcTrView2d.prototype.refineCrossingSelectionHits = function (box, results) {
-        var e_8, _a;
+        var e_9, _a;
         var _b;
         var database = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         if (!database) {
@@ -2306,12 +2376,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (results_1_1 && !results_1_1.done && (_a = results_1.return)) _a.call(results_1);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         return ids;
     };
@@ -2327,7 +2397,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.updateLayer = function (layer, changes) {
-        var e_9, _a;
+        var e_10, _a;
         var touchedObjectIds = this._scene.updateLayer(this.toLayerInfo(layer)).touchedObjectIds;
         if (this._layerAppearance.layerStyleMayHaveChanged(changes)) {
             this._layerAppearance.syncFromLiveRecord(layer);
@@ -2349,12 +2419,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 this.applySessionHiddenObjectState(objectId);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (touchedObjectIds_1_1 && !touchedObjectIds_1_1.done && (_a = touchedObjectIds_1.return)) _a.call(touchedObjectIds_1);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         this._isDirty = true;
     };
@@ -2628,7 +2698,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * drawable entity that must be rebuilt (for example ATTRIB → INSERT).
      */
     AcTrView2d.prototype.resolveSceneUpdateEntities = function (entities) {
-        var e_10, _a;
+        var e_11, _a;
         var _b;
         var db = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         var resolved = [];
@@ -2650,12 +2720,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 resolved.push(target);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         return resolved;
     };
@@ -2788,9 +2858,13 @@ var AcTrView2d = /** @class */ (function (_super) {
         waiter.start();
     };
     /**
-     * @inheritdoc
+     * Invalidates in-flight progressive convert and empties convert / deferred
+     * queues without tearing down the renderer or DOM.
+     *
+     * Call before {@link AcApDocManager.destroy} tears down documents so
+     * in-flight commits do not keep reading the manager singleton.
      */
-    AcTrView2d.prototype.clear = function () {
+    AcTrView2d.prototype.abortConversion = function () {
         // Invalidate any in-flight progressive convert so it neither paints into
         // the cleared scene nor double-decrements the processing counter.
         this._convertEpoch++;
@@ -2803,6 +2877,12 @@ var AcTrView2d = /** @class */ (function (_super) {
         this.cancelOpenLineworkFrame();
         this.resetDeferredGeometryQueue();
         this._entityProcessingIdleAt = 0;
+    };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.clear = function () {
+        this.abortConversion();
         this._scene.clear();
         this._renderer.resetDrawOrderZ();
         this._isDirty = true;
@@ -2919,12 +2999,44 @@ var AcTrView2d = /** @class */ (function (_super) {
     /**
      * True when this view is the document manager's live canvas.
      * Satellite/preview views must ignore global shortcuts and layout switches.
+     * Returns false when no manager exists so post-destroy key handlers do not
+     * reach {@link AcApDocManager.instance}.
      */
     AcTrView2d.prototype.isActiveManagedView = function () {
         var _a;
         var singleton = AcApDocManager;
         var current = (_a = singleton._instance) === null || _a === void 0 ? void 0 : _a.curView;
-        return current == null || current === this;
+        return current != null && current === this;
+    };
+    /**
+     * Moves keyboard focus into the viewer container after canvas interaction so
+     * document-level shortcuts stay scoped to this view.
+     *
+     * Skips host editable fields so wheel-over-canvas does not interrupt typing.
+     */
+    AcTrView2d.prototype.focusViewerForShortcuts = function () {
+        var active = document.activeElement;
+        if (active instanceof Node && this.container.contains(active)) {
+            return;
+        }
+        if (active instanceof HTMLElement &&
+            (active.tagName === 'INPUT' ||
+                active.tagName === 'TEXTAREA' ||
+                active.isContentEditable)) {
+            return;
+        }
+        this.container.focus({ preventScroll: true });
+    };
+    /**
+     * True when the key event originated from (or is focused within) this view.
+     */
+    AcTrView2d.prototype.isShortcutEventInsideViewer = function (e) {
+        var target = e.target;
+        if (target instanceof Node && this.container.contains(target)) {
+            return true;
+        }
+        var active = document.activeElement;
+        return active instanceof Node && this.container.contains(active);
     };
     /**
      * Drains the convert queue on a single serial worker so ENTITY flush chunks
@@ -3223,20 +3335,63 @@ var AcTrView2d = /** @class */ (function (_super) {
         }
     };
     /**
-     * Releases canvas DOM listeners and stops the animation loop.
+     * Releases canvas DOM, WebGL context, convert work, and listeners.
      *
      * Call when this view will no longer be used (manager destroy / split
      * view teardown). Safe to call more than once.
      */
     AcTrView2d.prototype.dispose = function () {
-        var _a, _b;
+        var _a, _b, _c;
+        if (this._viewDisposed)
+            return;
+        this._viewDisposed = true;
+        // Stop convert before tearing down documents/singletons that commit paths read.
+        this.abortConversion();
         (_a = this._disposeCanvasTouchCallout) === null || _a === void 0 ? void 0 : _a.call(this);
         this._disposeCanvasTouchCallout = undefined;
         (_b = this._disposeProgressiveInputWatch) === null || _b === void 0 ? void 0 : _b.call(this);
         this._disposeProgressiveInputWatch = undefined;
+        (_c = this._disposeMobileBoxGesture) === null || _c === void 0 ? void 0 : _c.call(this);
+        this._disposeMobileBoxGesture = undefined;
+        this._viewDomAbort.abort();
+        if (this._onFontNotFound) {
+            this._renderer.events.fontNotFound.removeEventListener(this._onFontNotFound);
+        }
+        if (this._onFontLoaded) {
+            this._renderer.events.fontLoaded.removeEventListener(this._onFontLoaded);
+        }
+        if (this._onSysVarChanged) {
+            AcDbSysVarManager.instance().events.sysVarChanged.removeEventListener(this._onSysVarChanged);
+        }
+        if (this._onSettingsModified) {
+            AcApSettingManager.instance.events.modified.removeEventListener(this._onSettingsModified);
+        }
+        if (this._onLayoutSwitched) {
+            acdbHostApplicationServices().layoutManager.events.layoutSwitched.removeEventListener(this._onLayoutSwitched);
+        }
+        if (this._onCommandWillStartHitTest) {
+            this.editor.events.commandWillStart.removeEventListener(this._onCommandWillStartHitTest);
+        }
+        if (this._onCommandEndedHitTest) {
+            this.editor.events.commandEnded.removeEventListener(this._onCommandEndedHitTest);
+        }
+        this._gripManager.dispose();
         this.clearFontLoadedRedrawTimer();
         this.cancelOpenLineworkFrame();
         this.stopAnimationLoop();
+        this.selectionSet.clear();
+        this.htmlTransientManager.dispose();
+        this._scene.clear();
+        this._renderer.dispose();
+        AcDbRenderingCache.instance.clear();
+        var webgl = this._renderer.internalRenderer;
+        webgl.dispose();
+        webgl.forceContextLoss();
+        this.canvas.remove();
+        this._css2dRenderer.domElement.remove();
+        this._stats.dom.remove();
+        // Editor / command line / ResizeObserver (after canvas/CSS2D removed).
+        _super.prototype.dispose.call(this);
     };
     /**
      * @inheritdoc
@@ -3338,7 +3493,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param layoutBtrId Input the block table record id of the layout
      */
     AcTrView2d.prototype.loadLayoutEntitiesIfNeeded = function (layoutBtrId) {
-        var e_11, _a;
+        var e_12, _a;
         var _this = this;
         try {
             var db = AcApDocManager.instance.curDocument.database;
@@ -3402,12 +3557,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                     entities_2.push(entity);
                 }
             }
-            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+            catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
                     if (iterator_1_1 && !iterator_1_1.done && (_a = iterator_1.return)) _a.call(iterator_1);
                 }
-                finally { if (e_11) throw e_11.error; }
+                finally { if (e_12) throw e_12.error; }
             }
             if (entities_2.length === 0) {
                 // Empty layout (e.g. a freshly-created paper space tab). Mark as
@@ -3731,8 +3886,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.redrawGlyphEntitiesAfterFontLoad = function (epoch, fontName) {
         return __awaiter(this, void 0, void 0, function () {
-            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_12_1, defaults, normalized_1, msSinceIdle, db;
-            var e_13, _c, e_12, _d;
+            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_13_1, defaults, normalized_1, msSinceIdle, db;
+            var e_14, _c, e_13, _d;
             var _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -3754,12 +3909,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                        catch (e_14_1) { e_14 = { error: e_14_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_13) throw e_13.error; }
+                            finally { if (e_14) throw e_14.error; }
                         }
                         _g.label = 1;
                     case 1:
@@ -3782,14 +3937,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_12_1 = _g.sent();
-                        e_12 = { error: e_12_1 };
+                        e_13_1 = _g.sent();
+                        e_13 = { error: e_13_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (glyphs_1_1 && !glyphs_1_1.done && (_d = glyphs_1.return)) _d.call(glyphs_1);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (glyphs.length > 0) {
@@ -3840,7 +3995,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         });
     };
     AcTrView2d.prototype.groupHasPendingGlyphGeometry = function (group) {
-        var e_14, _a;
+        var e_15, _a;
         try {
             // Prefer O(block-def shells). A full THREE.traverse over a mega-block
             // (100k+ flattened mesh leaves) was dominating scene-convert wall time.
@@ -3851,12 +4006,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         return AcTrView2d.directChildrenHavePendingGlyphs(group);
     };
@@ -3867,7 +4022,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * a whole-floor INSERT is O(glyph shells), not O(all drawable leaves).
      */
     AcTrView2d.directChildrenHavePendingGlyphs = function (root) {
-        var e_15, _a;
+        var e_16, _a;
         var children = root.children;
         for (var i = 0; i < children.length; i++) {
             var child = children[i];
@@ -3879,7 +4034,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             }
             if (child instanceof AcTrGroup) {
                 try {
-                    for (var _b = (e_15 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = (e_16 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var entity = _c.value;
                         if (entity instanceof AcTrGlyphEntity &&
                             !entity.hasDrawableGeometry()) {
@@ -3887,12 +4042,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                catch (e_16_1) { e_16 = { error: e_16_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_15) throw e_15.error; }
+                    finally { if (e_16) throw e_16.error; }
                 }
                 if (AcTrView2d.directChildrenHavePendingGlyphs(child)) {
                     return true;
@@ -4050,7 +4205,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper layouts.
      */
     AcTrView2d.prototype.ensureViewportViews = function (blockTableRecord, layoutView) {
-        var e_16, _a;
+        var e_17, _a;
         var iterator = blockTableRecord.newIterator();
         try {
             for (var iterator_2 = __values(iterator), iterator_2_1 = iterator_2.next(); !iterator_2_1.done; iterator_2_1 = iterator_2.next()) {
@@ -4063,12 +4218,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 layoutView.addViewport(viewportView);
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
                 if (iterator_2_1 && !iterator_2_1.done && (_a = iterator_2.return)) _a.call(iterator_2);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_17) throw e_17.error; }
         }
     };
     /**
@@ -4077,7 +4232,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * {@link AcDbViewport.frozenLayerIds} but omit them from `toGiViewport()`.
      */
     AcTrView2d.prototype.toGiViewportWithFrozenLayers = function (entity) {
-        var e_17, _a;
+        var e_18, _a;
         var _b;
         var gi = entity.toGiViewport();
         if (gi.frozenLayers && gi.frozenLayers.length > 0) {
@@ -4097,12 +4252,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         names.push(layer.name);
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            catch (e_18_1) { e_18 = { error: e_18_1 }; }
             finally {
                 try {
                     if (ids_1_1 && !ids_1_1.done && (_a = ids_1.return)) _a.call(ids_1);
                 }
-                finally { if (e_17) throw e_17.error; }
+                finally { if (e_18) throw e_18.error; }
             }
         }
         gi.frozenLayerIds = __spreadArray([], __read(ids), false);
@@ -4422,8 +4577,8 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.handleGroup = function (group_1, progressive_1) {
         return __awaiter(this, arguments, void 0, function (group, progressive, epoch, convertGen) {
-            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_4, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_18_1;
-            var e_19, _b, e_18, _c;
+            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_4, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_19_1;
+            var e_20, _b, e_19, _c;
             var _this = this;
             var _d, _e;
             if (epoch === void 0) { epoch = this._convertEpoch; }
@@ -4478,12 +4633,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 child.parent = null;
                             }
                         }
-                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
                         finally {
                             try {
                                 if (children_1_1 && !children_1_1.done && (_b = children_1.return)) _b.call(children_1);
                             }
-                            finally { if (e_19) throw e_19.error; }
+                            finally { if (e_20) throw e_20.error; }
                         }
                         renderContext = group.renderContext;
                         groupObjectId = group.objectId;
@@ -4598,14 +4753,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_18_1 = _f.sent();
-                        e_18 = { error: e_18_1 };
+                        e_19_1 = _f.sent();
+                        e_19 = { error: e_19_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (objectsGroupByLayer_1_1 && !objectsGroupByLayer_1_1.done && (_c = objectsGroupByLayer_1.return)) _c.call(objectsGroupByLayer_1);
                         }
-                        finally { if (e_18) throw e_18.error; }
+                        finally { if (e_19) throw e_19.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         group.dispose();