@payloadcms/ui 4.0.0-internal.d28e9fb → 4.0.0-internal.d7d662c

package/dist/providers/ListQuery/index.js

@@ -1,15 +1,15 @@
 'use client';
 
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useRouter, useSearchParams } from 'next/navigation.js';
-import * as qs from 'qs-esm';
+import { transformWhereQuery, validateWhereQuery } from 'payload/shared';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useListDrawerContext } from '../../elements/ListDrawer/Provider.js';
 import { useEffectEvent } from '../../hooks/useEffectEvent.js';
 import { useRouteTransition } from '../../providers/RouteTransition/index.js';
 import { parseSearchParams } from '../../utilities/parseSearchParams.js';
-import { useConfig } from '../Config/index.js';
+import { useRouter, useSearchParams } from '../RouterAdapter/index.js';
 import { ListQueryContext, ListQueryModifiedContext } from './context.js';
+import { getSearchWithListQuery } from './getSearchWithListQuery.js';
 import { mergeQuery } from './mergeQuery.js';
 import { sanitizeQuery } from './sanitizeQuery.js';
 export { useListQuery } from './context.js';
@@ -31,12 +31,6 @@ export const ListQueryProvider = ({
     startRouteTransition
   } = useRouteTransition();
   const [modified, setModified] = useState(false);
-  const {
-    getEntityConfig
-  } = useConfig();
-  const collectionConfig = getEntityConfig({
-    collectionSlug
-  });
   const contextRef = useRef({});
   contextRef.current.modified = modified;
   const {
@@ -46,7 +40,7 @@ export const ListQueryProvider = ({
   const queryFromURL = useMemo(() => sanitizeQuery(parseSearchParams(rawSearchParams)), [rawSearchParams]);
   const [query, setQuery] = useState(() => {
     if (modifySearchParams) {
-      return queryFromURL;
+      return queryFromProps ? sanitizeQuery(queryFromProps) : queryFromURL;
     } else {
       return {
         limit: queryFromProps.limit,
@@ -54,9 +48,8 @@ export const ListQueryProvider = ({
       };
     }
   });
-  const refineListData = useCallback(
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async (incomingQuery, modified_0) => {
+  const [searchInput, setSearchInput] = useState(query?.search || '');
+  const refineListData = useCallback(async (incomingQuery, modified_0) => {
     setModified(modified_0 ?? true);
     const newQuery = mergeQuery(query, incomingQuery, {
       defaults: {
@@ -64,19 +57,23 @@ export const ListQueryProvider = ({
         sort: queryFromProps.sort
       }
     });
+    let pendingUpdate = undefined;
     if (modifySearchParams) {
-      const search = `?${qs.stringify({
-        ...newQuery,
-        columns: JSON.stringify(newQuery.columns),
-        queryByGroup: JSON.stringify(newQuery.queryByGroup)
-      })}`;
+      const search = getSearchWithListQuery({
+        currentSearch: window.location.search,
+        query: newQuery,
+        updatedQuery: incomingQuery
+      });
       if (window.location.search !== search) {
-        startRouteTransition(() => router.replace(search));
+        pendingUpdate = startRouteTransition(() => router.replace(search, {
+          scroll: false
+        }));
       }
     } else if (typeof onQueryChange === 'function') {
-      onQueryChange(newQuery);
+      pendingUpdate = onQueryChange(newQuery);
     }
     setQuery(newQuery);
+    await pendingUpdate;
   }, [query, queryFromProps.limit, queryFromProps.sort, modifySearchParams, onQueryChange, startRouteTransition, router]);
   const handlePageChange = useCallback(async arg => {
     await refineListData({
@@ -116,15 +113,21 @@ export const ListQueryProvider = ({
       ...(query || {}),
       ...(queryFromProps || {})
     });
-    const search_1 = `?${qs.stringify({
-      ...newQuery_0,
-      columns: JSON.stringify(newQuery_0.columns),
-      queryByGroup: JSON.stringify(newQuery_0.queryByGroup)
-    })}`;
+    const search_1 = getSearchWithListQuery({
+      currentSearch: window.location.search,
+      query: newQuery_0
+    });
     if (window.location.search !== search_1) {
       setQuery(newQuery_0);
       // Important: do not use router.replace here to avoid re-rendering.
-      window.history.replaceState(null, '', search_1);
+      // Go through the adapter's replaceState so routers that observe history
+      // mutations (e.g. TanStack) don't re-run their loader and double-load the
+      // view. Falls back to the native call for adapters that don't implement it.
+      if (router.replaceState) {
+        router.replaceState(search_1);
+      } else {
+        window.history.replaceState(null, '', search_1);
+      }
     }
   });
   // If `query` is updated externally, update the local state
@@ -134,6 +137,26 @@ export const ListQueryProvider = ({
       syncPropsToURL();
     }
   }, [modifySearchParams, queryFromProps]);
+  const hasActiveFilters = useMemo(() => {
+    if (!query?.where) {
+      return false;
+    }
+    // Normalize flat/invalid where queries (e.g. `{ title: { equals } }`) into the
+    // `or/and` structure so they are detected the same way the WhereBuilder reads them.
+    const normalizedWhere = validateWhereQuery(query.where) ? query.where : transformWhereQuery(query.where);
+    return (normalizedWhere.or ?? []).some(orGroup => (orGroup.and ?? []).some(andGroup => {
+      const field = Object.keys(andGroup)[0];
+      if (!field) {
+        return false;
+      }
+      const operatorObj = andGroup[field];
+      if (!operatorObj || typeof operatorObj !== 'object') {
+        return false;
+      }
+      const operator = Object.keys(operatorObj)[0];
+      return Boolean(operator) && operatorObj[operator] !== undefined;
+    }));
+  }, [query?.where]);
   return /*#__PURE__*/_jsx(ListQueryContext, {
     value: {
       collectionSlug,
@@ -144,11 +167,16 @@ export const ListQueryProvider = ({
       handleSearchChange,
       handleSortChange,
       handleWhereChange,
-      isGroupingBy: Boolean(collectionConfig?.admin?.groupBy && query?.groupBy),
+      hasActiveFilters,
+      isGroupingBy: Boolean(query?.groupBy),
       orderableFieldName,
       query,
       refineListData,
+      resolvedGroupBy: queryFromProps?.groupBy,
+      resolvedSearch: queryFromProps?.search,
+      searchInput,
       setModified,
+      setSearchInput,
       ...contextRef.current
     },
     children: /*#__PURE__*/_jsx(ListQueryModifiedContext, {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["useRouter","useSearchParams","qs","React","useCallback","useEffect","useMemo","useRef","useState","useListDrawerContext","useEffectEvent","useRouteTransition","parseSearchParams","useConfig","ListQueryContext","ListQueryModifiedContext","mergeQuery","sanitizeQuery","useListQuery","ListQueryProvider","children","collectionSlug","data","modifySearchParams","onQueryChange","onQueryChangeFromProps","orderableFieldName","query","queryFromProps","router","rawSearchParams","startRouteTransition","modified","setModified","getEntityConfig","collectionConfig","contextRef","current","onQueryChangeFromContext","queryFromURL","setQuery","limit","sort","refineListData","incomingQuery","newQuery","defaults","search","stringify","columns","JSON","queryByGroup","window","location","replace","handlePageChange","arg","page","handlePerPageChange","handleSearchChange","undefined","handleSortChange","handleWhereChange","where","syncPropsToURL","history","replaceState","_jsx","value","defaultLimit","isGroupingBy","Boolean","admin","groupBy"],"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 { useConfig } from '../Config/index.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  'use no memo'\n\n  const router = useRouter()\n  const rawSearchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const [modified, setModified] = useState(false)\n  const { getEntityConfig } = useConfig()\n  const collectionConfig = getEntityConfig({ collectionSlug })\n\n  const contextRef = useRef({} as IListQueryContext)\n  contextRef.current.modified = modified\n\n  const { onQueryChange: onQueryChangeFromContext } = useListDrawerContext()\n  const onQueryChange = onQueryChangeFromContext || onQueryChangeFromProps\n\n  const queryFromURL = useMemo<ListQuery>(\n    () => sanitizeQuery(parseSearchParams(rawSearchParams)),\n    [rawSearchParams],\n  )\n\n  const [query, setQuery] = useState<ListQuery>(() => {\n    if (modifySearchParams) {\n      return queryFromURL\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      setModified(modified ?? true)\n\n      const newQuery = mergeQuery(query, incomingQuery, {\n        defaults: {\n          limit: queryFromProps.limit,\n          sort: queryFromProps.sort,\n        },\n      })\n\n      if (modifySearchParams) {\n        const search = `?${qs.stringify({\n          ...newQuery,\n          columns: JSON.stringify(newQuery.columns),\n          queryByGroup: JSON.stringify(newQuery.queryByGroup),\n        })}`\n        if (window.location.search !== search) {\n          startRouteTransition(() => router.replace(search))\n        }\n      } else if (typeof onQueryChange === 'function') {\n        onQueryChange(newQuery)\n      }\n\n      setQuery(newQuery)\n    },\n    [\n      query,\n      queryFromProps.limit,\n      queryFromProps.sort,\n      modifySearchParams,\n      onQueryChange,\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 (sort: string) => {\n      await refineListData({ sort })\n    },\n    [refineListData],\n  )\n\n  const handleWhereChange = useCallback(\n    async (where: Where) => {\n      await refineListData({ where })\n    },\n    [refineListData],\n  )\n\n  /**\n   * The server component may pass props to this client component, e.g. from\n   * fetching the query from preferences.\n   * This effect is responsible for syncing the props back to the URL, without\n   * triggering a re-render.\n   */\n  const syncPropsToURL = useEffectEvent(() => {\n    const newQuery = sanitizeQuery({ ...(query || {}), ...(queryFromProps || {}) })\n\n    const search = `?${qs.stringify({\n      ...newQuery,\n      columns: JSON.stringify(newQuery.columns),\n      queryByGroup: JSON.stringify(newQuery.queryByGroup),\n    })}`\n\n    if (window.location.search !== search) {\n      setQuery(newQuery)\n      // Important: do not use router.replace here to avoid re-rendering.\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 && queryFromProps) {\n      syncPropsToURL()\n    }\n  }, [modifySearchParams, queryFromProps])\n\n  return (\n    <ListQueryContext\n      value={{\n        collectionSlug,\n        data,\n        defaultLimit: data?.limit,\n        handlePageChange,\n        handlePerPageChange,\n        handleSearchChange,\n        handleSortChange,\n        handleWhereChange,\n        isGroupingBy: Boolean(collectionConfig?.admin?.groupBy && query?.groupBy),\n        orderableFieldName,\n        query,\n        refineListData,\n        setModified,\n        ...contextRef.current,\n      }}\n    >\n      <ListQueryModifiedContext value={modified}>{children}</ListQueryModifiedContext>\n    </ListQueryContext>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["transformWhereQuery","validateWhereQuery","React","useCallback","useEffect","useMemo","useRef","useState","useListDrawerContext","useEffectEvent","useRouteTransition","parseSearchParams","useRouter","useSearchParams","ListQueryContext","ListQueryModifiedContext","getSearchWithListQuery","mergeQuery","sanitizeQuery","useListQuery","ListQueryProvider","children","collectionSlug","data","modifySearchParams","onQueryChange","onQueryChangeFromProps","orderableFieldName","query","queryFromProps","router","rawSearchParams","startRouteTransition","modified","setModified","contextRef","current","onQueryChangeFromContext","queryFromURL","setQuery","limit","sort","searchInput","setSearchInput","search","refineListData","incomingQuery","newQuery","defaults","pendingUpdate","undefined","currentSearch","window","location","updatedQuery","replace","scroll","handlePageChange","arg","page","handlePerPageChange","handleSearchChange","handleSortChange","handleWhereChange","where","syncPropsToURL","replaceState","history","hasActiveFilters","normalizedWhere","or","some","orGroup","and","andGroup","field","Object","keys","operatorObj","operator","Boolean","_jsx","value","defaultLimit","isGroupingBy","groupBy","resolvedGroupBy","resolvedSearch"],"sources":["../../../src/providers/ListQuery/index.tsx"],"sourcesContent":["'use client'\nimport { type ListQuery, type Where } from 'payload'\nimport { transformWhereQuery, validateWhereQuery } from 'payload/shared'\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 { useRouter, useSearchParams } from '../RouterAdapter/index.js'\nimport { ListQueryContext, ListQueryModifiedContext } from './context.js'\nimport { getSearchWithListQuery } from './getSearchWithListQuery.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  'use no memo'\n\n  const router = useRouter()\n  const rawSearchParams = useSearchParams()\n  const { startRouteTransition } = useRouteTransition()\n  const [modified, setModified] = useState(false)\n  const contextRef = useRef({} as IListQueryContext)\n  contextRef.current.modified = modified\n\n  const { onQueryChange: onQueryChangeFromContext } = useListDrawerContext()\n  const onQueryChange = onQueryChangeFromContext || onQueryChangeFromProps\n\n  const queryFromURL = useMemo<ListQuery>(\n    () => sanitizeQuery(parseSearchParams(rawSearchParams)),\n    [rawSearchParams],\n  )\n\n  const [query, setQuery] = useState<ListQuery>(() => {\n    if (modifySearchParams) {\n      return queryFromProps ? sanitizeQuery(queryFromProps) : queryFromURL\n    } else {\n      return {\n        limit: queryFromProps.limit,\n        sort: queryFromProps.sort,\n      }\n    }\n  })\n\n  const [searchInput, setSearchInput] = useState(query?.search || '')\n\n  const refineListData = useCallback(\n    async (incomingQuery: ListQuery, modified?: boolean) => {\n      setModified(modified ?? true)\n\n      const newQuery = mergeQuery(query, incomingQuery, {\n        defaults: {\n          limit: queryFromProps.limit,\n          sort: queryFromProps.sort,\n        },\n      })\n\n      let pendingUpdate: Promise<unknown> | void = undefined\n\n      if (modifySearchParams) {\n        const search = getSearchWithListQuery({\n          currentSearch: window.location.search,\n          query: newQuery,\n          updatedQuery: incomingQuery,\n        })\n        if (window.location.search !== search) {\n          pendingUpdate = startRouteTransition(() => router.replace(search, { scroll: false }))\n        }\n      } else if (typeof onQueryChange === 'function') {\n        pendingUpdate = onQueryChange(newQuery)\n      }\n\n      setQuery(newQuery)\n      await pendingUpdate\n    },\n    [\n      query,\n      queryFromProps.limit,\n      queryFromProps.sort,\n      modifySearchParams,\n      onQueryChange,\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 (sort: string) => {\n      await refineListData({ sort })\n    },\n    [refineListData],\n  )\n\n  const handleWhereChange = useCallback(\n    async (where: Where) => {\n      await refineListData({ where })\n    },\n    [refineListData],\n  )\n\n  /**\n   * The server component may pass props to this client component, e.g. from\n   * fetching the query from preferences.\n   * This effect is responsible for syncing the props back to the URL, without\n   * triggering a re-render.\n   */\n  const syncPropsToURL = useEffectEvent(() => {\n    const newQuery = sanitizeQuery({ ...(query || {}), ...(queryFromProps || {}) })\n\n    const search = getSearchWithListQuery({\n      currentSearch: window.location.search,\n      query: newQuery,\n    })\n\n    if (window.location.search !== search) {\n      setQuery(newQuery)\n      // Important: do not use router.replace here to avoid re-rendering.\n      // Go through the adapter's replaceState so routers that observe history\n      // mutations (e.g. TanStack) don't re-run their loader and double-load the\n      // view. Falls back to the native call for adapters that don't implement it.\n      if (router.replaceState) {\n        router.replaceState(search)\n      } else {\n        window.history.replaceState(null, '', search)\n      }\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 && queryFromProps) {\n      syncPropsToURL()\n    }\n  }, [modifySearchParams, queryFromProps])\n\n  const hasActiveFilters = useMemo(() => {\n    if (!query?.where) {\n      return false\n    }\n\n    // Normalize flat/invalid where queries (e.g. `{ title: { equals } }`) into the\n    // `or/and` structure so they are detected the same way the WhereBuilder reads them.\n    const normalizedWhere = validateWhereQuery(query.where)\n      ? query.where\n      : transformWhereQuery(query.where)\n\n    return (normalizedWhere.or ?? []).some((orGroup) =>\n      (orGroup.and ?? []).some((andGroup) => {\n        const field = Object.keys(andGroup)[0]\n        if (!field) {\n          return false\n        }\n        const operatorObj = andGroup[field]\n        if (!operatorObj || typeof operatorObj !== 'object') {\n          return false\n        }\n        const operator = Object.keys(operatorObj)[0]\n        return Boolean(operator) && (operatorObj as Record<string, unknown>)[operator] !== undefined\n      }),\n    )\n  }, [query?.where])\n\n  return (\n    <ListQueryContext\n      value={{\n        collectionSlug,\n        data,\n        defaultLimit: data?.limit,\n        handlePageChange,\n        handlePerPageChange,\n        handleSearchChange,\n        handleSortChange,\n        handleWhereChange,\n        hasActiveFilters,\n        isGroupingBy: Boolean(query?.groupBy),\n        orderableFieldName,\n        query,\n        refineListData,\n        resolvedGroupBy: queryFromProps?.groupBy,\n        resolvedSearch: queryFromProps?.search,\n        searchInput,\n        setModified,\n        setSearchInput,\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.map

@@ -1 +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,SAwDF,CAAA"}
+{"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,SAqDF,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"mergeQuery.js","names":["mergeQuery","currentQuery","newQuery","options","page","shouldResetPage","some","key","includes","shouldResetQueryByGroup","mergedQueryByGroup","undefined","queryByGroup","Object","fromEntries","entries","map","value","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  const shouldResetPage = ['where', 'search', 'groupBy']?.some(\n    (key) => key in newQuery && !['limit', 'page'].includes(key),\n  )\n\n  if (shouldResetPage) {\n    page = 1\n  }\n\n  const shouldResetQueryByGroup = ['where', 'search', 'page', 'limit', 'groupBy', 'sort'].some(\n    (key) => key in newQuery,\n  )\n\n  let mergedQueryByGroup = undefined\n\n  if (!shouldResetQueryByGroup) {\n    // Deeply merge queryByGroup so we can send a partial update for a specific group\n    mergedQueryByGroup = {\n      ...(currentQuery?.queryByGroup || {}),\n      ...(newQuery.queryByGroup\n        ? Object.fromEntries(\n            Object.entries(newQuery.queryByGroup).map(([key, value]) => [\n              key,\n              {\n                ...(currentQuery?.queryByGroup?.[key] || {}),\n                ...value,\n              },\n            ]),\n          )\n        : {}),\n    }\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    queryByGroup: mergedQueryByGroup,\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,MAAMC,eAAA,GAAkB,CAAC,SAAS,UAAU,UAAU,EAAEC,IAAA,CACrDC,GAAA,IAAQA,GAAA,IAAOL,QAAA,IAAY,CAAC,CAAC,SAAS,OAAO,CAACM,QAAQ,CAACD,GAAA;EAG1D,IAAIF,eAAA,EAAiB;IACnBD,IAAA,GAAO;EACT;EAEA,MAAMK,uBAAA,GAA0B,CAAC,SAAS,UAAU,QAAQ,SAAS,WAAW,OAAO,CAACH,IAAI,CACzFC,GAAA,IAAQA,GAAA,IAAOL,QAAA;EAGlB,IAAIQ,kBAAA,GAAqBC,SAAA;EAEzB,IAAI,CAACF,uBAAA,EAAyB;IAC5B;IACAC,kBAAA,GAAqB;MACnB,IAAIT,YAAA,EAAcW,YAAA,IAAgB,CAAC,CAAC;MACpC,IAAIV,QAAA,CAASU,YAAY,GACrBC,MAAA,CAAOC,WAAW,CAChBD,MAAA,CAAOE,OAAO,CAACb,QAAA,CAASU,YAAY,EAAEI,GAAG,CAAC,CAAC,CAACT,GAAA,EAAKU,KAAA,CAAM,KAAK,CAC1DV,GAAA,EACA;QACE,IAAIN,YAAA,EAAcW,YAAA,GAAeL,GAAA,CAAI,IAAI,CAAC,CAAC;QAC3C,GAAGU;MACL,EACD,KAEH,CAAC,CAAC;IACR;EACF;EAEA,MAAMC,WAAA,GAAyB;IAC7B,GAAGjB,YAAY;IACf,GAAGC,QAAQ;IACXiB,OAAA,EAAS,aAAajB,QAAA,GAAWA,QAAA,CAASiB,OAAO,GAAGlB,YAAA,CAAakB,OAAO;IACxEC,OAAA,EACE,aAAalB,QAAA,GACTA,QAAA,CAASkB,OAAO,GACfnB,YAAA,EAAcmB,OAAA,IAAWjB,OAAA,EAASkB,QAAA,EAAUD,OAAA;IACnDE,KAAA,EAAO,WAAWpB,QAAA,GAAWA,QAAA,CAASoB,KAAK,GAAIrB,YAAA,EAAcqB,KAAA,IAASnB,OAAA,EAASkB,QAAA,EAAUC,KAAA;IACzFlB,IAAA;IACAmB,MAAA,EAAQ,YAAYrB,QAAA,GAAWA,QAAA,CAASqB,MAAM,GAAGtB,YAAA,EAAcsB,MAAA;IAC/DX,YAAA,EAAcF,kBAAA;IACdc,MAAA,EAAQ,YAAYtB,QAAA,GAAWA,QAAA,CAASsB,MAAM,GAAGvB,YAAA,EAAcuB,MAAA;IAC/DC,IAAA,EACE,UAAUvB,QAAA,GACNA,QAAA,CAASuB,IAAI,GACZxB,YAAC,EAAcwB,IAAA,IAAmBtB,OAAA,EAASkB,QAAA,EAAUI,IAAA;IAC5DC,KAAA,EAAO,WAAWxB,QAAA,GAAWA,QAAA,CAASwB,KAAK,GAAGzB,YAAA,EAAcyB;EAC9D;EAEA,OAAOR,WAAA;AACT","ignoreList":[]}
+{"version":3,"file":"mergeQuery.js","names":["mergeQuery","currentQuery","newQuery","options","page","shouldResetPage","some","key","includes","shouldResetQueryByGroup","mergedQueryByGroup","undefined","queryByGroup","Object","fromEntries","entries","map","value","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  const shouldResetPage = ['where', 'search', 'groupBy']?.some(\n    (key) => key in newQuery && !['limit', 'page'].includes(key),\n  )\n\n  if (shouldResetPage) {\n    page = 1\n  }\n\n  const shouldResetQueryByGroup = ['where', 'search', 'page', 'limit', 'groupBy', 'sort'].some(\n    (key) => key in newQuery,\n  )\n\n  let mergedQueryByGroup = undefined\n\n  if (!shouldResetQueryByGroup) {\n    // Deeply merge queryByGroup so we can send a partial update for a specific group\n    mergedQueryByGroup = {\n      ...(currentQuery?.queryByGroup || {}),\n      ...(newQuery.queryByGroup\n        ? Object.fromEntries(\n            Object.entries(newQuery.queryByGroup).map(([key, value]) => [\n              key,\n              {\n                ...(currentQuery?.queryByGroup?.[key] || {}),\n                ...value,\n              },\n            ]),\n          )\n        : {}),\n    }\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    queryByGroup: mergedQueryByGroup,\n    search: 'search' in newQuery ? newQuery.search : currentQuery?.search,\n    sort: 'sort' in newQuery ? newQuery.sort : (currentQuery?.sort ?? 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,MAAMC,eAAA,GAAkB,CAAC,SAAS,UAAU,UAAU,EAAEC,IAAA,CACrDC,GAAA,IAAQA,GAAA,IAAOL,QAAA,IAAY,CAAC,CAAC,SAAS,OAAO,CAACM,QAAQ,CAACD,GAAA;EAG1D,IAAIF,eAAA,EAAiB;IACnBD,IAAA,GAAO;EACT;EAEA,MAAMK,uBAAA,GAA0B,CAAC,SAAS,UAAU,QAAQ,SAAS,WAAW,OAAO,CAACH,IAAI,CACzFC,GAAA,IAAQA,GAAA,IAAOL,QAAA;EAGlB,IAAIQ,kBAAA,GAAqBC,SAAA;EAEzB,IAAI,CAACF,uBAAA,EAAyB;IAC5B;IACAC,kBAAA,GAAqB;MACnB,IAAIT,YAAA,EAAcW,YAAA,IAAgB,CAAC,CAAC;MACpC,IAAIV,QAAA,CAASU,YAAY,GACrBC,MAAA,CAAOC,WAAW,CAChBD,MAAA,CAAOE,OAAO,CAACb,QAAA,CAASU,YAAY,EAAEI,GAAG,CAAC,CAAC,CAACT,GAAA,EAAKU,KAAA,CAAM,KAAK,CAC1DV,GAAA,EACA;QACE,IAAIN,YAAA,EAAcW,YAAA,GAAeL,GAAA,CAAI,IAAI,CAAC,CAAC;QAC3C,GAAGU;MACL,EACD,KAEH,CAAC,CAAC;IACR;EACF;EAEA,MAAMC,WAAA,GAAyB;IAC7B,GAAGjB,YAAY;IACf,GAAGC,QAAQ;IACXiB,OAAA,EAAS,aAAajB,QAAA,GAAWA,QAAA,CAASiB,OAAO,GAAGlB,YAAA,CAAakB,OAAO;IACxEC,OAAA,EACE,aAAalB,QAAA,GACTA,QAAA,CAASkB,OAAO,GACfnB,YAAA,EAAcmB,OAAA,IAAWjB,OAAA,EAASkB,QAAA,EAAUD,OAAA;IACnDE,KAAA,EAAO,WAAWpB,QAAA,GAAWA,QAAA,CAASoB,KAAK,GAAIrB,YAAA,EAAcqB,KAAA,IAASnB,OAAA,EAASkB,QAAA,EAAUC,KAAA;IACzFlB,IAAA;IACAmB,MAAA,EAAQ,YAAYrB,QAAA,GAAWA,QAAA,CAASqB,MAAM,GAAGtB,YAAA,EAAcsB,MAAA;IAC/DX,YAAA,EAAcF,kBAAA;IACdc,MAAA,EAAQ,YAAYtB,QAAA,GAAWA,QAAA,CAASsB,MAAM,GAAGvB,YAAA,EAAcuB,MAAA;IAC/DC,IAAA,EAAM,UAAUvB,QAAA,GAAWA,QAAA,CAASuB,IAAI,GAAIxB,YAAA,EAAcwB,IAAA,IAAQtB,OAAA,EAASkB,QAAA,EAAUI,IAAA;IACrFC,KAAA,EAAO,WAAWxB,QAAA,GAAWA,QAAA,CAASwB,KAAK,GAAGzB,YAAA,EAAcyB;EAC9D;EAEA,OAAOR,WAAA;AACT","ignoreList":[]}

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

@@ -1 +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 (\n      key === 'where' &&\n      typeof value === 'object' &&\n      value !== null &&\n      !Object.keys(value as Where).length\n    ) {\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,IACEA,GAAA,KAAQ,WACR,OAAOC,KAAA,KAAU,YACjBA,KAAA,KAAU,QACV,CAACJ,MAAA,CAAOQ,IAAI,CAACJ,KAAA,EAAgBG,MAAM,EACnC;MACA,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":[]}
+{"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 (\n      key === 'where' &&\n      typeof value === 'object' &&\n      value !== null &&\n      !Object.keys(value).length\n    ) {\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,IACEA,GAAA,KAAQ,WACR,OAAOC,KAAA,KAAU,YACjBA,KAAA,KAAU,QACV,CAACJ,MAAA,CAAOQ,IAAI,CAACJ,KAAA,EAAOG,MAAM,EAC1B;MACA,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

@@ -6,7 +6,12 @@ type ContextHandlers = {
     handleSortChange?: (sort: string) => Promise<void>;
     handleWhereChange?: (where: Where) => Promise<void>;
 };
-export type OnListQueryChange = (query: ListQuery) => void;
+/**
+ * Returned promises are awaited; return values are otherwise ignored.
+ * The union of callbacks preserves TypeScript's `void` callback rule, allowing handlers such as `query => updates.push(query)`.
+ * A union of return types would reject synchronous handlers that return a value.
+ */
+export type OnListQueryChange = ((query: ListQuery) => Promise<unknown>) | ((query: ListQuery) => void);
 export type ListQueryProps = {
     readonly children: React.ReactNode;
     readonly collectionSlug?: ClientCollectionConfig['slug'];
@@ -14,10 +19,6 @@ export type ListQueryProps = {
     readonly modifySearchParams?: boolean;
     readonly onQueryChange?: OnListQueryChange;
     readonly orderableFieldName?: string;
-    /**
-     * @deprecated
-     */
-    readonly preferenceKey?: string;
     readonly query?: ListQuery;
 };
 export type IListQueryContext = {
@@ -25,6 +26,8 @@ export type IListQueryContext = {
     data: ListQueryProps['data'];
     defaultLimit?: number;
     defaultSort?: Sort;
+    /** True when the where query contains at least one condition with a value. */
+    hasActiveFilters: boolean;
     /**
      * @experimental This prop is subject to change. Use at your own risk.
      */
@@ -33,7 +36,11 @@ export type IListQueryContext = {
     orderableFieldName?: string;
     query: ListQuery;
     refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>;
+    resolvedGroupBy?: string;
+    resolvedSearch?: string;
+    searchInput: string;
     setModified: (modified: boolean) => void;
+    setSearchInput: (search: string) => void;
 } & ContextHandlers;
 export {};
 //# sourceMappingURL=types.d.ts.map

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,SAAS,EAET,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,GAAG,SAAS,CAAA;IACxC,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,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAA;IACrB,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,EACtB,SAAS,EAET,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;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GACzB,CAAC,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GACxC,CAAC,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC,CAAA;AAEhC,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,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;IAC9C,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,IAAI,CAAA;IAClB,8EAA8E;IAC9E,gBAAgB,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAA;IACrB,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,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,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  ListQuery,\n  PaginatedDistinctDocs,\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 | undefined\n  readonly modifySearchParams?: boolean\n  readonly onQueryChange?: OnListQueryChange\n  readonly orderableFieldName?: string\n  /**\n   * @deprecated\n   */\n  readonly preferenceKey?: string\n  readonly query?: ListQuery\n}\n\nexport type IListQueryContext = {\n  collectionSlug: ClientCollectionConfig['slug']\n  data: ListQueryProps['data']\n  defaultLimit?: number\n  defaultSort?: Sort\n  /**\n   * @experimental This prop is subject to change. Use at your own risk.\n   */\n  isGroupingBy: boolean\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":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/providers/ListQuery/types.ts"],"sourcesContent":["import type {\n  ClientCollectionConfig,\n  ListQuery,\n  PaginatedDistinctDocs,\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\n/**\n * Returned promises are awaited; return values are otherwise ignored.\n * The union of callbacks preserves TypeScript's `void` callback rule, allowing handlers such as `query => updates.push(query)`.\n * A union of return types would reject synchronous handlers that return a value.\n */\nexport type OnListQueryChange =\n  | ((query: ListQuery) => Promise<unknown>)\n  | ((query: ListQuery) => void)\n\nexport type ListQueryProps = {\n  readonly children: React.ReactNode\n  readonly collectionSlug?: ClientCollectionConfig['slug']\n  readonly data: PaginatedDocs | undefined\n  readonly modifySearchParams?: boolean\n  readonly onQueryChange?: OnListQueryChange\n  readonly orderableFieldName?: string\n  readonly query?: ListQuery\n}\n\nexport type IListQueryContext = {\n  collectionSlug: ClientCollectionConfig['slug']\n  data: ListQueryProps['data']\n  defaultLimit?: number\n  defaultSort?: Sort\n  /** True when the where query contains at least one condition with a value. */\n  hasActiveFilters: boolean\n  /**\n   * @experimental This prop is subject to change. Use at your own risk.\n   */\n  isGroupingBy: boolean\n  modified: boolean\n  orderableFieldName?: string\n  query: ListQuery\n  refineListData: (args: ListQuery, setModified?: boolean) => Promise<void>\n  resolvedGroupBy?: string\n  resolvedSearch?: string\n  searchInput: string\n  setModified: (modified: boolean) => void\n  setSearchInput: (search: string) => void\n} & ContextHandlers\n"],"mappings":"AAoCA","ignoreList":[]}

package/dist/providers/LivePreview/context.d.ts

@@ -8,11 +8,16 @@ export interface LivePreviewContextType {
     breakpoint: LivePreviewConfig['breakpoints'][number]['name'];
     breakpoints: LivePreviewConfig['breakpoints'];
     iframeRef: React.RefObject<HTMLIFrameElement | null>;
+    isExpanded: boolean;
     isLivePreviewEnabled: boolean;
     isLivePreviewing: boolean;
     isPopupOpen: boolean;
     isPreviewEnabled: boolean;
-    listeningForMessages?: boolean;
+    /**
+     * Timestamp of the last "ready" message received from any preview (iframe or popup).
+     * Used to trigger initial syncs to newly opened previews.
+     */
+    lastReadyAt: number;
     /**
      * The URL that has finished loading in the iframe or popup.
      * For example, if you set the `url`, it will begin to load into the iframe,
@@ -26,10 +31,9 @@ export interface LivePreviewContextType {
     openPopupWindow: ReturnType<typeof usePopupWindow>['openPopupWindow'];
     popupRef?: React.RefObject<null | Window>;
     previewURL?: string;
-    previewWindowType: 'iframe' | 'popup';
-    setAppIsReady: (appIsReady: boolean) => void;
     setBreakpoint: (breakpoint: LivePreviewConfig['breakpoints'][number]['name']) => void;
     setHeight: (height: number) => void;
+    setIsExpanded: (isExpanded: boolean) => void;
     setIsLivePreviewing: (isLivePreviewing: boolean) => void;
     setLoadedURL: (loadedURL: string) => void;
     setMeasuredDeviceSize: (size: {
@@ -37,7 +41,6 @@ export interface LivePreviewContextType {
         width: number;
     }) => void;
     setPreviewURL: (url: string) => void;
-    setPreviewWindowType: (previewWindowType: 'iframe' | 'popup') => void;
     setSize: Dispatch<SizeReducerAction>;
     setToolbarPosition: (position: {
         x: number;

package/dist/providers/LivePreview/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/providers/LivePreview/context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/providers/LivePreview/context.ts"],"names":[],"mappings":"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"}

package/dist/providers/LivePreview/context.js

@@ -6,10 +6,12 @@ export const LivePreviewContext = createContext({
   breakpoint: undefined,
   breakpoints: undefined,
   iframeRef: undefined,
+  isExpanded: false,
   isLivePreviewEnabled: undefined,
   isLivePreviewing: false,
   isPopupOpen: false,
   isPreviewEnabled: undefined,
+  lastReadyAt: 0,
   measuredDeviceSize: {
     height: 0,
     width: 0
@@ -17,15 +19,13 @@ export const LivePreviewContext = createContext({
   openPopupWindow: () => {},
   popupRef: undefined,
   previewURL: undefined,
-  previewWindowType: 'iframe',
-  setAppIsReady: () => {},
   setBreakpoint: () => {},
   setHeight: () => {},
+  setIsExpanded: () => {},
   setIsLivePreviewing: () => {},
   setLoadedURL: () => {},
   setMeasuredDeviceSize: () => {},
   setPreviewURL: () => {},
-  setPreviewWindowType: () => {},
   setSize: () => {},
   setToolbarPosition: () => {},
   setURL: () => {},

package/dist/providers/LivePreview/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","names":["createContext","use","LivePreviewContext","appIsReady","breakpoint","undefined","breakpoints","iframeRef","isLivePreviewEnabled","isLivePreviewing","isPopupOpen","isPreviewEnabled","measuredDeviceSize","height","width","openPopupWindow","popupRef","previewURL","previewWindowType","setAppIsReady","setBreakpoint","setHeight","setIsLivePreviewing","setLoadedURL","setMeasuredDeviceSize","setPreviewURL","setPreviewWindowType","setSize","setToolbarPosition","setURL","setWidth","setZoom","shouldRenderIframe","size","toolbarPosition","x","y","typeofLivePreviewURL","url","zoom","useLivePreviewContext","usePreviewURL"],"sources":["../../../src/providers/LivePreview/context.ts"],"sourcesContent":["'use client'\nimport type { LivePreviewConfig, LivePreviewURLType } from 'payload'\nimport type { Dispatch } from 'react'\nimport type React from 'react'\n\nimport { createContext, use } from 'react'\n\nimport type { usePopupWindow } from '../../hooks/usePopupWindow.js'\nimport type { SizeReducerAction } from './sizeReducer.js'\n\nexport interface LivePreviewContextType {\n  appIsReady: boolean\n  breakpoint: LivePreviewConfig['breakpoints'][number]['name']\n  breakpoints: LivePreviewConfig['breakpoints']\n  iframeRef: React.RefObject<HTMLIFrameElement | null>\n  isLivePreviewEnabled: boolean\n  isLivePreviewing: boolean\n  isPopupOpen: boolean\n  isPreviewEnabled: boolean\n  listeningForMessages?: boolean\n  /**\n   * The URL that has finished loading in the iframe or popup.\n   * For example, if you set the `url`, it will begin to load into the iframe,\n   * but `loadedURL` will not be set until the iframe's `onLoad` event fires.\n   */\n  loadedURL?: string\n  measuredDeviceSize: {\n    height: number\n    width: number\n  }\n  openPopupWindow: ReturnType<typeof usePopupWindow>['openPopupWindow']\n  popupRef?: React.RefObject<null | Window>\n  previewURL?: string\n  previewWindowType: 'iframe' | 'popup'\n  setAppIsReady: (appIsReady: boolean) => void\n  setBreakpoint: (breakpoint: LivePreviewConfig['breakpoints'][number]['name']) => void\n  setHeight: (height: number) => void\n  setIsLivePreviewing: (isLivePreviewing: boolean) => void\n  setLoadedURL: (loadedURL: string) => void\n  setMeasuredDeviceSize: (size: { height: number; width: number }) => void\n  setPreviewURL: (url: string) => void\n  setPreviewWindowType: (previewWindowType: 'iframe' | 'popup') => void\n  setSize: Dispatch<SizeReducerAction>\n  setToolbarPosition: (position: { x: number; y: number }) => void\n  /**\n   * Sets the URL of the preview (either iframe or popup).\n   * Will trigger a reload of the window.\n   */\n  setURL: (url: string) => void\n  setWidth: (width: number) => void\n  setZoom: (zoom: number) => void\n  /**\n   * Do not render the iframe until the user is actively live previewing. This will:\n   * 1. Prevent running through URL proxies set up on their `admin.livePreview.url` endpoint, e.g. to enter Next.js draft mode.\n   * 2. Avoid unnecessary performance and network costs of rendering the iframe before it's needed.\n   */\n  shouldRenderIframe?: boolean\n  size: {\n    height: number\n    width: number\n  }\n  toolbarPosition: {\n    x: number\n    y: number\n  }\n  /**\n   * The live preview url property can be either a string or a function that returns a string.\n   * It is important to know which one it is, so that we can opt in/out of certain behaviors, e.g. calling the server to get the URL.\n   */\n  typeofLivePreviewURL?: 'function' | 'string'\n  url: LivePreviewURLType\n  zoom: number\n}\n\nexport const LivePreviewContext = createContext<LivePreviewContextType>({\n  appIsReady: false,\n  breakpoint: undefined,\n  breakpoints: undefined,\n  iframeRef: undefined,\n  isLivePreviewEnabled: undefined,\n  isLivePreviewing: false,\n  isPopupOpen: false,\n  isPreviewEnabled: undefined,\n  measuredDeviceSize: {\n    height: 0,\n    width: 0,\n  },\n  openPopupWindow: () => {},\n  popupRef: undefined,\n  previewURL: undefined,\n  previewWindowType: 'iframe',\n  setAppIsReady: () => {},\n  setBreakpoint: () => {},\n  setHeight: () => {},\n  setIsLivePreviewing: () => {},\n  setLoadedURL: () => {},\n  setMeasuredDeviceSize: () => {},\n  setPreviewURL: () => {},\n  setPreviewWindowType: () => {},\n  setSize: () => {},\n  setToolbarPosition: () => {},\n  setURL: () => {},\n  setWidth: () => {},\n  setZoom: () => {},\n  shouldRenderIframe: undefined,\n  size: {\n    height: 0,\n    width: 0,\n  },\n  toolbarPosition: {\n    x: 0,\n    y: 0,\n  },\n  typeofLivePreviewURL: undefined,\n  url: undefined,\n  zoom: 1,\n})\n\nexport const useLivePreviewContext = () => use(LivePreviewContext)\n\n/**\n * Hook to access live preview context values. Separated to prevent breaking changes. In the future this hook can be removed in favour of just using the LivePreview one.\n */\nexport const usePreviewURL = () => {\n  const { isPreviewEnabled, previewURL, setPreviewURL } = use(LivePreviewContext)\n\n  return { isPreviewEnabled, previewURL, setPreviewURL }\n}\n"],"mappings":"AAAA;;AAKA,SAASA,aAAa,EAAEC,GAAG,QAAQ;AAqEnC,OAAO,MAAMC,kBAAA,GAAqBF,aAAA,CAAsC;EACtEG,UAAA,EAAY;EACZC,UAAA,EAAYC,SAAA;EACZC,WAAA,EAAaD,SAAA;EACbE,SAAA,EAAWF,SAAA;EACXG,oBAAA,EAAsBH,SAAA;EACtBI,gBAAA,EAAkB;EAClBC,WAAA,EAAa;EACbC,gBAAA,EAAkBN,SAAA;EAClBO,kBAAA,EAAoB;IAClBC,MAAA,EAAQ;IACRC,KAAA,EAAO;EACT;EACAC,eAAA,EAAiBA,CAAA,MAAO;EACxBC,QAAA,EAAUX,SAAA;EACVY,UAAA,EAAYZ,SAAA;EACZa,iBAAA,EAAmB;EACnBC,aAAA,EAAeA,CAAA,MAAO;EACtBC,aAAA,EAAeA,CAAA,MAAO;EACtBC,SAAA,EAAWA,CAAA,MAAO;EAClBC,mBAAA,EAAqBA,CAAA,MAAO;EAC5BC,YAAA,EAAcA,CAAA,MAAO;EACrBC,qBAAA,EAAuBA,CAAA,MAAO;EAC9BC,aAAA,EAAeA,CAAA,MAAO;EACtBC,oBAAA,EAAsBA,CAAA,MAAO;EAC7BC,OAAA,EAASA,CAAA,MAAO;EAChBC,kBAAA,EAAoBA,CAAA,MAAO;EAC3BC,MAAA,EAAQA,CAAA,MAAO;EACfC,QAAA,EAAUA,CAAA,MAAO;EACjBC,OAAA,EAASA,CAAA,MAAO;EAChBC,kBAAA,EAAoB3B,SAAA;EACpB4B,IAAA,EAAM;IACJpB,MAAA,EAAQ;IACRC,KAAA,EAAO;EACT;EACAoB,eAAA,EAAiB;IACfC,CAAA,EAAG;IACHC,CAAA,EAAG;EACL;EACAC,oBAAA,EAAsBhC,SAAA;EACtBiC,GAAA,EAAKjC,SAAA;EACLkC,IAAA,EAAM;AACR;AAEA,OAAO,MAAMC,qBAAA,GAAwBA,CAAA,KAAMvC,GAAA,CAAIC,kBAAA;AAE/C;;;AAGA,OAAO,MAAMuC,aAAA,GAAgBA,CAAA;EAC3B,MAAM;IAAE9B,gBAAgB;IAAEM,UAAU;IAAEQ;EAAa,CAAE,GAAGxB,GAAA,CAAIC,kBAAA;EAE5D,OAAO;IAAES,gBAAA;IAAkBM,UAAA;IAAYQ;EAAc;AACvD","ignoreList":[]}
+{"version":3,"file":"context.js","names":["createContext","use","LivePreviewContext","appIsReady","breakpoint","undefined","breakpoints","iframeRef","isExpanded","isLivePreviewEnabled","isLivePreviewing","isPopupOpen","isPreviewEnabled","lastReadyAt","measuredDeviceSize","height","width","openPopupWindow","popupRef","previewURL","setBreakpoint","setHeight","setIsExpanded","setIsLivePreviewing","setLoadedURL","setMeasuredDeviceSize","setPreviewURL","setSize","setToolbarPosition","setURL","setWidth","setZoom","shouldRenderIframe","size","toolbarPosition","x","y","typeofLivePreviewURL","url","zoom","useLivePreviewContext","usePreviewURL"],"sources":["../../../src/providers/LivePreview/context.ts"],"sourcesContent":["'use client'\nimport type { LivePreviewConfig, LivePreviewURLType } from 'payload'\nimport type { Dispatch } from 'react'\nimport type React from 'react'\n\nimport { createContext, use } from 'react'\n\nimport type { usePopupWindow } from '../../hooks/usePopupWindow.js'\nimport type { SizeReducerAction } from './sizeReducer.js'\n\nexport interface LivePreviewContextType {\n  appIsReady: boolean\n  breakpoint: LivePreviewConfig['breakpoints'][number]['name']\n  breakpoints: LivePreviewConfig['breakpoints']\n  iframeRef: React.RefObject<HTMLIFrameElement | null>\n  isExpanded: boolean\n  isLivePreviewEnabled: boolean\n  isLivePreviewing: boolean\n  isPopupOpen: boolean\n  isPreviewEnabled: boolean\n  /**\n   * Timestamp of the last \"ready\" message received from any preview (iframe or popup).\n   * Used to trigger initial syncs to newly opened previews.\n   */\n  lastReadyAt: number\n  /**\n   * The URL that has finished loading in the iframe or popup.\n   * For example, if you set the `url`, it will begin to load into the iframe,\n   * but `loadedURL` will not be set until the iframe's `onLoad` event fires.\n   */\n  loadedURL?: string\n  measuredDeviceSize: {\n    height: number\n    width: number\n  }\n  openPopupWindow: ReturnType<typeof usePopupWindow>['openPopupWindow']\n  popupRef?: React.RefObject<null | Window>\n  previewURL?: string\n  setBreakpoint: (breakpoint: LivePreviewConfig['breakpoints'][number]['name']) => void\n  setHeight: (height: number) => void\n  setIsExpanded: (isExpanded: boolean) => void\n  setIsLivePreviewing: (isLivePreviewing: boolean) => void\n  setLoadedURL: (loadedURL: string) => void\n  setMeasuredDeviceSize: (size: { height: number; width: number }) => void\n  setPreviewURL: (url: string) => void\n  setSize: Dispatch<SizeReducerAction>\n  setToolbarPosition: (position: { x: number; y: number }) => void\n  /**\n   * Sets the URL of the preview (either iframe or popup).\n   * Will trigger a reload of the window.\n   */\n  setURL: (url: string) => void\n  setWidth: (width: number) => void\n  setZoom: (zoom: number) => void\n  /**\n   * Do not render the iframe until the user is actively live previewing. This will:\n   * 1. Prevent running through URL proxies set up on their `admin.livePreview.url` endpoint, e.g. to enter Next.js draft mode.\n   * 2. Avoid unnecessary performance and network costs of rendering the iframe before it's needed.\n   */\n  shouldRenderIframe?: boolean\n  size: {\n    height: number\n    width: number\n  }\n  toolbarPosition: {\n    x: number\n    y: number\n  }\n  /**\n   * The live preview url property can be either a string or a function that returns a string.\n   * It is important to know which one it is, so that we can opt in/out of certain behaviors, e.g. calling the server to get the URL.\n   */\n  typeofLivePreviewURL?: 'function' | 'string'\n  url: LivePreviewURLType\n  zoom: number\n}\n\nexport const LivePreviewContext = createContext<LivePreviewContextType>({\n  appIsReady: false,\n  breakpoint: undefined,\n  breakpoints: undefined,\n  iframeRef: undefined,\n  isExpanded: false,\n  isLivePreviewEnabled: undefined,\n  isLivePreviewing: false,\n  isPopupOpen: false,\n  isPreviewEnabled: undefined,\n  lastReadyAt: 0,\n  measuredDeviceSize: {\n    height: 0,\n    width: 0,\n  },\n  openPopupWindow: () => {},\n  popupRef: undefined,\n  previewURL: undefined,\n  setBreakpoint: () => {},\n  setHeight: () => {},\n  setIsExpanded: () => {},\n  setIsLivePreviewing: () => {},\n  setLoadedURL: () => {},\n  setMeasuredDeviceSize: () => {},\n  setPreviewURL: () => {},\n  setSize: () => {},\n  setToolbarPosition: () => {},\n  setURL: () => {},\n  setWidth: () => {},\n  setZoom: () => {},\n  shouldRenderIframe: undefined,\n  size: {\n    height: 0,\n    width: 0,\n  },\n  toolbarPosition: {\n    x: 0,\n    y: 0,\n  },\n  typeofLivePreviewURL: undefined,\n  url: undefined,\n  zoom: 1,\n})\n\nexport const useLivePreviewContext = () => use(LivePreviewContext)\n\n/**\n * Hook to access live preview context values. Separated to prevent breaking changes. In the future this hook can be removed in favour of just using the LivePreview one.\n */\nexport const usePreviewURL = () => {\n  const { isPreviewEnabled, previewURL, setPreviewURL } = use(LivePreviewContext)\n\n  return { isPreviewEnabled, previewURL, setPreviewURL }\n}\n"],"mappings":"AAAA;;AAKA,SAASA,aAAa,EAAEC,GAAG,QAAQ;AAwEnC,OAAO,MAAMC,kBAAA,GAAqBF,aAAA,CAAsC;EACtEG,UAAA,EAAY;EACZC,UAAA,EAAYC,SAAA;EACZC,WAAA,EAAaD,SAAA;EACbE,SAAA,EAAWF,SAAA;EACXG,UAAA,EAAY;EACZC,oBAAA,EAAsBJ,SAAA;EACtBK,gBAAA,EAAkB;EAClBC,WAAA,EAAa;EACbC,gBAAA,EAAkBP,SAAA;EAClBQ,WAAA,EAAa;EACbC,kBAAA,EAAoB;IAClBC,MAAA,EAAQ;IACRC,KAAA,EAAO;EACT;EACAC,eAAA,EAAiBA,CAAA,MAAO;EACxBC,QAAA,EAAUb,SAAA;EACVc,UAAA,EAAYd,SAAA;EACZe,aAAA,EAAeA,CAAA,MAAO;EACtBC,SAAA,EAAWA,CAAA,MAAO;EAClBC,aAAA,EAAeA,CAAA,MAAO;EACtBC,mBAAA,EAAqBA,CAAA,MAAO;EAC5BC,YAAA,EAAcA,CAAA,MAAO;EACrBC,qBAAA,EAAuBA,CAAA,MAAO;EAC9BC,aAAA,EAAeA,CAAA,MAAO;EACtBC,OAAA,EAASA,CAAA,MAAO;EAChBC,kBAAA,EAAoBA,CAAA,MAAO;EAC3BC,MAAA,EAAQA,CAAA,MAAO;EACfC,QAAA,EAAUA,CAAA,MAAO;EACjBC,OAAA,EAASA,CAAA,MAAO;EAChBC,kBAAA,EAAoB3B,SAAA;EACpB4B,IAAA,EAAM;IACJlB,MAAA,EAAQ;IACRC,KAAA,EAAO;EACT;EACAkB,eAAA,EAAiB;IACfC,CAAA,EAAG;IACHC,CAAA,EAAG;EACL;EACAC,oBAAA,EAAsBhC,SAAA;EACtBiC,GAAA,EAAKjC,SAAA;EACLkC,IAAA,EAAM;AACR;AAEA,OAAO,MAAMC,qBAAA,GAAwBA,CAAA,KAAMvC,GAAA,CAAIC,kBAAA;AAE/C;;;AAGA,OAAO,MAAMuC,aAAA,GAAgBA,CAAA;EAC3B,MAAM;IAAE7B,gBAAgB;IAAEO,UAAU;IAAEO;EAAa,CAAE,GAAGzB,GAAA,CAAIC,kBAAA;EAE5D,OAAO;IAAEU,gBAAA;IAAkBO,UAAA;IAAYO;EAAc;AACvD","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/LivePreview/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAyB,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAG3F,OAAO,KAAmE,MAAM,OAAO,CAAA;AAEvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAU1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAA;IAC9C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,UAAU,CAAC,EAAE;QACX,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,gBAAgB,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,GAAG,IAAI,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,KAAK,CAAC,CAAA;AAEhE,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CA6RlE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/LivePreview/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAyB,iBAAiB,EAAsB,MAAM,SAAS,CAAA;AAG3F,OAAO,KAAmE,MAAM,OAAO,CAAA;AAEvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAW1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,WAAW,CAAC,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAA;IAC9C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,UAAU,CAAC,EAAE;QACX,MAAM,EAAE,MAAM,CAAA;QACd,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;IACD,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,gBAAgB,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,GAAG,IAAI,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,KAAK,CAAC,CAAA;AAEhE,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAgRlE,CAAA"}

package/dist/providers/LivePreview/index.js

@@ -7,6 +7,7 @@ import { usePopupWindow } from '../../hooks/usePopupWindow.js';
 import { useDocumentInfo } from '../../providers/DocumentInfo/index.js';
 import { usePreferences } from '../../providers/Preferences/index.js';
 import { formatAbsoluteURL } from '../../utilities/formatAbsoluteURL.js';
+import { isHttpURL } from '../../utilities/isHttpURL.js';
 import { customCollisionDetection } from './collisionDetection.js';
 import { LivePreviewContext } from './context.js';
 import { sizeReducer } from './sizeReducer.js';
@@ -20,7 +21,6 @@ export const LivePreviewProvider = ({
   typeofLivePreviewURL,
   url: urlFromProps
 }) => {
-  const [previewWindowType, setPreviewWindowType] = useState('iframe');
   const [isLivePreviewing, _setIsLivePreviewing] = useState(incomingIsLivePreviewing);
   const [shouldRenderIframe, setShouldRenderIframe] = useState(isLivePreviewing);
   /**
@@ -40,7 +40,13 @@ export const LivePreviewProvider = ({
     width: '100%'
   }], [incomingBreakpoints]);
   const [url, setURL] = useState('');
-  const [previewURL, setPreviewURL] = useState(previewURLFromProps);
+  const [previewURL, _setPreviewURL] = useState();
+  const setPreviewURL = useCallback(incomingURL => {
+    _setPreviewURL(isHttpURL(incomingURL) ? incomingURL : undefined);
+  }, []);
+  useEffect(() => {
+    setPreviewURL(previewURLFromProps);
+  }, [previewURLFromProps, setPreviewURL]);
   const {
     isPopupOpen,
     openPopupWindow,
@@ -50,7 +56,9 @@ export const LivePreviewProvider = ({
     url
   });
   const [appIsReady, setAppIsReady] = useState(false);
-  const [listeningForMessages, setListeningForMessages] = useState(false);
+  // Tracks when any preview (iframe or popup) signals it's ready
+  // Used to trigger an initial sync to newly opened previews
+  const [lastReadyAt, setLastReadyAt] = useState(0);
   const {
     collectionSlug,
     globalSlug
@@ -60,6 +68,7 @@ export const LivePreviewProvider = ({
     setPreference
   } = usePreferences();
   const iframeRef = React.useRef(null);
+  const [isExpanded, setIsExpanded] = useState(false);
   const [loadedURL, setLoadedURL] = useState();
   const [zoom, setZoom] = useState(1);
   const [position, setPosition] = useState({
@@ -82,18 +91,18 @@ export const LivePreviewProvider = ({
   *  - resets `appIsReady` to `false` while the new URL is loading
   */
   const setLivePreviewURL = useCallback(_incomingURL => {
-    let incomingURL;
+    let incomingURL_0;
     if (typeof _incomingURL === 'string') {
-      incomingURL = formatAbsoluteURL(_incomingURL);
+      incomingURL_0 = formatAbsoluteURL(_incomingURL);
     }
-    if (!incomingURL) {
+    if (!incomingURL_0) {
       setIsLivePreviewing(false);
     }
-    if (incomingURL !== url) {
+    if (incomingURL_0 !== url) {
       setAppIsReady(false);
-      setURL(incomingURL);
+      setURL(incomingURL_0);
     }
-  }, [url]);
+  }, [setIsLivePreviewing, url]);
   /**
   * `url` needs to be relative to the window, which cannot be done on initial render.
   */
@@ -154,30 +163,15 @@ export const LivePreviewProvider = ({
       if (url?.startsWith(event.origin) && event.data && typeof event.data === 'object' && event.data.type === 'payload-live-preview') {
         if (event.data.ready) {
           setAppIsReady(true);
+          setLastReadyAt(Date.now());
         }
       }
     };
     window.addEventListener('message', handleMessage);
-    setListeningForMessages(true);
     return () => {
       window.removeEventListener('message', handleMessage);
     };
-  }, [url, listeningForMessages]);
-  const handleWindowChange = useCallback(type => {
-    setAppIsReady(false);
-    setPreviewWindowType(type);
-    if (type === 'popup') {
-      openPopupWindow();
-    }
-  }, [openPopupWindow]);
-  // when the user closes the popup window, switch back to the iframe
-  // the `usePopupWindow` reports the `isPopupOpen` state for us to use here
-  useEffect(() => {
-    const newPreviewWindowType = isPopupOpen ? 'popup' : 'iframe';
-    if (newPreviewWindowType !== previewWindowType) {
-      handleWindowChange('iframe');
-    }
-  }, [previewWindowType, isPopupOpen, handleWindowChange]);
+  }, [url]);
   useEffect(() => {
     if (isFirstRender.current) {
       isFirstRender.current = false;
@@ -194,25 +188,24 @@ export const LivePreviewProvider = ({
       breakpoint,
       breakpoints,
       iframeRef,
+      isExpanded,
       isLivePreviewEnabled,
       isLivePreviewing,
       isPopupOpen,
       isPreviewEnabled,
-      listeningForMessages,
+      lastReadyAt,
       loadedURL,
       measuredDeviceSize,
       openPopupWindow,
       popupRef,
       previewURL,
-      previewWindowType,
-      setAppIsReady,
       setBreakpoint,
       setHeight,
+      setIsExpanded,
       setIsLivePreviewing,
       setLoadedURL,
       setMeasuredDeviceSize,
       setPreviewURL,
-      setPreviewWindowType: handleWindowChange,
       setSize,
       setToolbarPosition: setPosition,
       setURL: setLivePreviewURL,