@mlightcad/cad-simple-viewer 1.6.2 → 1.7.0

package/lib/command/markup/entity/AcApMarkupTextEntity.js

@@ -69,6 +69,7 @@ var AcApMarkupTextEntity = /** @class */ (function (_super) {
             layoutId: layoutId
         });
         group.add(badge);
+        this.seedOverlaySizes(view, [badge], []);
         cleanups.push(bindMarkupInlineTextEdit({
             view: view,
             el: badge.element,

package/lib/command/markup/entity/AcApMarkupTextEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupTextEntity.js","sourceRoot":"","sources":["../../../../src/command/markup/entity/AcApMarkupTextEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAIzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAEhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D;;;;GAIG;AACH;IAA0C,wCAAgB;IACxD;;OAEG;IACH,8BAAY,MAAwB;QAClC,OAAA,MAAK,YAAC,MAAM,CAAC,SAAA;IACf,CAAC;IAED;;;;;OAKG;IACO,2CAAY,GAAtB,UAAuB,IAAgB;QAAvC,iBAwDC;QAvDC,IAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;QACjC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QAC7C,CAAC;QACK,IAAA,KAA6B,IAAI,CAAC,KAAK,EAAE,EAAvC,KAAK,WAAA,EAAE,KAAK,WAAA,EAAE,QAAQ,cAAiB,CAAA;QAC/C,IAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAChC,2DAA2D;QAC3D,IAAM,QAAQ,GAAsB,EAAE,CAAA;QACtC,4DAA4D;QAC5D,IAAM,YAAY,GAAsB,EAAE,CAAA;QAE1C,IAAM,KAAK,GAAG,IAAI,aAAa,CAAC;YAC9B,EAAE,EAAE,UAAG,IAAI,CAAC,MAAM,CAAC,EAAE,WAAQ;YAC7B,KAAK,OAAA;YACL,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM;YAChC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;YACpC,aAAa,EAAE,IAAI,CAAC,QAAQ;YAC5B,KAAK,OAAA;YACL,QAAQ,UAAA;SACT,CAAC,CAAA;QACF,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAChB,QAAQ,CAAC,IAAI,CACX,wBAAwB,CAAC;YACvB,IAAI,MAAA;YACJ,EAAE,EAAE,KAAK,CAAC,OAAO;YACjB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;SACzB,CAAC,CACH,CAAA;QAED,YAAY,CAAC,IAAI,CAAC;YAChB,QAAQ,CAAC,IAAI,CACX,oBAAoB,CAAC;gBACnB,IAAI,MAAA;gBACJ,QAAQ,EAAE,KAAI,CAAC,MAAM,CAAC,EAAE;gBACxB,QAAQ,EAAE,KAAK;aAChB,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;SACF,CAAA;IACH,CAAC;IACH,2BAAC;AAAD,CAAC,AAvED,CAA0C,gBAAgB,GAuEzD"}
+{"version":3,"file":"AcApMarkupTextEntity.js","sourceRoot":"","sources":["../../../../src/command/markup/entity/AcApMarkupTextEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAIzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAEhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D;;;;GAIG;AACH;IAA0C,wCAAgB;IACxD;;OAEG;IACH,8BAAY,MAAwB;QAClC,OAAA,MAAK,YAAC,MAAM,CAAC,SAAA;IACf,CAAC;IAED;;;;;OAKG;IACO,2CAAY,GAAtB,UAAuB,IAAgB;QAAvC,iBAyDC;QAxDC,IAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;QACjC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QAC7C,CAAC;QACK,IAAA,KAA6B,IAAI,CAAC,KAAK,EAAE,EAAvC,KAAK,WAAA,EAAE,KAAK,WAAA,EAAE,QAAQ,cAAiB,CAAA;QAC/C,IAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAChC,2DAA2D;QAC3D,IAAM,QAAQ,GAAsB,EAAE,CAAA;QACtC,4DAA4D;QAC5D,IAAM,YAAY,GAAsB,EAAE,CAAA;QAE1C,IAAM,KAAK,GAAG,IAAI,aAAa,CAAC;YAC9B,EAAE,EAAE,UAAG,IAAI,CAAC,MAAM,CAAC,EAAE,WAAQ;YAC7B,KAAK,OAAA;YACL,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM;YAChC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;YACpC,aAAa,EAAE,IAAI,CAAC,QAAQ;YAC5B,KAAK,OAAA;YACL,QAAQ,UAAA;SACT,CAAC,CAAA;QACF,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAChB,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;QACxC,QAAQ,CAAC,IAAI,CACX,wBAAwB,CAAC;YACvB,IAAI,MAAA;YACJ,EAAE,EAAE,KAAK,CAAC,OAAO;YACjB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;SACzB,CAAC,CACH,CAAA;QAED,YAAY,CAAC,IAAI,CAAC;YAChB,QAAQ,CAAC,IAAI,CACX,oBAAoB,CAAC;gBACnB,IAAI,MAAA;gBACJ,QAAQ,EAAE,KAAI,CAAC,MAAM,CAAC,EAAE;gBACxB,QAAQ,EAAE,KAAK;aAChB,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;SACF,CAAA;IACH,CAAC;IACH,2BAAC;AAAD,CAAC,AAxED,CAA0C,gBAAgB,GAwEzD"}

package/lib/command/markup/index.d.ts

@@ -1,3 +1,5 @@
+export * from './AcApMarkupSessionBootstrap';
+export * from './AcApMarkupSession';
 export * from './AcApClearMarkupsCmd';
 export * from './AcApMarkupArrowCmd';
 export * from './AcApMarkupCalloutCmd';
@@ -5,6 +7,8 @@ export * from './AcApMarkupCalloutDrag';
 export * from './AcApMarkupCircleCmd';
 export * from './AcApMarkupCloudCmd';
 export * from './AcApMarkupCmdUtil';
+export * from './AcApMarkupDrawCmd';
+export * from './AcApRegisterMarkupCommands';
 export * from './AcApMarkupGeometry';
 export * from './AcApMarkupHighlightCmd';
 export * from './AcApMarkupHistory';

package/lib/command/markup/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/markup/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/markup/index.ts"],"names":[],"mappings":"AACA,cAAc,8BAA8B,CAAA;AAC5C,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,UAAU,CAAA"}

package/lib/command/markup/index.js

@@ -1,3 +1,6 @@
+// Side-effect: install per-session markup bag factory before other markup APIs run.
+export * from './AcApMarkupSessionBootstrap';
+export * from './AcApMarkupSession';
 export * from './AcApClearMarkupsCmd';
 export * from './AcApMarkupArrowCmd';
 export * from './AcApMarkupCalloutCmd';
@@ -5,6 +8,8 @@ export * from './AcApMarkupCalloutDrag';
 export * from './AcApMarkupCircleCmd';
 export * from './AcApMarkupCloudCmd';
 export * from './AcApMarkupCmdUtil';
+export * from './AcApMarkupDrawCmd';
+export * from './AcApRegisterMarkupCommands';
 export * from './AcApMarkupGeometry';
 export * from './AcApMarkupHighlightCmd';
 export * from './AcApMarkupHistory';

package/lib/command/markup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/markup/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/markup/index.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,cAAc,8BAA8B,CAAA;AAC5C,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AACpC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,UAAU,CAAA"}

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

@@ -0,0 +1,27 @@
+/**
+ * Angle-dimension arc radius in world space.
+ *
+ * Shared by canvas drawing and hit-testing so the painted arc and pick
+ * target stay aligned across zoom.
+ */
+/** Fraction of the shorter world-space arm used as the dimension arc radius. */
+export declare const MEASURE_ANGLE_ARC_RADIUS_FRACTION = 0.3;
+/**
+ * World-space radius of the interior angle dimension arc.
+ *
+ * @param vertex - Angle vertex in world coordinates
+ * @param arm1 - First arm endpoint in world coordinates
+ * @param arm2 - Second arm endpoint in world coordinates
+ * @returns Radius in world units (`0` when either arm is degenerate)
+ */
+export declare function measureAngleArcRadiusWcs(vertex: {
+    x: number;
+    y: number;
+}, arm1: {
+    x: number;
+    y: number;
+}, arm2: {
+    x: number;
+    y: number;
+}): number;
+//# sourceMappingURL=AcApMeasureAngleArc.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureAngleArc.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAngleArc.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,gFAAgF;AAChF,eAAO,MAAM,iCAAiC,MAAM,CAAA;AAEpD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EAChC,IAAI,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EAC9B,IAAI,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7B,MAAM,CAIR"}

package/lib/command/measure/AcApMeasureAngleArc.js

@@ -0,0 +1,22 @@
+/**
+ * Angle-dimension arc radius in world space.
+ *
+ * Shared by canvas drawing and hit-testing so the painted arc and pick
+ * target stay aligned across zoom.
+ */
+/** Fraction of the shorter world-space arm used as the dimension arc radius. */
+export var MEASURE_ANGLE_ARC_RADIUS_FRACTION = 0.3;
+/**
+ * World-space radius of the interior angle dimension arc.
+ *
+ * @param vertex - Angle vertex in world coordinates
+ * @param arm1 - First arm endpoint in world coordinates
+ * @param arm2 - Second arm endpoint in world coordinates
+ * @returns Radius in world units (`0` when either arm is degenerate)
+ */
+export function measureAngleArcRadiusWcs(vertex, arm1, arm2) {
+    var len1 = Math.hypot(arm1.x - vertex.x, arm1.y - vertex.y);
+    var len2 = Math.hypot(arm2.x - vertex.x, arm2.y - vertex.y);
+    return Math.min(len1, len2) * MEASURE_ANGLE_ARC_RADIUS_FRACTION;
+}
+//# sourceMappingURL=AcApMeasureAngleArc.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureAngleArc.js","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAngleArc.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,gFAAgF;AAChF,MAAM,CAAC,IAAM,iCAAiC,GAAG,GAAG,CAAA;AAEpD;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CACtC,MAAgC,EAChC,IAA8B,EAC9B,IAA8B;IAE9B,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC7D,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC7D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,iCAAiC,CAAA;AACjE,CAAC"}

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

@@ -1,8 +1,8 @@
 import { AcDbDatabase, AcGePoint3dLike } from '@mlightcad/data-model';
 import { AcApContext } from '../../app';
-import { AcEdCommand } from '../../editor';
 import { type AcApMeasurementStyle } from '../../util';
 import { AcTrView2d } from '../../view';
+import { AcApMeasureDrawCmd } from './AcApMeasureDrawCmd';
 /**
  * Commit an angle measurement overlay (also used when importing a sidecar).
  */
@@ -18,8 +18,7 @@ export declare function placeAngleMeasurement(view: AcTrView2d, db: AcDbDatabase
  * (canvas strokes + badge). Committed overlay is placed via
  * {@link placeAngleMeasurement}.
  */
-export declare class AcApMeasureAngleCmd extends AcEdCommand {
-    constructor();
+export declare class AcApMeasureAngleCmd extends AcApMeasureDrawCmd {
     execute(context: AcApContext): Promise<void>;
 }
 //# sourceMappingURL=AcApMeasureAngleCmd.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureAngleCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAngleCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAChB,MAAM,uBAAuB,CAAA;AAM9B,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAOZ,MAAM,cAAc,CAAA;AAErB,OAAO,EAML,KAAK,oBAAoB,EAE1B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAwBvC;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,EAChB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,IAAI,CAKN;AA0JD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,WAAW;;IAM5C,OAAO,CAAC,OAAO,EAAE,WAAW;CAoDnC"}
+{"version":3,"file":"AcApMeasureAngleCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAngleCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAMhF,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAQvC,OAAO,EAKL,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAMvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAoBzD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,EAChB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,IAAI,CAKN;AA2JD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,kBAAkB;IACnD,OAAO,CAAC,OAAO,EAAE,WAAW;CAkDnC"}

package/lib/command/measure/AcApMeasureAngleCmd.js

@@ -50,10 +50,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { AcTrHtmlBadge } from '@mlightcad/three-renderer';
-import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
-import { acapGetCurrentMeasurementStyle, acapGetMeasurementColor, acapGetMeasurementFontSize, acapGetMeasurementLineWeight, acapMeasurementCanvasLineWidth, formatMeasurementAngle } from '../../util';
+import { acapGetCurrentMeasurementStyle, acapGetMeasurementColor, acapGetMeasurementFontSize, acapMeasurementCanvasLineWidth, formatMeasurementAngle, MEASUREMENT_LINE_WEIGHT } from '../../util';
 import { AcApHtmlLivePreview, acapStrokeLiveSegment } from '../overlay/AcApHtmlLivePreview';
+import { acapSyncLiveOverlayTextHeight } from '../overlay/AcApOverlayDrawUtil';
+import { AcApMeasureDrawCmd } from './AcApMeasureDrawCmd';
 import { MEASUREMENT_LIVE_LAYER } from './AcApMeasurementStore';
 import { AcApMeasureAngleEntity } from './entity';
 /** Returns the angle in degrees between two arms sharing a common vertex. */
@@ -97,7 +99,7 @@ var AcApMeasureArm1Jig = /** @class */ (function (_super) {
     AcApMeasureArm1Jig.prototype.update = function (p) {
         var _this = this;
         this._cursor = p;
-        var lineWidth = acapMeasurementCanvasLineWidth(acapGetMeasurementLineWeight());
+        var lineWidth = acapMeasurementCanvasLineWidth(MEASUREMENT_LINE_WEIGHT);
         this._preview.acapSetDraw(function (ctx, view) {
             acapStrokeLiveSegment(ctx, view, _this._vertex, _this._cursor, _this._color, lineWidth);
         });
@@ -134,8 +136,9 @@ var AcApMeasureAngleJig = /** @class */ (function (_super) {
             // Keep the label slightly above the vertex (was -30px screen offset).
             transform: 'translate(-50%, calc(-50% - 30px))'
         });
-        _this._badge.object.visible = false;
         _this._htManager.add(_this._badge);
+        acapSyncLiveOverlayTextHeight(_this._view, [_this._badge], acapGetCurrentMeasurementStyle(_this._db));
+        _this._badge.object.visible = false;
         _this._preview = new AcApHtmlLivePreview(_this._view, "live-angle-arm2-".concat(Date.now()), MEASUREMENT_LIVE_LAYER);
         return _this;
     }
@@ -152,8 +155,10 @@ var AcApMeasureAngleJig = /** @class */ (function (_super) {
         this._arm2 = p;
         this._color = acapGetMeasurementColor(this._db);
         this._badge.setColor(this._color);
-        this._badge.setFontSize(acapGetMeasurementFontSize());
-        var lineWidth = acapMeasurementCanvasLineWidth(acapGetMeasurementLineWeight());
+        var style = acapGetCurrentMeasurementStyle(this._db);
+        this._badge.setFontSize(style.fontSize);
+        acapSyncLiveOverlayTextHeight(this._view, [this._badge], style);
+        var lineWidth = acapMeasurementCanvasLineWidth(MEASUREMENT_LINE_WEIGHT);
         this._preview.acapSetDraw(function (ctx, view) {
             acapStrokeLiveSegment(ctx, view, _this._vertex, _this._arm1, _this._color, lineWidth, { dashed: true });
             acapStrokeLiveSegment(ctx, view, _this._vertex, _this._arm2, _this._color, lineWidth);
@@ -181,9 +186,7 @@ var AcApMeasureAngleJig = /** @class */ (function (_super) {
 var AcApMeasureAngleCmd = /** @class */ (function (_super) {
     __extends(AcApMeasureAngleCmd, _super);
     function AcApMeasureAngleCmd() {
-        var _this = _super.call(this) || this;
-        _this.mode = AcEdOpenMode.Read;
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMeasureAngleCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
@@ -195,42 +198,40 @@ var AcApMeasureAngleCmd = /** @class */ (function (_super) {
                         editor = context.view.editor;
                         db = context.doc.database;
                         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 vertexPrompt, vertexResult, vertex, arm1Prompt, arm1Result, arm1, arm2Prompt, arm2Result, arm2;
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0:
-                                                vertexPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.vertex'));
-                                                return [4 /*yield*/, editor.getPoint(vertexPrompt)];
-                                            case 1:
-                                                vertexResult = _a.sent();
-                                                if (vertexResult.status !== AcEdPromptStatus.OK)
-                                                    return [2 /*return*/];
-                                                vertex = vertexResult.value;
-                                                arm1Prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.arm1'));
-                                                arm1Prompt.useBasePoint = true;
-                                                arm1Prompt.jig = new AcApMeasureArm1Jig(context.view, vertex, color);
-                                                return [4 /*yield*/, editor.getPoint(arm1Prompt)];
-                                            case 2:
-                                                arm1Result = _a.sent();
-                                                if (arm1Result.status !== AcEdPromptStatus.OK)
-                                                    return [2 /*return*/];
-                                                arm1 = arm1Result.value;
-                                                arm2Prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.arm2'));
-                                                arm2Prompt.jig = new AcApMeasureAngleJig(context.view, db, vertex, arm1, color);
-                                                return [4 /*yield*/, editor.getPoint(arm2Prompt)];
-                                            case 3:
-                                                arm2Result = _a.sent();
-                                                if (arm2Result.status !== AcEdPromptStatus.OK)
-                                                    return [2 /*return*/];
-                                                arm2 = arm2Result.value;
-                                                placeAngleMeasurement(context.view, db, vertex, arm1, arm2, acapGetCurrentMeasurementStyle(db));
+                        return [4 /*yield*/, this.withMeasureInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
+                                var vertexPrompt, vertexResult, vertex, arm1Prompt, arm1Result, arm1, arm2Prompt, arm2Result, arm2;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            vertexPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.vertex'));
+                                            return [4 /*yield*/, editor.getPoint(vertexPrompt)];
+                                        case 1:
+                                            vertexResult = _a.sent();
+                                            if (vertexResult.status !== AcEdPromptStatus.OK)
+                                                return [2 /*return*/];
+                                            vertex = vertexResult.value;
+                                            arm1Prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.arm1'));
+                                            arm1Prompt.useBasePoint = true;
+                                            arm1Prompt.jig = new AcApMeasureArm1Jig(context.view, vertex, color);
+                                            return [4 /*yield*/, editor.getPoint(arm1Prompt)];
+                                        case 2:
+                                            arm1Result = _a.sent();
+                                            if (arm1Result.status !== AcEdPromptStatus.OK)
+                                                return [2 /*return*/];
+                                            arm1 = arm1Result.value;
+                                            arm2Prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.arm2'));
+                                            arm2Prompt.jig = new AcApMeasureAngleJig(context.view, db, vertex, arm1, color);
+                                            return [4 /*yield*/, editor.getPoint(arm2Prompt)];
+                                        case 3:
+                                            arm2Result = _a.sent();
+                                            if (arm2Result.status !== AcEdPromptStatus.OK)
                                                 return [2 /*return*/];
-                                        }
-                                    });
-                                }); });
-                            })];
+                                            arm2 = arm2Result.value;
+                                            placeAngleMeasurement(context.view, db, vertex, arm1, arm2, acapGetCurrentMeasurementStyle(db));
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -239,6 +240,6 @@ var AcApMeasureAngleCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMeasureAngleCmd;
-}(AcEdCommand));
+}(AcApMeasureDrawCmd));
 export { AcApMeasureAngleCmd };
 //# sourceMappingURL=AcApMeasureAngleCmd.js.map

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

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

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

@@ -1,8 +1,8 @@
 import { AcDbDatabase } from '@mlightcad/data-model';
 import { AcApContext } from '../../app';
-import { AcEdCommand } from '../../editor';
 import { type AcApMeasurementStyle } from '../../util';
 import { AcTrView2d } from '../../view';
+import { AcApMeasureDrawCmd } from './AcApMeasureDrawCmd';
 import { type AcApMeasureCircleGeom } from './entity';
 type Point2 = {
     x: number;
@@ -27,8 +27,7 @@ export declare function placeArcMeasurement(view: AcTrView2d, db: AcDbDatabase,
  * Interactive preview is HTML-only. The committed overlay is placed via
  * {@link placeArcMeasurement}.
  */
-export declare class AcApMeasureArcCmd extends AcEdCommand {
-    constructor();
+export declare class AcApMeasureArcCmd extends AcApMeasureDrawCmd {
     execute(context: AcApContext): Promise<void>;
     /**
      * Two-point locked-arc flow after the start pick landed on a CIRCLE, ARC,

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureArcCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAIb,MAAM,uBAAuB,CAAA;AAQ9B,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvD,OAAO,EAEL,WAAW,EAOZ,MAAM,cAAc,CAAA;AAErB,OAAO,EAML,KAAK,oBAAoB,EAE1B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAcvC,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,UAAU,CAAA;AAEjB,KAAK,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAsItC;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,IAAI,CAKN;AA6XD;;;;;;;;;;;GAWG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;IAM1C,OAAO,CAAC,OAAO,EAAE,WAAW;IAyFlC;;;;;OAKG;YACW,eAAe;CAwD9B"}
+{"version":3,"file":"AcApMeasureArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureArcCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAIb,MAAM,uBAAuB,CAAA;AAQ9B,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AAQvD,OAAO,EAKL,KAAK,oBAAoB,EAG1B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAcvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,UAAU,CAAA;AAEjB,KAAK,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAsItC;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,IAAI,CAKN;AAqYD;;;;;;;;;;;GAWG;AACH,qBAAa,iBAAkB,SAAQ,kBAAkB;IACjD,OAAO,CAAC,OAAO,EAAE,WAAW;IAoFlC;;;;;OAKG;YACW,eAAe;CAwD9B"}

package/lib/command/measure/AcApMeasureArcCmd.js

@@ -99,11 +99,13 @@ var __values = (this && this.__values) || function(o) {
 import { AcGeCircArc2d, AcGeMathUtil } from '@mlightcad/data-model';
 import { AcTrHtmlBadge, AcTrHtmlDot, AcTrHtmlSnapIndicator } from '@mlightcad/three-renderer';
 import { AcApDocManager } from '../../app';
-import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
-import { acapGetCurrentMeasurementStyle, acapGetMeasurementColor, acapGetMeasurementFontSize, acapGetMeasurementLineWeight, acapMeasurementCanvasLineWidth, formatMeasurementLength } from '../../util';
+import { acapGetCurrentMeasurementStyle, acapGetMeasurementColor, acapGetMeasurementFontSize, acapMeasurementCanvasLineWidth, formatMeasurementLength, MEASUREMENT_LINE_WEIGHT } from '../../util';
 import { AcApHtmlLivePreview, acapStrokeLivePolyline, acapStrokeLiveSegment } from '../overlay/AcApHtmlLivePreview';
+import { acapSyncLiveOverlayTextHeight } from '../overlay/AcApOverlayDrawUtil';
 import { inwardLockAlignment, isBetterLockCandidate, lockCurvesFromEntity, pointLiesOnCircle, sameCircleGeom } from './AcApMeasureArcLock';
+import { AcApMeasureDrawCmd } from './AcApMeasureDrawCmd';
 import { MEASUREMENT_LIVE_LAYER } from './AcApMeasurementStore';
 import { AcApMeasureArcEntity, strokeMeasureArcOnContext } from './entity';
 /** Screen-pixel aperture for locking the first pick onto a CIRCLE/ARC stroke. */
@@ -321,8 +323,9 @@ var AcApArcLockedEndJig = /** @class */ (function (_super) {
             layoutId: _this._view.activeLayoutBtrId,
             fontSize: acapGetMeasurementFontSize()
         });
-        _this._badge.object.visible = false;
         _this._htManager.add(_this._badge);
+        acapSyncLiveOverlayTextHeight(_this._view, [_this._badge], acapGetCurrentMeasurementStyle(_this._db));
+        _this._badge.object.visible = false;
         _this._preview = new AcApHtmlLivePreview(_this._view, "live-arc-locked-".concat(Date.now()), MEASUREMENT_LIVE_LAYER);
         return _this;
     }
@@ -386,8 +389,10 @@ var AcApArcLockedEndJig = /** @class */ (function (_super) {
         this._color = acapGetMeasurementColor(this._db);
         this._indicator.setPosition(snapped);
         this._badge.setColor(this._color);
-        this._badge.setFontSize(acapGetMeasurementFontSize());
-        var lineWidth = acapMeasurementCanvasLineWidth(acapGetMeasurementLineWeight());
+        var style = acapGetCurrentMeasurementStyle(this._db);
+        this._badge.setFontSize(style.fontSize);
+        acapSyncLiveOverlayTextHeight(this._view, [this._badge], style);
+        var lineWidth = acapMeasurementCanvasLineWidth(MEASUREMENT_LINE_WEIGHT);
         var sweep = lockedSweep(this._start, end, this._geom, this.clockwise);
         this._preview.acapSetDraw(function (ctx, view) {
             strokeMeasureArcOnContext(ctx, view, _this._geom, _this._start, end, _this._color, lineWidth, sweep === null || sweep === void 0 ? void 0 : sweep.through);
@@ -433,7 +438,7 @@ var AcApMeasureArcThroughJig = /** @class */ (function (_super) {
     AcApMeasureArcThroughJig.prototype.update = function (p) {
         var _this = this;
         this._cursor = p;
-        var lineWidth = acapMeasurementCanvasLineWidth(acapGetMeasurementLineWeight());
+        var lineWidth = acapMeasurementCanvasLineWidth(MEASUREMENT_LINE_WEIGHT);
         this._preview.acapSetDraw(function (ctx, view) {
             acapStrokeLiveSegment(ctx, view, _this._start, _this._cursor, _this._color, lineWidth);
         });
@@ -468,8 +473,9 @@ var AcApMeasureArcEndJig = /** @class */ (function (_super) {
             layoutId: _this._view.activeLayoutBtrId,
             fontSize: acapGetMeasurementFontSize()
         });
-        _this._badge.object.visible = false;
         _this._htManager.add(_this._badge);
+        acapSyncLiveOverlayTextHeight(_this._view, [_this._badge], acapGetCurrentMeasurementStyle(_this._db));
+        _this._badge.object.visible = false;
         _this._preview = new AcApHtmlLivePreview(_this._view, "live-arc-end-".concat(Date.now()), MEASUREMENT_LIVE_LAYER);
         return _this;
     }
@@ -486,8 +492,10 @@ var AcApMeasureArcEndJig = /** @class */ (function (_super) {
         this._end = toPoint2(p);
         this._color = acapGetMeasurementColor(this._db);
         this._badge.setColor(this._color);
-        this._badge.setFontSize(acapGetMeasurementFontSize());
-        var lineWidth = acapMeasurementCanvasLineWidth(acapGetMeasurementLineWeight());
+        var style = acapGetCurrentMeasurementStyle(this._db);
+        this._badge.setFontSize(style.fontSize);
+        acapSyncLiveOverlayTextHeight(this._view, [this._badge], style);
+        var lineWidth = acapMeasurementCanvasLineWidth(MEASUREMENT_LINE_WEIGHT);
         var arc = AcGeCircArc2d.tryCreateByThreePoints(this._start, this._through, this._end);
         var geom = arc ? circleGeomFromArc(arc) : null;
         this._preview.acapSetDraw(function (ctx, view) {
@@ -527,9 +535,7 @@ var AcApMeasureArcEndJig = /** @class */ (function (_super) {
 var AcApMeasureArcCmd = /** @class */ (function (_super) {
     __extends(AcApMeasureArcCmd, _super);
     function AcApMeasureArcCmd() {
-        var _this = _super.call(this) || this;
-        _this.mode = AcEdOpenMode.Read;
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMeasureArcCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
@@ -542,62 +548,60 @@ var AcApMeasureArcCmd = /** @class */ (function (_super) {
                         db = context.doc.database;
                         color = acapGetMeasurementColor(db);
                         view = context.view;
-                        return [4 /*yield*/, context.view.withMode(AcEdViewMode.SELECTION, function () {
-                                return editor.withCursor(AcEdCorsorType.Crosshair, function () { return __awaiter(_this, void 0, void 0, function () {
-                                    var startPrompt, startResult, start, lock, startOnLock, throughPrompt, throughResult, through, endPrompt, endResult, end, start2, through2, end2, measured;
-                                    return __generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0:
-                                                editor.resetInputToggles();
-                                                startPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureArc.startPoint'));
-                                                startPrompt.jig = new AcApArcSnapJig(context, color);
-                                                return [4 /*yield*/, editor.getPoint(startPrompt)];
-                                            case 1:
-                                                startResult = _a.sent();
-                                                if (startResult.status !== AcEdPromptStatus.OK)
-                                                    return [2 /*return*/];
-                                                start = startResult.value;
-                                                lock = pickCircleGeomAtPoint(context, start);
-                                                if (!lock) return [3 /*break*/, 3];
-                                                startOnLock = pointLiesOnCircle(toPoint2(start), lock.geom)
-                                                    ? start
-                                                    : lock.snapped;
-                                                return [4 /*yield*/, this.commitLockedArc(context, view, db, color, lock.geom, startOnLock)];
-                                            case 2:
-                                                _a.sent();
+                        return [4 /*yield*/, this.withMeasureInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
+                                var startPrompt, startResult, start, lock, startOnLock, throughPrompt, throughResult, through, endPrompt, endResult, end, start2, through2, end2, measured;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            editor.resetInputToggles();
+                                            startPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureArc.startPoint'));
+                                            startPrompt.jig = new AcApArcSnapJig(context, color);
+                                            return [4 /*yield*/, editor.getPoint(startPrompt)];
+                                        case 1:
+                                            startResult = _a.sent();
+                                            if (startResult.status !== AcEdPromptStatus.OK)
+                                                return [2 /*return*/];
+                                            start = startResult.value;
+                                            lock = pickCircleGeomAtPoint(context, start);
+                                            if (!lock) return [3 /*break*/, 3];
+                                            startOnLock = pointLiesOnCircle(toPoint2(start), lock.geom)
+                                                ? start
+                                                : lock.snapped;
+                                            return [4 /*yield*/, this.commitLockedArc(context, view, db, color, lock.geom, startOnLock)];
+                                        case 2:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                        case 3:
+                                            throughPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureArc.throughPoint'));
+                                            throughPrompt.useBasePoint = true;
+                                            throughPrompt.jig = new AcApMeasureArcThroughJig(context.view, start, color);
+                                            return [4 /*yield*/, editor.getPoint(throughPrompt)];
+                                        case 4:
+                                            throughResult = _a.sent();
+                                            if (throughResult.status !== AcEdPromptStatus.OK)
+                                                return [2 /*return*/];
+                                            through = throughResult.value;
+                                            endPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureArc.endPoint'));
+                                            endPrompt.jig = new AcApMeasureArcEndJig(context.view, db, start, through, color);
+                                            return [4 /*yield*/, editor.getPoint(endPrompt)];
+                                        case 5:
+                                            endResult = _a.sent();
+                                            if (endResult.status !== AcEdPromptStatus.OK)
                                                 return [2 /*return*/];
-                                            case 3:
-                                                throughPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureArc.throughPoint'));
-                                                throughPrompt.useBasePoint = true;
-                                                throughPrompt.jig = new AcApMeasureArcThroughJig(context.view, start, color);
-                                                return [4 /*yield*/, editor.getPoint(throughPrompt)];
-                                            case 4:
-                                                throughResult = _a.sent();
-                                                if (throughResult.status !== AcEdPromptStatus.OK)
-                                                    return [2 /*return*/];
-                                                through = throughResult.value;
-                                                endPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureArc.endPoint'));
-                                                endPrompt.jig = new AcApMeasureArcEndJig(context.view, db, start, through, color);
-                                                return [4 /*yield*/, editor.getPoint(endPrompt)];
-                                            case 5:
-                                                endResult = _a.sent();
-                                                if (endResult.status !== AcEdPromptStatus.OK)
-                                                    return [2 /*return*/];
-                                                end = endResult.value;
-                                                start2 = toPoint2(start);
-                                                through2 = toPoint2(through);
-                                                end2 = toPoint2(end);
-                                                measured = AcGeCircArc2d.tryCreateByThreePoints(start2, through2, end2);
-                                                if (!measured) {
-                                                    this.showMessage(AcApI18n.t('jig.measureArc.invalidPoints'), 'warning');
-                                                    return [2 /*return*/];
-                                                }
-                                                placeArcMeasurement(view, db, circleGeomFromArc(measured), start2, through2, end2, acapGetCurrentMeasurementStyle(db));
+                                            end = endResult.value;
+                                            start2 = toPoint2(start);
+                                            through2 = toPoint2(through);
+                                            end2 = toPoint2(end);
+                                            measured = AcGeCircArc2d.tryCreateByThreePoints(start2, through2, end2);
+                                            if (!measured) {
+                                                this.showMessage(AcApI18n.t('jig.measureArc.invalidPoints'), 'warning');
                                                 return [2 /*return*/];
-                                        }
-                                    });
-                                }); });
-                            })];
+                                            }
+                                            placeArcMeasurement(view, db, circleGeomFromArc(measured), start2, through2, end2, acapGetCurrentMeasurementStyle(db));
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -661,6 +665,6 @@ var AcApMeasureArcCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMeasureArcCmd;
-}(AcEdCommand));
+}(AcApMeasureDrawCmd));
 export { AcApMeasureArcCmd };
 //# sourceMappingURL=AcApMeasureArcCmd.js.map