Remove Group: text when sorting groups + use onDragOver

actualbudget · Jan 20, 2024 · 05d338a · 05d338a
1 parent 34e7a80
commit 05d338a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.jsx b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
@@ -9,7 +9,10 @@ import {
   useSensor,
   useSensors,
 } from '@dnd-kit/core';
-import { restrictToParentElement, restrictToVerticalAxis } from '@dnd-kit/modifiers';
+import {
+  restrictToParentElement,
+  restrictToVerticalAxis,
+} from '@dnd-kit/modifiers';
 import {
   SortableContext,
   sortableKeyboardCoordinates,
@@ -168,7 +171,7 @@ export const BudgetCategories = memo(
     );
 
     const [originalCollapsed, setOriginalCollapsed] = useState(null);
-    const [collapsedOnDragMove, setCollapsedOnDragMove] = useState(null);
+    const [collapsedOnDragOver, setCollapsedOnDragOver] = useState(null);
 
     const onDragStart = e => {
       const { active } = e;
@@ -181,24 +184,20 @@ export const BudgetCategories = memo(
             .filter(item => item.type === 'expense-group')
             .map(item => item.value?.id);
 
-          setCollapsedOnDragMove(groupIds);
+          setCollapsedOnDragOver(groupIds);
           break;
         default:
           break;
       }
     };
 
-    const onDragMove = e => {
+    const onDragOver = e => {
       const { active, over } = e;
 
-      if (!over) {
-        return;
-      }
-
-      // Delay collapsing groups until user moves the group.
-      if (collapsedOnDragMove) {
-        setCollapsed(collapsedOnDragMove);
-        setCollapsedOnDragMove(null);
+      // Delay collapsing groups until user drags/hovers on another item.
+      if (collapsedOnDragOver) {
+        setCollapsed(collapsedOnDragOver);
+        setCollapsedOnDragOver(null);
       }
 
       // Expand groups on hover when moving around categories.
@@ -262,7 +261,7 @@ export const BudgetCategories = memo(
             collisionDetection={closestCenter}
             modifiers={[restrictToVerticalAxis, restrictToParentElement]}
             onDragStart={onDragStart}
-            onDragMove={onDragMove}
+            onDragOver={onDragOver}
             onDragEnd={onDragEnd}
           >
             <SortableContext
@@ -367,7 +366,7 @@ export const BudgetCategories = memo(
             collisionDetection={closestCenter}
             modifiers={[restrictToVerticalAxis, restrictToParentElement]}
             onDragStart={onDragStart}
-            onDragMove={onDragMove}
+            onDragOver={onDragOver}
             onDragEnd={onDragEnd}
           >
             <SortableContext

diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -81,7 +81,6 @@ export function SidebarGroup({
           minWidth: 0,
         }}
       >
-        {dragPreview && <Text style={{ fontWeight: 500 }}>Group: </Text>}
         {group.name}
       </div>
       {!dragPreview && (