@mlightcad/cad-simple-viewer 1.6.2 → 1.7.0

package/lib/command/measure/entity/AcApMeasureAreaEntity.js

@@ -13,6 +13,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+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 __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -38,18 +49,32 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { AcTrHtmlBadge, AcTrHtmlCanvasOverlay, AcTrHtmlDot } from '@mlightcad/three-renderer';
-import { acapMeasurementCanvasLineWidth, formatMeasurementLength } from '../../../util';
-import { serializeMeasurementStyle } from '../AcApMeasurementSidecar';
-import { getMeasurementStyle, MEASUREMENT_LAYER } from '../AcApMeasurementStore';
+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 { AcTrHtmlBadge, AcTrHtmlCanvasOverlay, AcTrHtmlGrip } from '@mlightcad/three-renderer';
+import { acapMeasurementCanvasLineWidth, formatMeasurementArea } from '../../../util';
+import { acapBindOverlayPointerDrag, acapPlaceOverlayHtml } from '../../overlay';
+import { runMeasurementEdit } from '../AcApMeasurementHistory';
+import { republishMeasurement } from '../AcApMeasurementRepublish';
+import { getMeasurementSnapshot, getMeasurementStyle, MEASUREMENT_LAYER } from '../AcApMeasurementStore';
 import { drawMeasureAreaOnCanvas, measureCentroid, measureShoelaceArea } from './AcApMeasureDrawUtil';
 import { AcApMeasureEntity } from './AcApMeasureEntity';
