floor-editor-ts 1.4.7 → 1.4.9

package/dist/floor-editor.es.js

@@ -11309,10 +11309,9 @@ function drawZoneShape(cs, zone, selected) {
 		ctx.fillStyle = color;
 		ctx.fillText(zone.name, bx + 6, by + 4);
 	}
-	const r = selected ? 9 : 7;
-	for (let i = 0; i < pts.length; i++) {
+	if (selected) for (let i = 0; i < pts.length; i++) {
 		const s = wts(cs, pts[i].x, pts[i].y);
-		drawVertexIndexBadge(ctx, s.x, s.y, i, color, r);
+		drawVertexIndexBadge(ctx, s.x, s.y, i, color, 9);
 	}
 	ctx.restore();
 }
@@ -11911,6 +11910,11 @@ function emitCameraMappingChanged(data) {
 	if (!((_data$serial = data.serial) === null || _data$serial === void 0 ? void 0 : _data$serial.trim())) return;
 	emitFloorCallback("cameraMappingChanged", data);
 }
+function emitCameraFloorClicked(serial) {
+	const s = serial === null || serial === void 0 ? void 0 : serial.trim();
+	if (!s) return;
+	emitFloorCallback("cameraFloorClicked", { serial: s });
+}
 function cameraItemToCallbackProps(item) {
 	var _item$props, _ref, _item$name, _item$props2;
 	if (!item.serial) return null;
@@ -63830,7 +63834,7 @@ function CameraFovEditor($$anchor, $$props) {
 				ctx.setLineDash([]);
 				ctx.globalAlpha = 1;
 			}
-			for (let i = 0; i < placed.length; i++) drawVertexIndexBadge(ctx, placed[i].x * s, placed[i].y * s, i, color, 10);
+			if (get(editing) || get(polySelected)) for (let i = 0; i < placed.length; i++) drawVertexIndexBadge(ctx, placed[i].x * s, placed[i].y * s, i, color, 10);
 			ctx.restore();
 		}
 	}
