starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-19 23:31:21 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix drag-n-drop things

Browse Source
This commit is contained in:
Gregory Schier
2023-10-28 21:42:35 -07:00
parent b2150181b3
commit b9d1e70e04
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,15 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
return ( return (
<div aria-hidden={hidden} className="relative h-full"> <div aria-hidden={hidden} className="relative h-full">
<HStack className="mt-1 pt-1 mx-2" justifyContent="between" alignItems="center" space={1}>
<WorkspaceActionsDropdown forDropdown={false} className="text-left mb-0" justify="start" />
<IconButton
size="sm"
icon="plusCircle"
title="Create Request"
onClick={() => createRequest.mutate({})}
/>
</HStack>
<div <div
role="menu" role="menu"
aria-orientation="vertical" aria-orientation="vertical"
@@ -165,19 +174,6 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
'h-full relative grid grid-rows-[auto_minmax(0,1fr)_auto]', 'h-full relative grid grid-rows-[auto_minmax(0,1fr)_auto]',
)} )}
> >
<HStack className="mt-1 pt-1 mx-2" justifyContent="between" alignItems="center" space={1}>
<WorkspaceActionsDropdown
forDropdown={false}
className="text-left mb-0"
justify="start"
/>
<IconButton
size="sm"
icon="plusCircle"
title="Create Request"
onClick={() => createRequest.mutate({})}
/>
</HStack>
<VStack <VStack
as="ul" as="ul"
className="relative pb-3 overflow-y-auto overflow-x-visible pt-2" className="relative pb-3 overflow-y-auto overflow-x-visible pt-2"
@@ -227,8 +223,10 @@ function SidebarItems({ requests, focused, selectedIndex, onSelect }: SidebarIte
if (hoveredIndex > index) newRequests.splice(hoveredIndex - 1, 0, request); if (hoveredIndex > index) newRequests.splice(hoveredIndex - 1, 0, request);
else newRequests.splice(hoveredIndex, 0, request); else newRequests.splice(hoveredIndex, 0, request);
const beforePriority = newRequests[hoveredIndex - 1]?.sortPriority ?? 0; // Do a simple find because the math is too hard
const afterPriority = newRequests[hoveredIndex + 1]?.sortPriority ?? 0; const newIndex = newRequests.findIndex((r) => r.id === requestId) ?? 0;
const beforePriority = newRequests[newIndex - 1]?.sortPriority ?? 0;
const afterPriority = newRequests[newIndex + 1]?.sortPriority ?? 0;
const shouldUpdateAll = afterPriority - beforePriority < 1; const shouldUpdateAll = afterPriority - beforePriority < 1;
if (shouldUpdateAll) { if (shouldUpdateAll) {
@@ -255,7 +253,7 @@ function SidebarItems({ requests, focused, selectedIndex, onSelect }: SidebarIte
key={r.id} key={r.id}
selected={selectedIndex === i} selected={selectedIndex === i}
requestId={r.id} requestId={r.id}
requestName={r.name} requestName={r.name + ' ' + r.sortPriority}
onMove={handleMove} onMove={handleMove}
onEnd={handleEnd} onEnd={handleEnd}
useProminentStyles={focused} useProminentStyles={focused}