Second fix for back button

src/client/useActions.ts

@@ -18,14 +18,6 @@ export const useActions = (
     [dispatch],
   );
 
-  const setActiveFileLeft = useCallback(() => {
-    dispatch({ type: 'set_active_file_left' });
-  }, [dispatch]);
-
-  const setActiveFileRight = useCallback(() => {
-    dispatch({ type: 'set_active_file_right' });
-  }, [dispatch]);
-
   const openTab = useCallback(
     (tabState: TabState): void => {
       dispatch({
@@ -57,7 +49,6 @@ export const useActions = (
     [dispatch],
   );
 
-  // True to show the settings modal.
   const setIsSettingsOpen = useCallback(
     (value: boolean) => {
       dispatch({
@@ -68,24 +59,10 @@ export const useActions = (
     [dispatch],
   );
 
-  const setIsDocOpen = useCallback(
-    (value: boolean) => {
-      dispatch({
-        type: 'set_is_doc_open',
-        value: value,
-      });
-    },
-    [dispatch],
-  );
-
   const closeSettings = useCallback(() => {
     setIsSettingsOpen(false);
   }, [setIsSettingsOpen]);
 
-  const closeDoc = useCallback(() => {
-    setIsDocOpen(false);
-  }, [setIsDocOpen]);
-
   const editorNoLongerWantsFocus = useCallback(() => {
     dispatch({
       type: 'editor_no_longer_wants_focus',
@@ -102,18 +79,27 @@ export const useActions = (
     [dispatch],
   );
 
+  // New action function for setting the tab list
+  const setTabList = useCallback(
+    (tabList: Array<TabState>) => {
+      dispatch({
+        type: 'set_tab_list',
+        tabList,
+      });
+    },
+    [dispatch],
+  );
+
   return {
     setActiveFileId,
-    setActiveFileLeft,
-    setActiveFileRight,
     openTab,
     closeTabs,
     setTheme,
     setIsSettingsOpen,
-    setIsDocOpen,
     closeSettings,
-    closeDoc,
     editorNoLongerWantsFocus,
     setUsername,
+    setTabList, // Export the new action function
   };
 };
+

src/client/useURLSync.ts

@@ -8,21 +8,20 @@ import {
   encodeTabs,
 } from './tabsSearchParameters';
 
-// Synchronizes the tab state with the URL parameters.
 export const useURLSync = ({
-  content,
-  openTab,
-  setActiveFileId,
-  tabList,
-  activeFileId,
-}: {
+                             content,
+                             setTabList,
+                             setActiveFileId,
+                             tabList,
+                             activeFileId,
+                           }: {
   content: VZCodeContent | null;
-  openTab: (tabState: TabState) => void;
+  setTabList: (tabList: Array<TabState>) => void;
   setActiveFileId: (activeFileId: FileId) => void;
   tabList: Array<TabState>;
   activeFileId: FileId | null;
 }) => {
-  // Use React router to get and set the  search parameters.
+  // Use React router to get and set the search parameters.
   const [searchParams, setSearchParams] = useSearchParams();
 
   // Extract the tab state parameters from the search parameters.
@@ -51,7 +50,7 @@ export const useURLSync = ({
     }
 
     // Decode the search parameters.
-    const { tabList, activeFileId } = decodeTabs({
+    const { tabList: decodedTabList, activeFileId: decodedActiveFileId } = decodeTabs({
       tabStateParams,
       content,
     });
@@ -60,13 +59,13 @@ export const useURLSync = ({
     isInitialized.current = true;
 
     // Update the state.
-    tabList.forEach(openTab);
-    setActiveFileId(activeFileId);
+    setTabList(decodedTabList);
+    setActiveFileId(decodedActiveFileId);
   }, [
     content,
-    searchParams,
+    tabStateParams,
+    setTabList,
     setActiveFileId,
-    openTab,
     isInitialized,
   ]);
 

src/client/vzReducer/index.ts

@@ -12,6 +12,7 @@ import { setIsDocOpenReducer } from './setIsDocOpenReducer';
 import { setThemeReducer } from './setThemeReducer';
 import { editorNoLongerWantsFocusReducer } from './editorNoLongerWantsFocusReducer';
 import { setUsernameReducer } from './setUsernameReducer';
+import { setTabListReducer } from './setTabListReducer'; // Imported a new reducer
 
 export { createInitialState } from './createInitialState';
 
@@ -41,8 +42,8 @@ export type VZState = {
 
 // The shape of the actions that can be dispatched to the reducer.
 export type VZAction =
-  // `set_active_file_id`
-  //  * Sets the active file ID.
+// `set_active_file_id`
+//  * Sets the active file ID.
   | { type: 'set_active_file_id'; activeFileId: FileId }
 
   // `set_active_file_left' 'set_active_file_right`
@@ -54,16 +55,16 @@ export type VZAction =
   // `open_tab`
   //  * Opens a tab.
   //  * Also serves to change an already open transient tab to persistent.
-  | {
-      type: 'open_tab';
-      fileId: FileId;
-      isTransient?: boolean;
-    }
+  | { type: 'open_tab'; fileId: FileId; isTransient?: boolean; }
 
   // `close_tabs`
   //  * Closes a set of tabs.
   | { type: 'close_tabs'; fileIdsToClose: Array<FileId> }
 
+  // `set_tab_list`
+  //  * Sets the tab list.
+  | { type: 'set_tab_list'; tabList: Array<TabState> }
+
   // `set_theme`
   //  * Sets the theme.
   | { type: 'set_theme'; themeLabel: ThemeLabel }
@@ -111,6 +112,7 @@ const reducers = [
   setIsDocOpenReducer,
   editorNoLongerWantsFocusReducer,
   setUsernameReducer,
+  setTabListReducer,
 ];
 
 export const vzReducer = (
@@ -121,4 +123,4 @@ export const vzReducer = (
     (currentState, currentReducer) =>
       currentReducer(currentState, action),
     state,
-  );
+  );

src/client/vzReducer/setTabListReducer.ts

@@ -0,0 +1,13 @@
+// setTabListReducer.ts
+import { VZState, VZAction } from './index';
+
+export const setTabListReducer = (state: VZState, action: VZAction): VZState => {
+  if (action.type !== 'set_tab_list') {
+    return state;
+  }
+
+  return {
+    ...state,
+    tabList: action.tabList,
+  };
+};