Browse Source

When the root folder is selected, ignore the selected items when dragging (#15392)

GitOrigin-RevId: a43e4f668d2df8c9abe5d67bd42546eaa5496c59
Alf Eaton 3 years ago
parent
commit
2678600108

+ 2 - 2
services/web/frontend/js/features/file-tree/contexts/file-tree-draggable.jsx

@@ -83,7 +83,7 @@ export function useDraggable(draggedEntityId) {
 
   const { permissionsLevel } = useEditorContext(editorContextPropTypes)
   const { fileTreeData } = useFileTreeData()
-  const { selectedEntityIds } = useFileTreeSelectable()
+  const { selectedEntityIds, isRootFolderSelected } = useFileTreeSelectable()
 
   const [isDraggable, setIsDraggable] = useState(true)
 
@@ -92,7 +92,7 @@ export function useDraggable(draggedEntityId) {
     item, // required, but overwritten by the return value of `begin`
     begin: () => {
       const draggedEntityIds = getDraggedEntityIds(
-        selectedEntityIds,
+        isRootFolderSelected ? new Set() : selectedEntityIds,
         draggedEntityId
       )
       const draggedItems = findAllInTreeOrThrow(fileTreeData, draggedEntityIds)