@payloadcms/next 3.23.0-canary.f4bcd50 → 3.23.0-canary.f63b80a

package/dist/views/Version/RenderFieldsToDiff/utilities/countChangedFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countChangedFields.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK/E,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,UA8IhF;AAED,KAAK,4BAA4B,GAAG;IAClC,cAAc,EAAE,OAAO,EAAE,CAAA;IACzB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CAAA;AAED,wBAAgB,wBAAwB,CAAC,EACvC,cAAmB,EACnB,KAAK,EACL,OAAO,EACP,WAAgB,GACjB,EAAE,4BAA4B,UA0B9B"}
+{"version":3,"file":"countChangedFields.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK7F,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,UA0JxF;AAED,KAAK,4BAA4B,GAAG;IAClC,cAAc,EAAE,OAAO,EAAE,CAAA;IACzB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CAAA;AAED,wBAAgB,wBAAwB,CAAC,EACvC,cAAmB,EACnB,MAAM,EACN,KAAK,EACL,OAAO,EACP,WAAgB,GACjB,EAAE,4BAA4B,UA4B9B"}

package/dist/views/Version/RenderFieldsToDiff/utilities/countChangedFields.js

@@ -6,6 +6,7 @@ import { getFieldsForRowComparison } from './getFieldsForRowComparison.js';
  */
 export function countChangedFields({
   comparison,
+  config,
   fields,
   locales,
   version
@@ -29,6 +30,7 @@ export function countChangedFields({
               const versionRows = version?.[field.name]?.[locale] ?? [];
               count += countChangedFieldsInRows({
                 comparisonRows,
+                config,
                 field,
                 locales,
                 versionRows
@@ -39,6 +41,7 @@ export function countChangedFields({
             const versionRows = version?.[field.name] ?? [];
             count += countChangedFieldsInRows({
               comparisonRows,
+              config,
               field,
               locales,
               versionRows
@@ -81,6 +84,7 @@ export function countChangedFields({
         {
           count += countChangedFields({
             comparison,
+            config,
             fields: field.fields,
             locales,
             version
@@ -94,6 +98,7 @@ export function countChangedFields({
             locales.forEach(locale => {
               count += countChangedFields({
                 comparison: comparison?.[field.name]?.[locale],
+                config,
                 fields: field.fields,
                 locales,
                 version: version?.[field.name]?.[locale]
@@ -102,6 +107,7 @@ export function countChangedFields({
           } else {
             count += countChangedFields({
               comparison: comparison?.[field.name],
+              config,
               fields: field.fields,
               locales,
               version: version?.[field.name]
@@ -119,6 +125,7 @@ export function countChangedFields({
               locales.forEach(locale => {
                 count += countChangedFields({
                   comparison: comparison?.[tab.name]?.[locale],
+                  config,
                   fields: tab.fields,
                   locales,
                   version: version?.[tab.name]?.[locale]
@@ -128,6 +135,7 @@ export function countChangedFields({
               // Named tab
               count += countChangedFields({
                 comparison: comparison?.[tab.name],
+                config,
                 fields: tab.fields,
                 locales,
                 version: version?.[tab.name]
@@ -136,6 +144,7 @@ export function countChangedFields({
               // Unnamed tab
               count += countChangedFields({
                 comparison,
+                config,
                 fields: tab.fields,
                 locales,
                 version
@@ -161,6 +170,7 @@ export function countChangedFields({
 }
 export function countChangedFieldsInRows({
   comparisonRows = [],
+  config,
   field,
   locales,
   versionRows = []
@@ -180,12 +190,14 @@ export function countChangedFieldsInRows({
         schemaPath: ''
       },
       comparisonRow,
+      config,
       field,
       row: i,
       versionRow
     });
     count += countChangedFields({
       comparison: comparisonRow,
+      config,
       fields: rowFields,
       locales,
       version: versionRow

package/dist/views/Version/RenderFieldsToDiff/utilities/countChangedFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"countChangedFields.js","names":["fieldHasChanges","getFieldsForRowComparison","countChangedFields","comparison","fields","locales","version","count","forEach","field","name","fieldType","type","localized","locale","comparisonRows","versionRows","countChangedFieldsInRows","tabs","tab","_exhaustiveCheck","Error","String","i","comparisonRow","versionRow","rowFields","baseVersionField","path","schemaPath","row"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"sourcesContent":["import type { ArrayFieldClient, BlocksFieldClient, ClientField } from 'payload'\n\nimport { fieldHasChanges } from './fieldHasChanges.js'\nimport { getFieldsForRowComparison } from './getFieldsForRowComparison.js'\n\ntype Args = {\n  comparison: unknown\n  fields: ClientField[]\n  locales: string[] | undefined\n  version: unknown\n}\n\n/**\n * Recursively counts the number of changed fields between comparison and\n * version data for a given set of fields.\n */\nexport function countChangedFields({ comparison, fields, locales, version }: Args) {\n  let count = 0\n\n  fields.forEach((field) => {\n    // Don't count the id field since it is not displayed in the UI\n    if ('name' in field && field.name === 'id') {\n      return\n    }\n    const fieldType = field.type\n    switch (fieldType) {\n      // Iterable fields are arrays and blocks fields. We iterate over each row and\n      // count the number of changed fields in each.\n      case 'array':\n      case 'blocks': {\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            const comparisonRows = comparison?.[field.name]?.[locale] ?? []\n            const versionRows = version?.[field.name]?.[locale] ?? []\n            count += countChangedFieldsInRows({ comparisonRows, field, locales, versionRows })\n          })\n        } else {\n          const comparisonRows = comparison?.[field.name] ?? []\n          const versionRows = version?.[field.name] ?? []\n          count += countChangedFieldsInRows({ comparisonRows, field, locales, versionRows })\n        }\n        break\n      }\n\n      // Regular fields without nested fields.\n      case 'checkbox':\n      case 'code':\n      case 'date':\n      case 'email':\n      case 'join':\n      case 'json':\n      case 'number':\n      case 'point':\n      case 'radio':\n      case 'relationship':\n      case 'richText':\n      case 'select':\n      case 'text':\n      case 'textarea':\n      case 'upload': {\n        // Fields that have a name and contain data. We can just check if the data has changed.\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            if (\n              fieldHasChanges(version?.[field.name]?.[locale], comparison?.[field.name]?.[locale])\n            ) {\n              count++\n            }\n          })\n        } else if (fieldHasChanges(version?.[field.name], comparison?.[field.name])) {\n          count++\n        }\n        break\n      }\n      // Fields that have nested fields, but don't nest their fields' data.\n      case 'collapsible':\n      case 'row': {\n        count += countChangedFields({\n          comparison,\n          fields: field.fields,\n          locales,\n          version,\n        })\n\n        break\n      }\n\n      // Fields that have nested fields and nest their fields' data.\n      case 'group': {\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            count += countChangedFields({\n              comparison: comparison?.[field.name]?.[locale],\n              fields: field.fields,\n              locales,\n              version: version?.[field.name]?.[locale],\n            })\n          })\n        } else {\n          count += countChangedFields({\n            comparison: comparison?.[field.name],\n            fields: field.fields,\n            locales,\n            version: version?.[field.name],\n          })\n        }\n        break\n      }\n\n      // Each tab in a tabs field has nested fields. The fields data may be\n      // nested or not depending on the existence of a name property.\n      case 'tabs': {\n        field.tabs.forEach((tab) => {\n          if ('name' in tab && locales && tab.localized) {\n            // Named localized tab\n            locales.forEach((locale) => {\n              count += countChangedFields({\n                comparison: comparison?.[tab.name]?.[locale],\n                fields: tab.fields,\n                locales,\n                version: version?.[tab.name]?.[locale],\n              })\n            })\n          } else if ('name' in tab) {\n            // Named tab\n            count += countChangedFields({\n              comparison: comparison?.[tab.name],\n              fields: tab.fields,\n              locales,\n              version: version?.[tab.name],\n            })\n          } else {\n            // Unnamed tab\n            count += countChangedFields({\n              comparison,\n              fields: tab.fields,\n              locales,\n              version,\n            })\n          }\n        })\n        break\n      }\n\n      // UI fields don't have data and are not displayed in the version view\n      // so we can ignore them.\n      case 'ui': {\n        break\n      }\n\n      default: {\n        const _exhaustiveCheck: never = fieldType\n        throw new Error(`Unexpected field.type in countChangedFields : ${String(fieldType)}`)\n      }\n    }\n  })\n\n  return count\n}\n\ntype countChangedFieldsInRowsArgs = {\n  comparisonRows: unknown[]\n  field: ArrayFieldClient | BlocksFieldClient\n  locales: string[] | undefined\n  versionRows: unknown[]\n}\n\nexport function countChangedFieldsInRows({\n  comparisonRows = [],\n  field,\n  locales,\n  versionRows = [],\n}: countChangedFieldsInRowsArgs) {\n  let count = 0\n  let i = 0\n\n  while (comparisonRows[i] || versionRows[i]) {\n    const comparisonRow = comparisonRows?.[i] || {}\n    const versionRow = versionRows?.[i] || {}\n\n    const { fields: rowFields } = getFieldsForRowComparison({\n      baseVersionField: { type: 'text', fields: [], path: '', schemaPath: '' }, // Doesn't matter, as we don't need the versionFields output here\n      comparisonRow,\n      field,\n      row: i,\n      versionRow,\n    })\n\n    count += countChangedFields({\n      comparison: comparisonRow,\n      fields: rowFields,\n      locales,\n      version: versionRow,\n    })\n\n    i++\n  }\n  return count\n}\n"],"mappings":"AAEA,SAASA,eAAe,QAAQ;AAChC,SAASC,yBAAyB,QAAQ;AAS1C;;;;AAIA,OAAO,SAASC,mBAAmB;EAAEC,UAAU;EAAEC,MAAM;EAAEC,OAAO;EAAEC;AAAO,CAAQ;EAC/E,IAAIC,KAAA,GAAQ;EAEZH,MAAA,CAAOI,OAAO,CAAEC,KAAA;IACd;IACA,IAAI,UAAUA,KAAA,IAASA,KAAA,CAAMC,IAAI,KAAK,MAAM;MAC1C;IACF;IACA,MAAMC,SAAA,GAAYF,KAAA,CAAMG,IAAI;IAC5B,QAAQD,SAAA;MACN;MACA;MACA,KAAK;MACL,KAAK;QAAU;UACb,IAAIN,OAAA,IAAWI,KAAA,CAAMI,SAAS,EAAE;YAC9BR,OAAA,CAAQG,OAAO,CAAEM,MAAA;cACf,MAAMC,cAAA,GAAiBZ,UAAA,GAAaM,KAAA,CAAMC,IAAI,CAAC,GAAGI,MAAA,CAAO,IAAI,EAAE;cAC/D,MAAME,WAAA,GAAcV,OAAA,GAAUG,KAAA,CAAMC,IAAI,CAAC,GAAGI,MAAA,CAAO,IAAI,EAAE;cACzDP,KAAA,IAASU,wBAAA,CAAyB;gBAAEF,cAAA;gBAAgBN,KAAA;gBAAOJ,OAAA;gBAASW;cAAY;YAClF;UACF,OAAO;YACL,MAAMD,cAAA,GAAiBZ,UAAA,GAAaM,KAAA,CAAMC,IAAI,CAAC,IAAI,EAAE;YACrD,MAAMM,WAAA,GAAcV,OAAA,GAAUG,KAAA,CAAMC,IAAI,CAAC,IAAI,EAAE;YAC/CH,KAAA,IAASU,wBAAA,CAAyB;cAAEF,cAAA;cAAgBN,KAAA;cAAOJ,OAAA;cAASW;YAAY;UAClF;UACA;QACF;MAEA;MACA,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;QAAU;UACb;UACA,IAAIX,OAAA,IAAWI,KAAA,CAAMI,SAAS,EAAE;YAC9BR,OAAA,CAAQG,OAAO,CAAEM,MAAA;cACf,IACEd,eAAA,CAAgBM,OAAA,GAAUG,KAAA,CAAMC,IAAI,CAAC,GAAGI,MAAA,CAAO,EAAEX,UAAA,GAAaM,KAAA,CAAMC,IAAI,CAAC,GAAGI,MAAA,CAAO,GACnF;gBACAP,KAAA;cACF;YACF;UACF,OAAO,IAAIP,eAAA,CAAgBM,OAAA,GAAUG,KAAA,CAAMC,IAAI,CAAC,EAAEP,UAAA,GAAaM,KAAA,CAAMC,IAAI,CAAC,GAAG;YAC3EH,KAAA;UACF;UACA;QACF;MACA;MACA,KAAK;MACL,KAAK;QAAO;UACVA,KAAA,IAASL,kBAAA,CAAmB;YAC1BC,UAAA;YACAC,MAAA,EAAQK,KAAA,CAAML,MAAM;YACpBC,OAAA;YACAC;UACF;UAEA;QACF;MAEA;MACA,KAAK;QAAS;UACZ,IAAID,OAAA,IAAWI,KAAA,CAAMI,SAAS,EAAE;YAC9BR,OAAA,CAAQG,OAAO,CAAEM,MAAA;cACfP,KAAA,IAASL,kBAAA,CAAmB;gBAC1BC,UAAA,EAAYA,UAAA,GAAaM,KAAA,CAAMC,IAAI,CAAC,GAAGI,MAAA,CAAO;gBAC9CV,MAAA,EAAQK,KAAA,CAAML,MAAM;gBACpBC,OAAA;gBACAC,OAAA,EAASA,OAAA,GAAUG,KAAA,CAAMC,IAAI,CAAC,GAAGI,MAAA;cACnC;YACF;UACF,OAAO;YACLP,KAAA,IAASL,kBAAA,CAAmB;cAC1BC,UAAA,EAAYA,UAAA,GAAaM,KAAA,CAAMC,IAAI,CAAC;cACpCN,MAAA,EAAQK,KAAA,CAAML,MAAM;cACpBC,OAAA;cACAC,OAAA,EAASA,OAAA,GAAUG,KAAA,CAAMC,IAAI;YAC/B;UACF;UACA;QACF;MAEA;MACA;MACA,KAAK;QAAQ;UACXD,KAAA,CAAMS,IAAI,CAACV,OAAO,CAAEW,GAAA;YAClB,IAAI,UAAUA,GAAA,IAAOd,OAAA,IAAWc,GAAA,CAAIN,SAAS,EAAE;cAC7C;cACAR,OAAA,CAAQG,OAAO,CAAEM,MAAA;gBACfP,KAAA,IAASL,kBAAA,CAAmB;kBAC1BC,UAAA,EAAYA,UAAA,GAAagB,GAAA,CAAIT,IAAI,CAAC,GAAGI,MAAA,CAAO;kBAC5CV,MAAA,EAAQe,GAAA,CAAIf,MAAM;kBAClBC,OAAA;kBACAC,OAAA,EAASA,OAAA,GAAUa,GAAA,CAAIT,IAAI,CAAC,GAAGI,MAAA;gBACjC;cACF;YACF,OAAO,IAAI,UAAUK,GAAA,EAAK;cACxB;cACAZ,KAAA,IAASL,kBAAA,CAAmB;gBAC1BC,UAAA,EAAYA,UAAA,GAAagB,GAAA,CAAIT,IAAI,CAAC;gBAClCN,MAAA,EAAQe,GAAA,CAAIf,MAAM;gBAClBC,OAAA;gBACAC,OAAA,EAASA,OAAA,GAAUa,GAAA,CAAIT,IAAI;cAC7B;YACF,OAAO;cACL;cACAH,KAAA,IAASL,kBAAA,CAAmB;gBAC1BC,UAAA;gBACAC,MAAA,EAAQe,GAAA,CAAIf,MAAM;gBAClBC,OAAA;gBACAC;cACF;YACF;UACF;UACA;QACF;MAEA;MACA;MACA,KAAK;QAAM;UACT;QACF;MAEA;QAAS;UACP,MAAMc,gBAAA,GAA0BT,SAAA;UAChC,MAAM,IAAIU,KAAA,CAAM,iDAAiDC,MAAA,CAAOX,SAAA,GAAY;QACtF;IACF;EACF;EAEA,OAAOJ,KAAA;AACT;AASA,OAAO,SAASU,yBAAyB;EACvCF,cAAA,GAAiB,EAAE;EACnBN,KAAK;EACLJ,OAAO;EACPW,WAAA,GAAc;AAAE,CACa;EAC7B,IAAIT,KAAA,GAAQ;EACZ,IAAIgB,CAAA,GAAI;EAER,OAAOR,cAAc,CAACQ,CAAA,CAAE,IAAIP,WAAW,CAACO,CAAA,CAAE,EAAE;IAC1C,MAAMC,aAAA,GAAgBT,cAAA,GAAiBQ,CAAA,CAAE,IAAI,CAAC;IAC9C,MAAME,UAAA,GAAaT,WAAA,GAAcO,CAAA,CAAE,IAAI,CAAC;IAExC,MAAM;MAAEnB,MAAA,EAAQsB;IAAS,CAAE,GAAGzB,yBAAA,CAA0B;MACtD0B,gBAAA,EAAkB;QAAEf,IAAA,EAAM;QAAQR,MAAA,EAAQ,EAAE;QAAEwB,IAAA,EAAM;QAAIC,UAAA,EAAY;MAAG;MACvEL,aAAA;MACAf,KAAA;MACAqB,GAAA,EAAKP,CAAA;MACLE;IACF;IAEAlB,KAAA,IAASL,kBAAA,CAAmB;MAC1BC,UAAA,EAAYqB,aAAA;MACZpB,MAAA,EAAQsB,SAAA;MACRrB,OAAA;MACAC,OAAA,EAASmB;IACX;IAEAF,CAAA;EACF;EACA,OAAOhB,KAAA;AACT","ignoreList":[]}
+{"version":3,"file":"countChangedFields.js","names":["fieldHasChanges","getFieldsForRowComparison","countChangedFields","comparison","config","fields","locales","version","count","forEach","field","name","fieldType","type","localized","locale","comparisonRows","versionRows","countChangedFieldsInRows","tabs","tab","_exhaustiveCheck","Error","String","i","comparisonRow","versionRow","rowFields","baseVersionField","path","schemaPath","row"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"sourcesContent":["import type { ArrayFieldClient, BlocksFieldClient, ClientConfig, ClientField } from 'payload'\n\nimport { fieldHasChanges } from './fieldHasChanges.js'\nimport { getFieldsForRowComparison } from './getFieldsForRowComparison.js'\n\ntype Args = {\n  comparison: unknown\n  config: ClientConfig\n  fields: ClientField[]\n  locales: string[] | undefined\n  version: unknown\n}\n\n/**\n * Recursively counts the number of changed fields between comparison and\n * version data for a given set of fields.\n */\nexport function countChangedFields({ comparison, config, fields, locales, version }: Args) {\n  let count = 0\n\n  fields.forEach((field) => {\n    // Don't count the id field since it is not displayed in the UI\n    if ('name' in field && field.name === 'id') {\n      return\n    }\n    const fieldType = field.type\n    switch (fieldType) {\n      // Iterable fields are arrays and blocks fields. We iterate over each row and\n      // count the number of changed fields in each.\n      case 'array':\n      case 'blocks': {\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            const comparisonRows = comparison?.[field.name]?.[locale] ?? []\n            const versionRows = version?.[field.name]?.[locale] ?? []\n            count += countChangedFieldsInRows({\n              comparisonRows,\n              config,\n              field,\n              locales,\n              versionRows,\n            })\n          })\n        } else {\n          const comparisonRows = comparison?.[field.name] ?? []\n          const versionRows = version?.[field.name] ?? []\n          count += countChangedFieldsInRows({ comparisonRows, config, field, locales, versionRows })\n        }\n        break\n      }\n\n      // Regular fields without nested fields.\n      case 'checkbox':\n      case 'code':\n      case 'date':\n      case 'email':\n      case 'join':\n      case 'json':\n      case 'number':\n      case 'point':\n      case 'radio':\n      case 'relationship':\n      case 'richText':\n      case 'select':\n      case 'text':\n      case 'textarea':\n      case 'upload': {\n        // Fields that have a name and contain data. We can just check if the data has changed.\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            if (\n              fieldHasChanges(version?.[field.name]?.[locale], comparison?.[field.name]?.[locale])\n            ) {\n              count++\n            }\n          })\n        } else if (fieldHasChanges(version?.[field.name], comparison?.[field.name])) {\n          count++\n        }\n        break\n      }\n      // Fields that have nested fields, but don't nest their fields' data.\n      case 'collapsible':\n      case 'row': {\n        count += countChangedFields({\n          comparison,\n          config,\n          fields: field.fields,\n          locales,\n          version,\n        })\n\n        break\n      }\n\n      // Fields that have nested fields and nest their fields' data.\n      case 'group': {\n        if (locales && field.localized) {\n          locales.forEach((locale) => {\n            count += countChangedFields({\n              comparison: comparison?.[field.name]?.[locale],\n              config,\n              fields: field.fields,\n              locales,\n              version: version?.[field.name]?.[locale],\n            })\n          })\n        } else {\n          count += countChangedFields({\n            comparison: comparison?.[field.name],\n            config,\n            fields: field.fields,\n            locales,\n            version: version?.[field.name],\n          })\n        }\n        break\n      }\n\n      // Each tab in a tabs field has nested fields. The fields data may be\n      // nested or not depending on the existence of a name property.\n      case 'tabs': {\n        field.tabs.forEach((tab) => {\n          if ('name' in tab && locales && tab.localized) {\n            // Named localized tab\n            locales.forEach((locale) => {\n              count += countChangedFields({\n                comparison: comparison?.[tab.name]?.[locale],\n                config,\n                fields: tab.fields,\n                locales,\n                version: version?.[tab.name]?.[locale],\n              })\n            })\n          } else if ('name' in tab) {\n            // Named tab\n            count += countChangedFields({\n              comparison: comparison?.[tab.name],\n              config,\n              fields: tab.fields,\n              locales,\n              version: version?.[tab.name],\n            })\n          } else {\n            // Unnamed tab\n            count += countChangedFields({\n              comparison,\n              config,\n              fields: tab.fields,\n              locales,\n              version,\n            })\n          }\n        })\n        break\n      }\n\n      // UI fields don't have data and are not displayed in the version view\n      // so we can ignore them.\n      case 'ui': {\n        break\n      }\n\n      default: {\n        const _exhaustiveCheck: never = fieldType\n        throw new Error(`Unexpected field.type in countChangedFields : ${String(fieldType)}`)\n      }\n    }\n  })\n\n  return count\n}\n\ntype countChangedFieldsInRowsArgs = {\n  comparisonRows: unknown[]\n  config: ClientConfig\n  field: ArrayFieldClient | BlocksFieldClient\n  locales: string[] | undefined\n  versionRows: unknown[]\n}\n\nexport function countChangedFieldsInRows({\n  comparisonRows = [],\n  config,\n  field,\n  locales,\n  versionRows = [],\n}: countChangedFieldsInRowsArgs) {\n  let count = 0\n  let i = 0\n\n  while (comparisonRows[i] || versionRows[i]) {\n    const comparisonRow = comparisonRows?.[i] || {}\n    const versionRow = versionRows?.[i] || {}\n\n    const { fields: rowFields } = getFieldsForRowComparison({\n      baseVersionField: { type: 'text', fields: [], path: '', schemaPath: '' }, // Doesn't matter, as we don't need the versionFields output here\n      comparisonRow,\n      config,\n      field,\n      row: i,\n      versionRow,\n    })\n\n    count += countChangedFields({\n      comparison: comparisonRow,\n      config,\n      fields: rowFields,\n      locales,\n      version: versionRow,\n    })\n\n    i++\n  }\n  return count\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.d.ts

@@ -1,13 +1,14 @@
-import type { ArrayFieldClient, BaseVersionField, BlocksFieldClient, ClientField, VersionField } from 'payload';
+import type { ArrayFieldClient, BaseVersionField, BlocksFieldClient, ClientConfig, ClientField, VersionField } from 'payload';
 /**
  * Get the fields for a row in an iterable field for comparison.
  * - Array fields: the fields of the array field, because the fields are the same for each row.
  * - Blocks fields: the union of fields from the comparison and version row,
  *   because the fields from the version and comparison rows may differ.
  */
-export declare function getFieldsForRowComparison({ baseVersionField, comparisonRow, field, row, versionRow, }: {
+export declare function getFieldsForRowComparison({ baseVersionField, comparisonRow, config, field, row, versionRow, }: {
     baseVersionField: BaseVersionField;
     comparisonRow: any;
+    config: ClientConfig;
     field: ArrayFieldClient | BlocksFieldClient;
     row: number;
     versionRow: any;

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFieldsForRowComparison.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACb,MAAM,SAAS,CAAA;AAIhB;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,gBAAgB,EAChB,aAAa,EACb,KAAK,EACL,GAAG,EACH,UAAU,GACX,EAAE;IACD,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,aAAa,EAAE,GAAG,CAAA;IAClB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,GAAG,CAAA;CAChB,GAAG;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,aAAa,EAAE,YAAY,EAAE,CAAA;CAAE,CA2C3D"}
+{"version":3,"file":"getFieldsForRowComparison.d.ts","sourceRoot":"","sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EAEjB,YAAY,EACZ,WAAW,EACX,YAAY,EACb,MAAM,SAAS,CAAA;AAIhB;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,gBAAgB,EAChB,aAAa,EACb,MAAM,EACN,KAAK,EACL,GAAG,EACH,UAAU,GACX,EAAE;IACD,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,aAAa,EAAE,GAAG,CAAA;IAClB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,GAAG,CAAA;CAChB,GAAG;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,aAAa,EAAE,YAAY,EAAE,CAAA;CAAE,CAwD3D"}

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.js

@@ -8,6 +8,7 @@ import { getUniqueListBy } from 'payload/shared';
 export function getFieldsForRowComparison({
   baseVersionField,
   comparisonRow,
+  config,
   field,
   row,
   versionRow
@@ -19,18 +20,18 @@ export function getFieldsForRowComparison({
     versionFields = baseVersionField.rows?.length ? baseVersionField.rows[row] : baseVersionField.fields;
   } else if (field.type === 'blocks') {
     if (versionRow?.blockType === comparisonRow?.blockType) {
-      const matchedBlock = 'blocks' in field && field.blocks?.find(block => block.slug === versionRow?.blockType) || {
+      const matchedBlock = config?.blocksMap?.[versionRow?.blockType] ?? (('blocks' in field || 'blockReferences' in field) && (field.blockReferences ?? field.blocks)?.find(block => typeof block !== 'string' && block.slug === versionRow?.blockType) || {
         fields: []
-      };
+      });
       fields = matchedBlock.fields;
       versionFields = baseVersionField.rows?.length ? baseVersionField.rows[row] : baseVersionField.fields;
     } else {
-      const matchedVersionBlock = 'blocks' in field && field.blocks?.find(block => block.slug === versionRow?.blockType) || {
+      const matchedVersionBlock = config?.blocksMap?.[versionRow?.blockType] ?? (('blocks' in field || 'blockReferences' in field) && (field.blockReferences ?? field.blocks)?.find(block => typeof block !== 'string' && block.slug === versionRow?.blockType) || {
         fields: []
-      };
-      const matchedComparisonBlock = 'blocks' in field && field.blocks?.find(block => block.slug === comparisonRow?.blockType) || {
+      });
+      const matchedComparisonBlock = config?.blocksMap?.[comparisonRow?.blockType] ?? (('blocks' in field || 'blockReferences' in field) && (field.blockReferences ?? field.blocks)?.find(block => typeof block !== 'string' && block.slug === comparisonRow?.blockType) || {
         fields: []
-      };
+      });
       fields = getUniqueListBy([...matchedVersionBlock.fields, ...matchedComparisonBlock.fields], 'name');
       // buildVersionFields already merged the fields of the version and comparison rows together
       versionFields = baseVersionField.rows?.length ? baseVersionField.rows[row] : baseVersionField.fields;

package/dist/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFieldsForRowComparison.js","names":["getUniqueListBy","getFieldsForRowComparison","baseVersionField","comparisonRow","field","row","versionRow","fields","versionFields","type","rows","length","blockType","matchedBlock","blocks","find","block","slug","matchedVersionBlock","matchedComparisonBlock"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"sourcesContent":["import type {\n  ArrayFieldClient,\n  BaseVersionField,\n  BlocksFieldClient,\n  ClientField,\n  VersionField,\n} from 'payload'\n\nimport { getUniqueListBy } from 'payload/shared'\n\n/**\n * Get the fields for a row in an iterable field for comparison.\n * - Array fields: the fields of the array field, because the fields are the same for each row.\n * - Blocks fields: the union of fields from the comparison and version row,\n *   because the fields from the version and comparison rows may differ.\n */\nexport function getFieldsForRowComparison({\n  baseVersionField,\n  comparisonRow,\n  field,\n  row,\n  versionRow,\n}: {\n  baseVersionField: BaseVersionField\n  comparisonRow: any\n  field: ArrayFieldClient | BlocksFieldClient\n  row: number\n  versionRow: any\n}): { fields: ClientField[]; versionFields: VersionField[] } {\n  let fields: ClientField[] = []\n  let versionFields: VersionField[] = []\n\n  if (field.type === 'array' && 'fields' in field) {\n    fields = field.fields\n    versionFields = baseVersionField.rows?.length\n      ? baseVersionField.rows[row]\n      : baseVersionField.fields\n  } else if (field.type === 'blocks') {\n    if (versionRow?.blockType === comparisonRow?.blockType) {\n      const matchedBlock = ('blocks' in field &&\n        field.blocks?.find((block) => block.slug === versionRow?.blockType)) || {\n        fields: [],\n      }\n\n      fields = matchedBlock.fields\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    } else {\n      const matchedVersionBlock = ('blocks' in field &&\n        field.blocks?.find((block) => block.slug === versionRow?.blockType)) || {\n        fields: [],\n      }\n      const matchedComparisonBlock = ('blocks' in field &&\n        field.blocks?.find((block) => block.slug === comparisonRow?.blockType)) || {\n        fields: [],\n      }\n\n      fields = getUniqueListBy<ClientField>(\n        [...matchedVersionBlock.fields, ...matchedComparisonBlock.fields],\n        'name',\n      )\n\n      // buildVersionFields already merged the fields of the version and comparison rows together\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    }\n  }\n\n  return { fields, versionFields }\n}\n"],"mappings":"AAQA,SAASA,eAAe,QAAQ;AAEhC;;;;;;AAMA,OAAO,SAASC,0BAA0B;EACxCC,gBAAgB;EAChBC,aAAa;EACbC,KAAK;EACLC,GAAG;EACHC;AAAU,CAOX;EACC,IAAIC,MAAA,GAAwB,EAAE;EAC9B,IAAIC,aAAA,GAAgC,EAAE;EAEtC,IAAIJ,KAAA,CAAMK,IAAI,KAAK,WAAW,YAAYL,KAAA,EAAO;IAC/CG,MAAA,GAASH,KAAA,CAAMG,MAAM;IACrBC,aAAA,GAAgBN,gBAAA,CAAiBQ,IAAI,EAAEC,MAAA,GACnCT,gBAAA,CAAiBQ,IAAI,CAACL,GAAA,CAAI,GAC1BH,gBAAA,CAAiBK,MAAM;EAC7B,OAAO,IAAIH,KAAA,CAAMK,IAAI,KAAK,UAAU;IAClC,IAAIH,UAAA,EAAYM,SAAA,KAAcT,aAAA,EAAeS,SAAA,EAAW;MACtD,MAAMC,YAAA,GAAe,QAAC,IAAYT,KAAA,IAChCA,KAAA,CAAMU,MAAM,EAAEC,IAAA,CAAMC,KAAA,IAAUA,KAAA,CAAMC,IAAI,KAAKX,UAAA,EAAYM,SAAA,KAAe;QACxEL,MAAA,EAAQ;MACV;MAEAA,MAAA,GAASM,YAAA,CAAaN,MAAM;MAC5BC,aAAA,GAAgBN,gBAAA,CAAiBQ,IAAI,EAAEC,MAAA,GACnCT,gBAAA,CAAiBQ,IAAI,CAACL,GAAA,CAAI,GAC1BH,gBAAA,CAAiBK,MAAM;IAC7B,OAAO;MACL,MAAMW,mBAAA,GAAsB,QAAC,IAAYd,KAAA,IACvCA,KAAA,CAAMU,MAAM,EAAEC,IAAA,CAAMC,KAAA,IAAUA,KAAA,CAAMC,IAAI,KAAKX,UAAA,EAAYM,SAAA,KAAe;QACxEL,MAAA,EAAQ;MACV;MACA,MAAMY,sBAAA,GAAyB,QAAC,IAAYf,KAAA,IAC1CA,KAAA,CAAMU,MAAM,EAAEC,IAAA,CAAMC,KAAA,IAAUA,KAAA,CAAMC,IAAI,KAAKd,aAAA,EAAeS,SAAA,KAAe;QAC3EL,MAAA,EAAQ;MACV;MAEAA,MAAA,GAASP,eAAA,CACP,C,GAAIkB,mBAAA,CAAoBX,MAAM,E,GAAKY,sBAAA,CAAuBZ,MAAM,CAAC,EACjE;MAGF;MACAC,aAAA,GAAgBN,gBAAA,CAAiBQ,IAAI,EAAEC,MAAA,GACnCT,gBAAA,CAAiBQ,IAAI,CAACL,GAAA,CAAI,GAC1BH,gBAAA,CAAiBK,MAAM;IAC7B;EACF;EAEA,OAAO;IAAEA,MAAA;IAAQC;EAAc;AACjC","ignoreList":[]}
+{"version":3,"file":"getFieldsForRowComparison.js","names":["getUniqueListBy","getFieldsForRowComparison","baseVersionField","comparisonRow","config","field","row","versionRow","fields","versionFields","type","rows","length","blockType","matchedBlock","blocksMap","blockReferences","blocks","find","block","slug","matchedVersionBlock","matchedComparisonBlock"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/getFieldsForRowComparison.ts"],"sourcesContent":["import type {\n  ArrayFieldClient,\n  BaseVersionField,\n  BlocksFieldClient,\n  ClientBlock,\n  ClientConfig,\n  ClientField,\n  VersionField,\n} from 'payload'\n\nimport { getUniqueListBy } from 'payload/shared'\n\n/**\n * Get the fields for a row in an iterable field for comparison.\n * - Array fields: the fields of the array field, because the fields are the same for each row.\n * - Blocks fields: the union of fields from the comparison and version row,\n *   because the fields from the version and comparison rows may differ.\n */\nexport function getFieldsForRowComparison({\n  baseVersionField,\n  comparisonRow,\n  config,\n  field,\n  row,\n  versionRow,\n}: {\n  baseVersionField: BaseVersionField\n  comparisonRow: any\n  config: ClientConfig\n  field: ArrayFieldClient | BlocksFieldClient\n  row: number\n  versionRow: any\n}): { fields: ClientField[]; versionFields: VersionField[] } {\n  let fields: ClientField[] = []\n  let versionFields: VersionField[] = []\n\n  if (field.type === 'array' && 'fields' in field) {\n    fields = field.fields\n    versionFields = baseVersionField.rows?.length\n      ? baseVersionField.rows[row]\n      : baseVersionField.fields\n  } else if (field.type === 'blocks') {\n    if (versionRow?.blockType === comparisonRow?.blockType) {\n      const matchedBlock: ClientBlock =\n        config?.blocksMap?.[versionRow?.blockType] ??\n        (((('blocks' in field || 'blockReferences' in field) &&\n          (field.blockReferences ?? field.blocks)?.find(\n            (block) => typeof block !== 'string' && block.slug === versionRow?.blockType,\n          )) || {\n          fields: [],\n        }) as ClientBlock)\n\n      fields = matchedBlock.fields\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    } else {\n      const matchedVersionBlock =\n        config?.blocksMap?.[versionRow?.blockType] ??\n        (((('blocks' in field || 'blockReferences' in field) &&\n          (field.blockReferences ?? field.blocks)?.find(\n            (block) => typeof block !== 'string' && block.slug === versionRow?.blockType,\n          )) || {\n          fields: [],\n        }) as ClientBlock)\n\n      const matchedComparisonBlock =\n        config?.blocksMap?.[comparisonRow?.blockType] ??\n        (((('blocks' in field || 'blockReferences' in field) &&\n          (field.blockReferences ?? field.blocks)?.find(\n            (block) => typeof block !== 'string' && block.slug === comparisonRow?.blockType,\n          )) || {\n          fields: [],\n        }) as ClientBlock)\n\n      fields = getUniqueListBy<ClientField>(\n        [...matchedVersionBlock.fields, ...matchedComparisonBlock.fields],\n        'name',\n      )\n\n      // buildVersionFields already merged the fields of the version and comparison rows together\n      versionFields = baseVersionField.rows?.length\n        ? baseVersionField.rows[row]\n        : baseVersionField.fields\n    }\n  }\n\n  return { fields, versionFields }\n}\n"],"mappings":"AAUA,SAASA,eAAe,QAAQ;AAEhC;;;;;;AAMA,OAAO,SAASC,0BAA0B;EACxCC,gBAAgB;EAChBC,aAAa;EACbC,MAAM;EACNC,KAAK;EACLC,GAAG;EACHC;AAAU,CAQX;EACC,IAAIC,MAAA,GAAwB,EAAE;EAC9B,IAAIC,aAAA,GAAgC,EAAE;EAEtC,IAAIJ,KAAA,CAAMK,IAAI,KAAK,WAAW,YAAYL,KAAA,EAAO;IAC/CG,MAAA,GAASH,KAAA,CAAMG,MAAM;IACrBC,aAAA,GAAgBP,gBAAA,CAAiBS,IAAI,EAAEC,MAAA,GACnCV,gBAAA,CAAiBS,IAAI,CAACL,GAAA,CAAI,GAC1BJ,gBAAA,CAAiBM,MAAM;EAC7B,OAAO,IAAIH,KAAA,CAAMK,IAAI,KAAK,UAAU;IAClC,IAAIH,UAAA,EAAYM,SAAA,KAAcV,aAAA,EAAeU,SAAA,EAAW;MACtD,MAAMC,YAAA,GACJV,MAAA,EAAQW,SAAA,GAAYR,UAAA,EAAYM,SAAA,CAAU,KACxC,CAAE,YAAYR,KAAA,IAAS,qBAAqBA,KAAI,KAC/C,CAAAA,KAAA,CAAMW,eAAe,IAAIX,KAAA,CAAMY,MAAM,GAAGC,IAAA,CACtCC,KAAA,IAAU,OAAOA,KAAA,KAAU,YAAYA,KAAA,CAAMC,IAAI,KAAKb,UAAA,EAAYM,SAAA,KAC/D;QACNL,MAAA,EAAQ;MACV;MAEFA,MAAA,GAASM,YAAA,CAAaN,MAAM;MAC5BC,aAAA,GAAgBP,gBAAA,CAAiBS,IAAI,EAAEC,MAAA,GACnCV,gBAAA,CAAiBS,IAAI,CAACL,GAAA,CAAI,GAC1BJ,gBAAA,CAAiBM,MAAM;IAC7B,OAAO;MACL,MAAMa,mBAAA,GACJjB,MAAA,EAAQW,SAAA,GAAYR,UAAA,EAAYM,SAAA,CAAU,KACxC,CAAE,YAAYR,KAAA,IAAS,qBAAqBA,KAAI,KAC/C,CAAAA,KAAA,CAAMW,eAAe,IAAIX,KAAA,CAAMY,MAAM,GAAGC,IAAA,CACtCC,KAAA,IAAU,OAAOA,KAAA,KAAU,YAAYA,KAAA,CAAMC,IAAI,KAAKb,UAAA,EAAYM,SAAA,KAC/D;QACNL,MAAA,EAAQ;MACV;MAEF,MAAMc,sBAAA,GACJlB,MAAA,EAAQW,SAAA,GAAYZ,aAAA,EAAeU,SAAA,CAAU,KAC3C,CAAE,YAAYR,KAAA,IAAS,qBAAqBA,KAAI,KAC/C,CAAAA,KAAA,CAAMW,eAAe,IAAIX,KAAA,CAAMY,MAAM,GAAGC,IAAA,CACtCC,KAAA,IAAU,OAAOA,KAAA,KAAU,YAAYA,KAAA,CAAMC,IAAI,KAAKjB,aAAA,EAAeU,SAAA,KAClE;QACNL,MAAA,EAAQ;MACV;MAEFA,MAAA,GAASR,eAAA,CACP,C,GAAIqB,mBAAA,CAAoBb,MAAM,E,GAAKc,sBAAA,CAAuBd,MAAM,CAAC,EACjE;MAGF;MACAC,aAAA,GAAgBP,gBAAA,CAAiBS,IAAI,EAAEC,MAAA,GACnCV,gBAAA,CAAiBS,IAAI,CAACL,GAAA,CAAI,GAC1BJ,gBAAA,CAAiBM,MAAM;IAC7B;EACF;EAEA,OAAO;IAAEA,MAAA;IAAQC;EAAc;AACjC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.23.0-canary.f4bcd50",
+  "version": "3.23.0-canary.f63b80a",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -80,9 +80,9 @@
     "sass": "1.77.4",
     "sonner": "^1.7.0",
     "uuid": "10.0.0",
-    "@payloadcms/graphql": "3.23.0-canary.f4bcd50",
-    "@payloadcms/translations": "3.23.0-canary.f4bcd50",
-    "@payloadcms/ui": "3.23.0-canary.f4bcd50"
+    "@payloadcms/graphql": "3.23.0-canary.f63b80a",
+    "@payloadcms/translations": "3.23.0-canary.f63b80a",
+    "@payloadcms/ui": "3.23.0-canary.f63b80a"
   },
   "devDependencies": {
     "@babel/cli": "7.26.4",
@@ -100,13 +100,13 @@
     "esbuild-sass-plugin": "3.3.1",
     "eslint-plugin-react-compiler": "19.0.0-beta-714736e-20250131",
     "swc-plugin-transform-remove-imports": "3.1.0",
-    "@payloadcms/eslint-config": "3.9.0",
-    "payload": "3.23.0-canary.f4bcd50"
+    "payload": "3.23.0-canary.f63b80a",
+    "@payloadcms/eslint-config": "3.9.0"
   },
   "peerDependencies": {
     "graphql": "^16.8.1",
     "next": "^15.0.0",
-    "payload": "3.23.0-canary.f4bcd50"
+    "payload": "3.23.0-canary.f63b80a"
   },
   "engines": {
     "node": "^18.20.2 || >=20.9.0"