@@ -66766,6 +66770,8 @@ function FloorPlanCanvas($$anchor, $$props) {
 	*/
 	let fovSelectionOnly = /* @__PURE__ */ state(false);
 	let draggingFovVertex = /* @__PURE__ */ state(null);
+	/** Body-drag anchor (world) — same idea as zoneDragLast */
+	let fovDragLast = /* @__PURE__ */ state(null);
 	let editingTextAnnotationId = /* @__PURE__ */ state(null);
 	let editingTextAnnotationPos = /* @__PURE__ */ state(proxy({
 		x: 0,
@@ -67245,12 +67251,12 @@ function FloorPlanCanvas($$anchor, $$props) {
 			if (!mapStr) continue;
 			const pts = mapCoordinatesToWorldPoints(mapStr, bounds);
 			if (pts.length < 2) continue;
-			const isActive = get(selectedFovSerial) === fi.serial || (active === null || active === void 0 ? void 0 : active.id) === fi.id;
+			const isActive = get(selectedFovSerial) === fi.serial || get(currentSelectedId) === fi.id;
 			const color = ((_fi$props3 = fi.props) === null || _fi$props3 === void 0 ? void 0 : _fi$props3.zoneColor) || fi.color || "#22c55e";
 			ctx.save();
 			ctx.strokeStyle = color;
 			ctx.fillStyle = color;
-			ctx.globalAlpha = isActive ? .22 : .12;
+			ctx.globalAlpha = isActive ? .28 : $$props.viewOnly ? .22 : .16;
 			ctx.lineWidth = isActive ? 2.5 : 1.5;
 			ctx.setLineDash(isActive ? [] : [6, 4]);
 			ctx.beginPath();
@@ -67265,9 +67271,9 @@ function FloorPlanCanvas($$anchor, $$props) {
 			ctx.globalAlpha = 1;
 			ctx.stroke();
 			ctx.setLineDash([]);
-			for (let i = 0; i < pts.length; i++) {
+			if (isActive && !$$props.viewOnly) for (let i = 0; i < pts.length; i++) {
 				const s = worldToScreen(pts[i].x, pts[i].y);
-				drawVertexIndexBadge(ctx, s.x, s.y, i, color, isActive ? 9 : 7);
+				drawVertexIndexBadge(ctx, s.x, s.y, i, color, 9);
 			}
 			ctx.restore();
 		}
@@ -67986,7 +67992,7 @@ function FloorPlanCanvas($$anchor, $$props) {
 			else zoomToFit();
 			needsFitToCanvas = false;
 		}
-		if (get(wallStart) || get(draggingFurnitureId) || get(draggingDoorId) || get(draggingWindowId) || get(draggingStairId) || get(draggingColumnId) || get(draggingWallEndpoint) || get(draggingWallParallel) || get(draggingCurveHandle) || get(draggingHandle) || get(draggingMultiSelect) || get(draggingRoomId) || get(draggingRoomLabelId) || get(draggingTextAnnotationId) || get(draggingGuideId) || get(draggingZoneId) || get(draggingFovVertex) != null || get(zoneRectDragStart) || get(zonePolyDraft).length > 0 || get(fovPolyDraft).length > 0 || get(currentTool) === "cameraFov" || get(measuring) || get(annotating) || get(currentPlacingId) || get(isPlacingStair) || get(isPlacingColumn) || get(marqueeStart) || get(isPanning)) canvasDirty = true;
+		if (get(wallStart) || get(draggingFurnitureId) || get(draggingDoorId) || get(draggingWindowId) || get(draggingStairId) || get(draggingColumnId) || get(draggingWallEndpoint) || get(draggingWallParallel) || get(draggingCurveHandle) || get(draggingHandle) || get(draggingMultiSelect) || get(draggingRoomId) || get(draggingRoomLabelId) || get(draggingTextAnnotationId) || get(draggingGuideId) || get(draggingZoneId) || get(draggingFovVertex) != null || get(fovDragLast) || get(zoneRectDragStart) || get(zonePolyDraft).length > 0 || get(fovPolyDraft).length > 0 || get(currentTool) === "cameraFov" || get(measuring) || get(annotating) || get(currentPlacingId) || get(isPlacingStair) || get(isPlacingColumn) || get(marqueeStart) || get(isPanning)) canvasDirty = true;
 		updateDetectedRooms();
 		const selId = get(currentSelectedId);
 		const multiIds = get(currentSelectedIds);
@@ -69091,9 +69097,31 @@ function FloorPlanCanvas($$anchor, $$props) {
 			return;
 		}
 		if (tool === "select") {
-			const objectAboveZone = get(showFurniture) && (!!findFurnitureAt$1(wp) || !!findHandleAt$1(wp)) || get(layerVis).columns && !!findColumnAt$1(wp) || get(showStairs) && !!findStairAt$1(wp);
-			if (!objectAboveZone) {
+			const objectAbove = get(showFurniture) && (!!findFurnitureAt$1(wp) || !!findHandleAt$1(wp)) || get(layerVis).columns && !!findColumnAt$1(wp) || get(showStairs) && !!findStairAt$1(wp);
+			if (!objectAbove) {
 				var _$$get9;
+				const fovHit = findFovCameraAt(wp);
+				if (fovHit === null || fovHit === void 0 ? void 0 : fovHit.serial) {
+					var _fovHit$props;
+					const bounds = getInteriorFloorBounds(get(currentFloor));
+					const pts = bounds ? mapCoordinatesToWorldPoints((_fovHit$props = fovHit.props) === null || _fovHit$props === void 0 ? void 0 : _fovHit$props.mapCoordinates, bounds) : [];
+					const vIdx = pts.length ? findFovVertexAt(wp, pts) : -1;
+					set(selectedFovSerial, fovHit.serial, true);
+					set(fovSelectionOnly, true);
+					set(draggingFovVertex, vIdx >= 0 ? vIdx : null, true);
+					set(fovDragLast, vIdx >= 0 ? null : {
+						x: wp.x,
+						y: wp.y
+					}, true);
+					set(selectedZoneId, null);
+					selectedElementId.set(fovHit.id);
+					emitCameraFloorClicked(fovHit.serial);
+					set(selectedTextAnnotationId, null);
+					set(selectedAnnotationId, null);
+					set(selectedMeasurementId, null);
+					beginUndoGroup();
+					return;
+				}
 				if (((_$$get9 = get(currentFloor)) === null || _$$get9 === void 0 || (_$$get9 = _$$get9.zones) === null || _$$get9 === void 0 ? void 0 : _$$get9.length) && get(layerVis).zones) {
 					const zHit = findZoneAt(wp, get(currentFloor).zones, get(zoom));
 					if (zHit) {
@@ -69120,26 +69148,9 @@ function FloorPlanCanvas($$anchor, $$props) {
 						return;
 					}
 				}
-				const fovHit = findFovCameraAt(wp);
-				if (fovHit === null || fovHit === void 0 ? void 0 : fovHit.serial) {
-					var _fovHit$props;
-					const bounds = getInteriorFloorBounds(get(currentFloor));
-					const pts = bounds ? mapCoordinatesToWorldPoints((_fovHit$props = fovHit.props) === null || _fovHit$props === void 0 ? void 0 : _fovHit$props.mapCoordinates, bounds) : [];
-					const vIdx = pts.length ? findFovVertexAt(wp, pts) : -1;
-					set(selectedFovSerial, fovHit.serial, true);
-					set(fovSelectionOnly, true);
-					set(draggingFovVertex, vIdx >= 0 ? vIdx : null, true);
-					set(selectedZoneId, null);
-					selectedElementId.set(fovHit.id);
-					set(selectedTextAnnotationId, null);
-					set(selectedAnnotationId, null);
-					set(selectedMeasurementId, null);
-					if (vIdx >= 0) beginUndoGroup();
-					return;
-				}
 			}
 			set(selectedZoneId, null);
-			if (!objectAboveZone) {
+			if (!objectAbove) {
 				set(selectedFovSerial, null);
 				set(fovSelectionOnly, false);
 			}
@@ -69446,6 +69457,7 @@ function FloorPlanCanvas($$anchor, $$props) {
 			if (fi) {
 				var _fi$props4;
 				selectElement(fi.id, e.shiftKey, e.ctrlKey || e.metaKey);
+				if (fi.catalogId === "camera") emitCameraFloorClicked(fi.serial);
 				set(fovSelectionOnly, false);
 				if (fi.catalogId === "camera" && fi.serial && ((_fi$props4 = fi.props) === null || _fi$props4 === void 0 ? void 0 : _fi$props4.mapCoordinates)) {
 					set(selectedFovSerial, fi.serial, true);
@@ -69629,21 +69641,30 @@ function FloorPlanCanvas($$anchor, $$props) {
 			x: snap(get(mousePos).x),
 			y: snap(get(mousePos).y)
 		}, true);
-		if (get(draggingFovVertex) != null && get(selectedFovSerial) && get(currentFloor)) {
+		if (get(selectedFovSerial) && get(currentFloor) && (get(draggingFovVertex) != null || get(fovDragLast))) {
 			const bounds = getInteriorFloorBounds(get(currentFloor));
 			const cam = get(currentFloor).furniture.find((f) => f.catalogId === "camera" && f.serial === get(selectedFovSerial));
 			if (cam && bounds) {
 				var _cam$props2;
 				const pts = mapCoordinatesToWorldPoints((_cam$props2 = cam.props) === null || _cam$props2 === void 0 ? void 0 : _cam$props2.mapCoordinates, bounds);
-				if (pts[get(draggingFovVertex)]) {
+				if (get(draggingFovVertex) != null && pts[get(draggingFovVertex)]) {
 					const next = pts.map((p) => ({ ...p }));
 					next[get(draggingFovVertex)] = {
 						x: snap(get(mousePos).x),
 						y: snap(get(mousePos).y)
 					};
 					setCameraMapCoordinatesFromWorld(get(selectedFovSerial), next);
+				} else if (get(fovDragLast) && pts.length) {
+					const dx = get(mousePos).x - get(fovDragLast).x;
+					const dy = get(mousePos).y - get(fovDragLast).y;
+					set(fovDragLast, {
+						x: get(mousePos).x,
+						y: get(mousePos).y
+					}, true);
+					setCameraMapCoordinatesFromWorld(get(selectedFovSerial), translatePoints(pts, dx, dy));
 				}
 			}
+			return;
 		}
 		if (get(draggingZoneId) && ((_$$get12 = get(currentFloor)) === null || _$$get12 === void 0 ? void 0 : _$$get12.zones)) {
 			const z = get(currentFloor).zones.find((z) => z.id === get(draggingZoneId));
@@ -69971,9 +69992,10 @@ function FloorPlanCanvas($$anchor, $$props) {
 			set(draggingZoneVertex, null);
 			set(zoneDragLast, null);
 		}
-		if (get(draggingFovVertex) != null) {
+		if (get(draggingFovVertex) != null || get(fovDragLast)) {
 			endUndoGroup();
 			set(draggingFovVertex, null);
+			set(fovDragLast, null);
 		}
 		if (get(draggingRoomLabelId)) {
 			const dx = get(mousePos).x - roomLabelDragStart.x;