RichText/Patterns/Input Interaction: allow undo of patterns with BACK…

…SPACE and ESC

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

@@ -20,6 +20,18 @@ _Returns_
 
 -   `boolean`: Whether the given block type is allowed to be inserted.
 
+<a name="didAutomaticChange" href="#didAutomaticChange">#</a> **didAutomaticChange**
+
+Returns true if the last change was an automatic change, false otherwise.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `boolean`: Whether the last change was automatic.
+
 <a name="getAdjacentBlockClientId" href="#getAdjacentBlockClientId">#</a> **getAdjacentBlockClientId**
 
 Returns the client ID of the block adjacent one at the given reference

packages/block-editor/src/components/rich-text/index.js

@@ -64,6 +64,7 @@ class RichTextWrapper extends Component {
 		this.onPaste = this.onPaste.bind( this );
 		this.onDelete = this.onDelete.bind( this );
 		this.inputRule = this.inputRule.bind( this );
+		this.markAutomaticChange = this.markAutomaticChange.bind( this );
 	}
 
 	onEnter( { value, onChange, shiftKey } ) {
@@ -81,6 +82,7 @@ class RichTextWrapper extends Component {
 				onReplace( [
 					transformation.transform( { content: value.text } ),
 				] );
+				this.markAutomaticChange();
 			}
 		}
 
