@strapi/upload 5.59.0 → 5.61.0

package/dist/admin/pages/Assets/components/Dnd/ReorderHandle.js

@@ -0,0 +1,40 @@
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var designSystem = require('@strapi/design-system');
+var icons = require('@strapi/icons');
+var reactIntl = require('react-intl');
+var translations = require('../../../../utils/translations.js');
+var assetSortable = require('./assetSortable.js');
+
+/**
+ * The keyboard path into reordering (Space picks the item up, arrows move it,
+ * Space drops it). Pointer drags start from anywhere on the item, this grip
+ * included.
+ */ const ReorderHandle = ({ name, handle })=>{
+    const { formatMessage } = reactIntl.useIntl();
+    const { ref, onKeyDown, ...attributes } = handle;
+    return /*#__PURE__*/ jsxRuntime.jsx(designSystem.IconButton, {
+        ...attributes,
+        ref: ref,
+        size: "XS",
+        variant: "ghost",
+        withTooltip: false,
+        label: formatMessage({
+            id: translations.getTranslationKey('list.item.reorder'),
+            defaultMessage: 'Reorder {name}'
+        }, {
+            name
+        }),
+        ...assetSortable.REORDER_HANDLE_PROPS,
+        // Not stopped: once a drag starts, the arrows and the drop key are read on
+        // the document. The item ignores keys from here (`isFromReorderHandle`).
+        onKeyDown: onKeyDown,
+        // A click on the grip is not a click on the item.
+        onClick: (event)=>event.stopPropagation(),
+        children: /*#__PURE__*/ jsxRuntime.jsx(icons.Drag, {})
+    });
+};
+
+exports.ReorderHandle = ReorderHandle;
+//# sourceMappingURL=ReorderHandle.js.map

package/dist/admin/pages/Assets/components/Dnd/ReorderHandle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReorderHandle.js","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/ReorderHandle.tsx"],"sourcesContent":["import { IconButton } from '@strapi/design-system';\nimport { Drag } from '@strapi/icons';\nimport { useIntl } from 'react-intl';\n\nimport { getTranslationKey } from '../../../../utils/translations';\n\nimport { REORDER_HANDLE_PROPS, type AssetSortable } from './assetSortable';\n\ninterface ReorderHandleProps {\n  name: string;\n  handle: AssetSortable['handle'];\n}\n\n/**\n * The keyboard path into reordering (Space picks the item up, arrows move it,\n * Space drops it). Pointer drags start from anywhere on the item, this grip\n * included.\n */\nexport const ReorderHandle = ({ name, handle }: ReorderHandleProps) => {\n  const { formatMessage } = useIntl();\n  const { ref, onKeyDown, ...attributes } = handle;\n\n  return (\n    <IconButton\n      {...attributes}\n      ref={ref}\n      size=\"XS\"\n      variant=\"ghost\"\n      withTooltip={false}\n      label={formatMessage(\n        { id: getTranslationKey('list.item.reorder'), defaultMessage: 'Reorder {name}' },\n        { name }\n      )}\n      {...REORDER_HANDLE_PROPS}\n      // Not stopped: once a drag starts, the arrows and the drop key are read on\n      // the document. The item ignores keys from here (`isFromReorderHandle`).\n      onKeyDown={onKeyDown}\n      // A click on the grip is not a click on the item.\n      onClick={(event) => event.stopPropagation()}\n    >\n      <Drag />\n    </IconButton>\n  );\n};\n"],"names":["ReorderHandle","name","handle","formatMessage","useIntl","ref","onKeyDown","attributes","_jsx","IconButton","size","variant","withTooltip","label","id","getTranslationKey","defaultMessage","REORDER_HANDLE_PROPS","onClick","event","stopPropagation","Drag"],"mappings":";;;;;;;;;AAaA;;;;UAKaA,aAAAA,GAAgB,CAAC,EAAEC,IAAI,EAAEC,MAAM,EAAsB,GAAA;IAChE,MAAM,EAAEC,aAAa,EAAE,GAAGC,iBAAAA,EAAAA;AAC1B,IAAA,MAAM,EAAEC,GAAG,EAAEC,SAAS,EAAE,GAAGC,YAAY,GAAGL,MAAAA;AAE1C,IAAA,qBACEM,cAAA,CAACC,uBAAAA,EAAAA;AACE,QAAA,GAAGF,UAAU;QACdF,GAAAA,EAAKA,GAAAA;QACLK,IAAAA,EAAK,IAAA;QACLC,OAAAA,EAAQ,OAAA;QACRC,WAAAA,EAAa,KAAA;AACbC,QAAAA,KAAAA,EAAOV,aAAAA,CACL;AAAEW,YAAAA,EAAAA,EAAIC,8BAAAA,CAAkB,mBAAA,CAAA;YAAsBC,cAAAA,EAAgB;SAAiB,EAC/E;AAAEf,YAAAA;AAAK,SAAA,CAAA;AAER,QAAA,GAAGgB,kCAAoB;;;QAGxBX,SAAAA,EAAWA,SAAAA;;QAEXY,OAAAA,EAAS,CAACC,KAAAA,GAAUA,KAAAA,CAAMC,eAAe,EAAA;AAEzC,QAAA,QAAA,gBAAAZ,cAAA,CAACa,UAAAA,EAAAA,EAAAA;;AAGP;;;;"}

package/dist/admin/pages/Assets/components/Dnd/ReorderHandle.mjs

@@ -0,0 +1,38 @@
+import { jsx } from 'react/jsx-runtime';
+import { IconButton } from '@strapi/design-system';
+import { Drag } from '@strapi/icons';
+import { useIntl } from 'react-intl';
+import { getTranslationKey } from '../../../../utils/translations.mjs';
+import { REORDER_HANDLE_PROPS } from './assetSortable.mjs';
+
+/**
+ * The keyboard path into reordering (Space picks the item up, arrows move it,
+ * Space drops it). Pointer drags start from anywhere on the item, this grip
+ * included.
+ */ const ReorderHandle = ({ name, handle })=>{
+    const { formatMessage } = useIntl();
+    const { ref, onKeyDown, ...attributes } = handle;
+    return /*#__PURE__*/ jsx(IconButton, {
+        ...attributes,
+        ref: ref,
+        size: "XS",
+        variant: "ghost",
+        withTooltip: false,
+        label: formatMessage({
+            id: getTranslationKey('list.item.reorder'),
+            defaultMessage: 'Reorder {name}'
+        }, {
+            name
+        }),
+        ...REORDER_HANDLE_PROPS,
+        // Not stopped: once a drag starts, the arrows and the drop key are read on
+        // the document. The item ignores keys from here (`isFromReorderHandle`).
+        onKeyDown: onKeyDown,
+        // A click on the grip is not a click on the item.
+        onClick: (event)=>event.stopPropagation(),
+        children: /*#__PURE__*/ jsx(Drag, {})
+    });
+};
+
+export { ReorderHandle };
+//# sourceMappingURL=ReorderHandle.mjs.map

