@payloadcms/ui 4.0.0-internal.b6f3b9a → 4.0.0-internal.b8e7c89

package/dist/views/Version/RenderFieldsToDiff/buildVersionFields.spec.js

@@ -0,0 +1,258 @@
+import { getFieldPaths } from 'payload/shared';
+import { describe, expect, it, vi } from 'vitest';
+import { buildVersionFields } from './buildVersionFields.js';
+vi.mock('../../../elements/RenderServerComponent/index.js', () => ({
+  RenderServerComponent: () => null
+}));
+describe('buildVersionFields', () => {
+  it('should render version diffs when a block with unnamed row and collapsible fields is replaced', () => {
+    const linkButtonBlock = {
+      fields: [{
+        fields: [{
+          name: 'variant',
+          type: 'text'
+        }],
+        name: 'appearance',
+        type: 'group'
+      }, {
+        fields: [{
+          name: 'label',
+          type: 'text'
+        }],
+        type: 'row'
+      }, {
+        fields: [{
+          name: 'eventTag',
+          type: 'text'
+        }],
+        label: 'Tracking',
+        type: 'collapsible'
+      }],
+      slug: 'link-button'
+    };
+    const signInButtonBlock = {
+      fields: [{
+        fields: [{
+          name: 'variant',
+          type: 'text'
+        }],
+        name: 'appearance',
+        type: 'group'
+      }, {
+        fields: [{
+          name: 'label',
+          type: 'text'
+        }],
+        type: 'row'
+      }, {
+        name: 'isSignup',
+        type: 'checkbox'
+      }, {
+        fields: [{
+          name: 'eventTag',
+          type: 'text'
+        }],
+        label: 'Tracking',
+        type: 'collapsible'
+      }],
+      slug: 'sign-in-button'
+    };
+    const blocksField = {
+      blocks: [linkButtonBlock, signInButtonBlock],
+      name: 'ctas',
+      type: 'blocks'
+    };
+    const clientSchemaMap = new Map([['pages.ctas', blocksField]]);
+    addFieldsToClientSchemaMap({
+      clientSchemaMap,
+      entitySlug: 'pages',
+      fields: linkButtonBlock.fields,
+      parentSchemaPath: 'ctas.link-button'
+    });
+    addFieldsToClientSchemaMap({
+      clientSchemaMap,
+      entitySlug: 'pages',
+      fields: signInButtonBlock.fields,
+      parentSchemaPath: 'ctas.sign-in-button'
+    });
+    const {
+      versionFields
+    } = buildVersionFields({
+      clientSchemaMap,
+      customDiffComponents: {},
+      entitySlug: 'pages',
+      fields: [blocksField],
+      fieldsPermissions: {
+        ctas: true
+      },
+      i18n: {
+        t: key => key
+      },
+      modifiedOnly: true,
+      parentIndexPath: '',
+      parentIsLocalized: false,
+      parentPath: '',
+      parentSchemaPath: '',
+      req: {
+        payload: {
+          blocks: {},
+          importMap: {},
+          logger: {
+            error: vi.fn()
+          }
+        }
+      },
+      selectedLocales: [],
+      versionFromSiblingData: {
+        ctas: [{
+          appearance: {
+            variant: 'primary'
+          },
+          blockType: 'sign-in-button',
+          eventTag: 'sign-in tracking',
+          isSignup: true,
+          label: 'Sign in'
+        }]
+      },
+      versionToSiblingData: {
+        ctas: [{
+          appearance: {
+            variant: 'secondary'
+          },
+          blockType: 'link-button',
+          eventTag: 'link tracking',
+          label: 'Learn more'
+        }]
+      }
+    });
+    const rowFields = versionFields[0]?.field?.rows?.[0] ?? [];
+    const schemaPaths = getSchemaPaths(rowFields);
+    expect(schemaPaths).toEqual(expect.arrayContaining(['ctas.sign-in-button._index-1.label', 'ctas.sign-in-button._index-3.eventTag', 'ctas.link-button._index-1.label', 'ctas.link-button._index-2.eventTag']));
+  });
+  it('should use the source block permissions when a block is replaced', () => {
+    const sourceBlock = {
+      fields: [{
+        name: 'shared',
+        type: 'text'
+      }],
+      slug: 'source'
+    };
+    const replacementBlock = {
+      fields: [{
+        name: 'shared',
+        type: 'text'
+      }],
+      slug: 'replacement'
+    };
+    const blocksField = {
+      blocks: [sourceBlock, replacementBlock],
+      name: 'blocks',
+      type: 'blocks'
+    };
+    const clientSchemaMap = new Map([['pages.blocks', blocksField], ['pages.blocks.source.shared', sourceBlock.fields[0]], ['pages.blocks.replacement.shared', replacementBlock.fields[0]]]);
+    const fieldsPermissions = {
+      blocks: {
+        blocks: {
+          replacement: {
+            fields: {}
+          },
+          source: {
+            fields: {
+              shared: true
+            }
+          }
+        },
+        read: true
+      }
+    };
+    const {
+      versionFields
+    } = buildVersionFields({
+      clientSchemaMap,
+      customDiffComponents: {},
+      entitySlug: 'pages',
+      fields: [blocksField],
+      fieldsPermissions,
+      i18n: {
+        t: key => key
+      },
+      modifiedOnly: true,
+      parentIndexPath: '',
+      parentIsLocalized: false,
+      parentPath: '',
+      parentSchemaPath: '',
+      req: {
+        payload: {
+          blocks: {},
+          importMap: {},
+          logger: {
+            error: vi.fn()
+          }
+        }
+      },
+      selectedLocales: [],
+      versionFromSiblingData: {
+        blocks: [{
+          blockType: 'source',
+          shared: 'readable source value'
+        }]
+      },
+      versionToSiblingData: {
+        blocks: [{
+          blockType: 'replacement'
+        }]
+      }
+    });
+    const rowFields = versionFields[0]?.field?.rows?.[0];
+    expect(rowFields).toHaveLength(1);
+    expect(rowFields?.[0]?.field?.path).toBe('blocks.0.shared');
+    expect(rowFields?.[0]?.field?.schemaPath).toBe('blocks.source.shared');
+  });
+});
+function addFieldsToClientSchemaMap({
+  clientSchemaMap,
+  entitySlug,
+  fields,
+  parentIndexPath = '',
+  parentSchemaPath
+}) {
+  fields.forEach((field, index) => {
+    const {
+      indexPath,
+      schemaPath
+    } = getFieldPaths({
+      field,
+      index,
+      parentIndexPath,
+      parentSchemaPath
+    });
+    clientSchemaMap.set(`${entitySlug}.${schemaPath}`, field);
+    if (field.type === 'collapsible' || field.type === 'row') {
+      addFieldsToClientSchemaMap({
+        clientSchemaMap,
+        entitySlug,
+        fields: field.fields,
+        parentIndexPath: indexPath,
+        parentSchemaPath: schemaPath
+      });
+    } else if (field.type === 'group') {
+      addFieldsToClientSchemaMap({
+        clientSchemaMap,
+        entitySlug,
+        fields: field.fields,
+        parentIndexPath: 'name' in field ? '' : indexPath,
+        parentSchemaPath: schemaPath
+      });
+    }
+  });
+}
+function getSchemaPaths(versionFields) {
+  return versionFields.flatMap(versionField => {
+    const field = versionField.field;
+    if (!field) {
+      return [];
+    }
+    return [field.schemaPath, ...getSchemaPaths(field.fields), ...(field.rows?.flatMap(row => getSchemaPaths(row)) ?? []), ...(field.tabs?.flatMap(tab => getSchemaPaths(tab.fields)) ?? [])];
+  });
+}
+//# sourceMappingURL=buildVersionFields.spec.js.map

