mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-19 23:31:21 +02:00
Small tweaks
This commit is contained in:
@@ -3,8 +3,6 @@ import { useKeyPressEvent } from 'react-use';
|
|||||||
import { useActiveRequest } from '../hooks/useActiveRequest';
|
import { useActiveRequest } from '../hooks/useActiveRequest';
|
||||||
import { useActiveWorkspaceId } from '../hooks/useActiveWorkspaceId';
|
import { useActiveWorkspaceId } from '../hooks/useActiveWorkspaceId';
|
||||||
import { useAppRoutes } from '../hooks/useAppRoutes';
|
import { useAppRoutes } from '../hooks/useAppRoutes';
|
||||||
import { useDeleteRequest } from '../hooks/useDeleteRequest';
|
|
||||||
import { useDuplicateRequest } from '../hooks/useDuplicateRequest';
|
|
||||||
import { useRecentRequests } from '../hooks/useRecentRequests';
|
import { useRecentRequests } from '../hooks/useRecentRequests';
|
||||||
import { useRequests } from '../hooks/useRequests';
|
import { useRequests } from '../hooks/useRequests';
|
||||||
import { Button } from './core/Button';
|
import { Button } from './core/Button';
|
||||||
@@ -24,7 +22,7 @@ export function RecentRequestsDropdown() {
|
|||||||
if (!e.ctrlKey) return;
|
if (!e.ctrlKey) return;
|
||||||
if (!dropdownRef.current?.isOpen) {
|
if (!dropdownRef.current?.isOpen) {
|
||||||
// Set to 1 because the first item is the active request
|
// Set to 1 because the first item is the active request
|
||||||
dropdownRef.current?.open(e.shiftKey ? -1 : 1);
|
dropdownRef.current?.open(e.shiftKey ? -1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.shiftKey) {
|
if (e.shiftKey) {
|
||||||
@@ -39,11 +37,6 @@ export function RecentRequestsDropdown() {
|
|||||||
const recentRequestIds = useRecentRequests();
|
const recentRequestIds = useRecentRequests();
|
||||||
const requests = useRequests();
|
const requests = useRequests();
|
||||||
const routes = useAppRoutes();
|
const routes = useAppRoutes();
|
||||||
const deleteRequest = useDeleteRequest(activeRequest?.id ?? null);
|
|
||||||
const duplicateRequest = useDuplicateRequest({
|
|
||||||
id: activeRequest?.id ?? null,
|
|
||||||
navigateAfter: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
const items = useMemo<DropdownItem[]>(() => {
|
const items = useMemo<DropdownItem[]>(() => {
|
||||||
if (activeWorkspaceId === null) return [];
|
if (activeWorkspaceId === null) return [];
|
||||||
@@ -65,32 +58,12 @@ export function RecentRequestsDropdown() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show max 30 items
|
|
||||||
const fixedItems: DropdownItem[] = [
|
|
||||||
// {
|
|
||||||
// label: 'Duplicate',
|
|
||||||
// onSelect: duplicateRequest.mutate,
|
|
||||||
// leftSlot: <Icon icon="copy" />,
|
|
||||||
// rightSlot: <HotKey modifier="Meta" keyName="D" />,
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// label: 'Delete',
|
|
||||||
// onSelect: deleteRequest.mutate,
|
|
||||||
// variant: 'danger',
|
|
||||||
// leftSlot: <Icon icon="trash" />,
|
|
||||||
// },
|
|
||||||
];
|
|
||||||
|
|
||||||
// No recent requests to show
|
// No recent requests to show
|
||||||
if (recentRequestItems.length === 0) {
|
if (recentRequestItems.length === 0) {
|
||||||
return fixedItems;
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return recentRequestItems.slice(0, 20);
|
||||||
// ...fixedItems,
|
|
||||||
// { type: 'separator', label: 'Recent Requests' },
|
|
||||||
...recentRequestItems.slice(0, 20),
|
|
||||||
];
|
|
||||||
}, [activeWorkspaceId, recentRequestIds, requests, routes]);
|
}, [activeWorkspaceId, recentRequestIds, requests, routes]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -257,6 +257,8 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen'>, MenuProps>(functio
|
|||||||
[items],
|
[items],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (items.length === 0) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Portal name="dropdown">
|
<Portal name="dropdown">
|
||||||
<FocusTrap>
|
<FocusTrap>
|
||||||
|
|||||||
@@ -27,5 +27,5 @@ export function useRecentRequests() {
|
|||||||
});
|
});
|
||||||
}, [activeRequestId, setHistory]);
|
}, [activeRequestId, setHistory]);
|
||||||
|
|
||||||
return history;
|
return history.slice(1);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user