@payloadcms/ui 3.48.0 → 3.49.0-canary.1

package/dist/providers/ListQuery/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAEhF,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAQnE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA2MtD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAEhF,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAUnE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAuKtD,CAAA"}

package/dist/providers/ListQuery/index.js

@@ -2,7 +2,6 @@
 
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useRouter, useSearchParams } from 'next/navigation.js';
-import { isNumber, transformColumnsToSearchParams } from 'payload/shared';
 import * as qs from 'qs-esm';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useListDrawerContext } from '../../elements/ListDrawer/Provider.js';
@@ -10,21 +9,19 @@ import { useEffectEvent } from '../../hooks/useEffectEvent.js';
 import { useRouteTransition } from '../../providers/RouteTransition/index.js';
 import { parseSearchParams } from '../../utilities/parseSearchParams.js';
 import { ListQueryContext, ListQueryModifiedContext } from './context.js';
+import { mergeQuery } from './mergeQuery.js';
+import { sanitizeQuery } from './sanitizeQuery.js';
 export { useListQuery } from './context.js';
 export const ListQueryProvider = ({
   children,
   collectionSlug,
-  columns,
   data,
-  defaultLimit,
-  defaultSort,
-  listPreferences,
   modifySearchParams,
   onQueryChange: onQueryChangeFromProps,
-  orderableFieldName
+  orderableFieldName,
+  query: queryFromProps
 }) => {
   // TODO: Investigate if this is still needed
-  // eslint-disable-next-line react-compiler/react-compiler
   'use no memo';
 
   const router = useRouter();
@@ -33,7 +30,7 @@ export const ListQueryProvider = ({
     startRouteTransition
   } = useRouteTransition();
   const [modified, setModified] = useState(false);
-  const searchParams = useMemo(() => parseSearchParams(rawSearchParams), [rawSearchParams]);
+  const searchParams = useMemo(() => sanitizeQuery(parseSearchParams(rawSearchParams)), [rawSearchParams]);
   const contextRef = useRef({});
   contextRef.current.modified = modified;
   const {
@@ -44,29 +41,11 @@ export const ListQueryProvider = ({
       return searchParams;
     } else {
       return {
-        limit: String(defaultLimit),
-        sort: defaultSort
+        limit: queryFromProps.limit,
+        sort: queryFromProps.sort
       };
     }
   });
-  const mergeQuery = useCallback((newQuery = {}) => {
-    let page = 'page' in newQuery ? newQuery.page : currentQuery?.page;
-    if ('where' in newQuery || 'search' in newQuery) {
-      page = '1';
-    }
-    const mergedQuery = {
-      ...currentQuery,
-      ...newQuery,
-      columns: 'columns' in newQuery ? newQuery.columns : currentQuery.columns,
-      limit: 'limit' in newQuery ? newQuery.limit : currentQuery?.limit ?? String(defaultLimit),
-      page,
-      preset: 'preset' in newQuery ? newQuery.preset : currentQuery?.preset,
-      search: 'search' in newQuery ? newQuery.search : currentQuery?.search,
-      sort: 'sort' in newQuery ? newQuery.sort : currentQuery?.sort ?? defaultSort,
-      where: 'where' in newQuery ? newQuery.where : currentQuery?.where
-    };
-    return mergedQuery;
-  }, [currentQuery, defaultLimit, defaultSort]);
   const refineListData = useCallback(
   // eslint-disable-next-line @typescript-eslint/require-await
   async (incomingQuery, modified_0) => {
@@ -75,29 +54,34 @@ export const ListQueryProvider = ({
     } else {
       setModified(true);
     }
-    const newQuery_0 = mergeQuery(incomingQuery);
+    const newQuery = mergeQuery(currentQuery, incomingQuery, {
+      defaults: {
+        limit: queryFromProps.limit,
+        sort: queryFromProps.sort
+      }
+    });
     if (modifySearchParams) {
       startRouteTransition(() => router.replace(`${qs.stringify({
-        ...newQuery_0,
-        columns: JSON.stringify(newQuery_0.columns)
+        ...newQuery,
+        columns: JSON.stringify(newQuery.columns)
       }, {
         addQueryPrefix: true
       })}`));
     } else if (typeof onQueryChange === 'function' || typeof onQueryChangeFromProps === 'function') {
       const onChangeFn = onQueryChange || onQueryChangeFromProps;
-      onChangeFn(newQuery_0);
+      onChangeFn(newQuery);
     }
-    setCurrentQuery(newQuery_0);
-  }, [mergeQuery, modifySearchParams, onQueryChange, onQueryChangeFromProps, startRouteTransition, router]);
+    setCurrentQuery(newQuery);
+  }, [currentQuery, queryFromProps.limit, queryFromProps.sort, modifySearchParams, onQueryChange, onQueryChangeFromProps, startRouteTransition, router]);
   const handlePageChange = useCallback(async arg => {
     await refineListData({
-      page: String(arg)
+      page: arg
     });
   }, [refineListData]);
   const handlePerPageChange = React.useCallback(async arg_0 => {
     await refineListData({
-      limit: String(arg_0),
-      page: '1'
+      limit: arg_0,
+      page: 1
     });
   }, [refineListData]);
   const handleSearchChange = useCallback(async arg_1 => {
@@ -116,43 +100,28 @@ export const ListQueryProvider = ({
       where: arg_3
     });
   }, [refineListData]);
-  const syncQuery = useEffectEvent(() => {
-    let shouldUpdateQueryString = false;
-    const newQuery_1 = {
-      ...(currentQuery || {})
-    };
-    // Allow the URL to override the default limit
-    if (isNumber(defaultLimit) && !('limit' in currentQuery)) {
-      newQuery_1.limit = String(defaultLimit);
-      shouldUpdateQueryString = true;
-    }
-    // Allow the URL to override the default sort
-    if (defaultSort && !('sort' in currentQuery)) {
-      newQuery_1.sort = defaultSort;
-      shouldUpdateQueryString = true;
-    }
-    // Only modify columns if they originated from preferences
-    // We can assume they did if `listPreferences.columns` is defined
-    if (columns && listPreferences?.columns && !('columns' in currentQuery)) {
-      newQuery_1.columns = transformColumnsToSearchParams(columns);
-      shouldUpdateQueryString = true;
-    }
-    if (shouldUpdateQueryString) {
-      setCurrentQuery(newQuery_1);
-      // Do not use router.replace here to avoid re-rendering on initial load
-      window.history.replaceState(null, '', `?${qs.stringify({
-        ...newQuery_1,
-        columns: JSON.stringify(newQuery_1.columns)
-      })}`);
+  const mergeQueryFromPropsAndSyncToURL = useEffectEvent(() => {
+    const newQuery_0 = sanitizeQuery({
+      ...(currentQuery || {}),
+      ...(queryFromProps || {})
+    });
+    const search_0 = `?${qs.stringify({
+      ...newQuery_0,
+      columns: JSON.stringify(newQuery_0.columns)
+    })}`;
+    if (window.location.search !== search_0) {
+      setCurrentQuery(newQuery_0);
+      // Important: do not use router.replace here to avoid re-rendering on initial load
+      window.history.replaceState(null, '', search_0);
     }
   });
-  // If `defaultLimit` or `defaultSort` are updated externally, update the query
-  // I.e. when HMR runs, these properties may be different
+  // If `query` is updated externally, update the local state
+  // E.g. when HMR runs, these properties may be different
   useEffect(() => {
     if (modifySearchParams) {
-      syncQuery();
+      mergeQueryFromPropsAndSyncToURL();
     }
-  }, [defaultSort, defaultLimit, modifySearchParams, columns]);
+  }, [modifySearchParams, queryFromProps]);
   return /*#__PURE__*/_jsx(ListQueryContext, {
     value: {
       collectionSlug,

package/dist/providers/ListQuery/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["useRouter","useSearchParams","isNumber","transformColumnsToSearchParams","qs","React","useCallback","useEffect","useMemo","useRef","useState","useListDrawerContext","useEffectEvent","useRouteTransition","parseSearchParams","ListQueryContext","ListQueryModifiedContext","useListQuery","ListQueryProvider","children","collectionSlug","columns","data","defaultLimit","defaultSort","listPreferences","modifySearchParams","onQueryChange","onQueryChangeFromProps","orderableFieldName","router","rawSearchParams","startRouteTransition","modified","setModified","searchParams","contextRef","current","currentQuery","setCurrentQuery","limit","String","sort","mergeQuery","newQuery","page","mergedQuery","preset","search","where","refineListData","incomingQuery","undefined","replace","stringify","JSON","addQueryPrefix","onChangeFn","handlePageChange","arg","handlePerPageChange","handleSearchChange","handleSortChange","handleWhereChange","syncQuery","shouldUpdateQueryString","window","history","replaceState","_jsx","value","query"],"sources":["../../../src/providers/ListQuery/index.tsx"],"sourcesContent":["'use client'\nimport { useRouter, useSearchParams } from 'next/navigation.js'\nimport { type ListQuery, type Where } from 'payload'\nimport { isNumber, transformColumnsToSearchParams } from 'payload/shared'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'\n\nimport type { IListQueryContext, ListQueryProps } from './types.js'\n\nimport { useListDrawerContext } from '../../elements/ListDrawer/Provider.js'\nimport { useEffectEvent } from '../../hooks/useEffectEvent.js'\nimport { useRouteTransition } from '../../providers/RouteTransition/index.js'\nimport { parseSearchParams } from '../../utilities/parseSearchParams.js'\nimport { ListQueryContext, ListQueryModifiedContext } from './context.js'\n\nexport { useListQuery } from './context.js'\n\nexport const ListQueryProvider: React.FC<ListQueryProps> = ({\n  children,\n  collectionSlug,\n  columns,\n  data,\n  defaultLimit,\n  defaultSort,\n  listPreferences,\n  modifySearchParams,\n  onQueryChange: onQueryChangeFromProps,\n  orderableFieldName,\n}) => {\n  // TODO: Investigate if this is still needed\n  // eslint-disable-next-line react-compiler/react-compiler\n  'use no memo'\n  const router = useRouter()\n  const rawSearchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const [modified, setModified] = useState(false)\n\n  const searchParams = useMemo<ListQuery>(\n    () => parseSearchParams(rawSearchParams),\n    [rawSearchParams],\n  )\n\n  const contextRef = useRef({} as IListQueryContext)\n\n  contextRef.current.modified = modified\n\n  const { onQueryChange } = useListDrawerContext()\n\n  const [currentQuery, setCurrentQuery] = useState<ListQuery>(() => {\n    if (modifySearchParams) {\n      return searchParams\n    } else {\n      return {\n        limit: String(defaultLimit),\n        sort: defaultSort,\n      }\n    }\n  })\n\n  const mergeQuery = useCallback(\n    (newQuery: ListQuery = {}): ListQuery => {\n      let page = 'page' in newQuery ? newQuery.page : currentQuery?.page\n\n      if ('where' in newQuery || 'search' in newQuery) {\n        page = '1'\n      }\n\n      const mergedQuery: ListQuery = {\n        ...currentQuery,\n        ...newQuery,\n        columns: 'columns' in newQuery ? newQuery.columns : currentQuery.columns,\n        limit: 'limit' in newQuery ? newQuery.limit : (currentQuery?.limit ?? String(defaultLimit)),\n        page,\n        preset: 'preset' in newQuery ? newQuery.preset : currentQuery?.preset,\n        search: 'search' in newQuery ? newQuery.search : currentQuery?.search,\n        sort: 'sort' in newQuery ? newQuery.sort : ((currentQuery?.sort as string) ?? defaultSort),\n        where: 'where' in newQuery ? newQuery.where : currentQuery?.where,\n      }\n\n      return mergedQuery\n    },\n    [currentQuery, defaultLimit, defaultSort],\n  )\n\n  const refineListData = useCallback(\n    // eslint-disable-next-line @typescript-eslint/require-await\n    async (incomingQuery: ListQuery, modified?: boolean) => {\n      if (modified !== undefined) {\n        setModified(modified)\n      } else {\n        setModified(true)\n      }\n\n      const newQuery = mergeQuery(incomingQuery)\n\n      if (modifySearchParams) {\n        startRouteTransition(() =>\n          router.replace(\n            `${qs.stringify({ ...newQuery, columns: JSON.stringify(newQuery.columns) }, { addQueryPrefix: true })}`,\n          ),\n        )\n      } else if (\n        typeof onQueryChange === 'function' ||\n        typeof onQueryChangeFromProps === 'function'\n      ) {\n        const onChangeFn = onQueryChange || onQueryChangeFromProps\n        onChangeFn(newQuery)\n      }\n\n      setCurrentQuery(newQuery)\n    },\n    [\n      mergeQuery,\n      modifySearchParams,\n      onQueryChange,\n      onQueryChangeFromProps,\n      startRouteTransition,\n      router,\n    ],\n  )\n\n  const handlePageChange = useCallback(\n    async (arg: number) => {\n      await refineListData({ page: String(arg) })\n    },\n    [refineListData],\n  )\n\n  const handlePerPageChange = React.useCallback(\n    async (arg: number) => {\n      await refineListData({ limit: String(arg), page: '1' })\n    },\n    [refineListData],\n  )\n\n  const handleSearchChange = useCallback(\n    async (arg: string) => {\n      const search = arg === '' ? undefined : arg\n      await refineListData({ search })\n    },\n    [refineListData],\n  )\n\n  const handleSortChange = useCallback(\n    async (arg: string) => {\n      await refineListData({ sort: arg })\n    },\n    [refineListData],\n  )\n\n  const handleWhereChange = useCallback(\n    async (arg: Where) => {\n      await refineListData({ where: arg })\n    },\n    [refineListData],\n  )\n\n  const syncQuery = useEffectEvent(() => {\n    let shouldUpdateQueryString = false\n    const newQuery = { ...(currentQuery || {}) }\n\n    // Allow the URL to override the default limit\n    if (isNumber(defaultLimit) && !('limit' in currentQuery)) {\n      newQuery.limit = String(defaultLimit)\n      shouldUpdateQueryString = true\n    }\n\n    // Allow the URL to override the default sort\n    if (defaultSort && !('sort' in currentQuery)) {\n      newQuery.sort = defaultSort\n      shouldUpdateQueryString = true\n    }\n\n    // Only modify columns if they originated from preferences\n    // We can assume they did if `listPreferences.columns` is defined\n    if (columns && listPreferences?.columns && !('columns' in currentQuery)) {\n      newQuery.columns = transformColumnsToSearchParams(columns)\n      shouldUpdateQueryString = true\n    }\n\n    if (shouldUpdateQueryString) {\n      setCurrentQuery(newQuery)\n      // Do not use router.replace here to avoid re-rendering on initial load\n      window.history.replaceState(\n        null,\n        '',\n        `?${qs.stringify({ ...newQuery, columns: JSON.stringify(newQuery.columns) })}`,\n      )\n    }\n  })\n\n  // If `defaultLimit` or `defaultSort` are updated externally, update the query\n  // I.e. when HMR runs, these properties may be different\n  useEffect(() => {\n    if (modifySearchParams) {\n      syncQuery()\n    }\n  }, [defaultSort, defaultLimit, modifySearchParams, columns])\n\n  return (\n    <ListQueryContext\n      value={{\n        collectionSlug,\n        data,\n        handlePageChange,\n        handlePerPageChange,\n        handleSearchChange,\n        handleSortChange,\n        handleWhereChange,\n        orderableFieldName,\n        query: currentQuery,\n        refineListData,\n        setModified,\n\n        ...contextRef.current,\n      }}\n    >\n      <ListQueryModifiedContext value={modified}>{children}</ListQueryModifiedContext>\n    </ListQueryContext>\n  )\n}\n"],"mappings":"AAAA;;;AACA,SAASA,SAAS,EAAEC,eAAe,QAAQ;AAE3C,SAASC,QAAQ,EAAEC,8BAA8B,QAAQ;AACzD,YAAYC,EAAA,MAAQ;AACpB,OAAOC,KAAA,IAASC,WAAW,EAAEC,SAAS,EAAEC,OAAO,EAAEC,MAAM,EAAEC,QAAQ,QAAQ;AAIzE,SAASC,oBAAoB,QAAQ;AACrC,SAASC,cAAc,QAAQ;AAC/B,SAASC,kBAAkB,QAAQ;AACnC,SAASC,iBAAiB,QAAQ;AAClC,SAASC,gBAAgB,EAAEC,wBAAwB,QAAQ;AAE3D,SAASC,YAAY,QAAQ;AAE7B,OAAO,MAAMC,iBAAA,GAA8CA,CAAC;EAC1DC,QAAQ;EACRC,cAAc;EACdC,OAAO;EACPC,IAAI;EACJC,YAAY;EACZC,WAAW;EACXC,eAAe;EACfC,kBAAkB;EAClBC,aAAA,EAAeC,sBAAsB;EACrCC;AAAkB,CACnB;EACC;EACA;EACA;;EACA,MAAMC,MAAA,GAAS9B,SAAA;EACf,MAAM+B,eAAA,GAAkB9B,eAAA;EACxB,MAAM;IAAE+B;EAAoB,CAAE,GAAGnB,kBAAA;EACjC,MAAM,CAACoB,QAAA,EAAUC,WAAA,CAAY,GAAGxB,QAAA,CAAS;EAEzC,MAAMyB,YAAA,GAAe3B,OAAA,CACnB,MAAMM,iBAAA,CAAkBiB,eAAA,GACxB,CAACA,eAAA,CAAgB;EAGnB,MAAMK,UAAA,GAAa3B,MAAA,CAAO,CAAC;EAE3B2B,UAAA,CAAWC,OAAO,CAACJ,QAAQ,GAAGA,QAAA;EAE9B,MAAM;IAAEN;EAAa,CAAE,GAAGhB,oBAAA;EAE1B,MAAM,CAAC2B,YAAA,EAAcC,eAAA,CAAgB,GAAG7B,QAAA,CAAoB;IAC1D,IAAIgB,kBAAA,EAAoB;MACtB,OAAOS,YAAA;IACT,OAAO;MACL,OAAO;QACLK,KAAA,EAAOC,MAAA,CAAOlB,YAAA;QACdmB,IAAA,EAAMlB;MACR;IACF;EACF;EAEA,MAAMmB,UAAA,GAAarC,WAAA,CACjB,CAACsC,QAAA,GAAsB,CAAC,CAAC;IACvB,IAAIC,IAAA,GAAO,UAAUD,QAAA,GAAWA,QAAA,CAASC,IAAI,GAAGP,YAAA,EAAcO,IAAA;IAE9D,IAAI,WAAWD,QAAA,IAAY,YAAYA,QAAA,EAAU;MAC/CC,IAAA,GAAO;IACT;IAEA,MAAMC,WAAA,GAAyB;MAC7B,GAAGR,YAAY;MACf,GAAGM,QAAQ;MACXvB,OAAA,EAAS,aAAauB,QAAA,GAAWA,QAAA,CAASvB,OAAO,GAAGiB,YAAA,CAAajB,OAAO;MACxEmB,KAAA,EAAO,WAAWI,QAAA,GAAWA,QAAA,CAASJ,KAAK,GAAIF,YAAA,EAAcE,KAAA,IAASC,MAAA,CAAOlB,YAAA;MAC7EsB,IAAA;MACAE,MAAA,EAAQ,YAAYH,QAAA,GAAWA,QAAA,CAASG,MAAM,GAAGT,YAAA,EAAcS,MAAA;MAC/DC,MAAA,EAAQ,YAAYJ,QAAA,GAAWA,QAAA,CAASI,MAAM,GAAGV,YAAA,EAAcU,MAAA;MAC/DN,IAAA,EAAM,UAAUE,QAAA,GAAWA,QAAA,CAASF,IAAI,GAAIJ,YAAC,EAAcI,IAAA,IAAmBlB,WAAA;MAC9EyB,KAAA,EAAO,WAAWL,QAAA,GAAWA,QAAA,CAASK,KAAK,GAAGX,YAAA,EAAcW;IAC9D;IAEA,OAAOH,WAAA;EACT,GACA,CAACR,YAAA,EAAcf,YAAA,EAAcC,WAAA,CAAY;EAG3C,MAAM0B,cAAA,GAAiB5C,WAAA;EACrB;EACA,OAAO6C,aAAA,EAA0BlB,UAAA;IAC/B,IAAIA,UAAA,KAAamB,SAAA,EAAW;MAC1BlB,WAAA,CAAYD,UAAA;IACd,OAAO;MACLC,WAAA,CAAY;IACd;IAEA,MAAMU,UAAA,GAAWD,UAAA,CAAWQ,aAAA;IAE5B,IAAIzB,kBAAA,EAAoB;MACtBM,oBAAA,CAAqB,MACnBF,MAAA,CAAOuB,OAAO,CACZ,GAAGjD,EAAA,CAAGkD,SAAS,CAAC;QAAE,GAAGV,UAAQ;QAAEvB,OAAA,EAASkC,IAAA,CAAKD,SAAS,CAACV,UAAA,CAASvB,OAAO;MAAE,GAAG;QAAEmC,cAAA,EAAgB;MAAK,IAAI;IAG7G,OAAO,IACL,OAAO7B,aAAA,KAAkB,cACzB,OAAOC,sBAAA,KAA2B,YAClC;MACA,MAAM6B,UAAA,GAAa9B,aAAA,IAAiBC,sBAAA;MACpC6B,UAAA,CAAWb,UAAA;IACb;IAEAL,eAAA,CAAgBK,UAAA;EAClB,GACA,CACED,UAAA,EACAjB,kBAAA,EACAC,aAAA,EACAC,sBAAA,EACAI,oBAAA,EACAF,MAAA,CACD;EAGH,MAAM4B,gBAAA,GAAmBpD,WAAA,CACvB,MAAOqD,GAAA;IACL,MAAMT,cAAA,CAAe;MAAEL,IAAA,EAAMJ,MAAA,CAAOkB,GAAA;IAAK;EAC3C,GACA,CAACT,cAAA,CAAe;EAGlB,MAAMU,mBAAA,GAAsBvD,KAAA,CAAMC,WAAW,CAC3C,MAAOqD,KAAA;IACL,MAAMT,cAAA,CAAe;MAAEV,KAAA,EAAOC,MAAA,CAAOkB,KAAA;MAAMd,IAAA,EAAM;IAAI;EACvD,GACA,CAACK,cAAA,CAAe;EAGlB,MAAMW,kBAAA,GAAqBvD,WAAA,CACzB,MAAOqD,KAAA;IACL,MAAMX,MAAA,GAASW,KAAA,KAAQ,KAAKP,SAAA,GAAYO,KAAA;IACxC,MAAMT,cAAA,CAAe;MAAEF;IAAO;EAChC,GACA,CAACE,cAAA,CAAe;EAGlB,MAAMY,gBAAA,GAAmBxD,WAAA,CACvB,MAAOqD,KAAA;IACL,MAAMT,cAAA,CAAe;MAAER,IAAA,EAAMiB;IAAI;EACnC,GACA,CAACT,cAAA,CAAe;EAGlB,MAAMa,iBAAA,GAAoBzD,WAAA,CACxB,MAAOqD,KAAA;IACL,MAAMT,cAAA,CAAe;MAAED,KAAA,EAAOU;IAAI;EACpC,GACA,CAACT,cAAA,CAAe;EAGlB,MAAMc,SAAA,GAAYpD,cAAA,CAAe;IAC/B,IAAIqD,uBAAA,GAA0B;IAC9B,MAAMrB,UAAA,GAAW;MAAE,IAAIN,YAAA,IAAgB,CAAC,CAAC;IAAE;IAE3C;IACA,IAAIpC,QAAA,CAASqB,YAAA,KAAiB,EAAE,WAAWe,YAAW,GAAI;MACxDM,UAAA,CAASJ,KAAK,GAAGC,MAAA,CAAOlB,YAAA;MACxB0C,uBAAA,GAA0B;IAC5B;IAEA;IACA,IAAIzC,WAAA,IAAe,EAAE,UAAUc,YAAW,GAAI;MAC5CM,UAAA,CAASF,IAAI,GAAGlB,WAAA;MAChByC,uBAAA,GAA0B;IAC5B;IAEA;IACA;IACA,IAAI5C,OAAA,IAAWI,eAAA,EAAiBJ,OAAA,IAAW,EAAE,aAAaiB,YAAW,GAAI;MACvEM,UAAA,CAASvB,OAAO,GAAGlB,8BAAA,CAA+BkB,OAAA;MAClD4C,uBAAA,GAA0B;IAC5B;IAEA,IAAIA,uBAAA,EAAyB;MAC3B1B,eAAA,CAAgBK,UAAA;MAChB;MACAsB,MAAA,CAAOC,OAAO,CAACC,YAAY,CACzB,MACA,IACA,IAAIhE,EAAA,CAAGkD,SAAS,CAAC;QAAE,GAAGV,UAAQ;QAAEvB,OAAA,EAASkC,IAAA,CAAKD,SAAS,CAACV,UAAA,CAASvB,OAAO;MAAE,IAAI;IAElF;EACF;EAEA;EACA;EACAd,SAAA,CAAU;IACR,IAAImB,kBAAA,EAAoB;MACtBsC,SAAA;IACF;EACF,GAAG,CAACxC,WAAA,EAAaD,YAAA,EAAcG,kBAAA,EAAoBL,OAAA,CAAQ;EAE3D,oBACEgD,IAAA,CAACtD,gBAAA;IACCuD,KAAA,EAAO;MACLlD,cAAA;MACAE,IAAA;MACAoC,gBAAA;MACAE,mBAAA;MACAC,kBAAA;MACAC,gBAAA;MACAC,iBAAA;MACAlC,kBAAA;MACA0C,KAAA,EAAOjC,YAAA;MACPY,cAAA;MACAhB,WAAA;MAEA,GAAGE,UAAA,CAAWC;IAChB;cAEA,aAAAgC,IAAA,CAACrD,wBAAA;MAAyBsD,KAAA,EAAOrC,QAAA;gBAAWd;;;AAGlD","ignoreList":[]}
+{"version":3,"file":"index.js","names":["useRouter","useSearchParams","qs","React","useCallback","useEffect","useMemo","useRef","useState","useListDrawerContext","useEffectEvent","useRouteTransition","parseSearchParams","ListQueryContext","ListQueryModifiedContext","mergeQuery","sanitizeQuery","useListQuery","ListQueryProvider","children","collectionSlug","data","modifySearchParams","onQueryChange","onQueryChangeFromProps","orderableFieldName","query","queryFromProps","router","rawSearchParams","startRouteTransition","modified","setModified","searchParams","contextRef","current","currentQuery","setCurrentQuery","limit","sort","refineListData","incomingQuery","undefined","newQuery","defaults","replace","stringify","columns","JSON","addQueryPrefix","onChangeFn","handlePageChange","arg","page","handlePerPageChange","handleSearchChange","search","handleSortChange","handleWhereChange","where","mergeQueryFromPropsAndSyncToURL","window","location","history","replaceState","_jsx","value"],"sources":["../../../src/providers/ListQuery/index.tsx"],"sourcesContent":["'use client'\nimport { useRouter, useSearchParams } from 'next/navigation.js'\nimport { type ListQuery, type Where } from 'payload'\nimport * as qs from 'qs-esm'\nimport React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'\n\nimport type { IListQueryContext, ListQueryProps } from './types.js'\n\nimport { useListDrawerContext } from '../../elements/ListDrawer/Provider.js'\nimport { useEffectEvent } from '../../hooks/useEffectEvent.js'\nimport { useRouteTransition } from '../../providers/RouteTransition/index.js'\nimport { parseSearchParams } from '../../utilities/parseSearchParams.js'\nimport { ListQueryContext, ListQueryModifiedContext } from './context.js'\nimport { mergeQuery } from './mergeQuery.js'\nimport { sanitizeQuery } from './sanitizeQuery.js'\n\nexport { useListQuery } from './context.js'\n\nexport const ListQueryProvider: React.FC<ListQueryProps> = ({\n  children,\n  collectionSlug,\n  data,\n  modifySearchParams,\n  onQueryChange: onQueryChangeFromProps,\n  orderableFieldName,\n  query: queryFromProps,\n}) => {\n  // TODO: Investigate if this is still needed\n\n  'use no memo'\n  const router = useRouter()\n  const rawSearchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const [modified, setModified] = useState(false)\n\n  const searchParams = useMemo<ListQuery>(\n    () => sanitizeQuery(parseSearchParams(rawSearchParams)),\n    [rawSearchParams],\n  )\n\n  const contextRef = useRef({} as IListQueryContext)\n\n  contextRef.current.modified = modified\n\n  const { onQueryChange } = useListDrawerContext()\n\n  const [currentQuery, setCurrentQuery] = useState<ListQuery>(() => {\n    if (modifySearchParams) {\n      return searchParams\n    } else {\n      return {\n        limit: queryFromProps.limit,\n        sort: queryFromProps.sort,\n      }\n    }\n  })\n\n  const refineListData = useCallback(\n    // eslint-disable-next-line @typescript-eslint/require-await\n    async (incomingQuery: ListQuery, modified?: boolean) => {\n      if (modified !== undefined) {\n        setModified(modified)\n      } else {\n        setModified(true)\n      }\n\n      const newQuery = mergeQuery(currentQuery, incomingQuery, {\n        defaults: {\n          limit: queryFromProps.limit,\n          sort: queryFromProps.sort,\n        },\n      })\n\n      if (modifySearchParams) {\n        startRouteTransition(() =>\n          router.replace(\n            `${qs.stringify(\n              {\n                ...newQuery,\n                columns: JSON.stringify(newQuery.columns),\n              },\n              { addQueryPrefix: true },\n            )}`,\n          ),\n        )\n      } else if (\n        typeof onQueryChange === 'function' ||\n        typeof onQueryChangeFromProps === 'function'\n      ) {\n        const onChangeFn = onQueryChange || onQueryChangeFromProps\n        onChangeFn(newQuery)\n      }\n\n      setCurrentQuery(newQuery)\n    },\n    [\n      currentQuery,\n      queryFromProps.limit,\n      queryFromProps.sort,\n      modifySearchParams,\n      onQueryChange,\n      onQueryChangeFromProps,\n      startRouteTransition,\n      router,\n    ],\n  )\n\n  const handlePageChange = useCallback(\n    async (arg: number) => {\n      await refineListData({ page: arg })\n    },\n    [refineListData],\n  )\n\n  const handlePerPageChange = React.useCallback(\n    async (arg: number) => {\n      await refineListData({ limit: arg, page: 1 })\n    },\n    [refineListData],\n  )\n\n  const handleSearchChange = useCallback(\n    async (arg: string) => {\n      const search = arg === '' ? undefined : arg\n      await refineListData({ search })\n    },\n    [refineListData],\n  )\n\n  const handleSortChange = useCallback(\n    async (arg: string) => {\n      await refineListData({ sort: arg })\n    },\n    [refineListData],\n  )\n\n  const handleWhereChange = useCallback(\n    async (arg: Where) => {\n      await refineListData({ where: arg })\n    },\n    [refineListData],\n  )\n\n  const mergeQueryFromPropsAndSyncToURL = useEffectEvent(() => {\n    const newQuery = sanitizeQuery({ ...(currentQuery || {}), ...(queryFromProps || {}) })\n\n    const search = `?${qs.stringify({ ...newQuery, columns: JSON.stringify(newQuery.columns) })}`\n\n    if (window.location.search !== search) {\n      setCurrentQuery(newQuery)\n\n      // Important: do not use router.replace here to avoid re-rendering on initial load\n      window.history.replaceState(null, '', search)\n    }\n  })\n\n  // If `query` is updated externally, update the local state\n  // E.g. when HMR runs, these properties may be different\n  useEffect(() => {\n    if (modifySearchParams) {\n      mergeQueryFromPropsAndSyncToURL()\n    }\n  }, [modifySearchParams, queryFromProps])\n\n  return (\n    <ListQueryContext\n      value={{\n        collectionSlug,\n        data,\n        handlePageChange,\n        handlePerPageChange,\n        handleSearchChange,\n        handleSortChange,\n        handleWhereChange,\n        orderableFieldName,\n        query: currentQuery,\n        refineListData,\n        setModified,\n\n        ...contextRef.current,\n      }}\n    >\n      <ListQueryModifiedContext value={modified}>{children}</ListQueryModifiedContext>\n    </ListQueryContext>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/providers/ListQuery/mergeQuery.d.ts

@@ -0,0 +1,5 @@
+import type { ListQuery } from 'payload';
+export declare const mergeQuery: (currentQuery: ListQuery, newQuery: ListQuery, options?: {
+    defaults?: ListQuery;
+}) => ListQuery;
+//# sourceMappingURL=mergeQuery.d.ts.map

package/dist/providers/ListQuery/mergeQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeQuery.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/mergeQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,eAAO,MAAM,UAAU,iBACP,SAAS,YACb,SAAS,YACT;IACR,QAAQ,CAAC,EAAE,SAAS,CAAA;CACrB,KACA,SA2BF,CAAA"}

package/dist/providers/ListQuery/mergeQuery.js

@@ -0,0 +1,20 @@
+export const mergeQuery = (currentQuery, newQuery, options) => {
+  let page = 'page' in newQuery ? newQuery.page : currentQuery?.page;
+  if ('where' in newQuery || 'search' in newQuery) {
+    page = 1;
+  }
+  const mergedQuery = {
+    ...currentQuery,
+    ...newQuery,
+    columns: 'columns' in newQuery ? newQuery.columns : currentQuery.columns,
+    groupBy: 'groupBy' in newQuery ? newQuery.groupBy : currentQuery?.groupBy ?? options?.defaults?.groupBy,
+    limit: 'limit' in newQuery ? newQuery.limit : currentQuery?.limit ?? options?.defaults?.limit,
+    page,
+    preset: 'preset' in newQuery ? newQuery.preset : currentQuery?.preset,
+    search: 'search' in newQuery ? newQuery.search : currentQuery?.search,
+    sort: 'sort' in newQuery ? newQuery.sort : currentQuery?.sort ?? options?.defaults?.sort,
+    where: 'where' in newQuery ? newQuery.where : currentQuery?.where
+  };
+  return mergedQuery;
+};
+//# sourceMappingURL=mergeQuery.js.map

package/dist/providers/ListQuery/mergeQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeQuery.js","names":["mergeQuery","currentQuery","newQuery","options","page","mergedQuery","columns","groupBy","defaults","limit","preset","search","sort","where"],"sources":["../../../src/providers/ListQuery/mergeQuery.ts"],"sourcesContent":["import type { ListQuery } from 'payload'\n\nexport const mergeQuery = (\n  currentQuery: ListQuery,\n  newQuery: ListQuery,\n  options?: {\n    defaults?: ListQuery\n  },\n): ListQuery => {\n  let page = 'page' in newQuery ? newQuery.page : currentQuery?.page\n\n  if ('where' in newQuery || 'search' in newQuery) {\n    page = 1\n  }\n\n  const mergedQuery: ListQuery = {\n    ...currentQuery,\n    ...newQuery,\n    columns: 'columns' in newQuery ? newQuery.columns : currentQuery.columns,\n    groupBy:\n      'groupBy' in newQuery\n        ? newQuery.groupBy\n        : (currentQuery?.groupBy ?? options?.defaults?.groupBy),\n    limit: 'limit' in newQuery ? newQuery.limit : (currentQuery?.limit ?? options?.defaults?.limit),\n    page,\n    preset: 'preset' in newQuery ? newQuery.preset : currentQuery?.preset,\n    search: 'search' in newQuery ? newQuery.search : currentQuery?.search,\n    sort:\n      'sort' in newQuery\n        ? newQuery.sort\n        : ((currentQuery?.sort as string) ?? options?.defaults?.sort),\n    where: 'where' in newQuery ? newQuery.where : currentQuery?.where,\n  }\n\n  return mergedQuery\n}\n"],"mappings":"AAEA,OAAO,MAAMA,UAAA,GAAaA,CACxBC,YAAA,EACAC,QAAA,EACAC,OAAA;EAIA,IAAIC,IAAA,GAAO,UAAUF,QAAA,GAAWA,QAAA,CAASE,IAAI,GAAGH,YAAA,EAAcG,IAAA;EAE9D,IAAI,WAAWF,QAAA,IAAY,YAAYA,QAAA,EAAU;IAC/CE,IAAA,GAAO;EACT;EAEA,MAAMC,WAAA,GAAyB;IAC7B,GAAGJ,YAAY;IACf,GAAGC,QAAQ;IACXI,OAAA,EAAS,aAAaJ,QAAA,GAAWA,QAAA,CAASI,OAAO,GAAGL,YAAA,CAAaK,OAAO;IACxEC,OAAA,EACE,aAAaL,QAAA,GACTA,QAAA,CAASK,OAAO,GACfN,YAAA,EAAcM,OAAA,IAAWJ,OAAA,EAASK,QAAA,EAAUD,OAAA;IACnDE,KAAA,EAAO,WAAWP,QAAA,GAAWA,QAAA,CAASO,KAAK,GAAIR,YAAA,EAAcQ,KAAA,IAASN,OAAA,EAASK,QAAA,EAAUC,KAAA;IACzFL,IAAA;IACAM,MAAA,EAAQ,YAAYR,QAAA,GAAWA,QAAA,CAASQ,MAAM,GAAGT,YAAA,EAAcS,MAAA;IAC/DC,MAAA,EAAQ,YAAYT,QAAA,GAAWA,QAAA,CAASS,MAAM,GAAGV,YAAA,EAAcU,MAAA;IAC/DC,IAAA,EACE,UAAUV,QAAA,GACNA,QAAA,CAASU,IAAI,GACZX,YAAC,EAAcW,IAAA,IAAmBT,OAAA,EAASK,QAAA,EAAUI,IAAA;IAC5DC,KAAA,EAAO,WAAWX,QAAA,GAAWA,QAAA,CAASW,KAAK,GAAGZ,YAAA,EAAcY;EAC9D;EAEA,OAAOR,WAAA;AACT","ignoreList":[]}

package/dist/providers/ListQuery/sanitizeQuery.d.ts

@@ -0,0 +1,8 @@
+import type { ListQuery } from 'payload';
+/**
+ * Sanitize empty strings from the query, e.g. `?preset=`
+ * This is how we determine whether to clear user preferences for certain params
+ * Once cleared, they are no longer needed in the URL
+ */
+export declare const sanitizeQuery: (toSanitize: ListQuery) => ListQuery;
+//# sourceMappingURL=sanitizeQuery.d.ts.map

package/dist/providers/ListQuery/sanitizeQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeQuery.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/sanitizeQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAS,MAAM,SAAS,CAAA;AAE/C;;;;GAIG;AACH,eAAO,MAAM,aAAa,eAAgB,SAAS,KAAG,SA8BrD,CAAA"}

package/dist/providers/ListQuery/sanitizeQuery.js

@@ -0,0 +1,29 @@
+/**
+ * Sanitize empty strings from the query, e.g. `?preset=`
+ * This is how we determine whether to clear user preferences for certain params
+ * Once cleared, they are no longer needed in the URL
+ */export const sanitizeQuery = toSanitize => {
+  const sanitized = {
+    ...toSanitize
+  };
+  Object.entries(sanitized).forEach(([key, value]) => {
+    if (key === 'columns' && (value === '[]' || Array.isArray(sanitized[key]) && sanitized[key].length === 0)) {
+      delete sanitized[key];
+    }
+    if (key === 'where' && typeof value === 'object' && !Object.keys(value).length) {
+      delete sanitized[key];
+    }
+    if ((key === 'limit' || key === 'page') && typeof value === 'string') {
+      const parsed = parseInt(value, 10);
+      sanitized[key] = Number.isNaN(parsed) ? undefined : parsed;
+    }
+    if (key === 'page' && value === 0) {
+      delete sanitized[key];
+    }
+    if (value === '') {
+      delete sanitized[key];
+    }
+  });
+  return sanitized;
+};
+//# sourceMappingURL=sanitizeQuery.js.map

package/dist/providers/ListQuery/sanitizeQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeQuery.js","names":["sanitizeQuery","toSanitize","sanitized","Object","entries","forEach","key","value","Array","isArray","length","keys","parsed","parseInt","Number","isNaN","undefined"],"sources":["../../../src/providers/ListQuery/sanitizeQuery.ts"],"sourcesContent":["import type { ListQuery, Where } from 'payload'\n\n/**\n * Sanitize empty strings from the query, e.g. `?preset=`\n * This is how we determine whether to clear user preferences for certain params\n * Once cleared, they are no longer needed in the URL\n */\nexport const sanitizeQuery = (toSanitize: ListQuery): ListQuery => {\n  const sanitized = { ...toSanitize }\n\n  Object.entries(sanitized).forEach(([key, value]) => {\n    if (\n      key === 'columns' &&\n      (value === '[]' || (Array.isArray(sanitized[key]) && sanitized[key].length === 0))\n    ) {\n      delete sanitized[key]\n    }\n\n    if (key === 'where' && typeof value === 'object' && !Object.keys(value as Where).length) {\n      delete sanitized[key]\n    }\n\n    if ((key === 'limit' || key === 'page') && typeof value === 'string') {\n      const parsed = parseInt(value, 10)\n      sanitized[key] = Number.isNaN(parsed) ? undefined : parsed\n    }\n\n    if (key === 'page' && value === 0) {\n      delete sanitized[key]\n    }\n\n    if (value === '') {\n      delete sanitized[key]\n    }\n  })\n\n  return sanitized\n}\n"],"mappings":"AAEA;;;;GAKA,OAAO,MAAMA,aAAA,GAAiBC,UAAA;EAC5B,MAAMC,SAAA,GAAY;IAAE,GAAGD;EAAW;EAElCE,MAAA,CAAOC,OAAO,CAACF,SAAA,EAAWG,OAAO,CAAC,CAAC,CAACC,GAAA,EAAKC,KAAA,CAAM;IAC7C,IACED,GAAA,KAAQ,cACPC,KAAA,KAAU,QAASC,KAAA,CAAMC,OAAO,CAACP,SAAS,CAACI,GAAA,CAAI,KAAKJ,SAAS,CAACI,GAAA,CAAI,CAACI,MAAM,KAAK,CAAC,GAChF;MACA,OAAOR,SAAS,CAACI,GAAA,CAAI;IACvB;IAEA,IAAIA,GAAA,KAAQ,WAAW,OAAOC,KAAA,KAAU,YAAY,CAACJ,MAAA,CAAOQ,IAAI,CAACJ,KAAA,EAAgBG,MAAM,EAAE;MACvF,OAAOR,SAAS,CAACI,GAAA,CAAI;IACvB;IAEA,IAAI,CAACA,GAAA,KAAQ,WAAWA,GAAA,KAAQ,MAAK,KAAM,OAAOC,KAAA,KAAU,UAAU;MACpE,MAAMK,MAAA,GAASC,QAAA,CAASN,KAAA,EAAO;MAC/BL,SAAS,CAACI,GAAA,CAAI,GAAGQ,MAAA,CAAOC,KAAK,CAACH,MAAA,IAAUI,SAAA,GAAYJ,MAAA;IACtD;IAEA,IAAIN,GAAA,KAAQ,UAAUC,KAAA,KAAU,GAAG;MACjC,OAAOL,SAAS,CAACI,GAAA,CAAI;IACvB;IAEA,IAAIC,KAAA,KAAU,IAAI;MAChB,OAAOL,SAAS,CAACI,GAAA,CAAI;IACvB;EACF;EAEA,OAAOJ,SAAA;AACT","ignoreList":[]}

package/dist/providers/ListQuery/types.d.ts

@@ -1,4 +1,4 @@
-import type { ClientCollectionConfig, CollectionPreferences, ColumnPreference, ListQuery, PaginatedDocs, Sort, Where } from 'payload';
+import type { ClientCollectionConfig, ListQuery, PaginatedDocs, Sort, Where } from 'payload';
 type ContextHandlers = {
     handlePageChange?: (page: number) => Promise<void>;
     handlePerPageChange?: (limit: number) => Promise<void>;
@@ -10,11 +10,7 @@ export type OnListQueryChange = (query: ListQuery) => void;
 export type ListQueryProps = {
     readonly children: React.ReactNode;
     readonly collectionSlug?: ClientCollectionConfig['slug'];
-    readonly columns?: ColumnPreference[];
     readonly data: PaginatedDocs;
-    readonly defaultLimit?: number;
-    readonly defaultSort?: Sort;
-    readonly listPreferences?: CollectionPreferences;
     readonly modifySearchParams?: boolean;
     readonly onQueryChange?: OnListQueryChange;
     readonly orderableFieldName?: string;
@@ -22,6 +18,7 @@ export type ListQueryProps = {
      * @deprecated
      */
     readonly preferenceKey?: string;
+    query?: ListQuery;
 };
 export type IListQueryContext = {
     collectionSlug: ClientCollectionConfig['slug'];

package/dist/providers/ListQuery/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,SAAS,EACT,aAAa,EACb,IAAI,EACJ,KAAK,EACN,MAAM,SAAS,CAAA;AAEhB,KAAK,eAAe,GAAG;IACrB,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;AAE1D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IACrC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,CAAA;IAC3B,QAAQ,CAAC,eAAe,CAAC,EAAE,qBAAqB,CAAA;IAChD,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,EAAE,aAAa,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,SAAS,CAAA;IAChB,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;CACzC,GAAG,eAAe,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/providers/ListQuery/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EAEtB,SAAS,EACT,aAAa,EACb,IAAI,EACJ,KAAK,EACN,MAAM,SAAS,CAAA;AAEhB,KAAK,eAAe,GAAG;IACrB,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClD,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAA;AAE1D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACxD,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;IAC5B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,EAAE,aAAa,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,KAAK,EAAE,SAAS,CAAA;IAChB,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACzE,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;CACzC,GAAG,eAAe,CAAA"}

package/dist/providers/ListQuery/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/ListQuery/types.ts"],"sourcesContent":["import type {\n  ClientCollectionConfig,\n  CollectionPreferences,\n  ColumnPreference,\n  ListQuery,\n  PaginatedDocs,\n  Sort,\n  Where,\n} from 'payload'\n\ntype ContextHandlers = {\n  handlePageChange?: (page: number) => Promise<void>\n  handlePerPageChange?: (limit: number) => Promise<void>\n  handleSearchChange?: (search: string) => Promise<void>\n  handleSortChange?: (sort: string) => Promise<void>\n  handleWhereChange?: (where: Where) => Promise<void>\n}\n\nexport type OnListQueryChange = (query: ListQuery) => void\n\nexport type ListQueryProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug?: ClientCollectionConfig['slug']\n  readonly columns?: ColumnPreference[]\n  readonly data: PaginatedDocs\n  readonly defaultLimit?: number\n  readonly defaultSort?: Sort\n  readonly listPreferences?: CollectionPreferences\n  readonly modifySearchParams?: boolean\n  readonly onQueryChange?: OnListQueryChange\n  readonly orderableFieldName?: string\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n}\n\nexport type IListQueryContext = {\n  collectionSlug: ClientCollectionConfig['slug']\n  data: PaginatedDocs\n  defaultLimit?: number\n  defaultSort?: Sort\n  modified: boolean\n  orderableFieldName?: string\n  query: ListQuery\n  refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>\n  setModified: (modified: boolean) => void\n} & ContextHandlers\n"],"mappings":"AAqCA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/ListQuery/types.ts"],"sourcesContent":["import type {\n  ClientCollectionConfig,\n  ColumnPreference,\n  ListQuery,\n  PaginatedDocs,\n  Sort,\n  Where,\n} from 'payload'\n\ntype ContextHandlers = {\n  handlePageChange?: (page: number) => Promise<void>\n  handlePerPageChange?: (limit: number) => Promise<void>\n  handleSearchChange?: (search: string) => Promise<void>\n  handleSortChange?: (sort: string) => Promise<void>\n  handleWhereChange?: (where: Where) => Promise<void>\n}\n\nexport type OnListQueryChange = (query: ListQuery) => void\n\nexport type ListQueryProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug?: ClientCollectionConfig['slug']\n  readonly data: PaginatedDocs\n  readonly modifySearchParams?: boolean\n  readonly onQueryChange?: OnListQueryChange\n  readonly orderableFieldName?: string\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n  query?: ListQuery\n}\n\nexport type IListQueryContext = {\n  collectionSlug: ClientCollectionConfig['slug']\n  data: PaginatedDocs\n  defaultLimit?: number\n  defaultSort?: Sort\n  modified: boolean\n  orderableFieldName?: string\n  query: ListQuery\n  refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>\n  setModified: (modified: boolean) => void\n} & ContextHandlers\n"],"mappings":"AAiCA","ignoreList":[]}

package/dist/providers/TableColumns/buildColumnState/index.d.ts

@@ -4,7 +4,6 @@ import type { SortColumnProps } from '../../../elements/SortColumn/index.js';
 export type BuildColumnStateArgs = {
     beforeRows?: Column[];
     clientFields: ClientField[];
-    columnPreferences: CollectionPreferences['columns'];
     columns?: CollectionPreferences['columns'];
     customCellProps: DefaultCellComponentProps['customCellProps'];
     enableLinkedCell?: boolean;

package/dist/providers/TableColumns/buildColumnState/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAEV,WAAW,EACX,qBAAqB,EACrB,cAAc,EACd,MAAM,EACN,yBAAyB,EACzB,QAAQ,EACR,KAAK,EACL,aAAa,EACb,OAAO,EACP,yBAAyB,EAG1B,MAAM,SAAS,CAAA;AAUhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAA;AAY5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,YAAY,EAAE,WAAW,EAAE,CAAA;IAC3B,iBAAiB,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IACnD,OAAO,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAC1C,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,KAAK,EAAE,CAAA;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAC1C,UAAU,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;CAC7D,GAAG,CACA;IACE,cAAc,EAAE,cAAc,CAAA;IAC9B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAC5B,GACD;IACE,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE;QACJ,UAAU,EAAE,cAAc,CAAA;QAC1B,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;CACJ,CACJ,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,oBAAoB,KAAG,MAAM,EAwMnE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAEV,WAAW,EACX,qBAAqB,EACrB,cAAc,EACd,MAAM,EACN,yBAAyB,EACzB,QAAQ,EACR,KAAK,EACL,aAAa,EACb,OAAO,EACP,yBAAyB,EAG1B,MAAM,SAAS,CAAA;AAUhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAA;AAY5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,YAAY,EAAE,WAAW,EAAE,CAAA;IAC3B,OAAO,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAC1C,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,KAAK,EAAE,CAAA;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAC1C,UAAU,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;CAC7D,GAAG,CACA;IACE,cAAc,EAAE,cAAc,CAAA;IAC9B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CAC5B,GACD;IACE,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE;QACJ,UAAU,EAAE,cAAc,CAAA;QAC1B,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;CACJ,CACJ,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,oBAAoB,KAAG,MAAM,EAuMnE,CAAA"}

package/dist/providers/TableColumns/buildColumnState/index.js

@@ -12,7 +12,6 @@ export const buildColumnState = args => {
     beforeRows,
     clientFields,
     collectionSlug,
-    columnPreferences,
     columns,
     customCellProps,
     dataType,
@@ -39,7 +38,7 @@ export const buildColumnState = args => {
   ;
   // place the `ID` field first, if it exists
   // do the same for the `useAsTitle` field with precedence over the `ID` field
-  // then sort the rest of the fields based on the `defaultColumns` or `columnPreferences`
+  // then sort the rest of the fields based on the `defaultColumns` or `columns`
   const idFieldIndex = sortedFieldMap?.findIndex(field => fieldIsID(field));
   if (idFieldIndex > -1) {
     const idField = sortedFieldMap.splice(idFieldIndex, 1)[0];
@@ -50,9 +49,9 @@ export const buildColumnState = args => {
     const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0];
     sortedFieldMap.unshift(useAsTitleField);
   }
-  const sortTo = columnPreferences || columns;
+  const sortTo = columns;
   if (sortTo) {
-    // sort the fields to the order of `defaultColumns` or `columnPreferences`
+    // sort the fields to the order of `defaultColumns` or `columns`
     sortedFieldMap = sortFieldMap(sortedFieldMap, sortTo);
     _sortedFieldMap = sortFieldMap(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort
     ;
@@ -72,11 +71,11 @@ export const buildColumnState = args => {
       return acc // skip any group without a custom cell
       ;
     }
-    const columnPreference = columnPreferences?.find(preference => clientField && 'name' in clientField && preference.accessor === accessor);
+    const columnPref = columns?.find(preference => clientField && 'name' in clientField && preference.accessor === accessor);
     const isActive = isColumnActive({
       accessor,
       activeColumnsIndices,
-      columnPreference,
+      column: columnPref,
       columns
     });
     if (isActive && !activeColumnsIndices.includes(colIndex)) {

package/dist/providers/TableColumns/buildColumnState/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["fieldIsHiddenOrDisabled","fieldIsID","fieldIsPresentationalOnly","flattenTopLevelFields","React","RenderServerComponent","SortColumn","filterFields","isColumnActive","renderCell","sortFieldMap","buildColumnState","args","beforeRows","clientFields","collectionSlug","columnPreferences","columns","customCellProps","dataType","docs","enableLinkedCell","enableRowSelections","i18n","payload","serverFields","sortColumnProps","useAsTitle","sortedFieldMap","keepPresentationalFields","moveSubFieldsToTop","_sortedFieldMap","idFieldIndex","findIndex","field","idField","splice","unshift","useAsTitleFieldIndex","name","useAsTitleField","sortTo","activeColumnsIndices","sorted","reduce","acc","clientField","colIndex","accessor","undefined","serverField","find","f","fAccessor","hasCustomCell","admin","components","Cell","type","columnPreference","preference","isActive","includes","push","CustomLabel","CustomLabelToRender","Label","clientProps","customLabelServerProps","Component","importMap","serverProps","fieldAffectsDataSubFields","label","labelWithPrefix","dotAccessor","replace","Heading","_jsx","disable","column","active","renderedCells","map","doc","rowIndex","relationTo","columnIndex","value","isLinkedColumn"],"sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  ClientComponentProps,\n  ClientField,\n  CollectionPreferences,\n  CollectionSlug,\n  Column,\n  DefaultCellComponentProps,\n  Document,\n  Field,\n  PaginatedDocs,\n  Payload,\n  SanitizedCollectionConfig,\n  ServerComponentProps,\n  StaticLabel,\n} from 'payload'\n\nimport {\n  fieldIsHiddenOrDisabled,\n  fieldIsID,\n  fieldIsPresentationalOnly,\n  flattenTopLevelFields,\n} from 'payload/shared'\nimport React from 'react'\n\nimport type { SortColumnProps } from '../../../elements/SortColumn/index.js'\n\nimport { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js'\nimport {\n  SortColumn,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir -- MUST reference the exports dir: https://github.com/payloadcms/payload/issues/12002#issuecomment-2791493587\n} from '../../../exports/client/index.js'\nimport { filterFields } from './filterFields.js'\nimport { isColumnActive } from './isColumnActive.js'\nimport { renderCell } from './renderCell.js'\nimport { sortFieldMap } from './sortFieldMap.js'\n\nexport type BuildColumnStateArgs = {\n  beforeRows?: Column[]\n  clientFields: ClientField[]\n  columnPreferences: CollectionPreferences['columns']\n  columns?: CollectionPreferences['columns']\n  customCellProps: DefaultCellComponentProps['customCellProps']\n  enableLinkedCell?: boolean\n  enableRowSelections: boolean\n  enableRowTypes?: boolean\n  i18n: I18nClient\n  payload: Payload\n  serverFields: Field[]\n  sortColumnProps?: Partial<SortColumnProps>\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n} & (\n  | {\n      collectionSlug: CollectionSlug\n      dataType: 'monomorphic'\n      docs: PaginatedDocs['docs']\n    }\n  | {\n      collectionSlug?: undefined\n      dataType: 'polymorphic'\n      docs: {\n        relationTo: CollectionSlug\n        value: Document\n      }[]\n    }\n)\n\nexport const buildColumnState = (args: BuildColumnStateArgs): Column[] => {\n  const {\n    beforeRows,\n    clientFields,\n    collectionSlug,\n    columnPreferences,\n    columns,\n    customCellProps,\n    dataType,\n    docs,\n    enableLinkedCell = true,\n    enableRowSelections,\n    i18n,\n    payload,\n    serverFields,\n    sortColumnProps,\n    useAsTitle,\n  } = args\n\n  // clientFields contains the fake `id` column\n  let sortedFieldMap = flattenTopLevelFields(filterFields(clientFields), {\n    i18n,\n    keepPresentationalFields: true,\n    moveSubFieldsToTop: true,\n  }) as ClientField[]\n\n  let _sortedFieldMap = flattenTopLevelFields(filterFields(serverFields), {\n    i18n,\n    keepPresentationalFields: true,\n    moveSubFieldsToTop: true,\n  }) as Field[] // TODO: think of a way to avoid this additional flatten\n\n  // place the `ID` field first, if it exists\n  // do the same for the `useAsTitle` field with precedence over the `ID` field\n  // then sort the rest of the fields based on the `defaultColumns` or `columnPreferences`\n  const idFieldIndex = sortedFieldMap?.findIndex((field) => fieldIsID(field))\n\n  if (idFieldIndex > -1) {\n    const idField = sortedFieldMap.splice(idFieldIndex, 1)[0]\n    sortedFieldMap.unshift(idField)\n  }\n\n  const useAsTitleFieldIndex = useAsTitle\n    ? sortedFieldMap.findIndex((field) => 'name' in field && field.name === useAsTitle)\n    : -1\n\n  if (useAsTitleFieldIndex > -1) {\n    const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0]\n    sortedFieldMap.unshift(useAsTitleField)\n  }\n\n  const sortTo = columnPreferences || columns\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columnPreferences`\n    sortedFieldMap = sortFieldMap<ClientField>(sortedFieldMap, sortTo)\n    _sortedFieldMap = sortFieldMap<Field>(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted: Column[] = sortedFieldMap?.reduce((acc, clientField, colIndex) => {\n    if (fieldIsHiddenOrDisabled(clientField) && !fieldIsID(clientField)) {\n      return acc\n    }\n\n    const accessor =\n      (clientField as any).accessor ?? ('name' in clientField ? clientField.name : undefined)\n\n    const serverField = _sortedFieldMap.find((f) => {\n      const fAccessor = (f as any).accessor ?? ('name' in f ? f.name : undefined)\n      return fAccessor === accessor\n    })\n\n    const hasCustomCell =\n      serverField?.admin &&\n      'components' in serverField.admin &&\n      serverField.admin.components &&\n      'Cell' in serverField.admin.components &&\n      serverField.admin.components.Cell\n\n    if (serverField && serverField.type === 'group' && !hasCustomCell) {\n      return acc // skip any group without a custom cell\n    }\n\n    const columnPreference = columnPreferences?.find(\n      (preference) => clientField && 'name' in clientField && preference.accessor === accessor,\n    )\n\n    const isActive = isColumnActive({\n      accessor,\n      activeColumnsIndices,\n      columnPreference,\n      columns,\n    })\n\n    if (isActive && !activeColumnsIndices.includes(colIndex)) {\n      activeColumnsIndices.push(colIndex)\n    }\n\n    let CustomLabel = undefined\n\n    if (dataType === 'monomorphic') {\n      const CustomLabelToRender =\n        serverField &&\n        'admin' in serverField &&\n        'components' in serverField.admin &&\n        'Label' in serverField.admin.components &&\n        serverField.admin.components.Label !== undefined // let it return `null`\n          ? serverField.admin.components.Label\n          : undefined\n\n      // TODO: customComponent will be optional in v4\n      const clientProps: Omit<ClientComponentProps, 'customComponents'> = {\n        field: clientField,\n      }\n\n      const customLabelServerProps: Pick<\n        ServerComponentProps,\n        'clientField' | 'collectionSlug' | 'field' | 'i18n' | 'payload'\n      > = {\n        clientField,\n        collectionSlug,\n        field: serverField,\n        i18n,\n        payload,\n      }\n\n      CustomLabel = CustomLabelToRender\n        ? RenderServerComponent({\n            clientProps,\n            Component: CustomLabelToRender,\n            importMap: payload.importMap,\n            serverProps: customLabelServerProps,\n          })\n        : undefined\n    }\n\n    const fieldAffectsDataSubFields =\n      clientField &&\n      clientField.type &&\n      (clientField.type === 'array' ||\n        clientField.type === 'group' ||\n        clientField.type === 'blocks')\n\n    const label =\n      clientField && 'labelWithPrefix' in clientField && clientField.labelWithPrefix !== undefined\n        ? clientField.labelWithPrefix\n        : 'label' in clientField\n          ? clientField.label\n          : undefined\n\n    // Convert accessor to dot notation specifically for SortColumn sorting behavior\n    const dotAccessor = accessor?.replace(/-/g, '.')\n\n    const Heading = (\n      <SortColumn\n        disable={fieldAffectsDataSubFields || fieldIsPresentationalOnly(clientField) || undefined}\n        Label={CustomLabel}\n        label={label as StaticLabel}\n        name={dotAccessor}\n        {...(sortColumnProps || {})}\n      />\n    )\n\n    const column: Column = {\n      accessor,\n      active: isActive,\n      CustomLabel,\n      field: clientField,\n      Heading,\n      renderedCells: isActive\n        ? docs.map((doc, rowIndex) => {\n            return renderCell({\n              clientField,\n              collectionSlug: dataType === 'monomorphic' ? collectionSlug : doc.relationTo,\n              columnIndex: colIndex,\n              customCellProps,\n              doc: dataType === 'monomorphic' ? doc : doc.value,\n              enableRowSelections,\n              i18n,\n              isLinkedColumn: enableLinkedCell && colIndex === activeColumnsIndices[0],\n              payload,\n              rowIndex,\n              serverField,\n            })\n          })\n        : [],\n    }\n\n    acc.push(column)\n\n    return acc\n  }, [])\n\n  if (beforeRows) {\n    sorted.unshift(...beforeRows)\n  }\n\n  return sorted\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["fieldIsHiddenOrDisabled","fieldIsID","fieldIsPresentationalOnly","flattenTopLevelFields","React","RenderServerComponent","SortColumn","filterFields","isColumnActive","renderCell","sortFieldMap","buildColumnState","args","beforeRows","clientFields","collectionSlug","columns","customCellProps","dataType","docs","enableLinkedCell","enableRowSelections","i18n","payload","serverFields","sortColumnProps","useAsTitle","sortedFieldMap","keepPresentationalFields","moveSubFieldsToTop","_sortedFieldMap","idFieldIndex","findIndex","field","idField","splice","unshift","useAsTitleFieldIndex","name","useAsTitleField","sortTo","activeColumnsIndices","sorted","reduce","acc","clientField","colIndex","accessor","undefined","serverField","find","f","fAccessor","hasCustomCell","admin","components","Cell","type","columnPref","preference","isActive","column","includes","push","CustomLabel","CustomLabelToRender","Label","clientProps","customLabelServerProps","Component","importMap","serverProps","fieldAffectsDataSubFields","label","labelWithPrefix","dotAccessor","replace","Heading","_jsx","disable","active","renderedCells","map","doc","rowIndex","relationTo","columnIndex","value","isLinkedColumn"],"sources":["../../../../src/providers/TableColumns/buildColumnState/index.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  ClientComponentProps,\n  ClientField,\n  CollectionPreferences,\n  CollectionSlug,\n  Column,\n  DefaultCellComponentProps,\n  Document,\n  Field,\n  PaginatedDocs,\n  Payload,\n  SanitizedCollectionConfig,\n  ServerComponentProps,\n  StaticLabel,\n} from 'payload'\n\nimport {\n  fieldIsHiddenOrDisabled,\n  fieldIsID,\n  fieldIsPresentationalOnly,\n  flattenTopLevelFields,\n} from 'payload/shared'\nimport React from 'react'\n\nimport type { SortColumnProps } from '../../../elements/SortColumn/index.js'\n\nimport { RenderServerComponent } from '../../../elements/RenderServerComponent/index.js'\nimport {\n  SortColumn,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir -- MUST reference the exports dir: https://github.com/payloadcms/payload/issues/12002#issuecomment-2791493587\n} from '../../../exports/client/index.js'\nimport { filterFields } from './filterFields.js'\nimport { isColumnActive } from './isColumnActive.js'\nimport { renderCell } from './renderCell.js'\nimport { sortFieldMap } from './sortFieldMap.js'\n\nexport type BuildColumnStateArgs = {\n  beforeRows?: Column[]\n  clientFields: ClientField[]\n  columns?: CollectionPreferences['columns']\n  customCellProps: DefaultCellComponentProps['customCellProps']\n  enableLinkedCell?: boolean\n  enableRowSelections: boolean\n  enableRowTypes?: boolean\n  i18n: I18nClient\n  payload: Payload\n  serverFields: Field[]\n  sortColumnProps?: Partial<SortColumnProps>\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n} & (\n  | {\n      collectionSlug: CollectionSlug\n      dataType: 'monomorphic'\n      docs: PaginatedDocs['docs']\n    }\n  | {\n      collectionSlug?: undefined\n      dataType: 'polymorphic'\n      docs: {\n        relationTo: CollectionSlug\n        value: Document\n      }[]\n    }\n)\n\nexport const buildColumnState = (args: BuildColumnStateArgs): Column[] => {\n  const {\n    beforeRows,\n    clientFields,\n    collectionSlug,\n    columns,\n    customCellProps,\n    dataType,\n    docs,\n    enableLinkedCell = true,\n    enableRowSelections,\n    i18n,\n    payload,\n    serverFields,\n    sortColumnProps,\n    useAsTitle,\n  } = args\n\n  // clientFields contains the fake `id` column\n  let sortedFieldMap = flattenTopLevelFields(filterFields(clientFields), {\n    i18n,\n    keepPresentationalFields: true,\n    moveSubFieldsToTop: true,\n  }) as ClientField[]\n\n  let _sortedFieldMap = flattenTopLevelFields(filterFields(serverFields), {\n    i18n,\n    keepPresentationalFields: true,\n    moveSubFieldsToTop: true,\n  }) as Field[] // TODO: think of a way to avoid this additional flatten\n\n  // place the `ID` field first, if it exists\n  // do the same for the `useAsTitle` field with precedence over the `ID` field\n  // then sort the rest of the fields based on the `defaultColumns` or `columns`\n  const idFieldIndex = sortedFieldMap?.findIndex((field) => fieldIsID(field))\n\n  if (idFieldIndex > -1) {\n    const idField = sortedFieldMap.splice(idFieldIndex, 1)[0]\n    sortedFieldMap.unshift(idField)\n  }\n\n  const useAsTitleFieldIndex = useAsTitle\n    ? sortedFieldMap.findIndex((field) => 'name' in field && field.name === useAsTitle)\n    : -1\n\n  if (useAsTitleFieldIndex > -1) {\n    const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0]\n    sortedFieldMap.unshift(useAsTitleField)\n  }\n\n  const sortTo = columns\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columns`\n    sortedFieldMap = sortFieldMap<ClientField>(sortedFieldMap, sortTo)\n    _sortedFieldMap = sortFieldMap<Field>(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted: Column[] = sortedFieldMap?.reduce((acc, clientField, colIndex) => {\n    if (fieldIsHiddenOrDisabled(clientField) && !fieldIsID(clientField)) {\n      return acc\n    }\n\n    const accessor =\n      (clientField as any).accessor ?? ('name' in clientField ? clientField.name : undefined)\n\n    const serverField = _sortedFieldMap.find((f) => {\n      const fAccessor = (f as any).accessor ?? ('name' in f ? f.name : undefined)\n      return fAccessor === accessor\n    })\n\n    const hasCustomCell =\n      serverField?.admin &&\n      'components' in serverField.admin &&\n      serverField.admin.components &&\n      'Cell' in serverField.admin.components &&\n      serverField.admin.components.Cell\n\n    if (serverField && serverField.type === 'group' && !hasCustomCell) {\n      return acc // skip any group without a custom cell\n    }\n\n    const columnPref = columns?.find(\n      (preference) => clientField && 'name' in clientField && preference.accessor === accessor,\n    )\n\n    const isActive = isColumnActive({\n      accessor,\n      activeColumnsIndices,\n      column: columnPref,\n      columns,\n    })\n\n    if (isActive && !activeColumnsIndices.includes(colIndex)) {\n      activeColumnsIndices.push(colIndex)\n    }\n\n    let CustomLabel = undefined\n\n    if (dataType === 'monomorphic') {\n      const CustomLabelToRender =\n        serverField &&\n        'admin' in serverField &&\n        'components' in serverField.admin &&\n        'Label' in serverField.admin.components &&\n        serverField.admin.components.Label !== undefined // let it return `null`\n          ? serverField.admin.components.Label\n          : undefined\n\n      // TODO: customComponent will be optional in v4\n      const clientProps: Omit<ClientComponentProps, 'customComponents'> = {\n        field: clientField,\n      }\n\n      const customLabelServerProps: Pick<\n        ServerComponentProps,\n        'clientField' | 'collectionSlug' | 'field' | 'i18n' | 'payload'\n      > = {\n        clientField,\n        collectionSlug,\n        field: serverField,\n        i18n,\n        payload,\n      }\n\n      CustomLabel = CustomLabelToRender\n        ? RenderServerComponent({\n            clientProps,\n            Component: CustomLabelToRender,\n            importMap: payload.importMap,\n            serverProps: customLabelServerProps,\n          })\n        : undefined\n    }\n\n    const fieldAffectsDataSubFields =\n      clientField &&\n      clientField.type &&\n      (clientField.type === 'array' ||\n        clientField.type === 'group' ||\n        clientField.type === 'blocks')\n\n    const label =\n      clientField && 'labelWithPrefix' in clientField && clientField.labelWithPrefix !== undefined\n        ? clientField.labelWithPrefix\n        : 'label' in clientField\n          ? clientField.label\n          : undefined\n\n    // Convert accessor to dot notation specifically for SortColumn sorting behavior\n    const dotAccessor = accessor?.replace(/-/g, '.')\n\n    const Heading = (\n      <SortColumn\n        disable={fieldAffectsDataSubFields || fieldIsPresentationalOnly(clientField) || undefined}\n        Label={CustomLabel}\n        label={label as StaticLabel}\n        name={dotAccessor}\n        {...(sortColumnProps || {})}\n      />\n    )\n\n    const column: Column = {\n      accessor,\n      active: isActive,\n      CustomLabel,\n      field: clientField,\n      Heading,\n      renderedCells: isActive\n        ? docs.map((doc, rowIndex) => {\n            return renderCell({\n              clientField,\n              collectionSlug: dataType === 'monomorphic' ? collectionSlug : doc.relationTo,\n              columnIndex: colIndex,\n              customCellProps,\n              doc: dataType === 'monomorphic' ? doc : doc.value,\n              enableRowSelections,\n              i18n,\n              isLinkedColumn: enableLinkedCell && colIndex === activeColumnsIndices[0],\n              payload,\n              rowIndex,\n              serverField,\n            })\n          })\n        : [],\n    }\n\n    acc.push(column)\n\n    return acc\n  }, [])\n\n  if (beforeRows) {\n    sorted.unshift(...beforeRows)\n  }\n\n  return sorted\n}\n"],"mappings":";AAiBA,SACEA,uBAAuB,EACvBC,SAAS,EACTC,yBAAyB,EACzBC,qBAAqB,QAChB;AACP,OAAOC,KAAA,MAAW;AAIlB,SAASC,qBAAqB,QAAQ;AACtC,SACEC,UAAU,QAEL;AACP,SAASC,YAAY,QAAQ;AAC7B,SAASC,cAAc,QAAQ;AAC/B,SAASC,UAAU,QAAQ;AAC3B,SAASC,YAAY,QAAQ;AA+B7B,OAAO,MAAMC,gBAAA,GAAoBC,IAAA;EAC/B,MAAM;IACJC,UAAU;IACVC,YAAY;IACZC,cAAc;IACdC,OAAO;IACPC,eAAe;IACfC,QAAQ;IACRC,IAAI;IACJC,gBAAA,GAAmB,IAAI;IACvBC,mBAAmB;IACnBC,IAAI;IACJC,OAAO;IACPC,YAAY;IACZC,eAAe;IACfC;EAAU,CACX,GAAGd,IAAA;EAEJ;EACA,IAAIe,cAAA,GAAiBxB,qBAAA,CAAsBI,YAAA,CAAaO,YAAA,GAAe;IACrEQ,IAAA;IACAM,wBAAA,EAA0B;IAC1BC,kBAAA,EAAoB;EACtB;EAEA,IAAIC,eAAA,GAAkB3B,qBAAA,CAAsBI,YAAA,CAAaiB,YAAA,GAAe;IACtEF,IAAA;IACAM,wBAAA,EAA0B;IAC1BC,kBAAA,EAAoB;EACtB,EAAc;EAAA;EAEd;EACA;EACA;EACA,MAAME,YAAA,GAAeJ,cAAA,EAAgBK,SAAA,CAAWC,KAAA,IAAUhC,SAAA,CAAUgC,KAAA;EAEpE,IAAIF,YAAA,GAAe,CAAC,GAAG;IACrB,MAAMG,OAAA,GAAUP,cAAA,CAAeQ,MAAM,CAACJ,YAAA,EAAc,EAAE,CAAC,EAAE;IACzDJ,cAAA,CAAeS,OAAO,CAACF,OAAA;EACzB;EAEA,MAAMG,oBAAA,GAAuBX,UAAA,GACzBC,cAAA,CAAeK,SAAS,CAAEC,KAAA,IAAU,UAAUA,KAAA,IAASA,KAAA,CAAMK,IAAI,KAAKZ,UAAA,IACtE,CAAC;EAEL,IAAIW,oBAAA,GAAuB,CAAC,GAAG;IAC7B,MAAME,eAAA,GAAkBZ,cAAA,CAAeQ,MAAM,CAACE,oBAAA,EAAsB,EAAE,CAAC,EAAE;IACzEV,cAAA,CAAeS,OAAO,CAACG,eAAA;EACzB;EAEA,MAAMC,MAAA,GAASxB,OAAA;EAEf,IAAIwB,MAAA,EAAQ;IACV;IACAb,cAAA,GAAiBjB,YAAA,CAA0BiB,cAAA,EAAgBa,MAAA;IAC3DV,eAAA,GAAkBpB,YAAA,CAAoBoB,eAAA,EAAiBU,MAAA,EAAQ;IAAA;EACjE;EAEA,MAAMC,oBAAA,GAAuB,EAAE;EAE/B,MAAMC,MAAA,GAAmBf,cAAA,EAAgBgB,MAAA,CAAO,CAACC,GAAA,EAAKC,WAAA,EAAaC,QAAA;IACjE,IAAI9C,uBAAA,CAAwB6C,WAAA,KAAgB,CAAC5C,SAAA,CAAU4C,WAAA,GAAc;MACnE,OAAOD,GAAA;IACT;IAEA,MAAMG,QAAA,GACJF,WAAC,CAAoBE,QAAQ,KAAK,UAAUF,WAAA,GAAcA,WAAA,CAAYP,IAAI,GAAGU,SAAQ;IAEvF,MAAMC,WAAA,GAAcnB,eAAA,CAAgBoB,IAAI,CAAEC,CAAA;MACxC,MAAMC,SAAA,GAAYD,CAAC,CAAUJ,QAAQ,KAAK,UAAUI,CAAA,GAAIA,CAAA,CAAEb,IAAI,GAAGU,SAAQ;MACzE,OAAOI,SAAA,KAAcL,QAAA;IACvB;IAEA,MAAMM,aAAA,GACJJ,WAAA,EAAaK,KAAA,IACb,gBAAgBL,WAAA,CAAYK,KAAK,IACjCL,WAAA,CAAYK,KAAK,CAACC,UAAU,IAC5B,UAAUN,WAAA,CAAYK,KAAK,CAACC,UAAU,IACtCN,WAAA,CAAYK,KAAK,CAACC,UAAU,CAACC,IAAI;IAEnC,IAAIP,WAAA,IAAeA,WAAA,CAAYQ,IAAI,KAAK,WAAW,CAACJ,aAAA,EAAe;MACjE,OAAOT,GAAA,CAAI;MAAA;IACb;IAEA,MAAMc,UAAA,GAAa1C,OAAA,EAASkC,IAAA,CACzBS,UAAA,IAAed,WAAA,IAAe,UAAUA,WAAA,IAAec,UAAA,CAAWZ,QAAQ,KAAKA,QAAA;IAGlF,MAAMa,QAAA,GAAWpD,cAAA,CAAe;MAC9BuC,QAAA;MACAN,oBAAA;MACAoB,MAAA,EAAQH,UAAA;MACR1C;IACF;IAEA,IAAI4C,QAAA,IAAY,CAACnB,oBAAA,CAAqBqB,QAAQ,CAAChB,QAAA,GAAW;MACxDL,oBAAA,CAAqBsB,IAAI,CAACjB,QAAA;IAC5B;IAEA,IAAIkB,WAAA,GAAchB,SAAA;IAElB,IAAI9B,QAAA,KAAa,eAAe;MAC9B,MAAM+C,mBAAA,GACJhB,WAAA,IACA,WAAWA,WAAA,IACX,gBAAgBA,WAAA,CAAYK,KAAK,IACjC,WAAWL,WAAA,CAAYK,KAAK,CAACC,UAAU,IACvCN,WAAA,CAAYK,KAAK,CAACC,UAAU,CAACW,KAAK,KAAKlB,SAAA,CAAU;MAAA,EAC7CC,WAAA,CAAYK,KAAK,CAACC,UAAU,CAACW,KAAK,GAClClB,SAAA;MAEN;MACA,MAAMmB,WAAA,GAA8D;QAClElC,KAAA,EAAOY;MACT;MAEA,MAAMuB,sBAAA,GAGF;QACFvB,WAAA;QACA9B,cAAA;QACAkB,KAAA,EAAOgB,WAAA;QACP3B,IAAA;QACAC;MACF;MAEAyC,WAAA,GAAcC,mBAAA,GACV5D,qBAAA,CAAsB;QACpB8D,WAAA;QACAE,SAAA,EAAWJ,mBAAA;QACXK,SAAA,EAAW/C,OAAA,CAAQ+C,SAAS;QAC5BC,WAAA,EAAaH;MACf,KACApB,SAAA;IACN;IAEA,MAAMwB,yBAAA,GACJ3B,WAAA,IACAA,WAAA,CAAYY,IAAI,KACfZ,WAAA,CAAYY,IAAI,KAAK,WACpBZ,WAAA,CAAYY,IAAI,KAAK,WACrBZ,WAAA,CAAYY,IAAI,KAAK,QAAO;IAEhC,MAAMgB,KAAA,GACJ5B,WAAA,IAAe,qBAAqBA,WAAA,IAAeA,WAAA,CAAY6B,eAAe,KAAK1B,SAAA,GAC/EH,WAAA,CAAY6B,eAAe,GAC3B,WAAW7B,WAAA,GACTA,WAAA,CAAY4B,KAAK,GACjBzB,SAAA;IAER;IACA,MAAM2B,WAAA,GAAc5B,QAAA,EAAU6B,OAAA,CAAQ,MAAM;IAE5C,MAAMC,OAAA,gBACJC,IAAA,CAACxE,UAAA;MACCyE,OAAA,EAASP,yBAAA,IAA6BtE,yBAAA,CAA0B2C,WAAA,KAAgBG,SAAA;MAChFkB,KAAA,EAAOF,WAAA;MACPS,KAAA,EAAOA,KAAA;MACPnC,IAAA,EAAMqC,WAAA;MACL,IAAIlD,eAAA,IAAmB,CAAC,CAAC;;IAI9B,MAAMoC,MAAA,GAAiB;MACrBd,QAAA;MACAiC,MAAA,EAAQpB,QAAA;MACRI,WAAA;MACA/B,KAAA,EAAOY,WAAA;MACPgC,OAAA;MACAI,aAAA,EAAerB,QAAA,GACXzC,IAAA,CAAK+D,GAAG,CAAC,CAACC,GAAA,EAAKC,QAAA;QACb,OAAO3E,UAAA,CAAW;UAChBoC,WAAA;UACA9B,cAAA,EAAgBG,QAAA,KAAa,gBAAgBH,cAAA,GAAiBoE,GAAA,CAAIE,UAAU;UAC5EC,WAAA,EAAaxC,QAAA;UACb7B,eAAA;UACAkE,GAAA,EAAKjE,QAAA,KAAa,gBAAgBiE,GAAA,GAAMA,GAAA,CAAII,KAAK;UACjDlE,mBAAA;UACAC,IAAA;UACAkE,cAAA,EAAgBpE,gBAAA,IAAoB0B,QAAA,KAAaL,oBAAoB,CAAC,EAAE;UACxElB,OAAA;UACA6D,QAAA;UACAnC;QACF;MACF,KACA;IACN;IAEAL,GAAA,CAAImB,IAAI,CAACF,MAAA;IAET,OAAOjB,GAAA;EACT,GAAG,EAAE;EAEL,IAAI/B,UAAA,EAAY;IACd6B,MAAA,CAAON,OAAO,IAAIvB,UAAA;EACpB;EAEA,OAAO6B,MAAA;AACT","ignoreList":[]}

package/dist/providers/TableColumns/buildColumnState/isColumnActive.d.ts

@@ -1,8 +1,8 @@
 import type { ColumnPreference } from 'payload';
-export declare function isColumnActive({ accessor, activeColumnsIndices, columnPreference, columns, }: {
+export declare function isColumnActive({ accessor, activeColumnsIndices, column, columns, }: {
     accessor: string;
     activeColumnsIndices: number[];
-    columnPreference: ColumnPreference;
+    column: ColumnPreference;
     columns: ColumnPreference[];
 }): boolean;
 //# sourceMappingURL=isColumnActive.d.ts.map

package/dist/providers/TableColumns/buildColumnState/isColumnActive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isColumnActive.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/isColumnActive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,oBAAoB,EACpB,gBAAgB,EAChB,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,EAAE,CAAA;IAC9B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC5B,WAUA"}
+{"version":3,"file":"isColumnActive.d.ts","sourceRoot":"","sources":["../../../../src/providers/TableColumns/buildColumnState/isColumnActive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,EAAE,CAAA;IAC9B,MAAM,EAAE,gBAAgB,CAAA;IACxB,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC5B,WAUA"}

package/dist/providers/TableColumns/buildColumnState/isColumnActive.js

@@ -1,13 +1,13 @@
 export function isColumnActive({
   accessor,
   activeColumnsIndices,
-  columnPreference,
+  column,
   columns
 }) {
-  if (columnPreference) {
-    return columnPreference.active;
+  if (column) {
+    return column.active;
   } else if (columns && Array.isArray(columns) && columns.length > 0) {
-    return Boolean(columns.find(column => column.accessor === accessor)?.active);
+    return Boolean(columns.find(col => col.accessor === accessor)?.active);
   } else if (activeColumnsIndices.length < 4) {
     return true;
   }

package/dist/providers/TableColumns/buildColumnState/isColumnActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isColumnActive.js","names":["isColumnActive","accessor","activeColumnsIndices","columnPreference","columns","active","Array","isArray","length","Boolean","find","column"],"sources":["../../../../src/providers/TableColumns/buildColumnState/isColumnActive.ts"],"sourcesContent":["import type { ColumnPreference } from 'payload'\n\nexport function isColumnActive({\n  accessor,\n  activeColumnsIndices,\n  columnPreference,\n  columns,\n}: {\n  accessor: string\n  activeColumnsIndices: number[]\n  columnPreference: ColumnPreference\n  columns: ColumnPreference[]\n}) {\n  if (columnPreference) {\n    return columnPreference.active\n  } else if (columns && Array.isArray(columns) && columns.length > 0) {\n    return Boolean(columns.find((column) => column.accessor === accessor)?.active)\n  } else if (activeColumnsIndices.length < 4) {\n    return true\n  }\n\n  return false\n}\n"],"mappings":"AAEA,OAAO,SAASA,eAAe;EAC7BC,QAAQ;EACRC,oBAAoB;EACpBC,gBAAgB;EAChBC;AAAO,CAMR;EACC,IAAID,gBAAA,EAAkB;IACpB,OAAOA,gBAAA,CAAiBE,MAAM;EAChC,OAAO,IAAID,OAAA,IAAWE,KAAA,CAAMC,OAAO,CAACH,OAAA,KAAYA,OAAA,CAAQI,MAAM,GAAG,GAAG;IAClE,OAAOC,OAAA,CAAQL,OAAA,CAAQM,IAAI,CAAEC,MAAA,IAAWA,MAAA,CAAOV,QAAQ,KAAKA,QAAA,GAAWI,MAAA;EACzE,OAAO,IAAIH,oBAAA,CAAqBM,MAAM,GAAG,GAAG;IAC1C,OAAO;EACT;EAEA,OAAO;AACT","ignoreList":[]}
+{"version":3,"file":"isColumnActive.js","names":["isColumnActive","accessor","activeColumnsIndices","column","columns","active","Array","isArray","length","Boolean","find","col"],"sources":["../../../../src/providers/TableColumns/buildColumnState/isColumnActive.ts"],"sourcesContent":["import type { ColumnPreference } from 'payload'\n\nexport function isColumnActive({\n  accessor,\n  activeColumnsIndices,\n  column,\n  columns,\n}: {\n  accessor: string\n  activeColumnsIndices: number[]\n  column: ColumnPreference\n  columns: ColumnPreference[]\n}) {\n  if (column) {\n    return column.active\n  } else if (columns && Array.isArray(columns) && columns.length > 0) {\n    return Boolean(columns.find((col) => col.accessor === accessor)?.active)\n  } else if (activeColumnsIndices.length < 4) {\n    return true\n  }\n\n  return false\n}\n"],"mappings":"AAEA,OAAO,SAASA,eAAe;EAC7BC,QAAQ;EACRC,oBAAoB;EACpBC,MAAM;EACNC;AAAO,CAMR;EACC,IAAID,MAAA,EAAQ;IACV,OAAOA,MAAA,CAAOE,MAAM;EACtB,OAAO,IAAID,OAAA,IAAWE,KAAA,CAAMC,OAAO,CAACH,OAAA,KAAYA,OAAA,CAAQI,MAAM,GAAG,GAAG;IAClE,OAAOC,OAAA,CAAQL,OAAA,CAAQM,IAAI,CAAEC,GAAA,IAAQA,GAAA,CAAIV,QAAQ,KAAKA,QAAA,GAAWI,MAAA;EACnE,OAAO,IAAIH,oBAAA,CAAqBM,MAAM,GAAG,GAAG;IAC1C,OAAO;EACT;EAEA,OAAO;AACT","ignoreList":[]}

package/dist/utilities/buildTableState.js

@@ -149,10 +149,10 @@ const buildTableState = async args => {
         collection: collectionSlug,
         depth: 0,
         draft: true,
-        limit: query?.limit ? parseInt(query.limit, 10) : undefined,
+        limit: query?.limit,
         locale: req.locale,
         overrideAccess: false,
-        page: query?.page ? parseInt(query.page, 10) : undefined,
+        page: query?.page,
         sort: query?.sort,
         user: req.user,
         where: query?.where
@@ -168,7 +168,6 @@ const buildTableState = async args => {
     clientConfig,
     collectionConfig,
     collections: Array.isArray(collectionSlug) ? collectionSlug : undefined,
-    columnPreferences: Array.isArray(collectionSlug) ? collectionPreferences?.columns : undefined,
     columns,
     docs,
     enableRowSelections,