@mlightcad/cad-simple-viewer 1.5.8 → 1.5.9

package/lib/view/AcTrView2d.d.ts

@@ -252,6 +252,23 @@ export declare class AcTrView2d extends AcEdBaseView {
      * manager. Does not touch `COLORTHEME` / UI chrome.
      */
     private applyCanvasBackground;
+    /**
+     * Rebuilds byLayer materials on ACI-7 (foreground) layers after a canvas
+     * background change.
+     *
+     * The scene traversal above only reaches entity wrappers that still expose
+     * `refreshTextMaterials` — but `AcTrBatchedGroup.addEntity` flattens glyph
+     * entities into cloned drawable subtrees at add time, so for already-batched
+     * layouts it matches nothing and ACI-7 byLayer text kept its build-time
+     * colour (white text on a white canvas, #464). Entity-level ACI-7 materials
+     * are foreground-tracked and repainted by the style manager, but byLayer
+     * materials on an ACI-7 layer were created before the manager knew the
+     * layer colour and are not. Re-running the live layer sync — the same path
+     * a layer-table colour edit uses, which the #464 workaround exploited —
+     * rebuilds them against the background set just above, with foreground
+     * tracking attached for subsequent switches.
+     */
+    private resyncForegroundLayersForBackground;
     private isModelSpaceLayout;
     /**
      * Binds the active drawing database on the renderer draw context.
@@ -277,9 +294,12 @@ export declare class AcTrView2d extends AcEdBaseView {
      * `visible` property, and tear it down by removing `internalObject` from
      * `cadScene.internalScene` and calling `clear()`.
      *
-     * Scope: draws top-level geometry, text, and hatch entities. Block (INSERT)
-     * expansion, viewports, and dimensions are not supported for overlays yet
-     * and are skipped.
+     * Scope: draws top-level geometry, text, hatch, and block-reference
+     * (INSERT) entities, including entities that expand to multi-layer groups
+     * (dimensions, tables). A multi-layer group stays bucketed under its
+     * INSERT's layer — overlay layers are display-only, so per-fragment layer
+     * re-parenting (see `handleGroup`) is intentionally not replicated here.
+     * Viewports are not supported for overlays and are skipped.
      *
      * @param overlayDb - Input a database parsed independently of the active
      * document (e.g. via `new AcDbDatabase().read(...)`).

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

@@ -681,9 +681,48 @@ var AcTrView2d = /** @class */ (function (_super) {
         // Updates style-manager background, repaints ACI-7 / bg-follow materials.
         this._renderer.currentBackgroundColor = value;
         this._layerAppearance.refreshTextMaterialsInObjectTree(this._scene.internalScene);
+        this.resyncForegroundLayersForBackground();
         this.editor.syncCursorBackground(value);
         this._isDirty = true;
     };
+    /**
+     * Rebuilds byLayer materials on ACI-7 (foreground) layers after a canvas
+     * background change.
+     *
+     * The scene traversal above only reaches entity wrappers that still expose
+     * `refreshTextMaterials` — but `AcTrBatchedGroup.addEntity` flattens glyph
+     * entities into cloned drawable subtrees at add time, so for already-batched
+     * layouts it matches nothing and ACI-7 byLayer text kept its build-time
+     * colour (white text on a white canvas, #464). Entity-level ACI-7 materials
+     * are foreground-tracked and repainted by the style manager, but byLayer
+     * materials on an ACI-7 layer were created before the manager knew the
+     * layer colour and are not. Re-running the live layer sync — the same path
+     * a layer-table colour edit uses, which the #464 workaround exploited —
+     * rebuilds them against the background set just above, with foreground
+     * tracking attached for subsequent switches.
+     */
+    AcTrView2d.prototype.resyncForegroundLayersForBackground = function () {
+        var e_1, _a;
+        var _b;
+        var database = this._renderer.context.database;
+        if (!database)
+            return;
+        try {
+            for (var _c = __values(database.tables.layerTable.newIterator()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var layer = _d.value;
+                if ((_b = layer.color) === null || _b === void 0 ? void 0 : _b.isForeground) {
+                    this._layerAppearance.syncFromLiveRecord(layer);
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    };
     AcTrView2d.prototype.isModelSpaceLayout = function (database) {
         if (!database) {
             return this.activeLayoutBtrId === this.modelSpaceBtrId;
@@ -719,9 +758,12 @@ var AcTrView2d = /** @class */ (function (_super) {
      * `visible` property, and tear it down by removing `internalObject` from
      * `cadScene.internalScene` and calling `clear()`.
      *
-     * Scope: draws top-level geometry, text, and hatch entities. Block (INSERT)
-     * expansion, viewports, and dimensions are not supported for overlays yet
-     * and are skipped.
+     * Scope: draws top-level geometry, text, hatch, and block-reference
+     * (INSERT) entities, including entities that expand to multi-layer groups
+     * (dimensions, tables). A multi-layer group stays bucketed under its
+     * INSERT's layer — overlay layers are display-only, so per-fragment layer
+     * re-parenting (see `handleGroup`) is intentionally not replicated here.
+     * Viewports are not supported for overlays and are skipped.
      *
      * @param overlayDb - Input a database parsed independently of the active
      * document (e.g. via `new AcDbDatabase().read(...)`).
@@ -729,8 +771,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.addOverlayEntities = function (overlayDb) {
         return __awaiter(this, void 0, void 0, function () {
-            var layout, _a, _b, layer, previousDatabase, modelSpace, _c, _d, entity, threeEntity, e_1_1;
-            var e_2, _e, e_1, _f;
+            var layout, _a, _b, layer, previousDatabase, modelSpace, _c, _d, entity, threeEntity, error_1, e_2_1;
+            var e_3, _e, e_2, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -749,61 +791,75 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_2) throw e_2.error; }
+                            finally { if (e_3) throw e_3.error; }
                         }
                         previousDatabase = this._renderer.context.database;
                         this._renderer.context.database = overlayDb;
                         _g.label = 1;
                     case 1:
-                        _g.trys.push([1, , 10, 11]);
+                        _g.trys.push([1, , 12, 13]);
                         modelSpace = overlayDb.tables.blockTable.modelSpace;
                         _g.label = 2;
                     case 2:
-                        _g.trys.push([2, 7, 8, 9]);
+                        _g.trys.push([2, 9, 10, 11]);
                         _c = __values(modelSpace.newIterator()), _d = _c.next();
                         _g.label = 3;
                     case 3:
-                        if (!!_d.done) return [3 /*break*/, 6];
+                        if (!!_d.done) return [3 /*break*/, 8];
                         entity = _d.value;
                         if (entity instanceof AcDbViewport)
-                            return [3 /*break*/, 5];
+                            return [3 /*break*/, 7];
+                        _g.label = 4;
+                    case 4:
+                        _g.trys.push([4, 6, , 7]);
                         threeEntity = this.drawEntity(entity, false);
-                        if (!threeEntity || threeEntity instanceof AcTrGroup)
-                            return [3 /*break*/, 5];
+                        if (!threeEntity)
+                            return [3 /*break*/, 7];
                         threeEntity.objectId = entity.objectId;
                         threeEntity.ownerId = entity.ownerId;
                         threeEntity.layerName = entity.layer;
                         threeEntity.visible = entity.visibility !== false;
+                        if (threeEntity instanceof AcTrGroup &&
+                            threeEntity.isOnTheSameLayer) {
+                            // Children authored on layer "0" inherit the INSERT layer for
+                            // ByLayer traits (color, etc.), same as the primary-document path.
+                            this._inheritedLayerMaterialMapper.remap(threeEntity.children, '0', threeEntity.layerName);
+                        }
                         return [4 /*yield*/, this.finishEntityGeometry(threeEntity, false)];
-                    case 4:
+                    case 5:
                         _g.sent();
                         layout.addEntity(threeEntity);
                         threeEntity.dispose();
-                        _g.label = 5;
-                    case 5:
+                        return [3 /*break*/, 7];
+                    case 6:
+                        error_1 = _g.sent();
+                        // One unconvertible entity must not abort the whole overlay.
+                        log.error("[AcTrView2d] Failed to convert overlay entity ".concat(entity.objectId, " (").concat(entity.type, "):"), error_1);
+                        return [3 /*break*/, 7];
+                    case 7:
                         _d = _c.next();
                         return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_1_1 = _g.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
+                    case 8: return [3 /*break*/, 11];
+                    case 9:
+                        e_2_1 = _g.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 11];
+                    case 10:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_1) throw e_1.error; }
+                        finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 9: return [3 /*break*/, 11];
-                    case 10:
+                    case 11: return [3 /*break*/, 13];
+                    case 12:
                         this._renderer.context.database = previousDatabase;
                         return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/, layout];
+                    case 13: return [2 /*return*/, layout];
                 }
             });
         });
@@ -891,7 +947,7 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.ensureEntitiesConvertedForExport = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var includeInvisibleLayers, db, pending, _a, _b, _c, layoutBtrId, blockTableRecord;
-            var e_3, _d;
+            var e_4, _d;
             var _this = this;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -909,12 +965,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 pending.push.apply(pending, __spreadArray([], __read(this._entityDisplay.collectMissingEntitiesForExport(blockTableRecord, function (objectId) { return _this.hasEntity(objectId); }, includeInvisibleLayers)), false));
                             }
                         }
