Make it possible to undo prefix transforms

docs/block-api.md

@@ -124,18 +124,18 @@ Block styles can be used to provide alternative styles to block. It works by add
 // Register block styles.
 styles: [
 	// Mark style as default.
-	{ 
-		name: 'default', 
-		label: __( 'Rounded' ), 
-		isDefault: true 
+	{
+		name: 'default',
+		label: __( 'Rounded' ),
+		isDefault: true
 	},
-	{ 
-		name: 'outline', 
-		label: __( 'Outline' ) 
+	{
+		name: 'outline',
+		label: __( 'Outline' )
 	},
-	{ 
-		name: 'squared', 
-		label: __( 'Squared' ) 
+	{
+		name: 'squared',
+		label: __( 'Squared' )
 	},
 ],
 ```
@@ -413,6 +413,43 @@ transforms: {
 ```
 {% end %}
 
+A prefix transform is a transform that will be applied if the user prefixes some text in e.g. the paragraph block with a given pattern and a trailing space.
+
+{% codetabs %}
+{% ES5 %}
+```js
+transforms: {
+    from: [
+        {
+            type: 'prefix',
+            prefix: '?',
+            transform: function( content ) {
+                return createBlock( 'my-plugin/question', {
+                    content,
+                } );
+            },
+        },
+    ]
+}
+```
+{% ESNext %}
+```js
+transforms: {
+    from: [
+        {
+            type: 'prefix',
+            prefix: '?',
+            transform( content ) {
+                return createBlock( 'my-plugin/question', {
+                    content,
+                } );
+            },
+        },
+    ]
+}
+```
+{% end %}
+
 
 #### parent (optional)
 

packages/block-library/src/code/index.js

@@ -39,8 +39,7 @@ export const settings = {
 	transforms: {
 		from: [
 			{
-				type: 'pattern',
-				trigger: 'enter',
+				type: 'enter',
 				regExp: /^```$/,
 				transform: () => createBlock( 'core/code' ),
 			},

packages/block-library/src/heading/index.js

@@ -107,18 +107,16 @@ export const settings = {
 					} );
 				},
 			},
-			{
-				type: 'pattern',
-				regExp: /^(#{2,6})\s/,
-				transform: ( { content, match } ) => {
-					const level = match[ 1 ].length;
-
+			...[ 2, 3, 4, 5, 6 ].map( ( level ) => ( {
+				type: 'prefix',
+				prefix: Array( level + 1 ).join( '#' ),
+				transform( content ) {
 					return createBlock( 'core/heading', {
 						level,
 						content,
 					} );
 				},
-			},
+			} ) ),
 		],
 		to: [
 			{

packages/block-library/src/list/index.js

@@ -110,25 +110,25 @@ export const settings = {
 					} );
 				},
 			},
-			{
-				type: 'pattern',
-				regExp: /^[*-]\s/,
-				transform: ( { content } ) => {
+			...[ '*', '-' ].map( ( prefix ) => ( {
+				type: 'prefix',
+				prefix,
+				transform( content ) {
 					return createBlock( 'core/list', {
 						values: `<li>${ content }</li>`,
 					} );
 				},
-			},
-			{
-				type: 'pattern',
-				regExp: /^1[.)]\s/,
-				transform: ( { content } ) => {
+			} ) ),
+			...[ '1.', '1)' ].map( ( prefix ) => ( {
+				type: 'prefix',
+				prefix,
+				transform( content ) {
 					return createBlock( 'core/list', {
 						ordered: true,
 						values: `<li>${ content }</li>`,
 					} );
 				},
-			},
+			} ) ),
 		],
 		to: [
 			{

packages/block-library/src/quote/index.js

@@ -90,9 +90,9 @@ export const settings = {
 				} ),
 			},
 			{
-				type: 'pattern',
-				regExp: /^>\s/,
-				transform: ( { content } ) => {
+				type: 'prefix',
+				prefix: '>',
+				transform: ( content ) => {
 					return createBlock( 'core/quote', {
 						value: `<p>${ content }</p>`,
 					} );

packages/block-library/src/separator/index.js

@@ -27,8 +27,7 @@ export const settings = {
 	transforms: {
 		from: [
 			{
-				type: 'pattern',
-				trigger: 'enter',
+				type: 'enter',
 				regExp: /^-{3,}$/,
 				transform: () => createBlock( 'core/separator' ),
 			},

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

@@ -111,12 +111,11 @@ export class RichText extends Component {
 		this.savedContent = value;
 		this.patterns = getPatterns( {
 			onReplace,
-			multilineTag: this.multilineTag,
+			onCreateUndoLevel: this.onCreateUndoLevel,
 			valueToFormat: this.valueToFormat,
 		} );
-		this.enterPatterns = getBlockTransforms( 'from' ).filter( ( { type, trigger } ) =>
-			type === 'pattern' && trigger === 'enter'
-		);
+		this.enterPatterns = getBlockTransforms( 'from' )
+			.filter( ( { type } ) => type === 'enter' );
 
 		this.state = {};
 

packages/editor/src/components/rich-text/patterns.js

@@ -1,50 +1,51 @@
-/**
- * External dependencies
- */
-import { filter } from 'lodash';
-
 /**
  * WordPress dependencies
  */
 import { getBlockTransforms, findTransform } from '@wordpress/blocks';
-import { remove, applyFormat, getTextContent } from '@wordpress/rich-text';
-
-export function getPatterns( { onReplace, multiline, valueToFormat } ) {
-	const patterns = filter( getBlockTransforms( 'from' ), ( { type, trigger } ) => {
-		return type === 'pattern' && trigger === undefined;
-	} );
+import {
+	remove,
+	applyFormat,
+	getTextContent,
+	getSelectionStart,
+	slice,
+} from '@wordpress/rich-text';
+
+export function getPatterns( { onReplace, valueToFormat, onCreateUndoLevel } ) {
+	const prefixTransforms = getBlockTransforms( 'from' )
+		.filter( ( { type } ) => type === 'prefix' );
 
 	return [
 		( record ) => {
 			if ( ! onReplace ) {
 				return record;
 			}
 
+			const start = getSelectionStart( record );
 			const text = getTextContent( record );
-			const transformation = findTransform( patterns, ( item ) => {
-				return item.regExp.test( text );
+			const characterBefore = text.slice( start - 1, start );
+
+			if ( ! /\s/.test( characterBefore ) ) {
+				return record;
+			}
+
+			const trimmedTextBefore = text.slice( 0, start ).trim();
+			const transformation = findTransform( prefixTransforms, ( { prefix } ) => {
+				return trimmedTextBefore === prefix;
 			} );
 
 			if ( ! transformation ) {
 				return record;
 			}
 
-			const result = text.match( transformation.regExp );
-
-			const block = transformation.transform( {
-				content: valueToFormat( remove( record, 0, result[ 0 ].length ) ),
-				match: result,
-			} );
+			const content = valueToFormat( slice( record, start, text.length ) );
+			const block = transformation.transform( content );
 
+			onCreateUndoLevel();
 			onReplace( [ block ] );
 
 			return record;
 		},
 		( record ) => {
-			if ( multiline ) {
-				return record;
-			}
-
 			const text = getTextContent( record );
 
 			// Quick check the text for the necessary character.

test/e2e/specs/blocks/__snapshots__/code.test.js.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Code can be created by three backticks and enter 1`] = `
+"<!-- wp:code -->
+<pre class=\\"wp-block-code\\"><code>&lt;?php</code></pre>
+<!-- /wp:code -->"
+`;

test/e2e/specs/blocks/__snapshots__/heading.test.js.snap

@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Separator can be created by prefixing existing content with number signs and a space 1`] = `
+"<!-- wp:heading {\\"level\\":4} -->
+<h4>4</h4>
+<!-- /wp:heading -->"
+`;
+
+exports[`Separator can be created by prefixing number sign and a space 1`] = `
+"<!-- wp:heading {\\"level\\":3} -->
+<h3>3</h3>
+<!-- /wp:heading -->"
+`;

test/e2e/specs/blocks/__snapshots__/list.test.js.snap

@@ -74,6 +74,12 @@ exports[`List can be created by using an asterisk at the start of a paragraph bl
 <!-- /wp:list -->"
 `;
 
+exports[`List can undo asterisk transform 1`] = `
+"<!-- wp:list {\\"ordered\\":true} -->
+<ol><li>November</li></ol>
+<!-- /wp:list -->"
+`;
+
 exports[`List should create paragraph on split at end and merge back with content 1`] = `
 "<!-- wp:list -->
 <ul><li>one</li></ul>

test/e2e/specs/blocks/__snapshots__/separator.test.js.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Separator can be created by three dashes and enter 1`] = `
+"<!-- wp:separator -->
+<hr class=\\"wp-block-separator\\"/>
+<!-- /wp:separator -->"
+`;

test/e2e/specs/blocks/code.test.js

@@ -0,0 +1,23 @@
+/**
+ * Internal dependencies
+ */
+import {
+	clickBlockAppender,
+	getEditedPostContent,
+	newPost,
+} from '../../support/utils';
+
+describe( 'Code', () => {
+	beforeEach( async () => {
+		await newPost();
+	} );
+
+	it( 'can be created by three backticks and enter', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '```' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '<?php' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+} );

test/e2e/specs/blocks/heading.test.js

@@ -0,0 +1,30 @@
+/**
+ * Internal dependencies
+ */
+import {
+	clickBlockAppender,
+	getEditedPostContent,
+	newPost,
+} from '../../support/utils';
+
+describe( 'Separator', () => {
+	beforeEach( async () => {
+		await newPost();
+	} );
+
+	it( 'can be created by prefixing number sign and a space', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '### 3' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
+	it( 'can be created by prefixing existing content with number signs and a space', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '4' );
+		await page.keyboard.press( 'ArrowLeft' );
+		await page.keyboard.type( '#### ' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+} );

test/e2e/specs/blocks/list.test.js

@@ -9,6 +9,7 @@ import {
 	convertBlock,
 	pressWithModifier,
 	insertBlock,
+	META_KEY,
 } from '../../support/utils';
 
 describe( 'List', () => {
@@ -46,6 +47,15 @@ describe( 'List', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	it( 'can undo asterisk transform', async () => {
+		await clickBlockAppender();
+		await page.keyboard.type( '1. ' );
+		await pressWithModifier( META_KEY, 'z' );
+		await page.keyboard.type( 'November' );
+
+		expect( await getEditedPostContent() ).toMatchSnapshot();
+	} );
+
 	it( 'can be created by typing "/list"', async () => {
 		// Create a list with the slash block shortcut.
 		await clickBlockAppender();