@mlightcad/cad-simple-viewer 1.5.10 → 1.6.0

package/lib/command/measure/AcApMeasureDistanceCmd.js

@@ -49,67 +49,88 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { AcDbLine, AcGiLineWeight } from '@mlightcad/data-model';
+import { AcTrHtmlBadge } from '@mlightcad/three-renderer';
 import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
 import { AcApI18n } from '../../i18n';
-import { makeBadge, makeDot, makeLiveBadge, measurementColor } from '../../util';
-import { registerMeasurementCleanup } from './AcApClearMeasurementsCmd';
+import { acapGetCurrentMeasurementStyle, acapGetMeasurementColor, acapGetMeasurementFontSize, acapGetMeasurementLineWeight, acapMeasurementCanvasLineWidth, formatMeasurementLength } from '../../util';
+import { AcApHtmlLivePreview, acapStrokeLiveSegment } from '../overlay/AcApHtmlLivePreview';
+import { MEASUREMENT_LIVE_LAYER } from './AcApMeasurementStore';
+import { AcApMeasureDistanceEntity } from './entity';
 /** Returns the 2D Euclidean distance between two world points. */
 function calcDist(p1, p2) {
     var dx = p2.x - p1.x;
     var dy = p2.y - p1.y;
     return Math.sqrt(dx * dx + dy * dy);
 }
