@orbat-mapper/tactical-draw 0.14.1 → 0.15.1

package/dist/index.d.mts

@@ -699,6 +699,8 @@ interface InteractionStyle {
    * `optionHandle` when unset.
    */
   unsetOptionHandle?: HandleStyle;
+  /** Draw-rule handle that reshapes control points without being one, such as Sector's rotate grip. */
+  geometryHandle?: HandleStyle;
   /** Visible grab target for a draggable rendered text label. */
   labelHandle?: HandleStyle;
   scaleHandle?: HandleStyle;

package/dist/index.mjs

@@ -2635,13 +2635,14 @@ function runFixedLengthDraw(options) {
 			return;
 		}
 		const previewThreshold = rule?.minimumPreviewPoints ?? required;
-		const features = buildPreviewFeatures$1(adapter, kind, rule && raw.length >= previewThreshold ? rule.derive(raw) : raw, measureOptions, measureStyle, measureTextAmplifiers, renderOpts);
+		const points = rule && raw.length >= previewThreshold ? rule.derive(raw) : raw;
+		const features = buildPreviewFeatures$1(adapter, kind, points, measureOptions, measureStyle, measureTextAmplifiers, renderOpts);
 		ctx.writeLayer(previewLayer, [{
 			id: PREVIEW_CM_ID$1,
 			features,
 			iconResources: []
 		}]);
-		const guidePoints = rule?.guidePoints ? rule.guidePoints(raw) : raw;
+		const guidePoints = rule?.guidePoints ? rule.guidePoints(points) : raw;
 		const guideFeatures = guideEnabled ? buildGuideFeatures(guidePoints, isAreaKind) : [];
 		ctx.writeLayer(guideLayer, [{
 			id: GUIDE_GROUP_ID,
@@ -3285,6 +3286,7 @@ function handleFeatureId(prefix, kind, index) {
 		case "vertex": return `${prefix}:handle-vertex:${index}`;
 		case "midpoint": return `${prefix}:handle-midpoint:${index}`;
 		case "option": return `${prefix}:handle-option:${index}`;
+		case "geometry": return `${prefix}:handle-geometry:${index}`;
 		case "scale": return `${prefix}:handle-scale:${index}`;
 		case "rotate": return `${prefix}:handle-rotate`;
 	}
@@ -3295,6 +3297,7 @@ function handleStyleFor(kind, interactionStyle, unset = false) {
 		case "vertex": return interactionStyle?.vertexHandle;
 		case "midpoint": return interactionStyle?.midpointHandle;
 		case "option": return interactionStyle?.optionHandle;
+		case "geometry": return interactionStyle?.geometryHandle;
 		case "scale": return interactionStyle?.scaleHandle;
 		case "rotate": return interactionStyle?.rotateHandle;
 	}
@@ -3436,6 +3439,17 @@ function beginHandleDrag(args) {
 		return move;
 	};
 	if (hit.kind === "vertex") return begun("vertex", preDragPoints, dragOnePoint(preDragPoints, hit.index));
+	if (hit.kind === "geometry") {
+		const geometryHandles = rule?.geometryHandles;
+		const handleId = hit.geometryId;
+		if (!geometryHandles || handleId === void 0) throw new TypeError("A geometry handle drag needs a rule with geometryHandles");
+		return begun("geometry", preDragPoints, (pixel, modifiers) => ({ points: geometryHandles.drag({
+			previous: preDragPoints,
+			handleId,
+			position: fromPixel(pixel),
+			constrainAngles: modifiers?.constrainAngles
+		}) }));
+	}
 	if (hit.kind !== "midpoint") throw new TypeError(`Unsupported control-point handle kind: ${hit.kind}`);
 	const insertIndex = hit.index + 1;
 	const segmentEndIndex = (hit.index + 1) % preDragPoints.length;
@@ -4671,6 +4685,13 @@ function runEdit(opts) {
 			closedRing
 		});
 		if (modes.includes("reshape")) {
+			const geometryHandles = rule?.geometryHandles?.get(workingPoints) ?? [];
+			handles.push(...geometryHandles.map((handle, index) => ({
+				kind: "geometry",
+				index,
+				geometryId: handle.id,
+				position: [...handle.position]
+			})));
 			const optionHandles = getControlMeasureOptionHandles(measure.kind, workingPoints, workingOptions, {
 				detail: detailHandles,
 				...optionHandleContext()
@@ -5217,7 +5238,7 @@ function runEdit(opts) {
 			pixel,
 			interaction,
 			graphicId: measure.id,
-			controlPointIndex,
+			controlPointIndex: controlPointIndex ?? void 0,
 			originalEvent: info?.native
 		})?.pixel ?? pixel;
 	}
@@ -5359,7 +5380,7 @@ function runEdit(opts) {
 				fsm,
 				preDragPoints,
 				preDragOptions: workingOptions,
-				controlPointIndex: hit.kind === "midpoint" ? hit.index + 1 : hit.index
+				controlPointIndex: hit.kind === "geometry" ? null : hit.kind === "midpoint" ? hit.index + 1 : hit.index
 			};
 			emitTransient("start", fsm.kind === "midpoint" ? initialPoints : preDragPoints, activeDrag.controlPointIndex);
 			if (fsm.kind === "midpoint") {
@@ -6225,6 +6246,7 @@ function runGroupTransform(opts) {
 				optionsOverride: null,
 				box: null,
 				lastBoxPixels: [],
+				lastFeatures: [],
 				usesGraphicStack: isOnGraphicsLayer(graphic.id)
 			};
 		}
@@ -6241,6 +6263,7 @@ function runGroupTransform(opts) {
 			optionsOverride: null,
 			box: null,
 			lastBoxPixels: [],
+			lastFeatures: [],
 			usesGraphicStack: isOnGraphicsLayer(graphic.id)
 		};
 	}
@@ -6418,6 +6441,15 @@ function runGroupTransform(opts) {
 		return box ? boxCorners(box) : null;
 	}
 	/**
+	* The pixels a measure member's box is fitted from. A Text member renders a
+	* single Point; use its rotated-text footprint corners so the group box grows
+	* to contain the text extent (else the lone Point contributes a degenerate,
+	* unscalable box).
+	*/
+	function measureBoxPixels(kind, features) {
+		return (kind === "text" ? textFootprintCorners(features) : null) ?? pixelsFromFeatures(features);
+	}
+	/**
 	* Fold a box gesture's delta (`box` vs the pre-drag box) into each measure
 	* member that persists orientation/size as options (e.g. Text), off the
 	* per-member `baseOverrides` so live ticks recompute rather than compound.
@@ -6524,13 +6556,14 @@ function runGroupTransform(opts) {
 				} else {
 					const working = workingGraphicFor(i);
 					features = renderMeasureForAdapter(adapter, working, renderOpts).features;
-					boxPixels = (working.kind === "text" ? textFootprintCorners(features) : null) ?? pixelsFromFeatures(features);
+					boxPixels = measureBoxPixels(working.kind, features);
 				}
 			} catch {
 				features = [];
 				boxPixels = [];
 			}
 			member.lastBoxPixels = boxPixels;
+			member.lastFeatures = features;
 			(member.usesGraphicStack ? workingGroups : previewGroups).push({
 				id: member.graphic.id,
 				features,
@@ -6546,7 +6579,10 @@ function runGroupTransform(opts) {
 	function rescaleOnViewChange() {
 		if (ctx.settled) return;
 		if (members.some((m) => isAnchoredMember(m) || measureRendersFromViewState(m.graphic))) renderAllPreviews();
-		else refitBoxes();
+		else {
+			for (const member of members) member.lastBoxPixels = measureBoxPixels(member.graphic.kind, member.lastFeatures);
+			refitBoxes();
+		}
 		renderHandlesLayer();
 	}
 	function renderHandlesLayer() {
@@ -9812,6 +9848,12 @@ const BUILT_IN_INTERACTION_STYLE = {
 		strokeColor: "#f59e0b",
 		strokeWidth: 2
 	},
+	geometryHandle: {
+		pointRadius: 5,
+		fillColor: "#ffffff",
+		strokeColor: "#4f7cff",
+		strokeWidth: 2
+	},
 	labelHandle: {
 		pointRadius: 6,
 		fillColor: "#7c3aed",
@@ -9836,6 +9878,7 @@ const HANDLE_SLOTS = [
 	"midpointHandle",
 	"optionHandle",
 	"unsetOptionHandle",
+	"geometryHandle",
 	"labelHandle",
 	"scaleHandle",
 	"rotateHandle"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.14.1",
+  "version": "0.15.1",
   "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.33.0"
+    "@orbat-mapper/control-measures": "^0.34.0"
   },
   "peerDependencies": {
     "vitest": ">=4.0.0"