From f709c6631b52541806fc3cb7df9fff101ad8a153 Mon Sep 17 00:00:00 2001
From: Tanish Manku <tanish2k09.dev@gmail.com>
Date: Fri, 1 May 2026 06:45:33 -0700
Subject: [PATCH] PageScene: reset live camera to main when deleting the active
 camera

The store's `deleteCamera` resets `selectedCameraId` to `"main"` if the
deleted id was active, but the live engine camera kept the deleted
camera's pose because pose-restoring code only ran in
`handleCameraSelect`.

Extract `applyCameraPose` from `handleCameraSelect` and add a
`handleDeleteCamera` wrapper that calls the store action then
re-applies the main camera's pose if it just became the active one.
---
 .../app/src/pages/PageScene/PageEditor.tsx    | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/frontend/apps/artcraft/app/src/pages/PageScene/PageEditor.tsx b/frontend/apps/artcraft/app/src/pages/PageScene/PageEditor.tsx
index aca263e1f4..9a53ad451d 100644
--- a/frontend/apps/artcraft/app/src/pages/PageScene/PageEditor.tsx
+++ b/frontend/apps/artcraft/app/src/pages/PageScene/PageEditor.tsx
@@ -30,6 +30,7 @@ import { useViewportPointer } from "./hooks/useViewportPointer";
 import { useViewportKeyboard } from "./hooks/useViewportKeyboard";
 import { Outliner } from "./comps/Outliner";
 import { CameraAspectRatio } from "./enums";
+import { Camera } from "@storyteller/common";
 import { PromptBox3D } from "@storyteller/ui-promptbox";
 import { PopoverItem } from "@storyteller/ui-popover";
 import { LoadingDots } from "@storyteller/ui-loading";
@@ -165,6 +166,23 @@ export const PageEditor = () => {
   useFreeCam(editorCanvas, editorEngine);
   useViewportPointer(editorCanvas, editorEngine);
   useViewportKeyboard(editorEngine);
+  // Apply a saved camera entry to the live engine camera (position, lookAt,
+  // FOV, free-cam reset, re-render). Shared between camera-switch and
+  // delete-active-camera (which falls back to main).
+  const applyCameraPose = (camera: Camera) => {
+    if (!editorEngine) return;
+    const cam = editorEngine.cameraController.camera;
+    if (!cam) return;
+    cam.position.set(camera.position.x, camera.position.y, camera.position.z);
+    cam.lookAt(camera.lookAt.x, camera.lookAt.y, camera.lookAt.z);
+    cam.fov = editorEngine.cameraController.focalLengthToFov(camera.focalLength);
+    cam.updateProjectionMatrix();
+    if (editorEngine.cameraController.freeCamState) {
+      editorEngine.cameraController.freeCamState.velocity.set(0, 0, 0);
+    }
+    editorEngine.renderScene();
+  };
+
   const handleCameraSelect = (selectedItem: PopoverItem) => {
     const selectedCamera = cameras.find(
       (cam) => cam.label === selectedItem.label,
@@ -185,33 +203,7 @@ export const PageEditor = () => {
         });
       }, 1500);
 
-      // Update the main camera to match the selected camera's properties
-      const cam = editorEngine.cameraController.camera;
-      if (cam) {
-        cam.position.set(
-          selectedCamera.position.x,
-          selectedCamera.position.y,
-          selectedCamera.position.z,
-        );
-        cam.lookAt(
-          selectedCamera.lookAt.x,
-          selectedCamera.lookAt.y,
-          selectedCamera.lookAt.z,
-        );
-
-        cam.fov = editorEngine.cameraController.focalLengthToFov(
-          selectedCamera.focalLength,
-        );
-        cam.updateProjectionMatrix();
-
-        // Reset free-cam motion so a switch doesn't carry over a
-        // half-applied drag from the previous camera.
-        if (editorEngine.cameraController.freeCamState) {
-          editorEngine.cameraController.freeCamState.velocity.set(0, 0, 0);
-        }
-
-        editorEngine.renderScene();
-      }
+      applyCameraPose(selectedCamera);
 
       // Force update camera properties in the state
       updateCamera(selectedCamera.id, {
@@ -223,6 +215,18 @@ export const PageEditor = () => {
     }
   };
 
+  // Main camera can't be deleted (the store action returns early). For
+  // any other camera, if it was the active one, reset the live engine
+  // camera to main's saved pose so the viewport doesn't keep showing
+  // the deleted camera's POV.
+  const handleDeleteCamera = (id: string) => {
+    const wasActive = id === selectedCameraId;
+    deleteCamera(id);
+    if (!wasActive) return;
+    const main = cameras.find((c) => c.id === "main");
+    if (main) applyCameraPose(main);
+  };
+
   const handleAddCamera = () => {
     // Check if we've reached the maximum number of cameras
     if (cameras.length >= 6) {
@@ -507,7 +511,7 @@ export const PageEditor = () => {
                   gridVisibility={gridVisible}
                   setGridVisibility={setGridVisible}
                   selectedCameraId={selectedCameraId}
-                  deleteCamera={deleteCamera}
+                  deleteCamera={handleDeleteCamera}
                   focalLengthDragging={focalLengthDragging}
                   setFocalLengthDragging={setFocalLengthDragging}
                   isPromptBoxFocused={isPromptBoxFocused}