@orbat-mapper/tactical-draw 0.2.0-alpha.20 → 0.2.0-alpha.21

package/dist/index.mjs

@@ -2088,6 +2088,34 @@ function boxToHandles(box, fromPixel) {
 	return handles;
 }
 /**
+* The group's outline style: the resolved `boxOutline` plus `[4, 4]` dash so
+* the group reads as dashed per the reference design — unless the host
+* explicitly set their own `strokeDash`, which wins. Shared by
+* `transform-controller.ts` and `graphic-transform-controller.ts` so their
+* group boxes can't drift apart (member outlines stay solid).
+*/
+function groupOutlineStyle(base) {
+	if (base?.strokeDash !== void 0) return base;
+	return {
+		...base ?? {},
+		strokeDash: [4, 4]
+	};
+}
+/**
+* Build the per-member outline features for a group transform — one closed
+* `LineString` per `[memberId, box]` pair, id'd
+* `${handleIdPrefix}:member-outline:{memberId}` and styled with the plain
+* (solid) `boxOutline`. Shared by `transform-controller.ts` and
+* `graphic-transform-controller.ts` so member outlines can't drift between
+* the measures-only and mixed-graphic group transforms — only the group box
+* gets the dashed default (`groupOutlineStyle`).
+*/
+function memberOutlineFeatures(members, fromPixel, handleIdPrefix, style) {
+	const features = [];
+	for (const [memberId, box] of members) features.push(boxOutlineFeature(box, fromPixel, `${handleIdPrefix}:member-outline:${memberId}`, style));
+	return features;
+}
+/**
 * Build the closed `LineString` outline feature for `box`, styled from
 * `style` (delivered per-feature via `properties.style`, as the adapters
 * already honor for line features). `featureId` is the caller's stable id —
@@ -3692,32 +3720,15 @@ function runGroupTransform(opts) {
 		else refitBoxes();
 		renderHandlesLayer();
 	}
-	/**
-	* The group's outline style: the resolved `boxOutline` plus `[4, 4]` dash
-	* so the group reads as dashed per the reference design — unless the host
-	* explicitly set their own `strokeDash`, which wins.
-	*/
-	function groupOutlineStyle() {
-		const base = interactionStyle?.boxOutline;
-		if (base?.strokeDash !== void 0) return base;
-		return {
-			...base ?? {},
-			strokeDash: [4, 4]
-		};
-	}
 	function renderHandlesLayer() {
 		if (ctx.settled) return;
 		const features = [];
 		const liveGroupBox = activeBoxDrag ? activeBoxDrag.lastSnapshot.box : groupBox;
 		if (liveGroupBox) {
-			features.push(boxOutlineFeature(liveGroupBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, groupOutlineStyle()));
+			features.push(boxOutlineFeature(liveGroupBox, dragProjection.fromPixel, `${handleIdPrefix}:box-outline`, groupOutlineStyle(interactionStyle?.boxOutline)));
 			features.push(...toFeatures(boxToHandles(liveGroupBox, dragProjection.fromPixel), handleIdPrefix, interactionStyle));
 		}
-		for (const member of members) {
-			const memberBox = member.box;
-			if (!memberBox) continue;
-			features.push(boxOutlineFeature(memberBox, dragProjection.fromPixel, `${handleIdPrefix}:member-outline:${member.measure.id}`, interactionStyle?.boxOutline));
-		}
+		features.push(...memberOutlineFeatures(members.flatMap((member) => member.box ? [[member.measure.id, member.box]] : []), dragProjection.fromPixel, handleIdPrefix, interactionStyle?.boxOutline));
 		ctx.writeLayer(handlesLayer, features);
 	}
 	/**
@@ -4273,23 +4284,31 @@ function runGraphicTransform(opts) {
 		const features = [];
 		const resources = /* @__PURE__ */ new Map();
 		const pixels = [];
-		for (const graphic of working) if (isPointSymbol(graphic)) {
-			const plan = renderPointSymbolForAdapter(adapter, capability, graphic);
-			resources.set(plan.resource.id, plan.resource);
-			features.push(plan.feature);
-			const footprint = pointSymbolFootprint(graphic, plan.render, adapter);
-			if (footprint) pixels.push(...footprint.corners);
-		} else {
-			const rendered = renderMeasureForAdapter(adapter, graphic, renderOpts);
-			features.push(...rendered.features);
-			for (const feature of rendered.features) {
-				const positions = [];
-				if (feature.geometry) collectFeaturePositions(feature.geometry, positions);
-				for (const position of positions) {
-					const pixel = driver.toPixel(position);
-					if (pixel) pixels.push(pixel);
+		const memberBoxes = [];
+		const angle = drag ? drag.liveBox.angle : boxAngle;
+		for (const graphic of working) {
+			const graphicPixels = [];
+			if (isPointSymbol(graphic)) {
+				const plan = renderPointSymbolForAdapter(adapter, capability, graphic);
+				resources.set(plan.resource.id, plan.resource);
+				features.push(plan.feature);
+				const footprint = pointSymbolFootprint(graphic, plan.render, adapter);
+				if (footprint) graphicPixels.push(...footprint.corners);
+			} else {
+				const rendered = renderMeasureForAdapter(adapter, graphic, renderOpts);
+				features.push(...rendered.features);
+				for (const feature of rendered.features) {
+					const positions = [];
+					if (feature.geometry) collectFeaturePositions(feature.geometry, positions);
+					for (const position of positions) {
+						const pixel = driver.toPixel(position);
+						if (pixel) graphicPixels.push(pixel);
+					}
 				}
 			}
+			pixels.push(...graphicPixels);
+			const memberBox = fitTransformBox(graphicPixels, angle, interactionStyle?.boxPadding);
+			if (memberBox) memberBoxes.push([graphic.id, memberBox]);
 		}
 		adapter.reconcileLayerIconResources(previewLayer, [...resources.values()]);
 		ctx.writeLayer(previewLayer, features);
@@ -4297,9 +4316,10 @@ function runGraphicTransform(opts) {
 		const liveBox = drag?.liveBox ?? box;
 		const handles = [];
 		if (liveBox) {
-			handles.push(boxOutlineFeature(liveBox, (pixel) => driver.fromPixel(pixel), `${handleIdPrefix}:box-outline`, interactionStyle?.boxOutline));
+			handles.push(boxOutlineFeature(liveBox, (pixel) => driver.fromPixel(pixel), `${handleIdPrefix}:box-outline`, groupOutlineStyle(interactionStyle?.boxOutline)));
 			handles.push(...toFeatures(boxToHandles(liveBox, (pixel) => driver.fromPixel(pixel)), handleIdPrefix, interactionStyle));
 		}
+		handles.push(...memberOutlineFeatures(memberBoxes, (pixel) => driver.fromPixel(pixel), handleIdPrefix, interactionStyle?.boxOutline));
 		ctx.writeLayer(handlesLayer, handles);
 	}
 	function anchorPoints(source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.20",
+  "version": "0.2.0-alpha.21",
   "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",