@payloadcms/richtext-slate 3.0.0-beta.12 → 3.0.0-beta.121

package/README.md

@@ -14,7 +14,7 @@ npm install @payloadcms/richtext-slate
 ## Usage
 
 ```ts
-import { buildConfig } from 'payload/config'
+import { buildConfig } from 'payload'
 import { slateEditor } from '@payloadcms/richtext-slate'
 
 export default buildConfig({

package/dist/cell/index.d.ts

@@ -1,4 +1,4 @@
-import type { DefaultCellComponentProps } from 'payload/types';
+import type { DefaultCellComponentProps } from 'payload';
 import React from 'react';
 export declare const RichTextCell: React.FC<DefaultCellComponentProps<any[]>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/cell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cell/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,GAAG,EAAE,CAAC,CAKnE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cell/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAKxD,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,GAAG,EAAE,CAAC,CAqCnE,CAAA"}

package/dist/cell/index.js

@@ -1,9 +1,35 @@
 'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useConfig, useTableCell } from '@payloadcms/ui';
+import { formatAdminURL } from '@payloadcms/ui/shared';
+import LinkImport from 'next/link.js';
 import React from 'react';
-export const RichTextCell = ({ cellData })=>{
+const Link = LinkImport.default || LinkImport;
+export const RichTextCell = ()=>{
+    const { cellData, cellProps, columnIndex, customCellContext, rowData } = useTableCell();
     const flattenedText = cellData?.map((i)=>i?.children?.map((c)=>c.text)).join(' ');
+    const { config: { routes: { admin: adminRoute } } } = useConfig();
+    const { link } = cellProps || {};
+    let WrapElement = 'span';
+    const wrapElementProps = {};
+    const isLink = link !== undefined ? link : columnIndex === 0;
+    if (isLink) {
+        WrapElement = Link;
+        wrapElementProps.href = customCellContext?.collectionSlug ? formatAdminURL({
+            adminRoute,
+            path: `/collections/${customCellContext?.collectionSlug}/${rowData.id}`
+        }) : '';
+    }
+    if (isLink) {
+        return /*#__PURE__*/ _jsx(WrapElement, {
+            ...wrapElementProps,
+            children: flattenedText
+        });
+    }
     // Limiting the number of characters shown is done in a CSS rule
-    return /*#__PURE__*/ React.createElement("span", null, flattenedText);
+    return /*#__PURE__*/ _jsx("span", {
+        children: flattenedText
+    });
 };
 
 //# sourceMappingURL=index.js.map

package/dist/cell/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/cell/index.tsx"],"sourcesContent":["'use client'\nimport type { DefaultCellComponentProps } from 'payload/types'\n\nimport React from 'react'\n\nexport const RichTextCell: React.FC<DefaultCellComponentProps<any[]>> = ({ cellData }) => {\n  const flattenedText = cellData?.map((i) => i?.children?.map((c) => c.text)).join(' ')\n\n  // Limiting the number of characters shown is done in a CSS rule\n  return <span>{flattenedText}</span>\n}\n"],"names":["React","RichTextCell","cellData","flattenedText","map","i","children","c","text","join","span"],"rangeMappings":";;;;;;","mappings":"AAAA;AAGA,OAAOA,WAAW,QAAO;AAEzB,OAAO,MAAMC,eAA2D,CAAC,EAAEC,QAAQ,EAAE;IACnF,MAAMC,gBAAgBD,UAAUE,IAAI,CAACC,IAAMA,GAAGC,UAAUF,IAAI,CAACG,IAAMA,EAAEC,IAAI,GAAGC,KAAK;IAEjF,gEAAgE;IAChE,qBAAO,oBAACC,cAAMP;AAChB,EAAC"}
+{"version":3,"sources":["../../src/cell/index.tsx"],"sourcesContent":["'use client'\nimport type { DefaultCellComponentProps } from 'payload'\n\nimport { useConfig, useTableCell } from '@payloadcms/ui'\nimport { formatAdminURL } from '@payloadcms/ui/shared'\nimport LinkImport from 'next/link.js'\nimport React from 'react'\n\nconst Link = (LinkImport.default || LinkImport) as unknown as typeof LinkImport.default\n\nexport const RichTextCell: React.FC<DefaultCellComponentProps<any[]>> = () => {\n  const { cellData, cellProps, columnIndex, customCellContext, rowData } = useTableCell()\n  const flattenedText = cellData?.map((i) => i?.children?.map((c) => c.text)).join(' ')\n\n  const {\n    config: {\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n\n  const { link } = cellProps || {}\n  let WrapElement: React.ComponentType<any> | string = 'span'\n\n  const wrapElementProps: {\n    className?: string\n    href?: string\n    onClick?: () => void\n    type?: 'button'\n  } = {}\n\n  const isLink = link !== undefined ? link : columnIndex === 0\n\n  if (isLink) {\n    WrapElement = Link\n    wrapElementProps.href = customCellContext?.collectionSlug\n      ? formatAdminURL({\n          adminRoute,\n          path: `/collections/${customCellContext?.collectionSlug}/${rowData.id}`,\n        })\n      : ''\n  }\n\n  if (isLink) {\n    return <WrapElement {...wrapElementProps}>{flattenedText}</WrapElement>\n  }\n  // Limiting the number of characters shown is done in a CSS rule\n  return <span>{flattenedText}</span>\n}\n"],"names":["useConfig","useTableCell","formatAdminURL","LinkImport","React","Link","default","RichTextCell","cellData","cellProps","columnIndex","customCellContext","rowData","flattenedText","map","i","children","c","text","join","config","routes","admin","adminRoute","link","WrapElement","wrapElementProps","isLink","undefined","href","collectionSlug","path","id","span"],"mappings":"AAAA;;AAGA,SAASA,SAAS,EAAEC,YAAY,QAAQ,iBAAgB;AACxD,SAASC,cAAc,QAAQ,wBAAuB;AACtD,OAAOC,gBAAgB,eAAc;AACrC,OAAOC,WAAW,QAAO;AAEzB,MAAMC,OAAQF,WAAWG,OAAO,IAAIH;AAEpC,OAAO,MAAMI,eAA2D;IACtE,MAAM,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,WAAW,EAAEC,iBAAiB,EAAEC,OAAO,EAAE,GAAGX;IACzE,MAAMY,gBAAgBL,UAAUM,IAAI,CAACC,IAAMA,GAAGC,UAAUF,IAAI,CAACG,IAAMA,EAAEC,IAAI,GAAGC,KAAK;IAEjF,MAAM,EACJC,QAAQ,EACNC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC9B,EACF,GAAGvB;IAEJ,MAAM,EAAEwB,IAAI,EAAE,GAAGf,aAAa,CAAC;IAC/B,IAAIgB,cAAiD;IAErD,MAAMC,mBAKF,CAAC;IAEL,MAAMC,SAASH,SAASI,YAAYJ,OAAOd,gBAAgB;IAE3D,IAAIiB,QAAQ;QACVF,cAAcpB;QACdqB,iBAAiBG,IAAI,GAAGlB,mBAAmBmB,iBACvC5B,eAAe;YACbqB;YACAQ,MAAM,CAAC,aAAa,EAAEpB,mBAAmBmB,eAAe,CAAC,EAAElB,QAAQoB,EAAE,CAAC,CAAC;QACzE,KACA;IACN;IAEA,IAAIL,QAAQ;QACV,qBAAO,KAACF;YAAa,GAAGC,gBAAgB;sBAAGb;;IAC7C;IACA,gEAAgE;IAChE,qBAAO,KAACoB;kBAAMpB;;AAChB,EAAC"}

package/dist/data/defaultValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/data/defaultValue.ts"],"sourcesContent":["export const defaultRichTextValue = [\n  {\n    children: [{ text: '' }],\n  },\n]\n"],"names":["defaultRichTextValue","children","text"],"rangeMappings":";;;;;;;;","mappings":"AAAA,OAAO,MAAMA,uBAAuB;IAClC;QACEC,UAAU;YAAC;gBAAEC,MAAM;YAAG;SAAE;IAC1B;CACD,CAAA"}
+{"version":3,"sources":["../../src/data/defaultValue.ts"],"sourcesContent":["export const defaultRichTextValue = [\n  {\n    children: [{ text: '' }],\n  },\n]\n"],"names":["defaultRichTextValue","children","text"],"mappings":"AAAA,OAAO,MAAMA,uBAAuB;IAClC;QACEC,UAAU;YAAC;gBAAEC,MAAM;YAAG;SAAE;IAC1B;CACD,CAAA"}

package/dist/data/populate.d.ts

@@ -1,20 +1,21 @@
-import type { PayloadRequest } from 'payload/types';
-import type { Collection, Field, RichTextField } from 'payload/types';
+import type { Collection, Field, PayloadRequest, RichTextField, SelectType } from 'payload';
 import type { AdapterArguments } from '../types.js';
 type Arguments = {
     currentDepth?: number;
     data: unknown;
     depth: number;
+    draft: boolean;
     field: RichTextField<any[], AdapterArguments, AdapterArguments>;
     key: number | string;
     overrideAccess?: boolean;
     req: PayloadRequest;
+    select?: SelectType;
     showHiddenFields: boolean;
 };
-export declare const populate: ({ id, collection, currentDepth, data, depth, key, overrideAccess, req, showHiddenFields, }: Omit<Arguments, 'field'> & {
+export declare const populate: ({ id, collection, currentDepth, data, depth, draft, key, overrideAccess, req, select, showHiddenFields, }: {
     collection: Collection;
     field: Field;
     id: string;
-}) => Promise<void>;
+} & Omit<Arguments, "field">) => Promise<void>;
 export {};
 //# sourceMappingURL=populate.d.ts.map

package/dist/data/populate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../src/data/populate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,KAAK,SAAS,GAAG;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC/D,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,QAAQ,+FAUlB,KAAK,SAAS,EAAE,OAAO,CAAC,GAAG;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,KAAK,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX,KAAG,QAAQ,IAAI,CAsBf,CAAA"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../src/data/populate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAI3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,KAAK,SAAS,GAAG;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC/D,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,QAAQ,8GAYlB;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,KAAK,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,KAAG,OAAO,CAAC,IAAI,CAwB1C,CAAA"}

package/dist/data/populate.js

@@ -1,16 +1,19 @@
-export const populate = async ({ id, collection, currentDepth, data, depth, key, overrideAccess, req, showHiddenFields })=>{
+import { createDataloaderCacheKey } from 'payload';
+export const populate = async ({ id, collection, currentDepth, data, depth, draft, key, overrideAccess, req, select, showHiddenFields })=>{
     const dataRef = data;
-    const doc = await req.payloadDataLoader.load(JSON.stringify([
-        req.transactionID,
-        collection.config.slug,
-        id,
+    const doc = await req.payloadDataLoader.load(createDataloaderCacheKey({
+        collectionSlug: collection.config.slug,
+        currentDepth: currentDepth + 1,
         depth,
-        currentDepth + 1,
-        req.locale,
-        req.fallbackLocale,
-        typeof overrideAccess === 'undefined' ? false : overrideAccess,
-        showHiddenFields
-    ]));
+        docID: id,
+        draft,
+        fallbackLocale: req.locale,
+        locale: req.fallbackLocale,
+        overrideAccess: typeof overrideAccess === 'undefined' ? false : overrideAccess,
+        select,
+        showHiddenFields,
+        transactionID: req.transactionID
+    }));
     if (doc) {
         dataRef[key] = doc;
     } else {

package/dist/data/populate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/data/populate.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload/types'\nimport type { Collection, Field, RichTextField } from 'payload/types'\n\nimport type { AdapterArguments } from '../types.js'\n\ntype Arguments = {\n  currentDepth?: number\n  data: unknown\n  depth: number\n  field: RichTextField<any[], AdapterArguments, AdapterArguments>\n  key: number | string\n  overrideAccess?: boolean\n  req: PayloadRequest\n  showHiddenFields: boolean\n}\n\nexport const populate = async ({\n  id,\n  collection,\n  currentDepth,\n  data,\n  depth,\n  key,\n  overrideAccess,\n  req,\n  showHiddenFields,\n}: Omit<Arguments, 'field'> & {\n  collection: Collection\n  field: Field\n  id: string\n}): Promise<void> => {\n  const dataRef = data as Record<string, unknown>\n\n  const doc = await req.payloadDataLoader.load(\n    JSON.stringify([\n      req.transactionID,\n      collection.config.slug,\n      id,\n      depth,\n      currentDepth + 1,\n      req.locale,\n      req.fallbackLocale,\n      typeof overrideAccess === 'undefined' ? false : overrideAccess,\n      showHiddenFields,\n    ]),\n  )\n\n  if (doc) {\n    dataRef[key] = doc\n  } else {\n    dataRef[key] = null\n  }\n}\n"],"names":["populate","id","collection","currentDepth","data","depth","key","overrideAccess","req","showHiddenFields","dataRef","doc","payloadDataLoader","load","JSON","stringify","transactionID","config","slug","locale","fallbackLocale"],"rangeMappings":";;;;;;;;;;;;;;;;;;","mappings":"AAgBA,OAAO,MAAMA,WAAW,OAAO,EAC7BC,EAAE,EACFC,UAAU,EACVC,YAAY,EACZC,IAAI,EACJC,KAAK,EACLC,GAAG,EACHC,cAAc,EACdC,GAAG,EACHC,gBAAgB,EAKjB;IACC,MAAMC,UAAUN;IAEhB,MAAMO,MAAM,MAAMH,IAAII,iBAAiB,CAACC,IAAI,CAC1CC,KAAKC,SAAS,CAAC;QACbP,IAAIQ,aAAa;QACjBd,WAAWe,MAAM,CAACC,IAAI;QACtBjB;QACAI;QACAF,eAAe;QACfK,IAAIW,MAAM;QACVX,IAAIY,cAAc;QAClB,OAAOb,mBAAmB,cAAc,QAAQA;QAChDE;KACD;IAGH,IAAIE,KAAK;QACPD,OAAO,CAACJ,IAAI,GAAGK;IACjB,OAAO;QACLD,OAAO,CAACJ,IAAI,GAAG;IACjB;AACF,EAAC"}
+{"version":3,"sources":["../../src/data/populate.ts"],"sourcesContent":["import type { Collection, Field, PayloadRequest, RichTextField, SelectType } from 'payload'\n\nimport { createDataloaderCacheKey } from 'payload'\n\nimport type { AdapterArguments } from '../types.js'\n\ntype Arguments = {\n  currentDepth?: number\n  data: unknown\n  depth: number\n  draft: boolean\n  field: RichTextField<any[], AdapterArguments, AdapterArguments>\n  key: number | string\n  overrideAccess?: boolean\n  req: PayloadRequest\n  select?: SelectType\n  showHiddenFields: boolean\n}\n\nexport const populate = async ({\n  id,\n  collection,\n  currentDepth,\n  data,\n  depth,\n  draft,\n  key,\n  overrideAccess,\n  req,\n  select,\n  showHiddenFields,\n}: {\n  collection: Collection\n  field: Field\n  id: string\n} & Omit<Arguments, 'field'>): Promise<void> => {\n  const dataRef = data as Record<string, unknown>\n\n  const doc = await req.payloadDataLoader.load(\n    createDataloaderCacheKey({\n      collectionSlug: collection.config.slug,\n      currentDepth: currentDepth + 1,\n      depth,\n      docID: id,\n      draft,\n      fallbackLocale: req.locale,\n      locale: req.fallbackLocale,\n      overrideAccess: typeof overrideAccess === 'undefined' ? false : overrideAccess,\n      select,\n      showHiddenFields,\n      transactionID: req.transactionID,\n    }),\n  )\n\n  if (doc) {\n    dataRef[key] = doc\n  } else {\n    dataRef[key] = null\n  }\n}\n"],"names":["createDataloaderCacheKey","populate","id","collection","currentDepth","data","depth","draft","key","overrideAccess","req","select","showHiddenFields","dataRef","doc","payloadDataLoader","load","collectionSlug","config","slug","docID","fallbackLocale","locale","transactionID"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,UAAS;AAiBlD,OAAO,MAAMC,WAAW,OAAO,EAC7BC,EAAE,EACFC,UAAU,EACVC,YAAY,EACZC,IAAI,EACJC,KAAK,EACLC,KAAK,EACLC,GAAG,EACHC,cAAc,EACdC,GAAG,EACHC,MAAM,EACNC,gBAAgB,EAKU;IAC1B,MAAMC,UAAUR;IAEhB,MAAMS,MAAM,MAAMJ,IAAIK,iBAAiB,CAACC,IAAI,CAC1ChB,yBAAyB;QACvBiB,gBAAgBd,WAAWe,MAAM,CAACC,IAAI;QACtCf,cAAcA,eAAe;QAC7BE;QACAc,OAAOlB;QACPK;QACAc,gBAAgBX,IAAIY,MAAM;QAC1BA,QAAQZ,IAAIW,cAAc;QAC1BZ,gBAAgB,OAAOA,mBAAmB,cAAc,QAAQA;QAChEE;QACAC;QACAW,eAAeb,IAAIa,aAAa;IAClC;IAGF,IAAIT,KAAK;QACPD,OAAO,CAACL,IAAI,GAAGM;IACjB,OAAO;QACLD,OAAO,CAACL,IAAI,GAAG;IACjB;AACF,EAAC"}

package/dist/data/recurseNestedFields.d.ts

@@ -1,14 +1,15 @@
-import type { Field, PayloadRequest } from 'payload/types';
+import type { Field, PayloadRequest } from 'payload';
 type NestedRichTextFieldsArgs = {
     currentDepth?: number;
     data: unknown;
     depth: number;
+    draft: boolean;
     fields: Field[];
     overrideAccess: boolean;
-    promises: Promise<void>[];
+    populationPromises: Promise<void>[];
     req: PayloadRequest;
     showHiddenFields: boolean;
 };
-export declare const recurseNestedFields: ({ currentDepth, data, depth, fields, overrideAccess, promises, req, showHiddenFields, }: NestedRichTextFieldsArgs) => void;
+export declare const recurseNestedFields: ({ currentDepth, data, depth, draft, fields, overrideAccess, populationPromises, req, showHiddenFields, }: NestedRichTextFieldsArgs) => void;
 export {};
 //# sourceMappingURL=recurseNestedFields.d.ts.map

package/dist/data/recurseNestedFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recurseNestedFields.d.ts","sourceRoot":"","sources":["../../src/data/recurseNestedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAO1D,KAAK,wBAAwB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,cAAc,EAAE,OAAO,CAAA;IACvB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,mBAAmB,4FAS7B,wBAAwB,KAAG,IAgL7B,CAAA"}
+{"version":3,"file":"recurseNestedFields.d.ts","sourceRoot":"","sources":["../../src/data/recurseNestedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAOpD,KAAK,wBAAwB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,cAAc,EAAE,OAAO,CAAA;IACvB,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACnC,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,mBAAmB,6GAU7B,wBAAwB,KAAG,IA8L7B,CAAA"}

package/dist/data/recurseNestedFields.js

@@ -1,7 +1,7 @@
-import { fieldAffectsData, fieldHasSubFields, fieldIsArrayType } from 'payload/types';
+import { fieldAffectsData, fieldHasSubFields, fieldIsArrayType, tabHasName } from 'payload/shared';
 import { populate } from './populate.js';
 import { recurseRichText } from './richTextRelationshipPromise.js';
-export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, overrideAccess = false, promises, req, showHiddenFields })=>{
+export const recurseNestedFields = ({ currentDepth = 0, data, depth, draft, fields, overrideAccess = false, populationPromises, req, showHiddenFields })=>{
     fields.forEach((field)=>{
         if (field.type === 'relationship' || field.type === 'upload') {
             if (field.type === 'relationship') {
@@ -10,16 +10,18 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                         data[field.name].forEach(({ relationTo, value }, i)=>{
                             const collection = req.payload.collections[relationTo];
                             if (collection) {
-                                promises.push(populate({
+                                populationPromises.push(populate({
                                     id: value,
                                     collection,
                                     currentDepth,
                                     data: data[field.name],
                                     depth,
+                                    draft,
                                     field,
                                     key: i,
                                     overrideAccess,
                                     req,
+                                    select: collection.config.defaultPopulate,
                                     showHiddenFields
                                 }));
                             }
@@ -28,16 +30,18 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                         data[field.name].forEach((id, i)=>{
                             const collection = req.payload.collections[field.relationTo];
                             if (collection) {
-                                promises.push(populate({
+                                populationPromises.push(populate({
                                     id,
                                     collection,
                                     currentDepth,
                                     data: data[field.name],
                                     depth,
+                                    draft,
                                     field,
                                     key: i,
                                     overrideAccess,
                                     req,
+                                    select: collection.config.defaultPopulate,
                                     showHiddenFields
                                 }));
                             }
@@ -46,16 +50,18 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                 } else if (Array.isArray(field.relationTo) && data[field.name]?.value && data[field.name]?.relationTo) {
                     if (!('hasMany' in field) || !field.hasMany) {
                         const collection = req.payload.collections[data[field.name].relationTo];
-                        promises.push(populate({
+                        populationPromises.push(populate({
                             id: data[field.name].value,
                             collection,
                             currentDepth,
                             data: data[field.name],
                             depth,
+                            draft,
                             field,
                             key: 'value',
                             overrideAccess,
                             req,
+                            select: collection.config.defaultPopulate,
                             showHiddenFields
                         }));
                     }
@@ -63,16 +69,18 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
             }
             if (typeof data[field.name] !== 'undefined' && typeof field.relationTo === 'string') {
                 const collection = req.payload.collections[field.relationTo];
-                promises.push(populate({
+                populationPromises.push(populate({
                     id: data[field.name],
                     collection,
                     currentDepth,
                     data,
                     depth,
+                    draft,
                     field,
                     key: field.name,
                     overrideAccess,
                     req,
+                    select: collection.config.defaultPopulate,
                     showHiddenFields
                 }));
             }
@@ -82,9 +90,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                     currentDepth,
                     data: data[field.name],
                     depth,
+                    draft,
                     fields: field.fields,
                     overrideAccess,
-                    promises,
+                    populationPromises,
                     req,
                     showHiddenFields
                 });
@@ -93,9 +102,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                     currentDepth,
                     data,
                     depth,
+                    draft,
                     fields: field.fields,
                     overrideAccess,
-                    promises,
+                    populationPromises,
                     req,
                     showHiddenFields
                 });
@@ -104,11 +114,12 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
             field.tabs.forEach((tab)=>{
                 recurseNestedFields({
                     currentDepth,
-                    data,
+                    data: tabHasName(tab) ? data[tab.name] : data,
                     depth,
+                    draft,
                     fields: tab.fields,
                     overrideAccess,
-                    promises,
+                    populationPromises,
                     req,
                     showHiddenFields
                 });
@@ -122,9 +133,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                             currentDepth,
                             data: data[field.name][i],
                             depth,
+                            draft,
                             fields: block.fields,
                             overrideAccess,
-                            promises,
+                            populationPromises,
                             req,
                             showHiddenFields
                         });
@@ -137,9 +149,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                         currentDepth,
                         data: data[field.name][i],
                         depth,
+                        draft,
                         fields: field.fields,
                         overrideAccess,
-                        promises,
+                        populationPromises,
                         req,
                         showHiddenFields
                     });
@@ -153,9 +166,10 @@ export const recurseNestedFields = ({ currentDepth = 0, data, depth, fields, ove
                         children: node.children,
                         currentDepth,
                         depth,
+                        draft,
                         field,
                         overrideAccess,
-                        promises,
+                        populationPromises,
                         req,
                         showHiddenFields
                     });

package/dist/data/recurseNestedFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/data/recurseNestedFields.ts"],"sourcesContent":["import type { Field, PayloadRequest } from 'payload/types'\n\nimport { fieldAffectsData, fieldHasSubFields, fieldIsArrayType } from 'payload/types'\n\nimport { populate } from './populate.js'\nimport { recurseRichText } from './richTextRelationshipPromise.js'\n\ntype NestedRichTextFieldsArgs = {\n  currentDepth?: number\n  data: unknown\n  depth: number\n  fields: Field[]\n  overrideAccess: boolean\n  promises: Promise<void>[]\n  req: PayloadRequest\n  showHiddenFields: boolean\n}\n\nexport const recurseNestedFields = ({\n  currentDepth = 0,\n  data,\n  depth,\n  fields,\n  overrideAccess = false,\n  promises,\n  req,\n  showHiddenFields,\n}: NestedRichTextFieldsArgs): void => {\n  fields.forEach((field) => {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (field.type === 'relationship') {\n        if (field.hasMany && Array.isArray(data[field.name])) {\n          if (Array.isArray(field.relationTo)) {\n            data[field.name].forEach(({ relationTo, value }, i) => {\n              const collection = req.payload.collections[relationTo]\n              if (collection) {\n                promises.push(\n                  populate({\n                    id: value,\n                    collection,\n                    currentDepth,\n                    data: data[field.name],\n                    depth,\n                    field,\n                    key: i,\n                    overrideAccess,\n                    req,\n                    showHiddenFields,\n                  }),\n                )\n              }\n            })\n          } else {\n            data[field.name].forEach((id, i) => {\n              const collection = req.payload.collections[field.relationTo as string]\n              if (collection) {\n                promises.push(\n                  populate({\n                    id,\n                    collection,\n                    currentDepth,\n                    data: data[field.name],\n                    depth,\n                    field,\n                    key: i,\n                    overrideAccess,\n                    req,\n                    showHiddenFields,\n                  }),\n                )\n              }\n            })\n          }\n        } else if (\n          Array.isArray(field.relationTo) &&\n          data[field.name]?.value &&\n          data[field.name]?.relationTo\n        ) {\n          if (!('hasMany' in field) || !field.hasMany) {\n            const collection = req.payload.collections[data[field.name].relationTo]\n            promises.push(\n              populate({\n                id: data[field.name].value,\n                collection,\n                currentDepth,\n                data: data[field.name],\n                depth,\n                field,\n                key: 'value',\n                overrideAccess,\n                req,\n                showHiddenFields,\n              }),\n            )\n          }\n        }\n      }\n      if (typeof data[field.name] !== 'undefined' && typeof field.relationTo === 'string') {\n        const collection = req.payload.collections[field.relationTo]\n        promises.push(\n          populate({\n            id: data[field.name],\n            collection,\n            currentDepth,\n            data,\n            depth,\n            field,\n            key: field.name,\n            overrideAccess,\n            req,\n            showHiddenFields,\n          }),\n        )\n      }\n    } else if (fieldHasSubFields(field) && !fieldIsArrayType(field)) {\n      if (fieldAffectsData(field) && typeof data[field.name] === 'object') {\n        recurseNestedFields({\n          currentDepth,\n          data: data[field.name],\n          depth,\n          fields: field.fields,\n          overrideAccess,\n          promises,\n          req,\n          showHiddenFields,\n        })\n      } else {\n        recurseNestedFields({\n          currentDepth,\n          data,\n          depth,\n          fields: field.fields,\n          overrideAccess,\n          promises,\n          req,\n          showHiddenFields,\n        })\n      }\n    } else if (field.type === 'tabs') {\n      field.tabs.forEach((tab) => {\n        recurseNestedFields({\n          currentDepth,\n          data,\n          depth,\n          fields: tab.fields,\n          overrideAccess,\n          promises,\n          req,\n          showHiddenFields,\n        })\n      })\n    } else if (Array.isArray(data[field.name])) {\n      if (field.type === 'blocks') {\n        data[field.name].forEach((row, i) => {\n          const block = field.blocks.find(({ slug }) => slug === row?.blockType)\n          if (block) {\n            recurseNestedFields({\n              currentDepth,\n              data: data[field.name][i],\n              depth,\n              fields: block.fields,\n              overrideAccess,\n              promises,\n              req,\n              showHiddenFields,\n            })\n          }\n        })\n      }\n\n      if (field.type === 'array') {\n        data[field.name].forEach((_, i) => {\n          recurseNestedFields({\n            currentDepth,\n            data: data[field.name][i],\n            depth,\n            fields: field.fields,\n            overrideAccess,\n            promises,\n            req,\n            showHiddenFields,\n          })\n        })\n      }\n    }\n\n    if (field.type === 'richText' && Array.isArray(data[field.name])) {\n      data[field.name].forEach((node) => {\n        if (Array.isArray(node.children)) {\n          recurseRichText({\n            children: node.children,\n            currentDepth,\n            depth,\n            field,\n            overrideAccess,\n            promises,\n            req,\n            showHiddenFields,\n          })\n        }\n      })\n    }\n  })\n}\n"],"names":["fieldAffectsData","fieldHasSubFields","fieldIsArrayType","populate","recurseRichText","recurseNestedFields","currentDepth","data","depth","fields","overrideAccess","promises","req","showHiddenFields","forEach","field","type","hasMany","Array","isArray","name","relationTo","value","i","collection","payload","collections","push","id","key","tabs","tab","row","block","blocks","find","slug","blockType","_","node","children"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/data/recurseNestedFields.ts"],"sourcesContent":["import type { Field, PayloadRequest } from 'payload'\n\nimport { fieldAffectsData, fieldHasSubFields, fieldIsArrayType, tabHasName } from 'payload/shared'\n\nimport { populate } from './populate.js'\nimport { recurseRichText } from './richTextRelationshipPromise.js'\n\ntype NestedRichTextFieldsArgs = {\n  currentDepth?: number\n  data: unknown\n  depth: number\n  draft: boolean\n  fields: Field[]\n  overrideAccess: boolean\n  populationPromises: Promise<void>[]\n  req: PayloadRequest\n  showHiddenFields: boolean\n}\n\nexport const recurseNestedFields = ({\n  currentDepth = 0,\n  data,\n  depth,\n  draft,\n  fields,\n  overrideAccess = false,\n  populationPromises,\n  req,\n  showHiddenFields,\n}: NestedRichTextFieldsArgs): void => {\n  fields.forEach((field) => {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (field.type === 'relationship') {\n        if (field.hasMany && Array.isArray(data[field.name])) {\n          if (Array.isArray(field.relationTo)) {\n            data[field.name].forEach(({ relationTo, value }, i) => {\n              const collection = req.payload.collections[relationTo]\n              if (collection) {\n                populationPromises.push(\n                  populate({\n                    id: value,\n                    collection,\n                    currentDepth,\n                    data: data[field.name],\n                    depth,\n                    draft,\n                    field,\n                    key: i,\n                    overrideAccess,\n                    req,\n                    select: collection.config.defaultPopulate,\n                    showHiddenFields,\n                  }),\n                )\n              }\n            })\n          } else {\n            data[field.name].forEach((id, i) => {\n              const collection = req.payload.collections[field.relationTo as string]\n              if (collection) {\n                populationPromises.push(\n                  populate({\n                    id,\n                    collection,\n                    currentDepth,\n                    data: data[field.name],\n                    depth,\n                    draft,\n                    field,\n                    key: i,\n                    overrideAccess,\n                    req,\n                    select: collection.config.defaultPopulate,\n                    showHiddenFields,\n                  }),\n                )\n              }\n            })\n          }\n        } else if (\n          Array.isArray(field.relationTo) &&\n          data[field.name]?.value &&\n          data[field.name]?.relationTo\n        ) {\n          if (!('hasMany' in field) || !field.hasMany) {\n            const collection = req.payload.collections[data[field.name].relationTo]\n            populationPromises.push(\n              populate({\n                id: data[field.name].value,\n                collection,\n                currentDepth,\n                data: data[field.name],\n                depth,\n                draft,\n                field,\n                key: 'value',\n                overrideAccess,\n                req,\n                select: collection.config.defaultPopulate,\n                showHiddenFields,\n              }),\n            )\n          }\n        }\n      }\n      if (typeof data[field.name] !== 'undefined' && typeof field.relationTo === 'string') {\n        const collection = req.payload.collections[field.relationTo]\n        populationPromises.push(\n          populate({\n            id: data[field.name],\n            collection,\n            currentDepth,\n            data,\n            depth,\n            draft,\n            field,\n            key: field.name,\n            overrideAccess,\n            req,\n            select: collection.config.defaultPopulate,\n            showHiddenFields,\n          }),\n        )\n      }\n    } else if (fieldHasSubFields(field) && !fieldIsArrayType(field)) {\n      if (fieldAffectsData(field) && typeof data[field.name] === 'object') {\n        recurseNestedFields({\n          currentDepth,\n          data: data[field.name],\n          depth,\n          draft,\n          fields: field.fields,\n          overrideAccess,\n          populationPromises,\n          req,\n          showHiddenFields,\n        })\n      } else {\n        recurseNestedFields({\n          currentDepth,\n          data,\n          depth,\n          draft,\n          fields: field.fields,\n          overrideAccess,\n          populationPromises,\n          req,\n          showHiddenFields,\n        })\n      }\n    } else if (field.type === 'tabs') {\n      field.tabs.forEach((tab) => {\n        recurseNestedFields({\n          currentDepth,\n          data: tabHasName(tab) ? data[tab.name] : data,\n          depth,\n          draft,\n          fields: tab.fields,\n          overrideAccess,\n          populationPromises,\n          req,\n          showHiddenFields,\n        })\n      })\n    } else if (Array.isArray(data[field.name])) {\n      if (field.type === 'blocks') {\n        data[field.name].forEach((row, i) => {\n          const block = field.blocks.find(({ slug }) => slug === row?.blockType)\n          if (block) {\n            recurseNestedFields({\n              currentDepth,\n              data: data[field.name][i],\n              depth,\n              draft,\n              fields: block.fields,\n              overrideAccess,\n              populationPromises,\n              req,\n              showHiddenFields,\n            })\n          }\n        })\n      }\n\n      if (field.type === 'array') {\n        data[field.name].forEach((_, i) => {\n          recurseNestedFields({\n            currentDepth,\n            data: data[field.name][i],\n            depth,\n            draft,\n            fields: field.fields,\n            overrideAccess,\n            populationPromises,\n            req,\n            showHiddenFields,\n          })\n        })\n      }\n    }\n\n    if (field.type === 'richText' && Array.isArray(data[field.name])) {\n      data[field.name].forEach((node) => {\n        if (Array.isArray(node.children)) {\n          recurseRichText({\n            children: node.children,\n            currentDepth,\n            depth,\n            draft,\n            field,\n            overrideAccess,\n            populationPromises,\n            req,\n            showHiddenFields,\n          })\n        }\n      })\n    }\n  })\n}\n"],"names":["fieldAffectsData","fieldHasSubFields","fieldIsArrayType","tabHasName","populate","recurseRichText","recurseNestedFields","currentDepth","data","depth","draft","fields","overrideAccess","populationPromises","req","showHiddenFields","forEach","field","type","hasMany","Array","isArray","name","relationTo","value","i","collection","payload","collections","push","id","key","select","config","defaultPopulate","tabs","tab","row","block","blocks","find","slug","blockType","_","node","children"],"mappings":"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"}

package/dist/data/richTextRelationshipPromise.d.ts

@@ -1,17 +1,18 @@
-import type { PayloadRequest, RichTextAdapter, RichTextField } from 'payload/types';
+import type { PayloadRequest, RichTextAdapter, RichTextField } from 'payload';
 import type { AdapterArguments } from '../types.js';
-export type Args = Parameters<RichTextAdapter<any[], AdapterArguments>['populationPromise']>[0];
+export type Args = Parameters<RichTextAdapter<any[], AdapterArguments>['graphQLPopulationPromises']>[0];
 type RecurseRichTextArgs = {
     children: unknown[];
     currentDepth: number;
     depth: number;
-    field: RichTextField<any[], AdapterArguments, AdapterArguments>;
+    draft: boolean;
+    field: RichTextField<any[], any, any>;
     overrideAccess: boolean;
-    promises: Promise<void>[];
+    populationPromises: Promise<void>[];
     req: PayloadRequest;
     showHiddenFields: boolean;
 };
-export declare const recurseRichText: ({ children, currentDepth, depth, field, overrideAccess, promises, req, showHiddenFields, }: RecurseRichTextArgs) => void;
-export declare const richTextRelationshipPromise: ({ currentDepth, depth, field, overrideAccess, req, showHiddenFields, siblingDoc, }: Args) => Promise<void>;
+export declare const recurseRichText: ({ children, currentDepth, depth, draft, field, overrideAccess, populationPromises, req, showHiddenFields, }: RecurseRichTextArgs) => void;
+export declare const richTextRelationshipPromise: ({ currentDepth, depth, draft, field, overrideAccess, populationPromises, req, showHiddenFields, siblingDoc, }: Args) => void;
 export {};
 //# sourceMappingURL=richTextRelationshipPromise.d.ts.map

package/dist/data/richTextRelationshipPromise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"richTextRelationshipPromise.d.ts","sourceRoot":"","sources":["../../src/data/richTextRelationshipPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAEnF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAKnD,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAE/F,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;IAC/D,cAAc,EAAE,OAAO,CAAA;IACvB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACzB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,eAAe,+FASzB,mBAAmB,KAAG,IA6FxB,CAAA;AAED,eAAO,MAAM,2BAA2B,uFAQrC,IAAI,KAAG,QAAQ,IAAI,CAerB,CAAA"}
+{"version":3,"file":"richTextRelationshipPromise.d.ts","sourceRoot":"","sources":["../../src/data/richTextRelationshipPromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAKnD,MAAM,MAAM,IAAI,GAAG,UAAU,CAC3B,eAAe,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,2BAA2B,CAAC,CACtE,CAAC,CAAC,CAAC,CAAA;AAEJ,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,aAAa,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;IACrC,cAAc,EAAE,OAAO,CAAA;IACvB,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACnC,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,eAAe,gHAUzB,mBAAmB,KAAG,IAoGxB,CAAA;AAED,eAAO,MAAM,2BAA2B,kHAUrC,IAAI,SAYN,CAAA"}

package/dist/data/richTextRelationshipPromise.js

@@ -1,6 +1,6 @@
 import { populate } from './populate.js';
 import { recurseNestedFields } from './recurseNestedFields.js';
-export const recurseRichText = ({ children, currentDepth = 0, depth, field, overrideAccess = false, promises, req, showHiddenFields })=>{
+export const recurseRichText = ({ children, currentDepth = 0, depth, draft, field, overrideAccess = false, populationPromises, req, showHiddenFields })=>{
     if (depth <= 0 || currentDepth > depth) {
         return;
     }
@@ -9,16 +9,18 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
             if ((element.type === 'relationship' || element.type === 'upload') && element?.value?.id) {
                 const collection = req.payload.collections[element?.relationTo];
                 if (collection) {
-                    promises.push(populate({
+                    populationPromises.push(populate({
                         id: element.value.id,
                         collection,
                         currentDepth,
                         data: element,
                         depth,
+                        draft,
                         field,
                         key: 'value',
                         overrideAccess,
                         req,
+                        select: collection.config.defaultPopulate,
                         showHiddenFields
                     }));
                 }
@@ -27,9 +29,10 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
                         currentDepth,
                         data: element.fields || {},
                         depth,
+                        draft,
                         fields: field.admin.upload.collections[element.relationTo].fields,
                         overrideAccess,
-                        promises,
+                        populationPromises,
                         req,
                         showHiddenFields
                     });
@@ -39,16 +42,18 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
                 if (element?.doc?.value && element?.doc?.relationTo) {
                     const collection = req.payload.collections[element?.doc?.relationTo];
                     if (collection) {
-                        promises.push(populate({
+                        populationPromises.push(populate({
                             id: element.doc.value,
                             collection,
                             currentDepth,
                             data: element.doc,
                             depth,
+                            draft,
                             field,
                             key: 'value',
                             overrideAccess,
                             req,
+                            select: collection.config.defaultPopulate,
                             showHiddenFields
                         }));
                     }
@@ -58,9 +63,10 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
                         currentDepth,
                         data: element.fields || {},
                         depth,
+                        draft,
                         fields: field.admin?.link?.fields,
                         overrideAccess,
-                        promises,
+                        populationPromises,
                         req,
                         showHiddenFields
                     });
@@ -71,9 +77,10 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
                     children: element.children,
                     currentDepth,
                     depth,
+                    draft,
                     field,
                     overrideAccess,
-                    promises,
+                    populationPromises,
                     req,
                     showHiddenFields
                 });
@@ -81,19 +88,18 @@ export const recurseRichText = ({ children, currentDepth = 0, depth, field, over
         });
     }
 };
-export const richTextRelationshipPromise = async ({ currentDepth, depth, field, overrideAccess, req, showHiddenFields, siblingDoc })=>{
-    const promises = [];
+export const richTextRelationshipPromise = ({ currentDepth, depth, draft, field, overrideAccess, populationPromises, req, showHiddenFields, siblingDoc })=>{
     recurseRichText({
         children: siblingDoc[field.name],
         currentDepth,
         depth,
+        draft,
         field,
         overrideAccess,
-        promises,
+        populationPromises,
         req,
         showHiddenFields
     });
-    await Promise.all(promises);
 };
 
 //# sourceMappingURL=richTextRelationshipPromise.js.map

package/dist/data/richTextRelationshipPromise.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/data/richTextRelationshipPromise.ts"],"sourcesContent":["import type { PayloadRequest, RichTextAdapter, RichTextField } from 'payload/types'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { populate } from './populate.js'\nimport { recurseNestedFields } from './recurseNestedFields.js'\n\nexport type Args = Parameters<RichTextAdapter<any[], AdapterArguments>['populationPromise']>[0]\n\ntype RecurseRichTextArgs = {\n  children: unknown[]\n  currentDepth: number\n  depth: number\n  field: RichTextField<any[], AdapterArguments, AdapterArguments>\n  overrideAccess: boolean\n  promises: Promise<void>[]\n  req: PayloadRequest\n  showHiddenFields: boolean\n}\n\nexport const recurseRichText = ({\n  children,\n  currentDepth = 0,\n  depth,\n  field,\n  overrideAccess = false,\n  promises,\n  req,\n  showHiddenFields,\n}: RecurseRichTextArgs): void => {\n  if (depth <= 0 || currentDepth > depth) {\n    return\n  }\n\n  if (Array.isArray(children)) {\n    ;(children as any[]).forEach((element) => {\n      if ((element.type === 'relationship' || element.type === 'upload') && element?.value?.id) {\n        const collection = req.payload.collections[element?.relationTo]\n\n        if (collection) {\n          promises.push(\n            populate({\n              id: element.value.id,\n              collection,\n              currentDepth,\n              data: element,\n              depth,\n              field,\n              key: 'value',\n              overrideAccess,\n              req,\n              showHiddenFields,\n            }),\n          )\n        }\n        if (\n          element.type === 'upload' &&\n          Array.isArray(field.admin?.upload?.collections?.[element?.relationTo]?.fields)\n        ) {\n          recurseNestedFields({\n            currentDepth,\n            data: element.fields || {},\n            depth,\n            fields: field.admin.upload.collections[element.relationTo].fields,\n            overrideAccess,\n            promises,\n            req,\n            showHiddenFields,\n          })\n        }\n      }\n\n      if (element.type === 'link') {\n        if (element?.doc?.value && element?.doc?.relationTo) {\n          const collection = req.payload.collections[element?.doc?.relationTo]\n\n          if (collection) {\n            promises.push(\n              populate({\n                id: element.doc.value,\n                collection,\n                currentDepth,\n                data: element.doc,\n                depth,\n                field,\n                key: 'value',\n                overrideAccess,\n                req,\n                showHiddenFields,\n              }),\n            )\n          }\n        }\n\n        if (Array.isArray(field.admin?.link?.fields)) {\n          recurseNestedFields({\n            currentDepth,\n            data: element.fields || {},\n            depth,\n            fields: field.admin?.link?.fields,\n            overrideAccess,\n            promises,\n            req,\n            showHiddenFields,\n          })\n        }\n      }\n\n      if (element?.children) {\n        recurseRichText({\n          children: element.children,\n          currentDepth,\n          depth,\n          field,\n          overrideAccess,\n          promises,\n          req,\n          showHiddenFields,\n        })\n      }\n    })\n  }\n}\n\nexport const richTextRelationshipPromise = async ({\n  currentDepth,\n  depth,\n  field,\n  overrideAccess,\n  req,\n  showHiddenFields,\n  siblingDoc,\n}: Args): Promise<void> => {\n  const promises = []\n\n  recurseRichText({\n    children: siblingDoc[field.name] as unknown[],\n    currentDepth,\n    depth,\n    field,\n    overrideAccess,\n    promises,\n    req,\n    showHiddenFields,\n  })\n\n  await Promise.all(promises)\n}\n"],"names":["populate","recurseNestedFields","recurseRichText","children","currentDepth","depth","field","overrideAccess","promises","req","showHiddenFields","Array","isArray","forEach","element","type","value","id","collection","payload","collections","relationTo","push","data","key","admin","upload","fields","doc","link","richTextRelationshipPromise","siblingDoc","name","Promise","all"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,QAAQ,QAAQ,gBAAe;AACxC,SAASC,mBAAmB,QAAQ,2BAA0B;AAe9D,OAAO,MAAMC,kBAAkB,CAAC,EAC9BC,QAAQ,EACRC,eAAe,CAAC,EAChBC,KAAK,EACLC,KAAK,EACLC,iBAAiB,KAAK,EACtBC,QAAQ,EACRC,GAAG,EACHC,gBAAgB,EACI;IACpB,IAAIL,SAAS,KAAKD,eAAeC,OAAO;QACtC;IACF;IAEA,IAAIM,MAAMC,OAAO,CAACT,WAAW;QACzBA,SAAmBU,OAAO,CAAC,CAACC;YAC5B,IAAI,AAACA,CAAAA,QAAQC,IAAI,KAAK,kBAAkBD,QAAQC,IAAI,KAAK,QAAO,KAAMD,SAASE,OAAOC,IAAI;gBACxF,MAAMC,aAAaT,IAAIU,OAAO,CAACC,WAAW,CAACN,SAASO,WAAW;gBAE/D,IAAIH,YAAY;oBACdV,SAASc,IAAI,CACXtB,SAAS;wBACPiB,IAAIH,QAAQE,KAAK,CAACC,EAAE;wBACpBC;wBACAd;wBACAmB,MAAMT;wBACNT;wBACAC;wBACAkB,KAAK;wBACLjB;wBACAE;wBACAC;oBACF;gBAEJ;gBACA,IACEI,QAAQC,IAAI,KAAK,YACjBJ,MAAMC,OAAO,CAACN,MAAMmB,KAAK,EAAEC,QAAQN,aAAa,CAACN,SAASO,WAAW,EAAEM,SACvE;oBACA1B,oBAAoB;wBAClBG;wBACAmB,MAAMT,QAAQa,MAAM,IAAI,CAAC;wBACzBtB;wBACAsB,QAAQrB,MAAMmB,KAAK,CAACC,MAAM,CAACN,WAAW,CAACN,QAAQO,UAAU,CAAC,CAACM,MAAM;wBACjEpB;wBACAC;wBACAC;wBACAC;oBACF;gBACF;YACF;YAEA,IAAII,QAAQC,IAAI,KAAK,QAAQ;gBAC3B,IAAID,SAASc,KAAKZ,SAASF,SAASc,KAAKP,YAAY;oBACnD,MAAMH,aAAaT,IAAIU,OAAO,CAACC,WAAW,CAACN,SAASc,KAAKP,WAAW;oBAEpE,IAAIH,YAAY;wBACdV,SAASc,IAAI,CACXtB,SAAS;4BACPiB,IAAIH,QAAQc,GAAG,CAACZ,KAAK;4BACrBE;4BACAd;4BACAmB,MAAMT,QAAQc,GAAG;4BACjBvB;4BACAC;4BACAkB,KAAK;4BACLjB;4BACAE;4BACAC;wBACF;oBAEJ;gBACF;gBAEA,IAAIC,MAAMC,OAAO,CAACN,MAAMmB,KAAK,EAAEI,MAAMF,SAAS;oBAC5C1B,oBAAoB;wBAClBG;wBACAmB,MAAMT,QAAQa,MAAM,IAAI,CAAC;wBACzBtB;wBACAsB,QAAQrB,MAAMmB,KAAK,EAAEI,MAAMF;wBAC3BpB;wBACAC;wBACAC;wBACAC;oBACF;gBACF;YACF;YAEA,IAAII,SAASX,UAAU;gBACrBD,gBAAgB;oBACdC,UAAUW,QAAQX,QAAQ;oBAC1BC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;gBACF;YACF;QACF;IACF;AACF,EAAC;AAED,OAAO,MAAMoB,8BAA8B,OAAO,EAChD1B,YAAY,EACZC,KAAK,EACLC,KAAK,EACLC,cAAc,EACdE,GAAG,EACHC,gBAAgB,EAChBqB,UAAU,EACL;IACL,MAAMvB,WAAW,EAAE;IAEnBN,gBAAgB;QACdC,UAAU4B,UAAU,CAACzB,MAAM0B,IAAI,CAAC;QAChC5B;QACAC;QACAC;QACAC;QACAC;QACAC;QACAC;IACF;IAEA,MAAMuB,QAAQC,GAAG,CAAC1B;AACpB,EAAC"}
+{"version":3,"sources":["../../src/data/richTextRelationshipPromise.ts"],"sourcesContent":["import type { PayloadRequest, RichTextAdapter, RichTextField } from 'payload'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { populate } from './populate.js'\nimport { recurseNestedFields } from './recurseNestedFields.js'\n\nexport type Args = Parameters<\n  RichTextAdapter<any[], AdapterArguments>['graphQLPopulationPromises']\n>[0]\n\ntype RecurseRichTextArgs = {\n  children: unknown[]\n  currentDepth: number\n  depth: number\n  draft: boolean\n  field: RichTextField<any[], any, any>\n  overrideAccess: boolean\n  populationPromises: Promise<void>[]\n  req: PayloadRequest\n  showHiddenFields: boolean\n}\n\nexport const recurseRichText = ({\n  children,\n  currentDepth = 0,\n  depth,\n  draft,\n  field,\n  overrideAccess = false,\n  populationPromises,\n  req,\n  showHiddenFields,\n}: RecurseRichTextArgs): void => {\n  if (depth <= 0 || currentDepth > depth) {\n    return\n  }\n\n  if (Array.isArray(children)) {\n    ;(children as any[]).forEach((element) => {\n      if ((element.type === 'relationship' || element.type === 'upload') && element?.value?.id) {\n        const collection = req.payload.collections[element?.relationTo]\n\n        if (collection) {\n          populationPromises.push(\n            populate({\n              id: element.value.id,\n              collection,\n              currentDepth,\n              data: element,\n              depth,\n              draft,\n              field,\n              key: 'value',\n              overrideAccess,\n              req,\n              select: collection.config.defaultPopulate,\n              showHiddenFields,\n            }),\n          )\n        }\n        if (\n          element.type === 'upload' &&\n          Array.isArray(field.admin?.upload?.collections?.[element?.relationTo]?.fields)\n        ) {\n          recurseNestedFields({\n            currentDepth,\n            data: element.fields || {},\n            depth,\n            draft,\n            fields: field.admin.upload.collections[element.relationTo].fields,\n            overrideAccess,\n            populationPromises,\n            req,\n            showHiddenFields,\n          })\n        }\n      }\n\n      if (element.type === 'link') {\n        if (element?.doc?.value && element?.doc?.relationTo) {\n          const collection = req.payload.collections[element?.doc?.relationTo]\n\n          if (collection) {\n            populationPromises.push(\n              populate({\n                id: element.doc.value,\n                collection,\n                currentDepth,\n                data: element.doc,\n                depth,\n                draft,\n                field,\n                key: 'value',\n                overrideAccess,\n                req,\n                select: collection.config.defaultPopulate,\n                showHiddenFields,\n              }),\n            )\n          }\n        }\n\n        if (Array.isArray(field.admin?.link?.fields)) {\n          recurseNestedFields({\n            currentDepth,\n            data: element.fields || {},\n            depth,\n            draft,\n            fields: field.admin?.link?.fields,\n            overrideAccess,\n            populationPromises,\n            req,\n            showHiddenFields,\n          })\n        }\n      }\n\n      if (element?.children) {\n        recurseRichText({\n          children: element.children,\n          currentDepth,\n          depth,\n          draft,\n          field,\n          overrideAccess,\n          populationPromises,\n          req,\n          showHiddenFields,\n        })\n      }\n    })\n  }\n}\n\nexport const richTextRelationshipPromise = ({\n  currentDepth,\n  depth,\n  draft,\n  field,\n  overrideAccess,\n  populationPromises,\n  req,\n  showHiddenFields,\n  siblingDoc,\n}: Args) => {\n  recurseRichText({\n    children: siblingDoc[field.name] as unknown[],\n    currentDepth,\n    depth,\n    draft,\n    field,\n    overrideAccess,\n    populationPromises,\n    req,\n    showHiddenFields,\n  })\n}\n"],"names":["populate","recurseNestedFields","recurseRichText","children","currentDepth","depth","draft","field","overrideAccess","populationPromises","req","showHiddenFields","Array","isArray","forEach","element","type","value","id","collection","payload","collections","relationTo","push","data","key","select","config","defaultPopulate","admin","upload","fields","doc","link","richTextRelationshipPromise","siblingDoc","name"],"mappings":"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"}

package/dist/data/validation.d.ts

@@ -1,4 +1,4 @@
-import type { RichTextField, Validate } from 'payload/types';
+import type { RichTextField, Validate } from 'payload';
 import type { AdapterArguments } from '../types.js';
 export declare const richTextValidate: Validate<unknown[], unknown, RichTextField<any[], AdapterArguments>, RichTextField<any[], AdapterArguments>>;
 //# sourceMappingURL=validation.d.ts.map

package/dist/data/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/data/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAInD,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CACrC,OAAO,EAAE,EACT,OAAO,EACP,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,EACtC,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAUvC,CAAA"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/data/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAInD,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CACrC,OAAO,EAAE,EACT,OAAO,EACP,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,EACtC,aAAa,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAYvC,CAAA"}

package/dist/data/validation.js

@@ -3,7 +3,9 @@ export const richTextValidate = (value, { req, required })=>{
     const { t } = req;
     if (required) {
         const stringifiedDefaultValue = JSON.stringify(defaultRichTextValue);
-        if (value && JSON.stringify(value) !== stringifiedDefaultValue) return true;
+        if (value && JSON.stringify(value) !== stringifiedDefaultValue) {
+            return true;
+        }
         return t('validation:required');
     }
     return true;

package/dist/data/validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/data/validation.ts"],"sourcesContent":["import type { RichTextField, Validate } from 'payload/types'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { defaultRichTextValue } from './defaultValue.js'\n\nexport const richTextValidate: Validate<\n  unknown[],\n  unknown,\n  RichTextField<any[], AdapterArguments>,\n  RichTextField<any[], AdapterArguments>\n> = (value, { req, required }) => {\n  const { t } = req\n  if (required) {\n    const stringifiedDefaultValue = JSON.stringify(defaultRichTextValue)\n    if (value && JSON.stringify(value) !== stringifiedDefaultValue) return true\n    return t('validation:required')\n  }\n\n  return true\n}\n"],"names":["defaultRichTextValue","richTextValidate","value","req","required","t","stringifiedDefaultValue","JSON","stringify"],"rangeMappings":";;;;;;;;;","mappings":"AAIA,SAASA,oBAAoB,QAAQ,oBAAmB;AAExD,OAAO,MAAMC,mBAKT,CAACC,OAAO,EAAEC,GAAG,EAAEC,QAAQ,EAAE;IAC3B,MAAM,EAAEC,CAAC,EAAE,GAAGF;IACd,IAAIC,UAAU;QACZ,MAAME,0BAA0BC,KAAKC,SAAS,CAACR;QAC/C,IAAIE,SAASK,KAAKC,SAAS,CAACN,WAAWI,yBAAyB,OAAO;QACvE,OAAOD,EAAE;IACX;IAEA,OAAO;AACT,EAAC"}
+{"version":3,"sources":["../../src/data/validation.ts"],"sourcesContent":["import type { RichTextField, Validate } from 'payload'\n\nimport type { AdapterArguments } from '../types.js'\n\nimport { defaultRichTextValue } from './defaultValue.js'\n\nexport const richTextValidate: Validate<\n  unknown[],\n  unknown,\n  RichTextField<any[], AdapterArguments>,\n  RichTextField<any[], AdapterArguments>\n> = (value, { req, required }) => {\n  const { t } = req\n  if (required) {\n    const stringifiedDefaultValue = JSON.stringify(defaultRichTextValue)\n    if (value && JSON.stringify(value) !== stringifiedDefaultValue) {\n      return true\n    }\n    return t('validation:required')\n  }\n\n  return true\n}\n"],"names":["defaultRichTextValue","richTextValidate","value","req","required","t","stringifiedDefaultValue","JSON","stringify"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,oBAAmB;AAExD,OAAO,MAAMC,mBAKT,CAACC,OAAO,EAAEC,GAAG,EAAEC,QAAQ,EAAE;IAC3B,MAAM,EAAEC,CAAC,EAAE,GAAGF;IACd,IAAIC,UAAU;QACZ,MAAME,0BAA0BC,KAAKC,SAAS,CAACR;QAC/C,IAAIE,SAASK,KAAKC,SAAS,CAACN,WAAWI,yBAAyB;YAC9D,OAAO;QACT;QACA,OAAOD,EAAE;IACX;IAEA,OAAO;AACT,EAAC"}