starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-25 19:01:38 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Better opening workspaces and redirect workspace to recent request

Browse Source
This commit is contained in:
Gregory Schier
2023-04-11 11:11:36 -07:00
parent deeefdcfbf
commit a38691ed53
11 changed files with 146 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src-web/components/Sidebar.tsx
View File

@@ -57,16 +57,21 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
(requestId: string) => {
const index = requests.findIndex((r) => r.id === requestId);
const request = requests[index];
if (!request || request.id === activeRequestId) return;
if (!request) return;
routes.navigate('request', { requestId, workspaceId: request.workspaceId });
setSelectedIndex(index);
focusActiveRequest(index);
},
[activeRequestId, focusActiveRequest, requests, routes],
[focusActiveRequest, requests, routes],
);
const handleFocus = useCallback(() => focusActiveRequest(), [focusActiveRequest]);
const handleFocus = useCallback(() => {
if (hasFocus) return;
focusActiveRequest(selectedIndex ?? 0);
}, [focusActiveRequest, hasFocus, selectedIndex]);
const handleBlur = useCallback(() => setHasFocus(false), []);
const handleDeleteKey = useCallback(
(e: KeyboardEvent) => {
if (!hasFocus) return;
@@ -85,11 +90,11 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
useTauriEvent(
'focus_sidebar',
() => {
if (hidden) return;
if (hidden || hasFocus) return;
// Select 0 index on focus if none selected
focusActiveRequest(selectedIndex ?? 0);
},
[focusActiveRequest, hidden],
[focusActiveRequest, hidden, activeRequestId],
);
useKeyPressEvent('Enter', (e) => {