@strapi/upload 5.51.0 → 5.51.2

package/dist/admin/future/pages/Assets/hooks/useAssetSelection.mjs

@@ -0,0 +1,71 @@
+import { useState, useCallback, useMemo, createElement, createContext, useContext } from 'react';
+import { createEmptySelection, toggleSelection, selectRange, selectAll, clearSelection, getIdsOfKind } from '../utils/selection.mjs';
+
+const AssetSelectionContext = createContext(null);
+const AssetSelectionProvider = ({ children, disabled = false })=>{
+    const [state, setState] = useState(createEmptySelection);
+    const isSelected = useCallback((key)=>!disabled && state.selectedKeys.has(key), [
+        disabled,
+        state.selectedKeys
+    ]);
+    const toggle = useCallback((key)=>{
+        if (disabled) return;
+        setState((prev)=>toggleSelection(prev, key));
+    }, [
+        disabled
+    ]);
+    const selectRange$1 = useCallback((orderedKeys, targetKey)=>{
+        if (disabled) return;
+        setState((prev)=>selectRange(prev, orderedKeys, targetKey));
+    }, [
+        disabled
+    ]);
+    const selectAll$1 = useCallback((orderedKeys)=>{
+        if (disabled) return;
+        setState(selectAll(orderedKeys));
+    }, [
+        disabled
+    ]);
+    const clear = useCallback(()=>setState(clearSelection()), []);
+    const selectedIds = useMemo(()=>getIdsOfKind(state.selectedKeys, 'asset'), [
+        state.selectedKeys
+    ]);
+    const selectedFolderIds = useMemo(()=>getIdsOfKind(state.selectedKeys, 'folder'), [
+        state.selectedKeys
+    ]);
+    const value = useMemo(()=>({
+            selectedKeys: state.selectedKeys,
+            selectedIds,
+            selectedFolderIds,
+            anchorKey: state.anchorKey,
+            isSelected,
+            toggle,
+            selectRange: selectRange$1,
+            selectAll: selectAll$1,
+            clear
+        }), [
+        state.selectedKeys,
+        selectedIds,
+        selectedFolderIds,
+        state.anchorKey,
+        isSelected,
+        toggle,
+        selectRange$1,
+        selectAll$1,
+        clear
+    ]);
+    return createElement(AssetSelectionContext.Provider, {
+        value
+    }, children);
+};
+const useAssetSelection = ()=>{
+    const context = useContext(AssetSelectionContext);
+    if (!context) {
+        throw new Error('useAssetSelection must be used within an AssetSelectionProvider');
+    }
+    return context;
+};
+const useAssetSelectionOptional = ()=>useContext(AssetSelectionContext);
+
+export { AssetSelectionProvider, useAssetSelection, useAssetSelectionOptional };
+//# sourceMappingURL=useAssetSelection.mjs.map

package/dist/admin/future/pages/Assets/hooks/useAssetSelection.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAssetSelection.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useAssetSelection.ts"],"sourcesContent":["import {\n  createContext,\n  createElement,\n  useCallback,\n  useContext,\n  useMemo,\n  useState,\n  type ReactNode,\n} from 'react';\n\nimport {\n  clearSelection,\n  createEmptySelection,\n  getIdsOfKind,\n  selectAll as selectAllState,\n  selectRange as selectRangeState,\n  toggleSelection,\n  type ItemKey,\n  type SelectionState,\n} from '../utils/selection';\n\n/**\n * Ephemeral, view-state-only multi-select for the future Media Library. Selection\n * is page-scoped and reset on folder navigation or sort/filter changes (the\n * table/grid toggle keeps it — same list, different presentation).\n *\n * The actual computation lives in `../utils/selection.ts` (pure + unit-tested);\n * this hook is a thin React wrapper. Assets and folders share one mechanism —\n * items are tracked as namespaced keys (`asset:1` / `folder:1`) so toggle, range\n * and select-all behave the same for both. Range / select-all receive the\n * ordered key array from the caller (the view owns the rendered order), keeping\n * the context data-source-agnostic.\n */\nexport interface AssetSelection {\n  /** Every selected item key (assets and folders), render-order agnostic. */\n  selectedKeys: Set<ItemKey>;\n  /** Selected asset ids, derived from {@link selectedKeys}. */\n  selectedIds: Set<number>;\n  /** Selected folder ids, derived from {@link selectedKeys}. */\n  selectedFolderIds: Set<number>;\n  anchorKey: ItemKey | null;\n  isSelected: (key: ItemKey) => boolean;\n  /** Additive toggle (Cmd/Ctrl+click, item checkbox). */\n  toggle: (key: ItemKey) => void;\n  /** Shift+click — selects the contiguous range from the anchor to the target. */\n  selectRange: (orderedKeys: ItemKey[], targetKey: ItemKey) => void;\n  /** Header checkbox — selects every rendered item (folders and assets). */\n  selectAll: (orderedKeys: ItemKey[]) => void;\n  /** Close button / folder navigation / list-identity changes. */\n  clear: () => void;\n}\n\nconst AssetSelectionContext = createContext<AssetSelection | null>(null);\n\ninterface AssetSelectionProviderProps {\n  children: ReactNode;\n  /**\n   * When true, selection is inert: every mutator is a no-op and nothing ever\n   * reads as selected. Every bulk action is gated on `assets.update`, so a user\n   * without it has nothing to select for — the views also hide the checkboxes,\n   * and this makes the remaining paths (click-to-select, Space key) do nothing.\n   */\n  disabled?: boolean;\n}\n\nexport const AssetSelectionProvider = ({\n  children,\n  disabled = false,\n}: AssetSelectionProviderProps) => {\n  const [state, setState] = useState<SelectionState>(createEmptySelection);\n\n  const isSelected = useCallback(\n    (key: ItemKey) => !disabled && state.selectedKeys.has(key),\n    [disabled, state.selectedKeys]\n  );\n\n  const toggle = useCallback(\n    (key: ItemKey) => {\n      if (disabled) return;\n      setState((prev) => toggleSelection(prev, key));\n    },\n    [disabled]\n  );\n\n  const selectRange = useCallback(\n    (orderedKeys: ItemKey[], targetKey: ItemKey) => {\n      if (disabled) return;\n      setState((prev) => selectRangeState(prev, orderedKeys, targetKey));\n    },\n    [disabled]\n  );\n\n  const selectAll = useCallback(\n    (orderedKeys: ItemKey[]) => {\n      if (disabled) return;\n      setState(selectAllState(orderedKeys));\n    },\n    [disabled]\n  );\n\n  const clear = useCallback(() => setState(clearSelection()), []);\n\n  const selectedIds = useMemo(\n    () => getIdsOfKind(state.selectedKeys, 'asset'),\n    [state.selectedKeys]\n  );\n  const selectedFolderIds = useMemo(\n    () => getIdsOfKind(state.selectedKeys, 'folder'),\n    [state.selectedKeys]\n  );\n\n  const value = useMemo<AssetSelection>(\n    () => ({\n      selectedKeys: state.selectedKeys,\n      selectedIds,\n      selectedFolderIds,\n      anchorKey: state.anchorKey,\n      isSelected,\n      toggle,\n      selectRange,\n      selectAll,\n      clear,\n    }),\n    [\n      state.selectedKeys,\n      selectedIds,\n      selectedFolderIds,\n      state.anchorKey,\n      isSelected,\n      toggle,\n      selectRange,\n      selectAll,\n      clear,\n    ]\n  );\n\n  return createElement(AssetSelectionContext.Provider, { value }, children);\n};\n\nexport const useAssetSelection = () => {\n  const context = useContext(AssetSelectionContext);\n\n  if (!context) {\n    throw new Error('useAssetSelection must be used within an AssetSelectionProvider');\n  }\n\n  return context;\n};\n\nexport const useAssetSelectionOptional = () => useContext(AssetSelectionContext);\n"],"names":["AssetSelectionContext","createContext","AssetSelectionProvider","children","disabled","state","setState","useState","createEmptySelection","isSelected","useCallback","key","selectedKeys","has","toggle","prev","toggleSelection","selectRange","orderedKeys","targetKey","selectRangeState","selectAll","selectAllState","clear","clearSelection","selectedIds","useMemo","getIdsOfKind","selectedFolderIds","value","anchorKey","createElement","Provider","useAssetSelection","context","useContext","Error","useAssetSelectionOptional"],"mappings":"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"}

package/dist/admin/future/pages/Assets/hooks/useFolderNavigation.js