package/dist/admin/pages/Assets/components/Dnd/ReorderHandle.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReorderHandle.mjs","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/ReorderHandle.tsx"],"sourcesContent":["import { IconButton } from '@strapi/design-system';\nimport { Drag } from '@strapi/icons';\nimport { useIntl } from 'react-intl';\n\nimport { getTranslationKey } from '../../../../utils/translations';\n\nimport { REORDER_HANDLE_PROPS, type AssetSortable } from './assetSortable';\n\ninterface ReorderHandleProps {\n  name: string;\n  handle: AssetSortable['handle'];\n}\n\n/**\n * The keyboard path into reordering (Space picks the item up, arrows move it,\n * Space drops it). Pointer drags start from anywhere on the item, this grip\n * included.\n */\nexport const ReorderHandle = ({ name, handle }: ReorderHandleProps) => {\n  const { formatMessage } = useIntl();\n  const { ref, onKeyDown, ...attributes } = handle;\n\n  return (\n    <IconButton\n      {...attributes}\n      ref={ref}\n      size=\"XS\"\n      variant=\"ghost\"\n      withTooltip={false}\n      label={formatMessage(\n        { id: getTranslationKey('list.item.reorder'), defaultMessage: 'Reorder {name}' },\n        { name }\n      )}\n      {...REORDER_HANDLE_PROPS}\n      // Not stopped: once a drag starts, the arrows and the drop key are read on\n      // the document. The item ignores keys from here (`isFromReorderHandle`).\n      onKeyDown={onKeyDown}\n      // A click on the grip is not a click on the item.\n      onClick={(event) => event.stopPropagation()}\n    >\n      <Drag />\n    </IconButton>\n  );\n};\n"],"names":["ReorderHandle","name","handle","formatMessage","useIntl","ref","onKeyDown","attributes","_jsx","IconButton","size","variant","withTooltip","label","id","getTranslationKey","defaultMessage","REORDER_HANDLE_PROPS","onClick","event","stopPropagation","Drag"],"mappings":";;;;;;;AAaA;;;;UAKaA,aAAAA,GAAgB,CAAC,EAAEC,IAAI,EAAEC,MAAM,EAAsB,GAAA;IAChE,MAAM,EAAEC,aAAa,EAAE,GAAGC,OAAAA,EAAAA;AAC1B,IAAA,MAAM,EAAEC,GAAG,EAAEC,SAAS,EAAE,GAAGC,YAAY,GAAGL,MAAAA;AAE1C,IAAA,qBACEM,GAAA,CAACC,UAAAA,EAAAA;AACE,QAAA,GAAGF,UAAU;QACdF,GAAAA,EAAKA,GAAAA;QACLK,IAAAA,EAAK,IAAA;QACLC,OAAAA,EAAQ,OAAA;QACRC,WAAAA,EAAa,KAAA;AACbC,QAAAA,KAAAA,EAAOV,aAAAA,CACL;AAAEW,YAAAA,EAAAA,EAAIC,iBAAAA,CAAkB,mBAAA,CAAA;YAAsBC,cAAAA,EAAgB;SAAiB,EAC/E;AAAEf,YAAAA;AAAK,SAAA,CAAA;AAER,QAAA,GAAGgB,oBAAoB;;;QAGxBX,SAAAA,EAAWA,SAAAA;;QAEXY,OAAAA,EAAS,CAACC,KAAAA,GAAUA,KAAAA,CAAMC,eAAe,EAAA;AAEzC,QAAA,QAAA,gBAAAZ,GAAA,CAACa,IAAAA,EAAAA,EAAAA;;AAGP;;;;"}

package/dist/admin/pages/Assets/components/Dnd/assetSortable.js

@@ -0,0 +1,29 @@
+'use strict';
+
+var React = require('react');
+
+const useNotSortable = ()=>null;
+/**
+ * Holds the hook that makes an asset sortable, rather than a value: the hook
+ * needs each item's id. A given subtree always gets the same hook, so calling
+ * it from `useAssetSortable` keeps the rules of hooks.
+ */ const AssetSortableContext = React.createContext(useNotSortable);
+const useAssetSortable = (assetId)=>{
+    const useSortableAsset = React.useContext(AssetSortableContext);
+    return useSortableAsset(assetId);
+};
+const REORDER_HANDLE_ATTRIBUTE = 'data-reorder-handle';
+/** Marks the reorder grip, so the item can tell its keys apart. */ const REORDER_HANDLE_PROPS = {
+    [REORDER_HANDLE_ATTRIBUTE]: ''
+};
+/**
+ * Keys pressed on the grip, including the arrows and the drop key mid-drag,
+ * belong to reordering. The item must not also read them as its own
+ * Enter/Space.
+ */ const isFromReorderHandle = (event)=>event.target instanceof Element && event.target.closest(`[${REORDER_HANDLE_ATTRIBUTE}]`) !== null;
+
+exports.AssetSortableContext = AssetSortableContext;
+exports.REORDER_HANDLE_PROPS = REORDER_HANDLE_PROPS;
+exports.isFromReorderHandle = isFromReorderHandle;
+exports.useAssetSortable = useAssetSortable;
+//# sourceMappingURL=assetSortable.js.map

