Simplify meta attribute sources and attempt to prepare a generalization of custom sources

docs/designers-developers/developers/data/data-core-block-editor.md

@@ -353,6 +353,18 @@ _Returns_
 
 -   `Array<Editor.InserterItem>`: Items that appear in inserter.
 
+<a name="getLastBlockAttributesChange" href="#getLastBlockAttributesChange">#</a> **getLastBlockAttributesChange**
+
+Returns an object describing the last block attributes changes
+
+_Parameters_
+
+-   _state_ `Object`: Block editor state.
+
+_Returns_
+
+-   `Object`: the clientId and the block attributes changes
+
 <a name="getLastMultiSelectedBlockClientId" href="#getLastMultiSelectedBlockClientId">#</a> **getLastMultiSelectedBlockClientId**
 
 Returns the client ID of the last block in the multi-selection set, or null

docs/designers-developers/developers/data/data-core-editor.md

@@ -1047,10 +1047,6 @@ _Parameters_
 
 -   _edits_ `Object`: Post attributes to edit.
 
-_Returns_
-
--   `Object`: Action object.
-
 <a name="enablePublishSidebar" href="#enablePublishSidebar">#</a> **enablePublishSidebar**
 
 Returns an action object used in signalling that the user has enabled the
@@ -1211,10 +1207,6 @@ _Parameters_
 -   _blocks_ `Array`: Block Array.
 -   _options_ `?Object`: Optional options.
 
-_Returns_
-
--   `Object`: Action object
-
 <a name="resetPost" href="#resetPost">#</a> **resetPost**
 
 Returns an action object used in signalling that the latest version of the

