@mlightcad/cad-simple-viewer 1.6.0 → 1.6.2

package/lib/command/draw/AcApCircleCmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApCircleCmd.d.ts","sourceRoot":"","sources":["../../../src/command/draw/AcApCircleCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,eAAe,EAEhB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvD,OAAO,EACL,YAAY,EACZ,WAAW,EAEX,cAAc,EAQf,MAAM,cAAc,CAAA;AAqGrB;;GAEG;AACH,qBAAa,aAAc,SAAQ,cAAc,CAAC,MAAM,CAAC;IACvD;;OAEG;IACH,OAAO,CAAC,OAAO,CAAY;IAE3B;;;;OAIG;gBACS,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe;IAKvD;;OAEG;IACH,IAAI,MAAM,IAAI,UAAU,CAEvB;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM;CAGtB;AAmDD;;GAEG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C;;OAEG;;IAMH;;;;;;;OAOG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;IAwUlC;;;;;;;OAOG;YACW,aAAa;IAwB3B;;;;;;OAMG;YACW,oBAAoB;IAmBlC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;CAO9B"}
+{"version":3,"file":"AcApCircleCmd.d.ts","sourceRoot":"","sources":["../../../src/command/draw/AcApCircleCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,eAAe,EAChB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvD,OAAO,EACL,YAAY,EACZ,WAAW,EAEX,cAAc,EAQf,MAAM,cAAc,CAAA;AAwErB;;GAEG;AACH,qBAAa,aAAc,SAAQ,cAAc,CAAC,MAAM,CAAC;IACvD;;OAEG;IACH,OAAO,CAAC,OAAO,CAAY;IAE3B;;;;OAIG;gBACS,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe;IAKvD;;OAEG;IACH,IAAI,MAAM,IAAI,UAAU,CAEvB;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM;CAGtB;AAmDD;;GAEG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C;;OAEG;;IAMH;;;;;;;OAOG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;IAwUlC;;;;;;;OAOG;YACW,aAAa;IAwB3B;;;;;;OAMG;YACW,oBAAoB;IAmBlC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;CAO9B"}

package/lib/command/draw/AcApCircleCmd.js

@@ -49,7 +49,7 @@ 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 { AcDbCircle, AcGePoint3d, AcGeTol } from '@mlightcad/data-model';
+import { AcDbCircle, AcGeCircArc2d, AcGePoint3d } from '@mlightcad/data-model';
 import { AcApDocManager } from '../../app';
 import { AcEdCommand, AcEdOpenMode, AcEdPreviewJig, AcEdPromptDistanceOptions, AcEdPromptPointOptions, AcEdPromptStateMachine, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
@@ -66,54 +66,22 @@ function applyCircleDefinition(entity, definition) {
     entity.center = definition.center;
     entity.radius = definition.radius;
 }
-function createCircleFromCenterRadius(center, radius) {
-    if (!Number.isFinite(radius) || AcGeTol.isNonPositive(radius))
+function toCircleDefinition(arc) {
+    if (!arc)
         return undefined;
     return {
-        center: { x: center.x, y: center.y, z: 0 },
-        radius: radius
+        center: { x: arc.center.x, y: arc.center.y, z: 0 },
+        radius: arc.radius
     };
 }
+function createCircleFromCenterRadius(center, radius) {
+    return toCircleDefinition(AcGeCircArc2d.tryCreateCircle(center, radius));
+}
 function createCircleFromTwoPoints(first, second) {
-    var dx = second.x - first.x;
-    var dy = second.y - first.y;
-    var diameter = Math.hypot(dx, dy);
-    if (AcGeTol.isNonPositive(diameter))
-        return undefined;
-    return {
-        center: {
-            x: (first.x + second.x) / 2,
-            y: (first.y + second.y) / 2,
-            z: 0
-        },
-        radius: diameter / 2
-    };
+    return toCircleDefinition(AcGeCircArc2d.tryCreateCircleByDiameter(first, second));
 }
 function createCircleFromThreePoints(p1, p2, p3) {
-    var x1 = p1.x;
-    var y1 = p1.y;
-    var x2 = p2.x;
-    var y2 = p2.y;
-    var x3 = p3.x;
-    var y3 = p3.y;
-    var d = 2 * (x1 * (y2 - y3) + x2 * (y3 - y1) + x3 * (y1 - y2));
-    if (AcGeTol.equalToZero(d))
-        return undefined;
-    var ux = ((x1 * x1 + y1 * y1) * (y2 - y3) +
-        (x2 * x2 + y2 * y2) * (y3 - y1) +
-        (x3 * x3 + y3 * y3) * (y1 - y2)) /
-        d;
-    var uy = ((x1 * x1 + y1 * y1) * (x3 - x2) +
-        (x2 * x2 + y2 * y2) * (x1 - x3) +
-        (x3 * x3 + y3 * y3) * (x2 - x1)) /
-        d;
-    var radius = Math.hypot(ux - x1, uy - y1);
-    if (!Number.isFinite(radius) || AcGeTol.isNonPositive(radius))
-        return undefined;
-    return {
-        center: { x: ux, y: uy, z: 0 },
-        radius: radius
-    };
+    return toCircleDefinition(AcGeCircArc2d.tryCreateCircleByThreePoints(p1, p2, p3));
 }
 /**
  * Dynamic radius preview jig used by center-based circle workflows.

package/lib/command/draw/AcApCircleCmd.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupTextCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupTextCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EACL,WAAW,EAGZ,MAAM,cAAc,CAAA;AAcrB;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;IAM1C,OAAO,CAAC,OAAO,EAAE,WAAW;CA4CnC"}
+{"version":3,"file":"AcApMarkupTextCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupTextCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EACL,WAAW,EAGZ,MAAM,cAAc,CAAA;AAkBrB;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;IAM1C,OAAO,CAAC,OAAO,EAAE,WAAW;CAmDnC"}

package/lib/command/markup/AcApMarkupTextCmd.js

@@ -66,7 +66,7 @@ import { AcApI18n } from '../../i18n';
 import { configureMarkupCommand, createMarkupMeta, promptMarkupCapsuleText, withMarkupInput } from './AcApMarkupCmdUtil';
 import { commitMarkup } from './AcApMarkupPresenter';
 import { MARKUP_LIVE_LAYER } from './AcApMarkupStore';
-import { defaultMarkupColor, getMarkupFontSize } from './AcApMarkupUtil';
+import { defaultMarkupColor, getMarkupFontSize, subscribeMarkupDrawStyle } from './AcApMarkupUtil';
 /**
  * Place a text markup label at a picked world point.
  */
@@ -83,7 +83,7 @@ var AcApMarkupTextCmd = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
-                            var pointPrompt, pointResult, position, view, badgeId, badge, text, meta, record;
+                            var pointPrompt, pointResult, position, view, badgeId, badge, unsubDrawStyle, text, meta, record;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -107,6 +107,11 @@ var AcApMarkupTextCmd = /** @class */ (function (_super) {
                                         });
                                         view.htmlTransientManager.add(badge);
                                         view.isHtmlDirty = true;
+                                        unsubDrawStyle = subscribeMarkupDrawStyle(function () {
+                                            badge.setColor(defaultMarkupColor());
+                                            badge.setFontSize(getMarkupFontSize());
+                                            view.isHtmlDirty = true;
+                                        });
                                         text = 'Note';
                                         _a.label = 2;
                                     case 2:
@@ -117,6 +122,7 @@ var AcApMarkupTextCmd = /** @class */ (function (_super) {
                                             (_a.sent()) || 'Note';
                                         return [3 /*break*/, 5];
                                     case 4:
+                                        unsubDrawStyle();
                                         view.htmlTransientManager.remove(badgeId);
                                         view.isHtmlDirty = true;
                                         return [7 /*endfinally*/];

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupTextEdit.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupTextEdit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAI5C;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,2DAA2D;IAC3D,IAAI,EAAE,UAAU,CAAA;IAChB,mDAAmD;IACnD,EAAE,EAAE,WAAW,CAAA;IACf;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,mDAAmD;IACnD,EAAE,EAAE,WAAW,CAAA;IACf;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,sEAAsE;IACtE,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAmBD;;;;;GAKG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAiDD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EACzD,IAAI,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAOT;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgG7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,+BAA+B,GACvC,MAAM,IAAI,CAwDZ"}
+{"version":3,"file":"AcApMarkupTextEdit.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupTextEdit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAI5C;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,2DAA2D;IAC3D,IAAI,EAAE,UAAU,CAAA;IAChB,mDAAmD;IACnD,EAAE,EAAE,WAAW,CAAA;IACf;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,mDAAmD;IACnD,EAAE,EAAE,WAAW,CAAA;IACf;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;IACtB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,8EAA8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,sEAAsE;IACtE,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAmBD;;;;;GAKG;AACH,wBAAgB,uBAAuB,IAAI,OAAO,CAEjD;AAoDD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EACzD,IAAI,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GACxC,OAAO,CAOT;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkG7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,+BAA+B,GACvC,MAAM,IAAI,CAwDZ"}

package/lib/command/markup/AcApMarkupTextEdit.js

@@ -30,7 +30,7 @@ function ensureStyles() {
         return;
     var style = document.createElement('style');
     style.id = STYLE_ID;
-    style.textContent = "\n    .ml-html-text-editing {\n      outline: 1px solid var(--ml-ui-accent, #409eff);\n      outline-offset: 1px;\n      cursor: text !important;\n      user-select: text;\n      pointer-events: auto;\n      min-height: 1.2em;\n    }\n  ";
+    style.textContent = "\n    .ml-html-text-editing,\n    .ml-html-text-editing:focus,\n    .ml-html-selected.ml-html-text-editing {\n      outline: none !important;\n      outline-offset: 0;\n      box-shadow: var(--ml-ui-shadow, 0 1px 4px rgba(0, 0, 0, 0.2));\n      cursor: text !important;\n      user-select: text;\n      pointer-events: auto;\n      min-height: 1.2em;\n    }\n  ";
     document.head.appendChild(style);
 }
 /**
@@ -106,6 +106,7 @@ export function editMarkupHtmlText(options) {
         el.style.pointerEvents = 'auto';
         el.textContent = original;
         el.classList.add(EDITING_CLASS);
+        listenOn.classList.add(EDITING_CLASS);
         el.tabIndex = 0;
         enablePlaintext(el);
         var settled = false;
@@ -114,6 +115,7 @@ export function editMarkupHtmlText(options) {
             var _a;
             (_a = options.signal) === null || _a === void 0 ? void 0 : _a.removeEventListener('abort', onAbort);
             el.classList.remove(EDITING_CLASS);
+            listenOn.classList.remove(EDITING_CLASS);
             el.removeAttribute('contenteditable');
             el.removeAttribute('tabindex');
             listenOn.removeEventListener('pointerdown', onPointerDown, true);

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupUtil.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,YAAY,EAGZ,cAAc,EACf,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,0EAA0E;AAC1E,wBAAgB,wBAAwB,IAAI,SAAS,CAEpD;AAED,2DAA2D;AAC3D,eAAO,MAAM,kBAAkB,+BAA+B,CAAA;AAE9D,4EAA4E;AAC5E,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAiBlC,yEAAyE;AACzE,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAKzE;AAED,kEAAkE;AAClE,wBAAgB,kBAAkB,IAAI,SAAS,CAE9C;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,IAAI,cAAc,CAEpD;AAED,2EAA2E;AAC3E,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,6EAA6E;AAC7E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAGzD;AAED,kDAAkD;AAClD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIpE;AAED,yDAAyD;AACzD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAIxD;AAED,oEAAoE;AACpE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAI7E;AAED,iEAAiE;AACjE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAEzD;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAQvD;AAED,yFAAyF;AACzF,wBAAgB,kBAAkB,IAAI,eAAe,CAMpD;AAED,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,MAAM,SAAW,GAAG,MAAM,CAKxD;AAED,gDAAgD;AAChD,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,GAAG,MAAM,CAMxD"}
+{"version":3,"file":"AcApMarkupUtil.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,YAAY,EAGZ,cAAc,EACf,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,0EAA0E;AAC1E,wBAAgB,wBAAwB,IAAI,SAAS,CAEpD;AAED,2DAA2D;AAC3D,eAAO,MAAM,kBAAkB,+BAA+B,CAAA;AAE9D,4EAA4E;AAC5E,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAiBlC,yEAAyE;AACzE,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAKzE;AAED,kEAAkE;AAClE,wBAAgB,kBAAkB,IAAI,SAAS,CAE9C;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,IAAI,cAAc,CAEpD;AAED,2EAA2E;AAC3E,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,6EAA6E;AAC7E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAGzD;AAED,kDAAkD;AAClD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIpE;AAED,yDAAyD;AACzD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAIxD;AAED,oEAAoE;AACpE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAI7E;AAED,iEAAiE;AACjE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAEzD;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAQvD;AAED,yFAAyF;AACzF,wBAAgB,kBAAkB,IAAI,eAAe,CAMpD;AAED,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,MAAM,SAAW,GAAG,MAAM,CAKxD;AAED,gDAAgD;AAChD,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,GAAG,MAAM,CAMxD"}

package/lib/command/markup/AcApMarkupUtil.js

@@ -10,6 +10,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { AcCmColor, AcCmColorMethod, AcDbSystemVariables, AcDbSysVarManager, AcGiLineWeight } from '@mlightcad/data-model';
+import { preferExactAciColor } from '../../util/AcApCssColor';
 /** Factory default markup color (ACI red) used to seed the draw style. */
 export function createDefaultMarkupColor() {
     return new AcCmColor(AcCmColorMethod.ByACI, 1);
@@ -95,9 +96,9 @@ export function markupColorToCss(color) {
 export function cssToMarkupColor(css) {
     var fromString = AcCmColor.fromString(css);
     if (fromString)
-        return fromString;
+        return preferExactAciColor(fromString);
     try {
-        return new AcCmColor().setRGBFromCss(css);
+        return preferExactAciColor(new AcCmColor().setRGBFromCss(css));
     }
     catch (_a) {
         return createDefaultMarkupColor();

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

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

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

@@ -3,43 +3,40 @@ import { AcApContext } from '../../app';
 import { AcEdCommand } from '../../editor';
 import { type AcApMeasurementStyle } from '../../util';
 import { AcTrView2d } from '../../view';
+import { type AcApMeasureCircleGeom } from './entity';
+type Point2 = {
+    x: number;
+    y: number;
+};
 /**
  * Commit an arc-length measurement overlay (also used when importing a sidecar).
  */
-export declare function placeArcMeasurement(view: AcTrView2d, db: AcDbDatabase, geom: {
-    cx: number;
-    cy: number;
-    r: number;
-}, start: {
-    x: number;
-    y: number;
-}, end: {
-    x: number;
-    y: number;
-}, style: AcApMeasurementStyle, options?: {
+export declare function placeArcMeasurement(view: AcTrView2d, db: AcDbDatabase, geom: AcApMeasureCircleGeom, start: Point2, through: Point2 | undefined, end: Point2, style: AcApMeasurementStyle, options?: {
     id?: string;
     layoutId?: string;
 }): void;
 /**
- * Command that measures the length of an arc on an existing circle or arc entity.
- *
- * Uses a two-phase pick flow that mirrors AutoCAD's arc-length measurement:
- *
- * 1. **Phase 1 — entity snap**: The user hovers over a circle or arc in the
- *    drawing. A square snap indicator appears on the circumference and the
- *    entity geometry is captured. Clicking confirms the start point.
+ * Command that measures arc length.
  *
- * 2. **Phase 2 — end point**: The same square indicator follows the cursor,
- *    always locked to the captured circle. A canvas overlay draws the shorter
- *    arc between the start and current position in real time, together with a
- *    live badge showing the arc length.
+ * If the first pick lands on a CIRCLE, ARC, or polyline bulge, subsequent
+ * picks lock onto that circumference (two-point sweep). Sweep direction
+ * follows the first mouse movement so arcs greater than 180 degrees stay on
+ * the same side; Ctrl flips to the complementary (major/minor) arc. Otherwise
+ * three world points (start, a point on the arc, end) define a free-form arc.
  *
- * Persistent overlays are placed via {@link AcTrHtmlTransientManager} for dots
- * and badge. The arc canvas is managed with a viewChanged listener cleaned up
- * via {@link commitMeasurementGroup}.
+ * Interactive preview is HTML-only. The committed overlay is placed via
+ * {@link placeArcMeasurement}.
  */
 export declare class AcApMeasureArcCmd extends AcEdCommand {
     constructor();
     execute(context: AcApContext): Promise<void>;
+    /**
+     * Two-point locked-arc flow after the start pick landed on a CIRCLE, ARC,
+     * or polyline bulge.
+     *
+     * Sweep direction follows the cursor; Ctrl toggles the complementary arc.
+     */
+    private commitLockedArc;
 }
+export {};
 //# sourceMappingURL=AcApMeasureArcCmd.d.ts.map

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,EAIL,YAAY,EAEb,MAAM,uBAAuB,CAAA;AAS9B,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAOZ,MAAM,cAAc,CAAA;AAErB,OAAO,EAKL,KAAK,oBAAoB,EAE1B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AA+GvC;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3C,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/B,GAAG,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7B,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,IAAI,CAKN;AA+JD;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;IAM1C,OAAO,CAAC,OAAO,EAAE,WAAW;CAqJnC"}
+{"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"}