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

package/lib/editor/input/AcEdOsnapCenterMarks.js

@@ -84,13 +84,25 @@ function transformMark(mark, matrix) {
 }
 /**
  * Child spatial-index ids may get a `#n` suffix when the same object appears
- * more than once in a block. Strip that before matching database object ids.
+ * more than once in a block (see {@link uniquifySpatialItemIds}). Strip that
+ * before matching database object ids.
  */
 export function canonicalGsMark(id) {
     if (typeof id !== 'string')
         return id;
     return id.replace(/#\d+$/, '');
 }
+/**
+ * 0-based occurrence index encoded in a spatial-index child id (`id` → 0,
+ * `id#1` → 1, …). Matches depth-first leaf order used when flattening nested
+ * INSERT child boxes.
+ */
+export function gsMarkOccurrence(id) {
+    if (typeof id !== 'string')
+        return 0;
+    var match = /#(\d+)$/.exec(id);
+    return match ? Number(match[1]) : 0;
+}
 function polylineVertices(entity) {
     var _a;
     if (entity instanceof AcDb2dPolyline) {
@@ -165,25 +177,63 @@ function fullInsertionTransform(blockRef) {
  *
  * Returns the leaf entity and the cumulative transform that maps its local
  * geometry into the caller space (typically WCS).
+ *
+ * When `gsMark` carries a `#n` suffix, the n-th depth-first match of the
+ * canonical object id is returned so duplicate nested INSERT instances are
+ * disambiguated (#745). When no suffix is present and `hintPoint` is given,
+ * nested INSERTs whose extents do not contain the hint are skipped so the
+ * instance under the cursor is preferred over the first DFS match.
  */
-export function resolveBlockSubEntity(blockRef, gsMark, parentMat) {
-    var e_1, _a;
+export function resolveBlockSubEntity(blockRef, gsMark, parentMat, hintPoint) {
     if (parentMat === void 0) { parentMat = new AcGeMatrix3d(); }
+    var occurrence = gsMarkOccurrence(gsMark);
+    var result = resolveBlockSubEntityOccurrence(blockRef, canonicalGsMark(gsMark), occurrence, parentMat, hintPoint, 
+    /* allowHintPrune */ occurrence === 0 && hintPoint != null);
+    return result.found;
+}
+/** XY containment with padding — spatial child boxes have no Z (#745). */
+function extentsContainXY(extents, point, pad) {
+    if (pad === void 0) { pad = 1e-4; }
+    return (point.x >= extents.min.x - pad &&
+        point.x <= extents.max.x + pad &&
+        point.y >= extents.min.y - pad &&
+        point.y <= extents.max.y + pad);
+}
+function resolveBlockSubEntityOccurrence(blockRef, targetId, remaining, parentMat, hintPoint, allowHintPrune) {
+    var e_1, _a;
     var blockTableRecord = blockRef.blockTableRecord;
-    if (!blockTableRecord)
-        return undefined;
+    if (!blockTableRecord) {
+        return { found: undefined, remaining: remaining };
+    }
     var thisMat = new AcGeMatrix3d().multiplyMatrices(parentMat, fullInsertionTransform(blockRef));
-    var targetId = canonicalGsMark(gsMark);
+    var localHint;
+    if (allowHintPrune && hintPoint != null && remaining === 0) {
+        localHint = new AcGePoint3d(hintPoint).applyMatrix4(thisMat.clone().invert());
+    }
     try {
         for (var _b = __values(blockTableRecord.newIterator()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var entity = _c.value;
-            if (entity.objectId === gsMark || entity.objectId === targetId) {
-                return { entity: entity, transform: thisMat };
+            if (entity.objectId === targetId) {
+                if (remaining > 0) {
+                    remaining -= 1;
+                    continue;
+                }
+                return { found: { entity: entity, transform: thisMat }, remaining: 0 };
             }
             if (entity instanceof AcDbBlockReference) {
-                var nested = resolveBlockSubEntity(entity, gsMark, thisMat);
-                if (nested)
+                if (allowHintPrune && remaining === 0 && localHint) {
+                    var extents = entity.geometricExtents;
+                    // Spatial hints are XY-only (childBoxHint uses z: 0). A full 3D
+                    // containsPoint would drop elevated nested INSERTs whose Z range
+                    // does not include 0 after the parent invert.
+                    if (!extents.isEmpty() && !extentsContainXY(extents, localHint)) {
+                        continue;
+                    }
+                }
+                var nested = resolveBlockSubEntityOccurrence(entity, targetId, remaining, thisMat, hintPoint, allowHintPrune);
+                if (nested.found)
                     return nested;
+                remaining = nested.remaining;
             }
         }
     }
@@ -194,15 +244,15 @@ export function resolveBlockSubEntity(blockRef, gsMark, parentMat) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    return undefined;
+    return { found: undefined, remaining: remaining };
 }
 function collectBlockCenterMarks(blockRef, pickPoint, gsMark) {
     if (!gsMark) {
         return collectFromOsnapCenter(blockRef, pickPoint);
     }
-    var found = resolveBlockSubEntity(blockRef, gsMark);
+    var found = resolveBlockSubEntity(blockRef, gsMark, new AcGeMatrix3d(), pickPoint);
     if (!found) {
-        return collectFromOsnapCenter(blockRef, pickPoint, canonicalGsMark(gsMark));
+        return collectFromOsnapCenter(blockRef, pickPoint, gsMark);
     }
     var inverse = found.transform.clone().invert();
     var localPick = new AcGePoint3d(pickPoint).applyMatrix4(inverse);

package/lib/editor/input/AcEdOsnapCenterMarks.js.map

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

package/lib/editor/input/AcEdOsnapResolver.d.ts

@@ -45,7 +45,21 @@ export declare class AcEdOsnapResolver {
     private static osnapModePriority;
     private collectOsnapPointsByMode;
     private collectOsnapPointsInAvailableModes;
+    /**
+     * Collects enabled osnap modes from an already-resolved block sub-entity so
+     * each hit child is walked once instead of once per mode (#745).
+     */
+    private collectOsnapPointsFromResolvedSubEntity;
+    private static childBoxHint;
     private collectIntersectionOsnapPoints;
+    /**
+     * Looks an entity up by id with no block-table-record owner check, so a
+     * hit is resolved the same way whether it came from the active layout's
+     * own spatial index (paper space) or was drilled through a paper-space
+     * viewport into model space (#746) — a BTR-scoped `getIdAt` only resolves
+     * entities it owns and silently drops every other hit.
+     */
+    private static getEntityById;
     private collectOsnapPoints;
     private updateAcquiredCenters;
 }

package/lib/editor/input/AcEdOsnapResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcEdOsnapResolver.d.ts","sourceRoot":"","sources":["../../../src/editor/input/AcEdOsnapResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,aAAa,EAIb,eAAe,EAEf,eAAe,EAChB,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAKnD,OAAO,EACL,KAAK,mBAAmB,EAMzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,YAAY,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEjE,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG;IAC7C,IAAI,EAAE,aAAa,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,uBAAuB;IACtC,gEAAgE;IAChE,SAAS,EAAE,eAAe,CAAA;IAC1B,qDAAqD;IACrD,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,mDAAmD;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAwJD;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,gBAAgB,CAA4B;gBAExC,IAAI,EAAE,YAAY;IAI9B;;;;OAIG;IACH,IAAI,mBAAmB,IAAI,SAAS,mBAAmB,EAAE,CAExD;IAED,qEAAqE;IACrE,oBAAoB;IAIpB;;;OAGG;IACH,MAAM,CAAC,kBAAkB,CACvB,KAAK,EAAE,SAAS,mBAAmB,EAAE,EACrC,IAAI,CAAC,EAAE,cAAc,GACpB,mBAAmB,EAAE;IAOxB;;OAEG;IACH,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,cAAc,GAAG,SAAS;IAiDrE;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,aAAa,GAAG,cAAc;IAmBtE,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAgBhC,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,kCAAkC;IAsB1C,OAAO,CAAC,8BAA8B;IAgGtC,OAAO,CAAC,kBAAkB;IAyD1B,OAAO,CAAC,qBAAqB;CA0C9B"}
+{"version":3,"file":"AcEdOsnapResolver.d.ts","sourceRoot":"","sources":["../../../src/editor/input/AcEdOsnapResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,aAAa,EAIb,eAAe,EAEf,eAAe,EAChB,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAKnD,OAAO,EACL,KAAK,mBAAmB,EAKzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,YAAY,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEjE,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG;IAC7C,IAAI,EAAE,aAAa,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,uBAAuB;IACtC,gEAAgE;IAChE,SAAS,EAAE,eAAe,CAAA;IAC1B,qDAAqD;IACrD,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,mDAAmD;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAiKD;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,gBAAgB,CAA4B;gBAExC,IAAI,EAAE,YAAY;IAI9B;;;;OAIG;IACH,IAAI,mBAAmB,IAAI,SAAS,mBAAmB,EAAE,CAExD;IAED,qEAAqE;IACrE,oBAAoB;IAIpB;;;OAGG;IACH,MAAM,CAAC,kBAAkB,CACvB,KAAK,EAAE,SAAS,mBAAmB,EAAE,EACrC,IAAI,CAAC,EAAE,cAAc,GACpB,mBAAmB,EAAE;IAOxB;;OAEG;IACH,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,cAAc,GAAG,SAAS;IAiDrE;;OAEG;IACH,MAAM,CAAC,qBAAqB,CAAC,SAAS,EAAE,aAAa,GAAG,cAAc;IAmBtE,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAgBhC,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,kCAAkC;IAsB1C;;;OAGG;IACH,OAAO,CAAC,uCAAuC;IAqD/C,OAAO,CAAC,MAAM,CAAC,YAAY;IAqB3B,OAAO,CAAC,8BAA8B;IA6HtC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAQ5B,OAAO,CAAC,kBAAkB;IA8G1B,OAAO,CAAC,qBAAqB;CAyD9B"}

package/lib/editor/input/AcEdOsnapResolver.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -34,10 +45,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { AcDbArc, AcDbBlockReference, AcDbCircle, acdbHasOsnapMode, acdbHostApplicationServices, AcDbLine, acdbMaskToOsnapModes, AcDbOsnapMode, AcGeBox3d, AcGeGeometryUtil, AcGeMatrix3d, AcGePoint3d } from '@mlightcad/data-model';
+import { AcDbArc, AcDbBlockReference, AcDbCircle, AcDbEntity, acdbHasOsnapMode, acdbHostApplicationServices, AcDbLine, acdbMaskToOsnapModes, AcDbOsnapMode, AcGeBox3d, AcGeGeometryUtil, AcGeMatrix3d, AcGePoint3d } from '@mlightcad/data-model';
 import { AcApSettingManager } from '../../app/AcApSettingManager';
 import { isEffectiveSpatialQueryHit } from '../view/AcEdSpatialQueryResult';
-import { canonicalGsMark, centerMarksCoincide, collectCenterMarksFromEntity, mergeAcquiredCenterMarks, resolveBlockSubEntity } from './AcEdOsnapCenterMarks';
+import { centerMarksCoincide, collectCenterMarksFromEntity, mergeAcquiredCenterMarks, resolveBlockSubEntity } from './AcEdOsnapCenterMarks';
 var DEFAULT_HIT_RADIUS_PX = 20;
 /**
  * Max nearby geometry sources considered per intersection query.
@@ -267,8 +278,93 @@ var AcEdOsnapResolver = /** @class */ (function () {
             _this.collectOsnapPointsByMode(entity, mode, osnapPoints, pickPoint, lastPoint, gsMark);
         });
     };
-    AcEdOsnapResolver.prototype.collectIntersectionOsnapPoints = function (pickResults, modelSpace, osnapPoints, cursorWcs, threshold) {
+    /**
+     * Collects enabled osnap modes from an already-resolved block sub-entity so
+     * each hit child is walked once instead of once per mode (#745).
+     */
+    AcEdOsnapResolver.prototype.collectOsnapPointsFromResolvedSubEntity = function (found, osnapPoints, pickPoint, lastPoint) {
         var e_2, _a, e_3, _b, e_4, _c;
+        var _d;
+        var inverse = found.transform.clone().invert();
+        var localPick = new AcGePoint3d(pickPoint).applyMatrix4(inverse);
+        var localLast = new AcGePoint3d(lastPoint).applyMatrix4(inverse);
+        var modes = acdbMaskToOsnapModes(AcApSettingManager.instance.osnapModes);
+        var isNestedInsert = found.entity instanceof AcDbBlockReference;
+        try {
+            for (var modes_1 = __values(modes), modes_1_1 = modes_1.next(); !modes_1_1.done; modes_1_1 = modes_1.next()) {
+                var mode = modes_1_1.value;
+                if (mode === AcDbOsnapMode.Intersection)
+                    continue;
+                var localSnapPoints = [];
+                if (isNestedInsert) {
+                    // Preserve INSERT self-marker semantics used by subEntityGetOsnapPoints.
+                    found.entity.subGetOsnapPoints(mode, localPick, localLast, localSnapPoints, found.entity.objectId, found.transform);
+                    try {
+                        for (var localSnapPoints_1 = (e_3 = void 0, __values(localSnapPoints)), localSnapPoints_1_1 = localSnapPoints_1.next(); !localSnapPoints_1_1.done; localSnapPoints_1_1 = localSnapPoints_1.next()) {
+                            var point = localSnapPoints_1_1.value;
+                            osnapPoints.push({
+                                x: point.x,
+                                y: point.y,
+                                z: (_d = point.z) !== null && _d !== void 0 ? _d : 0,
+                                type: mode
+                            });
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (localSnapPoints_1_1 && !localSnapPoints_1_1.done && (_b = localSnapPoints_1.return)) _b.call(localSnapPoints_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                }
+                else {
+                    found.entity.subGetOsnapPoints(mode, localPick, localLast, localSnapPoints);
+                    try {
+                        for (var localSnapPoints_2 = (e_4 = void 0, __values(localSnapPoints)), localSnapPoints_2_1 = localSnapPoints_2.next(); !localSnapPoints_2_1.done; localSnapPoints_2_1 = localSnapPoints_2.next()) {
+                            var point = localSnapPoints_2_1.value;
+                            var world = new AcGePoint3d(point).applyMatrix4(found.transform);
+                            osnapPoints.push({
+                                x: world.x,
+                                y: world.y,
+                                z: world.z,
+                                type: mode
+                            });
+                        }
+                    }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (localSnapPoints_2_1 && !localSnapPoints_2_1.done && (_c = localSnapPoints_2.return)) _c.call(localSnapPoints_2);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
+                }
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (modes_1_1 && !modes_1_1.done && (_a = modes_1.return)) _a.call(modes_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+    };
+    AcEdOsnapResolver.childBoxHint = function (child) {
+        if (child.minX == null ||
+            child.minY == null ||
+            child.maxX == null ||
+            child.maxY == null) {
+            return undefined;
+        }
+        return {
+            x: (child.minX + child.maxX) / 2,
+            y: (child.minY + child.maxY) / 2,
+            z: 0
+        };
+    };
+    AcEdOsnapResolver.prototype.collectIntersectionOsnapPoints = function (pickResults, db, osnapPoints, cursorWcs, threshold) {
+        var e_5, _a, e_6, _b, e_7, _c;
         var sources = [];
         var seenKeys = new Set();
         var tryAdd = function (source) {
@@ -290,28 +386,37 @@ var AcEdOsnapResolver = /** @class */ (function () {
                     break;
                 if (!isEffectiveSpatialQueryHit(item))
                     continue;
-                var entity = modelSpace.getIdAt(item.id);
+                var entity = AcEdOsnapResolver.getEntityById(db, item.id);
                 if (!entity)
                     continue;
+                var viewportId = item.viewportId;
+                // Drill-through hits without a live mapper must not be treated as
+                // paper-space geometry — their boxes are still in model WCS.
+                if (viewportId != null &&
+                    !this._view.getViewportCoordinateMapper(viewportId)) {
+                    continue;
+                }
                 if (item.children && item.children.length > 0) {
                     try {
                         // INSERT (and other hierarchical hits): only the aperture-hit children.
                         // Never expand the whole block definition into INT snap.
-                        for (var _d = (e_3 = void 0, __values(item.children)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                        for (var _d = (e_6 = void 0, __values(item.children)), _e = _d.next(); !_e.done; _e = _d.next()) {
                             var child = _e.value;
                             if (sources.length >= MAX_INTERSECTION_SOURCES)
                                 break;
-                            var gsMark = canonicalGsMark(child.id);
-                            var key = "".concat(item.id, ":").concat(gsMark);
+                            // Keep the `#n` occurrence suffix so two instances of the same part
+                            // do not collapse to one INT source (#745).
+                            var key = "".concat(item.id, ":").concat(child.id);
                             if (entity instanceof AcDbBlockReference) {
-                                var found = resolveBlockSubEntity(entity, gsMark);
+                                var found = resolveBlockSubEntity(entity, child.id, new AcGeMatrix3d(), AcEdOsnapResolver.childBoxHint(child));
                                 if (!found)
                                     continue;
                                 tryAdd({
                                     key: key,
                                     box: boxFromSpatialItem(child),
                                     entity: found.entity,
-                                    transform: found.transform
+                                    transform: found.transform,
+                                    viewportId: viewportId
                                 });
                             }
                             else {
@@ -319,17 +424,18 @@ var AcEdOsnapResolver = /** @class */ (function () {
                                     key: key,
                                     box: boxFromSpatialItem(child),
                                     entity: entity,
-                                    transform: new AcGeMatrix3d()
+                                    transform: new AcGeMatrix3d(),
+                                    viewportId: viewportId
                                 });
                             }
                         }
                     }
-                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
                     finally {
                         try {
                             if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
                         }
-                        finally { if (e_3) throw e_3.error; }
+                        finally { if (e_6) throw e_6.error; }
                     }
                     continue;
                 }
@@ -342,16 +448,17 @@ var AcEdOsnapResolver = /** @class */ (function () {
                     key: item.id,
                     box: entity.geometricExtents,
                     entity: entity,
-                    transform: new AcGeMatrix3d()
+                    transform: new AcGeMatrix3d(),
+                    viewportId: viewportId
                 });
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (pickResults_1_1 && !pickResults_1_1.done && (_a = pickResults_1.return)) _a.call(pickResults_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         if (sources.length < 2)
             return;
@@ -364,79 +471,186 @@ var AcEdOsnapResolver = /** @class */ (function () {
                     return;
                 if (performance.now() - started > INTERSECTION_TIME_BUDGET_MS)
                     return;
+                if (sources[i].viewportId !== sources[j].viewportId)
+                    continue;
                 if (!boxesOverlapXY(sources[i].box, sources[j].box))
                     continue;
                 pairTests++;
+                var viewportId = sources[i].viewportId;
+                var mapper = viewportId != null
+                    ? this._view.getViewportCoordinateMapper(viewportId)
+                    : undefined;
+                // Sources with a viewportId were only added when a mapper existed;
+                // if it disappeared mid-resolve, skip rather than emit model WCS.
+                if (viewportId != null && !mapper)
+                    continue;
                 var points = intersectSources(sources[i], sources[j]);
                 try {
-                    for (var points_1 = (e_4 = void 0, __values(points)), points_1_1 = points_1.next(); !points_1_1.done; points_1_1 = points_1.next()) {
+                    for (var points_1 = (e_7 = void 0, __values(points)), points_1_1 = points_1.next(); !points_1_1.done; points_1_1 = points_1.next()) {
                         var point = points_1_1.value;
-                        var dx = point.x - cursorWcs.x;
-                        var dy = point.y - cursorWcs.y;
+                        var paperPoint = mapper ? mapper.modelToPaper(point) : point;
+                        if (mapper && !mapper.containsPaperPoint(paperPoint))
+                            continue;
+                        var dx = paperPoint.x - cursorWcs.x;
+                        var dy = paperPoint.y - cursorWcs.y;
                         if (dx * dx + dy * dy > threshSq)
                             continue;
                         osnapPoints.push({
-                            x: point.x,
-                            y: point.y,
+                            x: paperPoint.x,
+                            y: paperPoint.y,
                             z: point.z,
                             type: AcDbOsnapMode.Intersection
                         });
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
                 finally {
                     try {
                         if (points_1_1 && !points_1_1.done && (_c = points_1.return)) _c.call(points_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_7) throw e_7.error; }
                 }
             }
         }
     };
+    /**
+     * Looks an entity up by id with no block-table-record owner check, so a
+     * hit is resolved the same way whether it came from the active layout's
+     * own spatial index (paper space) or was drilled through a paper-space
+     * viewport into model space (#746) — a BTR-scoped `getIdAt` only resolves
+     * entities it owns and silently drops every other hit.
+     */
+    AcEdOsnapResolver.getEntityById = function (db, id) {
+        var object = db.getObjectById(id);
+        return object instanceof AcDbEntity ? object : undefined;
+    };
     AcEdOsnapResolver.prototype.collectOsnapPoints = function (cursorWcs, lastPoint, hitRadiusPx, threshold) {
         var _this = this;
         var results = this._view.pick(cursorWcs, hitRadiusPx);
         var db = acdbHostApplicationServices().workingDatabase;
-        var modelSpace = db.tables.blockTable.modelSpace;
         var osnapPoints = [];
         var pickPoint = AcGeGeometryUtil.point2dToPoint3d(cursorWcs);
         var last = AcGeGeometryUtil.point2dToPoint3d(lastPoint);
         results.forEach(function (item) {
-            var entity = modelSpace.getIdAt(item.id);
+            var e_8, _a;
+            var entity = AcEdOsnapResolver.getEntityById(db, item.id);
             if (!entity)
                 return;
+            // A viewport drill-through hit's geometry is in model-space WCS: the
+            // pick/last points must be converted into that space before the
+            // query, and whatever comes back converted to paper space before it
+            // can be compared with the paper-space cursor (#746).
+            var mapper = item.viewportId != null
+                ? _this._view.getViewportCoordinateMapper(item.viewportId)
+                : undefined;
+            // Never fall back to treating a tagged drill-through hit as paper
+            // space — that reintroduces the wrong-space snap from #746.
+            if (item.viewportId != null && !mapper)
+                return;
+            var queryPickPoint = mapper
+                ? AcGeGeometryUtil.point2dToPoint3d(mapper.paperToModel(cursorWcs))
+                : pickPoint;
+            var queryLastPoint = mapper
+                ? AcGeGeometryUtil.point2dToPoint3d(mapper.paperToModel(lastPoint))
+                : last;
+            var localPoints = [];
             if (item.children && item.children.length > 0) {
                 item.children.forEach(function (child) {
-                    return _this.collectOsnapPointsInAvailableModes(entity, osnapPoints, pickPoint, last, canonicalGsMark(child.id));
+                    if (entity instanceof AcDbBlockReference) {
+                        var found = resolveBlockSubEntity(entity, child.id, new AcGeMatrix3d(), AcEdOsnapResolver.childBoxHint(child));
+                        if (found) {
+                            _this.collectOsnapPointsFromResolvedSubEntity(found, localPoints, queryPickPoint, queryLastPoint);
+                            return;
+                        }
+                    }
+                    // Keep `#n` so data-model occurrence resolution can disambiguate
+                    // duplicate nested INSERT parts when resolveBlockSubEntity misses.
+                    _this.collectOsnapPointsInAvailableModes(entity, localPoints, queryPickPoint, queryLastPoint, child.id);
                 });
             }
             else {
-                _this.collectOsnapPointsInAvailableModes(entity, osnapPoints, pickPoint, last);
+                _this.collectOsnapPointsInAvailableModes(entity, localPoints, queryPickPoint, queryLastPoint);
+            }
+            if (!mapper) {
+                osnapPoints.push.apply(osnapPoints, __spreadArray([], __read(localPoints), false));
+                return;
+            }
+            try {
+                for (var localPoints_1 = __values(localPoints), localPoints_1_1 = localPoints_1.next(); !localPoints_1_1.done; localPoints_1_1 = localPoints_1.next()) {
+                    var point = localPoints_1_1.value;
+                    var paperPoint = mapper.modelToPaper(point);
+                    if (!mapper.containsPaperPoint(paperPoint))
+                        continue;
+                    osnapPoints.push({
+                        x: paperPoint.x,
+                        y: paperPoint.y,
+                        z: point.z,
+                        type: point.type
+                    });
+                }
+            }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+            finally {
+                try {
+                    if (localPoints_1_1 && !localPoints_1_1.done && (_a = localPoints_1.return)) _a.call(localPoints_1);
+                }
+                finally { if (e_8) throw e_8.error; }
             }
         });
         if (acdbHasOsnapMode(AcApSettingManager.instance.osnapModes, AcDbOsnapMode.Intersection)) {
-            this.collectIntersectionOsnapPoints(results, modelSpace, osnapPoints, cursorWcs, threshold);
+            this.collectIntersectionOsnapPoints(results, db, osnapPoints, cursorWcs, threshold);
         }
-        this.updateAcquiredCenters(results, modelSpace, pickPoint);
+        this.updateAcquiredCenters(results, db, pickPoint);
         return osnapPoints;
     };
-    AcEdOsnapResolver.prototype.updateAcquiredCenters = function (results, modelSpace, pickPoint) {
+    AcEdOsnapResolver.prototype.updateAcquiredCenters = function (results, db, pickPoint) {
+        var _this = this;
         if (!acdbHasOsnapMode(AcApSettingManager.instance.osnapModes, AcDbOsnapMode.Center)) {
             this._acquiredCenters = [];
             return;
         }
         var hovered = [];
         results.forEach(function (item) {
-            var entity = modelSpace.getIdAt(item.id);
+            var e_9, _a;
+            var entity = AcEdOsnapResolver.getEntityById(db, item.id);
             if (!entity)
                 return;
+            var mapper = item.viewportId != null
+                ? _this._view.getViewportCoordinateMapper(item.viewportId)
+                : undefined;
+            if (item.viewportId != null && !mapper)
+                return;
+            var queryPickPoint = mapper
+                ? AcGeGeometryUtil.point2dToPoint3d(mapper.paperToModel(pickPoint))
+                : pickPoint;
+            var localMarks = [];
             if (item.children && item.children.length > 0) {
                 item.children.forEach(function (child) {
-                    hovered.push.apply(hovered, __spreadArray([], __read(collectCenterMarksFromEntity(entity, pickPoint, canonicalGsMark(child.id))), false));
+                    localMarks.push.apply(localMarks, __spreadArray([], __read(collectCenterMarksFromEntity(entity, queryPickPoint, child.id)), false));
                 });
             }
             else {
-                hovered.push.apply(hovered, __spreadArray([], __read(collectCenterMarksFromEntity(entity, pickPoint)), false));
+                localMarks.push.apply(localMarks, __spreadArray([], __read(collectCenterMarksFromEntity(entity, queryPickPoint)), false));
+            }
+            if (!mapper) {
+                hovered.push.apply(hovered, __spreadArray([], __read(localMarks), false));
+                return;
+            }
+            try {
+                for (var localMarks_1 = __values(localMarks), localMarks_1_1 = localMarks_1.next(); !localMarks_1_1.done; localMarks_1_1 = localMarks_1.next()) {
+                    var mark = localMarks_1_1.value;
+                    var paperPoint = mapper.modelToPaper(mark);
+                    if (!mapper.containsPaperPoint(paperPoint))
+                        continue;
+                    hovered.push(__assign(__assign({}, mark), { x: paperPoint.x, y: paperPoint.y }));
+                }
+            }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            finally {
+                try {
+                    if (localMarks_1_1 && !localMarks_1_1.done && (_a = localMarks_1.return)) _a.call(localMarks_1);
+                }
+                finally { if (e_9) throw e_9.error; }
             }
         });
         this._acquiredCenters = mergeAcquiredCenterMarks(this._acquiredCenters, hovered);