@mlightcad/cad-simple-viewer 1.4.13 → 1.5.0

package/lib/view/AcTrPickResultUtil.js

@@ -0,0 +1,54 @@
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+export function sortPickResults(results, point) {
+    return __spreadArray([], __read(results), false).sort(function (a, b) { return comparePickResults(a, b, point); });
+}
+function comparePickResults(a, b, point) {
+    var areaDelta = bboxArea(a) - bboxArea(b);
+    if (Math.abs(areaDelta) > Number.EPSILON)
+        return areaDelta;
+    var distanceDelta = squaredDistanceToBox(point, a) - squaredDistanceToBox(point, b);
+    if (Math.abs(distanceDelta) > Number.EPSILON)
+        return distanceDelta;
+    return 0;
+}
+function bboxArea(item) {
+    return Math.max(item.maxX - item.minX, 0) * Math.max(item.maxY - item.minY, 0);
+}
+function squaredDistanceToBox(point, item) {
+    var dx = point.x < item.minX
+        ? item.minX - point.x
+        : point.x > item.maxX
+            ? point.x - item.maxX
+            : 0;
+    var dy = point.y < item.minY
+        ? item.minY - point.y
+        : point.y > item.maxY
+            ? point.y - item.maxY
+            : 0;
+    return dx * dx + dy * dy;
+}
+//# sourceMappingURL=AcTrPickResultUtil.js.map

package/lib/view/AcTrPickResultUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcTrPickResultUtil.js","sourceRoot":"","sources":["../../src/view/AcTrPickResultUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,MAAM,UAAU,eAAe,CAC7B,OAAuC,EACvC,KAAsB;IAEtB,OAAO,yBAAI,OAAO,UAAE,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAA/B,CAA+B,CAAC,CAAA;AACrE,CAAC;AAED,SAAS,kBAAkB,CACzB,CAA+B,EAC/B,CAA+B,EAC/B,KAAsB;IAEtB,IAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAC3C,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAE1D,IAAM,aAAa,GACjB,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,GAAG,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IACjE,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,OAAO;QAAE,OAAO,aAAa,CAAA;IAElE,OAAO,CAAC,CAAA;AACV,CAAC;AAED,SAAS,QAAQ,CAAC,IAAkC;IAClD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;AAChF,CAAC;AAED,SAAS,oBAAoB,CAC3B,KAAsB,EACtB,IAAkC;IAElC,IAAM,EAAE,GACN,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI;QACjB,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI;YACrB,CAAC,CAAC,CAAC,CAAA;IACT,IAAM,EAAE,GACN,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI;QACjB,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI;YACnB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI;YACrB,CAAC,CAAC,CAAC,CAAA;IAET,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;AAC1B,CAAC"}

package/lib/view/AcTrView2d.d.ts

@@ -83,6 +83,7 @@ export declare class AcTrView2d extends AcEdBaseView {
      * @param options.background - Optional background color as hex number (default: 0x000000)
      */
     constructor(options?: AcTrView2dOptions);
+    private getPointerSelectionAction;
     /**
      * Initializes the viewer after renderer and camera are created.
      *
@@ -315,6 +316,30 @@ export declare class AcTrView2d extends AcEdBaseView {
      */
     private batchConvert;
     private handleGroup;
+    /**
+     * 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.
+     */
+    private remapInheritedLayerObjects;
+    /**
+     * 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".
+     */
+    private promoteLayerZeroByLayerColor;
+    /**
+     * Builds the resolved layer traits used when layer-0 block content inherits an INSERT layer.
+     */
+    private getEffectiveLayerTraits;
     private decreaseNumOfEntitiesToProcess;
 }
 //# sourceMappingURL=AcTrView2d.d.ts.map

package/lib/view/AcTrView2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcTrView2d.d.ts","sourceRoot":"","sources":["../../src/view/AcTrView2d.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcTrView2d.d.ts","sourceRoot":"","sources":["../../src/view/AcTrView2d.ts"],"names":[],"mappings":"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"}

package/lib/view/AcTrView2d.js

