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

package/dist/forms/RenderFields/index.js

@@ -11,12 +11,11 @@ import { RenderField } from './RenderField.js';
 import './index.css';
 const baseClass = 'render-fields';
 export const RenderFields = props => {
-  const $ = _c(22);
+  const $ = _c(20);
   const {
     className,
     fields,
     forceRender,
-    margins,
     parentIndexPath,
     parentPath,
     parentSchemaPath,
@@ -25,24 +24,20 @@ export const RenderFields = props => {
   } = props;
   const operation = useOperation();
   if (fields && fields.length > 0) {
-    const t0 = margins && `${baseClass}--margins-${margins}`;
-    const t1 = margins === false && `${baseClass}--margins-none`;
-    let t2;
-    if ($[0] !== className || $[1] !== t0 || $[2] !== t1) {
-      t2 = [baseClass, className, t0, t1].filter(Boolean);
+    let t0;
+    if ($[0] !== className) {
+      t0 = [baseClass, className].filter(Boolean);
       $[0] = className;
       $[1] = t0;
-      $[2] = t1;
-      $[3] = t2;
     } else {
-      t2 = $[3];
+      t0 = $[1];
     }
-    const t3 = t2.join(" ");
-    let t4;
-    if ($[4] !== fields || $[5] !== forceRender || $[6] !== operation || $[7] !== parentIndexPath || $[8] !== parentPath || $[9] !== parentSchemaPath || $[10] !== permissions || $[11] !== readOnlyFromParent || $[12] !== t3) {
-      let t5;
-      if ($[14] !== forceRender || $[15] !== operation || $[16] !== parentIndexPath || $[17] !== parentPath || $[18] !== parentSchemaPath || $[19] !== permissions || $[20] !== readOnlyFromParent) {
-        t5 = (field, i) => {
+    const t1 = t0.join(" ");
+    let t2;
+    if ($[2] !== fields || $[3] !== forceRender || $[4] !== operation || $[5] !== parentIndexPath || $[6] !== parentPath || $[7] !== parentSchemaPath || $[8] !== permissions || $[9] !== readOnlyFromParent || $[10] !== t1) {
+      let t3;
+      if ($[12] !== forceRender || $[13] !== operation || $[14] !== parentIndexPath || $[15] !== parentPath || $[16] !== parentSchemaPath || $[17] !== permissions || $[18] !== readOnlyFromParent) {
+        t3 = (field, i) => {
           if (!field || fieldIsHiddenOrDisabled(field)) {
             return null;
           }
@@ -92,36 +87,36 @@ export const RenderFields = props => {
             })
           }, `${path}-${i}`);
         };
-        $[14] = forceRender;
-        $[15] = operation;
-        $[16] = parentIndexPath;
-        $[17] = parentPath;
-        $[18] = parentSchemaPath;
-        $[19] = permissions;
-        $[20] = readOnlyFromParent;
-        $[21] = t5;
+        $[12] = forceRender;
+        $[13] = operation;
+        $[14] = parentIndexPath;
+        $[15] = parentPath;
+        $[16] = parentSchemaPath;
+        $[17] = permissions;
+        $[18] = readOnlyFromParent;
+        $[19] = t3;
       } else {
-        t5 = $[21];
+        t3 = $[19];
       }
-      t4 = _jsx(RenderIfInViewport, {
-        className: t3,
+      t2 = _jsx(RenderIfInViewport, {
+        className: t1,
         forceRender,
-        children: fields.map(t5)
+        children: fields.map(t3)
       });
-      $[4] = fields;
-      $[5] = forceRender;
-      $[6] = operation;
-      $[7] = parentIndexPath;
-      $[8] = parentPath;
-      $[9] = parentSchemaPath;
-      $[10] = permissions;
-      $[11] = readOnlyFromParent;
-      $[12] = t3;
-      $[13] = t4;
+      $[2] = fields;
+      $[3] = forceRender;
+      $[4] = operation;
+      $[5] = parentIndexPath;
+      $[6] = parentPath;
+      $[7] = parentSchemaPath;
+      $[8] = permissions;
+      $[9] = readOnlyFromParent;
+      $[10] = t1;
+      $[11] = t2;
     } else {
-      t4 = $[13];
+      t2 = $[11];
     }
-    return t4;
+    return t2;
   }
   return null;
 };

package/dist/forms/RenderFields/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","fieldIsHiddenOrDisabled","getFieldPaths","getFieldPermissions","React","RenderIfInViewport","useOperation","FieldPathContext","RenderField","baseClass","RenderFields","props","$","className","fields","forceRender","margins","parentIndexPath","parentPath","parentSchemaPath","permissions","readOnly","readOnlyFromParent","operation","length","t0","t1","t2","filter","Boolean","t3","join","t4","t5","field","i","hasOperationPermission","fieldPermissions","read","hasReadPermission","parentName","includes","split","isReadOnly","admin","indexPath","path","schemaPath","index","_jsx","value","children","clientFieldConfig","map"],"sources":["../../../src/forms/RenderFields/index.tsx"],"sourcesContent":["'use client'\n\nimport type { SanitizedFieldPermissions } from 'payload'\n\nimport { fieldIsHiddenOrDisabled, getFieldPaths, getFieldPermissions } from 'payload/shared'\nimport React from 'react'\n\nimport type { RenderFieldsProps } from './types.js'\n\nimport { RenderIfInViewport } from '../../elements/RenderIfInViewport/index.js'\nimport { useOperation } from '../../providers/Operation/index.js'\nimport { FieldPathContext } from './context.js'\nimport { RenderField } from './RenderField.js'\nimport './index.css'\n\nconst baseClass = 'render-fields'\n\nexport { RenderFieldsProps as Props }\n\nexport const RenderFields: React.FC<RenderFieldsProps> = (props) => {\n  const {\n    className,\n    fields,\n    forceRender,\n    margins,\n    parentIndexPath,\n    parentPath,\n    parentSchemaPath,\n    permissions,\n    readOnly: readOnlyFromParent,\n  } = props\n\n  const operation = useOperation()\n\n  if (fields && fields.length > 0) {\n    return (\n      <RenderIfInViewport\n        className={[\n          baseClass,\n          className,\n          margins && `${baseClass}--margins-${margins}`,\n          margins === false && `${baseClass}--margins-none`,\n        ]\n          .filter(Boolean)\n          .join(' ')}\n        forceRender={forceRender}\n      >\n        {fields.map((field, i) => {\n          // For sidebar fields in the main fields array, `field` will be `null`, and visa versa\n          // This is to keep the order of the fields consistent and maintain the correct index paths for the main fields (i)\n          if (!field || fieldIsHiddenOrDisabled(field)) {\n            return null\n          }\n\n          const {\n            operation: hasOperationPermission,\n            permissions: fieldPermissions,\n            read: hasReadPermission,\n          } = getFieldPermissions({\n            field,\n            operation,\n            parentName: parentPath?.includes('.')\n              ? parentPath.split('.')[parentPath.split('.').length - 1]\n              : parentPath,\n            permissions,\n          })\n\n          // If the user cannot read the field, then filter it out\n          // This is different from `admin.readOnly` which is executed based on `operation`\n          if ('name' in field && !hasReadPermission) {\n            return null\n          }\n\n          // `admin.readOnly` displays the value but prevents the field from being edited\n          let isReadOnly = readOnlyFromParent || field?.admin?.readOnly\n\n          // If parent field is `readOnly: true`, but this field is `readOnly: false`, the field should still be editable\n          if (isReadOnly && field.admin?.readOnly === false) {\n            isReadOnly = false\n          }\n\n          // If the user does not have access at the operation level, to begin with, force it to be read-only\n          if ('name' in field && !hasOperationPermission) {\n            isReadOnly = true\n          }\n\n          const { indexPath, path, schemaPath } = getFieldPaths({\n            field,\n            index: i,\n            parentIndexPath,\n            parentPath,\n            parentSchemaPath,\n          })\n\n          return (\n            <FieldPathContext key={`${path}-${i}`} value={path}>\n              <RenderField\n                clientFieldConfig={field}\n                forceRender={forceRender}\n                indexPath={indexPath}\n                parentPath={parentPath}\n                parentSchemaPath={parentSchemaPath}\n                path={path}\n                permissions={fieldPermissions as SanitizedFieldPermissions}\n                readOnly={isReadOnly}\n                schemaPath={schemaPath}\n              />\n            </FieldPathContext>\n          )\n        })}\n      </RenderIfInViewport>\n    )\n  }\n\n  return null\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","fieldIsHiddenOrDisabled","getFieldPaths","getFieldPermissions","React","RenderIfInViewport","useOperation","FieldPathContext","RenderField","baseClass","RenderFields","props","$","className","fields","forceRender","parentIndexPath","parentPath","parentSchemaPath","permissions","readOnly","readOnlyFromParent","operation","length","t0","filter","Boolean","t1","join","t2","t3","field","i","hasOperationPermission","fieldPermissions","read","hasReadPermission","parentName","includes","split","isReadOnly","admin","indexPath","path","schemaPath","index","_jsx","value","children","clientFieldConfig","map"],"sources":["../../../src/forms/RenderFields/index.tsx"],"sourcesContent":["'use client'\n\nimport type { SanitizedFieldPermissions } from 'payload'\n\nimport { fieldIsHiddenOrDisabled, getFieldPaths, getFieldPermissions } from 'payload/shared'\nimport React from 'react'\n\nimport type { RenderFieldsProps } from './types.js'\n\nimport { RenderIfInViewport } from '../../elements/RenderIfInViewport/index.js'\nimport { useOperation } from '../../providers/Operation/index.js'\nimport { FieldPathContext } from './context.js'\nimport { RenderField } from './RenderField.js'\nimport './index.css'\n\nconst baseClass = 'render-fields'\n\nexport { RenderFieldsProps as Props }\n\nexport const RenderFields: React.FC<RenderFieldsProps> = (props) => {\n  const {\n    className,\n    fields,\n    forceRender,\n    parentIndexPath,\n    parentPath,\n    parentSchemaPath,\n    permissions,\n    readOnly: readOnlyFromParent,\n  } = props\n\n  const operation = useOperation()\n\n  if (fields && fields.length > 0) {\n    return (\n      <RenderIfInViewport\n        className={[baseClass, className].filter(Boolean).join(' ')}\n        forceRender={forceRender}\n      >\n        {fields.map((field, i) => {\n          // For sidebar fields in the main fields array, `field` will be `null`, and visa versa\n          // This is to keep the order of the fields consistent and maintain the correct index paths for the main fields (i)\n          if (!field || fieldIsHiddenOrDisabled(field)) {\n            return null\n          }\n\n          const {\n            operation: hasOperationPermission,\n            permissions: fieldPermissions,\n            read: hasReadPermission,\n          } = getFieldPermissions({\n            field,\n            operation,\n            parentName: parentPath?.includes('.')\n              ? parentPath.split('.')[parentPath.split('.').length - 1]\n              : parentPath,\n            permissions,\n          })\n\n          // If the user cannot read the field, then filter it out\n          // This is different from `admin.readOnly` which is executed based on `operation`\n          if ('name' in field && !hasReadPermission) {\n            return null\n          }\n\n          // `admin.readOnly` displays the value but prevents the field from being edited\n          let isReadOnly = readOnlyFromParent || field?.admin?.readOnly\n\n          // If parent field is `readOnly: true`, but this field is `readOnly: false`, the field should still be editable\n          if (isReadOnly && field.admin?.readOnly === false) {\n            isReadOnly = false\n          }\n\n          // If the user does not have access at the operation level, to begin with, force it to be read-only\n          if ('name' in field && !hasOperationPermission) {\n            isReadOnly = true\n          }\n\n          const { indexPath, path, schemaPath } = getFieldPaths({\n            field,\n            index: i,\n            parentIndexPath,\n            parentPath,\n            parentSchemaPath,\n          })\n\n          return (\n            <FieldPathContext key={`${path}-${i}`} value={path}>\n              <RenderField\n                clientFieldConfig={field}\n                forceRender={forceRender}\n                indexPath={indexPath}\n                parentPath={parentPath}\n                parentSchemaPath={parentSchemaPath}\n                path={path}\n                permissions={fieldPermissions as SanitizedFieldPermissions}\n                readOnly={isReadOnly}\n                schemaPath={schemaPath}\n              />\n            </FieldPathContext>\n          )\n        })}\n      </RenderIfInViewport>\n    )\n  }\n\n  return null\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/forms/RenderFields/types.d.ts

@@ -2,7 +2,6 @@ import type { ClientComponentProps, ClientField, SanitizedFieldPermissions } fro
 export type RenderFieldsProps = {
     readonly className?: string;
     readonly fields: ClientField[];
-    readonly margins?: 'small' | false;
     readonly parentIndexPath: string;
     readonly parentPath: string;
     readonly parentSchemaPath: string;

package/dist/forms/RenderFields/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/forms/RenderFields/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAE3F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAA;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,KAAK,CAAA;IAClC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,WAAW,EAChB;QACE,CAAC,SAAS,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAC/C,GACD,yBAAyB,CAAA;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAC5B,GAAG,IAAI,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/forms/RenderFields/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAE3F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAA;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,WAAW,EAChB;QACE,CAAC,SAAS,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAC/C,GACD,yBAAyB,CAAA;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAC5B,GAAG,IAAI,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAA"}

package/dist/forms/RenderFields/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/forms/RenderFields/types.ts"],"sourcesContent":["import type { ClientComponentProps, ClientField, SanitizedFieldPermissions } from 'payload'\n\nexport type RenderFieldsProps = {\n  readonly className?: string\n  readonly fields: ClientField[]\n  readonly margins?: 'small' | false\n  readonly parentIndexPath: string\n  readonly parentPath: string\n  readonly parentSchemaPath: string\n  readonly permissions:\n    | {\n        [fieldName: string]: SanitizedFieldPermissions\n      }\n    | SanitizedFieldPermissions\n  readonly readOnly?: boolean\n} & Pick<ClientComponentProps, 'forceRender'>\n"],"mappings":"AAEA","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/forms/RenderFields/types.ts"],"sourcesContent":["import type { ClientComponentProps, ClientField, SanitizedFieldPermissions } from 'payload'\n\nexport type RenderFieldsProps = {\n  readonly className?: string\n  readonly fields: ClientField[]\n  readonly parentIndexPath: string\n  readonly parentPath: string\n  readonly parentSchemaPath: string\n  readonly permissions:\n    | {\n        [fieldName: string]: SanitizedFieldPermissions\n      }\n    | SanitizedFieldPermissions\n  readonly readOnly?: boolean\n} & Pick<ClientComponentProps, 'forceRender'>\n"],"mappings":"AAEA","ignoreList":[]}

package/dist/forms/Submit/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import type { Props } from '../../elements/Button/types.js';
-import './index.scss';
+import './index.css';
 export declare const FormSubmit: React.FC<Props>;
 //# sourceMappingURL=index.d.ts.map

package/dist/forms/Submit/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/forms/Submit/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAS3D,OAAO,cAAc,CAAA;AAIrB,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA8CtC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/forms/Submit/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAS3D,OAAO,aAAa,CAAA;AAIpB,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6BtC,CAAA"}

package/dist/forms/Submit/index.js

@@ -1,43 +1,53 @@
 'use client';
 
+import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { Button } from '../../elements/Button/index.js';
 import { useForm, useFormBackgroundProcessing, useFormInitializing, useFormProcessing } from '../Form/context.js';
-import './index.scss';
+import './index.css';
 const baseClass = 'form-submit';
 export const FormSubmit = props => {
+  const $ = _c(7);
   const {
-    type = 'submit',
+    type: t0,
     buttonId: id,
     children,
     disabled: disabledFromProps,
-    onClick,
-    programmaticSubmit,
-    ref
+    onClick
   } = props;
+  const type = t0 === undefined ? "submit" : t0;
   const processing = useFormProcessing();
   const backgroundProcessing = useFormBackgroundProcessing();
   const initializing = useFormInitializing();
   const {
-    disabled,
-    submit
+    disabled
   } = useForm();
   const canSave = !(disabledFromProps || initializing || processing || backgroundProcessing || disabled);
-  const handleClick = onClick ?? (programmaticSubmit ? () => {
-    void submit();
-  } : undefined);
-  return /*#__PURE__*/_jsx("div", {
-    className: baseClass,
-    children: /*#__PURE__*/_jsx(Button, {
-      ref: ref,
-      ...props,
-      disabled: canSave ? undefined : true,
-      id: id,
-      onClick: handleClick,
-      type: type,
-      children: children
-    })
-  });
+  const t1 = canSave ? undefined : true;
+  let t2;
+  if ($[0] !== children || $[1] !== id || $[2] !== onClick || $[3] !== props || $[4] !== t1 || $[5] !== type) {
+    t2 = _jsx("div", {
+      className: baseClass,
+      children: _jsx(Button, {
+        ...props,
+        disabled: t1,
+        id,
+        onClick,
+        type,
+        children
+      })
+    });
+    $[0] = children;
+    $[1] = id;
+    $[2] = onClick;
+    $[3] = props;
+    $[4] = t1;
+    $[5] = type;
+    $[6] = t2;
+  } else {
+    t2 = $[6];
+  }
+  return t2;
 };
 //# sourceMappingURL=index.js.map

package/dist/forms/Submit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["React","Button","useForm","useFormBackgroundProcessing","useFormInitializing","useFormProcessing","baseClass","FormSubmit","props","type","buttonId","id","children","disabled","disabledFromProps","onClick","programmaticSubmit","ref","processing","backgroundProcessing","initializing","submit","canSave","handleClick","undefined","_jsx","className"],"sources":["../../../src/forms/Submit/index.tsx"],"sourcesContent":["'use client'\nimport React from 'react'\n\nimport type { Props } from '../../elements/Button/types.js'\n\nimport { Button } from '../../elements/Button/index.js'\nimport {\n  useForm,\n  useFormBackgroundProcessing,\n  useFormInitializing,\n  useFormProcessing,\n} from '../Form/context.js'\nimport './index.scss'\n\nconst baseClass = 'form-submit'\n\nexport const FormSubmit: React.FC<Props> = (props) => {\n  const {\n    type = 'submit',\n    buttonId: id,\n    children,\n    disabled: disabledFromProps,\n    onClick,\n    programmaticSubmit,\n    ref,\n  } = props\n\n  const processing = useFormProcessing()\n  const backgroundProcessing = useFormBackgroundProcessing()\n  const initializing = useFormInitializing()\n  const { disabled, submit } = useForm()\n\n  const canSave = !(\n    disabledFromProps ||\n    initializing ||\n    processing ||\n    backgroundProcessing ||\n    disabled\n  )\n\n  const handleClick =\n    onClick ??\n    (programmaticSubmit\n      ? () => {\n          void submit()\n        }\n      : undefined)\n\n  return (\n    <div className={baseClass}>\n      <Button\n        ref={ref}\n        {...props}\n        disabled={canSave ? undefined : true}\n        id={id}\n        onClick={handleClick}\n        type={type}\n      >\n        {children}\n      </Button>\n    </div>\n  )\n}\n"],"mappings":"AAAA;;;AACA,OAAOA,KAAA,MAAW;AAIlB,SAASC,MAAM,QAAQ;AACvB,SACEC,OAAO,EACPC,2BAA2B,EAC3BC,mBAAmB,EACnBC,iBAAiB,QACZ;AACP,OAAO;AAEP,MAAMC,SAAA,GAAY;AAElB,OAAO,MAAMC,UAAA,GAA+BC,KAAA;EAC1C,MAAM;IACJC,IAAA,GAAO,QAAQ;IACfC,QAAA,EAAUC,EAAE;IACZC,QAAQ;IACRC,QAAA,EAAUC,iBAAiB;IAC3BC,OAAO;IACPC,kBAAkB;IAClBC;EAAG,CACJ,GAAGT,KAAA;EAEJ,MAAMU,UAAA,GAAab,iBAAA;EACnB,MAAMc,oBAAA,GAAuBhB,2BAAA;EAC7B,MAAMiB,YAAA,GAAehB,mBAAA;EACrB,MAAM;IAAES,QAAQ;IAAEQ;EAAM,CAAE,GAAGnB,OAAA;EAE7B,MAAMoB,OAAA,GAAU,EACdR,iBAAA,IACAM,YAAA,IACAF,UAAA,IACAC,oBAAA,IACAN,QAAO;EAGT,MAAMU,WAAA,GACJR,OAAA,KACCC,kBAAA,GACG;IACE,KAAKK,MAAA;EACP,IACAG,SAAQ;EAEd,oBACEC,IAAA,CAAC;IAAIC,SAAA,EAAWpB,SAAA;cACd,aAAAmB,IAAA,CAACxB,MAAA;MACCgB,GAAA,EAAKA,GAAA;MACJ,GAAGT,KAAK;MACTK,QAAA,EAAUS,OAAA,GAAUE,SAAA,GAAY;MAChCb,EAAA,EAAIA,EAAA;MACJI,OAAA,EAASQ,WAAA;MACTd,IAAA,EAAMA,IAAA;gBAELG;;;AAIT","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","React","Button","useForm","useFormBackgroundProcessing","useFormInitializing","useFormProcessing","baseClass","FormSubmit","props","$","type","t0","buttonId","id","children","disabled","disabledFromProps","onClick","undefined","processing","backgroundProcessing","initializing","canSave","t1","t2","_jsx","className"],"sources":["../../../src/forms/Submit/index.tsx"],"sourcesContent":["'use client'\nimport React from 'react'\n\nimport type { Props } from '../../elements/Button/types.js'\n\nimport { Button } from '../../elements/Button/index.js'\nimport {\n  useForm,\n  useFormBackgroundProcessing,\n  useFormInitializing,\n  useFormProcessing,\n} from '../Form/context.js'\nimport './index.css'\n\nconst baseClass = 'form-submit'\n\nexport const FormSubmit: React.FC<Props> = (props) => {\n  const { type = 'submit', buttonId: id, children, disabled: disabledFromProps, onClick } = props\n\n  const processing = useFormProcessing()\n  const backgroundProcessing = useFormBackgroundProcessing()\n  const initializing = useFormInitializing()\n  const { disabled } = useForm()\n\n  const canSave = !(\n    disabledFromProps ||\n    initializing ||\n    processing ||\n    backgroundProcessing ||\n    disabled\n  )\n\n  return (\n    <div className={baseClass}>\n      <Button\n        {...props}\n        disabled={canSave ? undefined : true}\n        id={id}\n        onClick={onClick}\n        type={type}\n      >\n        {children}\n      </Button>\n    </div>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AACA,OAAOC,KAAA,MAAW;AAIlB,SAASC,MAAM,QAAQ;AACvB,SACEC,OAAO,EACPC,2BAA2B,EAC3BC,mBAAmB,EACnBC,iBAAiB,QACZ;AACP,OAAO;AAEP,MAAMC,SAAA,GAAY;AAElB,OAAO,MAAMC,UAAA,GAA8BC,KAAA;EAAA,MAAAC,CAAA,GAAAV,EAAA;EACzC;IAAAW,IAAA,EAAAC,EAAA;IAAAC,QAAA,EAAAC,EAAA;IAAAC,QAAA;IAAAC,QAAA,EAAAC,iBAAA;IAAAC;EAAA,IAA0FT,KAAA;EAAlF,MAAAE,IAAA,GAAAC,EAAe,KAAAO,SAAA,GAAR,QAAQ,GAAfP,EAAe;EAEvB,MAAAQ,UAAA,GAAmBd,iBAAA;EACnB,MAAAe,oBAAA,GAA6BjB,2BAAA;EAC7B,MAAAkB,YAAA,GAAqBjB,mBAAA;EACrB;IAAAW;EAAA,IAAqBb,OAAA;EAErB,MAAAoB,OAAA,KACEN,iBAAA,IACAK,YAAA,IACAF,UAAA,IACAC,oBAAA,IACAL,QAAO;EAOO,MAAAQ,EAAA,GAAAD,OAAA,GAAAJ,SAAA,OAAsB;EAAA,IAAAM,EAAA;EAAA,IAAAf,CAAA,QAAAK,QAAA,IAAAL,CAAA,QAAAI,EAAA,IAAAJ,CAAA,QAAAQ,OAAA,IAAAR,CAAA,QAAAD,KAAA,IAAAC,CAAA,QAAAc,EAAA,IAAAd,CAAA,QAAAC,IAAA;IAHpCc,EAAA,GAAAC,IAAA,CAAC;MAAAC,SAAA,EAAApB,SAAA;MAAAQ,QAAA,EACCW,IAAA,CAAAxB,MAAA;QAAA,GACMO,KAAK;QAAAO,QAAA,EACCQ,EAAsB;QAAAV,EAAA;QAAAI,OAAA;QAAAP,IAAA;QAAAI;MAAA,C;;;;;;;;;;;;SAHpCU,E;CAYJ","ignoreList":[]}

package/dist/forms/WatchChildErrors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/forms/WatchChildErrors/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,6BAA6B,GAAG;IACnC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB;;;;;OAKG;IACH,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACvC,CAAA;AACD,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,6BAA6B,CA2CpE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/forms/WatchChildErrors/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,6BAA6B,GAAG;IACnC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;IACtB;;;;;OAKG;IACH,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACzB,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACvC,CAAA;AACD,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,6BAA6B,CAgDpE,CAAA"}

package/dist/forms/WatchChildErrors/index.js

@@ -25,8 +25,8 @@ export const WatchChildErrors = t0 => {
   let t2;
   if ($[2] !== formState || $[3] !== hasSubmitted || $[4] !== parentPath || $[5] !== segmentsToMatch || $[6] !== setErrorCount) {
     t2 = () => {
+      let errorCount = 0;
       if (hasSubmitted) {
-        let errorCount = 0;
         Object.entries(formState).forEach(t3 => {
           const [key] = t3;
           const matchingSegment = segmentsToMatch?.some(segment => {
@@ -45,8 +45,8 @@ export const WatchChildErrors = t0 => {
             }
           }
         });
-        setErrorCount(errorCount);
       }
+      setErrorCount(errorCount);
     };
     $[2] = formState;
     $[3] = hasSubmitted;

package/dist/forms/WatchChildErrors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","useThrottledEffect","useAllFormFields","useFormSubmitted","buildPathSegments","WatchChildErrors","t0","$","fields","path","parentPath","setErrorCount","formState","hasSubmitted","t1","segmentsToMatch","t2","errorCount","Object","entries","forEach","t3","key","matchingSegment","some","segment","segmentToMatch","join","endsWith","pathWithoutDot","slice","startsWith","pathState","valid"],"sources":["../../../src/forms/WatchChildErrors/index.tsx"],"sourcesContent":["'use client'\nimport type { ClientField } from 'payload'\nimport type React from 'react'\n\nimport { useThrottledEffect } from '../../hooks/useThrottledEffect.js'\nimport { useAllFormFields, useFormSubmitted } from '../Form/context.js'\nimport { buildPathSegments } from './buildPathSegments.js'\n\ntype TrackSubSchemaErrorCountProps = {\n  fields?: ClientField[]\n  /**\n   * This path should only include path segments that affect data\n   * i.e. it should not include _index-0 type segments\n   *\n   * For collapsibles and tabs you can simply pass their parent path\n   */\n  path: (number | string)[]\n  setErrorCount: (count: number) => void\n}\nexport const WatchChildErrors: React.FC<TrackSubSchemaErrorCountProps> = ({\n  fields,\n  path: parentPath,\n  setErrorCount,\n}) => {\n  const [formState] = useAllFormFields()\n  const hasSubmitted = useFormSubmitted()\n\n  const segmentsToMatch = buildPathSegments(fields)\n\n  useThrottledEffect(\n    () => {\n      if (hasSubmitted) {\n        let errorCount = 0\n        Object.entries(formState).forEach(([key]) => {\n          const matchingSegment = segmentsToMatch?.some((segment) => {\n            const segmentToMatch = [...parentPath, segment].join('.')\n            // match fields with same parent path\n            if (segmentToMatch.endsWith('.')) {\n              // Match both nested fields (key starts with segmentToMatch)\n              // and the field itself (key equals segmentToMatch without trailing dot)\n              const pathWithoutDot = segmentToMatch.slice(0, -1)\n              return key.startsWith(segmentToMatch) || key === pathWithoutDot\n            }\n            // match fields with same path\n            return key === segmentToMatch\n          })\n\n          if (matchingSegment) {\n            const pathState = formState[key]\n            if ('valid' in pathState && !pathState.valid) {\n              errorCount += 1\n            }\n          }\n        })\n        setErrorCount(errorCount)\n      }\n    },\n    250,\n    [formState, hasSubmitted, fields],\n  )\n\n  return null\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;AAIA,SAASC,kBAAkB,QAAQ;AACnC,SAASC,gBAAgB,EAAEC,gBAAgB,QAAQ;AACnD,SAASC,iBAAiB,QAAQ;AAalC,OAAO,MAAMC,gBAAA,GAA4DC,EAAA;EAAA,MAAAC,CAAA,GAAAP,EAAA;EAAC;IAAAQ,MAAA;IAAAC,IAAA,EAAAC,UAAA;IAAAC;EAAA,IAAAL,EAIzE;EACC,OAAAM,SAAA,IAAoBV,gBAAA;EACpB,MAAAW,YAAA,GAAqBV,gBAAA;EAAA,IAAAW,EAAA;EAAA,IAAAP,CAAA,QAAAC,MAAA;IAEGM,EAAA,GAAAV,iBAAA,CAAkBI,MAAA;IAAAD,CAAA,MAAAC,MAAA;IAAAD,CAAA,MAAAO,EAAA;EAAA;IAAAA,EAAA,GAAAP,CAAA;EAAA;EAA1C,MAAAQ,eAAA,GAAwBD,EAAkB;EAAA,IAAAE,EAAA;EAAA,IAAAT,CAAA,QAAAK,SAAA,IAAAL,CAAA,QAAAM,YAAA,IAAAN,CAAA,QAAAG,UAAA,IAAAH,CAAA,QAAAQ,eAAA,IAAAR,CAAA,QAAAI,aAAA;IAGxCK,EAAA,GAAAA,CAAA;MAAA,IACMH,YAAA;QACF,IAAAI,UAAA;QACAC,MAAA,CAAAC,OAAA,CAAeP,SAAA,EAAAQ,OAAA,CAAAC,EAAA;UAAoB,OAAAC,GAAA,IAAAD,EAAK;UACtC,MAAAE,eAAA,GAAwBR,eAAA,EAAAS,IAAA,CAAAC,OAAA;YACtB,MAAAC,cAAA,GAAuB,IAAIhB,UAAA,EAAYe,OAAA,EAAAE,IAAA,CAAc;YAAA,IAEjDD,cAAA,CAAAE,QAAA,CAAwB;cAG1B,MAAAC,cAAA,GAAuBH,cAAA,CAAAI,KAAA,MAAyB;cAAA,OACzCR,GAAA,CAAAS,UAAA,CAAeL,cAAA,KAAmBJ,GAAA,KAAQO,cAAA;YAAA;YAAA,OAG5CP,GAAA,KAAQI,cAAA;UAAA;UACjB,IAEIH,eAAA;YACF,MAAAS,SAAA,GAAkBpB,SAAS,CAACU,GAAA;YAAI,IAC5B,WAAWU,SAAA,KAAcA,SAAA,CAAAC,KAAe;cAC1ChB,UAAA,GAAAA,UAAA,IAAc;cAAdA,UAAA;YAAA;UAAA;QAAA,CAGN;QACAN,aAAA,CAAcM,UAAA;MAAA;IAAA;IAElBV,CAAA,MAAAK,SAAA;IAAAL,CAAA,MAAAM,YAAA;IAAAN,CAAA,MAAAG,UAAA;IAAAH,CAAA,MAAAQ,eAAA;IAAAR,CAAA,MAAAI,aAAA;IAAAJ,CAAA,MAAAS,EAAA;EAAA;IAAAA,EAAA,GAAAT,CAAA;EAAA;EAAA,IAAAc,EAAA;EAAA,IAAAd,CAAA,QAAAC,MAAA,IAAAD,CAAA,QAAAK,SAAA,IAAAL,CAAA,SAAAM,YAAA;IAEAQ,EAAA,IAACT,SAAA,EAAWC,YAAA,EAAcL,MAAA;IAAOD,CAAA,MAAAC,MAAA;IAAAD,CAAA,MAAAK,SAAA;IAAAL,CAAA,OAAAM,YAAA;IAAAN,CAAA,OAAAc,EAAA;EAAA;IAAAA,EAAA,GAAAd,CAAA;EAAA;EA7BnCN,kBAAA,CACEe,EA0BA,OAEAK,EAAiC;EAAA;AAAA,CAIrC","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","useThrottledEffect","useAllFormFields","useFormSubmitted","buildPathSegments","WatchChildErrors","t0","$","fields","path","parentPath","setErrorCount","formState","hasSubmitted","t1","segmentsToMatch","t2","errorCount","Object","entries","forEach","t3","key","matchingSegment","some","segment","segmentToMatch","join","endsWith","pathWithoutDot","slice","startsWith","pathState","valid"],"sources":["../../../src/forms/WatchChildErrors/index.tsx"],"sourcesContent":["'use client'\nimport type { ClientField } from 'payload'\nimport type React from 'react'\n\nimport { useThrottledEffect } from '../../hooks/useThrottledEffect.js'\nimport { useAllFormFields, useFormSubmitted } from '../Form/context.js'\nimport { buildPathSegments } from './buildPathSegments.js'\n\ntype TrackSubSchemaErrorCountProps = {\n  fields?: ClientField[]\n  /**\n   * This path should only include path segments that affect data\n   * i.e. it should not include _index-0 type segments\n   *\n   * For collapsibles and tabs you can simply pass their parent path\n   */\n  path: (number | string)[]\n  setErrorCount: (count: number) => void\n}\nexport const WatchChildErrors: React.FC<TrackSubSchemaErrorCountProps> = ({\n  fields,\n  path: parentPath,\n  setErrorCount,\n}) => {\n  const [formState] = useAllFormFields()\n  const hasSubmitted = useFormSubmitted()\n\n  const segmentsToMatch = buildPathSegments(fields)\n\n  useThrottledEffect(\n    () => {\n      // Errors are only surfaced after a submit attempt. Once the form is no longer\n      // submitted (e.g. after a successful save resets the submitted flag), reset the\n      // count to 0 so stale error indicators don't linger on the tab.\n      let errorCount = 0\n\n      if (hasSubmitted) {\n        Object.entries(formState).forEach(([key]) => {\n          const matchingSegment = segmentsToMatch?.some((segment) => {\n            const segmentToMatch = [...parentPath, segment].join('.')\n            // match fields with same parent path\n            if (segmentToMatch.endsWith('.')) {\n              // Match both nested fields (key starts with segmentToMatch)\n              // and the field itself (key equals segmentToMatch without trailing dot)\n              const pathWithoutDot = segmentToMatch.slice(0, -1)\n              return key.startsWith(segmentToMatch) || key === pathWithoutDot\n            }\n            // match fields with same path\n            return key === segmentToMatch\n          })\n\n          if (matchingSegment) {\n            const pathState = formState[key]\n            if ('valid' in pathState && !pathState.valid) {\n              errorCount += 1\n            }\n          }\n        })\n      }\n\n      setErrorCount(errorCount)\n    },\n    250,\n    [formState, hasSubmitted, fields],\n  )\n\n  return null\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;AAIA,SAASC,kBAAkB,QAAQ;AACnC,SAASC,gBAAgB,EAAEC,gBAAgB,QAAQ;AACnD,SAASC,iBAAiB,QAAQ;AAalC,OAAO,MAAMC,gBAAA,GAA4DC,EAAA;EAAA,MAAAC,CAAA,GAAAP,EAAA;EAAC;IAAAQ,MAAA;IAAAC,IAAA,EAAAC,UAAA;IAAAC;EAAA,IAAAL,EAIzE;EACC,OAAAM,SAAA,IAAoBV,gBAAA;EACpB,MAAAW,YAAA,GAAqBV,gBAAA;EAAA,IAAAW,EAAA;EAAA,IAAAP,CAAA,QAAAC,MAAA;IAEGM,EAAA,GAAAV,iBAAA,CAAkBI,MAAA;IAAAD,CAAA,MAAAC,MAAA;IAAAD,CAAA,MAAAO,EAAA;EAAA;IAAAA,EAAA,GAAAP,CAAA;EAAA;EAA1C,MAAAQ,eAAA,GAAwBD,EAAkB;EAAA,IAAAE,EAAA;EAAA,IAAAT,CAAA,QAAAK,SAAA,IAAAL,CAAA,QAAAM,YAAA,IAAAN,CAAA,QAAAG,UAAA,IAAAH,CAAA,QAAAQ,eAAA,IAAAR,CAAA,QAAAI,aAAA;IAGxCK,EAAA,GAAAA,CAAA;MAIE,IAAAC,UAAA;MAAiB,IAEbJ,YAAA;QACFK,MAAA,CAAAC,OAAA,CAAeP,SAAA,EAAAQ,OAAA,CAAAC,EAAA;UAAoB,OAAAC,GAAA,IAAAD,EAAK;UACtC,MAAAE,eAAA,GAAwBR,eAAA,EAAAS,IAAA,CAAAC,OAAA;YACtB,MAAAC,cAAA,GAAuB,IAAIhB,UAAA,EAAYe,OAAA,EAAAE,IAAA,CAAc;YAAA,IAEjDD,cAAA,CAAAE,QAAA,CAAwB;cAG1B,MAAAC,cAAA,GAAuBH,cAAA,CAAAI,KAAA,MAAyB;cAAA,OACzCR,GAAA,CAAAS,UAAA,CAAeL,cAAA,KAAmBJ,GAAA,KAAQO,cAAA;YAAA;YAAA,OAG5CP,GAAA,KAAQI,cAAA;UAAA;UACjB,IAEIH,eAAA;YACF,MAAAS,SAAA,GAAkBpB,SAAS,CAACU,GAAA;YAAI,IAC5B,WAAWU,SAAA,KAAcA,SAAA,CAAAC,KAAe;cAC1ChB,UAAA,GAAAA,UAAA,IAAc;cAAdA,UAAA;YAAA;UAAA;QAAA,CAGN;MAAA;MAGFN,aAAA,CAAcM,UAAA;IAAA;IAChBV,CAAA,MAAAK,SAAA;IAAAL,CAAA,MAAAM,YAAA;IAAAN,CAAA,MAAAG,UAAA;IAAAH,CAAA,MAAAQ,eAAA;IAAAR,CAAA,MAAAI,aAAA;IAAAJ,CAAA,MAAAS,EAAA;EAAA;IAAAA,EAAA,GAAAT,CAAA;EAAA;EAAA,IAAAc,EAAA;EAAA,IAAAd,CAAA,QAAAC,MAAA,IAAAD,CAAA,QAAAK,SAAA,IAAAL,CAAA,SAAAM,YAAA;IAEAQ,EAAA,IAACT,SAAA,EAAWC,YAAA,EAAcL,MAAA;IAAOD,CAAA,MAAAC,MAAA;IAAAD,CAAA,MAAAK,SAAA;IAAAL,CAAA,OAAAM,YAAA;IAAAN,CAAA,OAAAc,EAAA;EAAA;IAAAA,EAAA,GAAAd,CAAA;EAAA;EAlCnCN,kBAAA,CACEe,EA+BA,OAEAK,EAAiC;EAAA;AAAA,CAIrC","ignoreList":[]}

package/dist/forms/fieldSchemasToFormState/addFieldStatePromise.d.ts

@@ -1,4 +1,4 @@
-import type { BuildFormStateArgs, ClientFieldSchemaMap, Data, DocumentPreferences, Field, FieldSchemaMap, FormState, FormStateWithoutComponents, PayloadRequest, SanitizedFieldsPermissions, SelectMode, SelectType, TabAsField } from 'payload';
+import type { BuildFormStateArgs, ClientFieldSchemaMap, Data, DocumentPreferences, Field, FieldOperation, FieldSchemaMap, FormState, FormStateWithoutComponents, PayloadRequest, SanitizedFieldsPermissions, SelectMode, SelectType, TabAsField } from 'payload';
 import type { RenderFieldMethod } from './types.js';
 export type AddFieldStatePromiseArgs = {
     addErrorPathToParent: (fieldPath: string) => void;
@@ -25,6 +25,7 @@ export type AddFieldStatePromiseArgs = {
      */
     forceFullValue?: boolean;
     fullData: Data;
+    globalSlug?: string;
     id: number | string;
     /**
      * Whether the field schema should be included in the state
@@ -36,7 +37,7 @@ export type AddFieldStatePromiseArgs = {
      * Whether to omit parent fields in the state. @default false
      */
     omitParents?: boolean;
-    operation: 'create' | 'update';
+    operation: FieldOperation;
     parentIndexPath: string;
     parentPath: string;
     parentPermissions: SanitizedFieldsPermissions;

package/dist/forms/fieldSchemasToFormState/addFieldStatePromise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addFieldStatePromise.d.ts","sourceRoot":"","sources":["../../../src/forms/fieldSchemasToFormState/addFieldStatePromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,EACnB,KAAK,EACL,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC1B,cAAc,EAGd,0BAA0B,EAC1B,UAAU,EACV,UAAU,EACV,UAAU,EAEX,MAAM,SAAS,CAAA;AAchB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAQnD,MAAM,MAAM,wBAAwB,GAAG;IACrC,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACjD;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;OAEG;IACH,SAAS,EAAE,IAAI,GAAG,SAAS,CAAA;IAC3B,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,cAAc,CAAA;IAC9B;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,OAAO,CAAA;IACpD;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,EAAE,IAAI,CAAA;IACd,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAA;IACzC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC9B,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,0BAA0B,CAAA;IAC7C,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,mBAAmB,CAAA;IAChC,iBAAiB,EAAE,SAAS,CAAA;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,aAAa,EAAE,iBAAiB,CAAA;IAChC;;;OAGG;IACH,GAAG,EAAE,cAAc,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,KAAK,EAAE,0BAA0B,CAAA;CAClC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,SAAgB,wBAAwB,KAAG,OAAO,CAAC,IAAI,CA25BvF,CAAA"}
+{"version":3,"file":"addFieldStatePromise.d.ts","sourceRoot":"","sources":["../../../src/forms/fieldSchemasToFormState/addFieldStatePromise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,EACnB,KAAK,EACL,cAAc,EACd,cAAc,EAGd,SAAS,EACT,0BAA0B,EAC1B,cAAc,EAGd,0BAA0B,EAC1B,UAAU,EACV,UAAU,EACV,UAAU,EAEX,MAAM,SAAS,CAAA;AAchB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAQnD,MAAM,MAAM,wBAAwB,GAAG;IACrC,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACjD;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;OAEG;IACH,SAAS,EAAE,IAAI,GAAG,SAAS,CAAA;IAC3B,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,cAAc,CAAA;IAC9B;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,OAAO,CAAA;IACpD;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,EAAE,IAAI,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAA;IACzC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,SAAS,EAAE,cAAc,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,iBAAiB,EAAE,0BAA0B,CAAA;IAC7C,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,mBAAmB,CAAA;IAChC,iBAAiB,EAAE,SAAS,CAAA;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,aAAa,EAAE,iBAAiB,CAAA;IAChC;;;OAGG;IACH,GAAG,EAAE,cAAc,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,KAAK,EAAE,0BAA0B,CAAA;CAClC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,SAAgB,wBAAwB,KAAG,OAAO,CAAC,IAAI,CAi8BvF,CAAA"}

package/dist/forms/fieldSchemasToFormState/addFieldStatePromise.js

@@ -23,6 +23,7 @@ export const addFieldStatePromise = async args => {
     filter,
     forceFullValue = false,
     fullData,
+    globalSlug,
     includeSchema = false,
     indexPath,
     mockRSCs,
@@ -71,16 +72,38 @@ export const addFieldStatePromise = async args => {
   if (includeSchema) {
     fieldState.fieldSchema = field;
   }
+  // Short-circuit hidden fields to prevent recursing and rendering. Two exclusions:
+  // - `tab`: visibility is keyed by `field.id` (not `path`); the tab branch owns that write.
+  // - presentational containers (row, collapsible, unnamed group): they hold no value, so
+  //   returning here drops their nested fields' values.
+  const isPresentationalWithSubFields = fieldHasSubFields(field) && !fieldAffectsData(field);
+  if (passesCondition === false && field.type !== 'tab' && !isPresentationalWithSubFields) {
+    if (fieldAffectsData(field) && data?.[field.name] !== undefined) {
+      fieldState.value = data[field.name];
+      fieldState.initialValue = data[field.name];
+    }
+    if (!filter || filter(args)) {
+      state[path] = fieldState;
+    }
+    return;
+  }
   if (fieldAffectsData(field) && !fieldIsHiddenOrDisabled(field) && field.type !== 'tab') {
     fieldPermissions = parentPermissions === true ? parentPermissions : deepCopyObjectSimple(parentPermissions?.[field.name]);
     let hasPermission = fieldPermissions === true || deepCopyObjectSimple(fieldPermissions?.read);
     if (typeof field?.access?.read === 'function') {
+      const collection = collectionSlug ? req.payload.collections[collectionSlug]?.config ?? null : null;
+      const global = globalSlug ? req.payload.globals.config.find(g => g.slug === globalSlug) ?? null : null;
       hasPermission = await field.access.read({
         id,
         blockData,
         data: fullData,
         req,
-        siblingData: data
+        siblingData: data,
+        ...(collection ? {
+          collection
+        } : {
+          global
+        })
       });
     } else {
       hasPermission = true;
@@ -272,7 +295,7 @@ export const addFieldStatePromise = async args => {
             rowMetadata
           } = blocksValue.reduce((acc, row, i) => {
             const blockTypeToMatch = row.blockType;
-            const block = req.payload.blocks[blockTypeToMatch] ?? (field.blockReferences ?? field.blocks).find(blockType => typeof blockType !== 'string' && blockType.slug === blockTypeToMatch);
+            const block = req.payload.blocks[blockTypeToMatch] ?? field.blocks.find(blockType => typeof blockType !== 'string' && blockType.slug === blockTypeToMatch);
             if (!block) {
               throw new Error(`Block with type "${row.blockType}" was found in block data, but no block with that type is defined in the config for field with schema path ${schemaPath}.`);
             }
@@ -287,6 +310,7 @@ export const addFieldStatePromise = async args => {
             const rowPath = path + '.' + i;
             if (block) {
               row.id = row?.id || new ObjectId().toHexString();
+              const previousRow = (previousFormState?.[path]?.rows || []).find(prevRow => prevRow.id === row.id);
               if (!omitParents && (!filter || filter(args))) {
                 // Handle block `id` field
                 const idKey = rowPath + '.id';
@@ -294,6 +318,9 @@ export const addFieldStatePromise = async args => {
                   initialValue: row.id,
                   value: row.id
                 };
+                if (!previousRow) {
+                  state[idKey].addedByServer = true;
+                }
                 // If the blocks field fails filterOptions validation, add error paths to the individual blocks that are no longer allowed
                 if (filterOptionsValidationResult?.invalidBlockSlugs?.length && filterOptionsValidationResult.invalidBlockSlugs.includes(row.blockType)) {
                   state[idKey].errorMessage = req.t('validation:invalidBlock', {
@@ -316,8 +343,8 @@ export const addFieldStatePromise = async args => {
                   initialValue: row.blockType,
                   value: row.blockType
                 };
-                if (addedByServer) {
-                  state[fieldKey].addedByServer = addedByServer;
+                if (!previousRow) {
+                  state[fieldKey].addedByServer = true;
                 }
                 if (includeSchema) {
                   state[fieldKey].fieldSchema = block.fields.find(blockField => 'name' in blockField && blockField.name === 'blockType');
@@ -325,6 +352,9 @@ export const addFieldStatePromise = async args => {
                 // Handle `blockName` field
                 const blockNameKey = rowPath + '.blockName';
                 state[blockNameKey] = {};
+                if (!previousRow) {
+                  state[blockNameKey].addedByServer = true;
+                }
                 if (row.blockName) {
                   state[blockNameKey].initialValue = row.blockName;
                   state[blockNameKey].value = row.blockName;
@@ -367,8 +397,6 @@ export const addFieldStatePromise = async args => {
                 skipValidation,
                 state
               }));
-              // First, check if `previousFormState` has a matching row
-              const previousRow = (previousFormState?.[path]?.rows || []).find(prevRow => prevRow.id === row.id);
               const newRow = {
                 id: row.id,
                 blockType: row.blockType,
@@ -377,6 +405,9 @@ export const addFieldStatePromise = async args => {
               if (previousRow?.lastRenderedPath) {
                 newRow.lastRenderedPath = previousRow.lastRenderedPath;
               }
+              if (!previousRow) {
+                newRow.addedByServer = true;
+              }
               acc.rowMetadata.push(newRow);
               const isCollapsed = isRowCollapsed({
                 collapsedPrefs: preferences?.fields?.[path]?.collapsed,
@@ -522,7 +553,7 @@ export const addFieldStatePromise = async args => {
       case 'select':
         {
           if (typeof field.filterOptions === 'function') {
-            fieldState.selectFilterOptions = field.filterOptions({
+            fieldState.selectFilterOptions = await field.filterOptions({
               data: fullData,
               options: field.options,
               req,
@@ -557,6 +588,9 @@ export const addFieldStatePromise = async args => {
       state[path] = {
         disableFormData: true
       };
+      // Presentational containers are hidden client-side via `withCondition`, which reads
+      // `passesCondition` from their own state entry. Must be set here since these fields
+      // are excluded from the short-circuit above (which would otherwise carry the flag).
       if (passesCondition === false) {
         state[path].passesCondition = false;
       }
@@ -598,15 +632,12 @@ export const addFieldStatePromise = async args => {
     });
   } else if (field.type === 'tab') {
     const isNamedTab = tabHasName(field);
-    let tabSelect;
-    const tabField = {
-      ...field,
-      type: 'tab'
-    };
-    let childPermissions = undefined;
     if (isNamedTab) {
       const shouldContinue = stripUnselectedFields({
-        field: tabField,
+        field: {
+          ...field,
+          type: 'tab'
+        },
         select,
         selectMode,
         siblingDoc: data?.[field.name] || {}
@@ -614,15 +645,29 @@ export const addFieldStatePromise = async args => {
       if (!shouldContinue) {
         return;
       }
+    }
+    // Tab visibility on the client is keyed by `field.id`, not `path` (like all other fields).
+    if (field?.id) {
+      state[field.id] = {
+        passesCondition
+      };
+      // Flag newly added tab entries so the client accepts them during merge.
+      // Otherwise, tabs revealed after a hidden ancestor becomes visible would never make it into client form state.
+      if (!renderAllFields && !previousFormState?.[field.id]) {
+        state[field.id].addedByServer = true;
+      }
+    }
+    if (!passesCondition) {
+      return;
+    }
+    let childPermissions;
+    let tabSelect;
+    if (isNamedTab) {
       if (parentPermissions === true) {
         childPermissions = true;
       } else {
         const tabPermissions = parentPermissions?.[field.name];
-        if (tabPermissions === true) {
-          childPermissions = true;
-        } else {
-          childPermissions = tabPermissions?.fields;
-        }
+        childPermissions = tabPermissions === true ? true : tabPermissions?.fields;
       }
       if (typeof select?.[field.name] === 'object') {
         tabSelect = select?.[field.name];
@@ -631,23 +676,6 @@ export const addFieldStatePromise = async args => {
       childPermissions = parentPermissions;
       tabSelect = select;
     }
-    const pathSegments = path ? path.split('.') : [];
-    // If passesCondition is false then this should always result to false
-    // If the tab has no admin.condition provided then fallback to passesCondition and let that decide the result
-    let tabPassesCondition = passesCondition;
-    if (passesCondition && typeof field.admin?.condition === 'function') {
-      tabPassesCondition = field.admin.condition(fullData, data, {
-        blockData,
-        operation,
-        path: pathSegments,
-        user: req.user
-      });
-    }
-    if (field?.id) {
-      state[field.id] = {
-        passesCondition: tabPassesCondition
-      };
-    }
     return iterateFields({
       id,
       addErrorPathToParent: addErrorPathToParentArg,
@@ -666,7 +694,7 @@ export const addFieldStatePromise = async args => {
       omitParents,
       operation,
       parentIndexPath: indexPath,
-      parentPassesCondition: tabPassesCondition,
+      parentPassesCondition: passesCondition,
       parentPath: path,
       parentSchemaPath: schemaPath,
       permissions: childPermissions,
@@ -683,6 +711,11 @@ export const addFieldStatePromise = async args => {
       state
     });
   } else if (field.type === 'tabs') {
+    if (!filter || filter(args)) {
+      state[path] = {
+        disableFormData: true
+      };
+    }
     return iterateFields({
       id,
       addErrorPathToParent: addErrorPathToParentArg,
@@ -709,6 +742,7 @@ export const addFieldStatePromise = async args => {
       permissions: parentPermissions,
       preferences,
       previousFormState,
+      readOnly,
       renderAllFields,
       renderFieldFn,
       req,