Record selection changes in history (undo)

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

@@ -1075,6 +1075,20 @@ _Returns_
 
 -   `Object`: Action object.
 
+<a name="resetSelection" href="#resetSelection">#</a> **resetSelection**
+
+Returns an action object used in signalling that selection state should be
+reset to the specified selection.
+
+_Parameters_
+
+-   _selectionStart_ `WPBlockSelection`: The selection start.
+-   _selectionEnd_ `WPBlockSelection`: The selection end.
+
+_Returns_
+
+-   `Object`: Action object.
+
 <a name="selectBlock" href="#selectBlock">#</a> **selectBlock**
 
 Returns an action object used in signalling that the block with the

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

@@ -359,6 +359,30 @@ _Returns_
 
 -   `Array`: Block list.
 
+<a name="getEditorSelectionEnd" href="#getEditorSelectionEnd">#</a> **getEditorSelectionEnd**
+
+Returns the current selection end.
+
+_Parameters_
+
+-   _state_ `Object`: 
+
+_Returns_
+
+-   `WPBlockSelection`: The selection end.
+
+<a name="getEditorSelectionStart" href="#getEditorSelectionStart">#</a> **getEditorSelectionStart**
+
+Returns the current selection start.
+
+_Parameters_
+
+-   _state_ `Object`: 
+
+_Returns_
+
+-   `WPBlockSelection`: The selection start.
+
 <a name="getEditorSettings" href="#getEditorSettings">#</a> **getEditorSettings**
 
 Returns the post editor settings.

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

@@ -29,6 +29,9 @@ class BlockEditorProvider extends Component {
 			updateSettings,
 			value,
 			resetBlocks,
+			selectionStart,
+			selectionEnd,
+			resetSelection,
 			registry,
 		} = this.props;
 
@@ -58,6 +61,10 @@ class BlockEditorProvider extends Component {
 			this.isSyncingOutcomingValue = [];
 			this.isSyncingIncomingValue = value;
 			resetBlocks( value );
+
+			if ( selectionStart && selectionEnd ) {
+				resetSelection( selectionStart, selectionEnd );
+			}
 		}
 	}
 
@@ -86,6 +93,8 @@ class BlockEditorProvider extends Component {
 
 		const {
 			getBlocks,
+			getSelectionStart,
+			getSelectionEnd,
 			isLastBlockChangePersistent,
 			__unstableIsLastBlockChangeIgnored,
 		} = registry.select( 'core/block-editor' );
@@ -128,10 +137,13 @@ class BlockEditorProvider extends Component {
 				blocks = newBlocks;
 				isPersistent = newIsPersistent;
 
+				const selectionStart = getSelectionStart();
+				const selectionEnd = getSelectionEnd();
+
 				if ( isPersistent ) {
-					onChange( blocks );
+					onChange( blocks, { selectionStart, selectionEnd } );
 				} else {
-					onInput( blocks );
+					onInput( blocks, { selectionStart, selectionEnd } );
 				}
 			}
 		} );
@@ -150,11 +162,13 @@ export default compose( [
 		const {
 			updateSettings,
 			resetBlocks,
+			resetSelection,
 		} = dispatch( 'core/block-editor' );
 
 		return {
 			updateSettings,
 			resetBlocks,
+			resetSelection,
 		};
 	} ),
 ] )( BlockEditorProvider );

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

@@ -48,6 +48,31 @@ export function resetBlocks( blocks ) {
 	};
 }
 
+/**
+ * @typedef {WPBlockSelection} A block selection object.
+ *
+ * @property {string} clientId     A block client ID.
+ * @property {string} attributeKey A block attribute key.
+ * @property {number} offset       A block attribute offset.
+ */
+
+/**
+ * Returns an action object used in signalling that selection state should be
+ * reset to the specified selection.
+ *
+ * @param {WPBlockSelection} selectionStart The selection start.
+ * @param {WPBlockSelection} selectionEnd   The selection end.
+ *
+ * @return {Object} Action object.
+ */
+export function resetSelection( selectionStart, selectionEnd ) {
+	return {
+		type: 'RESET_SELECTION',
+		selectionStart,
+		selectionEnd,
+	};
+}
+
 /**
  * Returns an action object used in signalling that blocks have been received.
  * Unlike resetBlocks, these should be appended to the existing known set, not

packages/core-data/src/entities.js

@@ -36,7 +36,11 @@ function* loadPostTypeEntities() {
 			kind: 'postType',
 			baseURL: '/wp/v2/' + postType.rest_base,
 			name,
-			transientEdits: { blocks: true },
+			transientEdits: {
+				blocks: true,
+				selectionStart: true,
+				selectionEnd: true,
+			},
 			mergedEdits: { meta: true },
 		};
 	} );