+import { selectMeasurementGroup } from './AcApMeasureEntityGrips';
 /**
  * Area measurement overlay entity.
  *
  * Renders a filled canvas polygon, HTML dots at each vertex, and an area
- * badge at the vertex centroid. Requires at least three points for a full
- * draw; fewer points yield an empty group with empty extras.
+ * badge at the vertex centroid. Vertex grips update the measured value live
+ * and republish on commit.
  */
 var AcApMeasureAreaEntity = /** @class */ (function (_super) {
     __extends(AcApMeasureAreaEntity, _super);
@@ -61,7 +86,7 @@ var AcApMeasureAreaEntity = /** @class */ (function (_super) {
      */
     function AcApMeasureAreaEntity(points, options) {
         var _a;
-        var _this = _super.call(this, (_a = options.id) !== null && _a !== void 0 ? _a : "area-".concat(Date.now()), options.layoutId, options.style) || this;
+        var _this = _super.call(this, (_a = options.id) !== null && _a !== void 0 ? _a : "area-".concat(Date.now()), options.layoutId, options.style, options.textHeightWcs, options.strokeWidthWcs) || this;
         _this.points = points;
         return _this;
     }
@@ -95,14 +120,15 @@ var AcApMeasureAreaEntity = /** @class */ (function (_super) {
      * Serializes this area measurement to a store/sidecar record.
      *
      * @param layoutId - Optional layout BTR id written onto the record
+     * @param view - Optional view used to convert screen style to WCS
      * @returns Record with `type: 'area'` and polygon point geometry
      */
-    AcApMeasureAreaEntity.prototype.toRecord = function (layoutId) {
+    AcApMeasureAreaEntity.prototype.toRecord = function (layoutId, view) {
         return {
             id: this.entityId,
             type: 'area',
             layoutId: layoutId,
-            style: serializeMeasurementStyle(this.style),
+            style: this.serializeStyle(view),
             geometry: {
                 type: 'area',
                 points: this.points.map(function (p) { return ({ x: p.x, y: p.y }); })
@@ -131,49 +157,149 @@ var AcApMeasureAreaEntity = /** @class */ (function (_super) {
                 extras: {}
             };
         }
+        var live = this.points.map(function (p) { return ({ x: p.x, y: p.y }); });
+        var area = measureShoelaceArea(live);
         var color = this.style.color;
-        var area = measureShoelaceArea(this.points);
         var layoutId = this.resolveLayoutId(view);
-        var mid = measureCentroid(this.points);
         var persistOverlay = new AcTrHtmlCanvasOverlay({
             id: "area-canvas-".concat(this.entityId),
             container: view.container,
             layer: MEASUREMENT_LAYER,
             layoutId: layoutId
         });
+        var badge = new AcTrHtmlBadge({
+            id: "".concat(this.entityId, "-badge"),
+            color: color,
+            text: formatMeasurementArea(db, area),
+            worldPosition: measureCentroid(live),
+            layer: MEASUREMENT_LAYER,
+            fontSize: this.style.fontSize
+        });
+        var dots = live.map(function (p, i) {
+            return new AcTrHtmlGrip({
+                id: "".concat(_this.entityId, "-dot").concat(i),
+                color: color,
+                worldPosition: p,
+                layer: MEASUREMENT_LAYER
+            });
+        });
+        this.seedOverlaySizes(view, __spreadArray([badge], __read(dots), false), [persistOverlay.canvas]);
         var paintArea = function (paintStyle) {
             if (paintStyle === void 0) { paintStyle = _this.style; }
-            return drawMeasureAreaOnCanvas(persistOverlay.canvas, view, _this.points, paintStyle.color, acapMeasurementCanvasLineWidth(paintStyle.lineWeight));
+            return drawMeasureAreaOnCanvas(persistOverlay.canvas, view, live, paintStyle.color, acapMeasurementCanvasLineWidth(paintStyle.lineWeight));
         };
         paintArea();
         var redrawPersist = function () { var _a; return paintArea((_a = getMeasurementStyle(_this.entityId)) !== null && _a !== void 0 ? _a : _this.style); };
         view.events.viewChanged.addEventListener(redrawPersist);
         var group = (_a = this.createGroup(view))
-            .add.apply(_a, __spreadArray([new AcTrHtmlBadge({
-                id: "".concat(this.entityId, "-badge"),
-                color: color,
-                text: "".concat(formatMeasurementLength(db, area), "\u00B2"),
-                worldPosition: mid,
-                layer: MEASUREMENT_LAYER,
-                fontSize: this.style.fontSize
-            })], __read(this.points.map(function (p, i) {
-            return new AcTrHtmlDot({
-                id: "".concat(_this.entityId, "-dot").concat(i),
-                color: color,
-                worldPosition: p,
-                layer: MEASUREMENT_LAYER
+            .add.apply(_a, __spreadArray([badge], __read(dots), false)).addCanvas(persistOverlay);
+        var cleanups = [
+            function () { return view.events.viewChanged.removeEventListener(redrawPersist); }
+        ];
+        var pendingGrips = [];
+        var dragStart = live.map(function (p) { return (__assign({}, p)); });
+        var refreshLive = function () {
+            var _a;
+            area = measureShoelaceArea(live);
+            badge.setText(formatMeasurementArea(db, area));
+            acapPlaceOverlayHtml(view, badge, measureCentroid(live));
+            paintArea((_a = getMeasurementStyle(_this.entityId)) !== null && _a !== void 0 ? _a : _this.style);
+            view.isHtmlDirty = true;
+        };
+        var beginEndpointDrag = function () {
+            selectMeasurementGroup(view, _this.entityId);
+            dragStart = live.map(function (p) { return (__assign({}, p)); });
+        };
+        var commitEndpoints = function () {
+            var delta = 0;
+            for (var i = 0; i < live.length; i++) {
+                delta += Math.hypot(live[i].x - dragStart[i].x, live[i].y - dragStart[i].y);
+            }
+            if (delta < 1e-9) {
+                refreshLive();
+                return;
+            }
+            var snap = getMeasurementSnapshot(_this.entityId);
+            var geometry = {
+                type: 'area',
+                points: live.map(function (p) { return ({ x: p.x, y: p.y }); })
+            };
+            var record = snap
+                ? __assign(__assign({}, snap), { geometry: geometry }) : {
+                id: _this.entityId,
+                type: 'area',
+                layoutId: layoutId,
+                style: _this.serializeStyle(view),
+                geometry: geometry
+            };
+            runMeasurementEdit(view, 'Move Area', function () {
+                republishMeasurement(view, db, record);
             });
-        })), false)).addCanvas(persistOverlay);
+        };
+        pendingGrips.push(function () {
+            var _loop_1 = function (i) {
+                var index = i;
+                var dot = dots[index];
+                cleanups.push(acapBindOverlayPointerDrag({
+                    view: view,
+                    el: dot.element,
+                    onDragStart: beginEndpointDrag,
+                    onMove: function (point) {
+                        live[index] = point;
+                        acapPlaceOverlayHtml(view, dot, point);
+                        refreshLive();
+                    },
+                    onCommit: commitEndpoints
+                }));
+            };
+            for (var i = 0; i < dots.length; i++) {
+                _loop_1(i);
+            }
+        });
         return {
             group: group,
             entityIds: [],
             dispose: function () {
-                view.events.viewChanged.removeEventListener(redrawPersist);
+                var e_1, _a;
+                try {
+                    for (var cleanups_1 = __values(cleanups), cleanups_1_1 = cleanups_1.next(); !cleanups_1_1.done; cleanups_1_1 = cleanups_1.next()) {
+                        var fn = cleanups_1_1.value;
+                        try {
+                            fn();
+                        }
+                        catch (_b) {
+                            // ignore
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (cleanups_1_1 && !cleanups_1_1.done && (_a = cleanups_1.return)) _a.call(cleanups_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+            },
+            bindGrips: function () {
+                var e_2, _a;
+                try {
+                    for (var pendingGrips_1 = __values(pendingGrips), pendingGrips_1_1 = pendingGrips_1.next(); !pendingGrips_1_1.done; pendingGrips_1_1 = pendingGrips_1.next()) {
+                        var bind = pendingGrips_1_1.value;
+                        bind();
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (pendingGrips_1_1 && !pendingGrips_1_1.done && (_a = pendingGrips_1.return)) _a.call(pendingGrips_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
             },
             extras: {
                 style: this.style,
                 value: { kind: 'area', value: area },
-                snapshot: this.toRecord(layoutId),
+                snapshot: this.toRecord(layoutId, view),
                 redraw: paintArea
             }
         };

package/lib/command/measure/entity/AcApMeasureAreaEntity.js.map

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

package/lib/command/measure/entity/AcApMeasureDistanceEntity.d.ts

@@ -6,8 +6,9 @@ import { AcApMeasureEntity, type AcApMeasureEntityOptions, type AcApMeasureWorld
 /**
  * Distance measurement overlay entity.
  *
- * Renders an HTML canvas segment between two endpoints, HTML dots at each end,
- * and a length badge at the midpoint. No CAD transient entities.
+ * Renders an HTML canvas segment with arrows at both endpoints, HTML dots at
+ * each end, and a length badge at the midpoint. Endpoint grips update the
+ * measured value live and republish on commit.
  */
 export declare class AcApMeasureDistanceEntity extends AcApMeasureEntity {
     /** First endpoint of the measured segment in world coordinates. */
@@ -45,9 +46,10 @@ export declare class AcApMeasureDistanceEntity extends AcApMeasureEntity {
      * Serializes this distance measurement to a store/sidecar record.
      *
      * @param layoutId - Optional layout BTR id written onto the record
+     * @param view - Optional view used to convert screen style to WCS
      * @returns Record with `type: 'distance'` and start/end geometry
      */
-    toRecord(layoutId?: string): AcApMeasurementRecord;
+    toRecord(layoutId?: string, view?: AcTrView2d): AcApMeasurementRecord;
     /**
      * Draws the distance canvas stroke, endpoint dots, length badge, and extras.
      *

package/lib/command/measure/entity/AcApMeasureDistanceEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureDistanceEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureDistanceEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAM/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAEpE,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAChC,MAAM,qBAAqB,CAAA;AAe5B;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAiB;IACpC,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAiB;IAEpC;;;;;;OAMG;gBAED,EAAE,EAAE,eAAe,EACnB,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,wBAAwB;IAWnC;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,CACX,EAAE,EAAE,eAAe,EACnB,EAAE,EAAE,eAAe,EACnB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3C,yBAAyB;IAQ5B;;;;OAIG;IACM,YAAY,IAAI,eAAe;IAQxC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,qBAAqB;IAclD;;;;;;OAMG;IACH,SAAS,CAAC,kBAAkB,CAC1B,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,GACf,0BAA0B;CAiE9B"}
+{"version":3,"file":"AcApMeasureDistanceEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureDistanceEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAc/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAEpE,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EACX,MAAM,qBAAqB,CAAA;AAgBjD;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAiB;IACpC,oEAAoE;IACpE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAiB;IAEpC;;;;;;OAMG;gBAED,EAAE,EAAE,eAAe,EACnB,EAAE,EAAE,eAAe,EACnB,OAAO,EAAE,wBAAwB;IAcnC;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,CACX,EAAE,EAAE,eAAe,EACnB,EAAE,EAAE,eAAe,EACnB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3C,yBAAyB;IAQ5B;;;;OAIG;IACM,YAAY,IAAI,eAAe;IAQxC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,qBAAqB;IAqBrE;;;;;;OAMG;IACH,SAAS,CAAC,kBAAkB,CAC1B,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,GACf,0BAA0B;CA8K9B"}

package/lib/command/measure/entity/AcApMeasureDistanceEntity.js

@@ -13,12 +13,37 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { AcTrHtmlBadge, AcTrHtmlCanvasOverlay, AcTrHtmlDot } from '@mlightcad/three-renderer';
+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);
+    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 { AcTrHtmlBadge, AcTrHtmlCanvasOverlay, AcTrHtmlGrip } from '@mlightcad/three-renderer';
 import { acapMeasurementCanvasLineWidth, formatMeasurementLength } from '../../../util';
-import { serializeMeasurementStyle } from '../AcApMeasurementSidecar';
-import { getMeasurementStyle, MEASUREMENT_LAYER } from '../AcApMeasurementStore';
+import { ACAP_OVERLAY_ARROW_SIZE_PX, acapBindOverlayPointerDrag, acapPlaceOverlayHtml, acapScreenPxToWcs } from '../../overlay';
+import { runMeasurementEdit } from '../AcApMeasurementHistory';
+import { republishMeasurement } from '../AcApMeasurementRepublish';
+import { getMeasurementSnapshot, getMeasurementStyle, MEASUREMENT_LAYER } from '../AcApMeasurementStore';
 import { drawMeasureSegmentOnCanvas } from './AcApMeasureDrawUtil';
-import { AcApMeasureEntity } from './AcApMeasureEntity';
+import { AcApMeasureEntity, newMeasureOverlayId } from './AcApMeasureEntity';
+import { selectMeasurementGroup } from './AcApMeasureEntityGrips';
 /**
  * Euclidean distance between two points in the XY plane (Z ignored).
  *
@@ -34,8 +59,9 @@ function calcDist(p1, p2) {
 /**
  * Distance measurement overlay entity.
  *
- * Renders an HTML canvas segment between two endpoints, HTML dots at each end,
- * and a length badge at the midpoint. No CAD transient entities.
+ * Renders an HTML canvas segment with arrows at both endpoints, HTML dots at
+ * each end, and a length badge at the midpoint. Endpoint grips update the
+ * measured value live and republish on commit.
  */
 var AcApMeasureDistanceEntity = /** @class */ (function (_super) {
     __extends(AcApMeasureDistanceEntity, _super);
@@ -48,7 +74,7 @@ var AcApMeasureDistanceEntity = /** @class */ (function (_super) {
      */
     function AcApMeasureDistanceEntity(p1, p2, options) {
         var _a;
-        var _this = _super.call(this, (_a = options.id) !== null && _a !== void 0 ? _a : "dist-".concat(Date.now()), options.layoutId, options.style) || this;
+        var _this = _super.call(this, (_a = options.id) !== null && _a !== void 0 ? _a : newMeasureOverlayId('dist'), options.layoutId, options.style, options.textHeightWcs, options.strokeWidthWcs, options.arrowSizeWcs) || this;
         _this.p1 = p1;
         _this.p2 = p2;
         return _this;
@@ -85,14 +111,21 @@ var AcApMeasureDistanceEntity = /** @class */ (function (_super) {
      * Serializes this distance measurement to a store/sidecar record.
      *
      * @param layoutId - Optional layout BTR id written onto the record
+     * @param view - Optional view used to convert screen style to WCS
      * @returns Record with `type: 'distance'` and start/end geometry
      */
-    AcApMeasureDistanceEntity.prototype.toRecord = function (layoutId) {
+    AcApMeasureDistanceEntity.prototype.toRecord = function (layoutId, view) {
+        var _a;
+        var style = this.serializeStyle(view);
+        var arrowSizeWcs = (_a = this.arrowSizeWcs) !== null && _a !== void 0 ? _a : (view ? acapScreenPxToWcs(ACAP_OVERLAY_ARROW_SIZE_PX, view) : undefined);
+        if (arrowSizeWcs != null && arrowSizeWcs > 0) {
+            style.arrowSizeWcs = arrowSizeWcs;
+        }
         return {
             id: this.entityId,
             type: 'distance',
             layoutId: layoutId,
-            style: serializeMeasurementStyle(this.style),
+            style: style,
             geometry: {
                 type: 'distance',
                 start: { x: this.p1.x, y: this.p1.y },
@@ -109,53 +142,172 @@ var AcApMeasureDistanceEntity = /** @class */ (function (_super) {
      */
     AcApMeasureDistanceEntity.prototype.subWorldDrawWithDb = function (view, db) {
         var _this = this;
-        var dist = calcDist(this.p1, this.p2);
+        var live = {
+            start: { x: this.p1.x, y: this.p1.y },
+            end: { x: this.p2.x, y: this.p2.y }
+        };
+        var dist = calcDist(live.start, live.end);
         var color = this.style.color;
         var layoutId = this.resolveLayoutId(view);
-        var mid = this.primaryPoint();
+        var midOf = function (a, b) { return ({
+            x: (a.x + b.x) / 2,
+            y: (a.y + b.y) / 2
+        }); };
         var persistOverlay = new AcTrHtmlCanvasOverlay({
             id: "dist-canvas-".concat(this.entityId),
             container: view.container,
             layer: MEASUREMENT_LAYER,
             layoutId: layoutId
         });
-        var paintSegment = function (paintStyle) {
-            if (paintStyle === void 0) { paintStyle = _this.style; }
-            return drawMeasureSegmentOnCanvas(persistOverlay.canvas, view, _this.p1, _this.p2, paintStyle.color, acapMeasurementCanvasLineWidth(paintStyle.lineWeight));
-        };
-        paintSegment();
-        var redrawPersist = function () { var _a; return paintSegment((_a = getMeasurementStyle(_this.entityId)) !== null && _a !== void 0 ? _a : _this.style); };
-        view.events.viewChanged.addEventListener(redrawPersist);
-        var group = this.createGroup(view)
-            .add(new AcTrHtmlDot({
+        var dot1 = new AcTrHtmlGrip({
             id: "".concat(this.entityId, "-dot1"),
             color: color,
-            worldPosition: this.p1,
+            worldPosition: live.start,
             layer: MEASUREMENT_LAYER
-        }), new AcTrHtmlDot({
+        });
+        var dot2 = new AcTrHtmlGrip({
             id: "".concat(this.entityId, "-dot2"),
             color: color,
-            worldPosition: this.p2,
+            worldPosition: live.end,
             layer: MEASUREMENT_LAYER
-        }), new AcTrHtmlBadge({
+        });
+        var badge = new AcTrHtmlBadge({
             id: "".concat(this.entityId, "-badge"),
             color: color,
             text: formatMeasurementLength(db, dist),
-            worldPosition: mid,
+            worldPosition: midOf(live.start, live.end),
             layer: MEASUREMENT_LAYER,
             fontSize: this.style.fontSize
-        }))
+        });
+        this.seedOverlaySizes(view, [dot1, dot2, badge], [persistOverlay.canvas]);
+        var paintSegment = function (paintStyle) {
+            if (paintStyle === void 0) { paintStyle = _this.style; }
+            return drawMeasureSegmentOnCanvas(persistOverlay.canvas, view, live.start, live.end, paintStyle.color, acapMeasurementCanvasLineWidth(paintStyle.lineWeight), _this.strokeWidthWcs, _this.arrowSizeWcs);
+        };
+        paintSegment();
+        var redrawPersist = function () { var _a; return paintSegment((_a = getMeasurementStyle(_this.entityId)) !== null && _a !== void 0 ? _a : _this.style); };
+        view.events.viewChanged.addEventListener(redrawPersist);
+        var group = this.createGroup(view)
+            .add(dot1, dot2, badge)
             .addCanvas(persistOverlay);
+        var cleanups = [
+            function () { return view.events.viewChanged.removeEventListener(redrawPersist); }
+        ];
+        var pendingGrips = [];
+        var dragStart = {
+            start: __assign({}, live.start),
+            end: __assign({}, live.end)
+        };
+        var refreshLive = function () {
+            var _a;
+            dist = calcDist(live.start, live.end);
+            badge.setText(formatMeasurementLength(db, dist));
+            acapPlaceOverlayHtml(view, badge, midOf(live.start, live.end));
+            paintSegment((_a = getMeasurementStyle(_this.entityId)) !== null && _a !== void 0 ? _a : _this.style);
+            view.isHtmlDirty = true;
+        };
+        var beginEndpointDrag = function () {
+            selectMeasurementGroup(view, _this.entityId);
+            dragStart = {
+                start: __assign({}, live.start),
+                end: __assign({}, live.end)
+            };
+        };
+        var commitEndpoints = function () {
+            var startDelta = Math.hypot(live.start.x - dragStart.start.x, live.start.y - dragStart.start.y);
+            var endDelta = Math.hypot(live.end.x - dragStart.end.x, live.end.y - dragStart.end.y);
+            if (startDelta < 1e-9 && endDelta < 1e-9) {
+                refreshLive();
+                return;
+            }
+            var snap = getMeasurementSnapshot(_this.entityId);
+            var record = snap
+                ? __assign(__assign({}, snap), { geometry: {
+                        type: 'distance',
+                        start: __assign({}, live.start),
+                        end: __assign({}, live.end)
+                    } }) : {
+                id: _this.entityId,
+                type: 'distance',
+                layoutId: layoutId,
+                style: _this.serializeStyle(view),
+                geometry: {
+                    type: 'distance',
+                    start: __assign({}, live.start),
+                    end: __assign({}, live.end)
+                }
+            };
+            runMeasurementEdit(view, 'Move Distance', function () {
+                republishMeasurement(view, db, record);
+            });
+        };
+        pendingGrips.push(function () {
+            cleanups.push(acapBindOverlayPointerDrag({
+                view: view,
+                el: dot1.element,
+                onDragStart: beginEndpointDrag,
+                onMove: function (point) {
+                    live.start = point;
+                    acapPlaceOverlayHtml(view, dot1, point);
+                    refreshLive();
+                },
+                onCommit: commitEndpoints
+            }), acapBindOverlayPointerDrag({
+                view: view,
+                el: dot2.element,
+                onDragStart: beginEndpointDrag,
+                onMove: function (point) {
+                    live.end = point;
+                    acapPlaceOverlayHtml(view, dot2, point);
+                    refreshLive();
+                },
+                onCommit: commitEndpoints
+            }));
+        });
         return {
             group: group,
             entityIds: [],
             dispose: function () {
-                view.events.viewChanged.removeEventListener(redrawPersist);
+                var e_1, _a;
+                try {
+                    for (var cleanups_1 = __values(cleanups), cleanups_1_1 = cleanups_1.next(); !cleanups_1_1.done; cleanups_1_1 = cleanups_1.next()) {
+                        var fn = cleanups_1_1.value;
+                        try {
+                            fn();
+                        }
+                        catch (_b) {
+                            // ignore
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (cleanups_1_1 && !cleanups_1_1.done && (_a = cleanups_1.return)) _a.call(cleanups_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+            },
+            bindGrips: function () {
+                var e_2, _a;
+                try {
+                    for (var pendingGrips_1 = __values(pendingGrips), pendingGrips_1_1 = pendingGrips_1.next(); !pendingGrips_1_1.done; pendingGrips_1_1 = pendingGrips_1.next()) {
+                        var bind = pendingGrips_1_1.value;
+                        bind();
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (pendingGrips_1_1 && !pendingGrips_1_1.done && (_a = pendingGrips_1.return)) _a.call(pendingGrips_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
             },
             extras: {
                 style: this.style,
                 value: { kind: 'length', value: dist },
-                snapshot: this.toRecord(layoutId),
+                snapshot: this.toRecord(layoutId, view),
                 redraw: paintSegment
             }
         };

package/lib/command/measure/entity/AcApMeasureDistanceEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureDistanceEntity.js","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureDistanceEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAIA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAE7F,OAAO,EACL,8BAA8B,EAE9B,uBAAuB,EACxB,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EACL,iBAAiB,EAGlB,MAAM,qBAAqB,CAAA;AAE5B;;;;;;GAMG;AACH,SAAS,QAAQ,CAAC,EAAmB,EAAE,EAAmB;IACxD,IAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACtB,IAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACtB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;AACrC,CAAC;AAED;;;;;GAKG;AACH;IAA+C,6CAAiB;IAM9D;;;;;;OAMG;IACH,mCACE,EAAmB,EACnB,EAAmB,EACnB,OAAiC;;QAEjC,YAAA,MAAK,YACH,MAAA,OAAO,CAAC,EAAE,mCAAI,eAAQ,IAAI,CAAC,GAAG,EAAE,CAAE,EAClC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,KAAK,CACd,SAAA;QACD,KAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,KAAI,CAAC,EAAE,GAAG,EAAE,CAAA;;IACd,CAAC;IAED;;;;;;;;OAQG;IACI,gCAAM,GAAb,UACE,EAAmB,EACnB,EAAmB,EACnB,KAA2B,EAC3B,OAA4C;QAE5C,OAAO,IAAI,yBAAyB,CAAC,EAAE,EAAE,EAAE,EAAE;YAC3C,KAAK,OAAA;YACL,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE;YACf,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;SAC5B,CAAC,CAAA;IACJ,CAAC;IAED;;;;OAIG;IACM,gDAAY,GAArB;QACE,OAAO;YACL,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,CAAC,EAAE,CAAC;SACL,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACH,4CAAQ,GAAR,UAAS,QAAiB;QACxB,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,QAAQ;YACjB,IAAI,EAAE,UAAU;YAChB,QAAQ,UAAA;YACR,KAAK,EAAE,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC;YAC5C,QAAQ,EAAE;gBACR,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;gBACrC,GAAG,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;aACpC;SACF,CAAA;IACH,CAAC;IAED;;;;;;OAMG;IACO,sDAAkB,GAA5B,UACE,IAAgB,EAChB,EAAgB;QAFlB,iBAmEC;QA/DC,IAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QACvC,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;QAC9B,IAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3C,IAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAG,CAAA;QAEhC,IAAM,cAAc,GAAG,IAAI,qBAAqB,CAAC;YAC/C,EAAE,EAAE,sBAAe,IAAI,CAAC,QAAQ,CAAE;YAClC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,iBAAiB;YACxB,QAAQ,UAAA;SACT,CAAC,CAAA;QACF,IAAM,YAAY,GAAG,UAAC,UAAuB;YAAvB,2BAAA,EAAA,aAAa,KAAI,CAAC,KAAK;YAC3C,OAAA,0BAA0B,CACxB,cAAc,CAAC,MAAM,EACrB,IAAI,EACJ,KAAI,CAAC,EAAE,EACP,KAAI,CAAC,EAAE,EACP,UAAU,CAAC,KAAK,EAChB,8BAA8B,CAAC,UAAU,CAAC,UAAU,CAAC,CACtD;QAPD,CAOC,CAAA;QACH,YAAY,EAAE,CAAA;QACd,IAAM,aAAa,GAAG,sBACpB,OAAA,YAAY,CAAC,MAAA,mBAAmB,CAAC,KAAI,CAAC,QAAQ,CAAC,mCAAI,KAAI,CAAC,KAAK,CAAC,CAAA,EAAA,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;QAEvD,IAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;aACjC,GAAG,CACF,IAAI,WAAW,CAAC;YACd,EAAE,EAAE,UAAG,IAAI,CAAC,QAAQ,UAAO;YAC3B,KAAK,OAAA;YACL,aAAa,EAAE,IAAI,CAAC,EAAE;YACtB,KAAK,EAAE,iBAAiB;SACzB,CAAC,EACF,IAAI,WAAW,CAAC;YACd,EAAE,EAAE,UAAG,IAAI,CAAC,QAAQ,UAAO;YAC3B,KAAK,OAAA;YACL,aAAa,EAAE,IAAI,CAAC,EAAE;YACtB,KAAK,EAAE,iBAAiB;SACzB,CAAC,EACF,IAAI,aAAa,CAAC;YAChB,EAAE,EAAE,UAAG,IAAI,CAAC,QAAQ,WAAQ;YAC5B,KAAK,OAAA;YACL,IAAI,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC;YACvC,aAAa,EAAE,GAAG;YAClB,KAAK,EAAE,iBAAiB;YACxB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;SAC9B,CAAC,CACH;aACA,SAAS,CAAC,cAAc,CAAC,CAAA;QAE5B,OAAO;YACL,KAAK,OAAA;YACL,SAAS,EAAE,EAAE;YACb,OAAO,EAAE;gBACP,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAA;YAC5D,CAAC;YACD,MAAM,EAAE;gBACN,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;gBACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACjC,MAAM,EAAE,YAAY;aACrB;SACF,CAAA;IACH,CAAC;IACH,gCAAC;AAAD,CAAC,AA7JD,CAA+C,iBAAiB,GA6J/D"}
+{"version":3,"file":"AcApMeasureDistanceEntity.js","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureDistanceEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE9F,OAAO,EACL,8BAA8B,EAE9B,uBAAuB,EACxB,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EACL,iBAAiB,EAGjB,mBAAmB,EAAC,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE;;;;;;GAMG;AACH,SAAS,QAAQ,CAAC,EAA4B,EAAE,EAA4B;IAC1E,IAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACtB,IAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACtB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;AACrC,CAAC;AAED;;;;;;GAMG;AACH;IAA+C,6CAAiB;IAM9D;;;;;;OAMG;IACH,mCACE,EAAmB,EACnB,EAAmB,EACnB,OAAiC;;QAEjC,YAAA,MAAK,YACH,MAAA,OAAO,CAAC,EAAE,mCAAI,mBAAmB,CAAC,MAAM,CAAC,EACzC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,YAAY,CACrB,SAAA;QACD,KAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,KAAI,CAAC,EAAE,GAAG,EAAE,CAAA;;IACd,CAAC;IAED;;;;;;;;OAQG;IACI,gCAAM,GAAb,UACE,EAAmB,EACnB,EAAmB,EACnB,KAA2B,EAC3B,OAA4C;QAE5C,OAAO,IAAI,yBAAyB,CAAC,EAAE,EAAE,EAAE,EAAE;YAC3C,KAAK,OAAA;YACL,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE;YACf,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;SAC5B,CAAC,CAAA;IACJ,CAAC;IAED;;;;OAIG;IACM,gDAAY,GAArB;QACE,OAAO;YACL,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,CAAC,EAAE,CAAC;SACL,CAAA;IACH,CAAC;IAED;;;;;;OAMG;IACH,4CAAQ,GAAR,UAAS,QAAiB,EAAE,IAAiB;;QAC3C,IAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QACvC,IAAM,YAAY,GAChB,MAAA,IAAI,CAAC,YAAY,mCACjB,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC1E,IAAI,YAAY,IAAI,IAAI,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YAC7C,KAAK,CAAC,YAAY,GAAG,YAAY,CAAA;QACnC,CAAC;QACD,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,QAAQ;YACjB,IAAI,EAAE,UAAU;YAChB,QAAQ,UAAA;YACR,KAAK,OAAA;YACL,QAAQ,EAAE;gBACR,IAAI,EAAE,UAAU;gBAChB,KAAK,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;gBACrC,GAAG,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;aACpC;SACF,CAAA;IACH,CAAC;IAED;;;;;;OAMG;IACO,sDAAkB,GAA5B,UACE,IAAgB,EAChB,EAAgB;QAFlB,iBAgLC;QA5KC,IAAM,IAAI,GAAG;YACX,KAAK,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;YACrC,GAAG,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE;SACpC,CAAA;QACD,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QACzC,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;QAC9B,IAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3C,IAAM,KAAK,GAAG,UAAC,CAA2B,EAAE,CAA2B,IAAK,OAAA,CAAC;YAC3E,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAClB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACnB,CAAC,EAH0E,CAG1E,CAAA;QAEF,IAAM,cAAc,GAAG,IAAI,qBAAqB,CAAC;YAC/C,EAAE,EAAE,sBAAe,IAAI,CAAC,QAAQ,CAAE;YAClC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,iBAAiB;YACxB,QAAQ,UAAA;SACT,CAAC,CAAA;QACF,IAAM,IAAI,GAAG,IAAI,YAAY,CAAC;YAC5B,EAAE,EAAE,UAAG,IAAI,CAAC,QAAQ,UAAO;YAC3B,KAAK,OAAA;YACL,aAAa,EAAE,IAAI,CAAC,KAAK;YACzB,KAAK,EAAE,iBAAiB;SACzB,CAAC,CAAA;QACF,IAAM,IAAI,GAAG,IAAI,YAAY,CAAC;YAC5B,EAAE,EAAE,UAAG,IAAI,CAAC,QAAQ,UAAO;YAC3B,KAAK,OAAA;YACL,aAAa,EAAE,IAAI,CAAC,GAAG;YACvB,KAAK,EAAE,iBAAiB;SACzB,CAAC,CAAA;QACF,IAAM,KAAK,GAAG,IAAI,aAAa,CAAC;YAC9B,EAAE,EAAE,UAAG,IAAI,CAAC,QAAQ,WAAQ;YAC5B,KAAK,OAAA;YACL,IAAI,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC;YACvC,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC;YAC1C,KAAK,EAAE,iBAAiB;YACxB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;SAC9B,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAA;QACzE,IAAM,YAAY,GAAG,UAAC,UAAuB;YAAvB,2BAAA,EAAA,aAAa,KAAI,CAAC,KAAK;YAC3C,OAAA,0BAA0B,CACxB,cAAc,CAAC,MAAM,EACrB,IAAI,EACJ,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,GAAG,EACR,UAAU,CAAC,KAAK,EAChB,8BAA8B,CAAC,UAAU,CAAC,UAAU,CAAC,EACrD,KAAI,CAAC,cAAc,EACnB,KAAI,CAAC,YAAY,CAClB;QATD,CASC,CAAA;QACH,YAAY,EAAE,CAAA;QACd,IAAM,aAAa,GAAG,sBACpB,OAAA,YAAY,CAAC,MAAA,mBAAmB,CAAC,KAAI,CAAC,QAAQ,CAAC,mCAAI,KAAI,CAAC,KAAK,CAAC,CAAA,EAAA,CAAA;QAChE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;QAEvD,IAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;aACjC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;aACtB,SAAS,CAAC,cAAc,CAAC,CAAA;QAE5B,IAAM,QAAQ,GAAsB;YAClC,cAAM,OAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,EAA1D,CAA0D;SACjE,CAAA;QACD,IAAM,YAAY,GAAsB,EAAE,CAAA;QAC1C,IAAI,SAAS,GAAG;YACd,KAAK,eAAO,IAAI,CAAC,KAAK,CAAE;YACxB,GAAG,eAAO,IAAI,CAAC,GAAG,CAAE;SACrB,CAAA;QAED,IAAM,WAAW,GAAG;;YAClB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;YACrC,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAA;YAChD,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YAC9D,YAAY,CAAC,MAAA,mBAAmB,CAAC,KAAI,CAAC,QAAQ,CAAC,mCAAI,KAAI,CAAC,KAAK,CAAC,CAAA;YAC9D,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACzB,CAAC,CAAA;QAED,IAAM,iBAAiB,GAAG;YACxB,sBAAsB,CAAC,IAAI,EAAE,KAAI,CAAC,QAAQ,CAAC,CAAA;YAC3C,SAAS,GAAG;gBACV,KAAK,eAAO,IAAI,CAAC,KAAK,CAAE;gBACxB,GAAG,eAAO,IAAI,CAAC,GAAG,CAAE;aACrB,CAAA;QACH,CAAC,CAAA;QAED,IAAM,eAAe,GAAG;YACtB,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAC3B,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAChC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CACjC,CAAA;YACD,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAC5B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAC7B,CAAA;YACD,IAAI,UAAU,GAAG,IAAI,IAAI,QAAQ,GAAG,IAAI,EAAE,CAAC;gBACzC,WAAW,EAAE,CAAA;gBACb,OAAM;YACR,CAAC;YACD,IAAM,IAAI,GAAG,sBAAsB,CAAC,KAAI,CAAC,QAAQ,CAAC,CAAA;YAClD,IAAM,MAAM,GAA0B,IAAI;gBACxC,CAAC,uBACM,IAAI,KACP,QAAQ,EAAE;wBACR,IAAI,EAAE,UAAU;wBAChB,KAAK,eAAO,IAAI,CAAC,KAAK,CAAE;wBACxB,GAAG,eAAO,IAAI,CAAC,GAAG,CAAE;qBACrB,IAEL,CAAC,CAAC;gBACE,EAAE,EAAE,KAAI,CAAC,QAAQ;gBACjB,IAAI,EAAE,UAAU;gBAChB,QAAQ,UAAA;gBACR,KAAK,EAAE,KAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE;oBACR,IAAI,EAAE,UAAU;oBAChB,KAAK,eAAO,IAAI,CAAC,KAAK,CAAE;oBACxB,GAAG,eAAO,IAAI,CAAC,GAAG,CAAE;iBACrB;aACF,CAAA;YACL,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE;gBACxC,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;YACxC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,YAAY,CAAC,IAAI,CAAC;YAChB,QAAQ,CAAC,IAAI,CACX,0BAA0B,CAAC;gBACzB,IAAI,MAAA;gBACJ,EAAE,EAAE,IAAI,CAAC,OAAO;gBAChB,WAAW,EAAE,iBAAiB;gBAC9B,MAAM,EAAE,UAAA,KAAK;oBACX,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;oBAClB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;oBACvC,WAAW,EAAE,CAAA;gBACf,CAAC;gBACD,QAAQ,EAAE,eAAe;aAC1B,CAAC,EACF,0BAA0B,CAAC;gBACzB,IAAI,MAAA;gBACJ,EAAE,EAAE,IAAI,CAAC,OAAO;gBAChB,WAAW,EAAE,iBAAiB;gBAC9B,MAAM,EAAE,UAAA,KAAK;oBACX,IAAI,CAAC,GAAG,GAAG,KAAK,CAAA;oBAChB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;oBACvC,WAAW,EAAE,CAAA;gBACf,CAAC;gBACD,QAAQ,EAAE,eAAe;aAC1B,CAAC,CACH,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,OAAO;YACL,KAAK,OAAA;YACL,SAAS,EAAE,EAAE;YACb,OAAO,EAAE;;;oBACP,KAAiB,IAAA,aAAA,SAAA,QAAQ,CAAA,kCAAA,wDAAE,CAAC;wBAAvB,IAAM,EAAE,qBAAA;wBACX,IAAI,CAAC;4BACH,EAAE,EAAE,CAAA;wBACN,CAAC;wBAAC,WAAM,CAAC;4BACP,SAAS;wBACX,CAAC;oBACH,CAAC;;;;;;;;;YACH,CAAC;YACD,SAAS,EAAE;;;oBACT,KAAmB,IAAA,iBAAA,SAAA,YAAY,CAAA,0CAAA;wBAA1B,IAAM,IAAI,yBAAA;wBAAkB,IAAI,EAAE,CAAA;qBAAA;;;;;;;;;YACzC,CAAC;YACD,MAAM,EAAE;gBACN,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;gBACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;gBACvC,MAAM,EAAE,YAAY;aACrB;SACF,CAAA;IACH,CAAC;IACH,gCAAC;AAAD,CAAC,AArRD,CAA+C,iBAAiB,GAqR/D"}