@strapi/upload 5.51.2 → 5.52.1

package/dist/admin/future/pages/Assets/components/Dnd/AssetsDndProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"AssetsDndProvider.mjs","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/AssetsDndProvider.tsx"],"sourcesContent":["import {\n  createContext,\n  useCallback,\n  useContext,\n  useMemo,\n  useRef,\n  useState,\n  type ReactNode,\n} from 'react';\n\nimport {\n  DndContext,\n  DragOverlay,\n  PointerSensor,\n  pointerWithin,\n  useSensor,\n  useSensors,\n  type DragEndEvent,\n  type DragStartEvent,\n} from '@dnd-kit/core';\nimport { useNotification } from '@strapi/admin/strapi-admin';\nimport { Box, VisuallyHidden } from '@strapi/design-system';\nimport { useIntl } from 'react-intl';\n\nimport { useMediaLibraryPermissions } from '../../../../hooks/useMediaLibraryPermissions';\nimport { useBulkMoveMutation, useGetFolderStructureQuery } from '../../../../services/folders';\nimport { buildBulkMovePayload } from '../../../../utils/buildBulkMovePayload';\nimport { canDropItemOnFolder } from '../../../../utils/canDropItemOnFolder';\nimport { formatMoveSuccessMessage } from '../../../../utils/formatMoveSuccessMessage';\nimport { getBulkMoveErrorMessage } from '../../../../utils/getBulkMoveErrorMessage';\nimport { getFolderLabel } from '../../../../utils/getFolderLabel';\nimport { getTranslationKey } from '../../../../utils/translations';\nimport { useAssetSelectionOptional } from '../../hooks/useAssetSelection';\nimport { useFolderNavigation } from '../../hooks/useFolderNavigation';\n\nimport { buildDragSet } from './buildDragSet';\nimport { computeValidDropTargets } from './computeValidDropTargets';\nimport { parseFolderTargetId, parseFolderTreeTargetId } from './dndIds';\nimport { DragOverlayChip } from './DragOverlayChip';\n\nimport type { DragItemData } from '../../../../types/dnd';\n\n/* -------------------------------------------------------------------------------------------------\n * Context — shared with UploadDropZoneProvider for bidirectional drag guard.\n * See UploadDropZoneContext.tsx TODO linking both providers.\n * -----------------------------------------------------------------------------------------------*/\n\ninterface AssetsDndContextValue {\n  isInternalDragActive: boolean;\n  isMovePending: boolean;\n  /** O(1) lookup of whether the current drag set may drop on this destination. */\n  isValidDropTarget: (targetFolderId: number | null) => boolean;\n}\n\nconst AssetsDndContext = createContext<AssetsDndContextValue | null>(null);\n\nexport const useAssetsDnd = () => {\n  const context = useContext(AssetsDndContext);\n\n  if (!context) {\n    throw new Error('useAssetsDnd must be used within AssetsDndProvider');\n  }\n\n  return context;\n};\n\nexport const useAssetsDndOptional = () => useContext(AssetsDndContext);\n\n/* -------------------------------------------------------------------------------------------------\n * Provider\n * -----------------------------------------------------------------------------------------------*/\n\ninterface AssetsDndProviderProps {\n  children: ReactNode;\n}\n\ninterface DragSession {\n  items: DragItemData[];\n  fromSelection: boolean;\n}\n\nconst resolveDestination = (\n  overId: string | number\n): { destinationFolderId: number | null } | null => {\n  const inView = parseFolderTargetId(overId);\n\n  if (inView != null) {\n    return { destinationFolderId: inView };\n  }\n\n  const tree = parseFolderTreeTargetId(overId);\n\n  if (tree === 'root') {\n    return { destinationFolderId: null };\n  }\n\n  if (typeof tree === 'number') {\n    return { destinationFolderId: tree };\n  }\n\n  return null;\n};\n\n// Activation distance no real pointer gesture will ever reach — used to keep a\n// constant-length sensor array while disabling drag for users without the move\n// permission (see the note in the provider).\nconst DRAG_DISABLED_DISTANCE = Number.MAX_SAFE_INTEGER;\n\nexport const AssetsDndProvider = ({ children }: AssetsDndProviderProps) => {\n  const { formatMessage } = useIntl();\n  const { toggleNotification } = useNotification();\n  const selection = useAssetSelectionOptional();\n  const { currentFolderId } = useFolderNavigation();\n  const { data: folderStructure = [] } = useGetFolderStructureQuery();\n  const rootLabel = formatMessage({\n    id: getTranslationKey('plugin.name'),\n    defaultMessage: 'Media Library',\n  });\n  const [bulkMove, { isLoading: isMovePending }] = useBulkMoveMutation();\n  const [dragItems, setDragItems] = useState<DragItemData[]>([]);\n  const [liveAnnouncement, setLiveAnnouncement] = useState('');\n  // Sync session for drag-end — state alone can lag one render behind dragStart.\n  const dragSessionRef = useRef<DragSession>({ items: [], fromSelection: false });\n\n  const announceToLiveRegion = useCallback((message: string) => {\n    setLiveAnnouncement('');\n    requestAnimationFrame(() => setLiveAnnouncement(message));\n  }, []);\n\n  // Moving is a mutation (bulk-move → `assets.update`); without the permission\n  // pointer drag must never activate. Keyboard moves go through BulkMoveDialog,\n  // which is itself gated.\n  //\n  // The gate has to keep BOTH the `useSensor`/`useSensors` calls AND the sensor\n  // array's length constant across renders: `canUpdate` starts false and flips\n  // true once the RBAC check resolves, and dnd-kit keys internal memos/effects\n  // on the sensor list, erroring if its size changes (\"argument changed size\n  // between renders\"). So adding/removing a sensor is out — instead keep one\n  // PointerSensor always and push its activation distance out of reach when the\n  // user can't move, which no real drag gesture will ever satisfy.\n  const { canUpdate } = useMediaLibraryPermissions();\n  const sensors = useSensors(\n    useSensor(PointerSensor, {\n      activationConstraint: { distance: canUpdate ? 8 : DRAG_DISABLED_DISTANCE },\n    })\n  );\n\n  const validDropTargets = useMemo(\n    () => computeValidDropTargets(dragItems, folderStructure),\n    [dragItems, folderStructure]\n  );\n\n  const isValidDropTarget = useCallback(\n    (targetFolderId: number | null) => validDropTargets.has(targetFolderId),\n    [validDropTargets]\n  );\n\n  const contextValue = useMemo<AssetsDndContextValue>(\n    () => ({\n      isInternalDragActive: dragItems.length > 0,\n      isMovePending,\n      isValidDropTarget,\n    }),\n    [dragItems.length, isMovePending, isValidDropTarget]\n  );\n\n  const clearDragState = useCallback(() => {\n    dragSessionRef.current = { items: [], fromSelection: false };\n    setDragItems([]);\n  }, []);\n\n  const handleDragStart = useCallback(\n    (event: DragStartEvent) => {\n      const data = event.active.data.current as DragItemData | undefined;\n\n      if (!data) {\n        clearDragState();\n        return;\n      }\n\n      const { items, fromSelection } = buildDragSet(data, selection?.selectedKeys, currentFolderId);\n      dragSessionRef.current = { items, fromSelection };\n      setDragItems(items);\n    },\n    [clearDragState, currentFolderId, selection?.selectedKeys]\n  );\n\n  const handleDragEnd = useCallback(\n    async (event: DragEndEvent) => {\n      const { over } = event;\n      const { items, fromSelection } = dragSessionRef.current;\n      clearDragState();\n\n      if (isMovePending || !over || items.length === 0) {\n        return;\n      }\n\n      const destination = resolveDestination(over.id);\n\n      if (!destination) {\n        return;\n      }\n\n      const { destinationFolderId: targetFolderId } = destination;\n\n      if (\n        !canDropItemOnFolder({\n          items,\n          targetFolderId,\n          folderStructure,\n        })\n      ) {\n        return;\n      }\n\n      const payload = buildBulkMovePayload(items);\n      // Source is always the current folder — dragged items are, by definition,\n      // visible in the current view. Destination is the drop target. Both use\n      // leaf names so the DnD toast reads identically to the dialog's.\n      const successMessage = formatMoveSuccessMessage({\n        formatMessage,\n        count: items.length,\n        source: getFolderLabel(folderStructure, currentFolderId, rootLabel),\n        destination: getFolderLabel(folderStructure, targetFolderId, rootLabel),\n      });\n      const errorFallback = formatMessage({\n        id: getTranslationKey('list.bulk-actions.move.error'),\n        defaultMessage: 'An error occurred while moving the items.',\n      });\n\n      try {\n        await bulkMove({ ...payload, destinationFolderId: targetFolderId }).unwrap();\n\n        if (fromSelection) {\n          selection?.clear();\n        }\n\n        announceToLiveRegion(successMessage);\n\n        toggleNotification({\n          type: 'success',\n          message: successMessage,\n        });\n      } catch (error) {\n        const errorMessage = getBulkMoveErrorMessage(error, errorFallback);\n\n        announceToLiveRegion(\n          formatMessage(\n            {\n              id: getTranslationKey('dnd.announce.move-failure'),\n              defaultMessage: 'Move failed. {message}',\n            },\n            { message: errorMessage }\n          )\n        );\n\n        toggleNotification({\n          type: 'danger',\n          message: errorMessage,\n        });\n      }\n    },\n    [\n      announceToLiveRegion,\n      bulkMove,\n      clearDragState,\n      currentFolderId,\n      folderStructure,\n      formatMessage,\n      isMovePending,\n      rootLabel,\n      selection,\n      toggleNotification,\n    ]\n  );\n\n  const handleDragCancel = useCallback(() => {\n    clearDragState();\n  }, [clearDragState]);\n\n  const announcements = useMemo(\n    () => ({\n      onDragStart: ({ active }: DragStartEvent) => {\n        const data = active.data.current as DragItemData | undefined;\n        return data\n          ? formatMessage(\n              {\n                id: getTranslationKey('dnd.announce.drag-start'),\n                defaultMessage: 'Picked up {name}. Drop on a folder to move.',\n              },\n              { name: data.name }\n            )\n          : '';\n      },\n      onDragOver: () => '',\n      onDragEnd: ({ active, over }: DragEndEvent) => {\n        if (!over) {\n          return formatMessage({\n            id: getTranslationKey('dnd.announce.cancel'),\n            defaultMessage: 'Drag cancelled.',\n          });\n        }\n\n        const destination = resolveDestination(over.id);\n        const activeData = active.data.current as DragItemData | undefined;\n\n        if (!destination || !activeData) {\n          return '';\n        }\n\n        const { items } = buildDragSet(activeData, selection?.selectedKeys, currentFolderId);\n\n        if (\n          !canDropItemOnFolder({\n            items,\n            targetFolderId: destination.destinationFolderId,\n            folderStructure,\n          })\n        ) {\n          return formatMessage({\n            id: getTranslationKey('dnd.announce.invalid-drop'),\n            defaultMessage: 'Cannot move item to this folder.',\n          });\n        }\n\n        return '';\n      },\n      onDragCancel: () =>\n        formatMessage({\n          id: getTranslationKey('dnd.announce.cancel'),\n          defaultMessage: 'Drag cancelled.',\n        }),\n    }),\n    [currentFolderId, folderStructure, formatMessage, selection?.selectedKeys]\n  );\n\n  return (\n    <AssetsDndContext.Provider value={contextValue}>\n      <DndContext\n        sensors={sensors}\n        collisionDetection={pointerWithin}\n        onDragStart={handleDragStart}\n        onDragEnd={handleDragEnd}\n        onDragCancel={handleDragCancel}\n        accessibility={{ announcements }}\n      >\n        <VisuallyHidden aria-live=\"polite\" aria-atomic=\"true\">\n          {liveAnnouncement}\n        </VisuallyHidden>\n        <Box position=\"relative\">{children}</Box>\n        <DragOverlay dropAnimation={null}>\n          {dragItems.length > 0 ? <DragOverlayChip items={dragItems} /> : null}\n        </DragOverlay>\n      </DndContext>\n    </AssetsDndContext.Provider>\n  );\n};\n\n// Keyboard-accessible moves are handled by `BulkMoveDialog` (reachable from the\n// bulk-actions bar): pointer drag is a mouse-only enhancement, the dialog is the\n// a11y path. No `KeyboardSensor` by design.\n"],"names":["AssetsDndContext","createContext","useAssetsDndOptional","useContext","resolveDestination","overId","inView","parseFolderTargetId","destinationFolderId","tree","parseFolderTreeTargetId","DRAG_DISABLED_DISTANCE","Number","MAX_SAFE_INTEGER","AssetsDndProvider","children","formatMessage","useIntl","toggleNotification","useNotification","selection","useAssetSelectionOptional","currentFolderId","useFolderNavigation","data","folderStructure","useGetFolderStructureQuery","rootLabel","id","getTranslationKey","defaultMessage","bulkMove","isLoading","isMovePending","useBulkMoveMutation","dragItems","setDragItems","useState","liveAnnouncement","setLiveAnnouncement","dragSessionRef","useRef","items","fromSelection","announceToLiveRegion","useCallback","message","requestAnimationFrame","canUpdate","useMediaLibraryPermissions","sensors","useSensors","useSensor","PointerSensor","activationConstraint","distance","validDropTargets","useMemo","computeValidDropTargets","isValidDropTarget","targetFolderId","has","contextValue","isInternalDragActive","length","clearDragState","current","handleDragStart","event","active","buildDragSet","selectedKeys","handleDragEnd","over","destination","canDropItemOnFolder","payload","buildBulkMovePayload","successMessage","formatMoveSuccessMessage","count","source","getFolderLabel","errorFallback","unwrap","clear","type","error","errorMessage","getBulkMoveErrorMessage","handleDragCancel","announcements","onDragStart","name","onDragOver","onDragEnd","activeData","onDragCancel","_jsx","Provider","value","_jsxs","DndContext","collisionDetection","pointerWithin","accessibility","VisuallyHidden","aria-live","aria-atomic","Box","position","DragOverlay","dropAnimation","DragOverlayChip"],"mappings":"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"}
+{"version":3,"file":"AssetsDndProvider.mjs","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/AssetsDndProvider.tsx"],"sourcesContent":["import {\n  createContext,\n  useCallback,\n  useContext,\n  useMemo,\n  useRef,\n  useState,\n  type ReactNode,\n} from 'react';\n\nimport {\n  DndContext,\n  DragOverlay,\n  PointerSensor,\n  pointerWithin,\n  useSensor,\n  useSensors,\n  type DragEndEvent,\n  type DragStartEvent,\n} from '@dnd-kit/core';\nimport { useNotification } from '@strapi/admin/strapi-admin';\nimport { Flex, VisuallyHidden } from '@strapi/design-system';\nimport { useIntl } from 'react-intl';\n\nimport { useMediaLibraryPermissions } from '../../../../hooks/useMediaLibraryPermissions';\nimport { useBulkMoveMutation, useGetFolderStructureQuery } from '../../../../services/folders';\nimport { buildBulkMovePayload } from '../../../../utils/buildBulkMovePayload';\nimport { canDropItemOnFolder } from '../../../../utils/canDropItemOnFolder';\nimport { formatMoveSuccessMessage } from '../../../../utils/formatMoveSuccessMessage';\nimport { getBulkMoveErrorMessage } from '../../../../utils/getBulkMoveErrorMessage';\nimport { getFolderLabel } from '../../../../utils/getFolderLabel';\nimport { emptyItemLocations, type ItemLocations } from '../../../../utils/itemLocations';\nimport { getTranslationKey } from '../../../../utils/translations';\nimport { useAssetSelectionOptional } from '../../hooks/useAssetSelection';\nimport { useFolderNavigation } from '../../hooks/useFolderNavigation';\n\nimport { buildDragSet } from './buildDragSet';\nimport { computeValidDropTargets } from './computeValidDropTargets';\nimport { parseFolderTargetId, parseFolderTreeTargetId } from './dndIds';\nimport { DragOverlayChip } from './DragOverlayChip';\n\nimport type { DragItemData } from '../../../../types/dnd';\n\n/* -------------------------------------------------------------------------------------------------\n * Context — shared with UploadDropZoneProvider for bidirectional drag guard.\n * See UploadDropZoneContext.tsx TODO linking both providers.\n * -----------------------------------------------------------------------------------------------*/\n\ninterface AssetsDndContextValue {\n  isInternalDragActive: boolean;\n  isMovePending: boolean;\n  /** O(1) lookup of whether the current drag set may drop on this destination. */\n  isValidDropTarget: (targetFolderId: number | null) => boolean;\n}\n\nconst AssetsDndContext = createContext<AssetsDndContextValue | null>(null);\n\nexport const useAssetsDnd = () => {\n  const context = useContext(AssetsDndContext);\n\n  if (!context) {\n    throw new Error('useAssetsDnd must be used within AssetsDndProvider');\n  }\n\n  return context;\n};\n\nexport const useAssetsDndOptional = () => useContext(AssetsDndContext);\n\n/* -------------------------------------------------------------------------------------------------\n * Provider\n * -----------------------------------------------------------------------------------------------*/\n\ninterface AssetsDndProviderProps {\n  children: ReactNode;\n  /**\n   * Real location of every loaded row, so a multi-item drag validates against\n   * each item's own parent. Defaults to a lookup that misses everything, which\n   * falls back to the folder currently open.\n   */\n  locations?: ItemLocations;\n}\n\ninterface DragSession {\n  items: DragItemData[];\n  fromSelection: boolean;\n  /** Location of the grabbed row — names the source in the success toast. */\n  activeSourceFolderId: number | null;\n  /** True when the set spans several source folders, so none can be named. */\n  spansMultipleSources: boolean;\n}\n\nconst resolveDestination = (\n  overId: string | number\n): { destinationFolderId: number | null } | null => {\n  const inView = parseFolderTargetId(overId);\n\n  if (inView != null) {\n    return { destinationFolderId: inView };\n  }\n\n  const tree = parseFolderTreeTargetId(overId);\n\n  if (tree === 'root') {\n    return { destinationFolderId: null };\n  }\n\n  if (typeof tree === 'number') {\n    return { destinationFolderId: tree };\n  }\n\n  return null;\n};\n\n// Activation distance no real pointer gesture will ever reach — used to keep a\n// constant-length sensor array while disabling drag for users without the move\n// permission (see the note in the provider).\nconst DRAG_DISABLED_DISTANCE = Number.MAX_SAFE_INTEGER;\n\nexport const AssetsDndProvider = ({\n  children,\n  locations = emptyItemLocations,\n}: AssetsDndProviderProps) => {\n  const { formatMessage } = useIntl();\n  const { toggleNotification } = useNotification();\n  const selection = useAssetSelectionOptional();\n  const { currentFolderId } = useFolderNavigation();\n  const { data: folderStructure = [] } = useGetFolderStructureQuery();\n  const rootLabel = formatMessage({\n    id: getTranslationKey('plugin.name'),\n    defaultMessage: 'Media Library',\n  });\n  const [bulkMove, { isLoading: isMovePending }] = useBulkMoveMutation();\n  const [dragItems, setDragItems] = useState<DragItemData[]>([]);\n  const [liveAnnouncement, setLiveAnnouncement] = useState('');\n  // Sync session for drag-end — state alone can lag one render behind dragStart.\n  const dragSessionRef = useRef<DragSession>({\n    items: [],\n    fromSelection: false,\n    activeSourceFolderId: null,\n    spansMultipleSources: false,\n  });\n\n  const announceToLiveRegion = useCallback((message: string) => {\n    setLiveAnnouncement('');\n    requestAnimationFrame(() => setLiveAnnouncement(message));\n  }, []);\n\n  // Moving is a mutation (bulk-move → `assets.update`); without the permission\n  // pointer drag must never activate. Keyboard moves go through BulkMoveDialog,\n  // which is itself gated.\n  //\n  // The gate has to keep BOTH the `useSensor`/`useSensors` calls AND the sensor\n  // array's length constant across renders: `canUpdate` starts false and flips\n  // true once the RBAC check resolves, and dnd-kit keys internal memos/effects\n  // on the sensor list, erroring if its size changes (\"argument changed size\n  // between renders\"). So adding/removing a sensor is out — instead keep one\n  // PointerSensor always and push its activation distance out of reach when the\n  // user can't move, which no real drag gesture will ever satisfy.\n  const { canUpdate } = useMediaLibraryPermissions();\n  const sensors = useSensors(\n    useSensor(PointerSensor, {\n      activationConstraint: { distance: canUpdate ? 8 : DRAG_DISABLED_DISTANCE },\n    })\n  );\n\n  const validDropTargets = useMemo(\n    () => computeValidDropTargets(dragItems, folderStructure),\n    [dragItems, folderStructure]\n  );\n\n  const isValidDropTarget = useCallback(\n    (targetFolderId: number | null) => validDropTargets.has(targetFolderId),\n    [validDropTargets]\n  );\n\n  const contextValue = useMemo<AssetsDndContextValue>(\n    () => ({\n      isInternalDragActive: dragItems.length > 0,\n      isMovePending,\n      isValidDropTarget,\n    }),\n    [dragItems.length, isMovePending, isValidDropTarget]\n  );\n\n  const clearDragState = useCallback(() => {\n    dragSessionRef.current = {\n      items: [],\n      fromSelection: false,\n      activeSourceFolderId: null,\n      spansMultipleSources: false,\n    };\n    setDragItems([]);\n  }, []);\n\n  const handleDragStart = useCallback(\n    (event: DragStartEvent) => {\n      const data = event.active.data.current as DragItemData | undefined;\n\n      if (!data) {\n        clearDragState();\n        return;\n      }\n\n      const dragSet = buildDragSet(data, selection?.selectedKeys, locations, currentFolderId);\n      dragSessionRef.current = dragSet;\n      setDragItems(dragSet.items);\n    },\n    [clearDragState, currentFolderId, locations, selection?.selectedKeys]\n  );\n\n  const handleDragEnd = useCallback(\n    async (event: DragEndEvent) => {\n      const { over } = event;\n      const { items, fromSelection, activeSourceFolderId, spansMultipleSources } =\n        dragSessionRef.current;\n      clearDragState();\n\n      if (isMovePending || !over || items.length === 0) {\n        return;\n      }\n\n      const destination = resolveDestination(over.id);\n\n      if (!destination) {\n        return;\n      }\n\n      const { destinationFolderId: targetFolderId } = destination;\n\n      if (\n        !canDropItemOnFolder({\n          items,\n          targetFolderId,\n          folderStructure,\n        })\n      ) {\n        return;\n      }\n\n      const payload = buildBulkMovePayload(items);\n      // Source is the grabbed row's own location, not the folder currently open:\n      // a global search result can be dragged out of a folder the user isn't in.\n      // A search-built selection can also span folders, and then no single\n      // source is true for the whole set — `null` drops it from the wording\n      // instead of naming one item's folder for all of them. Destination is the\n      // drop target. Both use leaf names so the DnD toast reads identically to\n      // the dialog's.\n      const successMessage = formatMoveSuccessMessage({\n        formatMessage,\n        count: items.length,\n        source: spansMultipleSources\n          ? null\n          : getFolderLabel(folderStructure, activeSourceFolderId, rootLabel),\n        destination: getFolderLabel(folderStructure, targetFolderId, rootLabel),\n      });\n      const errorFallback = formatMessage({\n        id: getTranslationKey('list.bulk-actions.move.error'),\n        defaultMessage: 'An error occurred while moving the items.',\n      });\n\n      try {\n        await bulkMove({ ...payload, destinationFolderId: targetFolderId }).unwrap();\n\n        if (fromSelection) {\n          selection?.clear();\n        }\n\n        announceToLiveRegion(successMessage);\n\n        toggleNotification({\n          type: 'success',\n          message: successMessage,\n        });\n      } catch (error) {\n        const errorMessage = getBulkMoveErrorMessage(error, errorFallback);\n\n        announceToLiveRegion(\n          formatMessage(\n            {\n              id: getTranslationKey('dnd.announce.move-failure'),\n              defaultMessage: 'Move failed. {message}',\n            },\n            { message: errorMessage }\n          )\n        );\n\n        toggleNotification({\n          type: 'danger',\n          message: errorMessage,\n        });\n      }\n    },\n    [\n      announceToLiveRegion,\n      bulkMove,\n      clearDragState,\n      folderStructure,\n      formatMessage,\n      isMovePending,\n      rootLabel,\n      selection,\n      toggleNotification,\n    ]\n  );\n\n  const handleDragCancel = useCallback(() => {\n    clearDragState();\n  }, [clearDragState]);\n\n  const announcements = useMemo(\n    () => ({\n      onDragStart: ({ active }: DragStartEvent) => {\n        const data = active.data.current as DragItemData | undefined;\n        return data\n          ? formatMessage(\n              {\n                id: getTranslationKey('dnd.announce.drag-start'),\n                defaultMessage: 'Picked up {name}. Drop on a folder to move.',\n              },\n              { name: data.name }\n            )\n          : '';\n      },\n      onDragOver: () => '',\n      onDragEnd: ({ active, over }: DragEndEvent) => {\n        if (!over) {\n          return formatMessage({\n            id: getTranslationKey('dnd.announce.cancel'),\n            defaultMessage: 'Drag cancelled.',\n          });\n        }\n\n        const destination = resolveDestination(over.id);\n        const activeData = active.data.current as DragItemData | undefined;\n\n        if (!destination || !activeData) {\n          return '';\n        }\n\n        const { items } = buildDragSet(\n          activeData,\n          selection?.selectedKeys,\n          locations,\n          currentFolderId\n        );\n\n        if (\n          !canDropItemOnFolder({\n            items,\n            targetFolderId: destination.destinationFolderId,\n            folderStructure,\n          })\n        ) {\n          return formatMessage({\n            id: getTranslationKey('dnd.announce.invalid-drop'),\n            defaultMessage: 'Cannot move item to this folder.',\n          });\n        }\n\n        return '';\n      },\n      onDragCancel: () =>\n        formatMessage({\n          id: getTranslationKey('dnd.announce.cancel'),\n          defaultMessage: 'Drag cancelled.',\n        }),\n    }),\n    [currentFolderId, folderStructure, formatMessage, locations, selection?.selectedKeys]\n  );\n\n  return (\n    <AssetsDndContext.Provider value={contextValue}>\n      <DndContext\n        sensors={sensors}\n        collisionDetection={pointerWithin}\n        onDragStart={handleDragStart}\n        onDragEnd={handleDragEnd}\n        onDragCancel={handleDragCancel}\n        accessibility={{ announcements }}\n      >\n        <VisuallyHidden aria-live=\"polite\" aria-atomic=\"true\">\n          {liveAnnouncement}\n        </VisuallyHidden>\n        <Flex position=\"relative\" alignItems=\"stretch\" direction=\"column\" height=\"100%\">\n          {children}\n        </Flex>\n        <DragOverlay dropAnimation={null}>\n          {dragItems.length > 0 ? <DragOverlayChip items={dragItems} /> : null}\n        </DragOverlay>\n      </DndContext>\n    </AssetsDndContext.Provider>\n  );\n};\n\n// Keyboard-accessible moves are handled by `BulkMoveDialog` (reachable from the\n// bulk-actions bar): pointer drag is a mouse-only enhancement, the dialog is the\n// a11y path. No `KeyboardSensor` by design.\n"],"names":["AssetsDndContext","createContext","useAssetsDndOptional","useContext","resolveDestination","overId","inView","parseFolderTargetId","destinationFolderId","tree","parseFolderTreeTargetId","DRAG_DISABLED_DISTANCE","Number","MAX_SAFE_INTEGER","AssetsDndProvider","children","locations","emptyItemLocations","formatMessage","useIntl","toggleNotification","useNotification","selection","useAssetSelectionOptional","currentFolderId","useFolderNavigation","data","folderStructure","useGetFolderStructureQuery","rootLabel","id","getTranslationKey","defaultMessage","bulkMove","isLoading","isMovePending","useBulkMoveMutation","dragItems","setDragItems","useState","liveAnnouncement","setLiveAnnouncement","dragSessionRef","useRef","items","fromSelection","activeSourceFolderId","spansMultipleSources","announceToLiveRegion","useCallback","message","requestAnimationFrame","canUpdate","useMediaLibraryPermissions","sensors","useSensors","useSensor","PointerSensor","activationConstraint","distance","validDropTargets","useMemo","computeValidDropTargets","isValidDropTarget","targetFolderId","has","contextValue","isInternalDragActive","length","clearDragState","current","handleDragStart","event","active","dragSet","buildDragSet","selectedKeys","handleDragEnd","over","destination","canDropItemOnFolder","payload","buildBulkMovePayload","successMessage","formatMoveSuccessMessage","count","source","getFolderLabel","errorFallback","unwrap","clear","type","error","errorMessage","getBulkMoveErrorMessage","handleDragCancel","announcements","onDragStart","name","onDragOver","onDragEnd","activeData","onDragCancel","_jsx","Provider","value","_jsxs","DndContext","collisionDetection","pointerWithin","accessibility","VisuallyHidden","aria-live","aria-atomic","Flex","position","alignItems","direction","height","DragOverlay","dropAnimation","DragOverlayChip"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAuDA,MAAMA,iCAAmBC,aAAAA,CAA4C,IAAA,CAAA;AAY9D,MAAMC,oBAAAA,GAAuB,IAAMC,UAAAA,CAAWH,gBAAAA;AAyBrD,MAAMI,qBAAqB,CACzBC,MAAAA,GAAAA;AAEA,IAAA,MAAMC,SAASC,mBAAAA,CAAoBF,MAAAA,CAAAA;AAEnC,IAAA,IAAIC,UAAU,IAAA,EAAM;QAClB,OAAO;YAAEE,mBAAAA,EAAqBF;AAAO,SAAA;AACvC,IAAA;AAEA,IAAA,MAAMG,OAAOC,uBAAAA,CAAwBL,MAAAA,CAAAA;AAErC,IAAA,IAAII,SAAS,MAAA,EAAQ;QACnB,OAAO;YAAED,mBAAAA,EAAqB;AAAK,SAAA;AACrC,IAAA;IAEA,IAAI,OAAOC,SAAS,QAAA,EAAU;QAC5B,OAAO;YAAED,mBAAAA,EAAqBC;AAAK,SAAA;AACrC,IAAA;IAEA,OAAO,IAAA;AACT,CAAA;AAEA;AACA;AACA;AACA,MAAME,sBAAAA,GAAyBC,OAAOC,gBAAgB;AAE/C,MAAMC,oBAAoB,CAAC,EAChCC,QAAQ,EACRC,SAAAA,GAAYC,kBAAkB,EACP,GAAA;IACvB,MAAM,EAAEC,aAAa,EAAE,GAAGC,OAAAA,EAAAA;IAC1B,MAAM,EAAEC,kBAAkB,EAAE,GAAGC,eAAAA,EAAAA;AAC/B,IAAA,MAAMC,SAAAA,GAAYC,yBAAAA,EAAAA;IAClB,MAAM,EAAEC,eAAe,EAAE,GAAGC,mBAAAA,EAAAA;AAC5B,IAAA,MAAM,EAAEC,IAAAA,EAAMC,eAAAA,GAAkB,EAAE,EAAE,GAAGC,0BAAAA,EAAAA;AACvC,IAAA,MAAMC,YAAYX,aAAAA,CAAc;AAC9BY,QAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,aAAA,CAAA;QACtBC,cAAAA,EAAgB;AAClB,KAAA,CAAA;AACA,IAAA,MAAM,CAACC,QAAAA,EAAU,EAAEC,WAAWC,aAAa,EAAE,CAAC,GAAGC,mBAAAA,EAAAA;AACjD,IAAA,MAAM,CAACC,SAAAA,EAAWC,YAAAA,CAAa,GAAGC,SAAyB,EAAE,CAAA;AAC7D,IAAA,MAAM,CAACC,gBAAAA,EAAkBC,mBAAAA,CAAoB,GAAGF,QAAAA,CAAS,EAAA,CAAA;;AAEzD,IAAA,MAAMG,iBAAiBC,MAAAA,CAAoB;AACzCC,QAAAA,KAAAA,EAAO,EAAE;QACTC,aAAAA,EAAe,KAAA;QACfC,oBAAAA,EAAsB,IAAA;QACtBC,oBAAAA,EAAsB;AACxB,KAAA,CAAA;IAEA,MAAMC,oBAAAA,GAAuBC,YAAY,CAACC,OAAAA,GAAAA;QACxCT,mBAAAA,CAAoB,EAAA,CAAA;AACpBU,QAAAA,qBAAAA,CAAsB,IAAMV,mBAAAA,CAAoBS,OAAAA,CAAAA,CAAAA;AAClD,IAAA,CAAA,EAAG,EAAE,CAAA;;;;;;;;;;;;IAaL,MAAM,EAAEE,SAAS,EAAE,GAAGC,0BAAAA,EAAAA;IACtB,MAAMC,OAAAA,GAAUC,UAAAA,CACdC,SAAAA,CAAUC,aAAAA,EAAe;QACvBC,oBAAAA,EAAsB;AAAEC,YAAAA,QAAAA,EAAUP,YAAY,CAAA,GAAIzC;AAAuB;AAC3E,KAAA,CAAA,CAAA;AAGF,IAAA,MAAMiD,gBAAAA,GAAmBC,OAAAA,CACvB,IAAMC,uBAAAA,CAAwBzB,WAAWV,eAAAA,CAAAA,EACzC;AAACU,QAAAA,SAAAA;AAAWV,QAAAA;AAAgB,KAAA,CAAA;AAG9B,IAAA,MAAMoC,oBAAoBd,WAAAA,CACxB,CAACe,iBAAkCJ,gBAAAA,CAAiBK,GAAG,CAACD,cAAAA,CAAAA,EACxD;AAACJ,QAAAA;AAAiB,KAAA,CAAA;IAGpB,MAAMM,YAAAA,GAAeL,OAAAA,CACnB,KAAO;YACLM,oBAAAA,EAAsB9B,SAAAA,CAAU+B,MAAM,GAAG,CAAA;AACzCjC,YAAAA,aAAAA;AACA4B,YAAAA;AACF,SAAA,CAAA,EACA;AAAC1B,QAAAA,SAAAA,CAAU+B,MAAM;AAAEjC,QAAAA,aAAAA;AAAe4B,QAAAA;AAAkB,KAAA,CAAA;AAGtD,IAAA,MAAMM,iBAAiBpB,WAAAA,CAAY,IAAA;AACjCP,QAAAA,cAAAA,CAAe4B,OAAO,GAAG;AACvB1B,YAAAA,KAAAA,EAAO,EAAE;YACTC,aAAAA,EAAe,KAAA;YACfC,oBAAAA,EAAsB,IAAA;YACtBC,oBAAAA,EAAsB;AACxB,SAAA;AACAT,QAAAA,YAAAA,CAAa,EAAE,CAAA;AACjB,IAAA,CAAA,EAAG,EAAE,CAAA;IAEL,MAAMiC,eAAAA,GAAkBtB,YACtB,CAACuB,KAAAA,GAAAA;AACC,QAAA,MAAM9C,OAAO8C,KAAAA,CAAMC,MAAM,CAAC/C,IAAI,CAAC4C,OAAO;AAEtC,QAAA,IAAI,CAAC5C,IAAAA,EAAM;AACT2C,YAAAA,cAAAA,EAAAA;AACA,YAAA;AACF,QAAA;AAEA,QAAA,MAAMK,OAAAA,GAAUC,YAAAA,CAAajD,IAAAA,EAAMJ,SAAAA,EAAWsD,cAAc5D,SAAAA,EAAWQ,eAAAA,CAAAA;AACvEkB,QAAAA,cAAAA,CAAe4B,OAAO,GAAGI,OAAAA;AACzBpC,QAAAA,YAAAA,CAAaoC,QAAQ9B,KAAK,CAAA;IAC5B,CAAA,EACA;AAACyB,QAAAA,cAAAA;AAAgB7C,QAAAA,eAAAA;AAAiBR,QAAAA,SAAAA;QAAWM,SAAAA,EAAWsD;AAAa,KAAA,CAAA;IAGvE,MAAMC,aAAAA,GAAgB5B,YACpB,OAAOuB,KAAAA,GAAAA;QACL,MAAM,EAAEM,IAAI,EAAE,GAAGN,KAAAA;QACjB,MAAM,EAAE5B,KAAK,EAAEC,aAAa,EAAEC,oBAAoB,EAAEC,oBAAoB,EAAE,GACxEL,cAAAA,CAAe4B,OAAO;AACxBD,QAAAA,cAAAA,EAAAA;AAEA,QAAA,IAAIlC,iBAAiB,CAAC2C,IAAAA,IAAQlC,KAAAA,CAAMwB,MAAM,KAAK,CAAA,EAAG;AAChD,YAAA;AACF,QAAA;QAEA,MAAMW,WAAAA,GAAc3E,kBAAAA,CAAmB0E,IAAAA,CAAKhD,EAAE,CAAA;AAE9C,QAAA,IAAI,CAACiD,WAAAA,EAAa;AAChB,YAAA;AACF,QAAA;AAEA,QAAA,MAAM,EAAEvE,mBAAAA,EAAqBwD,cAAc,EAAE,GAAGe,WAAAA;AAEhD,QAAA,IACE,CAACC,mBAAAA,CAAoB;AACnBpC,YAAAA,KAAAA;AACAoB,YAAAA,cAAAA;AACArC,YAAAA;SACF,CAAA,EACA;AACA,YAAA;AACF,QAAA;AAEA,QAAA,MAAMsD,UAAUC,oBAAAA,CAAqBtC,KAAAA,CAAAA;;;;;;;;AAQrC,QAAA,MAAMuC,iBAAiBC,wBAAAA,CAAyB;AAC9ClE,YAAAA,aAAAA;AACAmE,YAAAA,KAAAA,EAAOzC,MAAMwB,MAAM;AACnBkB,YAAAA,MAAAA,EAAQvC,oBAAAA,GACJ,IAAA,GACAwC,cAAAA,CAAe5D,eAAAA,EAAiBmB,oBAAAA,EAAsBjB,SAAAA,CAAAA;YAC1DkD,WAAAA,EAAaQ,cAAAA,CAAe5D,iBAAiBqC,cAAAA,EAAgBnC,SAAAA;AAC/D,SAAA,CAAA;AACA,QAAA,MAAM2D,gBAAgBtE,aAAAA,CAAc;AAClCY,YAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,8BAAA,CAAA;YACtBC,cAAAA,EAAgB;AAClB,SAAA,CAAA;QAEA,IAAI;AACF,YAAA,MAAMC,QAAAA,CAAS;AAAE,gBAAA,GAAGgD,OAAO;gBAAEzE,mBAAAA,EAAqBwD;AAAe,aAAA,CAAA,CAAGyB,MAAM,EAAA;AAE1E,YAAA,IAAI5C,aAAAA,EAAe;gBACjBvB,SAAAA,EAAWoE,KAAAA,EAAAA;AACb,YAAA;YAEA1C,oBAAAA,CAAqBmC,cAAAA,CAAAA;YAErB/D,kBAAAA,CAAmB;gBACjBuE,IAAAA,EAAM,SAAA;gBACNzC,OAAAA,EAASiC;AACX,aAAA,CAAA;AACF,QAAA,CAAA,CAAE,OAAOS,KAAAA,EAAO;YACd,MAAMC,YAAAA,GAAeC,wBAAwBF,KAAAA,EAAOJ,aAAAA,CAAAA;AAEpDxC,YAAAA,oBAAAA,CACE9B,aAAAA,CACE;AACEY,gBAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,2BAAA,CAAA;gBACtBC,cAAAA,EAAgB;aAClB,EACA;gBAAEkB,OAAAA,EAAS2C;AAAa,aAAA,CAAA,CAAA;YAI5BzE,kBAAAA,CAAmB;gBACjBuE,IAAAA,EAAM,QAAA;gBACNzC,OAAAA,EAAS2C;AACX,aAAA,CAAA;AACF,QAAA;IACF,CAAA,EACA;AACE7C,QAAAA,oBAAAA;AACAf,QAAAA,QAAAA;AACAoC,QAAAA,cAAAA;AACA1C,QAAAA,eAAAA;AACAT,QAAAA,aAAAA;AACAiB,QAAAA,aAAAA;AACAN,QAAAA,SAAAA;AACAP,QAAAA,SAAAA;AACAF,QAAAA;AACD,KAAA,CAAA;AAGH,IAAA,MAAM2E,mBAAmB9C,WAAAA,CAAY,IAAA;AACnCoB,QAAAA,cAAAA,EAAAA;IACF,CAAA,EAAG;AAACA,QAAAA;AAAe,KAAA,CAAA;IAEnB,MAAM2B,aAAAA,GAAgBnC,OAAAA,CACpB,KAAO;YACLoC,WAAAA,EAAa,CAAC,EAAExB,MAAM,EAAkB,GAAA;AACtC,gBAAA,MAAM/C,IAAAA,GAAO+C,MAAAA,CAAO/C,IAAI,CAAC4C,OAAO;AAChC,gBAAA,OAAO5C,OACHR,aAAAA,CACE;AACEY,oBAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,yBAAA,CAAA;oBACtBC,cAAAA,EAAgB;iBAClB,EACA;AAAEkE,oBAAAA,IAAAA,EAAMxE,KAAKwE;iBAAK,CAAA,GAEpB,EAAA;AACN,YAAA,CAAA;AACAC,YAAAA,UAAAA,EAAY,IAAM,EAAA;AAClBC,YAAAA,SAAAA,EAAW,CAAC,EAAE3B,MAAM,EAAEK,IAAI,EAAgB,GAAA;AACxC,gBAAA,IAAI,CAACA,IAAAA,EAAM;AACT,oBAAA,OAAO5D,aAAAA,CAAc;AACnBY,wBAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,qBAAA,CAAA;wBACtBC,cAAAA,EAAgB;AAClB,qBAAA,CAAA;AACF,gBAAA;gBAEA,MAAM+C,WAAAA,GAAc3E,kBAAAA,CAAmB0E,IAAAA,CAAKhD,EAAE,CAAA;AAC9C,gBAAA,MAAMuE,UAAAA,GAAa5B,MAAAA,CAAO/C,IAAI,CAAC4C,OAAO;gBAEtC,IAAI,CAACS,WAAAA,IAAe,CAACsB,UAAAA,EAAY;oBAC/B,OAAO,EAAA;AACT,gBAAA;gBAEA,MAAM,EAAEzD,KAAK,EAAE,GAAG+B,aAChB0B,UAAAA,EACA/E,SAAAA,EAAWsD,cACX5D,SAAAA,EACAQ,eAAAA,CAAAA;AAGF,gBAAA,IACE,CAACwD,mBAAAA,CAAoB;AACnBpC,oBAAAA,KAAAA;AACAoB,oBAAAA,cAAAA,EAAgBe,YAAYvE,mBAAmB;AAC/CmB,oBAAAA;iBACF,CAAA,EACA;AACA,oBAAA,OAAOT,aAAAA,CAAc;AACnBY,wBAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,2BAAA,CAAA;wBACtBC,cAAAA,EAAgB;AAClB,qBAAA,CAAA;AACF,gBAAA;gBAEA,OAAO,EAAA;AACT,YAAA,CAAA;AACAsE,YAAAA,YAAAA,EAAc,IACZpF,aAAAA,CAAc;AACZY,oBAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,qBAAA,CAAA;oBACtBC,cAAAA,EAAgB;AAClB,iBAAA;AACJ,SAAA,CAAA,EACA;AAACR,QAAAA,eAAAA;AAAiBG,QAAAA,eAAAA;AAAiBT,QAAAA,aAAAA;AAAeF,QAAAA,SAAAA;QAAWM,SAAAA,EAAWsD;AAAa,KAAA,CAAA;IAGvF,qBACE2B,GAAA,CAACvG,iBAAiBwG,QAAQ,EAAA;QAACC,KAAAA,EAAOvC,YAAAA;AAChC,QAAA,QAAA,gBAAAwC,IAAA,CAACC,UAAAA,EAAAA;YACCrD,OAAAA,EAASA,OAAAA;YACTsD,kBAAAA,EAAoBC,aAAAA;YACpBZ,WAAAA,EAAa1B,eAAAA;YACb6B,SAAAA,EAAWvB,aAAAA;YACXyB,YAAAA,EAAcP,gBAAAA;YACde,aAAAA,EAAe;AAAEd,gBAAAA;AAAc,aAAA;;8BAE/BO,GAAA,CAACQ,cAAAA,EAAAA;oBAAeC,WAAAA,EAAU,QAAA;oBAASC,aAAAA,EAAY,MAAA;AAC5CzE,oBAAAA,QAAAA,EAAAA;;8BAEH+D,GAAA,CAACW,IAAAA,EAAAA;oBAAKC,QAAAA,EAAS,UAAA;oBAAWC,UAAAA,EAAW,SAAA;oBAAUC,SAAAA,EAAU,QAAA;oBAASC,MAAAA,EAAO,MAAA;AACtEvG,oBAAAA,QAAAA,EAAAA;;8BAEHwF,GAAA,CAACgB,WAAAA,EAAAA;oBAAYC,aAAAA,EAAe,IAAA;8BACzBnF,SAAAA,CAAU+B,MAAM,GAAG,CAAA,iBAAImC,GAAA,CAACkB,eAAAA,EAAAA;wBAAgB7E,KAAAA,EAAOP;AAAgB,qBAAA,CAAA,GAAA;;;;;AAK1E,EAAE;;;;;;"}

package/dist/admin/future/pages/Assets/components/Dnd/buildDragSet.js

@@ -1,43 +1,30 @@
 'use strict';
 
+var itemLocations = require('../../../../utils/itemLocations.js');
+var itemSource = require('../../../../utils/itemSource.js');
 var selection = require('../../utils/selection.js');
 
-/**
- * Stamp an item with the authoritative current-folder location. Drag/selection is
- * page-scoped to the current folder, so this is more reliable than the item's own
- * `folderId`/`parentId` — a dragged folder's `parent` is not populated by the
- * folders query, so its `parentId` would otherwise collapse to `null`.
- */ const locateItem = (item, currentFolderId)=>item.kind === 'file' ? {
-        ...item,
-        folderId: currentFolderId
-    } : {
-        ...item,
-        parentId: currentFolderId
-    };
 /**
  * Derive the drag payload once at drag start.
  *
  * - Dragging a selected item moves the complete current selection.
  * - Dragging an unselected item moves only that item.
  *
- * Selection is page-scoped to the current folder, so every item is stamped with
- * `currentFolderId` as its location for move validation.
- */ const buildDragSet = (activeData, selectedKeys, currentFolderId)=>{
-    if (!selectedKeys || selectedKeys.size === 0) {
-        return {
-            items: [
-                locateItem(activeData, currentFolderId)
-            ],
-            fromSelection: false
-        };
-    }
+ * The active item carries its own location on `dragData` (the row it was
+ * grabbed from); the rest of the selection is resolved through `locations`.
+ * Neither is derived from the folder currently open, because search results are
+ * global — see `utils/itemLocations.ts`.
+ */ const buildDragSet = (activeData, selectedKeys, locations, fallbackFolderId)=>{
     const activeKey = activeData.kind === 'file' ? selection.assetKey(activeData.id) : selection.folderKey(activeData.id);
-    if (!selectedKeys.has(activeKey)) {
+    const activeSourceFolderId = itemSource.sourceFolderIdOf(activeData);
+    if (!selectedKeys || !selectedKeys.has(activeKey)) {
         return {
             items: [
-                locateItem(activeData, currentFolderId)
+                activeData
             ],
-            fromSelection: false
+            fromSelection: false,
+            activeSourceFolderId,
+            spansMultipleSources: false
         };
     }
     const items = [];
@@ -46,24 +33,34 @@ var selection = require('../../utils/selection.js');
         const kind = key.slice(0, separator);
         const id = Number(key.slice(separator + 1));
         if (kind === 'asset') {
+            if (activeData.kind === 'file' && activeData.id === id) {
+                items.push(activeData);
+                return;
+            }
             items.push({
                 kind: 'file',
                 id,
-                name: activeData.kind === 'file' && activeData.id === id ? activeData.name : '',
-                folderId: currentFolderId
+                name: '',
+                folderId: itemLocations.locateItem(locations, 'file', id, fallbackFolderId)
             });
             return;
         }
+        if (activeData.kind === 'folder' && activeData.id === id) {
+            items.push(activeData);
+            return;
+        }
         items.push({
             kind: 'folder',
             id,
-            name: activeData.kind === 'folder' && activeData.id === id ? activeData.name : '',
-            parentId: currentFolderId
+            name: '',
+            parentId: itemLocations.locateItem(locations, 'folder', id, fallbackFolderId)
         });
     });
     return {
         items,
-        fromSelection: true
+        fromSelection: true,
+        activeSourceFolderId,
+        spansMultipleSources: items.some((item)=>itemSource.sourceFolderIdOf(item) !== activeSourceFolderId)
     };
 };
 

package/dist/admin/future/pages/Assets/components/Dnd/buildDragSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildDragSet.js","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/buildDragSet.ts"],"sourcesContent":["import { assetKey, folderKey, type ItemKey } from '../../utils/selection';\n\nimport type { DragItemData } from '../../../../types/dnd';\n\nexport interface DragSet {\n  items: DragItemData[];\n  /** True when the active item was already selected — membership is the full selection. */\n  fromSelection: boolean;\n}\n\n/**\n * Stamp an item with the authoritative current-folder location. Drag/selection is\n * page-scoped to the current folder, so this is more reliable than the item's own\n * `folderId`/`parentId` — a dragged folder's `parent` is not populated by the\n * folders query, so its `parentId` would otherwise collapse to `null`.\n */\nconst locateItem = (item: DragItemData, currentFolderId: number | null): DragItemData =>\n  item.kind === 'file'\n    ? { ...item, folderId: currentFolderId }\n    : { ...item, parentId: currentFolderId };\n\n/**\n * Derive the drag payload once at drag start.\n *\n * - Dragging a selected item moves the complete current selection.\n * - Dragging an unselected item moves only that item.\n *\n * Selection is page-scoped to the current folder, so every item is stamped with\n * `currentFolderId` as its location for move validation.\n */\nexport const buildDragSet = (\n  activeData: DragItemData,\n  selectedKeys: Set<ItemKey> | undefined,\n  currentFolderId: number | null\n): DragSet => {\n  if (!selectedKeys || selectedKeys.size === 0) {\n    return { items: [locateItem(activeData, currentFolderId)], fromSelection: false };\n  }\n\n  const activeKey: ItemKey =\n    activeData.kind === 'file' ? assetKey(activeData.id) : folderKey(activeData.id);\n\n  if (!selectedKeys.has(activeKey)) {\n    return { items: [locateItem(activeData, currentFolderId)], fromSelection: false };\n  }\n\n  const items: DragItemData[] = [];\n\n  selectedKeys.forEach((key) => {\n    const separator = key.indexOf(':');\n    const kind = key.slice(0, separator);\n    const id = Number(key.slice(separator + 1));\n\n    if (kind === 'asset') {\n      items.push({\n        kind: 'file',\n        id,\n        name: activeData.kind === 'file' && activeData.id === id ? activeData.name : '',\n        folderId: currentFolderId,\n      });\n      return;\n    }\n\n    items.push({\n      kind: 'folder',\n      id,\n      name: activeData.kind === 'folder' && activeData.id === id ? activeData.name : '',\n      parentId: currentFolderId,\n    });\n  });\n\n  return { items, fromSelection: true };\n};\n"],"names":["locateItem","item","currentFolderId","kind","folderId","parentId","buildDragSet","activeData","selectedKeys","size","items","fromSelection","activeKey","assetKey","id","folderKey","has","forEach","key","separator","indexOf","slice","Number","push","name"],"mappings":";;;;AAUA;;;;;IAMA,MAAMA,aAAa,CAACC,IAAAA,EAAoBC,kBACtCD,IAAAA,CAAKE,IAAI,KAAK,MAAA,GACV;AAAE,QAAA,GAAGF,IAAI;QAAEG,QAAAA,EAAUF;KAAgB,GACrC;AAAE,QAAA,GAAGD,IAAI;QAAEI,QAAAA,EAAUH;AAAgB,KAAA;AAE3C;;;;;;;;AAQC,IACM,MAAMI,YAAAA,GAAe,CAC1BC,YACAC,YAAAA,EACAN,eAAAA,GAAAA;AAEA,IAAA,IAAI,CAACM,YAAAA,IAAgBA,YAAAA,CAAaC,IAAI,KAAK,CAAA,EAAG;QAC5C,OAAO;YAAEC,KAAAA,EAAO;AAACV,gBAAAA,UAAAA,CAAWO,UAAAA,EAAYL,eAAAA;AAAiB,aAAA;YAAES,aAAAA,EAAe;AAAM,SAAA;AAClF,IAAA;IAEA,MAAMC,SAAAA,GACJL,UAAAA,CAAWJ,IAAI,KAAK,MAAA,GAASU,kBAAAA,CAASN,UAAAA,CAAWO,EAAE,CAAA,GAAIC,mBAAAA,CAAUR,UAAAA,CAAWO,EAAE,CAAA;AAEhF,IAAA,IAAI,CAACN,YAAAA,CAAaQ,GAAG,CAACJ,SAAAA,CAAAA,EAAY;QAChC,OAAO;YAAEF,KAAAA,EAAO;AAACV,gBAAAA,UAAAA,CAAWO,UAAAA,EAAYL,eAAAA;AAAiB,aAAA;YAAES,aAAAA,EAAe;AAAM,SAAA;AAClF,IAAA;AAEA,IAAA,MAAMD,QAAwB,EAAE;IAEhCF,YAAAA,CAAaS,OAAO,CAAC,CAACC,GAAAA,GAAAA;QACpB,MAAMC,SAAAA,GAAYD,GAAAA,CAAIE,OAAO,CAAC,GAAA,CAAA;AAC9B,QAAA,MAAMjB,IAAAA,GAAOe,GAAAA,CAAIG,KAAK,CAAC,CAAA,EAAGF,SAAAA,CAAAA;AAC1B,QAAA,MAAML,EAAAA,GAAKQ,MAAAA,CAAOJ,GAAAA,CAAIG,KAAK,CAACF,SAAAA,GAAY,CAAA,CAAA,CAAA;AAExC,QAAA,IAAIhB,SAAS,OAAA,EAAS;AACpBO,YAAAA,KAAAA,CAAMa,IAAI,CAAC;gBACTpB,IAAAA,EAAM,MAAA;AACNW,gBAAAA,EAAAA;gBACAU,IAAAA,EAAMjB,UAAAA,CAAWJ,IAAI,KAAK,MAAA,IAAUI,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,GAAKP,UAAAA,CAAWiB,IAAI,GAAG,EAAA;gBAC7EpB,QAAAA,EAAUF;AACZ,aAAA,CAAA;AACA,YAAA;AACF,QAAA;AAEAQ,QAAAA,KAAAA,CAAMa,IAAI,CAAC;YACTpB,IAAAA,EAAM,QAAA;AACNW,YAAAA,EAAAA;YACAU,IAAAA,EAAMjB,UAAAA,CAAWJ,IAAI,KAAK,QAAA,IAAYI,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,GAAKP,UAAAA,CAAWiB,IAAI,GAAG,EAAA;YAC/EnB,QAAAA,EAAUH;AACZ,SAAA,CAAA;AACF,IAAA,CAAA,CAAA;IAEA,OAAO;AAAEQ,QAAAA,KAAAA;QAAOC,aAAAA,EAAe;AAAK,KAAA;AACtC;;;;"}
+{"version":3,"file":"buildDragSet.js","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/buildDragSet.ts"],"sourcesContent":["import { locateItem, type ItemLocations } from '../../../../utils/itemLocations';\nimport { sourceFolderIdOf } from '../../../../utils/itemSource';\nimport { assetKey, folderKey, type ItemKey } from '../../utils/selection';\n\nimport type { DragItemData } from '../../../../types/dnd';\n\nexport interface DragSet {\n  items: DragItemData[];\n  /** True when the active item was already selected — membership is the full selection. */\n  fromSelection: boolean;\n  /**\n   * Location of the row the user actually grabbed — the only item in the set\n   * whose origin the user can point at. Names the source in the success toast.\n   */\n  activeSourceFolderId: number | null;\n  /**\n   * True when the set spans more than one source folder, which a global search\n   * selection can. There is then no single source to name, so the toast has to\n   * drop it rather than pick one item's folder and imply the others came from\n   * there too.\n   */\n  spansMultipleSources: boolean;\n}\n\n/**\n * Derive the drag payload once at drag start.\n *\n * - Dragging a selected item moves the complete current selection.\n * - Dragging an unselected item moves only that item.\n *\n * The active item carries its own location on `dragData` (the row it was\n * grabbed from); the rest of the selection is resolved through `locations`.\n * Neither is derived from the folder currently open, because search results are\n * global — see `utils/itemLocations.ts`.\n */\nexport const buildDragSet = (\n  activeData: DragItemData,\n  selectedKeys: Set<ItemKey> | undefined,\n  locations: ItemLocations,\n  fallbackFolderId: number | null\n): DragSet => {\n  const activeKey: ItemKey =\n    activeData.kind === 'file' ? assetKey(activeData.id) : folderKey(activeData.id);\n\n  const activeSourceFolderId = sourceFolderIdOf(activeData);\n\n  if (!selectedKeys || !selectedKeys.has(activeKey)) {\n    return {\n      items: [activeData],\n      fromSelection: false,\n      activeSourceFolderId,\n      spansMultipleSources: false,\n    };\n  }\n\n  const items: DragItemData[] = [];\n\n  selectedKeys.forEach((key) => {\n    const separator = key.indexOf(':');\n    const kind = key.slice(0, separator);\n    const id = Number(key.slice(separator + 1));\n\n    if (kind === 'asset') {\n      if (activeData.kind === 'file' && activeData.id === id) {\n        items.push(activeData);\n        return;\n      }\n\n      items.push({\n        kind: 'file',\n        id,\n        name: '',\n        folderId: locateItem(locations, 'file', id, fallbackFolderId),\n      });\n      return;\n    }\n\n    if (activeData.kind === 'folder' && activeData.id === id) {\n      items.push(activeData);\n      return;\n    }\n\n    items.push({\n      kind: 'folder',\n      id,\n      name: '',\n      parentId: locateItem(locations, 'folder', id, fallbackFolderId),\n    });\n  });\n\n  return {\n    items,\n    fromSelection: true,\n    activeSourceFolderId,\n    spansMultipleSources: items.some((item) => sourceFolderIdOf(item) !== activeSourceFolderId),\n  };\n};\n"],"names":["buildDragSet","activeData","selectedKeys","locations","fallbackFolderId","activeKey","kind","assetKey","id","folderKey","activeSourceFolderId","sourceFolderIdOf","has","items","fromSelection","spansMultipleSources","forEach","key","separator","indexOf","slice","Number","push","name","folderId","locateItem","parentId","some","item"],"mappings":";;;;;;AAwBA;;;;;;;;;;AAUC,IACM,MAAMA,YAAAA,GAAe,CAC1BC,UAAAA,EACAC,cACAC,SAAAA,EACAC,gBAAAA,GAAAA;IAEA,MAAMC,SAAAA,GACJJ,UAAAA,CAAWK,IAAI,KAAK,MAAA,GAASC,kBAAAA,CAASN,UAAAA,CAAWO,EAAE,CAAA,GAAIC,mBAAAA,CAAUR,UAAAA,CAAWO,EAAE,CAAA;AAEhF,IAAA,MAAME,uBAAuBC,2BAAAA,CAAiBV,UAAAA,CAAAA;AAE9C,IAAA,IAAI,CAACC,YAAAA,IAAgB,CAACA,YAAAA,CAAaU,GAAG,CAACP,SAAAA,CAAAA,EAAY;QACjD,OAAO;YACLQ,KAAAA,EAAO;AAACZ,gBAAAA;AAAW,aAAA;YACnBa,aAAAA,EAAe,KAAA;AACfJ,YAAAA,oBAAAA;YACAK,oBAAAA,EAAsB;AACxB,SAAA;AACF,IAAA;AAEA,IAAA,MAAMF,QAAwB,EAAE;IAEhCX,YAAAA,CAAac,OAAO,CAAC,CAACC,GAAAA,GAAAA;QACpB,MAAMC,SAAAA,GAAYD,GAAAA,CAAIE,OAAO,CAAC,GAAA,CAAA;AAC9B,QAAA,MAAMb,IAAAA,GAAOW,GAAAA,CAAIG,KAAK,CAAC,CAAA,EAAGF,SAAAA,CAAAA;AAC1B,QAAA,MAAMV,EAAAA,GAAKa,MAAAA,CAAOJ,GAAAA,CAAIG,KAAK,CAACF,SAAAA,GAAY,CAAA,CAAA,CAAA;AAExC,QAAA,IAAIZ,SAAS,OAAA,EAAS;AACpB,YAAA,IAAIL,WAAWK,IAAI,KAAK,UAAUL,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,EAAI;AACtDK,gBAAAA,KAAAA,CAAMS,IAAI,CAACrB,UAAAA,CAAAA;AACX,gBAAA;AACF,YAAA;AAEAY,YAAAA,KAAAA,CAAMS,IAAI,CAAC;gBACThB,IAAAA,EAAM,MAAA;AACNE,gBAAAA,EAAAA;gBACAe,IAAAA,EAAM,EAAA;gBACNC,QAAAA,EAAUC,wBAAAA,CAAWtB,SAAAA,EAAW,MAAA,EAAQK,EAAAA,EAAIJ,gBAAAA;AAC9C,aAAA,CAAA;AACA,YAAA;AACF,QAAA;AAEA,QAAA,IAAIH,WAAWK,IAAI,KAAK,YAAYL,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,EAAI;AACxDK,YAAAA,KAAAA,CAAMS,IAAI,CAACrB,UAAAA,CAAAA;AACX,YAAA;AACF,QAAA;AAEAY,QAAAA,KAAAA,CAAMS,IAAI,CAAC;YACThB,IAAAA,EAAM,QAAA;AACNE,YAAAA,EAAAA;YACAe,IAAAA,EAAM,EAAA;YACNG,QAAAA,EAAUD,wBAAAA,CAAWtB,SAAAA,EAAW,QAAA,EAAUK,EAAAA,EAAIJ,gBAAAA;AAChD,SAAA,CAAA;AACF,IAAA,CAAA,CAAA;IAEA,OAAO;AACLS,QAAAA,KAAAA;QACAC,aAAAA,EAAe,IAAA;AACfJ,QAAAA,oBAAAA;AACAK,QAAAA,oBAAAA,EAAsBF,MAAMc,IAAI,CAAC,CAACC,IAAAA,GAASjB,4BAAiBiB,IAAAA,CAAAA,KAAUlB,oBAAAA;AACxE,KAAA;AACF;;;;"}

