From 9a1a8884e72c2788a30c3a333950b6ea949e9b9e Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Sat, 11 Apr 2026 03:49:37 +0200
Subject: [PATCH] Refactor scene controls and add new scene button in App.tsx

---
 src/app/App.tsx | 57 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/app/App.tsx b/src/app/App.tsx
index e19ae3b3..515ddf1c 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -6528,22 +6528,47 @@ export function App({ store, initialStatusMessage }: AppProps) {
   return (
     <div className="app-shell">
       <header className="toolbar">
-        <label className="toolbar__scene-name">
-          <span className="visually-hidden">Scene Name</span>
-          <input
-            data-testid="toolbar-scene-name"
-            className="text-input toolbar__scene-name-input"
-            type="text"
-            value={sceneNameDraft}
-            onChange={(event) => setSceneNameDraft(event.currentTarget.value)}
-            onBlur={applySceneName}
-            onKeyDown={(event) => {
-              if (event.key === "Enter") {
-                applySceneName();
-              }
-            }}
-          />
-        </label>
+        <div className="toolbar__scene-controls">
+          <label className="toolbar__scene-picker">
+            <span className="visually-hidden">Active Scene</span>
+            <select
+              data-testid="toolbar-scene-select"
+              className="select-input toolbar__scene-select"
+              value={editorState.activeSceneId}
+              onChange={handleActiveSceneChange}
+            >
+              {sceneList.map((scene) => (
+                <option key={scene.id} value={scene.id}>
+                  {scene.name}
+                </option>
+              ))}
+            </select>
+          </label>
+          <button
+            className="toolbar__button"
+            type="button"
+            data-testid="toolbar-new-scene"
+            onClick={handleCreateScene}
+          >
+            New Scene
+          </button>
+          <label className="toolbar__scene-name">
+            <span className="visually-hidden">Scene Name</span>
+            <input
+              data-testid="toolbar-scene-name"
+              className="text-input toolbar__scene-name-input"
+              type="text"
+              value={sceneNameDraft}
+              onChange={(event) => setSceneNameDraft(event.currentTarget.value)}
+              onBlur={applySceneName}
+              onKeyDown={(event) => {
+                if (event.key === "Enter") {
+                  applySceneName();
+                }
+              }}
+            />
+          </label>
+        </div>
 
         <div className="toolbar__actions">
           <div className="toolbar__group">