Lighter block DOM: List (#20498)

* Lighter block DOM: List * Fix space key
WordPress · Mar 4, 2020 · e69f2ab · e69f2ab
1 parent 2446adb
commit e69f2ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/block-list/block-wrapper.js b/packages/block-editor/src/components/block-list/block-wrapper.js
@@ -219,7 +219,7 @@ const BlockComponent = forwardRef(
 	}
 );
 
-const elements = [ 'p', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ];
+const elements = [ 'p', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul' ];
 
 const ExtendedBlockComponent = elements.reduce( ( acc, element ) => {
 	acc[ element ] = forwardRef( ( props, ref ) => {

diff --git a/packages/block-library/src/list/edit.js b/packages/block-library/src/list/edit.js
@@ -7,6 +7,7 @@ import {
 	RichText,
 	BlockControls,
 	RichTextShortcut,
+	__experimentalBlock as Block,
 } from '@wordpress/block-editor';
 import { ToolbarGroup } from '@wordpress/components';
 import {
@@ -146,7 +147,8 @@ export default function ListEdit( {
 			<RichText
 				identifier="values"
 				multiline="li"
-				tagName={ tagName }
+				__unstableMultilineRootTag={ tagName }
+				tagName={ Block[ tagName ] }
 				onChange={ ( nextValues ) =>
 					setAttributes( { values: nextValues } )
 				}

diff --git a/packages/block-library/src/list/index.js b/packages/block-library/src/list/index.js
@@ -28,6 +28,7 @@ export const settings = {
 	supports: {
 		className: false,
 		__unstablePasteTextInline: true,
+		lightBlockWrapper: true,
 	},
 	example: {
 		attributes: {

diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
@@ -769,7 +769,10 @@ class RichText extends Component {
 	 */
 	handleSpace( event ) {
 		const { keyCode, shiftKey, altKey, metaKey, ctrlKey } = event;
-		const { tagName, __unstableMultilineTag: multilineTag } = this.props;
+		const {
+			__unstableMultilineRootTag: multilineRootTag,
+			__unstableMultilineTag: multilineTag,
+		} = this.props;
 
 		if (
 			// Only override when no modifiers are pressed.
@@ -797,7 +800,7 @@ class RichText extends Component {
 			return;
 		}
 
-		this.onChange( indentListItems( value, { type: tagName } ) );
+		this.onChange( indentListItems( value, { type: multilineRootTag } ) );
 		event.preventDefault();
 	}