@orbat-mapper/tactical-draw 0.10.1 → 0.11.0

package/dist/index.d.mts

@@ -628,6 +628,12 @@ interface InteractionStyle {
   midpointHandle?: HandleStyle;
   /** Generator-option handle, such as a flared attack shaft's rear-width grip. */
   optionHandle?: HandleStyle;
+  /**
+   * Generator-option handle whose option has no stored value, so it shows a
+   * derived position (e.g. an interpolated vertex width). Falls back to
+   * `optionHandle` when unset.
+   */
+  unsetOptionHandle?: HandleStyle;
   /** Visible grab target for a draggable rendered text label. */
   labelHandle?: HandleStyle;
   scaleHandle?: HandleStyle;
@@ -762,6 +768,13 @@ interface EditSession {
   /** `true` after the first working-copy mutation; back to `false` within tolerance. */
   readonly dirty: boolean;
   readonly modes: readonly EditMode[];
+  /**
+   * Whether reshape mode shows the measure's detail handles: fine-adjustment
+   * option handles such as the per-vertex width grips on arrow shafts.
+   * Initialised from `EditOptions.detailHandles` and mutated by
+   * [[setDetailHandles]].
+   */
+  readonly detailHandles: boolean;
   /**
    * Live size anchor for the measure under edit (ADR-0020). `"ground"` bakes a
    * pixel size to meters on commit; `"screen"` keeps it zoom-aware. Initialised
@@ -790,6 +803,11 @@ interface EditSession {
    * is rejected with `TypeError`.
    */
   setModes(modes: readonly EditMode[]): void;
+  /**
+   * Show or hide the detail handles (see [[detailHandles]]). View state only:
+   * no change event, no history entry. A silent no-op after settlement.
+   */
+  setDetailHandles(visible: boolean): void;
   /** Atomically replace the live working graphic while preserving id and kind. */
   updateGraphic(updater: (graphic: ControlMeasure) => ControlMeasure): void;
   /** Shallow-merge per-measure generator options into the live working copy. */
@@ -1509,6 +1527,13 @@ interface EditOptions {
    * stays screen-anchored throughout the edit.
    */
   sizeAnchor?: SizeAnchor;
+  /**
+   * Show the measure's detail handles in reshape mode: fine-adjustment option
+   * handles such as the left and right width grips beside each arrow-shaft
+   * vertex. Default `false`, which keeps the handle set uncluttered; hosts
+   * typically bind a toggle to [[EditSession.setDetailHandles]].
+   */
+  detailHandles?: boolean;
 }
 /**
  * Options for `TacticalDraw.editMany` — the multi-select group transform

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { DEFAULT_LABEL_HEIGHT_CSS_PIXELS, DEFAULT_SYMBOL_COLOR, FILL_PATTERN_DEFINITIONS, NON_SOLID_FILL_PATTERNS, applyBoxTransformOptions, canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, dragControlMeasureOptionHandle, foldsBoxTransformOptions, freezeOrientationOptions, getControlMeasureMetadata, getControlMeasureOptionHandles, getDefaultOptions, normalizeTextAmplifiers, renderControlMeasure, resolveAmplifierPlacement, resolveSizePair, resolveStyleHints, resolveSymbolColor, roundToFixed, switchSizePairUnit } from "@orbat-mapper/control-measures";
+import { DEFAULT_LABEL_HEIGHT_CSS_PIXELS, DEFAULT_SYMBOL_COLOR, FILL_PATTERN_DEFINITIONS, NON_SOLID_FILL_PATTERNS, applyBoxTransformOptions, canonicalTextAmplifierKey, cloneControlMeasure, controlMeasureIdFromFeature, dragControlMeasureOptionHandle, foldsBoxTransformOptions, freezeOrientationOptions, getControlMeasureMetadata, getControlMeasureOptionHandles, getDefaultOptions, normalizeTextAmplifiers, remapVertexAlignedOptions, renderControlMeasure, resetControlMeasureOptionHandle, resolveAmplifierPlacement, resolveSizePair, resolveStyleHints, resolveSymbolColor, roundToFixed, switchSizePairUnit } from "@orbat-mapper/control-measures";
 function pickPointerType(originalEvent) {
 	if (typeof PointerEvent !== "undefined" && originalEvent instanceof PointerEvent) {
 		if (originalEvent.pointerType === "touch") return "touch";
@@ -3175,7 +3175,8 @@ function handleFeatureId(prefix, kind, index) {
 		case "rotate": return `${prefix}:handle-rotate`;
 	}
 }
-function handleStyleFor(kind, interactionStyle) {
+function handleStyleFor(kind, interactionStyle, unset = false) {
+	if (kind === "option" && unset && interactionStyle?.unsetOptionHandle) return interactionStyle.unsetOptionHandle;
 	switch (kind) {
 		case "vertex": return interactionStyle?.vertexHandle;
 		case "midpoint": return interactionStyle?.midpointHandle;
@@ -3195,7 +3196,7 @@ function handleStyleFor(kind, interactionStyle) {
 */
 function toFeatures(handles, featureIdPrefix, interactionStyle) {
 	return handles.map((handle) => {
-		const style = handleStyleFor(handle.kind, interactionStyle);
+		const style = handleStyleFor(handle.kind, interactionStyle, handle.unset);
 		return {
 			type: "Feature",
 			id: handleFeatureId(featureIdPrefix, handle.kind, handle.index),
@@ -4300,6 +4301,7 @@ function runEdit(opts) {
 		symbolColors
 	};
 	let sizeAnchor = opts.sizeAnchor ?? defaultSizeAnchor(measure);
+	let detailHandles = opts.detailHandles ?? false;
 	const metadata = getControlMeasureMetadata(measure.kind);
 	const rule = metadata.rule;
 	const midpointHandlesEnabled = rule?.canonicalPointCount === void 0;
@@ -4561,14 +4563,15 @@ function runEdit(opts) {
 			closedRing
 		});
 		if (modes.includes("reshape")) {
-			const optionHandles = getControlMeasureOptionHandles(measure.kind, workingPoints, workingOptions);
+			const optionHandles = getControlMeasureOptionHandles(measure.kind, workingPoints, workingOptions, { detail: detailHandles });
 			for (let index = 0; index < optionHandles.length; index++) {
 				const handle = optionHandles[index];
 				handles.push({
 					kind: "option",
 					index,
 					optionId: handle.id,
-					position: [...handle.position]
+					position: [...handle.position],
+					...handle.unset ? { unset: true } : {}
 				});
 			}
 		}
@@ -5012,6 +5015,14 @@ function runEdit(opts) {
 			if (ctx.settled) return;
 			ctx.fail(new TacticalDrawAbortError("session"));
 		},
+		get detailHandles() {
+			return detailHandles;
+		},
+		setDetailHandles(visible) {
+			if (ctx.settled || visible === detailHandles) return;
+			detailHandles = visible;
+			renderHandlesLayer();
+		},
 		setModes(next) {
 			if (ctx.settled) return;
 			const normalised = normaliseModes(next);
@@ -5158,11 +5169,30 @@ function runEdit(opts) {
 		if (ctx.settled) return;
 		const previous = workingPoints.map((p) => [...p]);
 		const spliced = previous.filter((_, i) => i !== index);
-		commitGesture(rule ? rule.transform({
+		const next = rule ? rule.transform({
 			previous,
 			next: spliced,
 			activePointIndex: index
-		}) : spliced);
+		}) : spliced;
+		const preGestureOptions = workingOptions;
+		followVertexChange({
+			type: "delete",
+			index
+		});
+		commitGesture(next, preGestureOptions);
+	}
+	/**
+	* Keep the measure's vertex-aligned options (e.g. `vertexLeftWidthRatios`) in
+	* step with a vertex insert or delete, replacing `workingOptions`
+	* with the patched copy. The caller commits with the pre-change options
+	* snapshot so one change event and one undo step cover points and options.
+	*/
+	function followVertexChange(change) {
+		const patch = remapVertexAlignedOptions(measure.kind, workingOptions, change);
+		if (Object.keys(patch).length > 0) workingOptions = {
+			...workingOptions ?? {},
+			...patch
+		};
 	}
 	const onDriverDown = (pixel, info) => {
 		if (ctx.settled || dragInFlight) return;
@@ -5186,10 +5216,18 @@ function runEdit(opts) {
 				shell.suppressNextClickAway();
 				return;
 			}
+			if (hit.kind === "option" && hit.optionId && info?.altKey) {
+				const patch = resetControlMeasureOptionHandle(measure.kind, workingPoints, workingOptions, hit.optionId);
+				if (patch) {
+					setOptions(patch, "gesture", "Reset option handle");
+					shell.suppressNextClickAway();
+					return;
+				}
+			}
 			if (hit.kind === "option" && hit.optionId) {
 				activeOptionDrag = {
 					handleId: hit.optionId,
-					preDragOptions: { ...workingOptions ?? {} },
+					preDragOptions: workingOptions,
 					preDragNonGeometryDirty: nonGeometryDirty
 				};
 				emitTransient("start", workingPoints, null);
@@ -5208,10 +5246,15 @@ function runEdit(opts) {
 			activeDrag = {
 				fsm,
 				preDragPoints,
+				preDragOptions: workingOptions,
 				controlPointIndex: hit.kind === "midpoint" ? hit.index + 1 : hit.index
 			};
 			emitTransient("start", fsm.kind === "midpoint" ? initialPoints : preDragPoints, activeDrag.controlPointIndex);
 			if (fsm.kind === "midpoint") {
+				followVertexChange({
+					type: "insert",
+					index: hit.index + 1
+				});
 				workingPoints.splice(0, workingPoints.length, ...initialPoints);
 				renderWorkingGraphic();
 				renderHandlesLayer();
@@ -5386,13 +5429,13 @@ function runEdit(opts) {
 				driver.setDragPanEnabled(true);
 				return;
 			}
-			const { fsm, preDragPoints, controlPointIndex } = activeDrag;
+			const { fsm, preDragPoints, preDragOptions, controlPointIndex } = activeDrag;
 			activeDrag = null;
 			driver.setDragPanEnabled(true);
 			const next = fsm.end(snappedPixel(pixel, info, "reshape", controlPointIndex), { constrainAngles: info?.shiftKey });
 			emitTransient("end", next, controlPointIndex);
 			replaceWorkingPoints(preDragPoints);
-			commitGesture(next);
+			commitGesture(next, preDragOptions);
 			return;
 		}
 		if (activeBoxDrag) {
@@ -8492,6 +8535,7 @@ var TacticalDraw = class {
 			handleIdPrefix,
 			guide: options?.guide,
 			sizeAnchor: options?.sizeAnchor,
+			detailHandles: options?.detailHandles,
 			settleToGraphics,
 			publishWorkingGraphic: (graphic, features) => this.publishWorkingGraphics([{
 				id: graphic.id,
@@ -8973,6 +9017,12 @@ const BUILT_IN_INTERACTION_STYLE = {
 		strokeColor: "#ffffff",
 		strokeWidth: 2
 	},
+	unsetOptionHandle: {
+		pointRadius: 5,
+		fillColor: "#ffffff",
+		strokeColor: "#f59e0b",
+		strokeWidth: 2
+	},
 	labelHandle: {
 		pointRadius: 6,
 		fillColor: "#7c3aed",
@@ -8996,6 +9046,7 @@ const HANDLE_SLOTS = [
 	"vertexHandle",
 	"midpointHandle",
 	"optionHandle",
+	"unsetOptionHandle",
 	"labelHandle",
 	"scaleHandle",
 	"rotateHandle"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "description": "Engine-agnostic draw/edit core for tactical control measures (MIL-STD-2525 / APP-6). The MapAdapter ABI and bring-your-own-engine entry point for the tactical-draw package family.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.27.0"
+    "@orbat-mapper/control-measures": "^0.29.0"
   },
   "peerDependencies": {
     "vitest": ">=4.0.0"