From 527b951992bb818a5bb1b3ccc108b90178045aa7 Mon Sep 17 00:00:00 2001
From: Brent Yi <yibrenth@gmail.com>
Date: Wed, 17 Jul 2024 00:24:57 -0700
Subject: [PATCH] Reset refinements: don't reset theme, more robust scene reset

---
 src/viser/client/src/ControlPanel/GuiState.tsx | 7 +++++--
 src/viser/client/src/SceneTreeState.tsx        | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/viser/client/src/ControlPanel/GuiState.tsx b/src/viser/client/src/ControlPanel/GuiState.tsx
index 524815655..cb43a49ee 100644
--- a/src/viser/client/src/ControlPanel/GuiState.tsx
+++ b/src/viser/client/src/ControlPanel/GuiState.tsx
@@ -135,9 +135,12 @@ export function useGuiState(initialServer: string) {
           }),
         resetGui: () =>
           set((state) => {
+            // No need to overwrite the theme or label. The former especially
+            // can be jarring.
+            // state.theme = cleanGuiState.theme;
+            // state.label = cleanGuiState.label;
+
             // This feels brittle, could be cleaned up...
-            state.theme = cleanGuiState.theme;
-            state.label = cleanGuiState.label;
             state.shareUrl = null;
             state.guiIdSetFromContainerId = {};
             state.modals = [];
diff --git a/src/viser/client/src/SceneTreeState.tsx b/src/viser/client/src/SceneTreeState.tsx
index 5957a0339..ad5245c77 100644
--- a/src/viser/client/src/SceneTreeState.tsx
+++ b/src/viser/client/src/SceneTreeState.tsx
@@ -99,8 +99,8 @@ export function useSceneTreeState() {
                 if (key !== "" && key !== "/WorldAxes")
                   delete state.nodeFromName[key];
               }
-              state.nodeFromName[""]!.children = ["/WorldAxes"];
-              state.nodeFromName["/WorldAxes"]!.children = [];
+              state.nodeFromName[""] = rootNodeTemplate;
+              state.nodeFromName["/WorldAxes"] = rootAxesNode;
             }),
           setLabelVisibility: (name, labelVisibility) =>
             set((state) => {