@strapi/upload 5.52.3 → 5.54.0

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

@@ -1,4 +1,4 @@
-import { useState, useCallback, createElement, Fragment, useRef, useEffect, useMemo } from 'react';
+import { useState, useRef, useCallback, createElement, Fragment, useEffect, useMemo } from 'react';
 import { useDispatch, useStore } from 'react-redux';
 import { uploadApi } from '../../../services/api.mjs';
 import { useGetAssetsQuery } from '../../../services/assets.mjs';
@@ -8,6 +8,9 @@ import { getRelationId } from '../../../utils/getRelationId.mjs';
 import { mergeUploadedAssets } from '../utils/mergeUploadedAssets.mjs';
 
 const PAGE_SIZE = 20;
+/**
+ * How many list views keep their loaded pages in memory.
+ */ const MAX_REMEMBERED_LISTS = 10;
 /**
  * Concatenates the pages in ascending order, one entry per asset id.
  *
@@ -25,6 +28,10 @@ const PAGE_SIZE = 20;
         ...byId.values()
     ];
 };
+/**
+ * The highest page an accumulator holds — where the list was last read to, and
+ * so where to resume from on the way back.
+ */ const deepestPage = (pages)=>Object.keys(pages).reduce((deepest, key)=>Math.max(deepest, Number(key)), 1);
 /**
  * Keeps one earlier page's `getAssets` query subscribed and reports its results
  * back up whenever they change.
@@ -62,6 +69,10 @@ const PAGE_SIZE = 20;
  * The caller MUST render the returned `subscribers` node — that is what keeps
  * every loaded page subscribed, so `{Asset, LIST}` invalidations keep the whole
  * list consistent rather than only the current page.
+ *
+ * Loaded pages survive navigating away and back: each list's accumulator is
+ * remembered (LRU, `MAX_REMEMBERED_LISTS`) and restored when its key returns, so
+ * stepping into a subfolder and back out keeps the rows the user scrolled for.
  */ const useInfiniteAssets = ({ folder = null, sort, search, filters, enabled = true } = {})=>{
     // Derived from the request args themselves, so a new filter can't reach the
     // API without also invalidating what was accumulated under the old one.
@@ -92,15 +103,30 @@ const PAGE_SIZE = 20;
         listKey,
         pages: {}
     });
