Merge pull request #13771 from ckeditor/ck/13711-fix-handling-for-rtl…

…-lists-in-paste-from-office-plugin Fix (paste-from-office): Fix handling of bold text in RTL lists pasted from MS Word. Closes #13711.
ckeditor · Mar 28, 2023 · 3abb8df · 3abb8df
2 parents b90fc8a + 4977f17
commit 3abb8df
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/packages/ckeditor5-paste-from-office/src/filters/list.ts b/packages/ckeditor5-paste-from-office/src/filters/list.ts
@@ -261,7 +261,11 @@ function findListMarkerNode( element: ViewElement ): ViewText | null {
 			continue;
 		}
 
-		const textNodeOrElement = childNode.getChild( 0 )!;
+		const textNodeOrElement = childNode.getChild( 0 );
+
+		if ( !textNodeOrElement ) {
+			continue;
+		}
 
 		// If already found the marker element, use it.
 		if ( textNodeOrElement.is( '$text' ) ) {

diff --git a/packages/ckeditor5-paste-from-office/tests/filters/list.js b/packages/ckeditor5-paste-from-office/tests/filters/list.js
@@ -82,6 +82,28 @@ describe( 'PasteFromOffice - filters', () => {
 				expect( stringify( view ) ).to.equal( '' );
 			} );
 
+			it( 'handles RTL lists with bold item - #13711', () => {
+				const html = '<p dir=RTL style="mso-list:l0 level1 lfo1">' +
+					'<span dir=RTL></span>' +
+					'<b><span dir=LTR>Foo<o:p></o:p></span></b>' +
+				'</p>';
+
+				const view = htmlDataProcessor.toView( html );
+
+				transformListItemLikeElementsIntoLists( view, '@list l0:level1 { mso-level-number-format: bullet; }' );
+
+				expect( view.childCount ).to.equal( 1 );
+				expect( view.getChild( 0 ).name ).to.equal( 'ul' );
+				expect( stringify( view ) ).to.equal(
+					'<ul>' +
+						'<li dir="RTL" style="mso-list:l0 level1 lfo1">' +
+							'<span dir="RTL"></span>' +
+							'<b><span dir="LTR">Foo<o:p></o:p></span></b>' +
+						'</li>' +
+					'</ul>'
+				);
+			} );
+
 			describe( 'nesting', () => {
 				const level1 = 'style="mso-list:l0 level1 lfo0"';
 				const level2 = 'style="mso-list:l0 level2 lfo0"';