Remove BR logic from list block

WordPress · Jan 14, 2018 · ae9b07f · ae9b07f
1 parent 8ac6cc8
commit ae9b07f
Showing 1 changed file with 3 additions and 57 deletions.
diff --git a/blocks/library/list/index.js b/blocks/library/list/index.js
@@ -6,7 +6,7 @@ import { find, compact, get, initial, last, isEmpty } from 'lodash';
 /**
  * WordPress dependencies
  */
-import { Component, createElement, Children } from '@wordpress/element';
+import { Component, createElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -17,60 +17,6 @@ import { registerBlockType, createBlock } from '../../api';
 import Editable from '../../editable';
 import BlockControls from '../../block-controls';
 
-const fromBrDelimitedContent = ( content ) => {
-	if ( undefined === content ) {
-		// converting an empty block to a list block
-		return content;
-	}
-	const listItems = [];
-	listItems.push( createElement( 'li', [], [] ) );
-	content.forEach( function( element, elementIndex, elements ) {
-		// "split" the incoming content on 'br' elements
-		if ( 'br' === element.type && elementIndex < elements.length - 1 ) {
-			// if is br and there are more elements to come, push a new list item
-			listItems.push( createElement( 'li', [], [] ) );
-		} else {
-			listItems[ listItems.length - 1 ].props.children.push( element );
-		}
-	} );
-	return listItems;
-};
-
-const toBrDelimitedContent = ( values ) => {
-	if ( undefined === values ) {
-		// converting an empty list
-		return values;
-	}
-	const content = [];
-	values.forEach( function( li, liIndex, listItems ) {
-		if ( typeof li === 'string' ) {
-			content.push( li );
-			return;
-		}
-
-		Children.toArray( li.props.children ).forEach( function( element, elementIndex, liChildren ) {
-			if ( 'ul' === element.type || 'ol' === element.type ) { // lists within lists
-				// we know we've just finished processing a list item, so break the text
-				content.push( createElement( 'br' ) );
-				// push each element from the child list's converted content
-				content.push.apply( content, toBrDelimitedContent( Children.toArray( element.props.children ) ) );
-				// add a break if there are more list items to come, because the recursive call won't
-				// have added it when it finished processing the child list because it thinks the content ended
-				if ( liIndex !== listItems.length - 1 ) {
-					content.push( createElement( 'br' ) );
-				}
-			} else {
-				content.push( element );
-				if ( elementIndex === liChildren.length - 1 && liIndex !== listItems.length - 1 ) {
-					// last element in this list item, but not last element overall
-					content.push( createElement( 'br' ) );
-				}
-			}
-		} );
-	} );
-	return content;
-};
-
 registerBlockType( 'core/list', {
 	title: __( 'List' ),
 	description: __( 'List. Numbered or bulleted.' ),
@@ -138,7 +84,7 @@ registerBlockType( 'core/list', {
 				transform: ( { content } ) => {
 					return createBlock( 'core/list', {
 						nodeName: 'UL',
-						values: fromBrDelimitedContent( content ),
+						values: [ <li key="1">{ content }</li> ],
 					} );
 				},
 			},
@@ -148,7 +94,7 @@ registerBlockType( 'core/list', {
 				transform: ( { content } ) => {
 					return createBlock( 'core/list', {
 						nodeName: 'OL',
-						values: fromBrDelimitedContent( content ),
+						values: [ <li key="1">{ content }</li> ],
 					} );
 				},
 			},