Fix optimistic workspace creation on Android

2026-04-22 11:03:35 +07:00
parent 7b9cc3d423
commit 42cdabdf57
30 changed files with 1533 additions and 165 deletions
@@ -1,4 +1,10 @@
 import { router } from "expo-router";
+import { isNative } from "@/constants/platform";
+import {
+  activateNavigationWorkspaceSelection,
+  getLastNavigationWorkspaceRouteSelection,
+  overrideNextNavigationWorkspaceRouteSelection,
+} from "@/stores/navigation-active-workspace-store";
 import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
 import { generateDraftId } from "@/stores/draft-keys";
 import {
@@ -45,6 +51,20 @@ export function prepareWorkspaceTab(input: PrepareWorkspaceTabInput) {
 export function navigateToPreparedWorkspaceTab(input: NavigateToPreparedWorkspaceTabInput): string {
  const route = prepareWorkspaceTab(input);
  if (input.navigationMethod === "replace") {
+    const canReturnToWorkspaceShell =
+      isNative && getLastNavigationWorkspaceRouteSelection() !== null && router.canGoBack();
+    if (canReturnToWorkspaceShell) {
+      const nextSelection = {
+        serverId: input.serverId,
+        workspaceId: input.workspaceId,
+      };
+      overrideNextNavigationWorkspaceRouteSelection(nextSelection);
+      router.back();
+      setTimeout(() => {
+        activateNavigationWorkspaceSelection(nextSelection);
+      }, 0);
+      return route;
+    }
    router.replace(route as any);
  } else {
    router.navigate(route as any);