packages/block-editor/src/components/block-list/block.js

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { get, reduce, size, first, last } from 'lodash';
+import { first, last } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -649,42 +649,8 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, { select } ) => {
 
 	return {
 		setAttributes( newAttributes ) {
-			const { name, clientId } = ownProps;
-			const type = getBlockType( name );
-
-			function isMetaAttribute( key ) {
-				return get( type, [ 'attributes', key, 'source' ] ) === 'meta';
-			}
-
-			// Partition new attributes to delegate update behavior by source.
-			//
-			// TODO: A consolidated approach to external attributes sourcing
-			// should be devised to avoid specific handling for meta, enable
-			// additional attributes sources.
-			//
-			// See: https://github.com/WordPress/gutenberg/issues/2759
-			const {
-				blockAttributes,
-				metaAttributes,
-			} = reduce( newAttributes, ( result, value, key ) => {
-				if ( isMetaAttribute( key ) ) {
-					result.metaAttributes[ type.attributes[ key ].meta ] = value;
-				} else {
-					result.blockAttributes[ key ] = value;
-				}
-
-				return result;
-			}, { blockAttributes: {}, metaAttributes: {} } );
-
-			if ( size( blockAttributes ) ) {
-				updateBlockAttributes( clientId, blockAttributes );
-			}
-
-			if ( size( metaAttributes ) ) {
-				const { getSettings } = select( 'core/block-editor' );
-				const onChangeMeta = getSettings().__experimentalMetaSource.onChange;
-				onChangeMeta( metaAttributes );
-			}
+			const { clientId } = ownProps;
+			updateBlockAttributes( clientId, newAttributes );
 		},
 		onSelect( clientId = ownProps.clientId, initialPosition ) {
 			selectBlock( clientId, initialPosition );

packages/block-editor/src/components/provider/index.js

@@ -12,6 +12,10 @@ import { compose } from '@wordpress/compose';
 import withRegistryProvider from './with-registry-provider';
 
 class BlockEditorProvider extends Component {
+	constructor() {
+		super( ...arguments );
+		this.lastPersistedBlocks = [];
+	}
 	componentDidMount() {
 		this.props.updateSettings( this.props.settings );
 		this.props.resetBlocks( this.props.value );
@@ -35,11 +39,15 @@ class BlockEditorProvider extends Component {
 			this.attachChangeObserver( registry );
 		}
 
-		if ( this.isSyncingOutcomingValue ) {
-			this.isSyncingOutcomingValue = false;
-		} else if ( value !== prevProps.value ) {
+		if ( value !== prevProps.value && this.lastPersistedBlocks.indexOf( value ) === -1 ) {
 			this.isSyncingIncomingValue = true;
 			resetBlocks( value );
+			this.lastPersistedBlocks = [];
+		}
+
+		// Reset the last persisted values once the last change is performed
+		if ( value === this.lastPersistedBlocks[ 0 ] ) {
+			this.lastPersistedBlocks = [];
 		}
 	}
 
@@ -69,6 +77,7 @@ class BlockEditorProvider extends Component {
 		const {
 			getBlocks,
 			isLastBlockChangePersistent,
+			getLastBlockAttributesChange,
 			__unstableIsLastBlockChangeIgnored,
 		} = registry.select( 'core/block-editor' );
 
@@ -99,19 +108,15 @@ class BlockEditorProvider extends Component {
 				// This happens when a previous input is explicitely marked as persistent.
 				( newIsPersistent && ! isPersistent )
 			) {
-				// When knowing the blocks value is changing, assign instance
-				// value to skip reset in subsequent `componentDidUpdate`.
-				if ( newBlocks !== blocks ) {
-					this.isSyncingOutcomingValue = true;
-				}
-
 				blocks = newBlocks;
 				isPersistent = newIsPersistent;
+				const lastChanges = getLastBlockAttributesChange();
+				this.lastPersistedBlocks.push( blocks );
 
 				if ( isPersistent ) {
-					onChange( blocks );
+					onChange( blocks, lastChanges );
 				} else {
-					onInput( blocks );
+					onInput( blocks, lastChanges );
 				}
 			}
 		} );

packages/block-editor/src/store/reducer.js

@@ -983,8 +983,35 @@ export const blockListSettings = ( state = {}, action ) => {
 	return state;
 };
 
+export function lastBlockAttributesChanges( state, action ) {
+	switch ( action.type ) {
+		case 'UPDATE_BLOCK':
+			if ( ! action.updates.attributes ) {
+				return null;
+			}
+			return {
+				[ action.clientId ]: action.updates.attributes,
+			};
+
+		case 'UPDATE_BLOCK_ATTRIBUTES':
+			return {
+				[ action.clientId ]: action.attributes,
+			};
+
+		case 'RESET_BLOCKS':
+		case 'INSERT_BLOCKS':
+		case 'RECEIVE_BLOCKS':
+		case 'REPLACE_BLOCKS':
+			return getFlattenedBlockAttributes( action.blocks );
+	}
+
+	return null;
+}
+
 export default combineReducers( {
 	blocks,
+	// This is ideally embedded in blocks, the issues is that it alterns the isPersistent behavior
+	lastBlockAttributesChanges,
 	isTyping,
 	isCaretWithinFormattedText,
 	blockSelection,

packages/block-editor/src/store/selectors.js

@@ -64,14 +64,6 @@ const MILLISECONDS_PER_WEEK = 7 * 24 * 3600 * 1000;
  */
 const EMPTY_ARRAY = [];
 
-/**
- * Shared reference to an empty object for cases where it is important to avoid
- * returning a new object reference on every invocation.
- *
- * @type {Object}
- */
-const EMPTY_OBJECT = {};
-
 /**
  * Returns a new reference when the inner blocks of a given block client ID
  * change. This is used exclusively as a memoized selector dependant, relying
@@ -130,42 +122,14 @@ export function isBlockValid( state, clientId ) {
  *
  * @return {Object?} Block attributes.
  */
-export const getBlockAttributes = createSelector(
-	( state, clientId ) => {
-		const block = state.blocks.byClientId[ clientId ];
-		if ( ! block ) {
-			return null;
-		}
-
-		let attributes = state.blocks.attributes[ clientId ];
-
-		// Inject custom source attribute values.
-		//
-		// TODO: Create generic external sourcing pattern, not explicitly
-		// targeting meta attributes.
-		const type = getBlockType( block.name );
-		if ( type ) {
-			attributes = reduce( type.attributes, ( result, value, key ) => {
-				if ( value.source === 'meta' ) {
-					if ( result === attributes ) {
-						result = { ...result };
-					}
-
-					result[ key ] = getPostMeta( state, value.meta );
-				}
-
-				return result;
-			}, attributes );
-		}
+export function getBlockAttributes( state, clientId ) {
+	const block = state.blocks.byClientId[ clientId ];
+	if ( ! block ) {
+		return null;
+	}
 
-		return attributes;
-	},
-	( state, clientId ) => [
-		state.blocks.byClientId[ clientId ],
-		state.blocks.attributes[ clientId ],
-		getPostMeta( state ),
-	]
-);
+	return state.blocks.attributes[ clientId ];
+}
 
 /**
  * Returns a block given its client ID. This is a parsed copy of the block,
@@ -192,7 +156,8 @@ export const getBlock = createSelector(
 		};
 	},
 	( state, clientId ) => [
-		...getBlockAttributes.getDependants( state, clientId ),
+		state.blocks.attributes[ clientId ],
+		state.blocks.byClientId[ clientId ],
 		getBlockDependantsCacheBust( state, clientId ),
 	]
 );
@@ -211,7 +176,7 @@ export const __unstableGetBlockWithoutInnerBlocks = createSelector(
 	},
 	( state, clientId ) => [
 		state.blocks.byClientId[ clientId ],
-		...getBlockAttributes.getDependants( state, clientId ),
+		state.blocks.attributes[ clientId ],
 	]
 );
 
@@ -314,7 +279,6 @@ export const getBlocksByClientId = createSelector(
 		( clientId ) => getBlock( state, clientId )
 	),
 	( state ) => [
-		getPostMeta( state ),
 		state.blocks.byClientId,
 		state.blocks.order,
 		state.blocks.attributes,
@@ -691,7 +655,6 @@ export const getMultiSelectedBlocks = createSelector(
 		state.blocks.byClientId,
 		state.blocks.order,
 		state.blocks.attributes,
-		getPostMeta( state ),
 	]
 );
 
@@ -1437,6 +1400,17 @@ export function isLastBlockChangePersistent( state ) {
 	return state.blocks.isPersistentChange;
 }
 
+/**
+ * Returns an object describing the last block attributes changes
+ *
+ * @param {Object} state Block editor state.
+ *
+ * @return {Object} the clientId and the block attributes changes
+ */
+export function getLastBlockAttributesChange( state ) {
+	return state.lastBlockAttributesChanges;
+}
+
 /**
  * Returns true if the most recent block change is be considered ignored, or
  * false otherwise. An ignored change is one not to be committed by
@@ -1455,22 +1429,6 @@ export function __unstableIsLastBlockChangeIgnored( state ) {
 	return state.blocks.isIgnoredChange;
 }
 
-/**
- * Returns the value of a post meta from the editor settings.
- *
- * @param {Object} state Global application state.
- * @param {string} key   Meta Key to retrieve
- *
- * @return {*} Meta value
- */
-function getPostMeta( state, key ) {
-	if ( key === undefined ) {
-		return get( state, [ 'settings', '__experimentalMetaSource', 'value' ], EMPTY_OBJECT );
-	}
-
-	return get( state, [ 'settings', '__experimentalMetaSource', 'value', key ] );
-}
-
 /**
  * Returns the available reusable blocks
  *

packages/block-editor/src/store/test/selectors.js

@@ -473,54 +473,6 @@ describe( 'selectors', () => {
 				} ],
 			} );
 		} );
-
-		it( 'should merge meta attributes for the block', () => {
-			registerBlockType( 'core/meta-block', {
-				save: ( props ) => props.attributes.text,
-				category: 'common',
-				title: 'test block',
-				attributes: {
-					foo: {
-						type: 'string',
-						source: 'meta',
-						meta: 'foo',
-					},
-				},
-			} );
-
-			const state = {
-				settings: {
-					__experimentalMetaSource: {
-						value: {
-							foo: 'bar',
-						},
-					},
-				},
-				blocks: {
-					byClientId: {
-						123: { clientId: 123, name: 'core/meta-block' },
-					},
-					attributes: {
-						123: {},
-					},
-					order: {
-						'': [ 123 ],
-						123: [],
-					},
-				},
-			};
-
-			expect( getBlock( state, 123 ) ).toEqual( {
-				clientId: 123,
-				name: 'core/meta-block',
-				attributes: {
-					foo: 'bar',
-				},
-				innerBlocks: [],
-			} );
-
-			unregisterBlockType( 'core/meta-block' );
-		} );
 	} );
 
 	describe( 'getBlocks', () => {

packages/e2e-tests/specs/performance.test.js

@@ -34,7 +34,7 @@ describe( 'Performance', () => {
 				}
 			} );
 
-			dispatch( 'core/editor' ).resetBlocks( blocks );
+			dispatch( 'core/block-editor' ).resetBlocks( blocks );
 		}, html );
 		await saveDraft();