@@ -73,15 +73,16 @@ var __values = (this && this.__values) || function(o) {
 };
 import { acdbHostApplicationServices, AcDbRasterImage, AcDbRay, AcDbSysVarManager, AcDbViewport, AcDbXline, AcGeBox2d, AcGePoint2d, log } from '@mlightcad/data-model';
 import { AcDbSystemVariables } from '@mlightcad/data-model';
-import { AcTrEntity, AcTrGroup, AcTrRenderer, AcTrViewportView } from '@mlightcad/three-renderer';
+import { AcTrEntity, AcTrGroup, AcTrRenderer, AcTrViewportView, getMaterialMetadata, hasByLayerBinding, setMaterialMetadata } 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, AcEdViewMode, applyUiThemeFromBackground, eventBus } from '../editor';
+import { AcEdBaseView, AcEdConditionWaiter, AcEdCorsorType, AcEdViewMode, applyUiThemeFromBackground, eventBus, resolvePointerSelectionAction } from '../editor';
 import { AcTrGeometryUtil } from '../util';
 import { AcTrLayoutView } from './AcTrLayoutView';
 import { AcTrLayoutViewManager } from './AcTrLayoutViewManager';
+import { sortPickResults } from './AcTrPickResultUtil';
 import { AcTrScene } from './AcTrScene';
 /**
  * Default view option values
@@ -179,11 +180,44 @@ var AcTrView2d = /** @class */ (function (_super) {
         // Initialize background color through setter to keep renderer/cursor/foreground in sync.
         _this.backgroundColor = mergedOptions.background || 0x000000;
         _this._stats = _this.createStats(AcApSettingManager.instance.isShowStats);
+        // Two sysvars can drive the canvas background:
+        //
+        // - WHITEBKCOLOR (boolean): the low-level "is the paper white?" flag
+        //   that the View has always honoured.
+        // - COLORTHEME (number): the AutoCAD-standard theme selector where
+        //   0 = dark theme (black bg) and 1 = light theme (white bg).
+        //
+        // The Vue composable `useDark` (cad-viewer) toggles only COLORTHEME
+        // when the user flips the theme.  Without this bridge, toggling the
+        // UI theme left WHITEBKCOLOR stale and the canvas kept its previous
+        // background even though `changeForeground` had been fired through
+        // MTEXT/line inversion — producing e.g. a black canvas in light mode
+        // or a white canvas in dark mode.
+        //
+        // Listening to both sysvars keeps either entry point working.  The
+        // two remain independent (settable in isolation) because setting
+        // `this.backgroundColor` is idempotent and the handler for each
+        // sysvar only fires when that specific variable changes.
         AcDbSysVarManager.instance().events.sysVarChanged.addEventListener(function (args) {
-            if (args.name === AcDbSystemVariables.WHITEBKCOLOR.toLowerCase()) {
+            var nameLower = args.name.toLowerCase();
+            if (nameLower === AcDbSystemVariables.WHITEBKCOLOR.toLowerCase()) {
                 var useWhiteBackgroundColor = args.newVal;
                 _this.backgroundColor = useWhiteBackgroundColor ? 0xffffff : 0;
             }
+            else if (nameLower === AcDbSystemVariables.COLORTHEME.toLowerCase()) {
+                // COLORTHEME is registered with type 'number' in the data-model
+                // (0 = dark, 1 = light), but the sysvar bus does not strictly
+                // coerce values.  Normalise defensively so plugins setting the
+                // value as a string or boolean still behave correctly.
+                var newVal = args.newVal;
+                var isLight = typeof newVal === 'number'
+                    ? newVal === 1
+                    : typeof newVal === 'boolean'
+                        ? newVal
+                        : String(newVal).toLowerCase() === 'light' ||
+                            String(newVal) === '1';
+                _this.backgroundColor = isLight ? 0xffffff : 0;
+            }
         });
         AcApSettingManager.instance.events.modified.addEventListener(function (args) {
             if (args.key == 'isShowStats') {
@@ -227,7 +261,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             var width = Math.abs(p1.x - p2.x);
             var height = Math.abs(p1.y - p2.y);
             var mode = _this.getSelectionMode(selectionStartCanvas, curCanvas);
-            var action = _this.getSelectionActionFromEvent(e);
+            var action = _this.getPointerSelectionAction(e);
             var style = _this.getSelectionPreviewStyle(mode, action);
             Object.assign(selectionPreviewEl.style, {
                 left: "".concat(left, "px"),
@@ -248,7 +282,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             });
             var endWcs = _this.screenToWorld(endCanvas);
             clearSelectionPreview();
-            var action = _this.getSelectionActionFromEvent(e);
+            var action = _this.getPointerSelectionAction(e);
             if (_this.isSelectionClick(selectionStartCanvas, endCanvas)) {
                 var picked = _this.pick(endWcs);
                 if (picked.length > 0) {
@@ -321,6 +355,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         _this._numOfEntitiesToProcess = 0;
         return _this;
     }
+    AcTrView2d.prototype.getPointerSelectionAction = function (e) {
+        return resolvePointerSelectionAction(e);
+    };
     /**
      * Initializes the viewer after renderer and camera are created.
      *
@@ -431,6 +468,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         set: function (value) {
             this._renderer.setClearColor(value);
             this._renderer.changeForeground(value == 0 ? 0xffffff : 0);
+            // Store the canvas colour for theme-sensitive materials created after this
+            // point. `changeForeground` above keeps ACI 7 linework and hatches visible.
+            this._renderer.currentBackgroundColor = value;
             this.editor.setCursorColor(value == 0 ? 'white' : 'black');
             applyUiThemeFromBackground(value);
             this._isDirty = true;
@@ -627,24 +667,14 @@ var AcTrView2d = /** @class */ (function (_super) {
             var firstQueryResults = this._scene.search(box);
             var threshold = Math.max(box.size.width / 2, box.size.height / 2);
             var raycaster_1 = activeLayoutView.resetRaycaster(point, threshold);
-            if (pickOneOnly) {
-                firstQueryResults.some(function (item) {
-                    var objectId = item.id;
-                    if (activeLayout.isIntersectWith(objectId, raycaster_1)) {
-                        results.push(item);
-                        return true;
-                    }
-                    return false;
-                });
-            }
-            else {
-                firstQueryResults.forEach(function (item) {
-                    var objectId = item.id;
-                    if (activeLayout.isIntersectWith(objectId, raycaster_1)) {
-                        results.push(item);
-                    }
-                });
-            }
+            firstQueryResults.forEach(function (item) {
+                var objectId = item.id;
+                if (activeLayout.isIntersectWith(objectId, raycaster_1)) {
+                    results.push(item);
+                }
+            });
+            var sortedResults = sortPickResults(results, point);
+            return pickOneOnly ? sortedResults.slice(0, 1) : sortedResults;
         }
         return results;
     };
@@ -674,12 +704,27 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.addLayer = function (layer) {
-        this._scene.addLayer({
+        var updatedLayers = this._scene.addLayer({
             name: layer.name,
             isFrozen: layer.isFrozen,
             isOff: layer.isOff,
             color: layer.color
         });
+        var traits = {
+            layer: layer.name,
+            color: layer.color.clone(),
+            rgbColor: layer.color.RGB,
+            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._isDirty = true;
     };
     /**
@@ -973,83 +1018,75 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.batchConvert = function (entities) {
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_1, this_1, i;
-            var _this = this;
+            var i, entity, threeEntity, isExtendBbox, layoutView, viewportView, fileName, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _loop_1 = function (i) {
-                            var entity, threeEntity, isExtendBbox_1, layoutView, viewportView, fileName;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        entity = entities[i];
-                                        threeEntity = this_1.drawEntity(entity, true);
-                                        if (!threeEntity) return [3 /*break*/, 4];
-                                        threeEntity.objectId = entity.objectId;
-                                        threeEntity.ownerId = entity.ownerId;
-                                        threeEntity.layerName = entity.layer;
-                                        threeEntity.visible = entity.visibility;
-                                        if (!(threeEntity instanceof AcTrGroup &&
-                                            !threeEntity.isOnTheSameLayer)) return [3 /*break*/, 1];
-                                        this_1.handleGroup(threeEntity);
-                                        this_1.decreaseNumOfEntitiesToProcess();
-                                        return [3 /*break*/, 3];
-                                    case 1:
-                                        isExtendBbox_1 = !(entity instanceof AcDbRay || entity instanceof AcDbXline);
-                                        return [4 /*yield*/, threeEntity
-                                                .draw()
-                                                .then(function () {
-                                                _this._scene.addEntity(threeEntity, isExtendBbox_1);
-                                                // Release memory occupied by this entity
-                                                threeEntity.dispose();
-                                                _this._isDirty = true;
-                                            })
-                                                .finally(function () {
-                                                _this.decreaseNumOfEntitiesToProcess();
-                                            })];
-                                    case 2:
-                                        _b.sent();
-                                        _b.label = 3;
-                                    case 3:
-                                        if (entity instanceof AcDbViewport) {
-                                            // In paper space layouts, there is always a system-defined "default" viewport that exists as
-                                            // the bottom-most item. This viewport doesn't show any entities and is mainly for internal
-                                            // AutoCAD purposes. The viewport id number of this system-defined "default" viewport is 1.
-                                            if (entity.number !== 1) {
-                                                layoutView = this_1._layoutViewManager.getAt(entity.ownerId);
-                                                if (layoutView) {
-                                                    viewportView = new AcTrViewportView(layoutView, entity.toGiViewport(), this_1._renderer);
-                                                    layoutView.addViewport(viewportView);
-                                                }
-                                            }
-                                        }
-                                        else if (entity instanceof AcDbRasterImage) {
-                                            fileName = entity.imageFileName;
-                                            if (fileName)
-                                                this_1._missedImages.set(entity.objectId, fileName);
-                                        }
-                                        return [3 /*break*/, 5];
-                                    case 4:
-                                        this_1.decreaseNumOfEntitiesToProcess();
-                                        _b.label = 5;
-                                    case 5: return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
                         i = 0;
                         _a.label = 1;
                     case 1:
-                        if (!(i < entities.length)) return [3 /*break*/, 4];
-                        return [5 /*yield**/, _loop_1(i)];
+                        if (!(i < entities.length)) return [3 /*break*/, 9];
+                        entity = entities[i];
+                        _a.label = 2;
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _a.trys.push([2, 6, 7, 8]);
+                        threeEntity = this.drawEntity(entity, true);
+                        if (!threeEntity)
+                            return [3 /*break*/, 8];
+                        threeEntity.objectId = entity.objectId;
+                        threeEntity.ownerId = entity.ownerId;
+                        threeEntity.layerName = entity.layer;
+                        threeEntity.visible = entity.visibility;
+                        if (threeEntity instanceof AcTrGroup &&
+                            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);
+                        }
+                        if (!(threeEntity instanceof AcTrGroup &&
+                            !threeEntity.isOnTheSameLayer)) return [3 /*break*/, 3];
+                        this.handleGroup(threeEntity);
+                        return [3 /*break*/, 5];
                     case 3:
+                        isExtendBbox = !(entity instanceof AcDbRay || entity instanceof AcDbXline);
+                        return [4 /*yield*/, threeEntity.draw()];
+                    case 4:
+                        _a.sent();
+                        this._scene.addEntity(threeEntity, isExtendBbox);
+                        // Release memory occupied by this entity
+                        threeEntity.dispose();
+                        this._isDirty = true;
+                        _a.label = 5;
+                    case 5:
+                        if (entity instanceof AcDbViewport) {
+                            // In paper space layouts, there is always a system-defined "default" viewport that exists as
+                            // the bottom-most item. This viewport doesn't show any entities and is mainly for internal
+                            // AutoCAD purposes. The viewport id number of this system-defined "default" viewport is 1.
+                            if (entity.number !== 1) {
+                                layoutView = this._layoutViewManager.getAt(entity.ownerId);
+                                if (layoutView) {
+                                    viewportView = new AcTrViewportView(layoutView, entity.toGiViewport(), this._renderer);
+                                    layoutView.addViewport(viewportView);
+                                }
+                            }
+                        }
+                        else if (entity instanceof AcDbRasterImage) {
+                            fileName = entity.imageFileName;
+                            if (fileName)
+                                this._missedImages.set(entity.objectId, fileName);
+                        }
+                        return [3 /*break*/, 8];
+                    case 6:
+                        error_1 = _a.sent();
+                        log.error("[AcTrView2d] Failed to convert entity ".concat(entity.objectId, " (").concat(entity.type, "):"), error_1);
+                        return [3 /*break*/, 8];
+                    case 7:
+                        this.decreaseNumOfEntitiesToProcess();
+                        return [7 /*endfinally*/];
+                    case 8:
                         ++i;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -1094,21 +1131,29 @@ var AcTrView2d = /** @class */ (function (_super) {
         var groupObjectId = group.objectId;
         var groupLayerName = group.layerName;
         var groupBox = group.box;
+        var groupChildBoxes = group.boxes.map(function (box) { return (__assign({}, box)); });
         objectsGroupByLayer.forEach(function (objects, layerName) {
-            // In AutoCAD, an INSERT entity may reference multiple child entities that
-            // reside on different layers. During rendering, this engine groups entities
-            // by layer and assigns each group the INSERT entity's object ID.
-            // As a result, a single object ID (typically from an INSERT entity) may
-            // correspond to multiple layers. However, in this layer its object id is still
-            // uniqiue.
+            // AutoCAD block rule: entities authored on layer "0" inherit the INSERT's layer.
+            // Non-zero layers keep their original layer name.
+            var effectiveLayerName = layerName === '0' ? groupLayerName : layerName;
+            // 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);
+            // 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.
+            // Within each layer bucket, the object id remains unique in scene indexing.
             var entity = new AcTrEntity(styleManager);
             entity.applyMatrix4(group.matrix);
             entity.objectId = groupObjectId;
             entity.ownerId = group.ownerId;
-            // Here one group represents one block reference. If the layer name of entities in block
-            // definition is '0', it should be put on layer where the group exist.
-            entity.layerName = layerName === '0' ? groupLayerName : layerName;
+            // If block-definition entities are on layer "0", this bucket now uses the layer
+            // of the block reference itself (effectiveLayerName).
+            entity.layerName = effectiveLayerName;
             entity.box = groupBox;
+            var entityUserData = entity.userData;
+            entityUserData.spatialIndexChildBoxes = groupChildBoxes;
             // Important:
             // DO NOT USE spread operator when adding objects because it may be one very large array
             // and can result in maximum call stack size exceeded
@@ -1121,6 +1166,86 @@ var AcTrView2d = /** @class */ (function (_super) {
         group.dispose();
         this._isDirty = true;
     };
+    /**
+     * 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_3, _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) {
+                    if (child.userData.layerName === sourceLayerName) {
+                        child.userData.layerName = effectiveLayerName;
+                    }
+                    if (!('material' in child))
+                        return;
+                    var material = child.material;
+                    if (Array.isArray(material)) {
+                        var materials = material;
+                        child.material = materials.map(function (entry) {
+                            return renderer.getLayerBoundMaterial(_this.promoteLayerZeroByLayerColor(entry, sourceLayerName), effectiveLayerName, layerTraits);
+                        });
+                        return;
+                    }
+                    var remappedMaterial = renderer.getLayerBoundMaterial(_this.promoteLayerZeroByLayerColor(material, sourceLayerName), effectiveLayerName, layerTraits);
+                    child.material = remappedMaterial;
+                    child.userData.styleMaterialId = remappedMaterial.id;
+                });
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (objects_1_1 && !objects_1_1.done && (_a = objects_1.return)) _a.call(objects_1);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+    };
+    /**
+     * 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(),
+            rgbColor: layer.color.RGB,
+            lineType: layer.lineStyle,
+            lineWeight: layer.lineWeight,
+            transparency: layer.transparency
+        };
+    };
     AcTrView2d.prototype.decreaseNumOfEntitiesToProcess = function () {
         this._numOfEntitiesToProcess--;
         if (this._numOfEntitiesToProcess < 0) {