package/dist/admin/future/pages/Assets/components/Dnd/buildDragSet.mjs

@@ -1,41 +1,28 @@
+import { locateItem } from '../../../../utils/itemLocations.mjs';
+import { sourceFolderIdOf } from '../../../../utils/itemSource.mjs';
 import { assetKey, folderKey } from '../../utils/selection.mjs';
 
-/**
- * Stamp an item with the authoritative current-folder location. Drag/selection is
- * page-scoped to the current folder, so this is more reliable than the item's own
- * `folderId`/`parentId` — a dragged folder's `parent` is not populated by the
- * folders query, so its `parentId` would otherwise collapse to `null`.
- */ const locateItem = (item, currentFolderId)=>item.kind === 'file' ? {
-        ...item,
-        folderId: currentFolderId
-    } : {
-        ...item,
-        parentId: currentFolderId
-    };
 /**
  * Derive the drag payload once at drag start.
  *
  * - Dragging a selected item moves the complete current selection.
  * - Dragging an unselected item moves only that item.
  *
- * Selection is page-scoped to the current folder, so every item is stamped with
- * `currentFolderId` as its location for move validation.
- */ const buildDragSet = (activeData, selectedKeys, currentFolderId)=>{
-    if (!selectedKeys || selectedKeys.size === 0) {
-        return {
-            items: [
-                locateItem(activeData, currentFolderId)
-            ],
-            fromSelection: false
-        };
-    }
+ * The active item carries its own location on `dragData` (the row it was
+ * grabbed from); the rest of the selection is resolved through `locations`.
+ * Neither is derived from the folder currently open, because search results are
+ * global — see `utils/itemLocations.ts`.
+ */ const buildDragSet = (activeData, selectedKeys, locations, fallbackFolderId)=>{
     const activeKey = activeData.kind === 'file' ? assetKey(activeData.id) : folderKey(activeData.id);
-    if (!selectedKeys.has(activeKey)) {
+    const activeSourceFolderId = sourceFolderIdOf(activeData);
+    if (!selectedKeys || !selectedKeys.has(activeKey)) {
         return {
             items: [
-                locateItem(activeData, currentFolderId)
+                activeData
             ],
-            fromSelection: false
+            fromSelection: false,
+            activeSourceFolderId,
+            spansMultipleSources: false
         };
     }
     const items = [];
@@ -44,24 +31,34 @@ import { assetKey, folderKey } from '../../utils/selection.mjs';
         const kind = key.slice(0, separator);
         const id = Number(key.slice(separator + 1));
         if (kind === 'asset') {
+            if (activeData.kind === 'file' && activeData.id === id) {
+                items.push(activeData);
+                return;
+            }
             items.push({
                 kind: 'file',
                 id,
-                name: activeData.kind === 'file' && activeData.id === id ? activeData.name : '',
-                folderId: currentFolderId
+                name: '',
+                folderId: locateItem(locations, 'file', id, fallbackFolderId)
             });
             return;
         }
+        if (activeData.kind === 'folder' && activeData.id === id) {
+            items.push(activeData);
+            return;
+        }
         items.push({
             kind: 'folder',
             id,
-            name: activeData.kind === 'folder' && activeData.id === id ? activeData.name : '',
-            parentId: currentFolderId
+            name: '',
+            parentId: locateItem(locations, 'folder', id, fallbackFolderId)
         });
     });
     return {
         items,
-        fromSelection: true
+        fromSelection: true,
+        activeSourceFolderId,
+        spansMultipleSources: items.some((item)=>sourceFolderIdOf(item) !== activeSourceFolderId)
     };
 };
 

