@mlightcad/cad-simple-viewer 1.5.6 → 1.5.7

package/lib/view/AcTrView2d.js

@@ -98,17 +98,23 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { acdbHostApplicationServices, AcDbMText, AcDbRasterImage, AcDbRay, AcDbSysVarManager, AcDbViewport, AcDbXline, AcGeBox2d, AcGePoint2d, log } from '@mlightcad/data-model';
 import { AcDbSystemVariables } from '@mlightcad/data-model';
-import { AcTrEntity, AcTrGroup, AcTrRenderer, AcTrViewportView, getMaterialMetadata, hasByLayerBinding, setMaterialMetadata } from '@mlightcad/three-renderer';
+import { AcTrEntity, AcTrGroup, AcTrRenderer, AcTrViewportView } from '@mlightcad/three-renderer';
+import { AcTrMatrixUtil } from '@mlightcad/three-renderer';
 import * as THREE from 'three';
 import Stats from 'three/examples/jsm/libs/stats.module';
 import { CSS2DRenderer } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
 import { AcApDocManager, AcApSettingManager } from '../app';
 import { AcEdBaseView, AcEdConditionWaiter, AcEdCorsorType, AcEdGripManager, AcEdMTextEditor, AcEdOpenMode, AcEdViewMode, eventBus, resolvePointerSelectionAction } from '../editor';
 import { ACGI_MODEL_SPACE_BACKGROUND, isModelSpaceDatabase, readLayoutBackgroundColor } from '../editor/global/AcEdUiColor';
+import { isEffectiveSpatialQueryHit } from '../editor/view/AcEdSpatialQueryResult';
 import { AcTrGeometryUtil } from '../util';
+import { acapRunDatabaseEdit } from '../util/AcApDatabaseEdit';
+import { AcEdViewKeyHandler } from './AcEdViewKeyHandler';
 import { AcTrEntityDisplayController } from './AcTrEntityDisplayController';
-import { assertAcTrGroupWcsBboxesConsistent } from './AcTrGroupWcsBboxAssert';
+import { assertAcTrGroupWcsBboxesConsistent, unionGroupWcsChildBoxes } from './AcTrGroupWcsBboxAssert';
+import { AcTrInheritedLayerMaterialMapper } from './AcTrInheritedLayerMaterialMapper';
 import { AcTrLayer } from './AcTrLayer';
+import { AcTrLayerAppearanceController } from './AcTrLayerAppearanceController';
 import { AcTrLayoutView } from './AcTrLayoutView';
 import { AcTrLayoutViewManager } from './AcTrLayoutViewManager';
 import { sortPickResults } from './AcTrPickResultUtil';
@@ -158,11 +164,15 @@ var AcTrView2d = /** @class */ (function (_super) {
         var mergedOptions = __assign(__assign({}, DEFAULT_VIEW_2D_OPTIONS), options);
         var container = (_a = mergedOptions.container) !== null && _a !== void 0 ? _a : document.createElement('div');
         mergedOptions.container = container;
+        container.style.overflow = 'hidden';
         var renderer = new THREE.WebGLRenderer({
             antialias: true,
             alpha: true
         });
         container.appendChild(renderer.domElement);
+        renderer.domElement.style.display = 'block';
+        renderer.domElement.style.maxWidth = '100%';
+        renderer.domElement.style.maxHeight = '100%';
         _this = _super.call(this, renderer.domElement, container) || this;
         /**
          * ID of the currently scheduled requestAnimationFrame callback.
@@ -250,6 +260,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             _this._isDirty = (_this._progressiveRendering && stillLoading) || needsRedraw;
         };
         _this._gripManager = new AcEdGripManager(_this);
+        _this._keyHandler = new AcEdViewKeyHandler(_this);
         if (options.calculateSizeCallback) {
             _this.setCalculateSizeCallback(options.calculateSizeCallback);
         }
@@ -266,8 +277,11 @@ var AcTrView2d = /** @class */ (function (_super) {
             });
         });
         _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.backgroundColor =
+            (_b = mergedOptions.background) !== null && _b !== void 0 ? _b : ACGI_MODEL_SPACE_BACKGROUND;
         _this._stats = _this.createStats(AcApSettingManager.instance.isShowStats);
         // Layout background sysvars drive the canvas clear colour and ACI-7
         // inversion (`MODELBKCOLOR` for model space, `PAPERBKCOLOR` for the
