Merge pull request #13859 from ckeditor/ck/13858

Fix (list): ListPropertiesEditing should not crash if there was a list in an image caption element. Closes #13858.
ckeditor · Apr 12, 2023 · 8162741 · 8162741
2 parents 7d5ad28 + 767db45
commit 8162741
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/packages/ckeditor5-list/src/listproperties/listpropertiesediting.ts b/packages/ckeditor5-list/src/listproperties/listpropertiesediting.ts
@@ -372,8 +372,13 @@ function createAttributeStrategies( enabledProperties: ListPropertiesConfig ) {
 function upcastListItemAttributes( attributeStrategies: Array<AttributeStrategy> ) {
 	return ( dispatcher: UpcastDispatcher ) => {
 		dispatcher.on<UpcastElementEvent>( 'element:li', ( evt, data, conversionApi ) => {
+			// https://github.com/ckeditor/ckeditor5/issues/13858
+			if ( !data.modelRange ) {
+				return;
+			}
+
 			const listParent = data.viewItem.parent as ViewElement;
-			const listItem = data.modelRange!.start.nodeAfter || data.modelRange!.end.nodeBefore;
+			const listItem = data.modelRange.start.nodeAfter || data.modelRange.end.nodeBefore;
 
 			for ( const strategy of attributeStrategies ) {
 				if ( strategy.appliesToListItem( listItem! ) ) {

diff --git a/packages/ckeditor5-list/tests/listproperties/listpropertiesediting.js b/packages/ckeditor5-list/tests/listproperties/listpropertiesediting.js
@@ -5405,6 +5405,25 @@ describe( 'ListPropertiesEditing', () => {
 						'</listItem>'
 					);
 				} );
+
+				// https://github.com/ckeditor/ckeditor5/issues/13858
+				it( 'should not convert if the schema does not allow it in the given context', () => {
+					editor.model.schema.register( 'disallowedContext', {
+						inheritAllFrom: '$blockObject'
+					} );
+
+					editor.conversion.elementToElement( {
+						model: 'disallowedContext',
+						view: {
+							name: 'div',
+							classes: 'disallowed-context'
+						}
+					} );
+
+					editor.setData( '<div class="disallowed-context"><ul><li>foo</li></ul></div>' );
+
+					expect( getModelData( editor.model ) ).to.equal( '[<disallowedContext></disallowedContext>]' );
+				} );
 			} );
 		} );