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

Sidebar ordering 95% done!

Browse Source
This commit is contained in:
Gregory Schier
2023-11-03 15:02:17 -07:00
parent 8919d598c2
commit ef8ade45b1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,6 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
const hoveredTree = treeParentMap[id]; const hoveredTree = treeParentMap[id];
const dragIndex = hoveredTree?.children.findIndex((n) => n.item.id === id) ?? -99; const dragIndex = hoveredTree?.children.findIndex((n) => n.item.id === id) ?? -99;
const target = hoveredTree?.children[dragIndex + (side === 'above' ? 0 : 1)]?.item; const target = hoveredTree?.children[dragIndex + (side === 'above' ? 0 : 1)]?.item;
console.log('SET HOVERED ID', target?.id);
setHoveredId(target?.id ?? null); setHoveredId(target?.id ?? null);
}, },
[treeParentMap, setHoveredId], [treeParentMap, setHoveredId],
@@ -221,13 +220,16 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
const newChildren = targetTree.children.filter((c) => c.item.id !== itemId); const newChildren = targetTree.children.filter((c) => c.item.id !== itemId);
const hoveredIndex = newChildren.findIndex((c) => c.item.id === hoveredId) ?? null; const hoveredIndex = newChildren.findIndex((c) => c.item.id === hoveredId) ?? null;
if (hoveredIndex > index) newChildren.splice(hoveredIndex - 1, 0, child); if (hoveredIndex < index || targetTree.item.id !== parentTree.item.id) {
else newChildren.splice(hoveredIndex, 0, child); // Moving up or into a new tree is simply inserting before the hovered item
newChildren.splice(hoveredIndex, 0, child);
} else {
// Moving down has to account for the fact that the original item will be removed
newChildren.splice(hoveredIndex - 1, 0, child);
}
// Do a simple find because the math is too hard const prev = newChildren[hoveredIndex - 1]?.item;
const newIndex = newChildren.findIndex((r) => r.item.id === itemId) ?? 0; const next = newChildren[hoveredIndex + 1]?.item;
const prev = newChildren[newIndex - 1]?.item;
const next = newChildren[newIndex + 1]?.item;
const beforePriority = prev == null || prev.model === 'workspace' ? 0 : prev.sortPriority; const beforePriority = prev == null || prev.model === 'workspace' ? 0 : prev.sortPriority;
const afterPriority = next == null || next.model === 'workspace' ? 0 : next.sortPriority; const afterPriority = next == null || next.model === 'workspace' ? 0 : next.sortPriority;