package/dist/admin/pages/Assets/components/Dnd/assetSortable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetSortable.js","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/assetSortable.ts"],"sourcesContent":["import {\n  createContext,\n  useContext,\n  type CSSProperties,\n  type KeyboardEvent,\n  type SyntheticEvent,\n} from 'react';\n\nimport type { DraggableAttributes, DraggableSyntheticListeners } from '@dnd-kit/core';\n\n/**\n * What a list item needs to take part in reordering: the whole item drags with\n * the pointer, and a grip button carries the keyboard path (Space to pick up,\n * arrows to move) so it doesn't collide with the item's own Space/click.\n */\nexport interface AssetSortable {\n  setNodeRef: (node: HTMLElement | null) => void;\n  isDragging: boolean;\n  style: CSSProperties;\n  /** Pointer activation, for the item itself. */\n  listeners: DraggableSyntheticListeners;\n  handle: Partial<DraggableAttributes> & {\n    ref: (node: HTMLElement | null) => void;\n    onKeyDown?: (event: KeyboardEvent) => void;\n  };\n}\n\ntype UseAssetSortable = (assetId: number) => AssetSortable | null;\n\nconst useNotSortable: UseAssetSortable = () => null;\n\n/**\n * Holds the hook that makes an asset sortable, rather than a value: the hook\n * needs each item's id. A given subtree always gets the same hook, so calling\n * it from `useAssetSortable` keeps the rules of hooks.\n */\nexport const AssetSortableContext = createContext<UseAssetSortable>(useNotSortable);\n\nexport const useAssetSortable = (assetId: number) => {\n  const useSortableAsset = useContext(AssetSortableContext);\n\n  return useSortableAsset(assetId);\n};\n\nconst REORDER_HANDLE_ATTRIBUTE = 'data-reorder-handle';\n\n/** Marks the reorder grip, so the item can tell its keys apart. */\nexport const REORDER_HANDLE_PROPS = { [REORDER_HANDLE_ATTRIBUTE]: '' };\n\n/**\n * Keys pressed on the grip, including the arrows and the drop key mid-drag,\n * belong to reordering. The item must not also read them as its own\n * Enter/Space.\n */\nexport const isFromReorderHandle = (event: SyntheticEvent) =>\n  event.target instanceof Element && event.target.closest(`[${REORDER_HANDLE_ATTRIBUTE}]`) !== null;\n"],"names":["useNotSortable","AssetSortableContext","createContext","useAssetSortable","assetId","useSortableAsset","useContext","REORDER_HANDLE_ATTRIBUTE","REORDER_HANDLE_PROPS","isFromReorderHandle","event","target","Element","closest"],"mappings":";;;;AA6BA,MAAMA,iBAAmC,IAAM,IAAA;AAE/C;;;;AAIC,IACM,MAAMC,oBAAAA,GAAuBC,mBAAAA,CAAgCF,cAAAA;AAE7D,MAAMG,mBAAmB,CAACC,OAAAA,GAAAA;AAC/B,IAAA,MAAMC,mBAAmBC,gBAAAA,CAAWL,oBAAAA,CAAAA;AAEpC,IAAA,OAAOI,gBAAAA,CAAiBD,OAAAA,CAAAA;AAC1B;AAEA,MAAMG,wBAAAA,GAA2B,qBAAA;AAEjC,oEACO,MAAMC,oBAAAA,GAAuB;AAAE,IAAA,CAACD,2BAA2B;AAAG;AAErE;;;;UAKaE,mBAAAA,GAAsB,CAACC,QAClCA,KAAAA,CAAMC,MAAM,YAAYC,OAAAA,IAAWF,KAAAA,CAAMC,MAAM,CAACE,OAAO,CAAC,CAAC,CAAC,EAAEN,wBAAAA,CAAyB,CAAC,CAAC,CAAA,KAAM;;;;;;;"}

package/dist/admin/pages/Assets/components/Dnd/assetSortable.mjs

@@ -0,0 +1,24 @@
+import { createContext, useContext } from 'react';
+
+const useNotSortable = ()=>null;
+/**
+ * Holds the hook that makes an asset sortable, rather than a value: the hook
+ * needs each item's id. A given subtree always gets the same hook, so calling
+ * it from `useAssetSortable` keeps the rules of hooks.
+ */ const AssetSortableContext = createContext(useNotSortable);
+const useAssetSortable = (assetId)=>{
+    const useSortableAsset = useContext(AssetSortableContext);
+    return useSortableAsset(assetId);
+};
+const REORDER_HANDLE_ATTRIBUTE = 'data-reorder-handle';
+/** Marks the reorder grip, so the item can tell its keys apart. */ const REORDER_HANDLE_PROPS = {
+    [REORDER_HANDLE_ATTRIBUTE]: ''
+};
+/**
+ * Keys pressed on the grip, including the arrows and the drop key mid-drag,
+ * belong to reordering. The item must not also read them as its own
+ * Enter/Space.
+ */ const isFromReorderHandle = (event)=>event.target instanceof Element && event.target.closest(`[${REORDER_HANDLE_ATTRIBUTE}]`) !== null;
+
+export { AssetSortableContext, REORDER_HANDLE_PROPS, isFromReorderHandle, useAssetSortable };
+//# sourceMappingURL=assetSortable.mjs.map

package/dist/admin/pages/Assets/components/Dnd/assetSortable.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetSortable.mjs","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/assetSortable.ts"],"sourcesContent":["import {\n  createContext,\n  useContext,\n  type CSSProperties,\n  type KeyboardEvent,\n  type SyntheticEvent,\n} from 'react';\n\nimport type { DraggableAttributes, DraggableSyntheticListeners } from '@dnd-kit/core';\n\n/**\n * What a list item needs to take part in reordering: the whole item drags with\n * the pointer, and a grip button carries the keyboard path (Space to pick up,\n * arrows to move) so it doesn't collide with the item's own Space/click.\n */\nexport interface AssetSortable {\n  setNodeRef: (node: HTMLElement | null) => void;\n  isDragging: boolean;\n  style: CSSProperties;\n  /** Pointer activation, for the item itself. */\n  listeners: DraggableSyntheticListeners;\n  handle: Partial<DraggableAttributes> & {\n    ref: (node: HTMLElement | null) => void;\n    onKeyDown?: (event: KeyboardEvent) => void;\n  };\n}\n\ntype UseAssetSortable = (assetId: number) => AssetSortable | null;\n\nconst useNotSortable: UseAssetSortable = () => null;\n\n/**\n * Holds the hook that makes an asset sortable, rather than a value: the hook\n * needs each item's id. A given subtree always gets the same hook, so calling\n * it from `useAssetSortable` keeps the rules of hooks.\n */\nexport const AssetSortableContext = createContext<UseAssetSortable>(useNotSortable);\n\nexport const useAssetSortable = (assetId: number) => {\n  const useSortableAsset = useContext(AssetSortableContext);\n\n  return useSortableAsset(assetId);\n};\n\nconst REORDER_HANDLE_ATTRIBUTE = 'data-reorder-handle';\n\n/** Marks the reorder grip, so the item can tell its keys apart. */\nexport const REORDER_HANDLE_PROPS = { [REORDER_HANDLE_ATTRIBUTE]: '' };\n\n/**\n * Keys pressed on the grip, including the arrows and the drop key mid-drag,\n * belong to reordering. The item must not also read them as its own\n * Enter/Space.\n */\nexport const isFromReorderHandle = (event: SyntheticEvent) =>\n  event.target instanceof Element && event.target.closest(`[${REORDER_HANDLE_ATTRIBUTE}]`) !== null;\n"],"names":["useNotSortable","AssetSortableContext","createContext","useAssetSortable","assetId","useSortableAsset","useContext","REORDER_HANDLE_ATTRIBUTE","REORDER_HANDLE_PROPS","isFromReorderHandle","event","target","Element","closest"],"mappings":";;AA6BA,MAAMA,iBAAmC,IAAM,IAAA;AAE/C;;;;AAIC,IACM,MAAMC,oBAAAA,GAAuBC,aAAAA,CAAgCF,cAAAA;AAE7D,MAAMG,mBAAmB,CAACC,OAAAA,GAAAA;AAC/B,IAAA,MAAMC,mBAAmBC,UAAAA,CAAWL,oBAAAA,CAAAA;AAEpC,IAAA,OAAOI,gBAAAA,CAAiBD,OAAAA,CAAAA;AAC1B;AAEA,MAAMG,wBAAAA,GAA2B,qBAAA;AAEjC,oEACO,MAAMC,oBAAAA,GAAuB;AAAE,IAAA,CAACD,2BAA2B;AAAG;AAErE;;;;UAKaE,mBAAAA,GAAsB,CAACC,QAClCA,KAAAA,CAAMC,MAAM,YAAYC,OAAAA,IAAWF,KAAAA,CAAMC,MAAM,CAACE,OAAO,CAAC,CAAC,CAAC,EAAEN,wBAAAA,CAAyB,CAAC,CAAC,CAAA,KAAM;;;;"}

