From bb9025ab07f6eb7086429cc7a6166f14855812c3 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 3 Nov 2023 15:02:17 -0700
Subject: [PATCH] Sidebar ordering 95% done!

---
 src-web/components/Sidebar.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index bde18fe4..eb1cf173 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -197,7 +197,6 @@ export const Sidebar = memo(function Sidebar({ className }: Props) {
       const hoveredTree = treeParentMap[id];
       const dragIndex = hoveredTree?.children.findIndex((n) => n.item.id === id) ?? -99;
       const target = hoveredTree?.children[dragIndex + (side === 'above' ? 0 : 1)]?.item;
-      console.log('SET HOVERED ID', target?.id);
       setHoveredId(target?.id ?? null);
     },
     [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 hoveredIndex = newChildren.findIndex((c) => c.item.id === hoveredId) ?? null;
-      if (hoveredIndex > index) newChildren.splice(hoveredIndex - 1, 0, child);
-      else newChildren.splice(hoveredIndex, 0, child);
+      if (hoveredIndex < index || targetTree.item.id !== parentTree.item.id) {
+        // 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 newIndex = newChildren.findIndex((r) => r.item.id === itemId) ?? 0;
-      const prev = newChildren[newIndex - 1]?.item;
-      const next = newChildren[newIndex + 1]?.item;
+      const prev = newChildren[hoveredIndex - 1]?.item;
+      const next = newChildren[hoveredIndex + 1]?.item;
       const beforePriority = prev == null || prev.model === 'workspace' ? 0 : prev.sortPriority;
       const afterPriority = next == null || next.model === 'workspace' ? 0 : next.sortPriority;