package/dist/admin/future/pages/Assets/components/Dnd/buildDragSet.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"buildDragSet.mjs","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/buildDragSet.ts"],"sourcesContent":["import { assetKey, folderKey, type ItemKey } from '../../utils/selection';\n\nimport type { DragItemData } from '../../../../types/dnd';\n\nexport interface DragSet {\n  items: DragItemData[];\n  /** True when the active item was already selected — membership is the full selection. */\n  fromSelection: boolean;\n}\n\n/**\n * Stamp an item with the authoritative current-folder location. Drag/selection is\n * page-scoped to the current folder, so this is more reliable than the item's own\n * `folderId`/`parentId` — a dragged folder's `parent` is not populated by the\n * folders query, so its `parentId` would otherwise collapse to `null`.\n */\nconst locateItem = (item: DragItemData, currentFolderId: number | null): DragItemData =>\n  item.kind === 'file'\n    ? { ...item, folderId: currentFolderId }\n    : { ...item, parentId: currentFolderId };\n\n/**\n * Derive the drag payload once at drag start.\n *\n * - Dragging a selected item moves the complete current selection.\n * - Dragging an unselected item moves only that item.\n *\n * Selection is page-scoped to the current folder, so every item is stamped with\n * `currentFolderId` as its location for move validation.\n */\nexport const buildDragSet = (\n  activeData: DragItemData,\n  selectedKeys: Set<ItemKey> | undefined,\n  currentFolderId: number | null\n): DragSet => {\n  if (!selectedKeys || selectedKeys.size === 0) {\n    return { items: [locateItem(activeData, currentFolderId)], fromSelection: false };\n  }\n\n  const activeKey: ItemKey =\n    activeData.kind === 'file' ? assetKey(activeData.id) : folderKey(activeData.id);\n\n  if (!selectedKeys.has(activeKey)) {\n    return { items: [locateItem(activeData, currentFolderId)], fromSelection: false };\n  }\n\n  const items: DragItemData[] = [];\n\n  selectedKeys.forEach((key) => {\n    const separator = key.indexOf(':');\n    const kind = key.slice(0, separator);\n    const id = Number(key.slice(separator + 1));\n\n    if (kind === 'asset') {\n      items.push({\n        kind: 'file',\n        id,\n        name: activeData.kind === 'file' && activeData.id === id ? activeData.name : '',\n        folderId: currentFolderId,\n      });\n      return;\n    }\n\n    items.push({\n      kind: 'folder',\n      id,\n      name: activeData.kind === 'folder' && activeData.id === id ? activeData.name : '',\n      parentId: currentFolderId,\n    });\n  });\n\n  return { items, fromSelection: true };\n};\n"],"names":["locateItem","item","currentFolderId","kind","folderId","parentId","buildDragSet","activeData","selectedKeys","size","items","fromSelection","activeKey","assetKey","id","folderKey","has","forEach","key","separator","indexOf","slice","Number","push","name"],"mappings":";;AAUA;;;;;IAMA,MAAMA,aAAa,CAACC,IAAAA,EAAoBC,kBACtCD,IAAAA,CAAKE,IAAI,KAAK,MAAA,GACV;AAAE,QAAA,GAAGF,IAAI;QAAEG,QAAAA,EAAUF;KAAgB,GACrC;AAAE,QAAA,GAAGD,IAAI;QAAEI,QAAAA,EAAUH;AAAgB,KAAA;AAE3C;;;;;;;;AAQC,IACM,MAAMI,YAAAA,GAAe,CAC1BC,YACAC,YAAAA,EACAN,eAAAA,GAAAA;AAEA,IAAA,IAAI,CAACM,YAAAA,IAAgBA,YAAAA,CAAaC,IAAI,KAAK,CAAA,EAAG;QAC5C,OAAO;YAAEC,KAAAA,EAAO;AAACV,gBAAAA,UAAAA,CAAWO,UAAAA,EAAYL,eAAAA;AAAiB,aAAA;YAAES,aAAAA,EAAe;AAAM,SAAA;AAClF,IAAA;IAEA,MAAMC,SAAAA,GACJL,UAAAA,CAAWJ,IAAI,KAAK,MAAA,GAASU,QAAAA,CAASN,UAAAA,CAAWO,EAAE,CAAA,GAAIC,SAAAA,CAAUR,UAAAA,CAAWO,EAAE,CAAA;AAEhF,IAAA,IAAI,CAACN,YAAAA,CAAaQ,GAAG,CAACJ,SAAAA,CAAAA,EAAY;QAChC,OAAO;YAAEF,KAAAA,EAAO;AAACV,gBAAAA,UAAAA,CAAWO,UAAAA,EAAYL,eAAAA;AAAiB,aAAA;YAAES,aAAAA,EAAe;AAAM,SAAA;AAClF,IAAA;AAEA,IAAA,MAAMD,QAAwB,EAAE;IAEhCF,YAAAA,CAAaS,OAAO,CAAC,CAACC,GAAAA,GAAAA;QACpB,MAAMC,SAAAA,GAAYD,GAAAA,CAAIE,OAAO,CAAC,GAAA,CAAA;AAC9B,QAAA,MAAMjB,IAAAA,GAAOe,GAAAA,CAAIG,KAAK,CAAC,CAAA,EAAGF,SAAAA,CAAAA;AAC1B,QAAA,MAAML,EAAAA,GAAKQ,MAAAA,CAAOJ,GAAAA,CAAIG,KAAK,CAACF,SAAAA,GAAY,CAAA,CAAA,CAAA;AAExC,QAAA,IAAIhB,SAAS,OAAA,EAAS;AACpBO,YAAAA,KAAAA,CAAMa,IAAI,CAAC;gBACTpB,IAAAA,EAAM,MAAA;AACNW,gBAAAA,EAAAA;gBACAU,IAAAA,EAAMjB,UAAAA,CAAWJ,IAAI,KAAK,MAAA,IAAUI,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,GAAKP,UAAAA,CAAWiB,IAAI,GAAG,EAAA;gBAC7EpB,QAAAA,EAAUF;AACZ,aAAA,CAAA;AACA,YAAA;AACF,QAAA;AAEAQ,QAAAA,KAAAA,CAAMa,IAAI,CAAC;YACTpB,IAAAA,EAAM,QAAA;AACNW,YAAAA,EAAAA;YACAU,IAAAA,EAAMjB,UAAAA,CAAWJ,IAAI,KAAK,QAAA,IAAYI,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,GAAKP,UAAAA,CAAWiB,IAAI,GAAG,EAAA;YAC/EnB,QAAAA,EAAUH;AACZ,SAAA,CAAA;AACF,IAAA,CAAA,CAAA;IAEA,OAAO;AAAEQ,QAAAA,KAAAA;QAAOC,aAAAA,EAAe;AAAK,KAAA;AACtC;;;;"}
+{"version":3,"file":"buildDragSet.mjs","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/buildDragSet.ts"],"sourcesContent":["import { locateItem, type ItemLocations } from '../../../../utils/itemLocations';\nimport { sourceFolderIdOf } from '../../../../utils/itemSource';\nimport { assetKey, folderKey, type ItemKey } from '../../utils/selection';\n\nimport type { DragItemData } from '../../../../types/dnd';\n\nexport interface DragSet {\n  items: DragItemData[];\n  /** True when the active item was already selected — membership is the full selection. */\n  fromSelection: boolean;\n  /**\n   * Location of the row the user actually grabbed — the only item in the set\n   * whose origin the user can point at. Names the source in the success toast.\n   */\n  activeSourceFolderId: number | null;\n  /**\n   * True when the set spans more than one source folder, which a global search\n   * selection can. There is then no single source to name, so the toast has to\n   * drop it rather than pick one item's folder and imply the others came from\n   * there too.\n   */\n  spansMultipleSources: boolean;\n}\n\n/**\n * Derive the drag payload once at drag start.\n *\n * - Dragging a selected item moves the complete current selection.\n * - Dragging an unselected item moves only that item.\n *\n * The active item carries its own location on `dragData` (the row it was\n * grabbed from); the rest of the selection is resolved through `locations`.\n * Neither is derived from the folder currently open, because search results are\n * global — see `utils/itemLocations.ts`.\n */\nexport const buildDragSet = (\n  activeData: DragItemData,\n  selectedKeys: Set<ItemKey> | undefined,\n  locations: ItemLocations,\n  fallbackFolderId: number | null\n): DragSet => {\n  const activeKey: ItemKey =\n    activeData.kind === 'file' ? assetKey(activeData.id) : folderKey(activeData.id);\n\n  const activeSourceFolderId = sourceFolderIdOf(activeData);\n\n  if (!selectedKeys || !selectedKeys.has(activeKey)) {\n    return {\n      items: [activeData],\n      fromSelection: false,\n      activeSourceFolderId,\n      spansMultipleSources: false,\n    };\n  }\n\n  const items: DragItemData[] = [];\n\n  selectedKeys.forEach((key) => {\n    const separator = key.indexOf(':');\n    const kind = key.slice(0, separator);\n    const id = Number(key.slice(separator + 1));\n\n    if (kind === 'asset') {\n      if (activeData.kind === 'file' && activeData.id === id) {\n        items.push(activeData);\n        return;\n      }\n\n      items.push({\n        kind: 'file',\n        id,\n        name: '',\n        folderId: locateItem(locations, 'file', id, fallbackFolderId),\n      });\n      return;\n    }\n\n    if (activeData.kind === 'folder' && activeData.id === id) {\n      items.push(activeData);\n      return;\n    }\n\n    items.push({\n      kind: 'folder',\n      id,\n      name: '',\n      parentId: locateItem(locations, 'folder', id, fallbackFolderId),\n    });\n  });\n\n  return {\n    items,\n    fromSelection: true,\n    activeSourceFolderId,\n    spansMultipleSources: items.some((item) => sourceFolderIdOf(item) !== activeSourceFolderId),\n  };\n};\n"],"names":["buildDragSet","activeData","selectedKeys","locations","fallbackFolderId","activeKey","kind","assetKey","id","folderKey","activeSourceFolderId","sourceFolderIdOf","has","items","fromSelection","spansMultipleSources","forEach","key","separator","indexOf","slice","Number","push","name","folderId","locateItem","parentId","some","item"],"mappings":";;;;AAwBA;;;;;;;;;;AAUC,IACM,MAAMA,YAAAA,GAAe,CAC1BC,UAAAA,EACAC,cACAC,SAAAA,EACAC,gBAAAA,GAAAA;IAEA,MAAMC,SAAAA,GACJJ,UAAAA,CAAWK,IAAI,KAAK,MAAA,GAASC,QAAAA,CAASN,UAAAA,CAAWO,EAAE,CAAA,GAAIC,SAAAA,CAAUR,UAAAA,CAAWO,EAAE,CAAA;AAEhF,IAAA,MAAME,uBAAuBC,gBAAAA,CAAiBV,UAAAA,CAAAA;AAE9C,IAAA,IAAI,CAACC,YAAAA,IAAgB,CAACA,YAAAA,CAAaU,GAAG,CAACP,SAAAA,CAAAA,EAAY;QACjD,OAAO;YACLQ,KAAAA,EAAO;AAACZ,gBAAAA;AAAW,aAAA;YACnBa,aAAAA,EAAe,KAAA;AACfJ,YAAAA,oBAAAA;YACAK,oBAAAA,EAAsB;AACxB,SAAA;AACF,IAAA;AAEA,IAAA,MAAMF,QAAwB,EAAE;IAEhCX,YAAAA,CAAac,OAAO,CAAC,CAACC,GAAAA,GAAAA;QACpB,MAAMC,SAAAA,GAAYD,GAAAA,CAAIE,OAAO,CAAC,GAAA,CAAA;AAC9B,QAAA,MAAMb,IAAAA,GAAOW,GAAAA,CAAIG,KAAK,CAAC,CAAA,EAAGF,SAAAA,CAAAA;AAC1B,QAAA,MAAMV,EAAAA,GAAKa,MAAAA,CAAOJ,GAAAA,CAAIG,KAAK,CAACF,SAAAA,GAAY,CAAA,CAAA,CAAA;AAExC,QAAA,IAAIZ,SAAS,OAAA,EAAS;AACpB,YAAA,IAAIL,WAAWK,IAAI,KAAK,UAAUL,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,EAAI;AACtDK,gBAAAA,KAAAA,CAAMS,IAAI,CAACrB,UAAAA,CAAAA;AACX,gBAAA;AACF,YAAA;AAEAY,YAAAA,KAAAA,CAAMS,IAAI,CAAC;gBACThB,IAAAA,EAAM,MAAA;AACNE,gBAAAA,EAAAA;gBACAe,IAAAA,EAAM,EAAA;gBACNC,QAAAA,EAAUC,UAAAA,CAAWtB,SAAAA,EAAW,MAAA,EAAQK,EAAAA,EAAIJ,gBAAAA;AAC9C,aAAA,CAAA;AACA,YAAA;AACF,QAAA;AAEA,QAAA,IAAIH,WAAWK,IAAI,KAAK,YAAYL,UAAAA,CAAWO,EAAE,KAAKA,EAAAA,EAAI;AACxDK,YAAAA,KAAAA,CAAMS,IAAI,CAACrB,UAAAA,CAAAA;AACX,YAAA;AACF,QAAA;AAEAY,QAAAA,KAAAA,CAAMS,IAAI,CAAC;YACThB,IAAAA,EAAM,QAAA;AACNE,YAAAA,EAAAA;YACAe,IAAAA,EAAM,EAAA;YACNG,QAAAA,EAAUD,UAAAA,CAAWtB,SAAAA,EAAW,QAAA,EAAUK,EAAAA,EAAIJ,gBAAAA;AAChD,SAAA,CAAA;AACF,IAAA,CAAA,CAAA;IAEA,OAAO;AACLS,QAAAA,KAAAA;QACAC,aAAAA,EAAe,IAAA;AACfJ,QAAAA,oBAAAA;AACAK,QAAAA,oBAAAA,EAAsBF,MAAMc,IAAI,CAAC,CAACC,IAAAA,GAASjB,iBAAiBiB,IAAAA,CAAAA,KAAUlB,oBAAAA;AACxE,KAAA;AACF;;;;"}