package/dist/admin/pages/Assets/components/Dnd/dndIds.js

@@ -11,6 +11,10 @@ const parseFolderTargetId = (dndId)=>{
     return match ? Number(match[1]) : null;
 };
 const toFolderTreeTargetId = (id)=>`folder-tree-target:${id}`;
+/**
+ * The "N parent folders" row in the sidebar. Only there so hovering it during a
+ * drag opens it; no parser recognises it, so a drop on it moves nothing.
+ */ const toFolderTreeSummaryId = (rootId)=>`folder-tree-summary:${rootId}`;
 const HOME_TREE_TARGET_ID = 'folder-tree-target:home';
 const parseFolderTreeTargetId = (dndId)=>{
     if (typeof dndId !== 'string') {
@@ -29,5 +33,6 @@ exports.parseFolderTreeTargetId = parseFolderTreeTargetId;
 exports.toFileDraggableId = toFileDraggableId;
 exports.toFolderDraggableId = toFolderDraggableId;
 exports.toFolderTargetId = toFolderTargetId;
+exports.toFolderTreeSummaryId = toFolderTreeSummaryId;
 exports.toFolderTreeTargetId = toFolderTreeTargetId;
 //# sourceMappingURL=dndIds.js.map

package/dist/admin/pages/Assets/components/Dnd/dndIds.js.map

@@ -1 +1 @@
-{"version":3,"file":"dndIds.js","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/dndIds.ts"],"sourcesContent":["export const toFileDraggableId = (id: number) => `file:${id}` as const;\n\nexport const toFolderDraggableId = (id: number) => `folder:${id}` as const;\n\nexport const toFolderTargetId = (id: number) => `folder-target:${id}` as const;\n\nexport const parseFolderTargetId = (dndId: string | number): number | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  const match = /^folder-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n\nexport const toFolderTreeTargetId = (id: number) => `folder-tree-target:${id}` as const;\n\nexport const HOME_TREE_TARGET_ID = 'folder-tree-target:home' as const;\n\nexport const parseFolderTreeTargetId = (dndId: string | number): number | 'root' | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  if (dndId === HOME_TREE_TARGET_ID) {\n    return 'root';\n  }\n\n  const match = /^folder-tree-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n"],"names":["toFileDraggableId","id","toFolderDraggableId","toFolderTargetId","parseFolderTargetId","dndId","match","exec","Number","toFolderTreeTargetId","HOME_TREE_TARGET_ID","parseFolderTreeTargetId"],"mappings":";;AAAO,MAAMA,oBAAoB,CAACC,EAAAA,GAAe,CAAC,KAAK,EAAEA;AAElD,MAAMC,sBAAsB,CAACD,EAAAA,GAAe,CAAC,OAAO,EAAEA;AAEtD,MAAME,mBAAmB,CAACF,EAAAA,GAAe,CAAC,cAAc,EAAEA;AAE1D,MAAMG,sBAAsB,CAACC,KAAAA,GAAAA;IAClC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;IAEA,MAAMC,KAAAA,GAAQ,uBAAA,CAAwBC,IAAI,CAACF,KAAAA,CAAAA;AAC3C,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;AAEO,MAAMG,uBAAuB,CAACR,EAAAA,GAAe,CAAC,mBAAmB,EAAEA;AAEnE,MAAMS,sBAAsB;AAE5B,MAAMC,0BAA0B,CAACN,KAAAA,GAAAA;IACtC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,IAAIA,UAAUK,mBAAAA,EAAqB;QACjC,OAAO,MAAA;AACT,IAAA;IAEA,MAAMJ,KAAAA,GAAQ,4BAAA,CAA6BC,IAAI,CAACF,KAAAA,CAAAA;AAChD,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;;;;;;;;;;"}
+{"version":3,"file":"dndIds.js","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/dndIds.ts"],"sourcesContent":["export const toFileDraggableId = (id: number) => `file:${id}` as const;\n\nexport const toFolderDraggableId = (id: number) => `folder:${id}` as const;\n\nexport const toFolderTargetId = (id: number) => `folder-target:${id}` as const;\n\nexport const parseFolderTargetId = (dndId: string | number): number | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  const match = /^folder-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n\nexport const toFolderTreeTargetId = (id: number) => `folder-tree-target:${id}` as const;\n\n/**\n * The \"N parent folders\" row in the sidebar. Only there so hovering it during a\n * drag opens it; no parser recognises it, so a drop on it moves nothing.\n */\nexport const toFolderTreeSummaryId = (rootId: number) => `folder-tree-summary:${rootId}` as const;\n\nexport const HOME_TREE_TARGET_ID = 'folder-tree-target:home' as const;\n\nexport const parseFolderTreeTargetId = (dndId: string | number): number | 'root' | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  if (dndId === HOME_TREE_TARGET_ID) {\n    return 'root';\n  }\n\n  const match = /^folder-tree-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n"],"names":["toFileDraggableId","id","toFolderDraggableId","toFolderTargetId","parseFolderTargetId","dndId","match","exec","Number","toFolderTreeTargetId","toFolderTreeSummaryId","rootId","HOME_TREE_TARGET_ID","parseFolderTreeTargetId"],"mappings":";;AAAO,MAAMA,oBAAoB,CAACC,EAAAA,GAAe,CAAC,KAAK,EAAEA;AAElD,MAAMC,sBAAsB,CAACD,EAAAA,GAAe,CAAC,OAAO,EAAEA;AAEtD,MAAME,mBAAmB,CAACF,EAAAA,GAAe,CAAC,cAAc,EAAEA;AAE1D,MAAMG,sBAAsB,CAACC,KAAAA,GAAAA;IAClC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;IAEA,MAAMC,KAAAA,GAAQ,uBAAA,CAAwBC,IAAI,CAACF,KAAAA,CAAAA;AAC3C,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;AAEO,MAAMG,uBAAuB,CAACR,EAAAA,GAAe,CAAC,mBAAmB,EAAEA;AAE1E;;;UAIaS,qBAAAA,GAAwB,CAACC,SAAmB,CAAC,oBAAoB,EAAEA,MAAAA,CAAAA;AAEzE,MAAMC,sBAAsB;AAE5B,MAAMC,0BAA0B,CAACR,KAAAA,GAAAA;IACtC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,IAAIA,UAAUO,mBAAAA,EAAqB;QACjC,OAAO,MAAA;AACT,IAAA;IAEA,MAAMN,KAAAA,GAAQ,4BAAA,CAA6BC,IAAI,CAACF,KAAAA,CAAAA;AAChD,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;;;;;;;;;;;"}