-                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                             }
-                            finally { if (e_3) throw e_3.error; }
+                            finally { if (e_4) throw e_4.error; }
                         }
                         if (pending.length === 0) {
                             return [2 /*return*/];
@@ -1218,7 +1274,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * don't have to land pixel-perfect on the viewport line to grab it.
      */
     AcTrView2d.prototype.pick = function (point, hitRadius, pickOneOnly) {
-        var e_4, _a;
+        var e_5, _a;
         if (point == null)
             point = this.curPos;
         var results = [];
@@ -1249,12 +1305,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_5) throw e_5.error; }
             }
         }
         // 1) Resolve hits in the active layout. Skip the `AcDbViewport`
@@ -1297,7 +1353,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper-space pick.
      */
     AcTrView2d.prototype.pickThroughViewports = function (paperPoint, paperBox, viewports, results) {
-        var e_5, _a;
+        var e_6, _a;
         var modelLayout = this._scene.modelSpaceLayout;
         if (!modelLayout)
             return;
@@ -1332,12 +1388,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 _loop_1(vpView);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (viewports_1_1 && !viewports_1_1.done && (_a = viewports_1.return)) _a.call(viewports_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
     };
     /**
@@ -1374,13 +1430,34 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.updateLayer = function (layer, changes) {
-        this._scene.updateLayer(this.toLayerInfo(layer));
+        var e_7, _a;
+        var touchedObjectIds = this._scene.updateLayer(this.toLayerInfo(layer)).touchedObjectIds;
         if (this._layerAppearance.layerStyleMayHaveChanged(changes)) {
             this._layerAppearance.syncFromLiveRecord(layer);
         }
-        if (this._entityDisplay.layerVisibilityMayHaveChanged(changes) &&
-            AcTrLayer.isLayerVisible(this.toLayerInfo(layer))) {
-            void this.convertMissingEntitiesOnLayer(layer.name);
+        if (this._entityDisplay.layerVisibilityMayHaveChanged(changes)) {
+            var layerInfo = this.toLayerInfo(layer);
+            // Normal entities convert when the layer is on and thawed. INSERTs also
+            // convert when thawed while still off (Off must not skip multi-layer
+            // block contents).
+            if (AcTrLayer.isLayerVisible(layerInfo) || !layerInfo.isFrozen) {
+                void this.convertMissingEntitiesOnLayer(layer.name);
+            }
+        }
+        try {
+            // Thawing an INSERT layer may restore cross-layer fragments that were
+            // session-hidden; reapply that state.
+            for (var touchedObjectIds_1 = __values(touchedObjectIds), touchedObjectIds_1_1 = touchedObjectIds_1.next(); !touchedObjectIds_1_1.done; touchedObjectIds_1_1 = touchedObjectIds_1.next()) {
+                var objectId = touchedObjectIds_1_1.value;
+                this.applySessionHiddenObjectState(objectId);
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (touchedObjectIds_1_1 && !touchedObjectIds_1_1.done && (_a = touchedObjectIds_1.return)) _a.call(touchedObjectIds_1);
+            }
+            finally { if (e_7) throw e_7.error; }
         }
         this._isDirty = true;
     };
@@ -1570,7 +1647,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * drawable entity that must be rebuilt (for example ATTRIB → INSERT).
      */
     AcTrView2d.prototype.resolveSceneUpdateEntities = function (entities) {
-        var e_6, _a;
+        var e_8, _a;
         var _b;
         var db = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         var resolved = [];
@@ -1592,12 +1669,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 resolved.push(target);
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         return resolved;
     };
@@ -1819,7 +1896,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param layoutBtrId Input the block table record id of the layout
      */
     AcTrView2d.prototype.loadLayoutEntitiesIfNeeded = function (layoutBtrId) {
-        var e_7, _a;
+        var e_9, _a;
         var _this = this;
         try {
             var db = AcApDocManager.instance.curDocument.database;
@@ -1890,12 +1967,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                     entities_2.push(entity);
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
             finally {
                 try {
                     if (iterator_1_1 && !iterator_1_1.done && (_a = iterator_1.return)) _a.call(iterator_1);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_9) throw e_9.error; }
             }
             if (entities_2.length === 0) {
                 // Empty layout (e.g. a freshly-created paper space tab). Mark as
@@ -2058,7 +2135,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper layouts.
      */
     AcTrView2d.prototype.ensureViewportViews = function (blockTableRecord, layoutView) {
-        var e_8, _a;
+        var e_10, _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()) {
@@ -2071,12 +2148,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 layoutView.addViewport(viewportView);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (iterator_2_1 && !iterator_2_1.done && (_a = iterator_2.return)) _a.call(iterator_2);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_10) throw e_10.error; }
         }
     };
     /**
@@ -2086,7 +2163,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.batchConvert = function (entities_3) {
         return __awaiter(this, arguments, void 0, function (entities, options) {
-            var progressive, i, entity, shouldConvert, threeEntity, isExtendBbox, layoutView, viewportView, fileName, error_1;
+            var progressive, i, entity, shouldConvert, threeEntity, isExtendBbox, layoutView, viewportView, fileName, error_2;
             var _this = this;
             if (options === void 0) { options = {}; }
             return __generator(this, function (_a) {
@@ -2137,6 +2214,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                             // 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._inheritedLayerMaterialMapper.remap(threeEntity.children, '0', threeEntity.layerName);
+                            threeEntity.userData.insertLayerName = threeEntity.layerName;
                         }
                         if (!(threeEntity instanceof AcTrGroup &&
                             !threeEntity.isOnTheSameLayer)) return [3 /*break*/, 4];