+/**
+ * Commit a distance measurement overlay (also used when importing a sidecar).
+ */
+export function placeDistanceMeasurement(view, db, p1, p2, style, options) {
+    AcApMeasureDistanceEntity.create(p1, p2, style, options).commit(view, db);
+}
 /**
  * Preview jig for the distance measurement command.
  *
- * Renders a live rubber-band line from the fixed first point to the current
- * cursor position. The badge showing the live distance is rendered by the
- * jig itself and is removed when the jig ends — it is intentionally short-lived
- * and intrinsic to the interactive input UX.
+ * Renders a live HTML rubber-band segment and length badge (no AcDb preview).
  */
 var AcApMeasureDistanceJig = /** @class */ (function (_super) {
     __extends(AcApMeasureDistanceJig, _super);
     function AcApMeasureDistanceJig(view, db, p1, color) {
         var _this = _super.call(this, view) || this;
-        _this._p1 = p1;
         _this._view = view;
+        _this._p1 = p1;
+        _this._p2 = p1;
         _this._db = db;
-        _this._line = new AcDbLine(p1, p1);
-        _this._line.color = color;
-        _this._line.lineWeight = AcGiLineWeight.LineWeight070;
-        // Live badge — short-lived, cleaned up in end()
-        _this._badge = makeLiveBadge(color);
+        _this._color = color;
+        _this._badgeId = "live-dist-badge-".concat(Date.now());
+        _this._htManager = _this._view.htmlTransientManager;
+        _this._badge = new AcTrHtmlBadge({
+            id: _this._badgeId,
+            color: color,
+            worldPosition: p1,
+            layer: MEASUREMENT_LIVE_LAYER,
+            layoutId: _this._view.activeLayoutBtrId,
+            fontSize: acapGetMeasurementFontSize()
+        });
+        _this._badge.object.visible = false;
+        _this._htManager.add(_this._badge);
+        _this._preview = new AcApHtmlLivePreview(_this._view, "live-dist-stroke-".concat(Date.now()), MEASUREMENT_LIVE_LAYER);
         return _this;
     }
     Object.defineProperty(AcApMeasureDistanceJig.prototype, "entity", {
+        /** HTML-only preview — no CAD transient. */
         get: function () {
-            return this._line;
+            return null;
         },
         enumerable: false,
         configurable: true
     });
     AcApMeasureDistanceJig.prototype.update = function (p2) {
-        this._line.endPoint = p2;
+        var _this = this;
+        this._p2 = p2;
+        this._color = acapGetMeasurementColor(this._db);
+        this._badge.setColor(this._color);
+        this._badge.setFontSize(acapGetMeasurementFontSize());
         var dist = calcDist(this._p1, p2);
+        var lineWidth = acapMeasurementCanvasLineWidth(acapGetMeasurementLineWeight());
+        this._preview.acapSetDraw(function (ctx, view) {
+            acapStrokeLiveSegment(ctx, view, _this._p1, _this._p2, _this._color, lineWidth);
+        });
         if (dist < 0.0001) {
-            this._badge.style.display = 'none';
+            this._badge.object.visible = false;
             return;
         }
-        this._badge.textContent = this._db.formatter.formatLength(dist, {
-            showUnits: true,
-            showApproximate: true
+        this._badge.setText(formatMeasurementLength(this._db, dist));
+        this._badge.setPosition({
+            x: (this._p1.x + p2.x) / 2,
+            y: (this._p1.y + p2.y) / 2
         });
-        this._badge.style.display = 'block';
-        var mid = { x: (this._p1.x + p2.x) / 2, y: (this._p1.y + p2.y) / 2 };
-        var rect = this._view.canvas.getBoundingClientRect();
-        var s = this._view.worldToScreen(mid);
-        this._badge.style.left = "".concat(s.x + rect.left, "px");
-        this._badge.style.top = "".concat(s.y + rect.top, "px");
+        this._badge.object.visible = true;
     };
     AcApMeasureDistanceJig.prototype.end = function () {
         _super.prototype.end.call(this);
-        this._badge.remove();
+        this._preview.acapDispose();
+        this._htManager.remove(this._badgeId);
     };
     return AcApMeasureDistanceJig;
 }(AcEdPreviewJig));
@@ -117,10 +138,8 @@ export { AcApMeasureDistanceJig };
 /**
  * Command that measures the straight-line distance between two points.
  *
- * Prompts the user to pick two world points, then registers a transient CAD
- * line between them. Persistent DOM overlays (dots + badge) are placed via
- * {@link AcTrHtmlTransientManager} using CSS2DObject, so they track zoom/pan
- * automatically without manual viewChanged listeners.
+ * Prompts for two world points, then commits a measurement overlay.
+ * Interactive preview is HTML-only (canvas stroke + badge).
  */
 var AcApMeasureDistanceCmd = /** @class */ (function (_super) {
     __extends(AcApMeasureDistanceCmd, _super);
@@ -138,10 +157,10 @@ var AcApMeasureDistanceCmd = /** @class */ (function (_super) {
                     case 0:
                         editor = context.view.editor;
                         db = context.doc.database;
-                        color = measurementColor(db);
+                        color = acapGetMeasurementColor(db);
                         return [4 /*yield*/, context.view.withMode(AcEdViewMode.SELECTION, function () {
                                 return editor.withCursor(AcEdCorsorType.Crosshair, function () { return __awaiter(_this, void 0, void 0, function () {
-                                    var p1Prompt, p1Result, p1, p2Prompt, p2Result, p2, dist, line, htManager, id, mid;
+                                    var p1Prompt, p1Result, p1, p2Prompt, p2Result, p2;
                                     return __generator(this, function (_a) {
                                         switch (_a.label) {
                                             case 0:
@@ -161,26 +180,7 @@ var AcApMeasureDistanceCmd = /** @class */ (function (_super) {
                                                 if (p2Result.status !== AcEdPromptStatus.OK)
                                                     return [2 /*return*/];
                                                 p2 = p2Result.value;
-                                                dist = calcDist(p1, p2);
-                                                line = new AcDbLine(p1, p2);
-                                                line.color = color;
-                                                line.lineWeight = AcGiLineWeight.LineWeight070;
-                                                context.view.addTransientEntity(line);
-                                                htManager = context.view.htmlTransientManager;
-                                                id = "dist-".concat(Date.now());
-                                                mid = { x: (p1.x + p2.x) / 2, y: (p1.y + p2.y) / 2 };
-                                                htManager.add("".concat(id, "-dot1"), makeDot(color), p1, 'measurement');
-                                                htManager.add("".concat(id, "-dot2"), makeDot(color), p2, 'measurement');
-                                                htManager.add("".concat(id, "-badge"), makeBadge(color, db.formatter.formatLength(dist, {
-                                                    showUnits: true,
-                                                    showApproximate: true
-                                                })), mid, 'measurement');
-                                                registerMeasurementCleanup(function () {
-                                                    context.view.removeTransientEntity(line.objectId);
-                                                    htManager.remove("".concat(id, "-dot1"));
-                                                    htManager.remove("".concat(id, "-dot2"));
-                                                    htManager.remove("".concat(id, "-badge"));
-                                                });
+                                                placeDistanceMeasurement(context.view, db, p1, p2, acapGetCurrentMeasurementStyle(db));
                                                 return [2 /*return*/];
                                         }
                                     });

package/lib/command/measure/AcApMeasureDistanceCmd.js.map

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

package/lib/command/measure/AcApMeasurePointCmd.d.ts

@@ -0,0 +1,24 @@
+import { AcDbDatabase, AcGePoint3dLike } from '@mlightcad/data-model';
+import { AcApContext } from '../../app';
+import { AcEdCommand } from '../../editor';
+import { type AcApMeasurementStyle } from '../../util';
+import { AcTrView2d } from '../../view';
+/**
+ * Commit a coordinate measurement overlay (also used when importing a sidecar).
+ */
+export declare function placePointMeasurement(view: AcTrView2d, db: AcDbDatabase, point: AcGePoint3dLike, style: AcApMeasurementStyle, options?: {
+    id?: string;
+    layoutId?: string;
+}): void;
+/**
+ * Command that measures the world X/Y coordinates of a picked point.
+ *
+ * Prompts the user to pick one world point, then places a persistent dot and
+ * coordinate badge via {@link AcTrHtmlTransientManager}. The overlays are
+ * cleared by {@link commitMeasurementGroup}.
+ */
+export declare class AcApMeasurePointCmd extends AcEdCommand {
+    constructor();
+    execute(context: AcApContext): Promise<void>;
+}
+//# sourceMappingURL=AcApMeasurePointCmd.d.ts.map

package/lib/command/measure/AcApMeasurePointCmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasurePointCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasurePointCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EACL,WAAW,EAMZ,MAAM,cAAc,CAAA;AAErB,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAGvC;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,EAChB,KAAK,EAAE,eAAe,EACtB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,IAAI,CAEN;AAED;;;;;;GAMG;AACH,qBAAa,mBAAoB,SAAQ,WAAW;;IAM5C,OAAO,CAAC,OAAO,EAAE,WAAW;CAqBnC"}

package/lib/command/measure/AcApMeasurePointCmd.js

@@ -0,0 +1,114 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcApI18n } from '../../i18n';
+import { acapGetCurrentMeasurementStyle } from '../../util';
+import { AcApMeasurePointEntity } from './entity';
+/**
+ * Commit a coordinate measurement overlay (also used when importing a sidecar).
+ */
+export function placePointMeasurement(view, db, point, style, options) {
+    AcApMeasurePointEntity.create(point, style, options).commit(view, db);
+}
+/**
+ * Command that measures the world X/Y coordinates of a picked point.
+ *
+ * Prompts the user to pick one world point, then places a persistent dot and
+ * coordinate badge via {@link AcTrHtmlTransientManager}. The overlays are
+ * cleared by {@link commitMeasurementGroup}.
+ */
+var AcApMeasurePointCmd = /** @class */ (function (_super) {
+    __extends(AcApMeasurePointCmd, _super);
+    function AcApMeasurePointCmd() {
+        var _this = _super.call(this) || this;
+        _this.mode = AcEdOpenMode.Read;
+        return _this;
+    }
+    AcApMeasurePointCmd.prototype.execute = function (context) {
+        return __awaiter(this, void 0, void 0, function () {
+            var editor, db;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        editor = context.view.editor;
+                        db = context.doc.database;
+                        return [4 /*yield*/, context.view.withMode(AcEdViewMode.SELECTION, function () {
+                                return editor.withCursor(AcEdCorsorType.Crosshair, function () { return __awaiter(_this, void 0, void 0, function () {
+                                    var pointPrompt, pointResult, point;
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                pointPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measurePoint.point'));
+                                                return [4 /*yield*/, editor.getPoint(pointPrompt)];
+                                            case 1:
+                                                pointResult = _a.sent();
+                                                if (pointResult.status !== AcEdPromptStatus.OK)
+                                                    return [2 /*return*/];
+                                                point = pointResult.value;
+                                                placePointMeasurement(context.view, db, point, acapGetCurrentMeasurementStyle(db));
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); });
+                            })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return AcApMeasurePointCmd;
+}(AcEdCommand));
+export { AcApMeasurePointCmd };
+//# sourceMappingURL=AcApMeasurePointCmd.js.map

package/lib/command/measure/AcApMeasurePointCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasurePointCmd.js","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasurePointCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,OAAO,EACL,WAAW,EACX,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EAChB,YAAY,EACb,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EACL,8BAA8B,EAE/B,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAEjD;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAgB,EAChB,EAAgB,EAChB,KAAsB,EACtB,KAA2B,EAC3B,OAA4C;IAE5C,sBAAsB,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AACvE,CAAC;AAED;;;;;;GAMG;AACH;IAAyC,uCAAW;IAClD;QACE,YAAA,MAAK,WAAE,SAAA;QACP,KAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAA;;IAC/B,CAAC;IAEK,qCAAO,GAAb,UAAc,OAAoB;;;;;;;wBAC1B,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;wBAC5B,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAA;wBAE/B,qBAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,EAAE;gCAClD,OAAA,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,EAAE;;;;;gDACpC,WAAW,GAAG,IAAI,sBAAsB,CAC5C,QAAQ,CAAC,CAAC,CAAC,wBAAwB,CAAC,CACrC,CAAA;gDACmB,qBAAM,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAA;;gDAAhD,WAAW,GAAG,SAAkC;gDACtD,IAAI,WAAW,CAAC,MAAM,KAAK,gBAAgB,CAAC,EAAE;oDAAE,sBAAM;gDAChD,KAAK,GAAG,WAAW,CAAC,KAAM,CAAA;gDAChC,qBAAqB,CACnB,OAAO,CAAC,IAAkB,EAC1B,EAAE,EACF,KAAK,EACL,8BAA8B,CAAC,EAAE,CAAC,CACnC,CAAA;;;;qCACF,CAAC;4BAbF,CAaE,CACH,EAAA;;wBAfD,SAeC,CAAA;;;;;KACF;IACH,0BAAC;AAAD,CAAC,AA3BD,CAAyC,WAAW,GA2BnD"}

package/lib/command/measure/AcApMeasurementGeometry.d.ts

@@ -0,0 +1,22 @@
+import { AcGeBox2d } from '@mlightcad/data-model';
+import { type AcApScreenPoint } from '../../util/AcApScreenHitTest';
+import type { AcApMeasurementGeometry } from './AcApMeasurementTypes';
+type WorldToScreen = (point: {
+    x: number;
+    y: number;
+}) => AcApScreenPoint;
+/**
+ * Axis-aligned world bounds of a measurement's control geometry.
+ *
+ * Used for window / crossing box selection. Point measurements use their
+ * position; arcs use the full circle AABB of `center` ± `radius`.
+ */
+export declare function measurementGeometryBounds(geometry: AcApMeasurementGeometry): AcGeBox2d | undefined;
+/**
+ * Whether a canvas-space pick hits a measurement's drawn stroke or fill.
+ *
+ * Point measurements are skipped — they are selected via HTML badges / dots.
+ */
+export declare function hitTestMeasurementGeometry(geometry: AcApMeasurementGeometry, canvas: AcApScreenPoint, worldToScreen: WorldToScreen, threshold: number): boolean;
+export {};
+//# sourceMappingURL=AcApMeasurementGeometry.d.ts.map

package/lib/command/measure/AcApMeasurementGeometry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasurementGeometry.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasurementGeometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,8BAA8B,CAAA;AACrC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AAErE,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,eAAe,CAAA;AAQzE;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,uBAAuB,GAChC,SAAS,GAAG,SAAS,CAmCvB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,uBAAuB,EACjC,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,GAChB,OAAO,CA4FT"}

package/lib/command/measure/AcApMeasurementGeometry.js

@@ -0,0 +1,127 @@
+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);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+import { AcGeBox2d } from '@mlightcad/data-model';
+import { distPointToArcPx, distPointToCirclePx, distPointToPolylinePx, distPointToSegmentPx, pointInPolygonPx } from '../../util/AcApScreenHitTest';
+var TWO_PI = Math.PI * 2;
+function normaliseAngle(a) {
+    return ((a % TWO_PI) + TWO_PI) % TWO_PI;
+}
+/**
+ * Axis-aligned world bounds of a measurement's control geometry.
+ *
+ * Used for window / crossing box selection. Point measurements use their
+ * position; arcs use the full circle AABB of `center` ± `radius`.
+ */
+export function measurementGeometryBounds(geometry) {
+    var e_1, _a;
+    var box = new AcGeBox2d();
+    switch (geometry.type) {
+        case 'distance':
+            box.expandByPoint(geometry.start).expandByPoint(geometry.end);
+            break;
+        case 'angle':
+            box
+                .expandByPoint(geometry.vertex)
+                .expandByPoint(geometry.arm1)
+                .expandByPoint(geometry.arm2);
+            break;
+        case 'area':
+            try {
+                for (var _b = __values(geometry.points), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var point = _c.value;
+                    box.expandByPoint(point);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            break;
+        case 'arc':
+            box
+                .expandByPoint({
+                x: geometry.center.x - geometry.radius,
+                y: geometry.center.y - geometry.radius
+            })
+                .expandByPoint({
+                x: geometry.center.x + geometry.radius,
+                y: geometry.center.y + geometry.radius
+            });
+            break;
+        case 'point':
+            box.expandByPoint(geometry.position);
+            break;
+        default:
+            return undefined;
+    }
+    return box.isEmpty() ? undefined : box;
+}
+/**
+ * Whether a canvas-space pick hits a measurement's drawn stroke or fill.
+ *
+ * Point measurements are skipped — they are selected via HTML badges / dots.
+ */
+export function hitTestMeasurementGeometry(geometry, canvas, worldToScreen, threshold) {
+    switch (geometry.type) {
+        case 'distance': {
+            var a = worldToScreen(geometry.start);
+            var b = worldToScreen(geometry.end);
+            return (distPointToSegmentPx(canvas.x, canvas.y, a.x, a.y, b.x, b.y) <=
+                threshold);
+        }
+        case 'angle': {
+            var vertex = worldToScreen(geometry.vertex);
+            var arm1 = worldToScreen(geometry.arm1);
+            var arm2 = worldToScreen(geometry.arm2);
+            if (distPointToSegmentPx(canvas.x, canvas.y, vertex.x, vertex.y, arm1.x, arm1.y) <= threshold ||
+                distPointToSegmentPx(canvas.x, canvas.y, vertex.x, vertex.y, arm2.x, arm2.y) <= threshold) {
+                return true;
+            }
+            var len1 = Math.hypot(arm1.x - vertex.x, arm1.y - vertex.y);
+            var len2 = Math.hypot(arm2.x - vertex.x, arm2.y - vertex.y);
+            var r = Math.max(Math.min(len1, len2) * 0.3, 15);
+            var startAngle = Math.atan2(arm1.y - vertex.y, arm1.x - vertex.x);
+            var endAngle = Math.atan2(arm2.y - vertex.y, arm2.x - vertex.x);
+            var antiClockwise = normaliseAngle(endAngle - startAngle) > Math.PI;
+            return (distPointToArcPx(canvas.x, canvas.y, vertex.x, vertex.y, r, startAngle, endAngle, antiClockwise) <= threshold);
+        }
+        case 'area': {
+            var verts = geometry.points.map(worldToScreen);
+            if (verts.length < 2)
+                return false;
+            if (pointInPolygonPx(canvas.x, canvas.y, verts))
+                return true;
+            return (distPointToPolylinePx(canvas.x, canvas.y, verts, true) <= threshold);
+        }
+        case 'arc': {
+            var center = worldToScreen(geometry.center);
+            var start = worldToScreen(geometry.start);
+            var end = worldToScreen(geometry.end);
+            var radius = Math.hypot(start.x - center.x, start.y - center.y);
+            if (!(radius > 0)) {
+                return (distPointToCirclePx(canvas.x, canvas.y, center.x, center.y, 0) <=
+                    threshold);
+            }
+            var startAngle = Math.atan2(start.y - center.y, start.x - center.x);
+            var endAngle = Math.atan2(end.y - center.y, end.x - center.x);
+            var cwSpan = normaliseAngle(endAngle - startAngle);
+            var antiClockwise = cwSpan > Math.PI;
+            return (distPointToArcPx(canvas.x, canvas.y, center.x, center.y, radius, startAngle, endAngle, antiClockwise) <= threshold);
+        }
+        case 'point':
+            return false;
+    }
+}
+//# sourceMappingURL=AcApMeasurementGeometry.js.map

package/lib/command/measure/AcApMeasurementGeometry.js.map

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

package/lib/command/measure/AcApMeasurementHistory.d.ts

@@ -0,0 +1,78 @@
+import type { AcEdBaseView } from '../../editor';
+/**
+ * Snapshot-based undo/redo for measurement HTML overlays.
+ *
+ * Measurements are not DWG objects. Groups are
+ * {@link AcTrHtmlTransientManager.detach}ed (kept alive) so undo can
+ * {@link AcTrHtmlTransientManager.reattach} them.
+ */
+export declare class AcApMeasurementHistory {
+    /** Undo stack of measurement overlay mutations (oldest first). */
+    private readonly undoStack;
+    /** Redo stack of measurement overlay mutations (oldest first). */
+    private readonly redoStack;
+    /**
+     * Nesting depth of {@link run} / {@link apply}. Greater than zero means a
+     * mutation is in progress and nested {@link run} calls are not recorded.
+     */
+    private depth;
+    /** True while applying undo/redo or nested inside {@link run}. */
+    get isBusy(): boolean;
+    /** Whether there is at least one measurement overlay undo step. */
+    canUndo(): boolean;
+    /** Whether there is at least one measurement overlay redo step. */
+    canRedo(): boolean;
+    /**
+     * Drop redo entries and dispose detached groups they still hold.
+     * Called after a new undoable edit so redo cannot jump over it.
+     */
+    clearRedo(): void;
+    /**
+     * Drop history. Detached groups still referenced by the stacks are disposed.
+     * Groups that remain on the view are left for {@link AcTrView2d.clear}.
+     */
+    clear(): void;
+    /**
+     * Run a measurement mutation and record one undo step when the committed
+     * measurement groups on the view change. Nested calls do not create extra
+     * entries.
+     * @param view - View whose measurement HTML overlays are snapshotted.
+     * @param label - Human-readable undo label.
+     * @param mutate - Mutation that adds or removes measurement groups.
+     */
+    run(view: AcEdBaseView, label: string, mutate: () => void): void;
+    /**
+     * Undo the last measurement overlay mutation.
+     * @returns true when an entry was applied.
+     */
+    undo(): boolean;
+    /**
+     * Redo the last undone measurement overlay mutation.
+     * @returns true when an entry was applied.
+     */
+    redo(): boolean;
+    /**
+     * Apply one history entry by detaching and reattaching HTML groups.
+     * @param entry - Snapshot of groups added and removed by the original edit.
+     * @param direction - `'undo'` restores the pre-edit set; `'redo'` restores
+     *   the post-edit set.
+     */
+    private apply;
+}
+/** Shared measurement overlay history for the active session. */
+export declare function getMeasurementHistory(): AcApMeasurementHistory;
+/**
+ * Record an undoable measurement overlay edit.
+ * @param view - View whose measurement HTML overlays are snapshotted.
+ * @param label - Human-readable undo label.
+ * @param mutate - Mutation that adds or removes measurement groups.
+ */
+export declare function runMeasurementEdit(view: AcEdBaseView, label: string, mutate: () => void): void;
+/**
+ * Drop measurement overlay history (document open / close).
+ * Detached groups are disposed; attached groups stay for view.clear().
+ */
+export declare function resetMeasurementSession(): void;
+/** Bind this history into session undo (also runs at module load). */
+export declare function bindMeasurementOverlayHistory(): void;
+//# sourceMappingURL=AcApMeasurementHistory.d.ts.map

package/lib/command/measure/AcApMeasurementHistory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasurementHistory.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasurementHistory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AA2ChD;;;;;;GAMG;AACH,qBAAa,sBAAsB;IACjC,kEAAkE;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,kEAAkE;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAI;IAEjB,kEAAkE;IAClE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,mEAAmE;IACnE,OAAO,IAAI,OAAO;IAIlB,mEAAmE;IACnE,OAAO,IAAI,OAAO;IAIlB;;;OAGG;IACH,SAAS,IAAI,IAAI;IAOjB;;;OAGG;IACH,KAAK,IAAI,IAAI;IAQb;;;;;;;OAOG;IACH,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,IAAI;IA0ChE;;;OAGG;IACH,IAAI,IAAI,OAAO;IAQf;;;OAGG;IACH,IAAI,IAAI,OAAO;IAQf;;;;;OAKG;IACH,OAAO,CAAC,KAAK;CAyBd;AAiED,iEAAiE;AACjE,wBAAgB,qBAAqB,IAAI,sBAAsB,CAG9D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,IAAI,GACjB,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAK9C;AAED,sEAAsE;AACtE,wBAAgB,6BAA6B,IAAI,IAAI,CASpD"}