Merge branch 'suggest-mode-6b-insert-mechanism' into suggest-mode-6b-insert-ui

Author: adamsilverstein

packages/editor/src/components/suggestion-mode/provider.js

@@ -265,6 +265,16 @@ export function hasAttributeConflict( currentAttributes, operations ) {
 	if ( ! Array.isArray( operations ) ) {
 		return false;
 	}
+	// Inserted blocks have no pre-existing attributes — the overlay's
+	// baseline for a `block-insert-after` entry is `{}`, so every
+	// attribute-set op rides on `before: null`. Comparing that against the
+	// live (already-typed-into) block's attributes always reads as
+	// divergence, which falsely fires the staleness prompt on apply. The
+	// attribute-set ops describe the inserted block's content, not an
+	// overwrite of pre-existing data, so there is nothing to conflict with.
+	if ( findStructuralOp( operations )?.type === 'block-insert-after' ) {
+		return false;
+	}
 	for ( const op of operations ) {
 		if ( op.type !== 'attribute-set' ) {
 			continue;

packages/editor/src/components/suggestion-mode/test/provider.js

@@ -295,6 +295,37 @@ describe( 'hasAttributeConflict', () => {
 			hasAttributeConflict( { content: wrapperOther }, [ CONTENT_OP ] )
 		).toBe( true );
 	} );
+
+	it( 'returns false for a block-insert-after payload even when attribute-set ops appear divergent', () => {
+		// The overlay baseline for an inserted block is `{}` — every
+		// attribute-set op the auto-save loop persists carries
+		// `before: null` regardless of what the user typed. Comparing
+		// that against the live (already-typed-into) block on the
+		// accepting client must not fire the staleness prompt.
+		const operations = [
+			{
+				type: 'block-insert-after',
+				clientId: 'inserted',
+				blockName: 'core/paragraph',
+				anchorClientId: 'anchor',
+				parentClientId: null,
+				block: {
+					name: 'core/paragraph',
+					attributes: { content: 'Hi' },
+					innerBlocks: [],
+				},
+			},
+			{
+				type: 'attribute-set',
+				attribute: 'content',
+				before: null,
+				after: 'Hi',
+			},
+		];
+		expect( hasAttributeConflict( { content: 'Hi' }, operations ) ).toBe(
+			false
+		);
+	} );
 } );
 
 describe( 'parseSuggestionPayload', () => {