|
1 | 1 | import React, { useState, useEffect, useCallback } from 'react'; |
2 | 2 | import { Routes, Route, Navigate, useNavigate } from 'react-router-dom'; |
3 | 3 | import { Events } from '@wailsio/runtime'; |
| 4 | + |
4 | 5 | import { Sidebar } from './components/Sidebar'; |
5 | 6 | import { TitleBar } from './components/TitleBar'; |
6 | 7 | import { SettingsModal } from './components/SettingsModal'; |
7 | 8 | import ToolRouter from './ToolRouter'; |
8 | 9 | import './App.css'; |
9 | 10 |
|
10 | | -// NavigationHandler listens for navigate events from command palette |
11 | | -function NavigationHandler() { |
| 11 | +function App() { |
12 | 12 | const navigate = useNavigate(); |
| 13 | + const [isSidebarOpen, setIsSidebarOpen] = useState(true); |
| 14 | + const [isSettingsOpen, setIsSettingsOpen] = useState(false); |
| 15 | + const [themeMode, setThemeMode] = useState(() => { |
| 16 | + return localStorage.getItem('themeMode') || 'dark'; |
| 17 | + }); |
| 18 | + |
| 19 | + const toggleSidebar = () => setIsSidebarOpen(!isSidebarOpen); |
| 20 | + const openSettings = () => setIsSettingsOpen(true); |
| 21 | + const closeSettings = () => setIsSettingsOpen(false); |
13 | 22 |
|
| 23 | + // Handle navigation events from command palette |
14 | 24 | useEffect(() => { |
15 | | - console.log('[App] Setting up navigation event listener...'); |
| 25 | + console.log('[App] Setting up navigation listener for command palette...'); |
| 26 | + |
| 27 | + const handleNavigation = (data) => { |
| 28 | + console.log('[App] Received navigate:to event:', data); |
| 29 | + |
| 30 | + // In Wails V3, data might be the path string OR an event object with path in data |
| 31 | + let path = ''; |
| 32 | + if (typeof data === 'string') { |
| 33 | + path = data; |
| 34 | + } else if (data && typeof data === 'object') { |
| 35 | + if (data.data) { |
| 36 | + path = typeof data.data === 'string' ? data.data : data.data[0]; |
| 37 | + } else if (data.path) { |
| 38 | + path = data.path; |
| 39 | + } |
| 40 | + } |
16 | 41 |
|
17 | | - // Listen for navigation events from command palette (via Go backend) |
18 | | - const unsubscribe = Events.On('navigate:to', (path) => { |
19 | | - console.log('[App] Received navigate:to event:', path); |
20 | 42 | if (path) { |
| 43 | + console.log('[App] Navigating to path:', path); |
21 | 44 | navigate(path); |
| 45 | + } else { |
| 46 | + console.warn('[App] Received empty/invalid path via navigate:to:', data); |
22 | 47 | } |
23 | | - }); |
| 48 | + }; |
| 49 | + |
| 50 | + let unsubscribe = null; |
| 51 | + try { |
| 52 | + unsubscribe = Events.On('navigate:to', (event) => { |
| 53 | + handleNavigation(event); |
| 54 | + }); |
| 55 | + console.log('[App] Navigation listener registered successfully'); |
| 56 | + } catch (err) { |
| 57 | + console.error('[App] Failed to register navigation listener:', err); |
| 58 | + } |
24 | 59 |
|
25 | 60 | return () => { |
26 | | - console.log('[App] Cleaning up navigation event listener'); |
| 61 | + console.log('[App] Cleaning up navigation listener'); |
27 | 62 | if (unsubscribe) unsubscribe(); |
28 | 63 | }; |
29 | 64 | }, [navigate]); |
30 | 65 |
|
31 | | - return null; |
32 | | -} |
33 | | - |
34 | | -function App() { |
35 | | - const [isSidebarOpen, setIsSidebarOpen] = useState(true); |
36 | | - const [isSettingsOpen, setIsSettingsOpen] = useState(false); |
37 | | - const [themeMode, setThemeMode] = useState(() => { |
38 | | - return localStorage.getItem('themeMode') || 'dark'; |
39 | | - }); |
40 | | - |
41 | | - const toggleSidebar = () => setIsSidebarOpen(!isSidebarOpen); |
42 | | - const openSettings = () => setIsSettingsOpen(true); |
43 | | - const closeSettings = () => setIsSettingsOpen(false); |
44 | | - |
45 | | - // Global spotlight shortcut is Cmd+Shift+Space (handled by Go backend) |
46 | | - |
| 66 | + // Handle theme changes |
47 | 67 | useEffect(() => { |
48 | 68 | localStorage.setItem('themeMode', themeMode); |
49 | 69 | if (themeMode === 'dark') { |
@@ -90,7 +110,6 @@ function App() { |
90 | 110 | <Route path="/tool/:toolId/*" element={<ToolRouter />} /> |
91 | 111 | <Route path="*" element={<Navigate to="/tool/text-converter" replace />} /> |
92 | 112 | </Routes> |
93 | | - <NavigationHandler /> |
94 | 113 | </main> |
95 | 114 | </div> |
96 | 115 |
|
|
0 commit comments