@@ -273,6 +275,7 @@ class RichTextWrapper extends Component {
 		const block = transformation.transform( content );
 
 		onReplace( [ block ] );
+		this.markAutomaticChange();
 	}
 
 	getAllowedFormats() {
@@ -293,6 +296,16 @@ class RichTextWrapper extends Component {
 		return formattingControls.map( ( name ) => `core/${ name }` );
 	}
 
+	/**
+	 * Marks the last change as an automatic change at the next idle period to
+	 * ensure all selection changes have been recorded.
+	 */
+	markAutomaticChange() {
+		window.requestIdleCallback( () => {
+			this.props.markAutomaticChange();
+		} );
+	}
+
 	render() {
 		const {
 			children,
@@ -313,6 +326,10 @@ class RichTextWrapper extends Component {
 			onExitFormattedText,
 			isSelected: originalIsSelected,
 			onCreateUndoLevel,
+			// eslint-disable-next-line no-unused-vars
+			markAutomaticChange,
+			didAutomaticChange,
+			undo,
 			placeholder,
 			// eslint-disable-next-line no-unused-vars
 			allowedFormats,
@@ -375,6 +392,9 @@ class RichTextWrapper extends Component {
 				__unstableOnEnterFormattedText={ onEnterFormattedText }
 				__unstableOnExitFormattedText={ onExitFormattedText }
 				__unstableOnCreateUndoLevel={ onCreateUndoLevel }
+				__unstableMarkAutomaticChange={ this.markAutomaticChange }
+				__unstableDidAutomaticChange={ didAutomaticChange }
+				__unstableUndo={ undo }
 			>
 				{ ( { isSelected, value, onChange, Editable } ) =>
 					<>
@@ -435,6 +455,7 @@ const RichTextContainer = compose( [
 			getSelectionStart,
 			getSelectionEnd,
 			getSettings,
+			didAutomaticChange,
 		} = select( 'core/block-editor' );
 
 		const selectionStart = getSelectionStart();
@@ -453,6 +474,7 @@ const RichTextContainer = compose( [
 			selectionStart: isSelected ? selectionStart.offset : undefined,
 			selectionEnd: isSelected ? selectionEnd.offset : undefined,
 			isSelected,
+			didAutomaticChange: didAutomaticChange(),
 		};
 	} ),
 	withDispatch( ( dispatch, {
@@ -465,7 +487,9 @@ const RichTextContainer = compose( [
 			enterFormattedText,
 			exitFormattedText,
 			selectionChange,
+			__unstableMarkAutomaticChange,
 		} = dispatch( 'core/block-editor' );
+		const { undo } = dispatch( 'core/editor' );
 
 		return {
 			onCreateUndoLevel: __unstableMarkLastChangeAsPersistent,
@@ -474,6 +498,8 @@ const RichTextContainer = compose( [
 			onSelectionChange( start, end ) {
 				selectionChange( clientId, identifier, start, end );
 			},
+			markAutomaticChange: __unstableMarkAutomaticChange,
+			undo,
 		};
 	} ),
 	withFilters( 'experimentalRichText' ),

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

@@ -711,6 +711,20 @@ export function __unstableMarkLastChangeAsPersistent() {
 	return { type: 'MARK_LAST_CHANGE_AS_PERSISTENT' };
 }
 
+/**
+ * Returns an action object used in signalling that the last block change is
+ * an automatic change, meaning it was not performed by the user, and can be
+ * undone using the `Escape` and `Backspace` keys. This action must be called
+ * after the change was made, and any actions that are a consequence of it, so
+ * it is recommended to be called at the next idle period to ensure all
+ * selection changes have been recorded.
+ *
+ * @return {Object} Action object.
+ */
+export function __unstableMarkAutomaticChange() {
+	return { type: 'MARK_AUTOMATIC_CHANGE' };
+}
+
 /**
  * Returns an action object used to enable or disable the navigation mode.
  *

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

@@ -1251,6 +1251,18 @@ export function lastBlockAttributesChange( state, action ) {
 	return null;
 }
 
+/**
+ * Reducer returning automatic change state.
+ *
+ * @param {boolean} state  Current state.
+ * @param {Object}  action Dispatched action.
+ *
+ * @return {boolean} Updated state.
+ */
+export function didAutomaticChange( state, action ) {
+	return action.type === 'MARK_AUTOMATIC_CHANGE' ? true : false;
+}
+
 export default combineReducers( {
 	blocks,
 	isTyping,
@@ -1264,4 +1276,5 @@ export default combineReducers( {
 	preferences,
 	lastBlockAttributesChange,
 	isNavigationMode,
+	didAutomaticChange,
 } );

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

@@ -1415,3 +1415,14 @@ function getReusableBlocks( state ) {
 export function isNavigationMode( state ) {
 	return state.isNavigationMode;
 }
+
+/**
+ * Returns true if the last change was an automatic change, false otherwise.
+ *
+ * @param {Object} state Global application state.
+ *
+ * @return {boolean} Whether the last change was automatic.
+ */
+export function didAutomaticChange( state ) {
+	return state.didAutomaticChange;
+}

packages/e2e-tests/specs/__snapshots__/rich-text.test.js.snap

@@ -48,6 +48,10 @@ exports[`RichText should not lose selection direction 1`] = `
 <!-- /wp:paragraph -->"
 `;
 
+exports[`RichText should not undo backtick transform with backspace after selection change 1`] = `""`;
+
+exports[`RichText should not undo backtick transform with backspace after typing 1`] = `""`;
+
 exports[`RichText should only mutate text data on input 1`] = `
 "<!-- wp:paragraph -->
 <p>1<strong>2</strong>34</p>
@@ -77,3 +81,9 @@ exports[`RichText should update internal selection after fresh focus 1`] = `
 <p>1<strong>2</strong></p>
 <!-- /wp:paragraph -->"
 `;
+
+exports[`RichText should undo backtick transform with backspace 1`] = `
+"<!-- wp:paragraph -->
+<p>\`a\`</p>
+<!-- /wp:paragraph -->"
+`;

packages/e2e-tests/specs/blocks/__snapshots__/list.test.js.snap

@@ -200,6 +200,8 @@ exports[`List should not transform lines in block when transforming multiple blo
 <!-- /wp:list -->"
 `;
 
+exports[`List should not undo asterisk transform with backspace after typing 1`] = `""`;
+
 exports[`List should outdent with children 1`] = `
 "<!-- wp:list -->
 <ul><li>a<ul><li>b<ul><li>c</li></ul></li></ul></li></ul>
@@ -267,3 +269,17 @@ exports[`List should split into two with paragraph and merge lists 3`] = `
 <ul><li>two</li></ul>
 <!-- /wp:list -->"
 `;
+
+exports[`List should undo asterisk transform with backspace 1`] = `
+"<!-- wp:paragraph -->
+<p>* </p>
+<!-- /wp:paragraph -->"
+`;
+
+exports[`List should undo asterisk transform with backspace after selection change 1`] = `""`;
+
+exports[`List should undo asterisk transform with escape 1`] = `
+"<!-- wp:paragraph -->
+<p>* </p>
+<!-- /wp:paragraph -->"
+`;

packages/e2e-tests/specs/blocks/list.test.js

@@ -55,6 +55,47 @@ describe( 'List', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	it( 'should undo asterisk transform with backspace', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '* ' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		await page.keyboard.press( 'Backspace' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	it( 'should undo asterisk transform with escape', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '* ' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		await page.keyboard.press( 'Escape' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	it( 'should not undo asterisk transform with backspace after typing', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '* a' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		await page.keyboard.press( 'Backspace' );
+		await page.keyboard.press( 'Backspace' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	it( 'should undo asterisk transform with backspace after selection change', async () => {
+		await clickBlockAppender();
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '* ' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'Backspace' );
+
+		// Expect list to be deleted
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
 	it( 'can be created by typing "/list"', async () => {
 		// Create a list with the slash block shortcut.
 		await clickBlockAppender();

packages/e2e-tests/specs/rich-text.test.js

@@ -103,6 +103,42 @@ describe( 'RichText', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	it( 'should undo backtick transform with backspace', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '`a`' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		await page.keyboard.press( 'Backspace' );
+
+		// Expect "`a`" to be restored.
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	it( 'should not undo backtick transform with backspace after typing', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '`a`' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		await page.keyboard.type( 'b' );
+		await page.keyboard.press( 'Backspace' );
+		await page.keyboard.press( 'Backspace' );
+
+		// Expect "a" to be deleted.
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	it( 'should not undo backtick transform with backspace after selection change', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '`a`' );
+		await page.evaluate( () => new Promise( window.requestIdleCallback ) );
+		// Move inside format boundary.
+		await page.keyboard.press( 'ArrowLeft' );
+		await page.keyboard.press( 'ArrowLeft' );
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'Backspace' );
+
+		// Expect "a" to be deleted.
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
 	it( 'should not format text after code backtick', async () => {
 		await clickBlockAppender();
 		await page.keyboard.type( 'A `backtick` and more.' );

packages/rich-text/src/component/index.js

@@ -12,7 +12,7 @@ import {
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { BACKSPACE, DELETE, ENTER, LEFT, RIGHT, SPACE } from '@wordpress/keycodes';
+import { BACKSPACE, DELETE, ENTER, LEFT, RIGHT, SPACE, ESCAPE } from '@wordpress/keycodes';
 import { withSelect } from '@wordpress/data';
 import { withSafeTimeout, compose } from '@wordpress/compose';
 import isShallowEqual from '@wordpress/is-shallow-equal';
@@ -365,6 +365,7 @@ class RichText extends Component {
 		if ( transformed !== change ) {
 			this.onCreateUndoLevel();
 			this.onChange( { ...transformed, activeFormats } );
+			this.props.__unstableMarkAutomaticChange();
 		}
 
 		// Create an undo level when input stops for over a second.
@@ -518,7 +519,17 @@ class RichText extends Component {
 	handleDelete( event ) {
 		const { keyCode } = event;
 
-		if ( keyCode !== DELETE && keyCode !== BACKSPACE ) {
+		if ( keyCode !== DELETE && keyCode !== BACKSPACE && keyCode !== ESCAPE ) {
+			return;
+		}
+
+		if ( this.props.__unstableDidAutomaticChange ) {
+			event.preventDefault();
+			this.props.__unstableUndo();
+			return;
+		}
+
+		if ( keyCode === ESCAPE ) {
 			return;
 		}