Rework solution to use special core/nextpage block which means format…

…ting does not get removed during raw-handling transforms
mpkelly · Nov 6, 2023 · cd0bcc2 · cd0bcc2
1 parent c2c6e11
commit cd0bcc2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/packages/blocks/src/api/raw-handling/nested-list-converted.js b/packages/blocks/src/api/raw-handling/nested-list-converted.js
@@ -1,7 +1,3 @@
-/**
- * Internal dependencies
- */
-
 function isList( node ) {
 	return node.nodeName === 'OL' || node.nodeName === 'UL';
 }
@@ -10,6 +6,22 @@ function createLineBreak( doc ) {
 	return doc.createElement( 'br' );
 }
 
+function getDepth( listNode, depth = 2 ) {
+	if ( isList( listNode.parentElement ) ) {
+		return getDepth( listNode.parentElement, depth + 2 );
+	}
+	return depth;
+}
+
+function createSpace( length ) {
+	return (
+		Array.from( { length } )
+			// eslint-disable-next-line no-unused-vars
+			.map( ( i ) => `\u00A0\u00A0` )
+			.join( ' ' )
+	);
+}
+
 function createBullet( doc, child, isNested ) {
 	const node = doc.createElement( 'pre' );
 	const isOrdered = child.parentElement.nodeName === 'OL';
@@ -22,7 +34,9 @@ function createBullet( doc, child, isNested ) {
 		bullet = `${ index + 1 }. `;
 	}
 	if ( isNested ) {
-		bullet = `  ${ bullet }`;
+		const space = createSpace( getDepth( child.parentElement ) );
+
+		bullet = `${ space }${ bullet }`;
 	}
 	node.innerText = bullet;
 	return node;
@@ -47,7 +61,8 @@ export default function nestedListedConverter( node, doc ) {
 	if ( isList( node ) ) {
 		const nodes = transformList( node );
 		if ( nodes.length ) {
-			const wrapper = doc.createElement( 'p' );
+			const wrapper = doc.createElement( 'wp-block' );
+			wrapper.dataset.block = 'core/nextpage';
 			nodes.forEach( ( child ) => {
 				wrapper.appendChild( child );
 			} );

diff --git a/packages/blocks/src/api/raw-handling/paste-handler.js b/packages/blocks/src/api/raw-handling/paste-handler.js
@@ -51,6 +51,7 @@ function filterInlineHTML( HTML, preserveWhiteSpace ) {
 	HTML = deepFilterHTML( HTML, [
 		headRemover,
 		googleDocsUIDRemover,
+		nestedListedConverter,
 		msListIgnore,
 		phrasingContentReducer,
 		commentRemover,