Merge pull request #1444 from ckeditor/t/1443

Fix: Attributes were incorrectly set on an element's children during upcast. Closes #1443.
ckeditor · Jun 25, 2018 · dfa0b39 · dfa0b39
2 parents ec70448 + d224f33
commit dfa0b39
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/src/conversion/upcast-converters.js b/src/conversion/upcast-converters.js
@@ -514,7 +514,7 @@ function _setAttributeOn( modelRange, modelAttribute, conversionApi ) {
 	let result = false;
 
 	// Set attribute on each item in range according to Schema.
-	for ( const node of Array.from( modelRange.getItems() ) ) {
+	for ( const node of Array.from( modelRange.getItems( { shallow: true } ) ) ) {
 		if ( conversionApi.schema.checkAttribute( node, modelAttribute.key ) ) {
 			conversionApi.writer.setAttribute( modelAttribute.key, modelAttribute.value, node );
 

diff --git a/tests/conversion/conversion.js b/tests/conversion/conversion.js
@@ -604,6 +604,28 @@ describe( 'Conversion', () => {
 
 				test( '<img src="foo.jpg"></img>', '<image source="foo.jpg"></image>' );
 			} );
+
+			// #1443.
+			it( 'should not set attributes on the element\'s children', () => {
+				schema.register( 'div', {
+					inheritAllFrom: '$root',
+					allowWhere: '$block',
+					isLimit: true,
+					allowAttributes: [ 'border', 'shade' ]
+				} );
+
+				conversion.elementToElement(
+					{ model: 'div', view: 'div' }
+				);
+
+				conversion.attributeToAttribute( { model: 'border', view: { key: 'class', value: 'border' } } );
+				conversion.attributeToAttribute( { model: 'shade', view: { key: 'class', value: 'shade' } } );
+
+				test(
+					'<div class="border"><div class="shade"></div></div>',
+					'<div border="border"><div shade="shade"></div></div>'
+				);
+			} );
 		} );
 
 		function test( input, expectedModel, expectedView = null ) {

diff --git a/tests/conversion/upcast-converters.js b/tests/conversion/upcast-converters.js
@@ -553,6 +553,33 @@ describe( 'upcast-helpers', () => {
 				'<image styled="true"></image>'
 			);
 		} );
+
+		// #1443.
+		it( 'should not set attributes on the element\'s children', () => {
+			schema.register( 'div', {
+				inheritAllFrom: '$root',
+				allowWhere: '$block',
+				isLimit: true,
+				allowAttributes: [ 'border', 'shade' ]
+			} );
+
+			conversion.for( 'upcast' ).add( upcastElementToElement( { view: 'div', model: 'div' } ) );
+
+			const shadeHelper = upcastAttributeToAttribute( { view: { key: 'class', value: 'shade' }, model: 'shade' } );
+			const borderHelper = upcastAttributeToAttribute( { view: { key: 'class', value: 'border' }, model: 'border' } );
+
+			conversion.for( 'upcast' ).add( shadeHelper );
+			conversion.for( 'upcast' ).add( borderHelper );
+
+			expectResult(
+				new ViewContainerElement(
+					'div',
+					{ class: 'border' },
+					new ViewContainerElement( 'div', { class: 'shade' } )
+				),
+				'<div border="border"><div shade="shade"></div></div>'
+			);
+		} );
 	} );
 
 	describe( 'upcastElementToMarker', () => {