package/dist/admin/pages/Assets/components/Dnd/dndIds.mjs

@@ -9,6 +9,10 @@ const parseFolderTargetId = (dndId)=>{
     return match ? Number(match[1]) : null;
 };
 const toFolderTreeTargetId = (id)=>`folder-tree-target:${id}`;
+/**
+ * The "N parent folders" row in the sidebar. Only there so hovering it during a
+ * drag opens it; no parser recognises it, so a drop on it moves nothing.
+ */ const toFolderTreeSummaryId = (rootId)=>`folder-tree-summary:${rootId}`;
 const HOME_TREE_TARGET_ID = 'folder-tree-target:home';
 const parseFolderTreeTargetId = (dndId)=>{
     if (typeof dndId !== 'string') {
@@ -21,5 +25,5 @@ const parseFolderTreeTargetId = (dndId)=>{
     return match ? Number(match[1]) : null;
 };
 
-export { HOME_TREE_TARGET_ID, parseFolderTargetId, parseFolderTreeTargetId, toFileDraggableId, toFolderDraggableId, toFolderTargetId, toFolderTreeTargetId };
+export { HOME_TREE_TARGET_ID, parseFolderTargetId, parseFolderTreeTargetId, toFileDraggableId, toFolderDraggableId, toFolderTargetId, toFolderTreeSummaryId, toFolderTreeTargetId };
 //# sourceMappingURL=dndIds.mjs.map

package/dist/admin/pages/Assets/components/Dnd/dndIds.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dndIds.mjs","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/dndIds.ts"],"sourcesContent":["export const toFileDraggableId = (id: number) => `file:${id}` as const;\n\nexport const toFolderDraggableId = (id: number) => `folder:${id}` as const;\n\nexport const toFolderTargetId = (id: number) => `folder-target:${id}` as const;\n\nexport const parseFolderTargetId = (dndId: string | number): number | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  const match = /^folder-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n\nexport const toFolderTreeTargetId = (id: number) => `folder-tree-target:${id}` as const;\n\nexport const HOME_TREE_TARGET_ID = 'folder-tree-target:home' as const;\n\nexport const parseFolderTreeTargetId = (dndId: string | number): number | 'root' | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  if (dndId === HOME_TREE_TARGET_ID) {\n    return 'root';\n  }\n\n  const match = /^folder-tree-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n"],"names":["toFileDraggableId","id","toFolderDraggableId","toFolderTargetId","parseFolderTargetId","dndId","match","exec","Number","toFolderTreeTargetId","HOME_TREE_TARGET_ID","parseFolderTreeTargetId"],"mappings":"AAAO,MAAMA,oBAAoB,CAACC,EAAAA,GAAe,CAAC,KAAK,EAAEA;AAElD,MAAMC,sBAAsB,CAACD,EAAAA,GAAe,CAAC,OAAO,EAAEA;AAEtD,MAAME,mBAAmB,CAACF,EAAAA,GAAe,CAAC,cAAc,EAAEA;AAE1D,MAAMG,sBAAsB,CAACC,KAAAA,GAAAA;IAClC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;IAEA,MAAMC,KAAAA,GAAQ,uBAAA,CAAwBC,IAAI,CAACF,KAAAA,CAAAA;AAC3C,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;AAEO,MAAMG,uBAAuB,CAACR,EAAAA,GAAe,CAAC,mBAAmB,EAAEA;AAEnE,MAAMS,sBAAsB;AAE5B,MAAMC,0BAA0B,CAACN,KAAAA,GAAAA;IACtC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,IAAIA,UAAUK,mBAAAA,EAAqB;QACjC,OAAO,MAAA;AACT,IAAA;IAEA,MAAMJ,KAAAA,GAAQ,4BAAA,CAA6BC,IAAI,CAACF,KAAAA,CAAAA;AAChD,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;;;;"}
+{"version":3,"file":"dndIds.mjs","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/dndIds.ts"],"sourcesContent":["export const toFileDraggableId = (id: number) => `file:${id}` as const;\n\nexport const toFolderDraggableId = (id: number) => `folder:${id}` as const;\n\nexport const toFolderTargetId = (id: number) => `folder-target:${id}` as const;\n\nexport const parseFolderTargetId = (dndId: string | number): number | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  const match = /^folder-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n\nexport const toFolderTreeTargetId = (id: number) => `folder-tree-target:${id}` as const;\n\n/**\n * The \"N parent folders\" row in the sidebar. Only there so hovering it during a\n * drag opens it; no parser recognises it, so a drop on it moves nothing.\n */\nexport const toFolderTreeSummaryId = (rootId: number) => `folder-tree-summary:${rootId}` as const;\n\nexport const HOME_TREE_TARGET_ID = 'folder-tree-target:home' as const;\n\nexport const parseFolderTreeTargetId = (dndId: string | number): number | 'root' | null => {\n  if (typeof dndId !== 'string') {\n    return null;\n  }\n\n  if (dndId === HOME_TREE_TARGET_ID) {\n    return 'root';\n  }\n\n  const match = /^folder-tree-target:(\\d+)$/.exec(dndId);\n  return match ? Number(match[1]) : null;\n};\n"],"names":["toFileDraggableId","id","toFolderDraggableId","toFolderTargetId","parseFolderTargetId","dndId","match","exec","Number","toFolderTreeTargetId","toFolderTreeSummaryId","rootId","HOME_TREE_TARGET_ID","parseFolderTreeTargetId"],"mappings":"AAAO,MAAMA,oBAAoB,CAACC,EAAAA,GAAe,CAAC,KAAK,EAAEA;AAElD,MAAMC,sBAAsB,CAACD,EAAAA,GAAe,CAAC,OAAO,EAAEA;AAEtD,MAAME,mBAAmB,CAACF,EAAAA,GAAe,CAAC,cAAc,EAAEA;AAE1D,MAAMG,sBAAsB,CAACC,KAAAA,GAAAA;IAClC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;IAEA,MAAMC,KAAAA,GAAQ,uBAAA,CAAwBC,IAAI,CAACF,KAAAA,CAAAA;AAC3C,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;AAEO,MAAMG,uBAAuB,CAACR,EAAAA,GAAe,CAAC,mBAAmB,EAAEA;AAE1E;;;UAIaS,qBAAAA,GAAwB,CAACC,SAAmB,CAAC,oBAAoB,EAAEA,MAAAA,CAAAA;AAEzE,MAAMC,sBAAsB;AAE5B,MAAMC,0BAA0B,CAACR,KAAAA,GAAAA;IACtC,IAAI,OAAOA,UAAU,QAAA,EAAU;QAC7B,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,IAAIA,UAAUO,mBAAAA,EAAqB;QACjC,OAAO,MAAA;AACT,IAAA;IAEA,MAAMN,KAAAA,GAAQ,4BAAA,CAA6BC,IAAI,CAACF,KAAAA,CAAAA;AAChD,IAAA,OAAOC,KAAAA,GAAQE,MAAAA,CAAOF,KAAK,CAAC,EAAE,CAAA,GAAI,IAAA;AACpC;;;;"}

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

@@ -4,12 +4,23 @@ var React = require('react');
 var core = require('@dnd-kit/core');
 var getRelationId = require('../../../../utils/getRelationId.js');
 var AssetsDndProvider = require('./AssetsDndProvider.js');
+var assetSortable = require('./assetSortable.js');
 var dndIds = require('./dndIds.js');
 
-const useFileDraggable = (asset)=>{
-    const { isMovePending } = AssetsDndProvider.useAssetsDndOptional() ?? {
-        isMovePending: false
+/**
+ * Without an `AssetsDndProvider` (the Content Manager asset picker mounts none)
+ * items are not draggable: nothing handles the drop. Their drag attributes are
+ * withheld too, so they aren't announced as draggable.
+ */ const NO_DRAG_ATTRIBUTES = {};
+const withoutDrag = (draggable, isDndEnabled)=>isDndEnabled ? draggable : {
+        ...draggable,
+        attributes: NO_DRAG_ATTRIBUTES,
+        listeners: undefined
     };
+const useFileDraggable = (asset)=>{
+    const dnd = AssetsDndProvider.useAssetsDndOptional();
+    const isDndEnabled = dnd !== null;
+    const isMovePending = dnd?.isMovePending ?? false;
     const data = React.useMemo(()=>({
             kind: 'file',
             id: asset.id,
@@ -23,20 +34,37 @@ const useFileDraggable = (asset)=>{
     const draggable = core.useDraggable({
         id: dndIds.toFileDraggableId(asset.id),
         data,
-        disabled: isMovePending
+        disabled: !isDndEnabled || isMovePending
     });
+    const sortable = assetSortable.useAssetSortable(asset.id);
+    // In a reorderable list (the picker's Selected tab) dragging reorders
+    // instead of moving between folders: the item takes the sortable's node,
+    // pointer listeners and transform, and exposes a grip for the keyboard.
+    if (sortable) {
+        return {
+            ...withoutDrag(draggable, false),
+            setNodeRef: sortable.setNodeRef,
+            isDragging: sortable.isDragging,
+            listeners: sortable.listeners,
+            dragStyle: sortable.style,
+            dragHandle: sortable.handle,
+            dragData: data
+        };
+    }
     // `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,
+        ...withoutDrag(draggable, isDndEnabled),
+        dragStyle: undefined,
+        dragHandle: undefined,
         dragData: data
     };
 };
 const useFolderDraggableDroppable = (folder)=>{
-    const { isMovePending, isValidDropTarget } = AssetsDndProvider.useAssetsDndOptional() ?? {
-        isMovePending: false,
-        isValidDropTarget: ()=>false
-    };
+    const dnd = AssetsDndProvider.useAssetsDndOptional();
+    const isDndEnabled = dnd !== null;
+    const isMovePending = dnd?.isMovePending ?? false;
+    const isValidDropTarget = dnd?.isValidDropTarget ?? (()=>false);
     const { active } = core.useDndContext();
     const parentId = getRelationId.getRelationId(folder.parent);
     const dragData = React.useMemo(()=>({
@@ -57,15 +85,15 @@ const useFolderDraggableDroppable = (folder)=>{
         folder.id,
         folder.name
     ]);
-    const draggable = core.useDraggable({
+    const draggable = withoutDrag(core.useDraggable({
         id: dndIds.toFolderDraggableId(folder.id),
         data: dragData,
-        disabled: isMovePending
-    });
+        disabled: !isDndEnabled || isMovePending
+    }), isDndEnabled);
     const droppable = core.useDroppable({
         id: dndIds.toFolderTargetId(folder.id),
         data: dropData,
-        disabled: isMovePending
+        disabled: !isDndEnabled || isMovePending
     });
     const isValidTarget = isValidDropTarget(folder.id);
     const isOver = droppable.isOver;

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

@@ -1 +1 @@
-{"version":3,"file":"useAssetDnd.js","sources":["../../../../../../admin/src/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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"}
+{"version":3,"file":"useAssetDnd.js","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/useAssetDnd.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport { useDndContext, useDraggable, useDroppable, type DraggableAttributes } from '@dnd-kit/core';\n\nimport { getRelationId } from '../../../../utils/getRelationId';\n\nimport { useAssetsDndOptional } from './AssetsDndProvider';\nimport { useAssetSortable } from './assetSortable';\nimport { toFileDraggableId, toFolderDraggableId, toFolderTargetId } from './dndIds';\n\nimport type { DragFileData, DragFolderData, FolderTargetData } from '../../../../types/dnd';\n\n/**\n * Without an `AssetsDndProvider` (the Content Manager asset picker mounts none)\n * items are not draggable: nothing handles the drop. Their drag attributes are\n * withheld too, so they aren't announced as draggable.\n */\nconst NO_DRAG_ATTRIBUTES: Partial<DraggableAttributes> = {};\n\nconst withoutDrag = <T extends { attributes: DraggableAttributes }>(\n  draggable: T,\n  isDndEnabled: boolean\n) =>\n  isDndEnabled ? draggable : { ...draggable, attributes: NO_DRAG_ATTRIBUTES, listeners: undefined };\n\nexport const useFileDraggable = (asset: {\n  id: number;\n  name: string;\n  folder?: number | string | { id?: number } | null;\n}) => {\n  const dnd = useAssetsDndOptional();\n  const isDndEnabled = dnd !== null;\n  const isMovePending = dnd?.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: !isDndEnabled || isMovePending,\n  });\n\n  const sortable = useAssetSortable(asset.id);\n\n  // In a reorderable list (the picker's Selected tab) dragging reorders\n  // instead of moving between folders: the item takes the sortable's node,\n  // pointer listeners and transform, and exposes a grip for the keyboard.\n  if (sortable) {\n    return {\n      ...withoutDrag(draggable, false),\n      setNodeRef: sortable.setNodeRef,\n      isDragging: sortable.isDragging,\n      listeners: sortable.listeners,\n      dragStyle: sortable.style,\n      dragHandle: sortable.handle,\n      dragData: data,\n    };\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 {\n    ...withoutDrag(draggable, isDndEnabled),\n    dragStyle: undefined,\n    dragHandle: undefined,\n    dragData: data,\n  };\n};\n\nexport const useFolderDraggableDroppable = (folder: {\n  id: number;\n  name: string;\n  parent?: number | null | { id?: number };\n}) => {\n  const dnd = useAssetsDndOptional();\n  const isDndEnabled = dnd !== null;\n  const isMovePending = dnd?.isMovePending ?? false;\n  const isValidDropTarget = dnd?.isValidDropTarget ?? (() => false);\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 = withoutDrag(\n    useDraggable({\n      id: toFolderDraggableId(folder.id),\n      data: dragData,\n      disabled: !isDndEnabled || isMovePending,\n    }),\n    isDndEnabled\n  );\n\n  const droppable = useDroppable({\n    id: toFolderTargetId(folder.id),\n    data: dropData,\n    disabled: !isDndEnabled || 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":["NO_DRAG_ATTRIBUTES","withoutDrag","draggable","isDndEnabled","attributes","listeners","undefined","useFileDraggable","asset","dnd","useAssetsDndOptional","isMovePending","data","useMemo","kind","id","name","folderId","getRelationId","folder","useDraggable","toFileDraggableId","disabled","sortable","useAssetSortable","setNodeRef","isDragging","dragStyle","style","dragHandle","handle","dragData","useFolderDraggableDroppable","isValidDropTarget","active","useDndContext","parentId","parent","dropData","toFolderDraggableId","droppable","useDroppable","toFolderTargetId","isValidTarget","isOver","showValidDropHighlight","showInvalidDropCursor"],"mappings":"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"}

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

@@ -2,12 +2,23 @@ import { useMemo } from 'react';
 import { useDndContext, useDraggable, useDroppable } from '@dnd-kit/core';
 import { getRelationId } from '../../../../utils/getRelationId.mjs';
 import { useAssetsDndOptional } from './AssetsDndProvider.mjs';
+import { useAssetSortable } from './assetSortable.mjs';
 import { toFolderDraggableId, toFolderTargetId, toFileDraggableId } from './dndIds.mjs';
 
-const useFileDraggable = (asset)=>{
-    const { isMovePending } = useAssetsDndOptional() ?? {
-        isMovePending: false
+/**
+ * Without an `AssetsDndProvider` (the Content Manager asset picker mounts none)
+ * items are not draggable: nothing handles the drop. Their drag attributes are
+ * withheld too, so they aren't announced as draggable.
+ */ const NO_DRAG_ATTRIBUTES = {};
+const withoutDrag = (draggable, isDndEnabled)=>isDndEnabled ? draggable : {
+        ...draggable,
+        attributes: NO_DRAG_ATTRIBUTES,
+        listeners: undefined
     };
+const useFileDraggable = (asset)=>{
+    const dnd = useAssetsDndOptional();
+    const isDndEnabled = dnd !== null;
+    const isMovePending = dnd?.isMovePending ?? false;
     const data = useMemo(()=>({
             kind: 'file',
             id: asset.id,
@@ -21,20 +32,37 @@ const useFileDraggable = (asset)=>{
     const draggable = useDraggable({
         id: toFileDraggableId(asset.id),
         data,
-        disabled: isMovePending
+        disabled: !isDndEnabled || isMovePending
     });
+    const sortable = useAssetSortable(asset.id);
+    // In a reorderable list (the picker's Selected tab) dragging reorders
+    // instead of moving between folders: the item takes the sortable's node,
+    // pointer listeners and transform, and exposes a grip for the keyboard.
+    if (sortable) {
+        return {
+            ...withoutDrag(draggable, false),
+            setNodeRef: sortable.setNodeRef,
+            isDragging: sortable.isDragging,
+            listeners: sortable.listeners,
+            dragStyle: sortable.style,
+            dragHandle: sortable.handle,
+            dragData: data
+        };
+    }
     // `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,
+        ...withoutDrag(draggable, isDndEnabled),
+        dragStyle: undefined,
+        dragHandle: undefined,
         dragData: data
     };
 };
 const useFolderDraggableDroppable = (folder)=>{
-    const { isMovePending, isValidDropTarget } = useAssetsDndOptional() ?? {
-        isMovePending: false,
-        isValidDropTarget: ()=>false
-    };
+    const dnd = useAssetsDndOptional();
+    const isDndEnabled = dnd !== null;
+    const isMovePending = dnd?.isMovePending ?? false;
+    const isValidDropTarget = dnd?.isValidDropTarget ?? (()=>false);
     const { active } = useDndContext();
     const parentId = getRelationId(folder.parent);
     const dragData = useMemo(()=>({
@@ -55,15 +83,15 @@ const useFolderDraggableDroppable = (folder)=>{
         folder.id,
         folder.name
     ]);
-    const draggable = useDraggable({
+    const draggable = withoutDrag(useDraggable({
         id: toFolderDraggableId(folder.id),
         data: dragData,
-        disabled: isMovePending
-    });
+        disabled: !isDndEnabled || isMovePending
+    }), isDndEnabled);
     const droppable = useDroppable({
         id: toFolderTargetId(folder.id),
         data: dropData,
-        disabled: isMovePending
+        disabled: !isDndEnabled || isMovePending
     });
     const isValidTarget = isValidDropTarget(folder.id);
     const isOver = droppable.isOver;

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

@@ -1 +1 @@
-{"version":3,"file":"useAssetDnd.mjs","sources":["../../../../../../admin/src/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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"}
+{"version":3,"file":"useAssetDnd.mjs","sources":["../../../../../../admin/src/pages/Assets/components/Dnd/useAssetDnd.ts"],"sourcesContent":["import { useMemo } from 'react';\n\nimport { useDndContext, useDraggable, useDroppable, type DraggableAttributes } from '@dnd-kit/core';\n\nimport { getRelationId } from '../../../../utils/getRelationId';\n\nimport { useAssetsDndOptional } from './AssetsDndProvider';\nimport { useAssetSortable } from './assetSortable';\nimport { toFileDraggableId, toFolderDraggableId, toFolderTargetId } from './dndIds';\n\nimport type { DragFileData, DragFolderData, FolderTargetData } from '../../../../types/dnd';\n\n/**\n * Without an `AssetsDndProvider` (the Content Manager asset picker mounts none)\n * items are not draggable: nothing handles the drop. Their drag attributes are\n * withheld too, so they aren't announced as draggable.\n */\nconst NO_DRAG_ATTRIBUTES: Partial<DraggableAttributes> = {};\n\nconst withoutDrag = <T extends { attributes: DraggableAttributes }>(\n  draggable: T,\n  isDndEnabled: boolean\n) =>\n  isDndEnabled ? draggable : { ...draggable, attributes: NO_DRAG_ATTRIBUTES, listeners: undefined };\n\nexport const useFileDraggable = (asset: {\n  id: number;\n  name: string;\n  folder?: number | string | { id?: number } | null;\n}) => {\n  const dnd = useAssetsDndOptional();\n  const isDndEnabled = dnd !== null;\n  const isMovePending = dnd?.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: !isDndEnabled || isMovePending,\n  });\n\n  const sortable = useAssetSortable(asset.id);\n\n  // In a reorderable list (the picker's Selected tab) dragging reorders\n  // instead of moving between folders: the item takes the sortable's node,\n  // pointer listeners and transform, and exposes a grip for the keyboard.\n  if (sortable) {\n    return {\n      ...withoutDrag(draggable, false),\n      setNodeRef: sortable.setNodeRef,\n      isDragging: sortable.isDragging,\n      listeners: sortable.listeners,\n      dragStyle: sortable.style,\n      dragHandle: sortable.handle,\n      dragData: data,\n    };\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 {\n    ...withoutDrag(draggable, isDndEnabled),\n    dragStyle: undefined,\n    dragHandle: undefined,\n    dragData: data,\n  };\n};\n\nexport const useFolderDraggableDroppable = (folder: {\n  id: number;\n  name: string;\n  parent?: number | null | { id?: number };\n}) => {\n  const dnd = useAssetsDndOptional();\n  const isDndEnabled = dnd !== null;\n  const isMovePending = dnd?.isMovePending ?? false;\n  const isValidDropTarget = dnd?.isValidDropTarget ?? (() => false);\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 = withoutDrag(\n    useDraggable({\n      id: toFolderDraggableId(folder.id),\n      data: dragData,\n      disabled: !isDndEnabled || isMovePending,\n    }),\n    isDndEnabled\n  );\n\n  const droppable = useDroppable({\n    id: toFolderTargetId(folder.id),\n    data: dropData,\n    disabled: !isDndEnabled || 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":["NO_DRAG_ATTRIBUTES","withoutDrag","draggable","isDndEnabled","attributes","listeners","undefined","useFileDraggable","asset","dnd","useAssetsDndOptional","isMovePending","data","useMemo","kind","id","name","folderId","getRelationId","folder","useDraggable","toFileDraggableId","disabled","sortable","useAssetSortable","setNodeRef","isDragging","dragStyle","style","dragHandle","handle","dragData","useFolderDraggableDroppable","isValidDropTarget","active","useDndContext","parentId","parent","dropData","toFolderDraggableId","droppable","useDroppable","toFolderTargetId","isValidTarget","isOver","showValidDropHighlight","showInvalidDropCursor"],"mappings":"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"}

package/dist/admin/pages/Assets/components/FilterBadges.mjs

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useId, useRef, useState } from 'react';
-import { Flex, Typography, Popover, Checkbox } from '@strapi/design-system';
+import { Flex, Popover, Typography, Checkbox } from '@strapi/design-system';
 import { Cross, Check } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 import { styled } from 'styled-components';
@@ -8,7 +8,7 @@ import { getTranslationKey } from '../../../utils/translations.mjs';
 import { TYPE_VALUES, DATE_PRESETS } from '../hooks/useListFilters.mjs';
 import { parseCalendarDate } from '../utils/buildAssetFilters.mjs';
 import { DateRangeCalendar } from './DateRangeCalendar.mjs';
-import { DATE_FIELD_LABELS, TYPE_LABELS, PRESET_LABELS, FILTER_PANEL_WIDTH } from './FilterMenu.mjs';
+import { FILTER_PANEL_WIDTH, DATE_FIELD_LABELS, TYPE_LABELS, PRESET_LABELS } from './FilterMenu.mjs';
 
 /**
  * Row of applied-filter badges under the toolbar. A badge has three segments —

package/dist/admin/pages/Assets/components/FilterMenu.mjs

@@ -1,8 +1,8 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { useIsMobile } from '@strapi/admin/strapi-admin';
-import { Menu, Checkbox, Flex, Box, Badge } from '@strapi/design-system';
-import { Filter, ChevronDown, Check } from '@strapi/icons';
+import { Menu, Box, Badge, Checkbox, Flex } from '@strapi/design-system';
+import { ChevronDown, Filter, Check } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 import { styled } from 'styled-components';
 import { useTracking, MEDIA_LIBRARY_LOCATION } from '../../../hooks/useTracking.mjs';