@@ -13,17 +13,34 @@ const parseFolderIdFromQuery = (folder)=>{
 const useFolderNavigation = ()=>{
     const [{ query }, setQuery] = strapiAdmin.useQueryParams();
     const currentFolderId = parseFolderIdFromQuery(query?.folder);
-    const navigateToFolder = (folder)=>{
+    /**
+   * Asset search is global, so keeping `_q` after a folder navigation would show
+   * byte-identical results and make the navigation look broken. Clearing it here
+   * — rather than at each call site — means no caller can forget.
+   */ const navigateToFolder = React.useCallback((folder)=>{
         setQuery({
-            folder: String(folder.id)
+            folder: String(folder.id),
+            _q: undefined
         });
-    };
+    }, [
+        setQuery
+    ]);
     /**
-   * Move to the Media Library root by removing the `folder` query param.
-   * `setQuery(_, 'remove')` deletes the keys present on the first argument
-   * (value is ignored), so any other query state (filters, pagination, etc.)
-   * is preserved.
+   * Move to the Media Library root by removing the `folder` query param, and the
+   * search term with it. `setQuery(_, 'remove')` deletes the keys present on the
+   * first argument (values are ignored) in one navigation, so any other query
+   * state (pagination, the details drawer, etc.) is preserved.
    */ const navigateToRoot = React.useCallback(()=>{
+        setQuery({
+            folder: '',
+            _q: ''
+        }, 'remove');
+    }, [
+        setQuery
+    ]);
+    /**
+   * Strips a `?folder=` value we can't parse.
+   */ const stripFolderParam = React.useCallback(()=>{
         setQuery({
             folder: ''
         }, 'remove');
@@ -34,26 +51,30 @@ const useFolderNavigation = ()=>{
     // Deleted/missing folders (404) are handled in AssetsPage — that needs a fetch.
     React.useEffect(()=>{
         if (query?.folder && currentFolderId === null) {
-            navigateToRoot();
+            stripFolderParam();
         }
     }, [
         query?.folder,
         currentFolderId,
-        navigateToRoot
+        stripFolderParam
     ]);
     /**
    * Convenience for the FolderTree sidebar: a single entry point that handles
    * both "go home" and "go to folder X" without forcing the caller to know
    * whether to call navigateToFolder or navigateToRoot.
-   */ const navigateToFolderId = (folderId)=>{
+   */ const navigateToFolderId = React.useCallback((folderId)=>{
         if (folderId == null) {
             navigateToRoot();
         } else {
             setQuery({
-                folder: String(folderId)
+                folder: String(folderId),
+                _q: undefined
             });
         }
-    };
+    }, [
+        navigateToRoot,
+        setQuery
+    ]);
     return {
         currentFolderId,
         navigateToFolder,

package/dist/admin/future/pages/Assets/hooks/useFolderNavigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFolderNavigation.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useFolderNavigation.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { useQueryParams } from '@strapi/admin/strapi-admin';\n\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\nconst parseFolderIdFromQuery = (folder: string | undefined): number | null => {\n  if (!folder) {\n    return null;\n  }\n\n  const id = Number(folder);\n\n  return Number.isFinite(id) ? id : null;\n};\n\nexport const useFolderNavigation = () => {\n  const [{ query }, setQuery] = useQueryParams<{ folder?: string }>();\n\n  const currentFolderId = parseFolderIdFromQuery(query?.folder);\n\n  const navigateToFolder = (folder: Folder) => {\n    setQuery({ folder: String(folder.id) });\n  };\n\n  /**\n   * Move to the Media Library root by removing the `folder` query param.\n   * `setQuery(_, 'remove')` deletes the keys present on the first argument\n   * (value is ignored), so any other query state (filters, pagination, etc.)\n   * is preserved.\n   */\n  const navigateToRoot = useCallback(() => {\n    setQuery({ folder: '' }, 'remove');\n  }, [setQuery]);\n\n  // Malformed ?folder= values (e.g. abc) parse as null; strip the param from the URL.\n  // Deleted/missing folders (404) are handled in AssetsPage — that needs a fetch.\n  useEffect(() => {\n    if (query?.folder && currentFolderId === null) {\n      navigateToRoot();\n    }\n  }, [query?.folder, currentFolderId, navigateToRoot]);\n\n  /**\n   * Convenience for the FolderTree sidebar: a single entry point that handles\n   * both \"go home\" and \"go to folder X\" without forcing the caller to know\n   * whether to call navigateToFolder or navigateToRoot.\n   */\n  const navigateToFolderId = (folderId: number | null) => {\n    if (folderId == null) {\n      navigateToRoot();\n    } else {\n      setQuery({ folder: String(folderId) });\n    }\n  };\n\n  return {\n    currentFolderId,\n    navigateToFolder,\n    navigateToRoot,\n    navigateToFolderId,\n  };\n};\n"],"names":["parseFolderIdFromQuery","folder","id","Number","isFinite","useFolderNavigation","query","setQuery","useQueryParams","currentFolderId","navigateToFolder","String","navigateToRoot","useCallback","useEffect","navigateToFolderId","folderId"],"mappings":";;;;;AAMA,MAAMA,yBAAyB,CAACC,MAAAA,GAAAA;AAC9B,IAAA,IAAI,CAACA,MAAAA,EAAQ;QACX,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMC,KAAKC,MAAAA,CAAOF,MAAAA,CAAAA;AAElB,IAAA,OAAOE,MAAAA,CAAOC,QAAQ,CAACF,EAAAA,CAAAA,GAAMA,EAAAA,GAAK,IAAA;AACpC,CAAA;MAEaG,mBAAAA,GAAsB,IAAA;AACjC,IAAA,MAAM,CAAC,EAAEC,KAAK,EAAE,EAAEC,SAAS,GAAGC,0BAAAA,EAAAA;IAE9B,MAAMC,eAAAA,GAAkBT,uBAAuBM,KAAAA,EAAOL,MAAAA,CAAAA;AAEtD,IAAA,MAAMS,mBAAmB,CAACT,MAAAA,GAAAA;QACxBM,QAAAA,CAAS;YAAEN,MAAAA,EAAQU,MAAAA,CAAOV,OAAOC,EAAE;AAAE,SAAA,CAAA;AACvC,IAAA,CAAA;AAEA;;;;;MAMA,MAAMU,iBAAiBC,iBAAAA,CAAY,IAAA;QACjCN,QAAAA,CAAS;YAAEN,MAAAA,EAAQ;SAAG,EAAG,QAAA,CAAA;IAC3B,CAAA,EAAG;AAACM,QAAAA;AAAS,KAAA,CAAA;;;IAIbO,eAAAA,CAAU,IAAA;QACR,IAAIR,KAAAA,EAAOL,MAAAA,IAAUQ,eAAAA,KAAoB,IAAA,EAAM;AAC7CG,YAAAA,cAAAA,EAAAA;AACF,QAAA;IACF,CAAA,EAAG;QAACN,KAAAA,EAAOL,MAAAA;AAAQQ,QAAAA,eAAAA;AAAiBG,QAAAA;AAAe,KAAA,CAAA;AAEnD;;;;MAKA,MAAMG,qBAAqB,CAACC,QAAAA,GAAAA;AAC1B,QAAA,IAAIA,YAAY,IAAA,EAAM;AACpBJ,YAAAA,cAAAA,EAAAA;QACF,CAAA,MAAO;YACLL,QAAAA,CAAS;AAAEN,gBAAAA,MAAAA,EAAQU,MAAAA,CAAOK,QAAAA;AAAU,aAAA,CAAA;AACtC,QAAA;AACF,IAAA,CAAA;IAEA,OAAO;AACLP,QAAAA,eAAAA;AACAC,QAAAA,gBAAAA;AACAE,QAAAA,cAAAA;AACAG,QAAAA;AACF,KAAA;AACF;;;;"}
+{"version":3,"file":"useFolderNavigation.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useFolderNavigation.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { useQueryParams } from '@strapi/admin/strapi-admin';\n\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\nconst parseFolderIdFromQuery = (folder: string | undefined): number | null => {\n  if (!folder) {\n    return null;\n  }\n\n  const id = Number(folder);\n\n  return Number.isFinite(id) ? id : null;\n};\n\ninterface FolderNavigationQuery {\n  folder?: string;\n  _q?: string;\n}\n\nexport const useFolderNavigation = () => {\n  const [{ query }, setQuery] = useQueryParams<FolderNavigationQuery>();\n\n  const currentFolderId = parseFolderIdFromQuery(query?.folder);\n\n  /**\n   * Asset search is global, so keeping `_q` after a folder navigation would show\n   * byte-identical results and make the navigation look broken. Clearing it here\n   * — rather than at each call site — means no caller can forget.\n   */\n  const navigateToFolder = useCallback(\n    (folder: Folder) => {\n      setQuery({ folder: String(folder.id), _q: undefined });\n    },\n    [setQuery]\n  );\n\n  /**\n   * Move to the Media Library root by removing the `folder` query param, and the\n   * search term with it. `setQuery(_, 'remove')` deletes the keys present on the\n   * first argument (values are ignored) in one navigation, so any other query\n   * state (pagination, the details drawer, etc.) is preserved.\n   */\n  const navigateToRoot = useCallback(() => {\n    setQuery({ folder: '', _q: '' }, 'remove');\n  }, [setQuery]);\n\n  /**\n   * Strips a `?folder=` value we can't parse.\n   */\n  const stripFolderParam = useCallback(() => {\n    setQuery({ folder: '' }, 'remove');\n  }, [setQuery]);\n\n  // Malformed ?folder= values (e.g. abc) parse as null; strip the param from the URL.\n  // Deleted/missing folders (404) are handled in AssetsPage — that needs a fetch.\n  useEffect(() => {\n    if (query?.folder && currentFolderId === null) {\n      stripFolderParam();\n    }\n  }, [query?.folder, currentFolderId, stripFolderParam]);\n\n  /**\n   * Convenience for the FolderTree sidebar: a single entry point that handles\n   * both \"go home\" and \"go to folder X\" without forcing the caller to know\n   * whether to call navigateToFolder or navigateToRoot.\n   */\n  const navigateToFolderId = useCallback(\n    (folderId: number | null) => {\n      if (folderId == null) {\n        navigateToRoot();\n      } else {\n        setQuery({ folder: String(folderId), _q: undefined });\n      }\n    },\n    [navigateToRoot, setQuery]\n  );\n\n  return {\n    currentFolderId,\n    navigateToFolder,\n    navigateToRoot,\n    navigateToFolderId,\n  };\n};\n"],"names":["parseFolderIdFromQuery","folder","id","Number","isFinite","useFolderNavigation","query","setQuery","useQueryParams","currentFolderId","navigateToFolder","useCallback","String","_q","undefined","navigateToRoot","stripFolderParam","useEffect","navigateToFolderId","folderId"],"mappings":";;;;;AAMA,MAAMA,yBAAyB,CAACC,MAAAA,GAAAA;AAC9B,IAAA,IAAI,CAACA,MAAAA,EAAQ;QACX,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMC,KAAKC,MAAAA,CAAOF,MAAAA,CAAAA;AAElB,IAAA,OAAOE,MAAAA,CAAOC,QAAQ,CAACF,EAAAA,CAAAA,GAAMA,EAAAA,GAAK,IAAA;AACpC,CAAA;MAOaG,mBAAAA,GAAsB,IAAA;AACjC,IAAA,MAAM,CAAC,EAAEC,KAAK,EAAE,EAAEC,SAAS,GAAGC,0BAAAA,EAAAA;IAE9B,MAAMC,eAAAA,GAAkBT,uBAAuBM,KAAAA,EAAOL,MAAAA,CAAAA;AAEtD;;;;MAKA,MAAMS,gBAAAA,GAAmBC,iBAAAA,CACvB,CAACV,MAAAA,GAAAA;QACCM,QAAAA,CAAS;YAAEN,MAAAA,EAAQW,MAAAA,CAAOX,OAAOC,EAAE,CAAA;YAAGW,EAAAA,EAAIC;AAAU,SAAA,CAAA;IACtD,CAAA,EACA;AAACP,QAAAA;AAAS,KAAA,CAAA;AAGZ;;;;;MAMA,MAAMQ,iBAAiBJ,iBAAAA,CAAY,IAAA;QACjCJ,QAAAA,CAAS;YAAEN,MAAAA,EAAQ,EAAA;YAAIY,EAAAA,EAAI;SAAG,EAAG,QAAA,CAAA;IACnC,CAAA,EAAG;AAACN,QAAAA;AAAS,KAAA,CAAA;AAEb;;MAGA,MAAMS,mBAAmBL,iBAAAA,CAAY,IAAA;QACnCJ,QAAAA,CAAS;YAAEN,MAAAA,EAAQ;SAAG,EAAG,QAAA,CAAA;IAC3B,CAAA,EAAG;AAACM,QAAAA;AAAS,KAAA,CAAA;;;IAIbU,eAAAA,CAAU,IAAA;QACR,IAAIX,KAAAA,EAAOL,MAAAA,IAAUQ,eAAAA,KAAoB,IAAA,EAAM;AAC7CO,YAAAA,gBAAAA,EAAAA;AACF,QAAA;IACF,CAAA,EAAG;QAACV,KAAAA,EAAOL,MAAAA;AAAQQ,QAAAA,eAAAA;AAAiBO,QAAAA;AAAiB,KAAA,CAAA;AAErD;;;;MAKA,MAAME,kBAAAA,GAAqBP,iBAAAA,CACzB,CAACQ,QAAAA,GAAAA;AACC,QAAA,IAAIA,YAAY,IAAA,EAAM;AACpBJ,YAAAA,cAAAA,EAAAA;QACF,CAAA,MAAO;YACLR,QAAAA,CAAS;AAAEN,gBAAAA,MAAAA,EAAQW,MAAAA,CAAOO,QAAAA,CAAAA;gBAAWN,EAAAA,EAAIC;AAAU,aAAA,CAAA;AACrD,QAAA;IACF,CAAA,EACA;AAACC,QAAAA,cAAAA;AAAgBR,QAAAA;AAAS,KAAA,CAAA;IAG5B,OAAO;AACLE,QAAAA,eAAAA;AACAC,QAAAA,gBAAAA;AACAK,QAAAA,cAAAA;AACAG,QAAAA;AACF,KAAA;AACF;;;;"}

package/dist/admin/future/pages/Assets/hooks/useFolderNavigation.mjs

@@ -11,17 +11,34 @@ const parseFolderIdFromQuery = (folder)=>{
 const useFolderNavigation = ()=>{
     const [{ query }, setQuery] = useQueryParams();
     const currentFolderId = parseFolderIdFromQuery(query?.folder);
-    const navigateToFolder = (folder)=>{
+    /**
+   * Asset search is global, so keeping `_q` after a folder navigation would show
+   * byte-identical results and make the navigation look broken. Clearing it here
+   * — rather than at each call site — means no caller can forget.
+   */ const navigateToFolder = useCallback((folder)=>{
         setQuery({
-            folder: String(folder.id)
+            folder: String(folder.id),
+            _q: undefined
         });
-    };
+    }, [
+        setQuery
+    ]);
     /**
-   * Move to the Media Library root by removing the `folder` query param.
-   * `setQuery(_, 'remove')` deletes the keys present on the first argument
-   * (value is ignored), so any other query state (filters, pagination, etc.)
-   * is preserved.
+   * Move to the Media Library root by removing the `folder` query param, and the
+   * search term with it. `setQuery(_, 'remove')` deletes the keys present on the
+   * first argument (values are ignored) in one navigation, so any other query
+   * state (pagination, the details drawer, etc.) is preserved.
    */ const navigateToRoot = useCallback(()=>{
+        setQuery({
+            folder: '',
+            _q: ''
+        }, 'remove');
+    }, [
+        setQuery
+    ]);
+    /**
+   * Strips a `?folder=` value we can't parse.
+   */ const stripFolderParam = useCallback(()=>{
         setQuery({
             folder: ''
         }, 'remove');
@@ -32,26 +49,30 @@ const useFolderNavigation = ()=>{
     // Deleted/missing folders (404) are handled in AssetsPage — that needs a fetch.
     useEffect(()=>{
         if (query?.folder && currentFolderId === null) {
-            navigateToRoot();
+            stripFolderParam();
         }
     }, [
         query?.folder,
         currentFolderId,
-        navigateToRoot
+        stripFolderParam
     ]);
     /**
    * Convenience for the FolderTree sidebar: a single entry point that handles
    * both "go home" and "go to folder X" without forcing the caller to know
    * whether to call navigateToFolder or navigateToRoot.
-   */ const navigateToFolderId = (folderId)=>{
+   */ const navigateToFolderId = useCallback((folderId)=>{
         if (folderId == null) {
             navigateToRoot();
         } else {
             setQuery({
-                folder: String(folderId)
+                folder: String(folderId),
+                _q: undefined
             });
         }
-    };
+    }, [
+        navigateToRoot,
+        setQuery
+    ]);
     return {
         currentFolderId,
         navigateToFolder,

package/dist/admin/future/pages/Assets/hooks/useFolderNavigation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useFolderNavigation.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useFolderNavigation.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { useQueryParams } from '@strapi/admin/strapi-admin';\n\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\nconst parseFolderIdFromQuery = (folder: string | undefined): number | null => {\n  if (!folder) {\n    return null;\n  }\n\n  const id = Number(folder);\n\n  return Number.isFinite(id) ? id : null;\n};\n\nexport const useFolderNavigation = () => {\n  const [{ query }, setQuery] = useQueryParams<{ folder?: string }>();\n\n  const currentFolderId = parseFolderIdFromQuery(query?.folder);\n\n  const navigateToFolder = (folder: Folder) => {\n    setQuery({ folder: String(folder.id) });\n  };\n\n  /**\n   * Move to the Media Library root by removing the `folder` query param.\n   * `setQuery(_, 'remove')` deletes the keys present on the first argument\n   * (value is ignored), so any other query state (filters, pagination, etc.)\n   * is preserved.\n   */\n  const navigateToRoot = useCallback(() => {\n    setQuery({ folder: '' }, 'remove');\n  }, [setQuery]);\n\n  // Malformed ?folder= values (e.g. abc) parse as null; strip the param from the URL.\n  // Deleted/missing folders (404) are handled in AssetsPage — that needs a fetch.\n  useEffect(() => {\n    if (query?.folder && currentFolderId === null) {\n      navigateToRoot();\n    }\n  }, [query?.folder, currentFolderId, navigateToRoot]);\n\n  /**\n   * Convenience for the FolderTree sidebar: a single entry point that handles\n   * both \"go home\" and \"go to folder X\" without forcing the caller to know\n   * whether to call navigateToFolder or navigateToRoot.\n   */\n  const navigateToFolderId = (folderId: number | null) => {\n    if (folderId == null) {\n      navigateToRoot();\n    } else {\n      setQuery({ folder: String(folderId) });\n    }\n  };\n\n  return {\n    currentFolderId,\n    navigateToFolder,\n    navigateToRoot,\n    navigateToFolderId,\n  };\n};\n"],"names":["parseFolderIdFromQuery","folder","id","Number","isFinite","useFolderNavigation","query","setQuery","useQueryParams","currentFolderId","navigateToFolder","String","navigateToRoot","useCallback","useEffect","navigateToFolderId","folderId"],"mappings":";;;AAMA,MAAMA,yBAAyB,CAACC,MAAAA,GAAAA;AAC9B,IAAA,IAAI,CAACA,MAAAA,EAAQ;QACX,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMC,KAAKC,MAAAA,CAAOF,MAAAA,CAAAA;AAElB,IAAA,OAAOE,MAAAA,CAAOC,QAAQ,CAACF,EAAAA,CAAAA,GAAMA,EAAAA,GAAK,IAAA;AACpC,CAAA;MAEaG,mBAAAA,GAAsB,IAAA;AACjC,IAAA,MAAM,CAAC,EAAEC,KAAK,EAAE,EAAEC,SAAS,GAAGC,cAAAA,EAAAA;IAE9B,MAAMC,eAAAA,GAAkBT,uBAAuBM,KAAAA,EAAOL,MAAAA,CAAAA;AAEtD,IAAA,MAAMS,mBAAmB,CAACT,MAAAA,GAAAA;QACxBM,QAAAA,CAAS;YAAEN,MAAAA,EAAQU,MAAAA,CAAOV,OAAOC,EAAE;AAAE,SAAA,CAAA;AACvC,IAAA,CAAA;AAEA;;;;;MAMA,MAAMU,iBAAiBC,WAAAA,CAAY,IAAA;QACjCN,QAAAA,CAAS;YAAEN,MAAAA,EAAQ;SAAG,EAAG,QAAA,CAAA;IAC3B,CAAA,EAAG;AAACM,QAAAA;AAAS,KAAA,CAAA;;;IAIbO,SAAAA,CAAU,IAAA;QACR,IAAIR,KAAAA,EAAOL,MAAAA,IAAUQ,eAAAA,KAAoB,IAAA,EAAM;AAC7CG,YAAAA,cAAAA,EAAAA;AACF,QAAA;IACF,CAAA,EAAG;QAACN,KAAAA,EAAOL,MAAAA;AAAQQ,QAAAA,eAAAA;AAAiBG,QAAAA;AAAe,KAAA,CAAA;AAEnD;;;;MAKA,MAAMG,qBAAqB,CAACC,QAAAA,GAAAA;AAC1B,QAAA,IAAIA,YAAY,IAAA,EAAM;AACpBJ,YAAAA,cAAAA,EAAAA;QACF,CAAA,MAAO;YACLL,QAAAA,CAAS;AAAEN,gBAAAA,MAAAA,EAAQU,MAAAA,CAAOK,QAAAA;AAAU,aAAA,CAAA;AACtC,QAAA;AACF,IAAA,CAAA;IAEA,OAAO;AACLP,QAAAA,eAAAA;AACAC,QAAAA,gBAAAA;AACAE,QAAAA,cAAAA;AACAG,QAAAA;AACF,KAAA;AACF;;;;"}
+{"version":3,"file":"useFolderNavigation.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useFolderNavigation.ts"],"sourcesContent":["import { useCallback, useEffect } from 'react';\n\nimport { useQueryParams } from '@strapi/admin/strapi-admin';\n\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\nconst parseFolderIdFromQuery = (folder: string | undefined): number | null => {\n  if (!folder) {\n    return null;\n  }\n\n  const id = Number(folder);\n\n  return Number.isFinite(id) ? id : null;\n};\n\ninterface FolderNavigationQuery {\n  folder?: string;\n  _q?: string;\n}\n\nexport const useFolderNavigation = () => {\n  const [{ query }, setQuery] = useQueryParams<FolderNavigationQuery>();\n\n  const currentFolderId = parseFolderIdFromQuery(query?.folder);\n\n  /**\n   * Asset search is global, so keeping `_q` after a folder navigation would show\n   * byte-identical results and make the navigation look broken. Clearing it here\n   * — rather than at each call site — means no caller can forget.\n   */\n  const navigateToFolder = useCallback(\n    (folder: Folder) => {\n      setQuery({ folder: String(folder.id), _q: undefined });\n    },\n    [setQuery]\n  );\n\n  /**\n   * Move to the Media Library root by removing the `folder` query param, and the\n   * search term with it. `setQuery(_, 'remove')` deletes the keys present on the\n   * first argument (values are ignored) in one navigation, so any other query\n   * state (pagination, the details drawer, etc.) is preserved.\n   */\n  const navigateToRoot = useCallback(() => {\n    setQuery({ folder: '', _q: '' }, 'remove');\n  }, [setQuery]);\n\n  /**\n   * Strips a `?folder=` value we can't parse.\n   */\n  const stripFolderParam = useCallback(() => {\n    setQuery({ folder: '' }, 'remove');\n  }, [setQuery]);\n\n  // Malformed ?folder= values (e.g. abc) parse as null; strip the param from the URL.\n  // Deleted/missing folders (404) are handled in AssetsPage — that needs a fetch.\n  useEffect(() => {\n    if (query?.folder && currentFolderId === null) {\n      stripFolderParam();\n    }\n  }, [query?.folder, currentFolderId, stripFolderParam]);\n\n  /**\n   * Convenience for the FolderTree sidebar: a single entry point that handles\n   * both \"go home\" and \"go to folder X\" without forcing the caller to know\n   * whether to call navigateToFolder or navigateToRoot.\n   */\n  const navigateToFolderId = useCallback(\n    (folderId: number | null) => {\n      if (folderId == null) {\n        navigateToRoot();\n      } else {\n        setQuery({ folder: String(folderId), _q: undefined });\n      }\n    },\n    [navigateToRoot, setQuery]\n  );\n\n  return {\n    currentFolderId,\n    navigateToFolder,\n    navigateToRoot,\n    navigateToFolderId,\n  };\n};\n"],"names":["parseFolderIdFromQuery","folder","id","Number","isFinite","useFolderNavigation","query","setQuery","useQueryParams","currentFolderId","navigateToFolder","useCallback","String","_q","undefined","navigateToRoot","stripFolderParam","useEffect","navigateToFolderId","folderId"],"mappings":";;;AAMA,MAAMA,yBAAyB,CAACC,MAAAA,GAAAA;AAC9B,IAAA,IAAI,CAACA,MAAAA,EAAQ;QACX,OAAO,IAAA;AACT,IAAA;AAEA,IAAA,MAAMC,KAAKC,MAAAA,CAAOF,MAAAA,CAAAA;AAElB,IAAA,OAAOE,MAAAA,CAAOC,QAAQ,CAACF,EAAAA,CAAAA,GAAMA,EAAAA,GAAK,IAAA;AACpC,CAAA;MAOaG,mBAAAA,GAAsB,IAAA;AACjC,IAAA,MAAM,CAAC,EAAEC,KAAK,EAAE,EAAEC,SAAS,GAAGC,cAAAA,EAAAA;IAE9B,MAAMC,eAAAA,GAAkBT,uBAAuBM,KAAAA,EAAOL,MAAAA,CAAAA;AAEtD;;;;MAKA,MAAMS,gBAAAA,GAAmBC,WAAAA,CACvB,CAACV,MAAAA,GAAAA;QACCM,QAAAA,CAAS;YAAEN,MAAAA,EAAQW,MAAAA,CAAOX,OAAOC,EAAE,CAAA;YAAGW,EAAAA,EAAIC;AAAU,SAAA,CAAA;IACtD,CAAA,EACA;AAACP,QAAAA;AAAS,KAAA,CAAA;AAGZ;;;;;MAMA,MAAMQ,iBAAiBJ,WAAAA,CAAY,IAAA;QACjCJ,QAAAA,CAAS;YAAEN,MAAAA,EAAQ,EAAA;YAAIY,EAAAA,EAAI;SAAG,EAAG,QAAA,CAAA;IACnC,CAAA,EAAG;AAACN,QAAAA;AAAS,KAAA,CAAA;AAEb;;MAGA,MAAMS,mBAAmBL,WAAAA,CAAY,IAAA;QACnCJ,QAAAA,CAAS;YAAEN,MAAAA,EAAQ;SAAG,EAAG,QAAA,CAAA;IAC3B,CAAA,EAAG;AAACM,QAAAA;AAAS,KAAA,CAAA;;;IAIbU,SAAAA,CAAU,IAAA;QACR,IAAIX,KAAAA,EAAOL,MAAAA,IAAUQ,eAAAA,KAAoB,IAAA,EAAM;AAC7CO,YAAAA,gBAAAA,EAAAA;AACF,QAAA;IACF,CAAA,EAAG;QAACV,KAAAA,EAAOL,MAAAA;AAAQQ,QAAAA,eAAAA;AAAiBO,QAAAA;AAAiB,KAAA,CAAA;AAErD;;;;MAKA,MAAME,kBAAAA,GAAqBP,WAAAA,CACzB,CAACQ,QAAAA,GAAAA;AACC,QAAA,IAAIA,YAAY,IAAA,EAAM;AACpBJ,YAAAA,cAAAA,EAAAA;QACF,CAAA,MAAO;YACLR,QAAAA,CAAS;AAAEN,gBAAAA,MAAAA,EAAQW,MAAAA,CAAOO,QAAAA,CAAAA;gBAAWN,EAAAA,EAAIC;AAAU,aAAA,CAAA;AACrD,QAAA;IACF,CAAA,EACA;AAACC,QAAAA,cAAAA;AAAgBR,QAAAA;AAAS,KAAA,CAAA;IAG5B,OAAO;AACLE,QAAAA,eAAAA;AACAC,QAAAA,gBAAAA;AACAK,QAAAA,cAAAA;AACAG,QAAAA;AACF,KAAA;AACF;;;;"}

package/dist/admin/future/pages/Assets/hooks/useInfiniteAssets.js

@@ -4,17 +4,26 @@ var React = require('react');
 var assets = require('../../../services/assets.js');
 
 const PAGE_SIZE = 20;
-const useInfiniteAssets = ({ folder = null, sort } = {})=>{
+const useInfiniteAssets = ({ folder = null, sort, search, filters, filtersKey = '', enabled = true } = {})=>{
     const [page, setPage] = React.useState(1);
     const lastResultsRef = React.useRef([]);
+    const lastPaginationRef = React.useRef(undefined);
     const isMountRef = React.useRef(true);
+    const isSearchMountRef = React.useRef(true);
     const { currentData: data, isLoading, isFetching, error } = assets.useGetAssetsQuery({
         folder,
         page,
         pageSize: PAGE_SIZE,
-        sort
+        sort,
+        search,
+        filters
+    }, {
+        skip: !enabled
     });
     const pagination = data?.pagination;
+    if (pagination) {
+        lastPaginationRef.current = pagination;
+    }
     // Accumulate pages. When cache is invalidated the current page is refetched
     // detect this and reset to avoid a gap in the results.
     const assets$1 = React.useMemo(()=>{
@@ -54,16 +63,43 @@ const useInfiniteAssets = ({ folder = null, sort } = {})=>{
         lastResultsRef.current = [];
     }, [
         folder,
-        sort
+        sort,
+        filtersKey
     ]);
+    // A search change resets pagination but keeps the previous results rendered
+    // until the new page 1 lands, which replaces them.
+    React.useEffect(()=>{
+        if (isSearchMountRef.current) {
+            isSearchMountRef.current = false;
+            return;
+        }
+        setPage(1);
+    }, [
+        search
+    ]);
+    // Deliberately the live value, not the stale-tolerant one below: paging must
+    // never be driven by a total that belongs to the previous query.
     const hasNextPage = pagination ? page < pagination.pageCount : false;
     const isFetchingMore = isFetching && page > 1;
     const fetchNextPage = React.useCallback(()=>{
         setPage((prev)=>prev + 1);
     }, []);
+    if (!enabled) {
+        return {
+            assets: [],
+            pagination: undefined,
+            isLoading: false,
+            isFetchingMore: false,
+            hasNextPage: false,
+            fetchNextPage,
+            error: undefined
+        };
+    }
     return {
         assets: assets$1,
-        pagination,
+        // Reported alongside the stale `assets` above so a consumer showing the total
+        // doesn't flash zero mid-transition.
+        pagination: pagination ?? lastPaginationRef.current,
         isLoading,
         isFetchingMore,
         hasNextPage,

package/dist/admin/future/pages/Assets/hooks/useInfiniteAssets.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInfiniteAssets.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useInfiniteAssets.ts"],"sourcesContent":["import { useState, useCallback, useMemo, useEffect, useRef } from 'react';\n\nimport { useGetAssetsQuery } from '../../../services/assets';\n\nimport type { File } from '../../../../../../shared/contracts/files';\n\nconst PAGE_SIZE = 20;\n\ninterface UseInfiniteAssetsOptions {\n  folder?: number | null;\n  sort?: string;\n}\n\nconst useInfiniteAssets = ({ folder = null, sort }: UseInfiniteAssetsOptions = {}) => {\n  const [page, setPage] = useState(1);\n  const lastResultsRef = useRef<File[]>([]);\n  const isMountRef = useRef(true);\n\n  const {\n    currentData: data,\n    isLoading,\n    isFetching,\n    error,\n  } = useGetAssetsQuery({\n    folder,\n    page,\n    pageSize: PAGE_SIZE,\n    sort,\n  });\n\n  const pagination = data?.pagination;\n\n  // Accumulate pages. When cache is invalidated the current page is refetched\n  // detect this and reset to avoid a gap in the results.\n  const assets = useMemo(() => {\n    if (!data) {\n      return lastResultsRef.current;\n    }\n\n    const currentPageResults = data.results;\n\n    if (page === 1) {\n      lastResultsRef.current = currentPageResults;\n    } else {\n      // If accumulated length doesn't match expectation, cache was cleared\n      const expectedPrior = (page - 1) * PAGE_SIZE;\n      if (lastResultsRef.current.length < expectedPrior - PAGE_SIZE) {\n        return lastResultsRef.current;\n      }\n\n      // Only append if these aren't already accumulated\n      if (lastResultsRef.current.length < page * PAGE_SIZE) {\n        lastResultsRef.current = [...lastResultsRef.current, ...currentPageResults];\n      }\n    }\n\n    return lastResultsRef.current;\n  }, [data, page]);\n\n  // Reset on filter/sort change — skip the initial mount since the memo\n  // already handles page 1 correctly\n  useEffect(() => {\n    if (isMountRef.current) {\n      isMountRef.current = false;\n\n      return;\n    }\n    setPage(1);\n    lastResultsRef.current = [];\n  }, [folder, sort]);\n\n  const hasNextPage = pagination ? page < pagination.pageCount : false;\n  const isFetchingMore = isFetching && page > 1;\n\n  const fetchNextPage = useCallback(() => {\n    setPage((prev) => prev + 1);\n  }, []);\n\n  return { assets, pagination, isLoading, isFetchingMore, hasNextPage, fetchNextPage, error };\n};\n\nexport { useInfiniteAssets };\nexport { PAGE_SIZE };\n"],"names":["PAGE_SIZE","useInfiniteAssets","folder","sort","page","setPage","useState","lastResultsRef","useRef","isMountRef","currentData","data","isLoading","isFetching","error","useGetAssetsQuery","pageSize","pagination","assets","useMemo","current","currentPageResults","results","expectedPrior","length","useEffect","hasNextPage","pageCount","isFetchingMore","fetchNextPage","useCallback","prev"],"mappings":";;;;;AAMA,MAAMA,SAAAA,GAAY;AAOlB,MAAMC,iBAAAA,GAAoB,CAAC,EAAEC,MAAAA,GAAS,IAAI,EAAEC,IAAI,EAA4B,GAAG,EAAE,GAAA;AAC/E,IAAA,MAAM,CAACC,IAAAA,EAAMC,OAAAA,CAAQ,GAAGC,cAAAA,CAAS,CAAA,CAAA;IACjC,MAAMC,cAAAA,GAAiBC,aAAe,EAAE,CAAA;AACxC,IAAA,MAAMC,aAAaD,YAAAA,CAAO,IAAA,CAAA;IAE1B,MAAM,EACJE,WAAAA,EAAaC,IAAI,EACjBC,SAAS,EACTC,UAAU,EACVC,KAAK,EACN,GAAGC,wBAAAA,CAAkB;AACpBb,QAAAA,MAAAA;AACAE,QAAAA,IAAAA;QACAY,QAAAA,EAAUhB,SAAAA;AACVG,QAAAA;AACF,KAAA,CAAA;AAEA,IAAA,MAAMc,aAAaN,IAAAA,EAAMM,UAAAA;;;AAIzB,IAAA,MAAMC,WAASC,aAAAA,CAAQ,IAAA;AACrB,QAAA,IAAI,CAACR,IAAAA,EAAM;AACT,YAAA,OAAOJ,eAAea,OAAO;AAC/B,QAAA;QAEA,MAAMC,kBAAAA,GAAqBV,KAAKW,OAAO;AAEvC,QAAA,IAAIlB,SAAS,CAAA,EAAG;AACdG,YAAAA,cAAAA,CAAea,OAAO,GAAGC,kBAAAA;QAC3B,CAAA,MAAO;;AAEL,YAAA,MAAME,aAAAA,GAAiBnB,CAAAA,IAAAA,GAAO,CAAA,IAAKJ,SAAAA;AACnC,YAAA,IAAIO,eAAea,OAAO,CAACI,MAAM,GAAGD,gBAAgBvB,SAAAA,EAAW;AAC7D,gBAAA,OAAOO,eAAea,OAAO;AAC/B,YAAA;;AAGA,YAAA,IAAIb,eAAea,OAAO,CAACI,MAAM,GAAGpB,OAAOJ,SAAAA,EAAW;AACpDO,gBAAAA,cAAAA,CAAea,OAAO,GAAG;AAAIb,oBAAAA,GAAAA,cAAAA,CAAea,OAAO;AAAKC,oBAAAA,GAAAA;AAAmB,iBAAA;AAC7E,YAAA;AACF,QAAA;AAEA,QAAA,OAAOd,eAAea,OAAO;IAC/B,CAAA,EAAG;AAACT,QAAAA,IAAAA;AAAMP,QAAAA;AAAK,KAAA,CAAA;;;IAIfqB,eAAAA,CAAU,IAAA;QACR,IAAIhB,UAAAA,CAAWW,OAAO,EAAE;AACtBX,YAAAA,UAAAA,CAAWW,OAAO,GAAG,KAAA;AAErB,YAAA;AACF,QAAA;QACAf,OAAAA,CAAQ,CAAA,CAAA;QACRE,cAAAA,CAAea,OAAO,GAAG,EAAE;IAC7B,CAAA,EAAG;AAAClB,QAAAA,MAAAA;AAAQC,QAAAA;AAAK,KAAA,CAAA;AAEjB,IAAA,MAAMuB,WAAAA,GAAcT,UAAAA,GAAab,IAAAA,GAAOa,UAAAA,CAAWU,SAAS,GAAG,KAAA;IAC/D,MAAMC,cAAAA,GAAiBf,cAAcT,IAAAA,GAAO,CAAA;AAE5C,IAAA,MAAMyB,gBAAgBC,iBAAAA,CAAY,IAAA;QAChCzB,OAAAA,CAAQ,CAAC0B,OAASA,IAAAA,GAAO,CAAA,CAAA;AAC3B,IAAA,CAAA,EAAG,EAAE,CAAA;IAEL,OAAO;AAAEb,gBAAAA,QAAAA;AAAQD,QAAAA,UAAAA;AAAYL,QAAAA,SAAAA;AAAWgB,QAAAA,cAAAA;AAAgBF,QAAAA,WAAAA;AAAaG,QAAAA,aAAAA;AAAef,QAAAA;AAAM,KAAA;AAC5F;;;;;"}
+{"version":3,"file":"useInfiniteAssets.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useInfiniteAssets.ts"],"sourcesContent":["import { useState, useCallback, useMemo, useEffect, useRef } from 'react';\n\nimport { useGetAssetsQuery } from '../../../services/assets';\n\nimport type { File, Pagination } from '../../../../../../shared/contracts/files';\n\nconst PAGE_SIZE = 20;\n\ninterface UseInfiniteAssetsOptions {\n  folder?: number | null;\n  sort?: string;\n  search?: string;\n  /** Extra `filters[$and]` entries for the files query. */\n  filters?: Record<string, unknown>[];\n  /**\n   * Stable fingerprint of `filters` — a change resets the accumulated pages\n   * (the array identity itself changes every render).\n   */\n  filtersKey?: string;\n  /** Structural switch: an `is [folder]`-only type badge means no file can match. */\n  enabled?: boolean;\n}\n\nconst useInfiniteAssets = ({\n  folder = null,\n  sort,\n  search,\n  filters,\n  filtersKey = '',\n  enabled = true,\n}: UseInfiniteAssetsOptions = {}) => {\n  const [page, setPage] = useState(1);\n  const lastResultsRef = useRef<File[]>([]);\n  const lastPaginationRef = useRef<Pagination | undefined>(undefined);\n  const isMountRef = useRef(true);\n  const isSearchMountRef = useRef(true);\n\n  const {\n    currentData: data,\n    isLoading,\n    isFetching,\n    error,\n  } = useGetAssetsQuery(\n    {\n      folder,\n      page,\n      pageSize: PAGE_SIZE,\n      sort,\n      search,\n      filters,\n    },\n    { skip: !enabled }\n  );\n\n  const pagination = data?.pagination;\n\n  if (pagination) {\n    lastPaginationRef.current = pagination;\n  }\n\n  // Accumulate pages. When cache is invalidated the current page is refetched\n  // detect this and reset to avoid a gap in the results.\n  const assets = useMemo(() => {\n    if (!data) {\n      return lastResultsRef.current;\n    }\n\n    const currentPageResults = data.results;\n\n    if (page === 1) {\n      lastResultsRef.current = currentPageResults;\n    } else {\n      // If accumulated length doesn't match expectation, cache was cleared\n      const expectedPrior = (page - 1) * PAGE_SIZE;\n      if (lastResultsRef.current.length < expectedPrior - PAGE_SIZE) {\n        return lastResultsRef.current;\n      }\n\n      // Only append if these aren't already accumulated\n      if (lastResultsRef.current.length < page * PAGE_SIZE) {\n        lastResultsRef.current = [...lastResultsRef.current, ...currentPageResults];\n      }\n    }\n\n    return lastResultsRef.current;\n  }, [data, page]);\n\n  // Reset on filter/sort change — skip the initial mount since the memo\n  // already handles page 1 correctly\n  useEffect(() => {\n    if (isMountRef.current) {\n      isMountRef.current = false;\n\n      return;\n    }\n    setPage(1);\n    lastResultsRef.current = [];\n  }, [folder, sort, filtersKey]);\n\n  // A search change resets pagination but keeps the previous results rendered\n  // until the new page 1 lands, which replaces them.\n  useEffect(() => {\n    if (isSearchMountRef.current) {\n      isSearchMountRef.current = false;\n\n      return;\n    }\n    setPage(1);\n  }, [search]);\n\n  // Deliberately the live value, not the stale-tolerant one below: paging must\n  // never be driven by a total that belongs to the previous query.\n  const hasNextPage = pagination ? page < pagination.pageCount : false;\n  const isFetchingMore = isFetching && page > 1;\n\n  const fetchNextPage = useCallback(() => {\n    setPage((prev) => prev + 1);\n  }, []);\n\n  if (!enabled) {\n    return {\n      assets: [] as File[],\n      pagination: undefined,\n      isLoading: false,\n      isFetchingMore: false,\n      hasNextPage: false,\n      fetchNextPage,\n      error: undefined,\n    };\n  }\n\n  return {\n    assets,\n    // Reported alongside the stale `assets` above so a consumer showing the total\n    // doesn't flash zero mid-transition.\n    pagination: pagination ?? lastPaginationRef.current,\n    isLoading,\n    isFetchingMore,\n    hasNextPage,\n    fetchNextPage,\n    error,\n  };\n};\n\nexport { useInfiniteAssets };\nexport { PAGE_SIZE };\n"],"names":["PAGE_SIZE","useInfiniteAssets","folder","sort","search","filters","filtersKey","enabled","page","setPage","useState","lastResultsRef","useRef","lastPaginationRef","undefined","isMountRef","isSearchMountRef","currentData","data","isLoading","isFetching","error","useGetAssetsQuery","pageSize","skip","pagination","current","assets","useMemo","currentPageResults","results","expectedPrior","length","useEffect","hasNextPage","pageCount","isFetchingMore","fetchNextPage","useCallback","prev"],"mappings":"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"}

package/dist/admin/future/pages/Assets/hooks/useInfiniteAssets.mjs

@@ -2,17 +2,26 @@ import { useState, useRef, useMemo, useEffect, useCallback } from 'react';
 import { useGetAssetsQuery } from '../../../services/assets.mjs';
 
 const PAGE_SIZE = 20;
-const useInfiniteAssets = ({ folder = null, sort } = {})=>{
+const useInfiniteAssets = ({ folder = null, sort, search, filters, filtersKey = '', enabled = true } = {})=>{
     const [page, setPage] = useState(1);
     const lastResultsRef = useRef([]);
+    const lastPaginationRef = useRef(undefined);
     const isMountRef = useRef(true);
+    const isSearchMountRef = useRef(true);
     const { currentData: data, isLoading, isFetching, error } = useGetAssetsQuery({
         folder,
         page,
         pageSize: PAGE_SIZE,
-        sort
+        sort,
+        search,
+        filters
+    }, {
+        skip: !enabled
     });
     const pagination = data?.pagination;
+    if (pagination) {
+        lastPaginationRef.current = pagination;
+    }
     // Accumulate pages. When cache is invalidated the current page is refetched
     // detect this and reset to avoid a gap in the results.
     const assets = useMemo(()=>{
@@ -52,16 +61,43 @@ const useInfiniteAssets = ({ folder = null, sort } = {})=>{
         lastResultsRef.current = [];
     }, [
         folder,
-        sort
+        sort,
+        filtersKey
     ]);
+    // A search change resets pagination but keeps the previous results rendered
+    // until the new page 1 lands, which replaces them.
+    useEffect(()=>{
+        if (isSearchMountRef.current) {
+            isSearchMountRef.current = false;
+            return;
+        }
+        setPage(1);
+    }, [
+        search
+    ]);
+    // Deliberately the live value, not the stale-tolerant one below: paging must
+    // never be driven by a total that belongs to the previous query.
     const hasNextPage = pagination ? page < pagination.pageCount : false;
     const isFetchingMore = isFetching && page > 1;
     const fetchNextPage = useCallback(()=>{
         setPage((prev)=>prev + 1);
     }, []);
+    if (!enabled) {
+        return {
+            assets: [],
+            pagination: undefined,
+            isLoading: false,
+            isFetchingMore: false,
+            hasNextPage: false,
+            fetchNextPage,
+            error: undefined
+        };
+    }
     return {
         assets,
-        pagination,
+        // Reported alongside the stale `assets` above so a consumer showing the total
+        // doesn't flash zero mid-transition.
+        pagination: pagination ?? lastPaginationRef.current,
         isLoading,
         isFetchingMore,
         hasNextPage,

package/dist/admin/future/pages/Assets/hooks/useInfiniteAssets.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useInfiniteAssets.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useInfiniteAssets.ts"],"sourcesContent":["import { useState, useCallback, useMemo, useEffect, useRef } from 'react';\n\nimport { useGetAssetsQuery } from '../../../services/assets';\n\nimport type { File } from '../../../../../../shared/contracts/files';\n\nconst PAGE_SIZE = 20;\n\ninterface UseInfiniteAssetsOptions {\n  folder?: number | null;\n  sort?: string;\n}\n\nconst useInfiniteAssets = ({ folder = null, sort }: UseInfiniteAssetsOptions = {}) => {\n  const [page, setPage] = useState(1);\n  const lastResultsRef = useRef<File[]>([]);\n  const isMountRef = useRef(true);\n\n  const {\n    currentData: data,\n    isLoading,\n    isFetching,\n    error,\n  } = useGetAssetsQuery({\n    folder,\n    page,\n    pageSize: PAGE_SIZE,\n    sort,\n  });\n\n  const pagination = data?.pagination;\n\n  // Accumulate pages. When cache is invalidated the current page is refetched\n  // detect this and reset to avoid a gap in the results.\n  const assets = useMemo(() => {\n    if (!data) {\n      return lastResultsRef.current;\n    }\n\n    const currentPageResults = data.results;\n\n    if (page === 1) {\n      lastResultsRef.current = currentPageResults;\n    } else {\n      // If accumulated length doesn't match expectation, cache was cleared\n      const expectedPrior = (page - 1) * PAGE_SIZE;\n      if (lastResultsRef.current.length < expectedPrior - PAGE_SIZE) {\n        return lastResultsRef.current;\n      }\n\n      // Only append if these aren't already accumulated\n      if (lastResultsRef.current.length < page * PAGE_SIZE) {\n        lastResultsRef.current = [...lastResultsRef.current, ...currentPageResults];\n      }\n    }\n\n    return lastResultsRef.current;\n  }, [data, page]);\n\n  // Reset on filter/sort change — skip the initial mount since the memo\n  // already handles page 1 correctly\n  useEffect(() => {\n    if (isMountRef.current) {\n      isMountRef.current = false;\n\n      return;\n    }\n    setPage(1);\n    lastResultsRef.current = [];\n  }, [folder, sort]);\n\n  const hasNextPage = pagination ? page < pagination.pageCount : false;\n  const isFetchingMore = isFetching && page > 1;\n\n  const fetchNextPage = useCallback(() => {\n    setPage((prev) => prev + 1);\n  }, []);\n\n  return { assets, pagination, isLoading, isFetchingMore, hasNextPage, fetchNextPage, error };\n};\n\nexport { useInfiniteAssets };\nexport { PAGE_SIZE };\n"],"names":["PAGE_SIZE","useInfiniteAssets","folder","sort","page","setPage","useState","lastResultsRef","useRef","isMountRef","currentData","data","isLoading","isFetching","error","useGetAssetsQuery","pageSize","pagination","assets","useMemo","current","currentPageResults","results","expectedPrior","length","useEffect","hasNextPage","pageCount","isFetchingMore","fetchNextPage","useCallback","prev"],"mappings":";;;AAMA,MAAMA,SAAAA,GAAY;AAOlB,MAAMC,iBAAAA,GAAoB,CAAC,EAAEC,MAAAA,GAAS,IAAI,EAAEC,IAAI,EAA4B,GAAG,EAAE,GAAA;AAC/E,IAAA,MAAM,CAACC,IAAAA,EAAMC,OAAAA,CAAQ,GAAGC,QAAAA,CAAS,CAAA,CAAA;IACjC,MAAMC,cAAAA,GAAiBC,OAAe,EAAE,CAAA;AACxC,IAAA,MAAMC,aAAaD,MAAAA,CAAO,IAAA,CAAA;IAE1B,MAAM,EACJE,WAAAA,EAAaC,IAAI,EACjBC,SAAS,EACTC,UAAU,EACVC,KAAK,EACN,GAAGC,iBAAAA,CAAkB;AACpBb,QAAAA,MAAAA;AACAE,QAAAA,IAAAA;QACAY,QAAAA,EAAUhB,SAAAA;AACVG,QAAAA;AACF,KAAA,CAAA;AAEA,IAAA,MAAMc,aAAaN,IAAAA,EAAMM,UAAAA;;;AAIzB,IAAA,MAAMC,SAASC,OAAAA,CAAQ,IAAA;AACrB,QAAA,IAAI,CAACR,IAAAA,EAAM;AACT,YAAA,OAAOJ,eAAea,OAAO;AAC/B,QAAA;QAEA,MAAMC,kBAAAA,GAAqBV,KAAKW,OAAO;AAEvC,QAAA,IAAIlB,SAAS,CAAA,EAAG;AACdG,YAAAA,cAAAA,CAAea,OAAO,GAAGC,kBAAAA;QAC3B,CAAA,MAAO;;AAEL,YAAA,MAAME,aAAAA,GAAiBnB,CAAAA,IAAAA,GAAO,CAAA,IAAKJ,SAAAA;AACnC,YAAA,IAAIO,eAAea,OAAO,CAACI,MAAM,GAAGD,gBAAgBvB,SAAAA,EAAW;AAC7D,gBAAA,OAAOO,eAAea,OAAO;AAC/B,YAAA;;AAGA,YAAA,IAAIb,eAAea,OAAO,CAACI,MAAM,GAAGpB,OAAOJ,SAAAA,EAAW;AACpDO,gBAAAA,cAAAA,CAAea,OAAO,GAAG;AAAIb,oBAAAA,GAAAA,cAAAA,CAAea,OAAO;AAAKC,oBAAAA,GAAAA;AAAmB,iBAAA;AAC7E,YAAA;AACF,QAAA;AAEA,QAAA,OAAOd,eAAea,OAAO;IAC/B,CAAA,EAAG;AAACT,QAAAA,IAAAA;AAAMP,QAAAA;AAAK,KAAA,CAAA;;;IAIfqB,SAAAA,CAAU,IAAA;QACR,IAAIhB,UAAAA,CAAWW,OAAO,EAAE;AACtBX,YAAAA,UAAAA,CAAWW,OAAO,GAAG,KAAA;AAErB,YAAA;AACF,QAAA;QACAf,OAAAA,CAAQ,CAAA,CAAA;QACRE,cAAAA,CAAea,OAAO,GAAG,EAAE;IAC7B,CAAA,EAAG;AAAClB,QAAAA,MAAAA;AAAQC,QAAAA;AAAK,KAAA,CAAA;AAEjB,IAAA,MAAMuB,WAAAA,GAAcT,UAAAA,GAAab,IAAAA,GAAOa,UAAAA,CAAWU,SAAS,GAAG,KAAA;IAC/D,MAAMC,cAAAA,GAAiBf,cAAcT,IAAAA,GAAO,CAAA;AAE5C,IAAA,MAAMyB,gBAAgBC,WAAAA,CAAY,IAAA;QAChCzB,OAAAA,CAAQ,CAAC0B,OAASA,IAAAA,GAAO,CAAA,CAAA;AAC3B,IAAA,CAAA,EAAG,EAAE,CAAA;IAEL,OAAO;AAAEb,QAAAA,MAAAA;AAAQD,QAAAA,UAAAA;AAAYL,QAAAA,SAAAA;AAAWgB,QAAAA,cAAAA;AAAgBF,QAAAA,WAAAA;AAAaG,QAAAA,aAAAA;AAAef,QAAAA;AAAM,KAAA;AAC5F;;;;"}
+{"version":3,"file":"useInfiniteAssets.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useInfiniteAssets.ts"],"sourcesContent":["import { useState, useCallback, useMemo, useEffect, useRef } from 'react';\n\nimport { useGetAssetsQuery } from '../../../services/assets';\n\nimport type { File, Pagination } from '../../../../../../shared/contracts/files';\n\nconst PAGE_SIZE = 20;\n\ninterface UseInfiniteAssetsOptions {\n  folder?: number | null;\n  sort?: string;\n  search?: string;\n  /** Extra `filters[$and]` entries for the files query. */\n  filters?: Record<string, unknown>[];\n  /**\n   * Stable fingerprint of `filters` — a change resets the accumulated pages\n   * (the array identity itself changes every render).\n   */\n  filtersKey?: string;\n  /** Structural switch: an `is [folder]`-only type badge means no file can match. */\n  enabled?: boolean;\n}\n\nconst useInfiniteAssets = ({\n  folder = null,\n  sort,\n  search,\n  filters,\n  filtersKey = '',\n  enabled = true,\n}: UseInfiniteAssetsOptions = {}) => {\n  const [page, setPage] = useState(1);\n  const lastResultsRef = useRef<File[]>([]);\n  const lastPaginationRef = useRef<Pagination | undefined>(undefined);\n  const isMountRef = useRef(true);\n  const isSearchMountRef = useRef(true);\n\n  const {\n    currentData: data,\n    isLoading,\n    isFetching,\n    error,\n  } = useGetAssetsQuery(\n    {\n      folder,\n      page,\n      pageSize: PAGE_SIZE,\n      sort,\n      search,\n      filters,\n    },\n    { skip: !enabled }\n  );\n\n  const pagination = data?.pagination;\n\n  if (pagination) {\n    lastPaginationRef.current = pagination;\n  }\n\n  // Accumulate pages. When cache is invalidated the current page is refetched\n  // detect this and reset to avoid a gap in the results.\n  const assets = useMemo(() => {\n    if (!data) {\n      return lastResultsRef.current;\n    }\n\n    const currentPageResults = data.results;\n\n    if (page === 1) {\n      lastResultsRef.current = currentPageResults;\n    } else {\n      // If accumulated length doesn't match expectation, cache was cleared\n      const expectedPrior = (page - 1) * PAGE_SIZE;\n      if (lastResultsRef.current.length < expectedPrior - PAGE_SIZE) {\n        return lastResultsRef.current;\n      }\n\n      // Only append if these aren't already accumulated\n      if (lastResultsRef.current.length < page * PAGE_SIZE) {\n        lastResultsRef.current = [...lastResultsRef.current, ...currentPageResults];\n      }\n    }\n\n    return lastResultsRef.current;\n  }, [data, page]);\n\n  // Reset on filter/sort change — skip the initial mount since the memo\n  // already handles page 1 correctly\n  useEffect(() => {\n    if (isMountRef.current) {\n      isMountRef.current = false;\n\n      return;\n    }\n    setPage(1);\n    lastResultsRef.current = [];\n  }, [folder, sort, filtersKey]);\n\n  // A search change resets pagination but keeps the previous results rendered\n  // until the new page 1 lands, which replaces them.\n  useEffect(() => {\n    if (isSearchMountRef.current) {\n      isSearchMountRef.current = false;\n\n      return;\n    }\n    setPage(1);\n  }, [search]);\n\n  // Deliberately the live value, not the stale-tolerant one below: paging must\n  // never be driven by a total that belongs to the previous query.\n  const hasNextPage = pagination ? page < pagination.pageCount : false;\n  const isFetchingMore = isFetching && page > 1;\n\n  const fetchNextPage = useCallback(() => {\n    setPage((prev) => prev + 1);\n  }, []);\n\n  if (!enabled) {\n    return {\n      assets: [] as File[],\n      pagination: undefined,\n      isLoading: false,\n      isFetchingMore: false,\n      hasNextPage: false,\n      fetchNextPage,\n      error: undefined,\n    };\n  }\n\n  return {\n    assets,\n    // Reported alongside the stale `assets` above so a consumer showing the total\n    // doesn't flash zero mid-transition.\n    pagination: pagination ?? lastPaginationRef.current,\n    isLoading,\n    isFetchingMore,\n    hasNextPage,\n    fetchNextPage,\n    error,\n  };\n};\n\nexport { useInfiniteAssets };\nexport { PAGE_SIZE };\n"],"names":["PAGE_SIZE","useInfiniteAssets","folder","sort","search","filters","filtersKey","enabled","page","setPage","useState","lastResultsRef","useRef","lastPaginationRef","undefined","isMountRef","isSearchMountRef","currentData","data","isLoading","isFetching","error","useGetAssetsQuery","pageSize","skip","pagination","current","assets","useMemo","currentPageResults","results","expectedPrior","length","useEffect","hasNextPage","pageCount","isFetchingMore","fetchNextPage","useCallback","prev"],"mappings":"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"}