Reverted change in createContextTree()

packages/ckeditor5-engine/src/conversion/upcastdispatcher.js

@@ -10,7 +10,6 @@
 import ViewConsumable from './viewconsumable';
 import ModelRange from '../model/range';
 import ModelPosition from '../model/position';
-import RootElement from '../model/rootelement';
 import { SchemaContext } from '../model/schema';
 
 import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
@@ -495,13 +494,10 @@ function createContextTree( contextDefinition, writer ) {
 			attributes[ key ] = item.getAttribute( key );
 		}
 
-		let current;
+		const current = writer.createElement( item.name, attributes );
 
 		if ( position ) {
-			current = writer.createElement( item.name, attributes );
 			writer.append( current, position );
-		} else {
-			current = new RootElement( null, item.name );
 		}
 
 		position = ModelPosition._createAt( current, 0 );

packages/ckeditor5-engine/src/model/rootelement.js

@@ -68,14 +68,11 @@ export default class RootElement extends Element {
 	 * Assuming that the object being checked is an element, you can also check its
 	 * {@link module:engine/model/element~Element#name name}:
 	 *
-	 *		rootElement.is( '$root' ); // -> true if this is a $root element
 	 *		rootElement.is( 'rootElement', '$root' ); // -> same as above
-	 *		text.is( '$root' ); -> false
 	 *
 	 * {@link module:engine/model/node~Node#is Check the entire list of model objects} which implement the `is()` method.
 	 *
-	 * @param {String} type Type to check when `name` parameter is present.
-	 * Otherwise, it acts like the `name` parameter.
+	 * @param {String} type Type to check.
 	 * @param {String} [name] Element name.
 	 * @returns {Boolean}
 	 */
@@ -84,7 +81,6 @@ export default class RootElement extends Element {
 			return type === 'rootElement' || type === 'model:rootElement' ||
 				// From super.is(). This is highly utilised method and cannot call super. See ckeditor/ckeditor5#6529.
 				type === 'element' || type === 'model:element' ||
-				type === this.name || type === 'model:' + this.name ||
 				type === 'node' || type === 'model:node';
 		}
 

packages/ckeditor5-engine/src/view/rooteditableelement.js

@@ -61,8 +61,7 @@ export default class RootEditableElement extends EditableElement {
 	 *
 	 * {@link module:engine/view/node~Node#is Check the entire list of view objects} which implement the `is()` method.
 	 *
-	 * @param {String} type Type to check when `name` parameter is present.
-	 * Otherwise, it acts like the `name` parameter.
+	 * @param {String} type Type to check.
 	 * @param {String} [name] Element name.
 	 * @returns {Boolean}
 	 */
@@ -72,7 +71,6 @@ export default class RootEditableElement extends EditableElement {
 				// From super.is(). This is highly utilised method and cannot call super. See ckeditor/ckeditor5#6529.
 				type === 'editableElement' || type === 'view:editableElement' ||
 				type === 'containerElement' || type === 'view:containerElement' ||
-				type === this.name || type === 'view:' + this.name ||
 				type === 'element' || type === 'view:element' ||
 				type === 'node' || type === 'view:node';
 		} else {

packages/ckeditor5-engine/tests/model/rootelement.js

@@ -37,8 +37,6 @@ describe( 'RootElement', () => {
 			expect( root.is( 'model:element', '$root' ) ).to.be.true;
 			expect( root.is( 'element' ) ).to.be.true;
 			expect( root.is( 'model:element' ) ).to.be.true;
-			expect( root.is( '$root' ) ).to.be.true;
-			expect( root.is( 'model:$root' ) ).to.be.true;
 			expect( root.is( 'rootElement', '$root' ) ).to.be.true;
 			expect( root.is( 'model:rootElement', '$root' ) ).to.be.true;
 			expect( root.is( 'rootElement' ) ).to.be.true;
@@ -57,6 +55,10 @@ describe( 'RootElement', () => {
 			expect( root.is( '$textProxy' ) ).to.be.false;
 			expect( root.is( 'documentFragment' ) ).to.be.false;
 			expect( root.is( 'view:element' ) ).to.be.false;
+			expect( root.is( '$root' ) ).to.be.false;
+			expect( root.is( 'model:$root' ) ).to.be.false;
+			expect( root.is( 'node', '$root' ) ).to.be.false;
+			expect( root.is( 'model:node', '$root' ) ).to.be.false;
 		} );
 	} );
 } );

packages/ckeditor5-engine/tests/view/rooteditableelement.js

@@ -66,8 +66,6 @@ describe( 'RootEditableElement', () => {
 			expect( el.is( 'view:element' ) ).to.be.true;
 			expect( el.is( 'element', 'div' ) ).to.be.true;
 			expect( el.is( 'view:element', 'div' ) ).to.be.true;
-			expect( el.is( 'element', 'div' ) ).to.be.true;
-			expect( el.is( 'view:div' ) ).to.be.true;
 		} );
 
 		it( 'should return false for other accept values', () => {
@@ -87,6 +85,10 @@ describe( 'RootEditableElement', () => {
 			expect( el.is( 'emptyElement' ) ).to.be.false;
 			expect( el.is( 'documentFragment' ) ).to.be.false;
 			expect( el.is( 'model:rootElement' ) ).to.be.false;
+			expect( el.is( 'div' ) ).to.be.false;
+			expect( el.is( 'view:div' ) ).to.be.false;
+			expect( el.is( 'node', 'div' ) ).to.be.false;
+			expect( el.is( 'view:node', 'div' ) ).to.be.false;
 		} );
 	} );
 

packages/ckeditor5-heading/src/title.js

@@ -429,7 +429,7 @@ function dataViewModelH1Insertion( evt, data, conversionApi ) {
 	const modelCursor = data.modelCursor;
 	const viewItem = data.viewItem;
 
-	if ( !modelCursor.isAtStart || !modelCursor.parent.is( '$root' ) ) {
+	if ( !modelCursor.isAtStart || !modelCursor.parent.is( 'element', '$root' ) ) {
 		return;
 	}
 

packages/ckeditor5-horizontal-line/src/horizontallinecommand.js

@@ -108,7 +108,7 @@ function getInsertHorizontalLineParent( selection, model ) {
 
 	const parent = insertAt.parent;
 
-	if ( parent.isEmpty && !parent.is( '$root' ) ) {
+	if ( parent.isEmpty && !parent.is( 'element', '$root' ) ) {
 		return parent.parent;
 	}
 

packages/ckeditor5-image/src/image/utils.js

@@ -161,7 +161,7 @@ function getInsertImageParent( selection, model ) {
 
 	const parent = insertAt.parent;
 
-	if ( parent.isEmpty && !parent.is( '$root' ) ) {
+	if ( parent.isEmpty && !parent.is( 'element', '$root' ) ) {
 		return parent.parent;
 	}
 

packages/ckeditor5-page-break/src/pagebreakcommand.js

@@ -107,7 +107,7 @@ function getInsertPageBreakParent( selection, model ) {
 
 	const parent = insertAt.parent;
 
-	if ( parent.isEmpty && !parent.is( '$root' ) ) {
+	if ( parent.isEmpty && !parent.is( 'element', '$root' ) ) {
 		return parent.parent;
 	}