fixed hotkeys

Author: ComputelessComputer

apps/desktop/src/components/main/body/index.tsx

@@ -1,12 +1,12 @@
-import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
+import { Button } from "@hypr/ui/components/ui/button";
+import { cn } from "@hypr/utils";
+
 import { ArrowLeftIcon, ArrowRightIcon, PanelLeftOpenIcon, PlusIcon } from "lucide-react";
 import { Reorder } from "motion/react";
 import { useCallback, useEffect, useRef } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { useShallow } from "zustand/shallow";
 
-import { Button } from "@hypr/ui/components/ui/button";
-import { cn } from "@hypr/utils";
 import { useShell } from "../../../contexts/shell";
 import { type Tab, uniqueIdfromTab, useTabs } from "../../../store/zustand/tabs";
 import { ChatFloatingButton } from "../../chat";
@@ -376,16 +376,12 @@ function useTabsShortcuts() {
     () => {
       if (currentTab?.type === "empty") {
         newNoteCurrent();
-        return;
-      }
-
-      if (currentTab) {
-        close(currentTab);
+      } else {
+        newNote();
       }
-      newNote();
     },
     { preventDefault: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [currentTab, close, newNote, newNoteCurrent],
+    [currentTab, newNote, newNoteCurrent],
   );
 
   useHotkeys(
@@ -398,15 +394,12 @@ function useTabsShortcuts() {
   useHotkeys(
     "mod+w",
     async () => {
-      if (currentTab && tabs.length > 1) {
+      if (currentTab) {
         close(currentTab);
-      } else {
-        const appWindow = getCurrentWebviewWindow();
-        await appWindow.close();
       }
     },
     { preventDefault: true, enableOnFormTags: true, enableOnContentEditable: true },
-    [tabs, currentTab, close],
+    [currentTab, close],
   );
 
   useHotkeys(

apps/desktop/src/routes/app/main/_layout.tsx

@@ -1,5 +1,5 @@
 import { createFileRoute, Outlet, useRouteContext } from "@tanstack/react-router";
-import { useCallback, useEffect } from "react";
+import { useCallback, useEffect, useRef } from "react";
 
 import { buildChatTools } from "../../../chat/tools";
 import { AITaskProvider } from "../../../contexts/ai-task";
@@ -17,21 +17,22 @@ export const Route = createFileRoute("/app/main/_layout")({
 
 function Component() {
   const { persistedStore, aiTaskStore, toolRegistry } = useRouteContext({ from: "__root__" });
-  const { registerOnEmpty, currentTab, openNew } = useTabs();
+  const { registerOnEmpty, openNew, tabs } = useTabs();
+  const hasOpenedInitialTab = useRef(false);
 
   const openDefaultEmptyTab = useCallback(() => {
     openNew({ type: "empty" });
   }, [openNew]);
 
   useEffect(() => {
-    if (!currentTab) {
+    // Use ref to prevent double-opening in React Strict Mode
+    if (tabs.length === 0 && !hasOpenedInitialTab.current) {
+      hasOpenedInitialTab.current = true;
       openDefaultEmptyTab();
     }
-  }, [currentTab, openDefaultEmptyTab]);
 
-  useEffect(() => {
     registerOnEmpty(openDefaultEmptyTab);
-  }, [openDefaultEmptyTab, registerOnEmpty]);
+  }, [tabs.length, openDefaultEmptyTab, registerOnEmpty]);
 
   if (!aiTaskStore) {
     return null;