package/dist/admin/future/pages/Assets/components/Dnd/useAssetDnd.js

@@ -2,21 +2,10 @@
 
 var React = require('react');
 var core = require('@dnd-kit/core');
+var getRelationId = require('../../../../utils/getRelationId.js');
 var AssetsDndProvider = require('./AssetsDndProvider.js');
 var dndIds = require('./dndIds.js');
 
-const getFileFolderId = (folder)=>{
-    if (folder == null) {
-        return null;
-    }
-    if (typeof folder === 'object') {
-        return folder.id ?? null;
-    }
-    if (typeof folder === 'number') {
-        return folder;
-    }
-    return Number(folder) || null;
-};
 const useFileDraggable = (asset)=>{
     const { isMovePending } = AssetsDndProvider.useAssetsDndOptional() ?? {
         isMovePending: false
@@ -25,17 +14,23 @@ const useFileDraggable = (asset)=>{
             kind: 'file',
             id: asset.id,
             name: asset.name,
-            folderId: getFileFolderId(asset.folder)
+            folderId: getRelationId.getRelationId(asset.folder)
         }), [
         asset.folder,
         asset.id,
         asset.name
     ]);
-    return core.useDraggable({
+    const draggable = core.useDraggable({
         id: dndIds.toFileDraggableId(asset.id),
         data,
         disabled: isMovePending
     });
+    // `dragData` is re-exposed (like `useFolderDraggableDroppable` does) so the
+    // row's actions menu can hand the move dialog the asset's real folder.
+    return {
+        ...draggable,
+        dragData: data
+    };
 };
 const useFolderDraggableDroppable = (folder)=>{
     const { isMovePending, isValidDropTarget } = AssetsDndProvider.useAssetsDndOptional() ?? {
@@ -43,7 +38,7 @@ const useFolderDraggableDroppable = (folder)=>{
         isValidDropTarget: ()=>false
     };
     const { active } = core.useDndContext();
-    const parentId = typeof folder.parent === 'object' && folder.parent != null ? folder.parent.id ?? null : folder.parent ?? null;
+    const parentId = getRelationId.getRelationId(folder.parent);
     const dragData = React.useMemo(()=>({
             kind: 'folder',
             id: folder.id,

package/dist/admin/future/pages/Assets/components/Dnd/useAssetDnd.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAssetDnd.js","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/useAssetDnd.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport { useDndContext, useDraggable, useDroppable } from '@dnd-kit/core';\n\nimport { useAssetsDndOptional } from './AssetsDndProvider';\nimport { toFileDraggableId, toFolderDraggableId, toFolderTargetId } from './dndIds';\n\nimport type { DragFileData, DragFolderData, FolderTargetData } from '../../../../types/dnd';\n\nconst getFileFolderId = (\n  folder: number | string | { id?: number } | null | undefined\n): number | null => {\n  if (folder == null) {\n    return null;\n  }\n\n  if (typeof folder === 'object') {\n    return folder.id ?? null;\n  }\n\n  if (typeof folder === 'number') {\n    return folder;\n  }\n\n  return Number(folder) || null;\n};\n\nexport const useFileDraggable = (asset: {\n  id: number;\n  name: string;\n  folder?: number | string | { id?: number } | null;\n}) => {\n  const { isMovePending } = useAssetsDndOptional() ?? { isMovePending: false };\n\n  const data = useMemo<DragFileData>(\n    () => ({\n      kind: 'file',\n      id: asset.id,\n      name: asset.name,\n      folderId: getFileFolderId(asset.folder),\n    }),\n    [asset.folder, asset.id, asset.name]\n  );\n\n  return useDraggable({\n    id: toFileDraggableId(asset.id),\n    data,\n    disabled: isMovePending,\n  });\n};\n\nexport const useFolderDraggableDroppable = (folder: {\n  id: number;\n  name: string;\n  parent?: number | null | { id?: number };\n}) => {\n  const { isMovePending, isValidDropTarget } = useAssetsDndOptional() ?? {\n    isMovePending: false,\n    isValidDropTarget: () => false,\n  };\n  const { active } = useDndContext();\n\n  const parentId =\n    typeof folder.parent === 'object' && folder.parent != null\n      ? (folder.parent.id ?? null)\n      : (folder.parent ?? null);\n\n  const dragData = useMemo<DragFolderData>(\n    () => ({\n      kind: 'folder',\n      id: folder.id,\n      name: folder.name,\n      parentId,\n    }),\n    [folder.id, folder.name, parentId]\n  );\n\n  const dropData = useMemo<FolderTargetData>(\n    () => ({\n      kind: 'folder-target',\n      id: folder.id,\n      name: folder.name,\n    }),\n    [folder.id, folder.name]\n  );\n\n  const draggable = useDraggable({\n    id: toFolderDraggableId(folder.id),\n    data: dragData,\n    disabled: isMovePending,\n  });\n\n  const droppable = useDroppable({\n    id: toFolderTargetId(folder.id),\n    data: dropData,\n    disabled: isMovePending,\n  });\n\n  const isValidTarget = isValidDropTarget(folder.id);\n  const isOver = droppable.isOver;\n  const showValidDropHighlight = isOver && isValidTarget;\n  const showInvalidDropCursor = isOver && !isValidTarget && active != null;\n\n  return {\n    dragData,\n    draggable,\n    droppable,\n    isDragging: draggable.isDragging,\n    showValidDropHighlight,\n    showInvalidDropCursor,\n  };\n};\n"],"names":["getFileFolderId","folder","id","Number","useFileDraggable","asset","isMovePending","useAssetsDndOptional","data","useMemo","kind","name","folderId","useDraggable","toFileDraggableId","disabled","useFolderDraggableDroppable","isValidDropTarget","active","useDndContext","parentId","parent","dragData","dropData","draggable","toFolderDraggableId","droppable","useDroppable","toFolderTargetId","isValidTarget","isOver","showValidDropHighlight","showInvalidDropCursor","isDragging"],"mappings":"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"}
+{"version":3,"file":"useAssetDnd.js","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/useAssetDnd.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport { useDndContext, useDraggable, useDroppable } from '@dnd-kit/core';\n\nimport { getRelationId } from '../../../../utils/getRelationId';\n\nimport { useAssetsDndOptional } from './AssetsDndProvider';\nimport { toFileDraggableId, toFolderDraggableId, toFolderTargetId } from './dndIds';\n\nimport type { DragFileData, DragFolderData, FolderTargetData } from '../../../../types/dnd';\n\nexport const useFileDraggable = (asset: {\n  id: number;\n  name: string;\n  folder?: number | string | { id?: number } | null;\n}) => {\n  const { isMovePending } = useAssetsDndOptional() ?? { isMovePending: false };\n\n  const data = useMemo<DragFileData>(\n    () => ({\n      kind: 'file',\n      id: asset.id,\n      name: asset.name,\n      folderId: getRelationId(asset.folder),\n    }),\n    [asset.folder, asset.id, asset.name]\n  );\n\n  const draggable = useDraggable({\n    id: toFileDraggableId(asset.id),\n    data,\n    disabled: isMovePending,\n  });\n\n  // `dragData` is re-exposed (like `useFolderDraggableDroppable` does) so the\n  // row's actions menu can hand the move dialog the asset's real folder.\n  return { ...draggable, dragData: data };\n};\n\nexport const useFolderDraggableDroppable = (folder: {\n  id: number;\n  name: string;\n  parent?: number | null | { id?: number };\n}) => {\n  const { isMovePending, isValidDropTarget } = useAssetsDndOptional() ?? {\n    isMovePending: false,\n    isValidDropTarget: () => false,\n  };\n  const { active } = useDndContext();\n\n  const parentId = getRelationId(folder.parent);\n\n  const dragData = useMemo<DragFolderData>(\n    () => ({\n      kind: 'folder',\n      id: folder.id,\n      name: folder.name,\n      parentId,\n    }),\n    [folder.id, folder.name, parentId]\n  );\n\n  const dropData = useMemo<FolderTargetData>(\n    () => ({\n      kind: 'folder-target',\n      id: folder.id,\n      name: folder.name,\n    }),\n    [folder.id, folder.name]\n  );\n\n  const draggable = useDraggable({\n    id: toFolderDraggableId(folder.id),\n    data: dragData,\n    disabled: isMovePending,\n  });\n\n  const droppable = useDroppable({\n    id: toFolderTargetId(folder.id),\n    data: dropData,\n    disabled: isMovePending,\n  });\n\n  const isValidTarget = isValidDropTarget(folder.id);\n  const isOver = droppable.isOver;\n  const showValidDropHighlight = isOver && isValidTarget;\n  const showInvalidDropCursor = isOver && !isValidTarget && active != null;\n\n  return {\n    dragData,\n    draggable,\n    droppable,\n    isDragging: draggable.isDragging,\n    showValidDropHighlight,\n    showInvalidDropCursor,\n  };\n};\n"],"names":["useFileDraggable","asset","isMovePending","useAssetsDndOptional","data","useMemo","kind","id","name","folderId","getRelationId","folder","draggable","useDraggable","toFileDraggableId","disabled","dragData","useFolderDraggableDroppable","isValidDropTarget","active","useDndContext","parentId","parent","dropData","toFolderDraggableId","droppable","useDroppable","toFolderTargetId","isValidTarget","isOver","showValidDropHighlight","showInvalidDropCursor","isDragging"],"mappings":";;;;;;;;AAWO,MAAMA,mBAAmB,CAACC,KAAAA,GAAAA;AAK/B,IAAA,MAAM,EAAEC,aAAa,EAAE,GAAGC,sCAAAA,EAAAA,IAA0B;QAAED,aAAAA,EAAe;AAAM,KAAA;IAE3E,MAAME,IAAAA,GAAOC,aAAAA,CACX,KAAO;YACLC,IAAAA,EAAM,MAAA;AACNC,YAAAA,EAAAA,EAAIN,MAAMM,EAAE;AACZC,YAAAA,IAAAA,EAAMP,MAAMO,IAAI;YAChBC,QAAAA,EAAUC,2BAAAA,CAAcT,MAAMU,MAAM;AACtC,SAAA,CAAA,EACA;AAACV,QAAAA,KAAAA,CAAMU,MAAM;AAAEV,QAAAA,KAAAA,CAAMM,EAAE;AAAEN,QAAAA,KAAAA,CAAMO;AAAK,KAAA,CAAA;AAGtC,IAAA,MAAMI,YAAYC,iBAAAA,CAAa;QAC7BN,EAAAA,EAAIO,wBAAAA,CAAkBb,MAAMM,EAAE,CAAA;AAC9BH,QAAAA,IAAAA;QACAW,QAAAA,EAAUb;AACZ,KAAA,CAAA;;;IAIA,OAAO;AAAE,QAAA,GAAGU,SAAS;QAAEI,QAAAA,EAAUZ;AAAK,KAAA;AACxC;AAEO,MAAMa,8BAA8B,CAACN,MAAAA,GAAAA;AAK1C,IAAA,MAAM,EAAET,aAAa,EAAEgB,iBAAiB,EAAE,GAAGf,sCAAAA,EAAAA,IAA0B;QACrED,aAAAA,EAAe,KAAA;AACfgB,QAAAA,iBAAAA,EAAmB,IAAM;AAC3B,KAAA;IACA,MAAM,EAAEC,MAAM,EAAE,GAAGC,kBAAAA,EAAAA;IAEnB,MAAMC,QAAAA,GAAWX,2BAAAA,CAAcC,MAAAA,CAAOW,MAAM,CAAA;IAE5C,MAAMN,QAAAA,GAAWX,aAAAA,CACf,KAAO;YACLC,IAAAA,EAAM,QAAA;AACNC,YAAAA,EAAAA,EAAII,OAAOJ,EAAE;AACbC,YAAAA,IAAAA,EAAMG,OAAOH,IAAI;AACjBa,YAAAA;AACF,SAAA,CAAA,EACA;AAACV,QAAAA,MAAAA,CAAOJ,EAAE;AAAEI,QAAAA,MAAAA,CAAOH,IAAI;AAAEa,QAAAA;AAAS,KAAA,CAAA;IAGpC,MAAME,QAAAA,GAAWlB,aAAAA,CACf,KAAO;YACLC,IAAAA,EAAM,eAAA;AACNC,YAAAA,EAAAA,EAAII,OAAOJ,EAAE;AACbC,YAAAA,IAAAA,EAAMG,OAAOH;AACf,SAAA,CAAA,EACA;AAACG,QAAAA,MAAAA,CAAOJ,EAAE;AAAEI,QAAAA,MAAAA,CAAOH;AAAK,KAAA,CAAA;AAG1B,IAAA,MAAMI,YAAYC,iBAAAA,CAAa;QAC7BN,EAAAA,EAAIiB,0BAAAA,CAAoBb,OAAOJ,EAAE,CAAA;QACjCH,IAAAA,EAAMY,QAAAA;QACND,QAAAA,EAAUb;AACZ,KAAA,CAAA;AAEA,IAAA,MAAMuB,YAAYC,iBAAAA,CAAa;QAC7BnB,EAAAA,EAAIoB,uBAAAA,CAAiBhB,OAAOJ,EAAE,CAAA;QAC9BH,IAAAA,EAAMmB,QAAAA;QACNR,QAAAA,EAAUb;AACZ,KAAA,CAAA;IAEA,MAAM0B,aAAAA,GAAgBV,iBAAAA,CAAkBP,MAAAA,CAAOJ,EAAE,CAAA;IACjD,MAAMsB,MAAAA,GAASJ,UAAUI,MAAM;AAC/B,IAAA,MAAMC,yBAAyBD,MAAAA,IAAUD,aAAAA;AACzC,IAAA,MAAMG,qBAAAA,GAAwBF,MAAAA,IAAU,CAACD,aAAAA,IAAiBT,MAAAA,IAAU,IAAA;IAEpE,OAAO;AACLH,QAAAA,QAAAA;AACAJ,QAAAA,SAAAA;AACAa,QAAAA,SAAAA;AACAO,QAAAA,UAAAA,EAAYpB,UAAUoB,UAAU;AAChCF,QAAAA,sBAAAA;AACAC,QAAAA;AACF,KAAA;AACF;;;;;"}

package/dist/admin/future/pages/Assets/components/Dnd/useAssetDnd.mjs

@@ -1,20 +1,9 @@
 import { useMemo } from 'react';
 import { useDndContext, useDraggable, useDroppable } from '@dnd-kit/core';
+import { getRelationId } from '../../../../utils/getRelationId.mjs';
 import { useAssetsDndOptional } from './AssetsDndProvider.mjs';
 import { toFolderDraggableId, toFolderTargetId, toFileDraggableId } from './dndIds.mjs';
 
-const getFileFolderId = (folder)=>{
-    if (folder == null) {
-        return null;
-    }
-    if (typeof folder === 'object') {
-        return folder.id ?? null;
-    }
-    if (typeof folder === 'number') {
-        return folder;
-    }
-    return Number(folder) || null;
-};
 const useFileDraggable = (asset)=>{
     const { isMovePending } = useAssetsDndOptional() ?? {
         isMovePending: false
@@ -23,17 +12,23 @@ const useFileDraggable = (asset)=>{
             kind: 'file',
             id: asset.id,
             name: asset.name,
-            folderId: getFileFolderId(asset.folder)
+            folderId: getRelationId(asset.folder)
         }), [
         asset.folder,
         asset.id,
         asset.name
     ]);
-    return useDraggable({
+    const draggable = useDraggable({
         id: toFileDraggableId(asset.id),
         data,
         disabled: isMovePending
     });
+    // `dragData` is re-exposed (like `useFolderDraggableDroppable` does) so the
+    // row's actions menu can hand the move dialog the asset's real folder.
+    return {
+        ...draggable,
+        dragData: data
+    };
 };
 const useFolderDraggableDroppable = (folder)=>{
     const { isMovePending, isValidDropTarget } = useAssetsDndOptional() ?? {
@@ -41,7 +36,7 @@ const useFolderDraggableDroppable = (folder)=>{
         isValidDropTarget: ()=>false
     };
     const { active } = useDndContext();
-    const parentId = typeof folder.parent === 'object' && folder.parent != null ? folder.parent.id ?? null : folder.parent ?? null;
+    const parentId = getRelationId(folder.parent);
     const dragData = useMemo(()=>({
             kind: 'folder',
             id: folder.id,

package/dist/admin/future/pages/Assets/components/Dnd/useAssetDnd.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useAssetDnd.mjs","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/useAssetDnd.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport { useDndContext, useDraggable, useDroppable } from '@dnd-kit/core';\n\nimport { useAssetsDndOptional } from './AssetsDndProvider';\nimport { toFileDraggableId, toFolderDraggableId, toFolderTargetId } from './dndIds';\n\nimport type { DragFileData, DragFolderData, FolderTargetData } from '../../../../types/dnd';\n\nconst getFileFolderId = (\n  folder: number | string | { id?: number } | null | undefined\n): number | null => {\n  if (folder == null) {\n    return null;\n  }\n\n  if (typeof folder === 'object') {\n    return folder.id ?? null;\n  }\n\n  if (typeof folder === 'number') {\n    return folder;\n  }\n\n  return Number(folder) || null;\n};\n\nexport const useFileDraggable = (asset: {\n  id: number;\n  name: string;\n  folder?: number | string | { id?: number } | null;\n}) => {\n  const { isMovePending } = useAssetsDndOptional() ?? { isMovePending: false };\n\n  const data = useMemo<DragFileData>(\n    () => ({\n      kind: 'file',\n      id: asset.id,\n      name: asset.name,\n      folderId: getFileFolderId(asset.folder),\n    }),\n    [asset.folder, asset.id, asset.name]\n  );\n\n  return useDraggable({\n    id: toFileDraggableId(asset.id),\n    data,\n    disabled: isMovePending,\n  });\n};\n\nexport const useFolderDraggableDroppable = (folder: {\n  id: number;\n  name: string;\n  parent?: number | null | { id?: number };\n}) => {\n  const { isMovePending, isValidDropTarget } = useAssetsDndOptional() ?? {\n    isMovePending: false,\n    isValidDropTarget: () => false,\n  };\n  const { active } = useDndContext();\n\n  const parentId =\n    typeof folder.parent === 'object' && folder.parent != null\n      ? (folder.parent.id ?? null)\n      : (folder.parent ?? null);\n\n  const dragData = useMemo<DragFolderData>(\n    () => ({\n      kind: 'folder',\n      id: folder.id,\n      name: folder.name,\n      parentId,\n    }),\n    [folder.id, folder.name, parentId]\n  );\n\n  const dropData = useMemo<FolderTargetData>(\n    () => ({\n      kind: 'folder-target',\n      id: folder.id,\n      name: folder.name,\n    }),\n    [folder.id, folder.name]\n  );\n\n  const draggable = useDraggable({\n    id: toFolderDraggableId(folder.id),\n    data: dragData,\n    disabled: isMovePending,\n  });\n\n  const droppable = useDroppable({\n    id: toFolderTargetId(folder.id),\n    data: dropData,\n    disabled: isMovePending,\n  });\n\n  const isValidTarget = isValidDropTarget(folder.id);\n  const isOver = droppable.isOver;\n  const showValidDropHighlight = isOver && isValidTarget;\n  const showInvalidDropCursor = isOver && !isValidTarget && active != null;\n\n  return {\n    dragData,\n    draggable,\n    droppable,\n    isDragging: draggable.isDragging,\n    showValidDropHighlight,\n    showInvalidDropCursor,\n  };\n};\n"],"names":["getFileFolderId","folder","id","Number","useFileDraggable","asset","isMovePending","useAssetsDndOptional","data","useMemo","kind","name","folderId","useDraggable","toFileDraggableId","disabled","useFolderDraggableDroppable","isValidDropTarget","active","useDndContext","parentId","parent","dragData","dropData","draggable","toFolderDraggableId","droppable","useDroppable","toFolderTargetId","isValidTarget","isOver","showValidDropHighlight","showInvalidDropCursor","isDragging"],"mappings":"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"}
+{"version":3,"file":"useAssetDnd.mjs","sources":["../../../../../../../admin/src/future/pages/Assets/components/Dnd/useAssetDnd.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport { useDndContext, useDraggable, useDroppable } from '@dnd-kit/core';\n\nimport { getRelationId } from '../../../../utils/getRelationId';\n\nimport { useAssetsDndOptional } from './AssetsDndProvider';\nimport { toFileDraggableId, toFolderDraggableId, toFolderTargetId } from './dndIds';\n\nimport type { DragFileData, DragFolderData, FolderTargetData } from '../../../../types/dnd';\n\nexport const useFileDraggable = (asset: {\n  id: number;\n  name: string;\n  folder?: number | string | { id?: number } | null;\n}) => {\n  const { isMovePending } = useAssetsDndOptional() ?? { isMovePending: false };\n\n  const data = useMemo<DragFileData>(\n    () => ({\n      kind: 'file',\n      id: asset.id,\n      name: asset.name,\n      folderId: getRelationId(asset.folder),\n    }),\n    [asset.folder, asset.id, asset.name]\n  );\n\n  const draggable = useDraggable({\n    id: toFileDraggableId(asset.id),\n    data,\n    disabled: isMovePending,\n  });\n\n  // `dragData` is re-exposed (like `useFolderDraggableDroppable` does) so the\n  // row's actions menu can hand the move dialog the asset's real folder.\n  return { ...draggable, dragData: data };\n};\n\nexport const useFolderDraggableDroppable = (folder: {\n  id: number;\n  name: string;\n  parent?: number | null | { id?: number };\n}) => {\n  const { isMovePending, isValidDropTarget } = useAssetsDndOptional() ?? {\n    isMovePending: false,\n    isValidDropTarget: () => false,\n  };\n  const { active } = useDndContext();\n\n  const parentId = getRelationId(folder.parent);\n\n  const dragData = useMemo<DragFolderData>(\n    () => ({\n      kind: 'folder',\n      id: folder.id,\n      name: folder.name,\n      parentId,\n    }),\n    [folder.id, folder.name, parentId]\n  );\n\n  const dropData = useMemo<FolderTargetData>(\n    () => ({\n      kind: 'folder-target',\n      id: folder.id,\n      name: folder.name,\n    }),\n    [folder.id, folder.name]\n  );\n\n  const draggable = useDraggable({\n    id: toFolderDraggableId(folder.id),\n    data: dragData,\n    disabled: isMovePending,\n  });\n\n  const droppable = useDroppable({\n    id: toFolderTargetId(folder.id),\n    data: dropData,\n    disabled: isMovePending,\n  });\n\n  const isValidTarget = isValidDropTarget(folder.id);\n  const isOver = droppable.isOver;\n  const showValidDropHighlight = isOver && isValidTarget;\n  const showInvalidDropCursor = isOver && !isValidTarget && active != null;\n\n  return {\n    dragData,\n    draggable,\n    droppable,\n    isDragging: draggable.isDragging,\n    showValidDropHighlight,\n    showInvalidDropCursor,\n  };\n};\n"],"names":["useFileDraggable","asset","isMovePending","useAssetsDndOptional","data","useMemo","kind","id","name","folderId","getRelationId","folder","draggable","useDraggable","toFileDraggableId","disabled","dragData","useFolderDraggableDroppable","isValidDropTarget","active","useDndContext","parentId","parent","dropData","toFolderDraggableId","droppable","useDroppable","toFolderTargetId","isValidTarget","isOver","showValidDropHighlight","showInvalidDropCursor","isDragging"],"mappings":"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"}

package/dist/admin/future/pages/Assets/components/FilterBadges.js

@@ -26,10 +26,13 @@ const Segment = styledComponents.styled.button`
   border: none;
   background: transparent;
   font: inherit;
-  padding: ${({ theme })=>`${theme.spaces[1]} ${theme.spaces[2]}`};
+  padding: ${({ theme })=>`${theme.spaces[2]} ${theme.spaces[3]}`};
   cursor: ${({ $interactive })=>$interactive ? 'pointer' : 'default'};
   border-right: 1px solid ${({ theme })=>theme.colors.neutral200};
 
+  ${({ theme })=>theme.breakpoints.medium} {
+    padding: ${({ theme })=>`${theme.spaces[1]} ${theme.spaces[2]}`};
+  }
   ${({ $interactive, theme })=>$interactive && `&:hover { background: ${theme.colors.primary100}; }`}
 
   &:focus-visible {
@@ -386,15 +389,21 @@ const FilterBadge = ({ filter, onChange, onRemove })=>{
         ]
     });
 };
-const FilterBadges = ({ listFilters })=>{
+// Tighten the gap above the badges when the sticky header is in its compact
+// (scrolled) state, matching the header's own shrink.
+const BadgesRoot = styledComponents.styled(designSystem.Flex)`
+  padding-top: ${({ theme, $compact })=>$compact ? theme.spaces[1] : theme.spaces[6]};
+  transition: padding-top 0.2s ease;
+`;
+const FilterBadges = ({ listFilters, compact = false })=>{
     const { filters, updateFilter, removeFilter } = listFilters;
     if (filters.length === 0) {
         return null;
     }
-    return /*#__PURE__*/ jsxRuntime.jsx(designSystem.Flex, {
+    return /*#__PURE__*/ jsxRuntime.jsx(BadgesRoot, {
+        $compact: compact,
         gap: 2,
         wrap: "wrap",
-        paddingTop: 2,
         "data-testid": "filter-badges",
         children: filters.map((filter, index)=>/*#__PURE__*/ jsxRuntime.jsx(FilterBadge, {
                 filter: filter,