package/dist/views/Version/RenderFieldsToDiff/buildVersionFields.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildVersionFields.spec.js","names":["getFieldPaths","describe","expect","it","vi","buildVersionFields","mock","RenderServerComponent","linkButtonBlock","fields","name","type","label","slug","signInButtonBlock","blocksField","blocks","clientSchemaMap","Map","addFieldsToClientSchemaMap","entitySlug","parentSchemaPath","versionFields","customDiffComponents","fieldsPermissions","ctas","i18n","t","key","modifiedOnly","parentIndexPath","parentIsLocalized","parentPath","req","payload","importMap","logger","error","fn","selectedLocales","versionFromSiblingData","appearance","variant","blockType","eventTag","isSignup","versionToSiblingData","rowFields","field","rows","schemaPaths","getSchemaPaths","toEqual","arrayContaining","sourceBlock","replacementBlock","replacement","source","shared","read","toHaveLength","path","toBe","schemaPath","forEach","index","indexPath","set","flatMap","versionField","row","tabs","tab"],"sources":["../../../../src/views/Version/RenderFieldsToDiff/buildVersionFields.spec.ts"],"sourcesContent":["import type {\n  ClientField,\n  ClientFieldSchemaMap,\n  Field,\n  SanitizedFieldsPermissions,\n  VersionField,\n} from 'payload'\n\nimport { getFieldPaths } from 'payload/shared'\nimport { describe, expect, it, vi } from 'vitest'\n\nimport { buildVersionFields, type BuildVersionFieldsArgs } from './buildVersionFields.js'\n\nvi.mock('../../../elements/RenderServerComponent/index.js', () => ({\n  RenderServerComponent: () => null,\n}))\n\ndescribe('buildVersionFields', () => {\n  it('should render version diffs when a block with unnamed row and collapsible fields is replaced', () => {\n    const linkButtonBlock = {\n      fields: [\n        {\n          fields: [{ name: 'variant', type: 'text' }],\n          name: 'appearance',\n          type: 'group',\n        },\n        {\n          fields: [{ name: 'label', type: 'text' }],\n          type: 'row',\n        },\n        {\n          fields: [{ name: 'eventTag', type: 'text' }],\n          label: 'Tracking',\n          type: 'collapsible',\n        },\n      ],\n      slug: 'link-button',\n    } satisfies { fields: Field[]; slug: string }\n    const signInButtonBlock = {\n      fields: [\n        {\n          fields: [{ name: 'variant', type: 'text' }],\n          name: 'appearance',\n          type: 'group',\n        },\n        {\n          fields: [{ name: 'label', type: 'text' }],\n          type: 'row',\n        },\n        { name: 'isSignup', type: 'checkbox' },\n        {\n          fields: [{ name: 'eventTag', type: 'text' }],\n          label: 'Tracking',\n          type: 'collapsible',\n        },\n      ],\n      slug: 'sign-in-button',\n    } satisfies { fields: Field[]; slug: string }\n    const blocksField = {\n      blocks: [linkButtonBlock, signInButtonBlock],\n      name: 'ctas',\n      type: 'blocks',\n    } satisfies Field\n    const clientSchemaMap = new Map([['pages.ctas', blocksField]]) as ClientFieldSchemaMap\n\n    addFieldsToClientSchemaMap({\n      clientSchemaMap,\n      entitySlug: 'pages',\n      fields: linkButtonBlock.fields,\n      parentSchemaPath: 'ctas.link-button',\n    })\n    addFieldsToClientSchemaMap({\n      clientSchemaMap,\n      entitySlug: 'pages',\n      fields: signInButtonBlock.fields,\n      parentSchemaPath: 'ctas.sign-in-button',\n    })\n\n    const { versionFields } = buildVersionFields({\n      clientSchemaMap,\n      customDiffComponents: {},\n      entitySlug: 'pages',\n      fields: [blocksField],\n      fieldsPermissions: { ctas: true } as SanitizedFieldsPermissions,\n      i18n: { t: (key: string) => key },\n      modifiedOnly: true,\n      parentIndexPath: '',\n      parentIsLocalized: false,\n      parentPath: '',\n      parentSchemaPath: '',\n      req: {\n        payload: {\n          blocks: {},\n          importMap: {},\n          logger: { error: vi.fn() },\n        },\n      },\n      selectedLocales: [],\n      versionFromSiblingData: {\n        ctas: [\n          {\n            appearance: { variant: 'primary' },\n            blockType: 'sign-in-button',\n            eventTag: 'sign-in tracking',\n            isSignup: true,\n            label: 'Sign in',\n          },\n        ],\n      },\n      versionToSiblingData: {\n        ctas: [\n          {\n            appearance: { variant: 'secondary' },\n            blockType: 'link-button',\n            eventTag: 'link tracking',\n            label: 'Learn more',\n          },\n        ],\n      },\n    } as BuildVersionFieldsArgs)\n\n    const rowFields = versionFields[0]?.field?.rows?.[0] ?? []\n    const schemaPaths = getSchemaPaths(rowFields)\n\n    expect(schemaPaths).toEqual(\n      expect.arrayContaining([\n        'ctas.sign-in-button._index-1.label',\n        'ctas.sign-in-button._index-3.eventTag',\n        'ctas.link-button._index-1.label',\n        'ctas.link-button._index-2.eventTag',\n      ]),\n    )\n  })\n\n  it('should use the source block permissions when a block is replaced', () => {\n    const sourceBlock = {\n      fields: [{ name: 'shared', type: 'text' }],\n      slug: 'source',\n    } satisfies { fields: Field[]; slug: string }\n    const replacementBlock = {\n      fields: [{ name: 'shared', type: 'text' }],\n      slug: 'replacement',\n    } satisfies { fields: Field[]; slug: string }\n    const blocksField = {\n      blocks: [sourceBlock, replacementBlock],\n      name: 'blocks',\n      type: 'blocks',\n    } satisfies Field\n    const clientSchemaMap = new Map([\n      ['pages.blocks', blocksField],\n      ['pages.blocks.source.shared', sourceBlock.fields[0]],\n      ['pages.blocks.replacement.shared', replacementBlock.fields[0]],\n    ]) as ClientFieldSchemaMap\n    const fieldsPermissions = {\n      blocks: {\n        blocks: {\n          replacement: { fields: {} },\n          source: { fields: { shared: true } },\n        },\n        read: true,\n      },\n    } as SanitizedFieldsPermissions\n\n    const { versionFields } = buildVersionFields({\n      clientSchemaMap,\n      customDiffComponents: {},\n      entitySlug: 'pages',\n      fields: [blocksField],\n      fieldsPermissions,\n      i18n: { t: (key: string) => key },\n      modifiedOnly: true,\n      parentIndexPath: '',\n      parentIsLocalized: false,\n      parentPath: '',\n      parentSchemaPath: '',\n      req: {\n        payload: {\n          blocks: {},\n          importMap: {},\n          logger: { error: vi.fn() },\n        },\n      },\n      selectedLocales: [],\n      versionFromSiblingData: {\n        blocks: [{ blockType: 'source', shared: 'readable source value' }],\n      },\n      versionToSiblingData: {\n        blocks: [{ blockType: 'replacement' }],\n      },\n    } as BuildVersionFieldsArgs)\n\n    const rowFields = versionFields[0]?.field?.rows?.[0]\n\n    expect(rowFields).toHaveLength(1)\n    expect(rowFields?.[0]?.field?.path).toBe('blocks.0.shared')\n    expect(rowFields?.[0]?.field?.schemaPath).toBe('blocks.source.shared')\n  })\n})\n\nfunction addFieldsToClientSchemaMap({\n  clientSchemaMap,\n  entitySlug,\n  fields,\n  parentIndexPath = '',\n  parentSchemaPath,\n}: {\n  clientSchemaMap: ClientFieldSchemaMap\n  entitySlug: string\n  fields: Field[]\n  parentIndexPath?: string\n  parentSchemaPath: string\n}): void {\n  fields.forEach((field, index) => {\n    const { indexPath, schemaPath } = getFieldPaths({\n      field,\n      index,\n      parentIndexPath,\n      parentSchemaPath,\n    })\n\n    clientSchemaMap.set(`${entitySlug}.${schemaPath}`, field as ClientField)\n\n    if (field.type === 'collapsible' || field.type === 'row') {\n      addFieldsToClientSchemaMap({\n        clientSchemaMap,\n        entitySlug,\n        fields: field.fields,\n        parentIndexPath: indexPath,\n        parentSchemaPath: schemaPath,\n      })\n    } else if (field.type === 'group') {\n      addFieldsToClientSchemaMap({\n        clientSchemaMap,\n        entitySlug,\n        fields: field.fields,\n        parentIndexPath: 'name' in field ? '' : indexPath,\n        parentSchemaPath: schemaPath,\n      })\n    }\n  })\n}\n\nfunction getSchemaPaths(versionFields: VersionField[]): string[] {\n  return versionFields.flatMap((versionField) => {\n    const field = versionField.field\n\n    if (!field) {\n      return []\n    }\n\n    return [\n      field.schemaPath,\n      ...getSchemaPaths(field.fields),\n      ...(field.rows?.flatMap((row) => getSchemaPaths(row)) ?? []),\n      ...(field.tabs?.flatMap((tab) => getSchemaPaths(tab.fields)) ?? []),\n    ]\n  })\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Version/RenderFieldsToDiff/fields/Iterable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAInD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AAUpB,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAsGnD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAInD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AAWpB,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA+GnD,CAAA"}

package/dist/views/Version/RenderFieldsToDiff/fields/Iterable/index.js

@@ -11,6 +11,7 @@ import { useTranslation } from '../../../../../providers/Translation/index.js';
 import { useSelectedLocales } from '../../../Default/SelectedLocalesContext.js';
 import { DiffCollapser } from '../../DiffCollapser/index.js';
 import { RenderVersionFieldsToDiff } from '../../RenderVersionFieldsToDiff.js';
+import { countChangedFieldsInRows } from '../../utilities/countChangedFields.js';
 import { getFieldsForRowComparison } from '../../utilities/getFieldsForRowComparison.js';
 const baseClass = 'iterable-diff';
 export const Iterable = t0 => {
@@ -74,6 +75,14 @@ export const Iterable = t0 => {
               valueFromRow,
               valueToRow
             });
+            const changeCount = countChangedFieldsInRows({
+              config,
+              field,
+              locales: selectedLocales,
+              parentIsLocalized: parentIsLocalized || field.localized,
+              valueFromRows: [valueFromRow],
+              valueToRows: [valueToRow]
+            });
             if (!versionFields?.length) {
               return null;
             }
@@ -82,6 +91,7 @@ export const Iterable = t0 => {
             return _jsx("div", {
               className: `${baseClass}__row`,
               children: _jsx(DiffCollapser, {
+                changeCount,
                 fields,
                 hideGutter: true,
                 Label: _jsxs("div", {

package/dist/views/Version/RenderFieldsToDiff/fields/Iterable/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["c","_c","getTranslation","fieldIsArrayType","fieldIsBlockType","React","useConfig","useTranslation","useSelectedLocales","DiffCollapser","RenderVersionFieldsToDiff","getFieldsForRowComparison","baseClass","Iterable","t0","$","baseVersionField","comparisonValue","valueFrom","field","locale","parentIsLocalized","versionValue","valueTo","i18n","t","selectedLocales","config","Error","type","valueToRowCount","Array","isArray","length","valueFromRowCount","maxRows","Math","max","t1","_jsx","className","children","_jsxs","isIterable","Label","label","from","_","i","valueToRow","valueFromRow","fields","versionFields","row","rowNumber","String","padStart","rowLabel","hideGutter","localized","labels","plural"],"sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx"],"sourcesContent":["'use client'\n\nimport type { FieldDiffClientProps } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { fieldIsArrayType, fieldIsBlockType } from 'payload/shared'\nimport React from 'react'\n\nimport './index.css'\nimport { useConfig } from '../../../../../providers/Config/index.js'\nimport { useTranslation } from '../../../../../providers/Translation/index.js'\nimport { useSelectedLocales } from '../../../Default/SelectedLocalesContext.js'\nimport { DiffCollapser } from '../../DiffCollapser/index.js'\nimport { RenderVersionFieldsToDiff } from '../../RenderVersionFieldsToDiff.js'\nimport { getFieldsForRowComparison } from '../../utilities/getFieldsForRowComparison.js'\n\nconst baseClass = 'iterable-diff'\n\nexport const Iterable: React.FC<FieldDiffClientProps> = ({\n  baseVersionField,\n  comparisonValue: valueFrom,\n  field,\n  locale,\n  parentIsLocalized,\n  versionValue: valueTo,\n}) => {\n  const { i18n, t } = useTranslation()\n  const { selectedLocales } = useSelectedLocales()\n  const { config } = useConfig()\n\n  if (!fieldIsArrayType(field) && !fieldIsBlockType(field)) {\n    throw new Error(`Expected field to be an array or blocks type but got: ${field.type}`)\n  }\n\n  const valueToRowCount = Array.isArray(valueTo) ? valueTo.length : 0\n  const valueFromRowCount = Array.isArray(valueFrom) ? valueFrom.length : 0\n  const maxRows = Math.max(valueToRowCount, valueFromRowCount)\n\n  return (\n    <div className={baseClass}>\n      <DiffCollapser\n        field={field}\n        isIterable\n        Label={\n          'label' in field &&\n          field.label &&\n          typeof field.label !== 'function' && (\n            <span>\n              {locale && <span className={`${baseClass}__locale-label`}>{locale}</span>}\n              {getTranslation(field.label, i18n)}\n            </span>\n          )\n        }\n        locales={selectedLocales}\n        parentIsLocalized={parentIsLocalized}\n        valueFrom={valueFrom}\n        valueTo={valueTo}\n      >\n        {maxRows > 0 && (\n          <div className={`${baseClass}__rows`}>\n            {Array.from({ length: maxRows }, (_, i) => {\n              const valueToRow = valueTo?.[i] || {}\n              const valueFromRow = valueFrom?.[i] || {}\n\n              const { fields, versionFields } = getFieldsForRowComparison({\n                baseVersionField,\n                config,\n                field,\n                row: i,\n                valueFromRow,\n                valueToRow,\n              })\n\n              if (!versionFields?.length) {\n                // Rows without a diff create \"holes\" in the baseVersionField.rows (=versionFields) array - this is to maintain the correct row indexes.\n                // It does mean that this row has no diff and should not be rendered => skip it.\n                return null\n              }\n\n              const rowNumber = String(i + 1).padStart(2, '0')\n              const rowLabel = fieldIsArrayType(field)\n                ? `${t('general:item')} ${rowNumber}`\n                : `${t('fields:block')} ${rowNumber}`\n\n              return (\n                <div className={`${baseClass}__row`} key={i}>\n                  <DiffCollapser\n                    fields={fields}\n                    hideGutter={true}\n                    Label={\n                      <div className={`${baseClass}-label-container`}>\n                        <div className={`${baseClass}-label-prefix`}></div>\n                        <span className={`${baseClass}__label`}>{rowLabel}</span>\n                      </div>\n                    }\n                    locales={selectedLocales}\n                    parentIsLocalized={parentIsLocalized || field.localized}\n                    valueFrom={valueFromRow}\n                    valueTo={valueToRow}\n                  >\n                    <RenderVersionFieldsToDiff versionFields={versionFields} />\n                  </DiffCollapser>\n                </div>\n              )\n            })}\n          </div>\n        )}\n        {maxRows === 0 && (\n          <div className={`${baseClass}__no-rows`}>\n            {i18n.t('version:noRowsFound', {\n              label:\n                'labels' in field && field.labels?.plural\n                  ? getTranslation(field.labels.plural, i18n)\n                  : i18n.t('general:rows'),\n            })}\n          </div>\n        )}\n      </DiffCollapser>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["c","_c","getTranslation","fieldIsArrayType","fieldIsBlockType","React","useConfig","useTranslation","useSelectedLocales","DiffCollapser","RenderVersionFieldsToDiff","countChangedFieldsInRows","getFieldsForRowComparison","baseClass","Iterable","t0","$","baseVersionField","comparisonValue","valueFrom","field","locale","parentIsLocalized","versionValue","valueTo","i18n","t","selectedLocales","config","Error","type","valueToRowCount","Array","isArray","length","valueFromRowCount","maxRows","Math","max","t1","_jsx","className","children","_jsxs","isIterable","Label","label","from","_","i","valueToRow","valueFromRow","fields","versionFields","row","changeCount","locales","localized","valueFromRows","valueToRows","rowNumber","String","padStart","rowLabel","hideGutter","labels","plural"],"sources":["../../../../../../src/views/Version/RenderFieldsToDiff/fields/Iterable/index.tsx"],"sourcesContent":["'use client'\n\nimport type { FieldDiffClientProps } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { fieldIsArrayType, fieldIsBlockType } from 'payload/shared'\nimport React from 'react'\n\nimport './index.css'\nimport { useConfig } from '../../../../../providers/Config/index.js'\nimport { useTranslation } from '../../../../../providers/Translation/index.js'\nimport { useSelectedLocales } from '../../../Default/SelectedLocalesContext.js'\nimport { DiffCollapser } from '../../DiffCollapser/index.js'\nimport { RenderVersionFieldsToDiff } from '../../RenderVersionFieldsToDiff.js'\nimport { countChangedFieldsInRows } from '../../utilities/countChangedFields.js'\nimport { getFieldsForRowComparison } from '../../utilities/getFieldsForRowComparison.js'\n\nconst baseClass = 'iterable-diff'\n\nexport const Iterable: React.FC<FieldDiffClientProps> = ({\n  baseVersionField,\n  comparisonValue: valueFrom,\n  field,\n  locale,\n  parentIsLocalized,\n  versionValue: valueTo,\n}) => {\n  const { i18n, t } = useTranslation()\n  const { selectedLocales } = useSelectedLocales()\n  const { config } = useConfig()\n\n  if (!fieldIsArrayType(field) && !fieldIsBlockType(field)) {\n    throw new Error(`Expected field to be an array or blocks type but got: ${field.type}`)\n  }\n\n  const valueToRowCount = Array.isArray(valueTo) ? valueTo.length : 0\n  const valueFromRowCount = Array.isArray(valueFrom) ? valueFrom.length : 0\n  const maxRows = Math.max(valueToRowCount, valueFromRowCount)\n\n  return (\n    <div className={baseClass}>\n      <DiffCollapser\n        field={field}\n        isIterable\n        Label={\n          'label' in field &&\n          field.label &&\n          typeof field.label !== 'function' && (\n            <span>\n              {locale && <span className={`${baseClass}__locale-label`}>{locale}</span>}\n              {getTranslation(field.label, i18n)}\n            </span>\n          )\n        }\n        locales={selectedLocales}\n        parentIsLocalized={parentIsLocalized}\n        valueFrom={valueFrom}\n        valueTo={valueTo}\n      >\n        {maxRows > 0 && (\n          <div className={`${baseClass}__rows`}>\n            {Array.from({ length: maxRows }, (_, i) => {\n              const valueToRow = valueTo?.[i] || {}\n              const valueFromRow = valueFrom?.[i] || {}\n\n              const { fields, versionFields } = getFieldsForRowComparison({\n                baseVersionField,\n                config,\n                field,\n                row: i,\n                valueFromRow,\n                valueToRow,\n              })\n              const changeCount = countChangedFieldsInRows({\n                config,\n                field,\n                locales: selectedLocales,\n                parentIsLocalized: parentIsLocalized || field.localized,\n                valueFromRows: [valueFromRow],\n                valueToRows: [valueToRow],\n              })\n\n              if (!versionFields?.length) {\n                // Rows without a diff create \"holes\" in the baseVersionField.rows (=versionFields) array - this is to maintain the correct row indexes.\n                // It does mean that this row has no diff and should not be rendered => skip it.\n                return null\n              }\n\n              const rowNumber = String(i + 1).padStart(2, '0')\n              const rowLabel = fieldIsArrayType(field)\n                ? `${t('general:item')} ${rowNumber}`\n                : `${t('fields:block')} ${rowNumber}`\n\n              return (\n                <div className={`${baseClass}__row`} key={i}>\n                  <DiffCollapser\n                    changeCount={changeCount}\n                    fields={fields}\n                    hideGutter={true}\n                    Label={\n                      <div className={`${baseClass}-label-container`}>\n                        <div className={`${baseClass}-label-prefix`}></div>\n                        <span className={`${baseClass}__label`}>{rowLabel}</span>\n                      </div>\n                    }\n                    locales={selectedLocales}\n                    parentIsLocalized={parentIsLocalized || field.localized}\n                    valueFrom={valueFromRow}\n                    valueTo={valueToRow}\n                  >\n                    <RenderVersionFieldsToDiff versionFields={versionFields} />\n                  </DiffCollapser>\n                </div>\n              )\n            })}\n          </div>\n        )}\n        {maxRows === 0 && (\n          <div className={`${baseClass}__no-rows`}>\n            {i18n.t('version:noRowsFound', {\n              label:\n                'labels' in field && field.labels?.plural\n                  ? getTranslation(field.labels.plural, i18n)\n                  : i18n.t('general:rows'),\n            })}\n          </div>\n        )}\n      </DiffCollapser>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

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,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAO7F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,SAAS,EACT,OAAO,GACR,EAAE,IAAI,UAqLN;AAED,KAAK,4BAA4B,GAAG;IAClC,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,aAAa,EAAE,OAAO,EAAE,CAAA;IACxB,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CAAA;AAED,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,KAAK,EACL,OAAO,EACP,iBAAiB,EACjB,aAAkB,EAClB,WAAgB,GACjB,EAAE,4BAA4B,UA6B9B"}
+{"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;AAO7F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,MAAM,EACN,OAAO,EACP,iBAAiB,EACjB,SAAS,EACT,OAAO,GACR,EAAE,IAAI,UAqLN;AAED,KAAK,4BAA4B,GAAG;IAClC,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAA;IAC3C,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;IAC7B,iBAAiB,EAAE,OAAO,CAAA;IAC1B,aAAa,EAAE,OAAO,EAAE,CAAA;IACxB,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CAAA;AAED,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,KAAK,EACL,OAAO,EACP,iBAAiB,EACjB,aAAkB,EAClB,WAAgB,GACjB,EAAE,4BAA4B,UAwD9B"}

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

@@ -1,6 +1,6 @@
 import { fieldShouldBeLocalized, groupHasName } from 'payload/shared';
 import { fieldHasChanges } from './fieldHasChanges.js';
-import { getFieldsForRowComparison } from './getFieldsForRowComparison.js';
+import { getBlockFields, getFieldsForRowComparison } from './getFieldsForRowComparison.js';
 /**
  * Recursively counts the number of changed fields between comparison and
  * version data for a given set of fields.
@@ -213,6 +213,38 @@ export function countChangedFieldsInRows({
   while (valueFromRows[i] || valueToRows[i]) {
     const valueFromRow = valueFromRows?.[i] || {};
     const valueToRow = valueToRows?.[i] || {};
+    if (field.type === 'blocks') {
+      const blockTypeFrom = valueFromRow.blockType;
+      const blockTypeTo = valueToRow.blockType;
+      if (blockTypeFrom !== blockTypeTo) {
+        count += countChangedFields({
+          config,
+          fields: getBlockFields({
+            blockSlug: blockTypeFrom,
+            config,
+            field
+          }),
+          locales,
+          parentIsLocalized: parentIsLocalized || field.localized,
+          valueFrom: valueFromRow,
+          valueTo: {}
+        });
+        count += countChangedFields({
+          config,
+          fields: getBlockFields({
+            blockSlug: blockTypeTo,
+            config,
+            field
+          }),
+          locales,
+          parentIsLocalized: parentIsLocalized || field.localized,
+          valueFrom: {},
+          valueTo: valueToRow
+        });
+        i++;
+        continue;
+      }
+    }
     const {
       fields: rowFields
     } = getFieldsForRowComparison({

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

@@ -1 +1 @@
-{"version":3,"file":"countChangedFields.js","names":["fieldShouldBeLocalized","groupHasName","fieldHasChanges","getFieldsForRowComparison","countChangedFields","config","fields","locales","parentIsLocalized","valueFrom","valueTo","count","forEach","field","name","fieldType","type","locale","valueFromRows","valueToRows","countChangedFieldsInRows","localized","tabs","tab","_exhaustiveCheck","Error","String","i","valueFromRow","valueToRow","rowFields","baseVersionField","path","schemaPath","row"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"sourcesContent":["import type { ArrayFieldClient, BlocksFieldClient, ClientConfig, ClientField } from 'payload'\n\nimport { fieldShouldBeLocalized, groupHasName } from 'payload/shared'\n\nimport { fieldHasChanges } from './fieldHasChanges.js'\nimport { getFieldsForRowComparison } from './getFieldsForRowComparison.js'\n\ntype Args = {\n  config: ClientConfig\n  fields: ClientField[]\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  valueFrom: unknown\n  valueTo: 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({\n  config,\n  fields,\n  locales,\n  parentIsLocalized,\n  valueFrom,\n  valueTo,\n}: 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 && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            const valueFromRows = valueFrom?.[field.name]?.[locale] ?? []\n            const valueToRows = valueTo?.[field.name]?.[locale] ?? []\n            count += countChangedFieldsInRows({\n              config,\n              field,\n              locales,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              valueFromRows,\n              valueToRows,\n            })\n          })\n        } else {\n          const valueFromRows = valueFrom?.[field.name] ?? []\n          const valueToRows = valueTo?.[field.name] ?? []\n          count += countChangedFieldsInRows({\n            config,\n            field,\n            locales,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            valueFromRows,\n            valueToRows,\n          })\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 'slug':\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 && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            if (\n              fieldHasChanges(valueTo?.[field.name]?.[locale], valueFrom?.[field.name]?.[locale])\n            ) {\n              count++\n            }\n          })\n        } else if (fieldHasChanges(valueTo?.[field.name], valueFrom?.[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          config,\n          fields: field.fields,\n          locales,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          valueFrom,\n          valueTo,\n        })\n\n        break\n      }\n\n      // Fields that have nested fields and nest their fields' data.\n      case 'group': {\n        if (groupHasName(field)) {\n          if (locales && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n            locales.forEach((locale) => {\n              count += countChangedFields({\n                config,\n                fields: field.fields,\n                locales,\n                parentIsLocalized: parentIsLocalized || field.localized,\n                valueFrom: valueFrom?.[field.name]?.[locale],\n                valueTo: valueTo?.[field.name]?.[locale],\n              })\n            })\n          } else {\n            count += countChangedFields({\n              config,\n              fields: field.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              valueFrom: valueFrom?.[field.name],\n              valueTo: valueTo?.[field.name],\n            })\n          }\n        } else {\n          // Unnamed group field: data is NOT nested under `field.name`\n          count += countChangedFields({\n            config,\n            fields: field.fields,\n            locales,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            valueFrom,\n            valueTo,\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                config,\n                fields: tab.fields,\n                locales,\n                parentIsLocalized: parentIsLocalized || tab.localized,\n                valueFrom: valueFrom?.[tab.name]?.[locale],\n                valueTo: valueTo?.[tab.name]?.[locale],\n              })\n            })\n          } else if ('name' in tab) {\n            // Named tab\n            count += countChangedFields({\n              config,\n              fields: tab.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || tab.localized,\n              valueFrom: valueFrom?.[tab.name],\n              valueTo: valueTo?.[tab.name],\n            })\n          } else {\n            // Unnamed tab\n            count += countChangedFields({\n              config,\n              fields: tab.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || tab.localized,\n              valueFrom,\n              valueTo,\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  config: ClientConfig\n  field: ArrayFieldClient | BlocksFieldClient\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  valueFromRows: unknown[]\n  valueToRows: unknown[]\n}\n\nexport function countChangedFieldsInRows({\n  config,\n  field,\n  locales,\n  parentIsLocalized,\n  valueFromRows = [],\n  valueToRows = [],\n}: countChangedFieldsInRowsArgs) {\n  let count = 0\n  let i = 0\n\n  while (valueFromRows[i] || valueToRows[i]) {\n    const valueFromRow = valueFromRows?.[i] || {}\n    const valueToRow = valueToRows?.[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      config,\n      field,\n      row: i,\n      valueFromRow,\n      valueToRow,\n    })\n\n    count += countChangedFields({\n      config,\n      fields: rowFields,\n      locales,\n      parentIsLocalized: parentIsLocalized || field.localized,\n      valueFrom: valueFromRow,\n      valueTo: valueToRow,\n    })\n\n    i++\n  }\n  return count\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"countChangedFields.js","names":["fieldShouldBeLocalized","groupHasName","fieldHasChanges","getBlockFields","getFieldsForRowComparison","countChangedFields","config","fields","locales","parentIsLocalized","valueFrom","valueTo","count","forEach","field","name","fieldType","type","locale","valueFromRows","valueToRows","countChangedFieldsInRows","localized","tabs","tab","_exhaustiveCheck","Error","String","i","valueFromRow","valueToRow","blockTypeFrom","blockType","blockTypeTo","blockSlug","rowFields","baseVersionField","path","schemaPath","row"],"sources":["../../../../../src/views/Version/RenderFieldsToDiff/utilities/countChangedFields.ts"],"sourcesContent":["import type { ArrayFieldClient, BlocksFieldClient, ClientConfig, ClientField } from 'payload'\n\nimport { fieldShouldBeLocalized, groupHasName } from 'payload/shared'\n\nimport { fieldHasChanges } from './fieldHasChanges.js'\nimport { getBlockFields, getFieldsForRowComparison } from './getFieldsForRowComparison.js'\n\ntype Args = {\n  config: ClientConfig\n  fields: ClientField[]\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  valueFrom: unknown\n  valueTo: 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({\n  config,\n  fields,\n  locales,\n  parentIsLocalized,\n  valueFrom,\n  valueTo,\n}: 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 && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            const valueFromRows = valueFrom?.[field.name]?.[locale] ?? []\n            const valueToRows = valueTo?.[field.name]?.[locale] ?? []\n            count += countChangedFieldsInRows({\n              config,\n              field,\n              locales,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              valueFromRows,\n              valueToRows,\n            })\n          })\n        } else {\n          const valueFromRows = valueFrom?.[field.name] ?? []\n          const valueToRows = valueTo?.[field.name] ?? []\n          count += countChangedFieldsInRows({\n            config,\n            field,\n            locales,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            valueFromRows,\n            valueToRows,\n          })\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 'slug':\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 && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n          locales.forEach((locale) => {\n            if (\n              fieldHasChanges(valueTo?.[field.name]?.[locale], valueFrom?.[field.name]?.[locale])\n            ) {\n              count++\n            }\n          })\n        } else if (fieldHasChanges(valueTo?.[field.name], valueFrom?.[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          config,\n          fields: field.fields,\n          locales,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          valueFrom,\n          valueTo,\n        })\n\n        break\n      }\n\n      // Fields that have nested fields and nest their fields' data.\n      case 'group': {\n        if (groupHasName(field)) {\n          if (locales && fieldShouldBeLocalized({ field, parentIsLocalized })) {\n            locales.forEach((locale) => {\n              count += countChangedFields({\n                config,\n                fields: field.fields,\n                locales,\n                parentIsLocalized: parentIsLocalized || field.localized,\n                valueFrom: valueFrom?.[field.name]?.[locale],\n                valueTo: valueTo?.[field.name]?.[locale],\n              })\n            })\n          } else {\n            count += countChangedFields({\n              config,\n              fields: field.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              valueFrom: valueFrom?.[field.name],\n              valueTo: valueTo?.[field.name],\n            })\n          }\n        } else {\n          // Unnamed group field: data is NOT nested under `field.name`\n          count += countChangedFields({\n            config,\n            fields: field.fields,\n            locales,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            valueFrom,\n            valueTo,\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                config,\n                fields: tab.fields,\n                locales,\n                parentIsLocalized: parentIsLocalized || tab.localized,\n                valueFrom: valueFrom?.[tab.name]?.[locale],\n                valueTo: valueTo?.[tab.name]?.[locale],\n              })\n            })\n          } else if ('name' in tab) {\n            // Named tab\n            count += countChangedFields({\n              config,\n              fields: tab.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || tab.localized,\n              valueFrom: valueFrom?.[tab.name],\n              valueTo: valueTo?.[tab.name],\n            })\n          } else {\n            // Unnamed tab\n            count += countChangedFields({\n              config,\n              fields: tab.fields,\n              locales,\n              parentIsLocalized: parentIsLocalized || tab.localized,\n              valueFrom,\n              valueTo,\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  config: ClientConfig\n  field: ArrayFieldClient | BlocksFieldClient\n  locales: string[] | undefined\n  parentIsLocalized: boolean\n  valueFromRows: unknown[]\n  valueToRows: unknown[]\n}\n\nexport function countChangedFieldsInRows({\n  config,\n  field,\n  locales,\n  parentIsLocalized,\n  valueFromRows = [],\n  valueToRows = [],\n}: countChangedFieldsInRowsArgs) {\n  let count = 0\n  let i = 0\n\n  while (valueFromRows[i] || valueToRows[i]) {\n    const valueFromRow = valueFromRows?.[i] || {}\n    const valueToRow = valueToRows?.[i] || {}\n\n    if (field.type === 'blocks') {\n      const blockTypeFrom = (valueFromRow as { blockType?: string }).blockType\n      const blockTypeTo = (valueToRow as { blockType?: string }).blockType\n\n      if (blockTypeFrom !== blockTypeTo) {\n        count += countChangedFields({\n          config,\n          fields: getBlockFields({ blockSlug: blockTypeFrom, config, field }),\n          locales,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          valueFrom: valueFromRow,\n          valueTo: {},\n        })\n        count += countChangedFields({\n          config,\n          fields: getBlockFields({ blockSlug: blockTypeTo, config, field }),\n          locales,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          valueFrom: {},\n          valueTo: valueToRow,\n        })\n\n        i++\n        continue\n      }\n    }\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      config,\n      field,\n      row: i,\n      valueFromRow,\n      valueToRow,\n    })\n\n    count += countChangedFields({\n      config,\n      fields: rowFields,\n      locales,\n      parentIsLocalized: parentIsLocalized || field.localized,\n      valueFrom: valueFromRow,\n      valueTo: valueToRow,\n    })\n\n    i++\n  }\n  return count\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -433,7 +433,7 @@ describe('countChangedFields', () => {
     });
     expect(result).toBe(5);
   });
-  it('should count changed fields between blocks with different slugs', () => {
+  it('should count source and replacement fields between blocks with different slugs', () => {
     const fields = [{
       name: 'blocks',
       type: 'blocks',
@@ -485,7 +485,7 @@ describe('countChangedFields', () => {
       valueTo,
       locales
     });
-    expect(result).toBe(3);
+    expect(result).toBe(6);
   });
   describe('localized fields', () => {
     const locales = ['en', 'de'];
@@ -857,5 +857,59 @@ describe('countChangedFieldsInRows', () => {
     });
     expect(result).toBe(2);
   });
+  it('should count source and replacement block fields separately', () => {
+    const field = {
+      name: 'myBlocks',
+      type: 'blocks',
+      blocks: [{
+        slug: 'source',
+        fields: [{
+          type: 'row',
+          fields: [{
+            name: 'sourceRow',
+            type: 'text'
+          }]
+        }, {
+          type: 'collapsible',
+          label: 'Source details',
+          fields: [{
+            name: 'sourceDetails',
+            type: 'text'
+          }]
+        }]
+      }, {
+        slug: 'replacement',
+        fields: [{
+          type: 'row',
+          fields: [{
+            name: 'replacementRow',
+            type: 'text'
+          }]
+        }, {
+          type: 'collapsible',
+          label: 'Replacement details',
+          fields: [{
+            name: 'replacementDetails',
+            type: 'text'
+          }]
+        }]
+      }]
+    };
+    const result = countChangedFieldsInRows({
+      field,
+      locales: undefined,
+      valueFromRows: [{
+        blockType: 'source',
+        sourceDetails: 'original details',
+        sourceRow: 'original row'
+      }],
+      valueToRows: [{
+        blockType: 'replacement',
+        replacementDetails: 'replacement details',
+        replacementRow: 'replacement row'
+      }]
+    });
+    expect(result).toBe(4);
+  });
 });
 //# sourceMappingURL=countChangedFields.spec.js.map