@@ -346,6 +360,12 @@ var AcTrView2d = /** @class */ (function (_super) {
             selectionPreviewEl.style.setProperty('--line-color', style.lineColor);
         });
         _this.canvas.addEventListener('mouseup', function (e) {
+            if (_this._gripManager.isDragging) {
+                selectionStartWcs = null;
+                selectionStartCanvas = null;
+                clearSelectionPreview();
+                return;
+            }
             if (!selectionStartWcs || !selectionStartCanvas)
                 return;
             var endCanvas = _this.viewportToCanvas({
@@ -388,31 +408,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         // such as the canvas or the entire document. This can interfere with other event listeners you
         // add, including the keydown event.
         document.addEventListener('keydown', function (e) {
-            // Ignore global shortcuts while typing or during IME composition.
-            var target = e.target;
-            var isEditableTarget = target instanceof HTMLInputElement ||
-                target instanceof HTMLTextAreaElement ||
-                (target === null || target === void 0 ? void 0 : target.isContentEditable) === true;
-            // keyCode 229 is commonly reported by IME composing key events.
-            var isImeComposing = e.isComposing || e.keyCode === 229;
-            if (isEditableTarget || isImeComposing) {
-                return;
-            }
-            switch (e.code) {
-                case 'Escape':
-                    _this.selectionSet.clear();
-                    break;
-                case 'Delete':
-                case 'Backspace':
-                    // Only dispatch erase when no command is currently active.
-                    // Dispatching erase mid-command (e.g. while LINE awaits the next
-                    // point) corrupts the active command's input pipeline because
-                    // sendStringToExecute clears scripted inputs unconditionally.
-                    if (!_this.editor.isActive) {
-                        AcApDocManager.instance.sendStringToExecute('erase');
-                    }
-                    break;
-            }
+            _this._keyHandler.handleKeyDown(e);
         });
         acdbHostApplicationServices().layoutManager.events.layoutSwitched.addEventListener(function (args) {
             var btrId = args.layout.blockTableRecordId;
@@ -468,6 +464,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         _this._css2dRenderer.domElement.style.left = '0px';
         _this._css2dRenderer.domElement.style.pointerEvents = 'none';
         _this._css2dRenderer.domElement.style.zIndex = '99998';
+        _this._css2dRenderer.domElement.style.maxWidth = '100%';
+        _this._css2dRenderer.domElement.style.maxHeight = '100%';
         container.appendChild(_this._css2dRenderer.domElement);
         _this._missedImages = new Map();
         _this._layoutViewManager = new AcTrLayoutViewManager();
@@ -658,7 +656,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._renderer.setClearColor(value);
         // Updates style-manager background, repaints ACI-7 / bg-follow materials.
         this._renderer.currentBackgroundColor = value;
-        this.refreshTextMaterialsInObjectTree(this._scene.internalScene);
+        this._layerAppearance.refreshTextMaterialsInObjectTree(this._scene.internalScene);
         this.editor.syncCursorBackground(value);
         this._isDirty = true;
     };
@@ -668,11 +666,21 @@ var AcTrView2d = /** @class */ (function (_super) {
         }
         return isModelSpaceDatabase(database);
     };
+    /**
+     * Binds the active drawing database on the renderer draw context.
+     *
+     * Called before document read so layer-table traits are available while layers
+     * are appended during open, and again after open to refresh display sysvars.
+     */
+    AcTrView2d.prototype.bindDrawDatabase = function (database) {
+        this._renderer.context.database = database;
+    };
     /**
      * Re-reads layout background sysvars from the active database. Called after
      * a document is opened so DWG-stored values take effect.
      */
     AcTrView2d.prototype.syncDisplaySysVars = function (database) {
+        this.bindDrawDatabase(database);
         this.applyCanvasBackground(readLayoutBackgroundColor(database, this.isModelSpaceLayout(database)));
     };
     /**
@@ -951,13 +959,18 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.editMTextEntity = function (mtext) {
         return __awaiter(this, void 0, void 0, function () {
-            var editor, applied, result;
+            var db, editor, applied, result_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        db = mtext.database;
                         if (mtext.lineSpacingFactor !== AcEdMTextEditor.defaultLineSpacingFactor) {
-                            mtext.lineSpacingFactor = AcEdMTextEditor.defaultLineSpacingFactor;
-                            mtext.triggerModifiedEvent();
+                            acapRunDatabaseEdit(db, 'Edit MText', function () {
+                                var opened = db.openEntityForWrite(mtext);
+                                if (!(opened instanceof AcDbMText))
+                                    return;
+                                opened.lineSpacingFactor = AcEdMTextEditor.defaultLineSpacingFactor;
+                            });
                         }
                         // Hide the in-scene MTEXT while the inline editor renders its own copy; otherwise
                         // both draw at once (double text) when the user double-clicks to edit.
@@ -978,16 +991,20 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 toolbarFontFamilies: this.getMTextToolbarFontFamilies()
                             })];
                     case 2:
-                        result = _a.sent();
-                        if (!result)
+                        result_1 = _a.sent();
+                        if (!result_1)
                             return [2 /*return*/];
-                        mtext.location = result.location;
-                        mtext.contents = result.contents;
-                        mtext.width = result.width;
-                        mtext.height = result.height;
-                        mtext.lineSpacingFactor = result.lineSpacingFactor;
-                        mtext.attachmentPoint = result.attachmentPoint;
-                        mtext.triggerModifiedEvent();
+                        acapRunDatabaseEdit(db, 'Edit MText', function () {
+                            var opened = db.openEntityForWrite(mtext);
+                            if (!(opened instanceof AcDbMText))
+                                return;
+                            opened.location = result_1.location;
+                            opened.contents = result_1.contents;
+                            opened.width = result_1.width;
+                            opened.height = result_1.height;
+                            opened.lineSpacingFactor = result_1.lineSpacingFactor;
+                            opened.attachmentPoint = result_1.attachmentPoint;
+                        });
                         applied = true;
                         return [3 /*break*/, 4];
                     case 3:
@@ -1096,6 +1113,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         firstQueryResults.forEach(function (item) {
             if (drillThroughViewportIds.has(item.id))
                 return;
+            if (!isEffectiveSpatialQueryHit(item))
+                return;
             if (activeLayout.isIntersectWith(item.id, raycaster)) {
                 results.push(item);
             }
@@ -1147,6 +1166,8 @@ var AcTrView2d = /** @class */ (function (_super) {
             var vpRaycaster = vpView.resetRaycaster(modelPt, modelRadius);
             var modelHits = modelLayout.search(modelBox);
             modelHits.forEach(function (item) {
+                if (!isEffectiveSpatialQueryHit(item))
+                    return;
                 if (modelLayout.isIntersectWith(item.id, vpRaycaster)) {
                     results.push(item);
                 }
@@ -1169,8 +1190,8 @@ var AcTrView2d = /** @class */ (function (_super) {
     /**
      * @inheritdoc
      */
-    AcTrView2d.prototype.search = function (box) {
-        return this._scene.search(box);
+    AcTrView2d.prototype.search = function (box, options) {
+        return this._scene.search(box, options);
     };
     /**
      * @inheritdoc
@@ -1192,49 +1213,18 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.addLayer = function (layer) {
-        var updatedLayers = this._scene.addLayer(this.toLayerInfo(layer));
-        var traits = {
-            layer: layer.name,
-            color: layer.color.clone(),
-            lineType: layer.lineStyle,
-            lineWeight: layer.lineWeight,
-            transparency: layer.transparency
-        };
-        var materials = this._renderer.updateLayerMaterial(layer.name, traits);
-        updatedLayers.forEach(function (updatedLayer) {
-            for (var id in materials) {
-                var material = materials[id];
-                updatedLayer.updateMaterial(Number(id), material);
-            }
-        });
+        this._scene.addLayer(this.toLayerInfo(layer));
+        this._layerAppearance.syncFromLiveRecord(layer);
         this._isDirty = true;
     };
     /**
      * @inheritdoc
      */
     AcTrView2d.prototype.updateLayer = function (layer, changes) {
-        var updatedLayers = this._scene.updateLayer(this.toLayerInfo(layer));
-        var traits = {};
-        if (changes.color) {
-            traits.color = changes.color.clone();
+        this._scene.updateLayer(this.toLayerInfo(layer));
+        if (this._layerAppearance.layerStyleMayHaveChanged(changes)) {
+            this._layerAppearance.syncFromLiveRecord(layer);
         }
-        if (changes.lineStyle) {
-            traits.lineType = layer.lineStyle;
-        }
-        if (changes.lineWeight !== undefined) {
-            traits.lineWeight = changes.lineWeight;
-        }
-        if (changes.transparency !== undefined) {
-            traits.transparency = changes.transparency;
-        }
-        traits.layer = layer.name; // always present
-        var materials = this._renderer.updateLayerMaterial(layer.name, traits);
-        updatedLayers.forEach(function (layer) {
-            for (var id in materials) {
-                var material = materials[id];
-                layer.updateMaterial(Number(id), material);
-            }
-        });
         if (this._entityDisplay.layerVisibilityMayHaveChanged(changes) &&
             AcTrLayer.isLayerVisible(this.toLayerInfo(layer))) {
             void this.convertMissingEntitiesOnLayer(layer.name);
@@ -1252,6 +1242,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             var threeEntity = this.drawEntity(entity_1, true);
             if (threeEntity) {
                 threeEntity.objectId = entity_1.objectId;
+                threeEntity.syncDraw();
                 this._scene.addTransientEntity(threeEntity);
                 this._isDirty = true;
             }
@@ -1265,6 +1256,49 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._scene.removeTransientEntity(objectId);
         this._isDirty = true;
     };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.canCreateEntityPreview = function (entityIds) {
+        return this._scene.canCreatePreview(entityIds);
+    };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.createEntityPreview = function (entityIds) {
+        var handleId = this._scene.createPreview(entityIds);
+        if (handleId) {
+            this._isDirty = true;
+        }
+        return handleId;
+    };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.updateEntityPreview = function (handleId, matrix) {
+        if (this._scene.updatePreview(handleId, AcTrMatrixUtil.createMatrix4(matrix))) {
+            this._isDirty = true;
+        }
+    };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.removeEntityPreview = function (handleId) {
+        if (this._scene.removePreview(handleId)) {
+            this._isDirty = true;
+        }
+    };
+    /**
+     * @inheritdoc
+     */
+    AcTrView2d.prototype.updateTransientPreviewTransforms = function (transforms) {
+        if (this._scene.updateTransientPreviewTransforms(transforms.map(function (entry) { return ({
+            objectId: entry.objectId,
+            matrix: AcTrMatrixUtil.createMatrix4(entry.matrix)
+        }); }))) {
+            this._isDirty = true;
+        }
+    };
     /**
      * @inheritdoc
      */
@@ -1341,28 +1375,30 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._scene.setEntityVisible(objectId, false);
     };
     /**
-     * @inheritdoc
+     * Rebuilds scene geometry for entities whose shape or styling changed.
+     *
+     * Pure translations should use {@link translateEntity} instead.
      */
     AcTrView2d.prototype.updateEntity = function (entity) {
         var _this = this;
-        var entities = [];
-        if (Array.isArray(entity)) {
-            entities = entity;
-        }
-        else {
-            entities.push(entity);
-        }
+        var entities = Array.isArray(entity) ? entity : [entity];
+        var selectedIds = entities
+            .map(function (item) { return item.objectId; })
+            .filter(function (objectId) { return _this.selectionSet.has(objectId); });
         for (var i = 0; i < entities.length; ++i) {
             var entity_2 = entities[i];
-            var threeEntity = entity_2.worldDraw(this._renderer);
-            if (threeEntity) {
-                threeEntity.objectId = entity_2.objectId;
-                threeEntity.ownerId = entity_2.ownerId;
-                threeEntity.layerName = entity_2.layer;
-                threeEntity.visible = entity_2.visibility !== false;
-                this._scene.updateEntity(threeEntity);
+            if (this._scene.hasEntity(entity_2.objectId)) {
+                this._scene.removeEntity(entity_2.objectId);
             }
         }
+        // Reconvert through the same path as initial load so block references are
+        // split by layer correctly and deferred MTEXT/SHAPE geometry is drawn.
+        void this.batchConvert(entities).then(function () {
+            if (selectedIds.length > 0) {
+                _this.highlight(selectedIds);
+            }
+            _this._gripManager.refresh();
+        });
         this._isDirty = true;
         // Not sure why texture for image entity isn't updated even if 'isDirty' flag is already set to true.
         // So add one timeout event to set 'isDirty' flag to true again to make it work
@@ -1779,76 +1815,30 @@ var AcTrView2d = /** @class */ (function (_super) {
         return entity.worldDraw(this._renderer, delay);
     };
     /**
-     * Finishes geometry for a converted entity. Progressive mode defers MTEXT/SHAPE
-     * to async workers; non-progressive mode uses synchronous drawing from
-     * {@link drawEntity}(..., false).
+     * Finishes geometry for a converted entity. Block groups always use
+     * {@link AcTrGroup.syncDraw} to finalize deferred children. Progressive mode
+     * defers MTEXT/SHAPE to async workers; non-progressive mode uses
+     * {@link AcTrEntity.syncDraw}.
      */
     AcTrView2d.prototype.finishEntityGeometry = function (threeEntity, progressive) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (threeEntity instanceof AcTrGroup) {
+                            threeEntity.syncDraw();
+                            return [2 /*return*/];
+                        }
                         if (!progressive) return [3 /*break*/, 2];
-                        return [4 /*yield*/, threeEntity.draw()];
+                        return [4 /*yield*/, threeEntity.asyncDraw()];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
                     case 2:
-                        if (this.entityUsedSyncDraw(threeEntity)) {
+                        if (threeEntity.hasDrawableGeometry()) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, threeEntity.draw()];
-                    case 3:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    /**
-     * Returns true when an entity already produced drawable geometry via syncDraw.
-     * MText/Shape expose syncDraw even when delay=true left the entity empty.
-     */
-    AcTrView2d.prototype.entityUsedSyncDraw = function (threeEntity) {
-        return (typeof threeEntity.syncDraw ===
-            'function' && threeEntity.children.length > 0);
-    };
-    /**
-     * Finishes deferred MText/Shape geometry inside a block group before it is
-     * split by layer. Block-reference attributes are created during INSERT
-     * worldDraw and can be left empty when progressive open passes delay=true.
-     */
-    AcTrView2d.prototype.ensureGroupDrawableGeometry = function (group) {
-        return __awaiter(this, void 0, void 0, function () {
-            var pending, finalizeDeferredEntity;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        pending = [];
-                        finalizeDeferredEntity = function (child) {
-                            if (_this.entityUsedSyncDraw(child)) {
-                                return;
-                            }
-                            var drawable = child;
-                            if (typeof drawable.syncDraw !== 'function') {
-                                return;
-                            }
-                            pending.push(Promise.resolve(drawable.syncDraw()));
-                        };
-                        group.getSourceEntities().forEach(finalizeDeferredEntity);
-                        group.traverse(function (child) {
-                            if (!(child instanceof AcTrEntity)) {
-                                return;
-                            }
-                            if (group.getSourceEntities().includes(child)) {
-                                return;
-                            }
-                            finalizeDeferredEntity(child);
-                        });
-                        return [4 /*yield*/, Promise.all(pending)];
-                    case 1:
-                        _a.sent();
+                        threeEntity.syncDraw();
                         return [2 /*return*/];
                 }
             });
@@ -1911,11 +1901,11 @@ var AcTrView2d = /** @class */ (function (_super) {
                         i = 0;
                         _a.label = 1;
                     case 1:
-                        if (!(i < entities.length)) return [3 /*break*/, 13];
+                        if (!(i < entities.length)) return [3 /*break*/, 11];
                         entity = entities[i];
                         _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 10, 11, 12]);
+                        _a.trys.push([2, 8, 9, 10]);
                         // Skip the default paper-space viewport (`*Paper_Space`) entirely:
                         // it is an AutoCAD-internal viewport that exists in every paper
                         // layout and must not be drawn (would render a giant rectangle in
@@ -1929,20 +1919,20 @@ var AcTrView2d = /** @class */ (function (_super) {
                         // parsers).
                         if (entity instanceof AcDbViewport &&
                             AcTrViewportView.isDefaultPaperSpaceViewport(entity)) {
-                            return [3 /*break*/, 12];
+                            return [3 /*break*/, 10];
                         }
                         shouldConvert = options.forExport
                             ? this._entityDisplay.shouldConvertForExport(entity)
                             : this._entityDisplay.shouldConvert(entity);
                         if (!shouldConvert) {
-                            return [3 /*break*/, 12];
+                            return [3 /*break*/, 10];
                         }
                         threeEntity = this.drawEntity(entity, progressive);
                         // Viewports may produce no border geometry (e.g. on a no-plot layer) while
                         // still needing an AcTrViewportView for model content below.
                         if (!threeEntity && !(entity instanceof AcDbViewport))
-                            return [3 /*break*/, 12];
-                        if (!threeEntity) return [3 /*break*/, 9];
+                            return [3 /*break*/, 10];
+                        if (!threeEntity) return [3 /*break*/, 7];
                         threeEntity.objectId = entity.objectId;
                         threeEntity.ownerId = entity.ownerId;
                         threeEntity.layerName = entity.layer;
@@ -1951,39 +1941,33 @@ var AcTrView2d = /** @class */ (function (_super) {
                             threeEntity.isOnTheSameLayer) {
                             // Even when a block expands to a single layer bucket, children authored on
                             // layer "0" still inherit the INSERT layer for ByLayer traits (color, etc.).
-                            this.remapInheritedLayerObjects(threeEntity.children, '0', threeEntity.layerName);
+                            this._inheritedLayerMaterialMapper.remap(threeEntity.children, '0', threeEntity.layerName);
                         }
                         if (!(threeEntity instanceof AcTrGroup &&
                             !threeEntity.isOnTheSameLayer)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.handleGroup(threeEntity)];
+                        return [4 /*yield*/, this.handleGroup(threeEntity, progressive)];
                     case 3:
                         _a.sent();
-                        return [3 /*break*/, 9];
+                        return [3 /*break*/, 7];
                     case 4:
                         isExtendBbox = !(entity instanceof AcDbRay || entity instanceof AcDbXline);
-                        if (!(threeEntity instanceof AcTrGroup)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.ensureGroupDrawableGeometry(threeEntity)];
+                        return [4 /*yield*/, this.finishEntityGeometry(threeEntity, progressive)];
                     case 5:
-                        _a.sent();
-                        _a.label = 6;
-                    case 6: return [4 /*yield*/, this.finishEntityGeometry(threeEntity, progressive)];
-                    case 7:
                         _a.sent();
                         if (threeEntity instanceof AcTrGroup) {
-                            ;
-                            threeEntity.refreshWcsChildBoxesFromChildren();
+                            this.syncGroupSpatialBoundsForIndexing(threeEntity);
                         }
                         this._scene.addEntity(threeEntity, isExtendBbox);
                         this.applySessionHiddenObjectState(entity.objectId);
                         // Release memory occupied by this entity
                         threeEntity.dispose();
-                        if (!progressive) return [3 /*break*/, 9];
+                        if (!progressive) return [3 /*break*/, 7];
                         this._isDirty = true;
                         return [4 /*yield*/, this._progressiveOpenFit.afterGeometryBatch(function () { return _this.resolveLayoutFitBox(); }, i)];
-                    case 8:
+                    case 6:
                         _a.sent();
-                        _a.label = 9;
-                    case 9:
+                        _a.label = 7;
+                    case 7:
                         if (entity instanceof AcDbViewport) {
                             // Default paper-space viewport was already filtered out at the
                             // top of the loop, so anything that reaches here is a real
@@ -2003,33 +1987,53 @@ var AcTrView2d = /** @class */ (function (_super) {
                             if (fileName)
                                 this._missedImages.set(entity.objectId, fileName);
                         }
-                        return [3 /*break*/, 12];
-                    case 10:
+                        return [3 /*break*/, 10];
+                    case 8:
                         error_1 = _a.sent();
                         log.error("[AcTrView2d] Failed to convert entity ".concat(entity.objectId, " (").concat(entity.type, "):"), error_1);
-                        return [3 /*break*/, 12];
-                    case 11:
+                        return [3 /*break*/, 10];
+                    case 9:
                         this.decreaseNumOfEntitiesToProcess();
                         return [7 /*endfinally*/];
-                    case 12:
+                    case 10:
                         ++i;
                         return [3 /*break*/, 1];
-                    case 13: return [2 /*return*/];
+                    case 11: return [2 /*return*/];
                 }
             });
         });
     };
-    AcTrView2d.prototype.handleGroup = function (group) {
+    /**
+     * Rebuilds block-reference child boxes and aligns aggregate {@link AcTrGroup.wcsBbox}
+     * with their union before spatial-index registration.
+     */
+    AcTrView2d.prototype.syncGroupSpatialBoundsForIndexing = function (group) {
+        group.refreshWcsChildBoxesFromChildren();
+        if (group.wcsChildBoxes.length === 0) {
+            return;
+        }
+        var childBoxes = group.wcsChildBoxes.map(function (box) { return ({
+            minX: box.minX,
+            minY: box.minY,
+            maxX: box.maxX,
+            maxY: box.maxY,
+            id: box.id
+        }); });
+        group.wcsBbox = unionGroupWcsChildBoxes(group);
+        var userData = group.userData;
+        userData.spatialIndexChildBoxes = childBoxes;
+    };
+    AcTrView2d.prototype.handleGroup = function (group, progressive) {
         return __awaiter(this, void 0, void 0, function () {
-            var children, objectsGroupByLayer, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, groupChildBoxes;
+            var children, objectsGroupByLayer, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, groupChildBoxes, aggregateSpatialBbox;
             var e_6, _a;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.ensureGroupDrawableGeometry(group)];
+                    case 0: return [4 /*yield*/, this.finishEntityGeometry(group, progressive)];
                     case 1:
                         _b.sent();
-                        group.refreshWcsChildBoxesFromChildren();
+                        this.syncGroupSpatialBoundsForIndexing(group);
                         children = group.children;
                         objectsGroupByLayer = new Map();
                         children.forEach(function (child) {
@@ -2082,6 +2086,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                             maxY: box.maxY,
                             id: box.id
                         }); });
+                        aggregateSpatialBbox = groupChildBoxes.length > 0
+                            ? unionGroupWcsChildBoxes(group)
+                            : group.wcsBbox.clone();
+                        if (groupChildBoxes.length > 0) {
+                            group.wcsBbox = aggregateSpatialBbox.clone();
+                        }
                         objectsGroupByLayer.forEach(function (objects, layerName) {
                             // AutoCAD block rule: entities authored on layer "0" inherit the INSERT's layer.
                             // Non-zero layers keep their original layer name.
@@ -2089,7 +2099,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                             // Keep runtime layer metadata/material cache aligned with the inherited layer so
                             // later layer style edits (color, linetype, lineweight, transparency) target this
                             // object set correctly.
-                            _this.remapInheritedLayerObjects(objects, layerName, effectiveLayerName);
+                            _this._inheritedLayerMaterialMapper.remap(objects, layerName, effectiveLayerName);
                             // One INSERT can expand to children from multiple layers. Here we create one
                             // render entity per layer bucket but preserve the INSERT object id for all
                             // buckets, so selection/highlight still maps back to the same database object.
@@ -2101,7 +2111,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                             // If block-definition entities are on layer "0", this bucket now uses the layer
                             // of the block reference itself (effectiveLayerName).
                             entity.layerName = effectiveLayerName;
-                            entity.wcsBbox = group.wcsBbox.clone();
+                            entity.wcsBbox = aggregateSpatialBbox.clone();
                             var entityUserData = entity.userData;
                             entityUserData.spatialIndexChildBoxes = groupChildBoxes;
                             // Important:
@@ -2110,7 +2120,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                             for (var i = 0; i < objects.length; i++) {
                                 entity.add(objects[i]);
                             }
-                            _this.refreshTextMaterialsInObjectTree(entity);
+                            _this._layerAppearance.refreshTextMaterialsInObjectTree(entity);
                             _this._scene.addEntity(entity, true);
                             _this.applySessionHiddenObjectState(groupObjectId);
                             entity.dispose();
@@ -2127,133 +2137,6 @@ var AcTrView2d = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * Rebinds text materials after INSERT groups are split/reparented by layer.
-     *
-     * Layer remapping can replace mesh materials; text must keep entity-trait
-     * colours (especially ACI-7 foreground on paper layouts).
-     */
-    AcTrView2d.prototype.refreshTextMaterialsInObjectTree = function (root) {
-        root.traverse(function (child) {
-            var refresh = child.refreshTextMaterials;
-            if (typeof refresh === 'function') {
-                refresh.call(child);
-            }
-        });
-    };
-    /**
-     * Remaps layer metadata/material bindings from a source layer to the effective render layer.
-     *
-     * During block decomposition, one INSERT may be split into multiple layer buckets. For
-     * children authored on layer "0", AutoCAD requires inheriting the INSERT's own layer.
-     * This method applies that inheritance by mutating each child's `userData.layerName` and
-     * re-binding materials via renderer cache, so subsequent layer-level style changes still
-     * hit the correct material instances.
-     *
-     * @param objects - Root objects in the current layer bucket to traverse and remap.
-     * @param sourceLayerName - Layer name found in block definition before inheritance.
-     * @param effectiveLayerName - Final layer name used by rendering and style updates.
-     */
-    AcTrView2d.prototype.remapInheritedLayerObjects = function (objects, sourceLayerName, effectiveLayerName) {
-        var e_7, _a;
-        var _this = this;
-        if (sourceLayerName === effectiveLayerName)
-            return;
-        var renderer = this._renderer;
-        var layerTraits = this.getEffectiveLayerTraits(effectiveLayerName);
-        try {
-            for (var objects_1 = __values(objects), objects_1_1 = objects_1.next(); !objects_1_1.done; objects_1_1 = objects_1.next()) {
-                var object = objects_1_1.value;
-                object.traverse(function (child) {
-                    var inheritsInsertLayer = child.userData.layerName === sourceLayerName;
-                    if (inheritsInsertLayer) {
-                        child.userData.layerName = effectiveLayerName;
-                    }
-                    if (!('material' in child))
-                        return;
-                    // Only layer-"0" (or the current source bucket) inherits INSERT traits.
-                    // Attributes/text on other layers must keep their own layer materials.
-                    if (!inheritsInsertLayer)
-                        return;
-                    var material = child.material;
-                    if (Array.isArray(material)) {
-                        var materials = material;
-                        child.material = materials.map(function (entry) {
-                            var _a;
-                            if (!_this.shouldRemapInheritedLayerMaterial(entry, sourceLayerName)) {
-                                return entry;
-                            }
-                            return ((_a = renderer.getLayerBoundMaterial(_this.promoteLayerZeroByLayerColor(entry, sourceLayerName), effectiveLayerName, layerTraits)) !== null && _a !== void 0 ? _a : entry);
-                        });
-                        return;
-                    }
-                    if (!_this.shouldRemapInheritedLayerMaterial(material, sourceLayerName)) {
-                        return;
-                    }
-                    var remappedMaterial = renderer.getLayerBoundMaterial(_this.promoteLayerZeroByLayerColor(material, sourceLayerName), effectiveLayerName, layerTraits);
-                    if (!remappedMaterial) {
-                        return;
-                    }
-                    child.material = remappedMaterial;
-                    child.userData.styleMaterialId = remappedMaterial.id;
-                });
-            }
-        }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
-        finally {
-            try {
-                if (objects_1_1 && !objects_1_1.done && (_a = objects_1.return)) _a.call(objects_1);
-            }
-            finally { if (e_7) throw e_7.error; }
-        }
-    };
-    /**
-     * Layer-0 block contents with ByLayer color resolve to ACI-7 foreground materials before
-     * INSERT remapping. Those materials must still inherit the INSERT layer when their colour
-     * is layer-bound, while explicit ACI-7 entities on layer 0 stay untouched.
-     */
-    AcTrView2d.prototype.shouldRemapInheritedLayerMaterial = function (material, sourceLayerName) {
-        var metadata = getMaterialMetadata(material);
-        if (metadata.isForeground !== true) {
-            return true;
-        }
-        if (sourceLayerName !== '0') {
-            return false;
-        }
-        if (metadata.isByLayerColor === true) {
-            return true;
-        }
-        var promoted = this.promoteLayerZeroByLayerColor(material, sourceLayerName);
-        return getMaterialMetadata(promoted).isByLayerColor === true;
-    };
-    /**
-     * Some DXF conversion paths lose `isByLayerColor` on layer-0 block contents while still
-     * retaining other ByLayer markers (lineType/lineWeight/transparency). For AutoCAD-compatible
-     * INSERT inheritance, treat such colors as inheritable when remapping from layer "0".
-     */
-    AcTrView2d.prototype.promoteLayerZeroByLayerColor = function (material, sourceLayerName) {
-        var metadata = getMaterialMetadata(material);
-        var hasAnyOtherByLayerBinding = hasByLayerBinding(metadata) && metadata.isByLayerColor !== true;
-        if (sourceLayerName === '0' && hasAnyOtherByLayerBinding) {
-            setMaterialMetadata(material, { isByLayerColor: true });
-        }
-        return material;
-    };
-    /**
-     * Builds the resolved layer traits used when layer-0 block content inherits an INSERT layer.
-     */
-    AcTrView2d.prototype.getEffectiveLayerTraits = function (layerName) {
-        var layer = AcApDocManager.instance.curDocument.database.tables.layerTable.getAt(layerName);
-        if (!layer)
-            return undefined;
-        return {
-            layer: layer.name,
-            color: layer.color.clone(),
-            lineType: layer.lineStyle,
-            lineWeight: layer.lineWeight,
-            transparency: layer.transparency
-        };
-    };
     AcTrView2d.prototype.decreaseNumOfEntitiesToProcess = function () {
         this._numOfEntitiesToProcess--;
         if (this._numOfEntitiesToProcess < 0) {