@@ -2185,8 +2263,8 @@ var AcTrView2d = /** @class */ (function (_super) {
                         }
                         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);
+                        error_2 = _a.sent();
+                        log.error("[AcTrView2d] Failed to convert entity ".concat(entity.objectId, " (").concat(entity.type, "):"), error_2);
                         return [3 /*break*/, 10];
                     case 9:
                         this.decreaseNumOfEntitiesToProcess();
@@ -2222,7 +2300,7 @@ var AcTrView2d = /** @class */ (function (_super) {
     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, aggregateSpatialBbox;
-            var e_9, _a;
+            var e_11, _a;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -2259,12 +2337,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 child.parent = null;
                             }
                         }
-                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
                         finally {
                             try {
                                 if (children_1_1 && !children_1_1.done && (_a = children_1.return)) _a.call(children_1);
                             }
-                            finally { if (e_9) throw e_9.error; }
+                            finally { if (e_11) throw e_11.error; }
                         }
                         renderContext = group.renderContext;
                         groupObjectId = group.objectId;
@@ -2289,13 +2367,22 @@ var AcTrView2d = /** @class */ (function (_super) {
                             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.
+                            // Nested layer-0 may already be resolved to an inner INSERT layer during
+                            // flatten. Remaining "0" buckets inherit this (outermost) INSERT layer.
                             var effectiveLayerName = layerName === '0' ? groupLayerName : layerName;
+                            // Material remap must still treat authored layer-0 drawables as layer-0
+                            // ByLayer even when nest resolution already rewrote layerName.
+                            var sourceLayerForMaterials = objects.some(function (object) {
+                                var _a;
+                                var data = object.userData;
+                                return ((_a = data.authoredLayerName) !== null && _a !== void 0 ? _a : layerName) === '0';
+                            })
+                                ? '0'
+                                : 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._inheritedLayerMaterialMapper.remap(objects, layerName, effectiveLayerName);
+                            _this._inheritedLayerMaterialMapper.remap(objects, sourceLayerForMaterials, 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.
@@ -2307,6 +2394,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.userData.insertLayerName = groupLayerName;
                             entity.wcsBbox = aggregateSpatialBbox.clone();
                             var entityUserData = entity.userData;
                             entityUserData.spatialIndexChildBoxes = groupChildBoxes;