@payloadcms/ui 3.0.0-canary.b8dd0db → 3.0.0-canary.bb00d64

package/dist/forms/Form/fieldReducer.js.map

@@ -1 +1 @@
-{"version":3,"file":"fieldReducer.js","names":["ObjectIdImport","dequal","deepCopyObject","deepCopyObjectSimple","flattenRows","separateRows","ObjectId","default","fieldReducer","state","action","type","optimize","newState","Object","entries","forEach","path","field","oldField","newField","errorPaths","errors","message","initialValue","value","errorMessage","valid","segments","split","length","push","fieldErrorPath","parentPath","slice","join","reduce","acc","fieldState","fieldErrorPaths","errorACC","startsWith","changed","newErrorPaths","Array","isArray","includes","key","rowIndex","remainingFields","rows","rowsMetadata","splice","disableFormData","blockType","rowIndexFromArgs","subFieldState","withNewRow","newRow","id","toHexString","undefined","collapsed","siblingRows","rowIndexArg","Math","max","min","duplicateRowMetadata","duplicateRowState","keys","moveFromIndex","moveToIndex","copyOfMovingRow","rowStateCopy","movingRowState","updatedRows"],"sources":["../../../src/forms/Form/fieldReducer.ts"],"sourcesContent":["'use client'\nimport type { FormField, FormState, Row } from 'payload'\n\nimport ObjectIdImport from 'bson-objectid'\nimport { dequal } from 'dequal/lite' // lite: no need for Map and Set support\nimport { deepCopyObject, deepCopyObjectSimple } from 'payload/shared'\n\nimport type { FieldAction } from './types.js'\n\nimport { flattenRows, separateRows } from './rows.js'\n\nconst ObjectId = (ObjectIdImport.default ||\n  ObjectIdImport) as unknown as typeof ObjectIdImport.default\n\n/**\n * Reducer which modifies the form field state (all the current data of the fields in the form). When called using dispatch, it will return a new state object.\n */\nexport function fieldReducer(state: FormState, action: FieldAction): FormState {\n  switch (action.type) {\n    case 'REPLACE_STATE': {\n      if (action.optimize !== false) {\n        // Only update fields that have changed\n        // by comparing old value / initialValue to new\n        // ..\n        // This is a performance enhancement for saving\n        // large documents with hundreds of fields\n        const newState = {}\n\n        Object.entries(action.state).forEach(([path, field]) => {\n          const oldField = state[path]\n          const newField = field\n\n          if (!dequal(oldField, newField)) {\n            newState[path] = newField\n          } else if (oldField) {\n            newState[path] = oldField\n          }\n        })\n        return newState\n      }\n      // If we're not optimizing, just set the state to the new state\n      return action.state\n    }\n\n    case 'REMOVE': {\n      const newState = { ...state }\n      if (newState[action.path]) delete newState[action.path]\n      return newState\n    }\n\n    case 'ADD_SERVER_ERRORS': {\n      let newState = { ...state }\n\n      const errorPaths: { fieldErrorPath: string; parentPath: string }[] = []\n\n      action.errors.forEach(({ field, message }) => {\n        newState[field] = {\n          ...(newState[field] || {\n            initialValue: null,\n            value: null,\n          }),\n          errorMessage: message,\n          valid: false,\n        }\n\n        const segments = field.split('.')\n        if (segments.length > 1) {\n          errorPaths.push({\n            fieldErrorPath: field,\n            parentPath: segments.slice(0, segments.length - 1).join('.'),\n          })\n        }\n      })\n\n      newState = Object.entries(newState).reduce((acc, [path, fieldState]) => {\n        const fieldErrorPaths = errorPaths.reduce((errorACC, { fieldErrorPath, parentPath }) => {\n          if (parentPath.startsWith(path)) {\n            errorACC.push(fieldErrorPath)\n          }\n          return errorACC\n        }, [])\n\n        let changed = false\n\n        if (fieldErrorPaths.length > 0) {\n          const newErrorPaths = Array.isArray(fieldState.errorPaths) ? fieldState.errorPaths : []\n\n          fieldErrorPaths.forEach((fieldErrorPath) => {\n            if (!newErrorPaths.includes(fieldErrorPath)) {\n              newErrorPaths.push(fieldErrorPath)\n              changed = true\n            }\n          })\n\n          if (changed) {\n            acc[path] = {\n              ...fieldState,\n              errorPaths: newErrorPaths,\n            }\n          }\n        }\n\n        if (!changed) {\n          acc[path] = fieldState\n        }\n\n        return acc\n      }, {})\n\n      return newState\n    }\n\n    case 'UPDATE': {\n      const newField = Object.entries(action).reduce(\n        (field, [key, value]) => {\n          if (\n            [\n              'disableFormData',\n              'errorMessage',\n              'initialValue',\n              'rows',\n              'valid',\n              'validate',\n              'value',\n            ].includes(key)\n          ) {\n            return {\n              ...field,\n              [key]: value,\n            }\n          }\n\n          return field\n        },\n        state[action.path] || ({} as FormField),\n      )\n\n      const newState = {\n        ...state,\n        [action.path]: newField,\n      }\n\n      return newState\n    }\n\n    case 'REMOVE_ROW': {\n      const { path, rowIndex } = action\n      const { remainingFields, rows } = separateRows(path, state)\n      const rowsMetadata = [...(state[path]?.rows || [])]\n\n      rows.splice(rowIndex, 1)\n      rowsMetadata.splice(rowIndex, 1)\n\n      const newState: FormState = {\n        ...remainingFields,\n        [path]: {\n          ...state[path],\n          disableFormData: rows.length > 0,\n          rows: rowsMetadata,\n          value: rows.length,\n        },\n        ...flattenRows(path, rows),\n      }\n\n      return newState\n    }\n\n    case 'ADD_ROW': {\n      const { blockType, path, rowIndex: rowIndexFromArgs, subFieldState = {} } = action\n\n      const rowIndex =\n        typeof rowIndexFromArgs === 'number' ? rowIndexFromArgs : state[path]?.rows?.length || 0\n\n      const withNewRow = [...(state[path]?.rows || [])]\n\n      const newRow: Row = {\n        id: (subFieldState?.id?.value as string) || new ObjectId().toHexString(),\n        blockType: blockType || undefined,\n        collapsed: false,\n      }\n\n      withNewRow.splice(rowIndex, 0, newRow)\n\n      if (blockType) {\n        subFieldState.blockType = {\n          initialValue: blockType,\n          valid: true,\n          value: blockType,\n        }\n      }\n\n      // add new row to array _field state_\n      const { remainingFields, rows: siblingRows } = separateRows(path, state)\n      siblingRows.splice(rowIndex, 0, subFieldState)\n\n      const newState: FormState = {\n        ...remainingFields,\n        ...flattenRows(path, siblingRows),\n        [path]: {\n          ...state[path],\n          disableFormData: true,\n          rows: withNewRow,\n          value: siblingRows.length,\n        },\n      }\n\n      return newState\n    }\n\n    case 'REPLACE_ROW': {\n      const { blockType, path, rowIndex: rowIndexArg, subFieldState = {} } = action\n\n      const { remainingFields, rows: siblingRows } = separateRows(path, state)\n      const rowIndex = Math.max(0, Math.min(rowIndexArg, siblingRows?.length - 1 || 0))\n\n      const rowsMetadata = [...(state[path]?.rows || [])]\n      rowsMetadata[rowIndex] = {\n        id: new ObjectId().toHexString(),\n        blockType: blockType || undefined,\n        collapsed: false,\n      }\n\n      if (blockType) {\n        subFieldState.blockType = {\n          initialValue: blockType,\n          valid: true,\n          value: blockType,\n        }\n      }\n\n      // replace form _field state_\n      siblingRows[rowIndex] = subFieldState\n\n      const newState: FormState = {\n        ...remainingFields,\n        ...flattenRows(path, siblingRows),\n        [path]: {\n          ...state[path],\n          disableFormData: true,\n          rows: rowsMetadata,\n          value: siblingRows.length,\n        },\n      }\n\n      return newState\n    }\n\n    case 'DUPLICATE_ROW': {\n      const { path, rowIndex } = action\n      const { remainingFields, rows } = separateRows(path, state)\n      const rowsMetadata = [...(state[path].rows || [])]\n\n      const duplicateRowMetadata = deepCopyObjectSimple(rowsMetadata[rowIndex])\n      if (duplicateRowMetadata.id) duplicateRowMetadata.id = new ObjectId().toHexString()\n\n      const duplicateRowState = deepCopyObject(rows[rowIndex])\n      if (duplicateRowState.id) {\n        duplicateRowState.id.value = new ObjectId().toHexString()\n        duplicateRowState.id.initialValue = new ObjectId().toHexString()\n      }\n\n      // If there are subfields\n      if (Object.keys(duplicateRowState).length > 0) {\n        // Add new object containing subfield names to unflattenedRows array\n        rows.splice(rowIndex + 1, 0, duplicateRowState)\n        rowsMetadata.splice(rowIndex + 1, 0, duplicateRowMetadata)\n      }\n\n      const newState = {\n        ...remainingFields,\n        ...flattenRows(path, rows),\n        [path]: {\n          ...state[path],\n          disableFormData: true,\n          rows: rowsMetadata,\n          value: rows.length,\n        },\n      }\n\n      return newState\n    }\n\n    case 'MOVE_ROW': {\n      const { moveFromIndex, moveToIndex, path } = action\n      const { remainingFields, rows } = separateRows(path, state)\n\n      // copy the row to move\n      const copyOfMovingRow = rows[moveFromIndex]\n      // delete the row by index\n      rows.splice(moveFromIndex, 1)\n      // insert row copyOfMovingRow back in\n      rows.splice(moveToIndex, 0, copyOfMovingRow)\n\n      // modify array/block internal row state (i.e. collapsed, blockType)\n      const rowStateCopy = [...(state[path]?.rows || [])]\n      const movingRowState = { ...rowStateCopy[moveFromIndex] }\n      rowStateCopy.splice(moveFromIndex, 1)\n      rowStateCopy.splice(moveToIndex, 0, movingRowState)\n\n      const newState = {\n        ...remainingFields,\n        ...flattenRows(path, rows),\n        [path]: {\n          ...state[path],\n          rows: rowStateCopy,\n        },\n      }\n\n      return newState\n    }\n\n    case 'SET_ROW_COLLAPSED': {\n      const { path, updatedRows } = action\n\n      const newState = {\n        ...state,\n        [path]: {\n          ...state[path],\n          rows: updatedRows,\n        },\n      }\n\n      return newState\n    }\n\n    case 'SET_ALL_ROWS_COLLAPSED': {\n      const { path, updatedRows } = action\n\n      return {\n        ...state,\n        [path]: {\n          ...state[path],\n          rows: updatedRows,\n        },\n      }\n    }\n\n    default: {\n      return state\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"fieldReducer.js","names":["ObjectIdImport","dequal","deepCopyObjectSimple","deepCopyObjectSimpleWithoutReactComponents","flattenRows","separateRows","ObjectId","default","fieldReducer","state","action","type","optimize","newState","Object","entries","forEach","path","field","oldField","newField","errorPaths","errors","message","fieldPath","initialValue","value","errorMessage","valid","segments","split","length","push","fieldErrorPath","parentPath","slice","join","reduce","acc","fieldState","fieldErrorPaths","errorACC","startsWith","changed","newErrorPaths","Array","isArray","includes","key","formState","rowIndex","remainingFields","rows","rowsMetadata","splice","disableFormData","requiresRender","blockType","rowIndexFromArgs","subFieldState","withNewRow","newRow","id","toHexString","undefined","collapsed","siblingRows","passesCondition","rowIndexArg","Math","max","min","duplicateRowMetadata","duplicateRowState","keys","filter","endsWith","idState","isValid","moveFromIndex","moveToIndex","copyOfMovingRow","rowStateCopy","movingRowState","updatedRows"],"sources":["../../../src/forms/Form/fieldReducer.ts"],"sourcesContent":["'use client'\nimport type { FormField, FormState, Row } from 'payload'\n\nimport ObjectIdImport from 'bson-objectid'\nimport { dequal } from 'dequal/lite' // lite: no need for Map and Set support\nimport { deepCopyObjectSimple, deepCopyObjectSimpleWithoutReactComponents } from 'payload/shared'\n\nimport type { FieldAction } from './types.js'\n\nimport { flattenRows, separateRows } from './rows.js'\n\nconst ObjectId = (ObjectIdImport.default ||\n  ObjectIdImport) as unknown as typeof ObjectIdImport.default\n\n/**\n * Reducer which modifies the form field state (all the current data of the fields in the form). When called using dispatch, it will return a new state object.\n */\nexport function fieldReducer(state: FormState, action: FieldAction): FormState {\n  switch (action.type) {\n    case 'REPLACE_STATE': {\n      if (action.optimize !== false) {\n        // Only update fields that have changed\n        // by comparing old value / initialValue to new\n        // ..\n        // This is a performance enhancement for saving\n        // large documents with hundreds of fields\n        const newState = {}\n\n        Object.entries(action.state).forEach(([path, field]) => {\n          const oldField = state[path]\n          const newField = field\n\n          if (!dequal(oldField, newField)) {\n            newState[path] = newField\n          } else if (oldField) {\n            newState[path] = oldField\n          }\n        })\n        return newState\n      }\n      // If we're not optimizing, just set the state to the new state\n      return action.state\n    }\n\n    case 'REMOVE': {\n      const newState = { ...state }\n      if (newState[action.path]) {\n        delete newState[action.path]\n      }\n      return newState\n    }\n\n    case 'ADD_SERVER_ERRORS': {\n      let newState = { ...state }\n\n      const errorPaths: { fieldErrorPath: string; parentPath: string }[] = []\n\n      action.errors.forEach(({ message, path: fieldPath }) => {\n        newState[fieldPath] = {\n          ...(newState[fieldPath] || {\n            initialValue: null,\n            value: null,\n          }),\n          errorMessage: message,\n          valid: false,\n        }\n\n        const segments = fieldPath.split('.')\n        if (segments.length > 1) {\n          errorPaths.push({\n            fieldErrorPath: fieldPath,\n            parentPath: segments.slice(0, segments.length - 1).join('.'),\n          })\n        }\n      })\n\n      newState = Object.entries(newState).reduce((acc, [path, fieldState]) => {\n        const fieldErrorPaths = errorPaths.reduce((errorACC, { fieldErrorPath, parentPath }) => {\n          if (parentPath.startsWith(path)) {\n            errorACC.push(fieldErrorPath)\n          }\n          return errorACC\n        }, [])\n\n        let changed = false\n\n        if (fieldErrorPaths.length > 0) {\n          const newErrorPaths = Array.isArray(fieldState.errorPaths) ? fieldState.errorPaths : []\n\n          fieldErrorPaths.forEach((fieldErrorPath) => {\n            if (!newErrorPaths.includes(fieldErrorPath)) {\n              newErrorPaths.push(fieldErrorPath)\n              changed = true\n            }\n          })\n\n          if (changed) {\n            acc[path] = {\n              ...fieldState,\n              errorPaths: newErrorPaths,\n            }\n          }\n        }\n\n        if (!changed) {\n          acc[path] = fieldState\n        }\n\n        return acc\n      }, {})\n\n      return newState\n    }\n\n    case 'UPDATE': {\n      const newField = Object.entries(action).reduce(\n        (field, [key, value]) => {\n          if (\n            [\n              'disableFormData',\n              'errorMessage',\n              'initialValue',\n              'rows',\n              'valid',\n              'validate',\n              'value',\n            ].includes(key)\n          ) {\n            return {\n              ...field,\n              [key]: value,\n            }\n          }\n\n          return field\n        },\n        state[action.path] || ({} as FormField),\n      )\n\n      const newState = {\n        ...state,\n        [action.path]: newField,\n      }\n\n      return newState\n    }\n\n    case 'UPDATE_MANY': {\n      const newState = { ...state }\n\n      Object.entries(action.formState).forEach(([path, field]) => {\n        newState[path] = field\n      })\n\n      return newState\n    }\n\n    case 'REMOVE_ROW': {\n      const { path, rowIndex } = action\n      const { remainingFields, rows } = separateRows(path, state)\n      const rowsMetadata = [...(state[path]?.rows || [])]\n\n      rows.splice(rowIndex, 1)\n      rowsMetadata.splice(rowIndex, 1)\n\n      const newState: FormState = {\n        ...remainingFields,\n        [path]: {\n          ...state[path],\n          disableFormData: rows.length > 0,\n          requiresRender: true,\n          rows: rowsMetadata,\n          value: rows.length,\n        },\n        ...flattenRows(path, rows),\n      }\n\n      return newState\n    }\n\n    case 'ADD_ROW': {\n      const { blockType, path, rowIndex: rowIndexFromArgs, subFieldState = {} } = action\n\n      const rowIndex =\n        typeof rowIndexFromArgs === 'number' ? rowIndexFromArgs : state[path]?.rows?.length || 0\n\n      const withNewRow = [...(state[path]?.rows || [])]\n\n      const newRow: Row = {\n        id: (subFieldState?.id?.value as string) || new ObjectId().toHexString(),\n        blockType: blockType || undefined,\n        collapsed: false,\n      }\n\n      withNewRow.splice(rowIndex, 0, newRow)\n\n      if (blockType) {\n        subFieldState.blockType = {\n          initialValue: blockType,\n          valid: true,\n          value: blockType,\n        }\n      }\n\n      // add new row to array _field state_\n      const { remainingFields, rows: siblingRows } = separateRows(path, state)\n      siblingRows.splice(rowIndex, 0, subFieldState)\n\n      const newState: FormState = {\n        ...remainingFields,\n        ...flattenRows(path, siblingRows),\n        [`${path}.${rowIndex}.id`]: {\n          initialValue: newRow.id,\n          passesCondition: true,\n          requiresRender: true,\n          valid: true,\n          value: newRow.id,\n        },\n        [path]: {\n          ...state[path],\n          disableFormData: true,\n          requiresRender: true,\n          rows: withNewRow,\n          value: siblingRows.length,\n        },\n      }\n\n      return newState\n    }\n\n    case 'REPLACE_ROW': {\n      const { blockType, path, rowIndex: rowIndexArg, subFieldState = {} } = action\n\n      const { remainingFields, rows: siblingRows } = separateRows(path, state)\n      const rowIndex = Math.max(0, Math.min(rowIndexArg, siblingRows?.length - 1 || 0))\n\n      const rowsMetadata = [...(state[path]?.rows || [])]\n      rowsMetadata[rowIndex] = {\n        id: new ObjectId().toHexString(),\n        blockType: blockType || undefined,\n        collapsed: false,\n      }\n\n      if (blockType) {\n        subFieldState.blockType = {\n          initialValue: blockType,\n          valid: true,\n          value: blockType,\n        }\n      }\n\n      // replace form _field state_\n      siblingRows[rowIndex] = subFieldState\n\n      const newState: FormState = {\n        ...remainingFields,\n        ...flattenRows(path, siblingRows),\n        [path]: {\n          ...state[path],\n          disableFormData: true,\n          rows: rowsMetadata,\n          value: siblingRows.length,\n        },\n      }\n\n      return newState\n    }\n\n    case 'DUPLICATE_ROW': {\n      const { path, rowIndex } = action\n      const { remainingFields, rows } = separateRows(path, state)\n      const rowsMetadata = [...(state[path].rows || [])]\n\n      const duplicateRowMetadata = deepCopyObjectSimple(rowsMetadata[rowIndex])\n      if (duplicateRowMetadata.id) {\n        duplicateRowMetadata.id = new ObjectId().toHexString()\n      }\n\n      const duplicateRowState = deepCopyObjectSimpleWithoutReactComponents(rows[rowIndex])\n      if (duplicateRowState.id) {\n        duplicateRowState.id.value = new ObjectId().toHexString()\n        duplicateRowState.id.initialValue = new ObjectId().toHexString()\n      }\n\n      for (const key of Object.keys(duplicateRowState).filter((key) => key.endsWith('.id'))) {\n        const idState = duplicateRowState[key]\n\n        if (idState && typeof idState.value === 'string' && ObjectId.isValid(idState.value)) {\n          duplicateRowState[key].value = new ObjectId().toHexString()\n          duplicateRowState[key].initialValue = new ObjectId().toHexString()\n        }\n      }\n\n      // If there are subfields\n      if (Object.keys(duplicateRowState).length > 0) {\n        // Add new object containing subfield names to unflattenedRows array\n        rows.splice(rowIndex + 1, 0, duplicateRowState)\n        rowsMetadata.splice(rowIndex + 1, 0, duplicateRowMetadata)\n      }\n\n      const newState = {\n        ...remainingFields,\n        ...flattenRows(path, rows),\n        [path]: {\n          ...state[path],\n          disableFormData: true,\n          requiresRender: true,\n          rows: rowsMetadata,\n          value: rows.length,\n        },\n      }\n\n      return newState\n    }\n\n    case 'MOVE_ROW': {\n      const { moveFromIndex, moveToIndex, path } = action\n      const { remainingFields, rows } = separateRows(path, state)\n\n      // copy the row to move\n      const copyOfMovingRow = rows[moveFromIndex]\n      // delete the row by index\n      rows.splice(moveFromIndex, 1)\n      // insert row copyOfMovingRow back in\n      rows.splice(moveToIndex, 0, copyOfMovingRow)\n\n      // modify array/block internal row state (i.e. collapsed, blockType)\n      const rowStateCopy = [...(state[path]?.rows || [])]\n      const movingRowState = { ...rowStateCopy[moveFromIndex] }\n      rowStateCopy.splice(moveFromIndex, 1)\n      rowStateCopy.splice(moveToIndex, 0, movingRowState)\n\n      const newState = {\n        ...remainingFields,\n        ...flattenRows(path, rows),\n        [path]: {\n          ...state[path],\n          rows: rowStateCopy,\n        },\n      }\n\n      return newState\n    }\n\n    case 'SET_ROW_COLLAPSED': {\n      const { path, updatedRows } = action\n\n      const newState = {\n        ...state,\n        [path]: {\n          ...state[path],\n          rows: updatedRows,\n        },\n      }\n\n      return newState\n    }\n\n    case 'SET_ALL_ROWS_COLLAPSED': {\n      const { path, updatedRows } = action\n\n      return {\n        ...state,\n        [path]: {\n          ...state[path],\n          rows: updatedRows,\n        },\n      }\n    }\n\n    default: {\n      return state\n    }\n  }\n}\n"],"mappings":"AAAA;;AAGA,OAAOA,cAAA,MAAoB;AAC3B,SAASC,MAAM,QAAQ,cAAa,CAAC;AACrC,SAASC,oBAAoB,EAAEC,0CAA0C,QAAQ;AAIjF,SAASC,WAAW,EAAEC,YAAY,QAAQ;AAE1C,MAAMC,QAAA,GAAYN,cAAA,CAAeO,OAAO,IACtCP,cAAA;AAEF;;;AAGA,OAAO,SAASQ,aAAaC,KAAgB,EAAEC,MAAmB;EAChE,QAAQA,MAAA,CAAOC,IAAI;IACjB,KAAK;MAAiB;QACpB,IAAID,MAAA,CAAOE,QAAQ,KAAK,OAAO;UAC7B;UACA;UACA;UACA;UACA;UACA,MAAMC,QAAA,GAAW,CAAC;UAElBC,MAAA,CAAOC,OAAO,CAACL,MAAA,CAAOD,KAAK,EAAEO,OAAO,CAAC,CAAC,CAACC,IAAA,EAAMC,KAAA,CAAM;YACjD,MAAMC,QAAA,GAAWV,KAAK,CAACQ,IAAA,CAAK;YAC5B,MAAMG,QAAA,GAAWF,KAAA;YAEjB,IAAI,CAACjB,MAAA,CAAOkB,QAAA,EAAUC,QAAA,GAAW;cAC/BP,QAAQ,CAACI,IAAA,CAAK,GAAGG,QAAA;YACnB,OAAO,IAAID,QAAA,EAAU;cACnBN,QAAQ,CAACI,IAAA,CAAK,GAAGE,QAAA;YACnB;UACF;UACA,OAAON,QAAA;QACT;QACA;QACA,OAAOH,MAAA,CAAOD,KAAK;MACrB;IAEA,KAAK;MAAU;QACb,MAAMI,QAAA,GAAW;UAAE,GAAGJ;QAAM;QAC5B,IAAII,QAAQ,CAACH,MAAA,CAAOO,IAAI,CAAC,EAAE;UACzB,OAAOJ,QAAQ,CAACH,MAAA,CAAOO,IAAI,CAAC;QAC9B;QACA,OAAOJ,QAAA;MACT;IAEA,KAAK;MAAqB;QACxB,IAAIA,QAAA,GAAW;UAAE,GAAGJ;QAAM;QAE1B,MAAMY,UAAA,GAA+D,EAAE;QAEvEX,MAAA,CAAOY,MAAM,CAACN,OAAO,CAAC,CAAC;UAAEO,OAAO;UAAEN,IAAA,EAAMO;QAAS,CAAE;UACjDX,QAAQ,CAACW,SAAA,CAAU,GAAG;YACpB,IAAIX,QAAQ,CAACW,SAAA,CAAU,IAAI;cACzBC,YAAA,EAAc;cACdC,KAAA,EAAO;YACT,CAAC;YACDC,YAAA,EAAcJ,OAAA;YACdK,KAAA,EAAO;UACT;UAEA,MAAMC,QAAA,GAAWL,SAAA,CAAUM,KAAK,CAAC;UACjC,IAAID,QAAA,CAASE,MAAM,GAAG,GAAG;YACvBV,UAAA,CAAWW,IAAI,CAAC;cACdC,cAAA,EAAgBT,SAAA;cAChBU,UAAA,EAAYL,QAAA,CAASM,KAAK,CAAC,GAAGN,QAAA,CAASE,MAAM,GAAG,GAAGK,IAAI,CAAC;YAC1D;UACF;QACF;QAEAvB,QAAA,GAAWC,MAAA,CAAOC,OAAO,CAACF,QAAA,EAAUwB,MAAM,CAAC,CAACC,GAAA,EAAK,CAACrB,IAAA,EAAMsB,UAAA,CAAW;UACjE,MAAMC,eAAA,GAAkBnB,UAAA,CAAWgB,MAAM,CAAC,CAACI,QAAA,EAAU;YAAER,cAAc;YAAEC;UAAU,CAAE;YACjF,IAAIA,UAAA,CAAWQ,UAAU,CAACzB,IAAA,GAAO;cAC/BwB,QAAA,CAAST,IAAI,CAACC,cAAA;YAChB;YACA,OAAOQ,QAAA;UACT,GAAG,EAAE;UAEL,IAAIE,OAAA,GAAU;UAEd,IAAIH,eAAA,CAAgBT,MAAM,GAAG,GAAG;YAC9B,MAAMa,aAAA,GAAgBC,KAAA,CAAMC,OAAO,CAACP,UAAA,CAAWlB,UAAU,IAAIkB,UAAA,CAAWlB,UAAU,GAAG,EAAE;YAEvFmB,eAAA,CAAgBxB,OAAO,CAAEiB,cAAA;cACvB,IAAI,CAACW,aAAA,CAAcG,QAAQ,CAACd,cAAA,GAAiB;gBAC3CW,aAAA,CAAcZ,IAAI,CAACC,cAAA;gBACnBU,OAAA,GAAU;cACZ;YACF;YAEA,IAAIA,OAAA,EAAS;cACXL,GAAG,CAACrB,IAAA,CAAK,GAAG;gBACV,GAAGsB,UAAU;gBACblB,UAAA,EAAYuB;cACd;YACF;UACF;UAEA,IAAI,CAACD,OAAA,EAAS;YACZL,GAAG,CAACrB,IAAA,CAAK,GAAGsB,UAAA;UACd;UAEA,OAAOD,GAAA;QACT,GAAG,CAAC;QAEJ,OAAOzB,QAAA;MACT;IAEA,KAAK;MAAU;QACb,MAAMO,QAAA,GAAWN,MAAA,CAAOC,OAAO,CAACL,MAAA,EAAQ2B,MAAM,CAC5C,CAACnB,KAAA,EAAO,CAAC8B,GAAA,EAAKtB,KAAA,CAAM;UAClB,IACE,CACE,mBACA,gBACA,gBACA,QACA,SACA,YACA,QACD,CAACqB,QAAQ,CAACC,GAAA,GACX;YACA,OAAO;cACL,GAAG9B,KAAK;cACR,CAAC8B,GAAA,GAAMtB;YACT;UACF;UAEA,OAAOR,KAAA;QACT,GACAT,KAAK,CAACC,MAAA,CAAOO,IAAI,CAAC,IAAK,CAAC;QAG1B,MAAMJ,QAAA,GAAW;UACf,GAAGJ,KAAK;UACR,CAACC,MAAA,CAAOO,IAAI,GAAGG;QACjB;QAEA,OAAOP,QAAA;MACT;IAEA,KAAK;MAAe;QAClB,MAAMA,QAAA,GAAW;UAAE,GAAGJ;QAAM;QAE5BK,MAAA,CAAOC,OAAO,CAACL,MAAA,CAAOuC,SAAS,EAAEjC,OAAO,CAAC,CAAC,CAACC,IAAA,EAAMC,KAAA,CAAM;UACrDL,QAAQ,CAACI,IAAA,CAAK,GAAGC,KAAA;QACnB;QAEA,OAAOL,QAAA;MACT;IAEA,KAAK;MAAc;QACjB,MAAM;UAAEI,IAAI;UAAEiC;QAAQ,CAAE,GAAGxC,MAAA;QAC3B,MAAM;UAAEyC,eAAe;UAAEC;QAAI,CAAE,GAAG/C,YAAA,CAAaY,IAAA,EAAMR,KAAA;QACrD,MAAM4C,YAAA,GAAe,C,IAAK5C,KAAK,CAACQ,IAAA,CAAK,EAAEmC,IAAA,IAAQ,EAAE,EAAE;QAEnDA,IAAA,CAAKE,MAAM,CAACJ,QAAA,EAAU;QACtBG,YAAA,CAAaC,MAAM,CAACJ,QAAA,EAAU;QAE9B,MAAMrC,QAAA,GAAsB;UAC1B,GAAGsC,eAAe;UAClB,CAAClC,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdsC,eAAA,EAAiBH,IAAA,CAAKrB,MAAM,GAAG;YAC/ByB,cAAA,EAAgB;YAChBJ,IAAA,EAAMC,YAAA;YACN3B,KAAA,EAAO0B,IAAA,CAAKrB;UACd;UACA,GAAG3B,WAAA,CAAYa,IAAA,EAAMmC,IAAA;QACvB;QAEA,OAAOvC,QAAA;MACT;IAEA,KAAK;MAAW;QACd,MAAM;UAAE4C,SAAS;UAAExC,IAAI;UAAEiC,QAAA,EAAUQ,gBAAgB;UAAEC,aAAA,GAAgB,CAAC;QAAC,CAAE,GAAGjD,MAAA;QAE5E,MAAMwC,QAAA,GACJ,OAAOQ,gBAAA,KAAqB,WAAWA,gBAAA,GAAmBjD,KAAK,CAACQ,IAAA,CAAK,EAAEmC,IAAA,EAAMrB,MAAA,IAAU;QAEzF,MAAM6B,UAAA,GAAa,C,IAAKnD,KAAK,CAACQ,IAAA,CAAK,EAAEmC,IAAA,IAAQ,EAAE,EAAE;QAEjD,MAAMS,MAAA,GAAc;UAClBC,EAAA,EAAIH,aAAC,EAAeG,EAAA,EAAIpC,KAAA,IAAoB,IAAIpB,QAAA,GAAWyD,WAAW;UACtEN,SAAA,EAAWA,SAAA,IAAaO,SAAA;UACxBC,SAAA,EAAW;QACb;QAEAL,UAAA,CAAWN,MAAM,CAACJ,QAAA,EAAU,GAAGW,MAAA;QAE/B,IAAIJ,SAAA,EAAW;UACbE,aAAA,CAAcF,SAAS,GAAG;YACxBhC,YAAA,EAAcgC,SAAA;YACd7B,KAAA,EAAO;YACPF,KAAA,EAAO+B;UACT;QACF;QAEA;QACA,MAAM;UAAEN,eAAe;UAAEC,IAAA,EAAMc;QAAW,CAAE,GAAG7D,YAAA,CAAaY,IAAA,EAAMR,KAAA;QAClEyD,WAAA,CAAYZ,MAAM,CAACJ,QAAA,EAAU,GAAGS,aAAA;QAEhC,MAAM9C,QAAA,GAAsB;UAC1B,GAAGsC,eAAe;UAClB,GAAG/C,WAAA,CAAYa,IAAA,EAAMiD,WAAA,CAAY;UACjC,CAAC,GAAGjD,IAAA,IAAQiC,QAAA,KAAa,GAAG;YAC1BzB,YAAA,EAAcoC,MAAA,CAAOC,EAAE;YACvBK,eAAA,EAAiB;YACjBX,cAAA,EAAgB;YAChB5B,KAAA,EAAO;YACPF,KAAA,EAAOmC,MAAA,CAAOC;UAChB;UACA,CAAC7C,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdsC,eAAA,EAAiB;YACjBC,cAAA,EAAgB;YAChBJ,IAAA,EAAMQ,UAAA;YACNlC,KAAA,EAAOwC,WAAA,CAAYnC;UACrB;QACF;QAEA,OAAOlB,QAAA;MACT;IAEA,KAAK;MAAe;QAClB,MAAM;UAAE4C,SAAS;UAAExC,IAAI;UAAEiC,QAAA,EAAUkB,WAAW;UAAET,aAAA,GAAgB,CAAC;QAAC,CAAE,GAAGjD,MAAA;QAEvE,MAAM;UAAEyC,eAAe;UAAEC,IAAA,EAAMc;QAAW,CAAE,GAAG7D,YAAA,CAAaY,IAAA,EAAMR,KAAA;QAClE,MAAMyC,QAAA,GAAWmB,IAAA,CAAKC,GAAG,CAAC,GAAGD,IAAA,CAAKE,GAAG,CAACH,WAAA,EAAaF,WAAA,EAAanC,MAAA,GAAS,KAAK;QAE9E,MAAMsB,YAAA,GAAe,C,IAAK5C,KAAK,CAACQ,IAAA,CAAK,EAAEmC,IAAA,IAAQ,EAAE,EAAE;QACnDC,YAAY,CAACH,QAAA,CAAS,GAAG;UACvBY,EAAA,EAAI,IAAIxD,QAAA,GAAWyD,WAAW;UAC9BN,SAAA,EAAWA,SAAA,IAAaO,SAAA;UACxBC,SAAA,EAAW;QACb;QAEA,IAAIR,SAAA,EAAW;UACbE,aAAA,CAAcF,SAAS,GAAG;YACxBhC,YAAA,EAAcgC,SAAA;YACd7B,KAAA,EAAO;YACPF,KAAA,EAAO+B;UACT;QACF;QAEA;QACAS,WAAW,CAAChB,QAAA,CAAS,GAAGS,aAAA;QAExB,MAAM9C,QAAA,GAAsB;UAC1B,GAAGsC,eAAe;UAClB,GAAG/C,WAAA,CAAYa,IAAA,EAAMiD,WAAA,CAAY;UACjC,CAACjD,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdsC,eAAA,EAAiB;YACjBH,IAAA,EAAMC,YAAA;YACN3B,KAAA,EAAOwC,WAAA,CAAYnC;UACrB;QACF;QAEA,OAAOlB,QAAA;MACT;IAEA,KAAK;MAAiB;QACpB,MAAM;UAAEI,IAAI;UAAEiC;QAAQ,CAAE,GAAGxC,MAAA;QAC3B,MAAM;UAAEyC,eAAe;UAAEC;QAAI,CAAE,GAAG/C,YAAA,CAAaY,IAAA,EAAMR,KAAA;QACrD,MAAM4C,YAAA,GAAe,C,IAAK5C,KAAK,CAACQ,IAAA,CAAK,CAACmC,IAAI,IAAI,EAAE,EAAE;QAElD,MAAMoB,oBAAA,GAAuBtE,oBAAA,CAAqBmD,YAAY,CAACH,QAAA,CAAS;QACxE,IAAIsB,oBAAA,CAAqBV,EAAE,EAAE;UAC3BU,oBAAA,CAAqBV,EAAE,GAAG,IAAIxD,QAAA,GAAWyD,WAAW;QACtD;QAEA,MAAMU,iBAAA,GAAoBtE,0CAAA,CAA2CiD,IAAI,CAACF,QAAA,CAAS;QACnF,IAAIuB,iBAAA,CAAkBX,EAAE,EAAE;UACxBW,iBAAA,CAAkBX,EAAE,CAACpC,KAAK,GAAG,IAAIpB,QAAA,GAAWyD,WAAW;UACvDU,iBAAA,CAAkBX,EAAE,CAACrC,YAAY,GAAG,IAAInB,QAAA,GAAWyD,WAAW;QAChE;QAEA,KAAK,MAAMf,GAAA,IAAOlC,MAAA,CAAO4D,IAAI,CAACD,iBAAA,EAAmBE,MAAM,CAAE3B,GAAA,IAAQA,GAAA,CAAI4B,QAAQ,CAAC,SAAS;UACrF,MAAMC,OAAA,GAAUJ,iBAAiB,CAACzB,GAAA,CAAI;UAEtC,IAAI6B,OAAA,IAAW,OAAOA,OAAA,CAAQnD,KAAK,KAAK,YAAYpB,QAAA,CAASwE,OAAO,CAACD,OAAA,CAAQnD,KAAK,GAAG;YACnF+C,iBAAiB,CAACzB,GAAA,CAAI,CAACtB,KAAK,GAAG,IAAIpB,QAAA,GAAWyD,WAAW;YACzDU,iBAAiB,CAACzB,GAAA,CAAI,CAACvB,YAAY,GAAG,IAAInB,QAAA,GAAWyD,WAAW;UAClE;QACF;QAEA;QACA,IAAIjD,MAAA,CAAO4D,IAAI,CAACD,iBAAA,EAAmB1C,MAAM,GAAG,GAAG;UAC7C;UACAqB,IAAA,CAAKE,MAAM,CAACJ,QAAA,GAAW,GAAG,GAAGuB,iBAAA;UAC7BpB,YAAA,CAAaC,MAAM,CAACJ,QAAA,GAAW,GAAG,GAAGsB,oBAAA;QACvC;QAEA,MAAM3D,QAAA,GAAW;UACf,GAAGsC,eAAe;UAClB,GAAG/C,WAAA,CAAYa,IAAA,EAAMmC,IAAA,CAAK;UAC1B,CAACnC,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdsC,eAAA,EAAiB;YACjBC,cAAA,EAAgB;YAChBJ,IAAA,EAAMC,YAAA;YACN3B,KAAA,EAAO0B,IAAA,CAAKrB;UACd;QACF;QAEA,OAAOlB,QAAA;MACT;IAEA,KAAK;MAAY;QACf,MAAM;UAAEkE,aAAa;UAAEC,WAAW;UAAE/D;QAAI,CAAE,GAAGP,MAAA;QAC7C,MAAM;UAAEyC,eAAe;UAAEC;QAAI,CAAE,GAAG/C,YAAA,CAAaY,IAAA,EAAMR,KAAA;QAErD;QACA,MAAMwE,eAAA,GAAkB7B,IAAI,CAAC2B,aAAA,CAAc;QAC3C;QACA3B,IAAA,CAAKE,MAAM,CAACyB,aAAA,EAAe;QAC3B;QACA3B,IAAA,CAAKE,MAAM,CAAC0B,WAAA,EAAa,GAAGC,eAAA;QAE5B;QACA,MAAMC,YAAA,GAAe,C,IAAKzE,KAAK,CAACQ,IAAA,CAAK,EAAEmC,IAAA,IAAQ,EAAE,EAAE;QACnD,MAAM+B,cAAA,GAAiB;UAAE,GAAGD,YAAY,CAACH,aAAA;QAAe;QACxDG,YAAA,CAAa5B,MAAM,CAACyB,aAAA,EAAe;QACnCG,YAAA,CAAa5B,MAAM,CAAC0B,WAAA,EAAa,GAAGG,cAAA;QAEpC,MAAMtE,QAAA,GAAW;UACf,GAAGsC,eAAe;UAClB,GAAG/C,WAAA,CAAYa,IAAA,EAAMmC,IAAA,CAAK;UAC1B,CAACnC,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdmC,IAAA,EAAM8B;UACR;QACF;QAEA,OAAOrE,QAAA;MACT;IAEA,KAAK;MAAqB;QACxB,MAAM;UAAEI,IAAI;UAAEmE;QAAW,CAAE,GAAG1E,MAAA;QAE9B,MAAMG,QAAA,GAAW;UACf,GAAGJ,KAAK;UACR,CAACQ,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdmC,IAAA,EAAMgC;UACR;QACF;QAEA,OAAOvE,QAAA;MACT;IAEA,KAAK;MAA0B;QAC7B,MAAM;UAAEI,IAAI;UAAEmE;QAAW,CAAE,GAAG1E,MAAA;QAE9B,OAAO;UACL,GAAGD,KAAK;UACR,CAACQ,IAAA,GAAO;YACN,GAAGR,KAAK,CAACQ,IAAA,CAAK;YACdmC,IAAA,EAAMgC;UACR;QACF;MACF;IAEA;MAAS;QACP,OAAO3E,KAAA;MACT;EACF;AACF","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/forms/Form/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA+D,MAAM,OAAO,CAAA;AAGnF,OAAO,KAAK,EAEV,SAAS,EAGV,MAAM,YAAY,CAAA;AA4BnB,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAmmBpC,CAAA;AAED,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,GACb,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/forms/Form/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAA+D,MAAM,OAAO,CAAA;AAGnF,OAAO,KAAK,EAEV,SAAS,EAGV,MAAM,YAAY,CAAA;AA4BnB,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAmqBpC,CAAA;AAED,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,GACb,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/dist/forms/Form/index.js

@@ -4,19 +4,19 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { dequal } from 'dequal/lite'; // lite: no need for Map and Set support
 import { useRouter } from 'next/navigation.js';
 import { serialize } from 'object-to-formdata';
-import { getDataByPath as getDataByPathFunc, getSiblingData as getSiblingDataFunc, reduceFieldsToValues, wait } from 'payload/shared';
+import { deepCopyObjectSimpleWithoutReactComponents, getDataByPath as getDataByPathFunc, getSiblingData as getSiblingDataFunc, reduceFieldsToValues, wait } from 'payload/shared';
 import React, { useCallback, useEffect, useReducer, useRef, useState } from 'react';
 import { toast } from 'sonner';
-import { useDebouncedEffect } from '../../hooks/useDebouncedEffect.js';
+import { useIgnoredEffectDebounced } from '../../hooks/useIgnoredEffect.js';
 import { useThrottledEffect } from '../../hooks/useThrottledEffect.js';
 import { useAuth } from '../../providers/Auth/index.js';
 import { useConfig } from '../../providers/Config/index.js';
 import { useDocumentInfo } from '../../providers/DocumentInfo/index.js';
 import { useLocale } from '../../providers/Locale/index.js';
 import { useOperation } from '../../providers/Operation/index.js';
+import { useServerFunctions } from '../../providers/ServerFunctions/index.js';
 import { useTranslation } from '../../providers/Translation/index.js';
 import { requests } from '../../utilities/api.js';
-import { getFormState } from '../../utilities/getFormState.js';
 import { FormContext, FormFieldsContext, FormWatchContext, InitializingContext, ModifiedContext, ProcessingContext, SubmittedContext } from './context.js';
 import { errorMessages } from './errorMessages.js';
 import { fieldReducer } from './fieldReducer.js';
@@ -27,6 +27,8 @@ export const Form = props => {
   const {
     id,
     collectionSlug,
+    docPermissions,
+    getDocPreferences,
     globalSlug
   } = useDocumentInfo();
   const {
@@ -34,9 +36,9 @@ export const Form = props => {
     beforeSubmit,
     children,
     className,
+    disabled: disabledFromProps,
     disableSuccessStatus,
     disableValidationOnSubmit,
-    disabled: disabledFromProps,
     // fields: fieldsFromProps = collection?.fields || global?.fields,
     handleResponse,
     initialState,
@@ -63,15 +65,12 @@ export const Form = props => {
     user
   } = useAuth();
   const operation = useOperation();
+  const {
+    getFormState
+  } = useServerFunctions();
   const {
     config
   } = useConfig();
-  const {
-    routes: {
-      api: apiRoute
-    },
-    serverURL
-  } = config;
   const [disabled, setDisabled] = useState(disabledFromProps || false);
   const [isMounted, setIsMounted] = useState(false);
   const [modified, setModified] = useState(false);
@@ -80,6 +79,8 @@ export const Form = props => {
   const [submitted, setSubmitted] = useState(false);
   const formRef = useRef(null);
   const contextRef = useRef({});
+  const abortControllerRef = useRef(new AbortController());
+  const abortControllerRef2 = useRef(new AbortController());
   const fieldsReducer = useReducer(fieldReducer, {}, () => initialState);
   /**
   * `fields` is the current, up-to-date state/data of all fields in the form. It can be modified by using dispatchFields,
@@ -96,7 +97,7 @@ export const Form = props => {
       const validatedField = field;
       if (field.passesCondition !== false) {
         let validationResult = validatedField.valid;
-        if (typeof field.validate === 'function') {
+        if ('validate' in field && typeof field.validate === 'function') {
           let valueToValidate = field.value;
           if (field?.rows && Array.isArray(field.rows)) {
             valueToValidate = contextRef.current.getDataByPath(path);
@@ -154,7 +155,7 @@ export const Form = props => {
       return;
     }
     // create new toast promise which will resolve manually later
-    let successToast, errorToast;
+    let errorToast, successToast;
     const promise = new Promise((resolve, reject) => {
       successToast = resolve;
       errorToast = reject;
@@ -182,14 +183,17 @@ export const Form = props => {
     }
     setProcessing(true);
     setDisabled(true);
-    if (waitForAutocomplete) await wait(100);
+    if (waitForAutocomplete) {
+      await wait(100);
+    }
     // Execute server side validations
     if (Array.isArray(beforeSubmit)) {
       let revalidatedFormState;
+      const serializableFields = deepCopyObjectSimpleWithoutReactComponents(fields);
       await beforeSubmit.reduce(async (priorOnChange, beforeSubmitFn) => {
         await priorOnChange;
         const result = await beforeSubmitFn({
-          formState: fields
+          formState: serializableFields
         });
         revalidatedFormState = result;
       }, Promise.resolve());
@@ -215,11 +219,14 @@ export const Form = props => {
     }
     // If submit handler comes through via props, run that
     if (onSubmit) {
-      const data_4 = {
-        ...reduceFieldsToValues(fields, true),
-        ...overrides
-      };
-      onSubmit(fields, data_4);
+      const serializableFields_0 = deepCopyObjectSimpleWithoutReactComponents(fields);
+      const data_4 = reduceFieldsToValues(serializableFields_0, true);
+      if (overrides) {
+        for (const [key, value] of Object.entries(overrides)) {
+          data_4[key] = value;
+        }
+      }
+      onSubmit(serializableFields_0, data_4);
     }
     if (!hasFormSubmitAction) {
       // No action provided, so we should return. An example where this happens are lexical link drawers. Upon submitting the drawer, we
@@ -252,9 +259,13 @@ export const Form = props => {
       const isJSON = contentType && contentType.indexOf('application/json') !== -1;
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       let json = {};
-      if (isJSON) json = await res.json();
+      if (isJSON) {
+        json = await res.json();
+      }
       if (res.status < 400) {
-        if (typeof onSuccess === 'function') await onSuccess(json);
+        if (typeof onSuccess === 'function') {
+          await onSuccess(json);
+        }
         setSubmitted(false);
         setProcessing(false);
         if (redirect) {
@@ -282,7 +293,7 @@ export const Form = props => {
             }
             if (Array.isArray(err_0?.data?.errors)) {
               err_0.data?.errors.forEach(dataError => {
-                if (dataError?.field) {
+                if (dataError?.path) {
                   newFieldErrs.push(dataError);
                 } else {
                   newNonFieldErrs.push(dataError);
@@ -304,7 +315,8 @@ export const Form = props => {
         errorToast(message);
       }
     } catch (err) {
-      console.error('Error submitting form', err);
+      console.error('Error submitting form', err) // eslint-disable-line no-console
+      ;
       setProcessing(false);
       setSubmitted(true);
       setDisabled(false);
@@ -339,17 +351,29 @@ export const Form = props => {
     return formData_0;
   }, []);
   const reset = useCallback(async data_6 => {
-    const newState = await getFormState({
-      apiRoute,
-      body: {
-        id,
-        collectionSlug,
-        data: data_6,
-        globalSlug,
-        operation,
-        schemaPath: collectionSlug || globalSlug
-      },
-      serverURL
+    if (abortControllerRef.current) {
+      try {
+        abortControllerRef.current.abort();
+      } catch (error) {
+        // swallow error
+      }
+    }
+    const abortController = new AbortController();
+    abortControllerRef.current = abortController;
+    const docPreferences = await getDocPreferences();
+    const {
+      state: newState
+    } = await getFormState({
+      id,
+      collectionSlug,
+      data: data_6,
+      docPermissions,
+      docPreferences,
+      globalSlug,
+      operation,
+      renderAllFields: true,
+      schemaPath: collectionSlug ? collectionSlug : globalSlug,
+      signal: abortController.signal
     });
     contextRef.current = {
       ...initContextState
@@ -359,7 +383,7 @@ export const Form = props => {
       type: 'REPLACE_STATE',
       state: newState
     });
-  }, [apiRoute, collectionSlug, dispatchFields, globalSlug, id, operation, serverURL]);
+  }, [collectionSlug, dispatchFields, globalSlug, id, operation, getFormState, docPermissions, getDocPreferences]);
   const replaceState = useCallback(state => {
     contextRef.current = {
       ...initContextState
@@ -370,40 +394,24 @@ export const Form = props => {
       state
     });
   }, [dispatchFields]);
-  const getFieldStateBySchemaPath = useCallback(async ({
-    data: data_7,
-    schemaPath
-  }) => {
-    const fieldSchema = await getFormState({
-      apiRoute,
-      body: {
-        collectionSlug,
-        data: data_7,
-        globalSlug,
-        schemaPath
-      },
-      serverURL
-    });
-    return fieldSchema;
-  }, [apiRoute, collectionSlug, globalSlug, serverURL]);
-  const addFieldRow = useCallback(async ({
-    data: data_8,
+  const addFieldRow = useCallback(({
+    blockType,
     path: path_3,
-    rowIndex,
-    schemaPath: schemaPath_0
+    rowIndex: rowIndexArg,
+    subFieldState
   }) => {
-    const subFieldState = await getFieldStateBySchemaPath({
-      data: data_8,
-      schemaPath: schemaPath_0
-    });
+    const newRows = getDataByPath(path_3) || [];
+    const rowIndex = rowIndexArg === undefined ? newRows.length : rowIndexArg;
+    // dispatch ADD_ROW that sets requiresRender: true and adds a blank row to local form state.
+    // This performs no form state request, as the debounced onChange effect will do that for us.
     dispatchFields({
       type: 'ADD_ROW',
-      blockType: data_8?.blockType,
+      blockType,
       path: path_3,
       rowIndex,
       subFieldState
     });
-  }, [getFieldStateBySchemaPath, dispatchFields]);
+  }, [dispatchFields, getDataByPath]);
   const removeFieldRow = useCallback(({
     path: path_4,
     rowIndex: rowIndex_0
@@ -414,24 +422,43 @@ export const Form = props => {
       rowIndex: rowIndex_0
     });
   }, [dispatchFields]);
-  const replaceFieldRow = useCallback(async ({
-    data: data_9,
+  const replaceFieldRow = useCallback(({
+    blockType: blockType_0,
     path: path_5,
-    rowIndex: rowIndex_1,
-    schemaPath: schemaPath_1
+    rowIndex: rowIndexArg_0,
+    subFieldState: subFieldState_0
   }) => {
-    const subFieldState_0 = await getFieldStateBySchemaPath({
-      data: data_9,
-      schemaPath: schemaPath_1
-    });
+    const currentRows = getDataByPath(path_5);
+    const rowIndex_1 = rowIndexArg_0 === undefined ? currentRows.length : rowIndexArg_0;
     dispatchFields({
       type: 'REPLACE_ROW',
-      blockType: data_9?.blockType,
+      blockType: blockType_0,
       path: path_5,
       rowIndex: rowIndex_1,
       subFieldState: subFieldState_0
     });
-  }, [getFieldStateBySchemaPath, dispatchFields]);
+  }, [dispatchFields, getDataByPath]);
+  // clean on unmount
+  useEffect(() => {
+    const re1 = abortControllerRef.current;
+    const re2 = abortControllerRef2.current;
+    return () => {
+      if (re1) {
+        try {
+          re1.abort();
+        } catch (_err) {
+          // swallow error
+        }
+      }
+      if (re2) {
+        try {
+          re2.abort();
+        } catch (_err_0) {
+          // swallow error
+        }
+      }
+    };
+  }, []);
   useEffect(() => {
     if (initializingFromProps !== undefined) {
       setInitializing(initializingFromProps);
@@ -463,10 +490,14 @@ export const Form = props => {
     setIsMounted(true);
   }, []);
   useEffect(() => {
-    if (typeof disabledFromProps === 'boolean') setDisabled(disabledFromProps);
+    if (typeof disabledFromProps === 'boolean') {
+      setDisabled(disabledFromProps);
+    }
   }, [disabledFromProps]);
   useEffect(() => {
-    if (typeof submittedFromProps === 'boolean') setSubmitted(submittedFromProps);
+    if (typeof submittedFromProps === 'boolean') {
+      setSubmitted(submittedFromProps);
+    }
   }, [submittedFromProps]);
   useEffect(() => {
     if (initialState) {
@@ -491,15 +522,19 @@ export const Form = props => {
     setModified(false);
   }, [locale]);
   const classes = [className, baseClass].filter(Boolean).join(' ');
-  useDebouncedEffect(() => {
+  useIgnoredEffectDebounced(() => {
     const executeOnChange = async () => {
       if (Array.isArray(onChange)) {
         let revalidatedFormState_0 = contextRef.current.fields;
         for (const onChangeFn of onChange) {
+          // Edit view default onChange is in packages/ui/src/views/Edit/index.tsx. This onChange usually sends a form state request
           revalidatedFormState_0 = await onChangeFn({
-            formState: revalidatedFormState_0
+            formState: deepCopyObjectSimpleWithoutReactComponents(contextRef.current.fields)
           });
         }
+        if (!revalidatedFormState_0) {
+          return;
+        }
         const {
           changed,
           newState: newState_0
@@ -513,11 +548,20 @@ export const Form = props => {
         }
       }
     };
-    if (modified) void executeOnChange();
-  }, 150,
-  // Make sure we trigger this whenever modified changes (not just when `fields` changes), otherwise we will miss merging server form state for the first form update/onChange. Here's why:
-  // `fields` updates before `modified`, because setModified is in a setTimeout. So on the first change, modified is false, so we don't trigger the effect even though we should.
-  [contextRef.current.fields, dispatchFields, onChange, modified]);
+    if (modified) {
+      void executeOnChange();
+    }
+  },
+  /*
+  Make sure we trigger this whenever modified changes (not just when `fields` changes),
+  otherwise we will miss merging server form state for the first form update/onChange.
+  Here's why:
+   `fields` updates before `modified`, because setModified is in a setTimeout.
+   So on the first change, modified is false, so we don't trigger the effect even though we should.
+  **/
+  [contextRef.current.fields, modified], [dispatchFields, onChange], {
+    delay: 250
+  });
   return /*#__PURE__*/_jsx("form", {
     action: typeof action === 'function' ? void action : action,
     className: classes,