-    // Derived rather than read straight from state: the render that discovers
-    // the key change still reaches the query below, and a list with no page 1
-    // must never be requested at page 2.
-    const page = pageState.queryKey === queryKey ? pageState.page : 1;
-    if (pageState.queryKey !== queryKey) {
+    // Each list's loaded pages, kept across navigation away from it.
+    const memoryRef = useRef(new Map());
+    const isNewList = pageState.queryKey !== queryKey;
+    const remembered = isNewList ? memoryRef.current.get(queryKey) : undefined;
+    // Derived rather than read from state: the render that discovers the key
+    // change still reaches the query below, and a list with no page 1 must never
+    // be requested at page 2. A remembered list always holds page 1, so resuming
+    // at its deepest page can't skip one.
+    let page;
+    if (!isNewList) {
+        page = pageState.page;
+    } else if (remembered) {
+        page = deepestPage(remembered.pages);
+    } else {
+        page = 1;
+    }
+    if (isNewList) {
         setPageState({
             queryKey,
-            page: 1
+            page
         });
+        if (remembered) {
+            setAccumulated(remembered);
+        }
     }
     const { currentData, isLoading, isFetching, error, startedTimeStamp, fulfilledTimeStamp } = useGetAssetsQuery({
         ...queryArgs,
@@ -113,7 +139,8 @@ const PAGE_SIZE = 20;
     // `currentData` is only ever the payload for the args just passed, so it
     // belongs to this key at this page — nothing to infer. Its reference is
     // stable per cache entry, so this settles after one extra render.
-    if (currentData && (!isSameQuery || accumulated.pages[page] !== currentData.results)) {
+    if (// A restore already set the accumulator from memory; don't overwrite it.
+    !remembered && currentData && (!isSameQuery || accumulated.pages[page] !== currentData.results)) {
         setAccumulated(isSameQuery ? {
             ...accumulated,
             pages: {
@@ -161,6 +188,29 @@ const PAGE_SIZE = 20;
             page: earlierPage,
             onRefreshed: handlePageRefreshed
         })));
+    // Remember what this list has read, so leaving it isn't forgetting it. Filed
+    // under `accumulated.queryKey`, not the live `queryKey`: the accumulator names
+    // the list it belongs to, so an entry still describing the list being left
+    // can't be misfiled under the one being entered.
+    useEffect(()=>{
+        if (Object.keys(accumulated.pages).length === 0) {
+            return;
+        }
+        const memory = memoryRef.current;
+        // Delete before set so the entry moves to the end. Map iterates in
+        // insertion order, so the first key is the least recently used.
+        memory.delete(accumulated.queryKey);
+        memory.set(accumulated.queryKey, accumulated);
+        while(memory.size > MAX_REMEMBERED_LISTS){
+            const oldest = memory.keys().next();
+            if (oldest.done) {
+                break;
+            }
+            memory.delete(oldest.value);
+        }
+    }, [
+        accumulated
+    ]);
     // Drop the left folder's cached `getAssets` pages when the folder changes.
     //
     // RTK Query 1.9.7 leaves a query's store subscription in place when its last
@@ -170,8 +220,9 @@ const PAGE_SIZE = 20;
     // next `{Asset, LIST}` invalidation (an upload in the new folder) refetch the
     // *previous* folder's pages: one bogus `/upload/files` request per loaded
     // page. There is no public per-entry unsubscribe, so evict the left folder's
-    // entries outright — returning reloads from page 1, which the accumulator
-    // already does on a list change.
+    // entries outright. Returning then re-reads every page it had loaded, but the
+    // rows come straight back from the accumulator memory above — so those
+    // requests refresh a list already on screen rather than being waited on.
     const dispatch = useDispatch();
     const store = useStore();
     const prevFolderRef = useRef(folder);
@@ -250,6 +301,10 @@ const PAGE_SIZE = 20;
         listAnsweredAfter
     ]);
     const isFetchingMore = isFetching && page > 1;
+    // A restored list already has rows on screen, so re-reading its current page
+    // is a background refresh — reporting it as loading would swap those rows for
+    // a spinner. Only an empty list has nothing better to show.
+    const isLoadingList = isChangingList || isLoading && assets.length === 0;
     const fetchNextPage = useCallback(()=>{
         setPageState((prev)=>({
                 queryKey,
@@ -277,7 +332,7 @@ const PAGE_SIZE = 20;
         // Falls back to the accumulated total so a consumer showing the count
         // doesn't flash zero mid-transition, matching the possibly stale `assets`.
         pagination: currentData?.pagination ?? accumulated.pagination,
-        isLoading: isLoading || isChangingList,
+        isLoading: isLoadingList,
         isFetchingMore,
         hasNextPage,
         fetchNextPage,

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 { createElement, Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';\n\nimport { useDispatch, useStore } from 'react-redux';\n\nimport { uploadApi } from '../../../services/api';\nimport { useGetAssetsQuery } from '../../../services/assets';\nimport { useTypedSelector } from '../../../store/hooks';\nimport { selectCompletedUploads } from '../../../store/uploadProgress';\nimport { getRelationId } from '../../../utils/getRelationId';\nimport { mergeUploadedAssets } from '../utils/mergeUploadedAssets';\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  /** Structural switch: an `is [folder]`-only type badge means no file can match. */\n  enabled?: boolean;\n}\n\ninterface QueryArgs {\n  folder: number | null;\n  sort?: string;\n  search?: string;\n  filters?: Record<string, unknown>[];\n}\n\n/**\n * Everything loaded for one query identity.\n *\n * `queryKey` lags the live key while a new query is in flight — that lag is\n * what keeps the previous results on screen across a search change.\n */\ninterface Accumulated {\n  queryKey: string;\n  listKey: string;\n  pages: Record<number, File[]>;\n  pagination?: Pagination;\n}\n\ninterface PageState {\n  queryKey: string;\n  page: number;\n}\n\ntype PageRefreshedHandler = (page: number, results: File[]) => void;\n\n/**\n * Concatenates the pages in ascending order, one entry per asset id.\n *\n * `Map.set` keeps the first insertion position but takes the latest value, so\n * an asset that moved between pages after a mutation holds its place and shows\n * fresh data instead of rendering twice under a duplicate key.\n */\nconst flattenPages = (pages: Record<number, File[]>): File[] => {\n  const byId = new Map<number, File>();\n\n  for (const page of Object.keys(pages)\n    .map(Number)\n    .sort((a, b) => a - b)) {\n    for (const asset of pages[page]) {\n      byId.set(asset.id, asset);\n    }\n  }\n\n  return [...byId.values()];\n};\n\n/**\n * Keeps one earlier page's `getAssets` query subscribed and reports its results\n * back up whenever they change.\n *\n * The hook itself only subscribes the current (latest) page. Without these, a\n * mutation invalidating `{Asset, LIST}` refetches that page alone and earlier\n * pages stay frozen — a rename or delete on an earlier page never reaches the\n * list until a folder/sort/search change. One subscriber per earlier\n * page keeps them all subscribed so the invalidation refetches the whole list.\n * Renders nothing; it exists only for the subscription + `onRefreshed` report.\n */\nconst PageSubscriber = ({\n  queryArgs,\n  page,\n  onRefreshed,\n}: {\n  queryArgs: QueryArgs;\n  page: number;\n  onRefreshed: PageRefreshedHandler;\n}) => {\n  const { currentData } = useGetAssetsQuery({ ...queryArgs, page, pageSize: PAGE_SIZE });\n  const results = currentData?.results;\n\n  useEffect(() => {\n    if (results) {\n      onRefreshed(page, results);\n    }\n    // `results` is a stable reference per cache entry, so this only re-reports\n    // when a refetch actually replaces the page's data. Reporting the same\n    // reference the accumulator already holds is a no-op (see `onRefreshed`).\n  }, [results, page, onRefreshed]);\n\n  return null;\n};\n\n/**\n * Infinite scroll over `/upload/files`, keeping one accumulated slot per page.\n *\n * The caller MUST render the returned `subscribers` node — that is what keeps\n * every loaded page subscribed, so `{Asset, LIST}` invalidations keep the whole\n * list consistent rather than only the current page.\n */\nconst useInfiniteAssets = ({\n  folder = null,\n  sort,\n  search,\n  filters,\n  enabled = true,\n}: UseInfiniteAssetsOptions = {}) => {\n  // Derived from the request args themselves, so a new filter can't reach the\n  // API without also invalidating what was accumulated under the old one.\n  const queryArgs: QueryArgs = { folder, sort, search, filters };\n  const queryKey = JSON.stringify(queryArgs);\n  // Identifies the list being viewed, ignoring the search term. Folder, sort\n  // and filter changes are single committed actions, so one clean reset per\n  // change is honest. Search is committed per keystroke on a 300ms debounce,\n  // and blanking the list on each one would strobe as the user types.\n  // The cost: through the search window the previous rows stay rendered and\n  // `hasNextPage` is false, so the list reads as complete until page 1 lands.\n  const listKey = JSON.stringify({ folder, sort, filters });\n\n  const [pageState, setPageState] = useState<PageState>({ queryKey, page: 1 });\n  const [accumulated, setAccumulated] = useState<Accumulated>({ queryKey, listKey, pages: {} });\n\n  // Derived rather than read straight from state: the render that discovers\n  // the key change still reaches the query below, and a list with no page 1\n  // must never be requested at page 2.\n  const page = pageState.queryKey === queryKey ? pageState.page : 1;\n\n  if (pageState.queryKey !== queryKey) {\n    setPageState({ queryKey, page: 1 });\n  }\n\n  const { currentData, isLoading, isFetching, error, startedTimeStamp, fulfilledTimeStamp } =\n    useGetAssetsQuery(\n      {\n        ...queryArgs,\n        page,\n        pageSize: PAGE_SIZE,\n      },\n      { skip: !enabled }\n    );\n\n  const isSameQuery = accumulated.queryKey === queryKey;\n\n  // `currentData` is only ever the payload for the args just passed, so it\n  // belongs to this key at this page — nothing to infer. Its reference is\n  // stable per cache entry, so this settles after one extra render.\n  if (currentData && (!isSameQuery || accumulated.pages[page] !== currentData.results)) {\n    setAccumulated(\n      isSameQuery\n        ? {\n            ...accumulated,\n            pages: { ...accumulated.pages, [page]: currentData.results },\n            pagination: currentData.pagination,\n          }\n        : {\n            queryKey,\n            listKey,\n            pages: { [page]: currentData.results },\n            pagination: currentData.pagination,\n          }\n    );\n  }\n\n  // Merges a refetched earlier page back into the accumulator. Ignores reports\n  // for a superseded query, and no-ops when the reference is unchanged so a\n  // subscriber re-reporting its already-stored page can't loop.\n  const handlePageRefreshed = useCallback<PageRefreshedHandler>(\n    (refreshedPage, results) => {\n      setAccumulated((prev) => {\n        if (prev.queryKey !== queryKey || prev.pages[refreshedPage] === results) {\n          return prev;\n        }\n\n        return { ...prev, pages: { ...prev.pages, [refreshedPage]: results } };\n      });\n    },\n    [queryKey]\n  );\n\n  // One subscriber per earlier page (the current page is already subscribed by\n  // the query above). Keyed by queryKey so a folder/sort/search change remounts\n  // them against the new args instead of reusing a stale cache entry.\n  // `createElement` rather than JSX so this stays a plain `.ts` hook file.\n  const subscribers = createElement(\n    Fragment,\n    null,\n    Array.from({ length: Math.max(0, page - 1) }, (_, index) => index + 1).map((earlierPage) =>\n      createElement(PageSubscriber, {\n        key: `${queryKey}:${earlierPage}`,\n        queryArgs,\n        page: earlierPage,\n        onRefreshed: handlePageRefreshed,\n      })\n    )\n  );\n\n  // Drop the left folder's cached `getAssets` pages when the folder changes.\n  //\n  // RTK Query 1.9.7 leaves a query's store subscription in place when its last\n  // subscriber unmounts while a refetch is still in flight — e.g. a delete\n  // invalidates `{Asset, LIST}`, every loaded page starts refetching, and the\n  // user navigates away before those settle. Those stale subscriptions make the\n  // next `{Asset, LIST}` invalidation (an upload in the new folder) refetch the\n  // *previous* folder's pages: one bogus `/upload/files` request per loaded\n  // page. There is no public per-entry unsubscribe, so evict the left folder's\n  // entries outright — returning reloads from page 1, which the accumulator\n  // already does on a list change.\n  const dispatch = useDispatch();\n  const store = useStore();\n  const prevFolderRef = useRef(folder);\n  useEffect(() => {\n    const prevFolder = prevFolderRef.current;\n    prevFolderRef.current = folder;\n    if (prevFolder === folder) {\n      return;\n    }\n\n    const apiState = (store.getState() as Record<string, { queries?: Record<string, unknown> }>)[\n      uploadApi.reducerPath\n    ];\n    const removeQueryResult = (\n      uploadApi as unknown as {\n        internalActions: {\n          removeQueryResult: (payload: { queryCacheKey: string }) => { type: string };\n        };\n      }\n    ).internalActions.removeQueryResult;\n\n    Object.keys(apiState?.queries ?? {}).forEach((cacheKey) => {\n      if (!cacheKey.startsWith('getAssets(')) {\n        return;\n      }\n      let args: { folder?: number | null };\n      try {\n        args = JSON.parse(cacheKey.slice('getAssets('.length, -1));\n      } catch {\n        return;\n      }\n      if (args.folder === prevFolder) {\n        dispatch(removeQueryResult({ queryCacheKey: cacheKey }));\n      }\n    });\n  }, [folder, dispatch, store]);\n\n  // Until the new list's first page lands the accumulator still holds the\n  // previous folder. Reported as loading so the page shows a spinner instead\n  // of the outgoing folder's assets under the incoming folder's header.\n  const isChangingList = accumulated.listKey !== listKey;\n\n  const loadedAssets = useMemo(\n    () => (isChangingList ? [] : flattenPages(accumulated.pages)),\n    [isChangingList, accumulated.pages]\n  );\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 = currentData ? page < currentData.pagination.pageCount : false;\n\n  const completedUploads = useTypedSelector(selectCompletedUploads);\n\n  // Only an unfiltered, unsearched list can place an upload locally: deciding\n  // whether an asset satisfies a filter means reimplementing the server's\n  // filter semantics client-side. Filtered views still refresh on the\n  // end-of-batch invalidation, as they did before.\n  const canPlaceUploads = !search && (filters?.length ?? 0) === 0;\n\n  // When the loaded data came back from a request that started after a given\n  // upload — i.e. the server had already stored it when asked. Past that point\n  // the list is the authority on whether the asset is there at all, so bridging\n  // must stop: otherwise a later delete or move, which refetches without it,\n  // would have it re-inserted.\n  const listAnsweredAfter =\n    fulfilledTimeStamp !== undefined &&\n    startedTimeStamp !== undefined &&\n    // A refetch in flight leaves `fulfilledTimeStamp` on the previous response,\n    // which predates this request — so only settled data counts.\n    fulfilledTimeStamp > startedTimeStamp\n      ? startedTimeStamp\n      : undefined;\n\n  const assets = useMemo(() => {\n    if (!canPlaceUploads || completedUploads.length === 0) {\n      return loadedAssets;\n    }\n\n    const bridging = completedUploads.filter(\n      ({ asset, completedAt }) =>\n        getRelationId(asset.folder) === folder &&\n        (listAnsweredAfter === undefined || completedAt > listAnsweredAfter)\n    );\n\n    return mergeUploadedAssets({\n      assets: loadedAssets,\n      uploaded: bridging.map(({ asset }) => asset),\n      sort,\n      hasNextPage,\n    });\n  }, [\n    canPlaceUploads,\n    completedUploads,\n    loadedAssets,\n    folder,\n    sort,\n    hasNextPage,\n    listAnsweredAfter,\n  ]);\n  const isFetchingMore = isFetching && page > 1;\n\n  const fetchNextPage = useCallback(() => {\n    setPageState((prev) => ({\n      queryKey,\n      page: (prev.queryKey === queryKey ? prev.page : 1) + 1,\n    }));\n  }, [queryKey]);\n\n  if (!enabled) {\n    return {\n      assets: [] as File[],\n      // No list to keep fresh while disabled, so nothing to subscribe.\n      subscribers: null,\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    subscribers,\n    // Falls back to the accumulated total so a consumer showing the count\n    // doesn't flash zero mid-transition, matching the possibly stale `assets`.\n    pagination: currentData?.pagination ?? accumulated.pagination,\n    isLoading: isLoading || isChangingList,\n    isFetchingMore,\n    hasNextPage,\n    fetchNextPage,\n    error,\n  };\n};\n\nexport { useInfiniteAssets };\nexport { PAGE_SIZE };\n"],"names":["PAGE_SIZE","flattenPages","pages","byId","Map","page","Object","keys","map","Number","sort","a","b","asset","set","id","values","PageSubscriber","queryArgs","onRefreshed","currentData","useGetAssetsQuery","pageSize","results","useEffect","useInfiniteAssets","folder","search","filters","enabled","queryKey","JSON","stringify","listKey","pageState","setPageState","useState","accumulated","setAccumulated","isLoading","isFetching","error","startedTimeStamp","fulfilledTimeStamp","skip","isSameQuery","pagination","handlePageRefreshed","useCallback","refreshedPage","prev","subscribers","createElement","Fragment","Array","from","length","Math","max","_","index","earlierPage","key","dispatch","useDispatch","store","useStore","prevFolderRef","useRef","prevFolder","current","apiState","getState","uploadApi","reducerPath","removeQueryResult","internalActions","queries","forEach","cacheKey","startsWith","args","parse","slice","queryCacheKey","isChangingList","loadedAssets","useMemo","hasNextPage","pageCount","completedUploads","useTypedSelector","selectCompletedUploads","canPlaceUploads","listAnsweredAfter","undefined","assets","bridging","filter","completedAt","getRelationId","mergeUploadedAssets","uploaded","isFetchingMore","fetchNextPage"],"mappings":"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"}
+{"version":3,"file":"useInfiniteAssets.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useInfiniteAssets.ts"],"sourcesContent":["import { createElement, Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';\n\nimport { useDispatch, useStore } from 'react-redux';\n\nimport { uploadApi } from '../../../services/api';\nimport { useGetAssetsQuery } from '../../../services/assets';\nimport { useTypedSelector } from '../../../store/hooks';\nimport { selectCompletedUploads } from '../../../store/uploadProgress';\nimport { getRelationId } from '../../../utils/getRelationId';\nimport { mergeUploadedAssets } from '../utils/mergeUploadedAssets';\n\nimport type { File, Pagination } from '../../../../../../shared/contracts/files';\n\nconst PAGE_SIZE = 20;\n\n/**\n * How many list views keep their loaded pages in memory.\n */\nconst MAX_REMEMBERED_LISTS = 10;\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  /** Structural switch: an `is [folder]`-only type badge means no file can match. */\n  enabled?: boolean;\n}\n\ninterface QueryArgs {\n  folder: number | null;\n  sort?: string;\n  search?: string;\n  filters?: Record<string, unknown>[];\n}\n\n/**\n * Everything loaded for one query identity.\n *\n * `queryKey` lags the live key while a new query is in flight — that lag is\n * what keeps the previous results on screen across a search change.\n */\ninterface Accumulated {\n  queryKey: string;\n  listKey: string;\n  pages: Record<number, File[]>;\n  pagination?: Pagination;\n}\n\ninterface PageState {\n  queryKey: string;\n  page: number;\n}\n\ntype PageRefreshedHandler = (page: number, results: File[]) => void;\n\n/**\n * Concatenates the pages in ascending order, one entry per asset id.\n *\n * `Map.set` keeps the first insertion position but takes the latest value, so\n * an asset that moved between pages after a mutation holds its place and shows\n * fresh data instead of rendering twice under a duplicate key.\n */\nconst flattenPages = (pages: Record<number, File[]>): File[] => {\n  const byId = new Map<number, File>();\n\n  for (const page of Object.keys(pages)\n    .map(Number)\n    .sort((a, b) => a - b)) {\n    for (const asset of pages[page]) {\n      byId.set(asset.id, asset);\n    }\n  }\n\n  return [...byId.values()];\n};\n\n/**\n * The highest page an accumulator holds — where the list was last read to, and\n * so where to resume from on the way back.\n */\nconst deepestPage = (pages: Record<number, File[]>): number =>\n  Object.keys(pages).reduce((deepest, key) => Math.max(deepest, Number(key)), 1);\n\n/**\n * Keeps one earlier page's `getAssets` query subscribed and reports its results\n * back up whenever they change.\n *\n * The hook itself only subscribes the current (latest) page. Without these, a\n * mutation invalidating `{Asset, LIST}` refetches that page alone and earlier\n * pages stay frozen — a rename or delete on an earlier page never reaches the\n * list until a folder/sort/search change. One subscriber per earlier\n * page keeps them all subscribed so the invalidation refetches the whole list.\n * Renders nothing; it exists only for the subscription + `onRefreshed` report.\n */\nconst PageSubscriber = ({\n  queryArgs,\n  page,\n  onRefreshed,\n}: {\n  queryArgs: QueryArgs;\n  page: number;\n  onRefreshed: PageRefreshedHandler;\n}) => {\n  const { currentData } = useGetAssetsQuery({ ...queryArgs, page, pageSize: PAGE_SIZE });\n  const results = currentData?.results;\n\n  useEffect(() => {\n    if (results) {\n      onRefreshed(page, results);\n    }\n    // `results` is a stable reference per cache entry, so this only re-reports\n    // when a refetch actually replaces the page's data. Reporting the same\n    // reference the accumulator already holds is a no-op (see `onRefreshed`).\n  }, [results, page, onRefreshed]);\n\n  return null;\n};\n\n/**\n * Infinite scroll over `/upload/files`, keeping one accumulated slot per page.\n *\n * The caller MUST render the returned `subscribers` node — that is what keeps\n * every loaded page subscribed, so `{Asset, LIST}` invalidations keep the whole\n * list consistent rather than only the current page.\n *\n * Loaded pages survive navigating away and back: each list's accumulator is\n * remembered (LRU, `MAX_REMEMBERED_LISTS`) and restored when its key returns, so\n * stepping into a subfolder and back out keeps the rows the user scrolled for.\n */\nconst useInfiniteAssets = ({\n  folder = null,\n  sort,\n  search,\n  filters,\n  enabled = true,\n}: UseInfiniteAssetsOptions = {}) => {\n  // Derived from the request args themselves, so a new filter can't reach the\n  // API without also invalidating what was accumulated under the old one.\n  const queryArgs: QueryArgs = { folder, sort, search, filters };\n  const queryKey = JSON.stringify(queryArgs);\n  // Identifies the list being viewed, ignoring the search term. Folder, sort\n  // and filter changes are single committed actions, so one clean reset per\n  // change is honest. Search is committed per keystroke on a 300ms debounce,\n  // and blanking the list on each one would strobe as the user types.\n  // The cost: through the search window the previous rows stay rendered and\n  // `hasNextPage` is false, so the list reads as complete until page 1 lands.\n  const listKey = JSON.stringify({ folder, sort, filters });\n\n  const [pageState, setPageState] = useState<PageState>({ queryKey, page: 1 });\n  const [accumulated, setAccumulated] = useState<Accumulated>({ queryKey, listKey, pages: {} });\n\n  // Each list's loaded pages, kept across navigation away from it.\n  const memoryRef = useRef(new Map<string, Accumulated>());\n\n  const isNewList = pageState.queryKey !== queryKey;\n\n  const remembered = isNewList ? memoryRef.current.get(queryKey) : undefined;\n\n  // Derived rather than read from state: the render that discovers the key\n  // change still reaches the query below, and a list with no page 1 must never\n  // be requested at page 2. A remembered list always holds page 1, so resuming\n  // at its deepest page can't skip one.\n  let page: number;\n  if (!isNewList) {\n    page = pageState.page;\n  } else if (remembered) {\n    page = deepestPage(remembered.pages);\n  } else {\n    page = 1;\n  }\n\n  if (isNewList) {\n    setPageState({ queryKey, page });\n\n    if (remembered) {\n      setAccumulated(remembered);\n    }\n  }\n\n  const { currentData, isLoading, isFetching, error, startedTimeStamp, fulfilledTimeStamp } =\n    useGetAssetsQuery(\n      {\n        ...queryArgs,\n        page,\n        pageSize: PAGE_SIZE,\n      },\n      { skip: !enabled }\n    );\n\n  const isSameQuery = accumulated.queryKey === queryKey;\n\n  // `currentData` is only ever the payload for the args just passed, so it\n  // belongs to this key at this page — nothing to infer. Its reference is\n  // stable per cache entry, so this settles after one extra render.\n  if (\n    // A restore already set the accumulator from memory; don't overwrite it.\n    !remembered &&\n    currentData &&\n    (!isSameQuery || accumulated.pages[page] !== currentData.results)\n  ) {\n    setAccumulated(\n      isSameQuery\n        ? {\n            ...accumulated,\n            pages: { ...accumulated.pages, [page]: currentData.results },\n            pagination: currentData.pagination,\n          }\n        : {\n            queryKey,\n            listKey,\n            pages: { [page]: currentData.results },\n            pagination: currentData.pagination,\n          }\n    );\n  }\n\n  // Merges a refetched earlier page back into the accumulator. Ignores reports\n  // for a superseded query, and no-ops when the reference is unchanged so a\n  // subscriber re-reporting its already-stored page can't loop.\n  const handlePageRefreshed = useCallback<PageRefreshedHandler>(\n    (refreshedPage, results) => {\n      setAccumulated((prev) => {\n        if (prev.queryKey !== queryKey || prev.pages[refreshedPage] === results) {\n          return prev;\n        }\n\n        return { ...prev, pages: { ...prev.pages, [refreshedPage]: results } };\n      });\n    },\n    [queryKey]\n  );\n\n  // One subscriber per earlier page (the current page is already subscribed by\n  // the query above). Keyed by queryKey so a folder/sort/search change remounts\n  // them against the new args instead of reusing a stale cache entry.\n  // `createElement` rather than JSX so this stays a plain `.ts` hook file.\n  const subscribers = createElement(\n    Fragment,\n    null,\n    Array.from({ length: Math.max(0, page - 1) }, (_, index) => index + 1).map((earlierPage) =>\n      createElement(PageSubscriber, {\n        key: `${queryKey}:${earlierPage}`,\n        queryArgs,\n        page: earlierPage,\n        onRefreshed: handlePageRefreshed,\n      })\n    )\n  );\n\n  // Remember what this list has read, so leaving it isn't forgetting it. Filed\n  // under `accumulated.queryKey`, not the live `queryKey`: the accumulator names\n  // the list it belongs to, so an entry still describing the list being left\n  // can't be misfiled under the one being entered.\n  useEffect(() => {\n    if (Object.keys(accumulated.pages).length === 0) {\n      return;\n    }\n\n    const memory = memoryRef.current;\n    // Delete before set so the entry moves to the end. Map iterates in\n    // insertion order, so the first key is the least recently used.\n    memory.delete(accumulated.queryKey);\n    memory.set(accumulated.queryKey, accumulated);\n\n    while (memory.size > MAX_REMEMBERED_LISTS) {\n      const oldest = memory.keys().next();\n\n      if (oldest.done) {\n        break;\n      }\n\n      memory.delete(oldest.value);\n    }\n  }, [accumulated]);\n\n  // Drop the left folder's cached `getAssets` pages when the folder changes.\n  //\n  // RTK Query 1.9.7 leaves a query's store subscription in place when its last\n  // subscriber unmounts while a refetch is still in flight — e.g. a delete\n  // invalidates `{Asset, LIST}`, every loaded page starts refetching, and the\n  // user navigates away before those settle. Those stale subscriptions make the\n  // next `{Asset, LIST}` invalidation (an upload in the new folder) refetch the\n  // *previous* folder's pages: one bogus `/upload/files` request per loaded\n  // page. There is no public per-entry unsubscribe, so evict the left folder's\n  // entries outright. Returning then re-reads every page it had loaded, but the\n  // rows come straight back from the accumulator memory above — so those\n  // requests refresh a list already on screen rather than being waited on.\n  const dispatch = useDispatch();\n  const store = useStore();\n  const prevFolderRef = useRef(folder);\n  useEffect(() => {\n    const prevFolder = prevFolderRef.current;\n    prevFolderRef.current = folder;\n    if (prevFolder === folder) {\n      return;\n    }\n\n    const apiState = (store.getState() as Record<string, { queries?: Record<string, unknown> }>)[\n      uploadApi.reducerPath\n    ];\n    const removeQueryResult = (\n      uploadApi as unknown as {\n        internalActions: {\n          removeQueryResult: (payload: { queryCacheKey: string }) => { type: string };\n        };\n      }\n    ).internalActions.removeQueryResult;\n\n    Object.keys(apiState?.queries ?? {}).forEach((cacheKey) => {\n      if (!cacheKey.startsWith('getAssets(')) {\n        return;\n      }\n      let args: { folder?: number | null };\n      try {\n        args = JSON.parse(cacheKey.slice('getAssets('.length, -1));\n      } catch {\n        return;\n      }\n      if (args.folder === prevFolder) {\n        dispatch(removeQueryResult({ queryCacheKey: cacheKey }));\n      }\n    });\n  }, [folder, dispatch, store]);\n\n  // Until the new list's first page lands the accumulator still holds the\n  // previous folder. Reported as loading so the page shows a spinner instead\n  // of the outgoing folder's assets under the incoming folder's header.\n  const isChangingList = accumulated.listKey !== listKey;\n\n  const loadedAssets = useMemo(\n    () => (isChangingList ? [] : flattenPages(accumulated.pages)),\n    [isChangingList, accumulated.pages]\n  );\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 = currentData ? page < currentData.pagination.pageCount : false;\n\n  const completedUploads = useTypedSelector(selectCompletedUploads);\n\n  // Only an unfiltered, unsearched list can place an upload locally: deciding\n  // whether an asset satisfies a filter means reimplementing the server's\n  // filter semantics client-side. Filtered views still refresh on the\n  // end-of-batch invalidation, as they did before.\n  const canPlaceUploads = !search && (filters?.length ?? 0) === 0;\n\n  // When the loaded data came back from a request that started after a given\n  // upload — i.e. the server had already stored it when asked. Past that point\n  // the list is the authority on whether the asset is there at all, so bridging\n  // must stop: otherwise a later delete or move, which refetches without it,\n  // would have it re-inserted.\n  const listAnsweredAfter =\n    fulfilledTimeStamp !== undefined &&\n    startedTimeStamp !== undefined &&\n    // A refetch in flight leaves `fulfilledTimeStamp` on the previous response,\n    // which predates this request — so only settled data counts.\n    fulfilledTimeStamp > startedTimeStamp\n      ? startedTimeStamp\n      : undefined;\n\n  const assets = useMemo(() => {\n    if (!canPlaceUploads || completedUploads.length === 0) {\n      return loadedAssets;\n    }\n\n    const bridging = completedUploads.filter(\n      ({ asset, completedAt }) =>\n        getRelationId(asset.folder) === folder &&\n        (listAnsweredAfter === undefined || completedAt > listAnsweredAfter)\n    );\n\n    return mergeUploadedAssets({\n      assets: loadedAssets,\n      uploaded: bridging.map(({ asset }) => asset),\n      sort,\n      hasNextPage,\n    });\n  }, [\n    canPlaceUploads,\n    completedUploads,\n    loadedAssets,\n    folder,\n    sort,\n    hasNextPage,\n    listAnsweredAfter,\n  ]);\n  const isFetchingMore = isFetching && page > 1;\n\n  // A restored list already has rows on screen, so re-reading its current page\n  // is a background refresh — reporting it as loading would swap those rows for\n  // a spinner. Only an empty list has nothing better to show.\n  const isLoadingList = isChangingList || (isLoading && assets.length === 0);\n\n  const fetchNextPage = useCallback(() => {\n    setPageState((prev) => ({\n      queryKey,\n      page: (prev.queryKey === queryKey ? prev.page : 1) + 1,\n    }));\n  }, [queryKey]);\n\n  if (!enabled) {\n    return {\n      assets: [] as File[],\n      // No list to keep fresh while disabled, so nothing to subscribe.\n      subscribers: null,\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    subscribers,\n    // Falls back to the accumulated total so a consumer showing the count\n    // doesn't flash zero mid-transition, matching the possibly stale `assets`.\n    pagination: currentData?.pagination ?? accumulated.pagination,\n    isLoading: isLoadingList,\n    isFetchingMore,\n    hasNextPage,\n    fetchNextPage,\n    error,\n  };\n};\n\nexport { useInfiniteAssets };\nexport { PAGE_SIZE };\n"],"names":["PAGE_SIZE","MAX_REMEMBERED_LISTS","flattenPages","pages","byId","Map","page","Object","keys","map","Number","sort","a","b","asset","set","id","values","deepestPage","reduce","deepest","key","Math","max","PageSubscriber","queryArgs","onRefreshed","currentData","useGetAssetsQuery","pageSize","results","useEffect","useInfiniteAssets","folder","search","filters","enabled","queryKey","JSON","stringify","listKey","pageState","setPageState","useState","accumulated","setAccumulated","memoryRef","useRef","isNewList","remembered","current","get","undefined","isLoading","isFetching","error","startedTimeStamp","fulfilledTimeStamp","skip","isSameQuery","pagination","handlePageRefreshed","useCallback","refreshedPage","prev","subscribers","createElement","Fragment","Array","from","length","_","index","earlierPage","memory","delete","size","oldest","next","done","value","dispatch","useDispatch","store","useStore","prevFolderRef","prevFolder","apiState","getState","uploadApi","reducerPath","removeQueryResult","internalActions","queries","forEach","cacheKey","startsWith","args","parse","slice","queryCacheKey","isChangingList","loadedAssets","useMemo","hasNextPage","pageCount","completedUploads","useTypedSelector","selectCompletedUploads","canPlaceUploads","listAnsweredAfter","assets","bridging","filter","completedAt","getRelationId","mergeUploadedAssets","uploaded","isFetchingMore","isLoadingList","fetchNextPage"],"mappings":"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"}

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

@@ -0,0 +1,111 @@
+'use strict';
+
+var React = require('react');
+
+/**
+ * The admin layout marks the element that scrolls the main column (see
+ * `Layouts.Root`). The media library has no scroll container of its own, so the
+ * offset to save and restore belongs to that ancestor.
+ */ const SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';
+/**
+ * How long a restore keeps retrying after the list key changes.
+ *
+ * A returning list usually comes back from memory in one commit, so the first
+ * attempt lands. When it doesn't — pages still loading, so the content isn't yet
+ * tall enough to scroll that far — later commits retry. Past this window the
+ * offset is dropped rather than yanked out from under someone already reading.
+ */ const RESTORE_WINDOW_MS = 2000;
+/**
+ * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in
+ * `useInfiniteAssets`: the two are keyed identically, so they should forget on
+ * the same terms.
+ */ const MAX_REMEMBERED_OFFSETS = 10;
+/**
+ * Remembers where each list was scrolled to and puts it back on return.
+ *
+ * `key` fingerprints the list on screen (folder, search, sort, filters). While
+ * it holds steady the current offset is recorded; when it changes the incoming
+ * key's saved offset is restored, or the list is sent to the top if it has none
+ * — a first visit, or one whose entry has been dropped.
+ *
+ * Returns a callback ref to place on any element inside the scrolling column;
+ * it only locates that column, it is never scrolled itself.
+ *
+ * Restoring a *position* only helps if the rows that filled it come back too —
+ * that is `useInfiniteAssets`' job.
+ */ const useListScrollRestoration = (key)=>{
+    const offsetsRef = React.useRef(new Map());
+    const containerRef = React.useRef(null);
+    const detachRef = React.useRef(null);
+    // The key offsets are currently filed under. In a ref because the scroll
+    // listener is attached once and must read the current value.
+    const keyRef = React.useRef(key);
+    const pendingRef = React.useRef(null);
+    const anchorRef = React.useCallback((node)=>{
+        detachRef.current?.();
+        detachRef.current = null;
+        containerRef.current = null;
+        const container = node?.closest(SCROLL_ROOT_SELECTOR);
+        if (!container) {
+            return;
+        }
+        const handleScroll = ()=>{
+            const offsets = offsetsRef.current;
+            // Delete before set so the entry moves to the end. Map iterates in
+            // insertion order, so the first key is the least recently scrolled.
+            offsets.delete(keyRef.current);
+            offsets.set(keyRef.current, container.scrollTop);
+            while(offsets.size > MAX_REMEMBERED_OFFSETS){
+                const oldest = offsets.keys().next().value;
+                if (oldest === undefined) {
+                    break;
+                }
+                offsets.delete(oldest);
+            }
+        };
+        container.addEventListener('scroll', handleScroll, {
+            passive: true
+        });
+        containerRef.current = container;
+        detachRef.current = ()=>container.removeEventListener('scroll', handleScroll);
+    }, []);
+    React.useEffect(()=>()=>detachRef.current?.(), []);
+    // Runs on every commit, not just when `key` changes: a restore the first
+    // commit was too short to satisfy must be retried as the rows arrive, and
+    // there is no state to key that off. Layout phase so the list is never
+    // painted at the wrong offset.
+    React.useLayoutEffect(()=>{
+        const container = containerRef.current;
+        if (!container) {
+            return;
+        }
+        if (keyRef.current !== key) {
+            keyRef.current = key;
+            pendingRef.current = {
+                top: offsetsRef.current.get(key) ?? 0,
+                deadline: Date.now() + RESTORE_WINDOW_MS
+            };
+        }
+        const pending = pendingRef.current;
+        if (!pending) {
+            return;
+        }
+        // Before the assignment, not alongside it: past the window the offset has to
+        // be dropped rather than applied one final time to a list the user has since
+        // scrolled themselves.
+        if (Date.now() > pending.deadline) {
+            pendingRef.current = null;
+            return;
+        }
+        container.scrollTop = pending.top;
+        // The browser clamps to the content that exists now, so a target the list
+        // isn't tall enough for yet stays pending for the next commit.
+        if (container.scrollTop >= pending.top) {
+            pendingRef.current = null;
+        }
+    });
+    return anchorRef;
+};
+
+exports.useListScrollRestoration = useListScrollRestoration;
+//# sourceMappingURL=useListScrollRestoration.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useListScrollRestoration.js","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListScrollRestoration.ts"],"sourcesContent":["import { useCallback, useEffect, useLayoutEffect, useRef } from 'react';\n\n/**\n * The admin layout marks the element that scrolls the main column (see\n * `Layouts.Root`). The media library has no scroll container of its own, so the\n * offset to save and restore belongs to that ancestor.\n */\nconst SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';\n\n/**\n * How long a restore keeps retrying after the list key changes.\n *\n * A returning list usually comes back from memory in one commit, so the first\n * attempt lands. When it doesn't — pages still loading, so the content isn't yet\n * tall enough to scroll that far — later commits retry. Past this window the\n * offset is dropped rather than yanked out from under someone already reading.\n */\nconst RESTORE_WINDOW_MS = 2000;\n\n/**\n * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in\n * `useInfiniteAssets`: the two are keyed identically, so they should forget on\n * the same terms.\n */\nconst MAX_REMEMBERED_OFFSETS = 10;\n\ninterface PendingRestore {\n  top: number;\n  deadline: number;\n}\n\n/**\n * Remembers where each list was scrolled to and puts it back on return.\n *\n * `key` fingerprints the list on screen (folder, search, sort, filters). While\n * it holds steady the current offset is recorded; when it changes the incoming\n * key's saved offset is restored, or the list is sent to the top if it has none\n * — a first visit, or one whose entry has been dropped.\n *\n * Returns a callback ref to place on any element inside the scrolling column;\n * it only locates that column, it is never scrolled itself.\n *\n * Restoring a *position* only helps if the rows that filled it come back too —\n * that is `useInfiniteAssets`' job.\n */\nexport const useListScrollRestoration = (key: string) => {\n  const offsetsRef = useRef(new Map<string, number>());\n  const containerRef = useRef<HTMLElement | null>(null);\n  const detachRef = useRef<(() => void) | null>(null);\n  // The key offsets are currently filed under. In a ref because the scroll\n  // listener is attached once and must read the current value.\n  const keyRef = useRef(key);\n  const pendingRef = useRef<PendingRestore | null>(null);\n\n  const anchorRef = useCallback((node: HTMLElement | null) => {\n    detachRef.current?.();\n    detachRef.current = null;\n    containerRef.current = null;\n\n    const container = node?.closest<HTMLElement>(SCROLL_ROOT_SELECTOR);\n\n    if (!container) {\n      return;\n    }\n\n    const handleScroll = () => {\n      const offsets = offsetsRef.current;\n\n      // Delete before set so the entry moves to the end. Map iterates in\n      // insertion order, so the first key is the least recently scrolled.\n      offsets.delete(keyRef.current);\n      offsets.set(keyRef.current, container.scrollTop);\n\n      while (offsets.size > MAX_REMEMBERED_OFFSETS) {\n        const oldest = offsets.keys().next().value;\n\n        if (oldest === undefined) {\n          break;\n        }\n\n        offsets.delete(oldest);\n      }\n    };\n\n    container.addEventListener('scroll', handleScroll, { passive: true });\n    containerRef.current = container;\n    detachRef.current = () => container.removeEventListener('scroll', handleScroll);\n  }, []);\n\n  useEffect(() => () => detachRef.current?.(), []);\n\n  // Runs on every commit, not just when `key` changes: a restore the first\n  // commit was too short to satisfy must be retried as the rows arrive, and\n  // there is no state to key that off. Layout phase so the list is never\n  // painted at the wrong offset.\n  useLayoutEffect(() => {\n    const container = containerRef.current;\n\n    if (!container) {\n      return;\n    }\n\n    if (keyRef.current !== key) {\n      keyRef.current = key;\n      pendingRef.current = {\n        top: offsetsRef.current.get(key) ?? 0,\n        deadline: Date.now() + RESTORE_WINDOW_MS,\n      };\n    }\n\n    const pending = pendingRef.current;\n\n    if (!pending) {\n      return;\n    }\n\n    // Before the assignment, not alongside it: past the window the offset has to\n    // be dropped rather than applied one final time to a list the user has since\n    // scrolled themselves.\n    if (Date.now() > pending.deadline) {\n      pendingRef.current = null;\n      return;\n    }\n\n    container.scrollTop = pending.top;\n\n    // The browser clamps to the content that exists now, so a target the list\n    // isn't tall enough for yet stays pending for the next commit.\n    if (container.scrollTop >= pending.top) {\n      pendingRef.current = null;\n    }\n  });\n\n  return anchorRef;\n};\n"],"names":["SCROLL_ROOT_SELECTOR","RESTORE_WINDOW_MS","MAX_REMEMBERED_OFFSETS","useListScrollRestoration","key","offsetsRef","useRef","Map","containerRef","detachRef","keyRef","pendingRef","anchorRef","useCallback","node","current","container","closest","handleScroll","offsets","delete","set","scrollTop","size","oldest","keys","next","value","undefined","addEventListener","passive","removeEventListener","useEffect","useLayoutEffect","top","get","deadline","Date","now","pending"],"mappings":"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"}

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

@@ -0,0 +1,109 @@
+import { useRef, useCallback, useEffect, useLayoutEffect } from 'react';
+
+/**
+ * The admin layout marks the element that scrolls the main column (see
+ * `Layouts.Root`). The media library has no scroll container of its own, so the
+ * offset to save and restore belongs to that ancestor.
+ */ const SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';
+/**
+ * How long a restore keeps retrying after the list key changes.
+ *
+ * A returning list usually comes back from memory in one commit, so the first
+ * attempt lands. When it doesn't — pages still loading, so the content isn't yet
+ * tall enough to scroll that far — later commits retry. Past this window the
+ * offset is dropped rather than yanked out from under someone already reading.
+ */ const RESTORE_WINDOW_MS = 2000;
+/**
+ * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in
+ * `useInfiniteAssets`: the two are keyed identically, so they should forget on
+ * the same terms.
+ */ const MAX_REMEMBERED_OFFSETS = 10;
+/**
+ * Remembers where each list was scrolled to and puts it back on return.
+ *
+ * `key` fingerprints the list on screen (folder, search, sort, filters). While
+ * it holds steady the current offset is recorded; when it changes the incoming
+ * key's saved offset is restored, or the list is sent to the top if it has none
+ * — a first visit, or one whose entry has been dropped.
+ *
+ * Returns a callback ref to place on any element inside the scrolling column;
+ * it only locates that column, it is never scrolled itself.
+ *
+ * Restoring a *position* only helps if the rows that filled it come back too —
+ * that is `useInfiniteAssets`' job.
+ */ const useListScrollRestoration = (key)=>{
+    const offsetsRef = useRef(new Map());
+    const containerRef = useRef(null);
+    const detachRef = useRef(null);
+    // The key offsets are currently filed under. In a ref because the scroll
+    // listener is attached once and must read the current value.
+    const keyRef = useRef(key);
+    const pendingRef = useRef(null);
+    const anchorRef = useCallback((node)=>{
+        detachRef.current?.();
+        detachRef.current = null;
+        containerRef.current = null;
+        const container = node?.closest(SCROLL_ROOT_SELECTOR);
+        if (!container) {
+            return;
+        }
+        const handleScroll = ()=>{
+            const offsets = offsetsRef.current;
+            // Delete before set so the entry moves to the end. Map iterates in
+            // insertion order, so the first key is the least recently scrolled.
+            offsets.delete(keyRef.current);
+            offsets.set(keyRef.current, container.scrollTop);
+            while(offsets.size > MAX_REMEMBERED_OFFSETS){
+                const oldest = offsets.keys().next().value;
+                if (oldest === undefined) {
+                    break;
+                }
+                offsets.delete(oldest);
+            }
+        };
+        container.addEventListener('scroll', handleScroll, {
+            passive: true
+        });
+        containerRef.current = container;
+        detachRef.current = ()=>container.removeEventListener('scroll', handleScroll);
+    }, []);
+    useEffect(()=>()=>detachRef.current?.(), []);
+    // Runs on every commit, not just when `key` changes: a restore the first
+    // commit was too short to satisfy must be retried as the rows arrive, and
+    // there is no state to key that off. Layout phase so the list is never
+    // painted at the wrong offset.
+    useLayoutEffect(()=>{
+        const container = containerRef.current;
+        if (!container) {
+            return;
+        }
+        if (keyRef.current !== key) {
+            keyRef.current = key;
+            pendingRef.current = {
+                top: offsetsRef.current.get(key) ?? 0,
+                deadline: Date.now() + RESTORE_WINDOW_MS
+            };
+        }
+        const pending = pendingRef.current;
+        if (!pending) {
+            return;
+        }
+        // Before the assignment, not alongside it: past the window the offset has to
+        // be dropped rather than applied one final time to a list the user has since
+        // scrolled themselves.
+        if (Date.now() > pending.deadline) {
+            pendingRef.current = null;
+            return;
+        }
+        container.scrollTop = pending.top;
+        // The browser clamps to the content that exists now, so a target the list
+        // isn't tall enough for yet stays pending for the next commit.
+        if (container.scrollTop >= pending.top) {
+            pendingRef.current = null;
+        }
+    });
+    return anchorRef;
+};
+
+export { useListScrollRestoration };
+//# sourceMappingURL=useListScrollRestoration.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useListScrollRestoration.mjs","sources":["../../../../../../admin/src/future/pages/Assets/hooks/useListScrollRestoration.ts"],"sourcesContent":["import { useCallback, useEffect, useLayoutEffect, useRef } from 'react';\n\n/**\n * The admin layout marks the element that scrolls the main column (see\n * `Layouts.Root`). The media library has no scroll container of its own, so the\n * offset to save and restore belongs to that ancestor.\n */\nconst SCROLL_ROOT_SELECTOR = '[data-strapi-main-content]';\n\n/**\n * How long a restore keeps retrying after the list key changes.\n *\n * A returning list usually comes back from memory in one commit, so the first\n * attempt lands. When it doesn't — pages still loading, so the content isn't yet\n * tall enough to scroll that far — later commits retry. Past this window the\n * offset is dropped rather than yanked out from under someone already reading.\n */\nconst RESTORE_WINDOW_MS = 2000;\n\n/**\n * How many list offsets to keep. Matches `MAX_REMEMBERED_LISTS` in\n * `useInfiniteAssets`: the two are keyed identically, so they should forget on\n * the same terms.\n */\nconst MAX_REMEMBERED_OFFSETS = 10;\n\ninterface PendingRestore {\n  top: number;\n  deadline: number;\n}\n\n/**\n * Remembers where each list was scrolled to and puts it back on return.\n *\n * `key` fingerprints the list on screen (folder, search, sort, filters). While\n * it holds steady the current offset is recorded; when it changes the incoming\n * key's saved offset is restored, or the list is sent to the top if it has none\n * — a first visit, or one whose entry has been dropped.\n *\n * Returns a callback ref to place on any element inside the scrolling column;\n * it only locates that column, it is never scrolled itself.\n *\n * Restoring a *position* only helps if the rows that filled it come back too —\n * that is `useInfiniteAssets`' job.\n */\nexport const useListScrollRestoration = (key: string) => {\n  const offsetsRef = useRef(new Map<string, number>());\n  const containerRef = useRef<HTMLElement | null>(null);\n  const detachRef = useRef<(() => void) | null>(null);\n  // The key offsets are currently filed under. In a ref because the scroll\n  // listener is attached once and must read the current value.\n  const keyRef = useRef(key);\n  const pendingRef = useRef<PendingRestore | null>(null);\n\n  const anchorRef = useCallback((node: HTMLElement | null) => {\n    detachRef.current?.();\n    detachRef.current = null;\n    containerRef.current = null;\n\n    const container = node?.closest<HTMLElement>(SCROLL_ROOT_SELECTOR);\n\n    if (!container) {\n      return;\n    }\n\n    const handleScroll = () => {\n      const offsets = offsetsRef.current;\n\n      // Delete before set so the entry moves to the end. Map iterates in\n      // insertion order, so the first key is the least recently scrolled.\n      offsets.delete(keyRef.current);\n      offsets.set(keyRef.current, container.scrollTop);\n\n      while (offsets.size > MAX_REMEMBERED_OFFSETS) {\n        const oldest = offsets.keys().next().value;\n\n        if (oldest === undefined) {\n          break;\n        }\n\n        offsets.delete(oldest);\n      }\n    };\n\n    container.addEventListener('scroll', handleScroll, { passive: true });\n    containerRef.current = container;\n    detachRef.current = () => container.removeEventListener('scroll', handleScroll);\n  }, []);\n\n  useEffect(() => () => detachRef.current?.(), []);\n\n  // Runs on every commit, not just when `key` changes: a restore the first\n  // commit was too short to satisfy must be retried as the rows arrive, and\n  // there is no state to key that off. Layout phase so the list is never\n  // painted at the wrong offset.\n  useLayoutEffect(() => {\n    const container = containerRef.current;\n\n    if (!container) {\n      return;\n    }\n\n    if (keyRef.current !== key) {\n      keyRef.current = key;\n      pendingRef.current = {\n        top: offsetsRef.current.get(key) ?? 0,\n        deadline: Date.now() + RESTORE_WINDOW_MS,\n      };\n    }\n\n    const pending = pendingRef.current;\n\n    if (!pending) {\n      return;\n    }\n\n    // Before the assignment, not alongside it: past the window the offset has to\n    // be dropped rather than applied one final time to a list the user has since\n    // scrolled themselves.\n    if (Date.now() > pending.deadline) {\n      pendingRef.current = null;\n      return;\n    }\n\n    container.scrollTop = pending.top;\n\n    // The browser clamps to the content that exists now, so a target the list\n    // isn't tall enough for yet stays pending for the next commit.\n    if (container.scrollTop >= pending.top) {\n      pendingRef.current = null;\n    }\n  });\n\n  return anchorRef;\n};\n"],"names":["SCROLL_ROOT_SELECTOR","RESTORE_WINDOW_MS","MAX_REMEMBERED_OFFSETS","useListScrollRestoration","key","offsetsRef","useRef","Map","containerRef","detachRef","keyRef","pendingRef","anchorRef","useCallback","node","current","container","closest","handleScroll","offsets","delete","set","scrollTop","size","oldest","keys","next","value","undefined","addEventListener","passive","removeEventListener","useEffect","useLayoutEffect","top","get","deadline","Date","now","pending"],"mappings":"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"}

package/dist/admin/future/services/api.js

@@ -345,6 +345,23 @@ const trackPoolRun = (uploadId, run)=>{
                         }));
                         break;
                     }
+                case 'file:progress':
+                    {
+                        const payload = parsed;
+                        // No usable Content-Length on the remote: leave the row indeterminate
+                        if (payload.totalBytes === null) {
+                            break;
+                        }
+                        // Already throttled server-side (~5 frames a second per file), so no batching
+                        // here. `size` rides along because the row is still at 0 — see `setFileProgress`.
+                        dispatch(uploadProgress.setFileProgress({
+                            index,
+                            bytes: payload.loadedBytes,
+                            size: payload.totalBytes,
+                            uploadId
+                        }));
+                        break;
+                    }
                 case 'file:uploading':
                     {
                         const payload = parsed;