8
0
Prechádzať zdrojové kódy

Merge branch 'master' into t/ckeditor5/645

Aleksander Nowodzinski 8 rokov pred
rodič
commit
cba551de8a

+ 3 - 3
packages/ckeditor5-typing/src/deletecommand.js

@@ -67,7 +67,7 @@ export default class DeleteCommand extends Command {
 		model.enqueueChange( this._buffer.batch, writer => {
 			this._buffer.lock();
 
-			const selection = Selection.createFromSelection( doc.selection );
+			const selection = new Selection( doc.selection );
 
 			// Do not replace the whole selected content if selection was collapsed.
 			// This prevents such situation:
@@ -104,7 +104,7 @@ export default class DeleteCommand extends Command {
 			model.deleteContent( selection, { doNotResetEntireContent } );
 			this._buffer.input( changeCount );
 
-			doc.selection.setRanges( selection.getRanges(), selection.isBackward );
+			writer.setSelection( selection );
 
 			this._buffer.unlock();
 		} );
@@ -178,6 +178,6 @@ export default class DeleteCommand extends Command {
 		writer.remove( Range.createIn( limitElement ) );
 		writer.insert( paragraph, limitElement );
 
-		selection.setCollapsedAt( paragraph );
+		writer.setSelection( paragraph );
 	}
 }

+ 2 - 2
packages/ckeditor5-typing/src/inputcommand.js

@@ -90,10 +90,10 @@ export default class InputCommand extends Command {
 			}
 
 			if ( resultRange ) {
-				doc.selection.setRanges( [ resultRange ] );
+				writer.setSelection( resultRange );
 			} else if ( isCollapsedRange ) {
 				// If range was collapsed just shift the selection by the number of inserted characters.
-				doc.selection.setCollapsedAt( range.start.getShiftedBy( textInsertions ) );
+				writer.setSelection( range.start.getShiftedBy( textInsertions ) );
 			}
 
 			this._buffer.unlock();

+ 41 - 474
packages/ckeditor5-typing/tests/input.js

@@ -1,17 +1,12 @@
-/*
+/**
  * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
-/* global document */
-
 import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
-import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/boldengine';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italicengine';
-import LinkEngine from '@ckeditor/ckeditor5-link/src/linkengine';
 import Input from '../src/input';
 
 import Writer from '@ckeditor/ckeditor5-engine/src/model/writer';
@@ -21,9 +16,7 @@ import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildv
 
 import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
 import ViewElement from '@ckeditor/ckeditor5-engine/src/view/element';
-import ViewContainerElement from '@ckeditor/ckeditor5-engine/src/view/containerelement';
 import ViewSelection from '@ckeditor/ckeditor5-engine/src/view/selection';
-import MutationObserver from '@ckeditor/ckeditor5-engine/src/view/observer/mutationobserver';
 
 import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
 import { getCode } from '@ckeditor/ckeditor5-utils/src/keyboard';
@@ -70,10 +63,10 @@ describe( 'Input feature', () => {
 	beforeEach( () => {
 		editor.setData( '<p>foobar</p>' );
 
-		model.change( () => {
-			model.document.selection.setRanges( [
+		model.change( writer => {
+			writer.setSelection(
 				ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 3, modelRoot.getChild( 0 ), 3 )
-			] );
+			);
 		} );
 	} );
 
@@ -271,7 +264,7 @@ describe( 'Input feature', () => {
 			// This test case emulates spellchecker correction.
 
 			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( viewRoot.getChild( 0 ).getChild( 0 ), 6 );
+			viewSelection.setTo( viewRoot.getChild( 0 ).getChild( 0 ), 6 );
 
 			view.fire( 'mutations',
 				[ {
@@ -291,7 +284,7 @@ describe( 'Input feature', () => {
 			// This test case emulates spellchecker correction.
 
 			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( viewRoot.getChild( 0 ).getChild( 0 ), 6 );
+			viewSelection.setTo( viewRoot.getChild( 0 ).getChild( 0 ), 6 );
 
 			testUtils.sinon.spy( Writer.prototype, 'insert' );
 			testUtils.sinon.spy( Writer.prototype, 'remove' );
@@ -315,7 +308,7 @@ describe( 'Input feature', () => {
 			editor.setData( '<p>Foo hous a</p>' );
 
 			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( viewRoot.getChild( 0 ).getChild( 0 ), 9 );
+			viewSelection.setTo( viewRoot.getChild( 0 ).getChild( 0 ), 9 );
 
 			view.fire( 'mutations',
 				[ {
@@ -336,7 +329,7 @@ describe( 'Input feature', () => {
 			editor.setData( '<p>Bar athat foo</p>' );
 
 			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( viewRoot.getChild( 0 ).getChild( 0 ), 8 );
+			viewSelection.setTo( viewRoot.getChild( 0 ).getChild( 0 ), 8 );
 
 			view.fire( 'mutations',
 				[ {
@@ -357,7 +350,7 @@ describe( 'Input feature', () => {
 			editor.setData( '<p>Foo hous e</p>' );
 
 			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( viewRoot.getChild( 0 ).getChild( 0 ), 9 );
+			viewSelection.setTo( viewRoot.getChild( 0 ).getChild( 0 ), 9 );
 
 			view.fire( 'mutations',
 				[ {
@@ -377,8 +370,8 @@ describe( 'Input feature', () => {
 			editor.setData( '<p>Foo house</p>' );
 
 			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( viewRoot.getChild( 0 ).getChild( 0 ), 8 );
-			viewSelection.moveFocusTo( viewRoot.getChild( 0 ).getChild( 0 ), 9 );
+			viewSelection.setTo( viewRoot.getChild( 0 ).getChild( 0 ), 8 );
+			viewSelection.setFocus( viewRoot.getChild( 0 ).getChild( 0 ), 9 );
 
 			view.fire( 'mutations',
 				[ {
@@ -395,10 +388,10 @@ describe( 'Input feature', () => {
 		} );
 
 		it( 'should replace last &nbsp; with space', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
+			model.change( writer => {
+				writer.setSelection(
 					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 6, modelRoot.getChild( 0 ), 6 )
-				] );
+				);
 			} );
 
 			view.fire( 'mutations', [
@@ -415,10 +408,10 @@ describe( 'Input feature', () => {
 		} );
 
 		it( 'should replace first &nbsp; with space', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
+			model.change( writer => {
+				writer.setSelection(
 					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 0, modelRoot.getChild( 0 ), 0 )
-				] );
+				);
 			} );
 
 			view.fire( 'mutations', [
@@ -435,10 +428,10 @@ describe( 'Input feature', () => {
 		} );
 
 		it( 'should replace all &nbsp; with spaces', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
+			model.change( writer => {
+				writer.setSelection(
 					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 6, modelRoot.getChild( 0 ), 6 )
-				] );
+				);
 			} );
 
 			view.fire( 'mutations', [
@@ -457,9 +450,9 @@ describe( 'Input feature', () => {
 
 	describe( 'keystroke handling', () => {
 		it( 'should remove contents', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			listenter.listenTo( view, 'keydown', () => {
@@ -491,9 +484,9 @@ describe( 'Input feature', () => {
 		} );
 
 		it( 'should do nothing on arrow key', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			view.fire( 'keydown', { keyCode: getCode( 'arrowdown' ) } );
@@ -502,9 +495,9 @@ describe( 'Input feature', () => {
 		} );
 
 		it( 'should do nothing on ctrl combinations', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			view.fire( 'keydown', { ctrlKey: true, keyCode: getCode( 'c' ) } );
@@ -513,9 +506,9 @@ describe( 'Input feature', () => {
 		} );
 
 		it( 'should do nothing on non printable keys', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			view.fire( 'keydown', { keyCode: 16 } ); // Shift
@@ -527,9 +520,9 @@ describe( 'Input feature', () => {
 
 		// #69
 		it( 'should do nothing on tab key', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			view.fire( 'keydown', { keyCode: 9 } ); // Tab
@@ -539,9 +532,9 @@ describe( 'Input feature', () => {
 
 		// #82
 		it( 'should do nothing on composition start key', () => {
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			view.fire( 'keydown', { keyCode: 229 } );
@@ -560,9 +553,9 @@ describe( 'Input feature', () => {
 			const lockSpy = testUtils.sinon.spy( buffer, 'lock' );
 			const unlockSpy = testUtils.sinon.spy( buffer, 'unlock' );
 
-			model.change( () => {
-				model.document.selection.setRanges( [
-					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) ] );
+			model.change( writer => {
+				writer.setSelection(
+					ModelRange.createFromParentsAndOffsets( modelRoot.getChild( 0 ), 2, modelRoot.getChild( 0 ), 4 ) );
 			} );
 
 			view.fire( 'keydown', { keyCode: getCode( 'y' ) } );
@@ -617,431 +610,5 @@ describe( 'Input feature', () => {
 			expect( getModelData( model ) ).to.equal( '<paragraph>fo[ob]ar</paragraph>' );
 		} );
 	} );
-
-	// NOTE: In all these tests we need to simulate the mutations. However, it's really tricky to tell what
-	// should be in "newChildren" because we don't have yet access to these nodes. We pass new instances,
-	// but this means that DomConverter which is used somewhere internally may return a different instance
-	// (which wouldn't happen in practice because it'd cache it). Besides, it's really hard to tell if the
-	// browser will keep the instances of the old elements when modifying the tree when the user is typing
-	// or if it will create new instances itself too.
-	// However, the code handling these mutations doesn't really care what's inside new/old children. It
-	// just needs the mutations common ancestor to understand how big fragment of the tree has changed.
-	describe( '#100', () => {
-		let domElement, domRoot;
-
-		beforeEach( () => {
-			domElement = document.createElement( 'div' );
-			document.body.appendChild( domElement );
-
-			return ClassicTestEditor.create( domElement, { plugins: [ Input, Paragraph, Bold, Italic, LinkEngine ] } )
-				.then( newEditor => {
-					editor = newEditor;
-					model = editor.model;
-					modelRoot = model.document.getRoot();
-					view = editor.editing.view;
-					viewRoot = view.getRoot();
-					domRoot = view.getDomRoot();
-
-					// Mock image feature.
-					newEditor.model.schema.register( 'image', { allowWhere: '$text' } );
-
-					buildModelConverter().for( newEditor.data.modelToView, newEditor.editing.modelToView )
-						.fromElement( 'image' )
-						.toElement( 'img' );
-
-					buildViewConverter().for( newEditor.data.viewToModel )
-						.fromElement( 'img' )
-						.toElement( 'image' );
-
-					// Disable MO completely and in a way it won't be reenabled on some Document#render() call.
-					const mutationObserver = view.getObserver( MutationObserver );
-
-					mutationObserver.disable();
-					mutationObserver.enable = () => {};
-				} );
-		} );
-
-		afterEach( () => {
-			domElement.remove();
-
-			return editor.destroy();
-		} );
-
-		// This happens when browser automatically switches parent and child nodes.
-		it( 'should handle mutations switching inner and outer node when adding new text node after', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text italic="true" linkHref="foo">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>text{}</i></a></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const link = paragraph.getChild( 0 );
-			const italic = link.getChild( 0 );
-			const text = italic.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<i><a href="foo">text</a>x</i>';
-			view.fire( 'mutations', [
-				// First mutation - remove all children from link element.
-				{
-					type: 'children',
-					node: link,
-					oldChildren: [ italic ],
-					newChildren: []
-				},
-
-				// Second mutation - remove link from paragraph and put italic there.
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ link ],
-					newChildren: [ new ViewElement( 'i' ) ]
-				},
-
-				// Third mutation - italic's new children.
-				{
-					type: 'children',
-					node: italic,
-					oldChildren: [ text ],
-					newChildren: [ new ViewElement( 'a', null, text.clone() ), new ViewText( 'x' ) ]
-				}
-			] );
-
-			expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>textx{}</i></a></p>' );
-		} );
-
-		it( 'should handle mutations switching inner and outer node when adding new text node before', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text italic="true" linkHref="foo">' +
-						'[]text' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>{}text</i></a></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const link = paragraph.getChild( 0 );
-			const italic = link.getChild( 0 );
-			const text = italic.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<i>x<a href="foo">text</a></i>';
-			view.fire( 'mutations', [
-				// First mutation - remove all children from link element.
-				{
-					type: 'children',
-					node: link,
-					oldChildren: [ italic ],
-					newChildren: []
-				},
-
-				// Second mutation - remove link from paragraph and put italic there.
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ link ],
-					newChildren: [ new ViewElement( 'i' ) ]
-				},
-
-				// Third mutation - italic's new children.
-				{
-					type: 'children',
-					node: italic,
-					oldChildren: [ text ],
-					newChildren: [ new ViewText( 'x' ), new ViewElement( 'a', null, 'text' ) ]
-				}
-			] );
-
-			expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>x{}text</i></a></p>' );
-		} );
-
-		it( 'should handle mutations switching inner and outer node - with text before', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'xxx<$text italic="true" linkHref="foo">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p>xxx<a href="foo"><i>text{}</i></a></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const textBefore = paragraph.getChild( 0 );
-			const link = paragraph.getChild( 1 );
-			const italic = link.getChild( 0 );
-			const text = italic.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = 'xxx<i><a href="foo">text</a>x</i>';
-			view.fire( 'mutations', [
-				// First mutation - remove all children from link element.
-				{
-					type: 'children',
-					node: link,
-					oldChildren: [ italic ],
-					newChildren: []
-				},
-
-				// Second mutation - remove link from paragraph and put italic there.
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ textBefore, link ],
-					newChildren: [ new ViewText( 'xxx' ), new ViewElement( 'i' ) ]
-				},
-
-				// Third mutation - italic's new children.
-				{
-					type: 'children',
-					node: italic,
-					oldChildren: [ text ],
-					newChildren: [ new ViewElement( 'a', null, 'text' ), new ViewText( 'x' ) ]
-				}
-			] );
-
-			expect( getViewData( view ) ).to.equal( '<p>xxx<a href="foo"><i>textx{}</i></a></p>' );
-		} );
-
-		// This happens when spell checker is applied on <strong> element and changes it to <b>.
-		it( 'should handle mutations replacing node', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<b>fixed text</b>';
-			view.fire( 'mutations', [
-				// Replace `<strong>` with `<b>`.
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ strong ],
-					newChildren: [ new ViewElement( 'b', null, 'fixed text' ) ]
-				}
-			] );
-
-			expect( getViewData( view, { withoutSelection: true } ) ).to.equal( '<p><strong>fixed text</strong></p>' );
-		} );
-
-		// Spell checker splits text inside attributes to two text nodes.
-		it( 'should handle mutations inside attribute element', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'this is foo text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>this is foo text{}</strong></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-			const text = strong.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].childNodes[ 0 ].innerHTML = 'this is bar text';
-			view.fire( 'mutations', [
-				{
-					type: 'children',
-					node: strong,
-					oldChildren: [ text ],
-					newChildren: [ new ViewText( 'this is bar' ), new ViewText( ' text' ) ]
-				}
-			] );
-
-			expect( getViewData( view, { withoutSelection: true } ) ).to.equal( '<p><strong>this is bar text</strong></p>' );
-		} );
-
-		it( 'should do nothing if elements mutated', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong><img />';
-			view.fire( 'mutations', [
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ strong ],
-					newChildren: [
-						new ViewElement( 'strong', null, new ViewText( 'text' ) ),
-						new ViewElement( 'img' )
-					]
-				}
-			] );
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-		} );
-
-		it( 'should do nothing if text is not changed', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong>';
-			view.fire( 'mutations', [
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ strong ],
-					newChildren: [ new ViewElement( 'strong', null, new ViewText( 'text' ) ) ]
-				}
-			] );
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-		} );
-
-		it( 'should do nothing on empty mutations', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong>';
-			view.fire( 'mutations', [] );
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-		} );
-
-		it( 'should do nothing if mutations does not have common ancestor', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong>';
-			view.fire( 'mutations', [
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ strong ],
-					newChildren: [ strong ]
-				},
-				{
-					type: 'children',
-					node: new ViewContainerElement( 'div' ),
-					oldChildren: [],
-					newChildren: [ new ViewText( 'foo' ), new ViewText( 'bar' ) ]
-				}
-			] );
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-		} );
-
-		it( 'should handle view selection if one is returned from mutations', () => {
-			setModelData( model,
-				'<paragraph>' +
-					'<$text bold="true">' +
-						'text[]' +
-					'</$text>' +
-				'</paragraph>'
-			);
-
-			expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( paragraph, 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<b>textx</b>';
-			view.fire( 'mutations', [
-				// Replace `<strong>` with `<b>`.
-				{
-					type: 'children',
-					node: paragraph,
-					oldChildren: [ strong ],
-					newChildren: [ new ViewElement( 'b', null, new ViewText( 'textx' ) ) ]
-				}
-			], viewSelection );
-
-			expect( getModelData( model ) ).to.equal( '<paragraph><$text bold="true">[]textx</$text></paragraph>' );
-			expect( getViewData( view ) ).to.equal( '<p><strong>{}textx</strong></p>' );
-		} );
-
-		// #117.
-		it( 'should handle mixed mutations', () => {
-			setModelData( model, '<paragraph><$text bold="true">Foo bar aple</$text></paragraph>' );
-
-			const paragraph = viewRoot.getChild( 0 );
-			const strong = paragraph.getChild( 0 );
-			const viewSelection = new ViewSelection();
-			viewSelection.setCollapsedAt( paragraph, 0 );
-
-			// Simulate mutations and DOM change.
-			domRoot.childNodes[ 0 ].innerHTML = '<strong>Foo bar </strong><b>apple</b>';
-			view.fire( 'mutations', [
-				{
-					type: 'text',
-					oldText: 'Foo bar aple',
-					newText: 'Foo bar ',
-					node: viewRoot.getChild( 0 ).getChild( 0 )
-				},
-				{
-					type: 'children',
-					oldChildren: [ strong ],
-					newChildren: [ strong, new ViewElement( 'b', null, new ViewText( 'apple' ) ) ],
-					node: paragraph
-				}
-			], viewSelection );
-
-			expect( getModelData( model ) ).to.equal( '<paragraph><$text bold="true">[]Foo bar apple</$text></paragraph>' );
-			expect( getViewData( view ) ).to.equal( '<p><strong>{}Foo bar apple</strong></p>' );
-		} );
-	} );
 } );
 

+ 3 - 1
packages/ckeditor5-typing/tests/inputcommand-integration.js

@@ -73,7 +73,9 @@ describe( 'Typing – InputCommand integration', () => {
 	}
 
 	function setSelection( pathA, pathB ) {
-		doc.selection.setRanges( [ new Range( new Position( doc.getRoot(), pathA ), new Position( doc.getRoot(), pathB ) ) ] );
+		model.change( writer => {
+			writer.setSelection( new Range( new Position( doc.getRoot(), pathA ), new Position( doc.getRoot(), pathB ) ) );
+		} );
 	}
 
 	describe( 'InputCommand integration', () => {

+ 4 - 4
packages/ckeditor5-typing/tests/spellchecking.js

@@ -236,7 +236,7 @@ function emulateSpellcheckerMutation( editor, nodeIndex, resultPositionIndex, ol
 	const viewRoot = view.getRoot();
 	const viewSelection = new ViewSelection();
 
-	viewSelection.setCollapsedAt( viewRoot.getChild( nodeIndex ).getChild( 0 ), resultPositionIndex );
+	viewSelection.setTo( viewRoot.getChild( nodeIndex ).getChild( 0 ), resultPositionIndex );
 
 	view.fire( 'mutations',
 		[ {
@@ -256,10 +256,10 @@ function emulateSpellcheckerInsertText( editor, nodeIndex, rangeStart, rangeEnd,
 	window.focus();
 	editor.editing.view.focus();
 
-	model.change( () => {
-		model.document.selection.setRanges( [
+	model.change( writer => {
+		writer.setSelection(
 			ModelRange.createFromParentsAndOffsets( modelRoot.getChild( nodeIndex ), rangeStart, modelRoot.getChild( nodeIndex ), rangeEnd )
-		] );
+		);
 	} );
 
 	model.document.once( 'change', () => {

+ 448 - 0
packages/ckeditor5-typing/tests/tickets/100.js

@@ -0,0 +1,448 @@
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/boldengine';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italicengine';
+import LinkEngine from '@ckeditor/ckeditor5-link/src/linkengine';
+import Input from '../../src/input';
+
+import buildModelConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildmodelconverter';
+import buildViewConverter from '@ckeditor/ckeditor5-engine/src/conversion/buildviewconverter';
+
+import ViewText from '@ckeditor/ckeditor5-engine/src/view/text';
+import ViewElement from '@ckeditor/ckeditor5-engine/src/view/element';
+import ViewContainerElement from '@ckeditor/ckeditor5-engine/src/view/containerelement';
+import ViewSelection from '@ckeditor/ckeditor5-engine/src/view/selection';
+import MutationObserver from '@ckeditor/ckeditor5-engine/src/view/observer/mutationobserver';
+
+import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
+
+/* global document */
+
+// NOTE: In all these tests we need to simulate the mutations. However, it's really tricky to tell what
+// should be in "newChildren" because we don't have yet access to these nodes. We pass new instances,
+// but this means that DomConverter which is used somewhere internally may return a different instance
+// (which wouldn't happen in practice because it'd cache it). Besides, it's really hard to tell if the
+// browser will keep the instances of the old elements when modifying the tree when the user is typing
+// or if it will create new instances itself too.
+// However, the code handling these mutations doesn't really care what's inside new/old children. It
+// just needs the mutations common ancestor to understand how big fragment of the tree has changed.
+describe( 'Bug ckeditor5-typing#100', () => {
+	let domElement, domRoot, editor, model, view, viewRoot;
+
+	beforeEach( () => {
+		domElement = document.createElement( 'div' );
+		document.body.appendChild( domElement );
+
+		return ClassicTestEditor.create( domElement, { plugins: [ Input, Paragraph, Bold, Italic, LinkEngine ] } )
+			.then( newEditor => {
+				editor = newEditor;
+				model = editor.model;
+				view = editor.editing.view;
+				viewRoot = view.getRoot();
+				domRoot = view.getDomRoot();
+
+				// Mock image feature.
+				newEditor.model.schema.register( 'image', { allowWhere: '$text' } );
+
+				buildModelConverter().for( newEditor.data.modelToView, newEditor.editing.modelToView )
+					.fromElement( 'image' )
+					.toElement( 'img' );
+
+				buildViewConverter().for( newEditor.data.viewToModel )
+					.fromElement( 'img' )
+					.toElement( 'image' );
+
+				// Disable MO completely and in a way it won't be reenabled on some Document#render() call.
+				const mutationObserver = view.getObserver( MutationObserver );
+
+				mutationObserver.disable();
+				mutationObserver.enable = () => {};
+			} );
+	} );
+
+	afterEach( () => {
+		domElement.remove();
+
+		return editor.destroy();
+	} );
+
+	// This happens when browser automatically switches parent and child nodes.
+	it( 'should handle mutations switching inner and outer node when adding new text node after', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text italic="true" linkHref="foo">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>text{}</i></a></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const link = paragraph.getChild( 0 );
+		const italic = link.getChild( 0 );
+		const text = italic.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<i><a href="foo">text</a>x</i>';
+		view.fire( 'mutations', [
+			// First mutation - remove all children from link element.
+			{
+				type: 'children',
+				node: link,
+				oldChildren: [ italic ],
+				newChildren: []
+			},
+
+			// Second mutation - remove link from paragraph and put italic there.
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ link ],
+				newChildren: [ new ViewElement( 'i' ) ]
+			},
+
+			// Third mutation - italic's new children.
+			{
+				type: 'children',
+				node: italic,
+				oldChildren: [ text ],
+				newChildren: [ new ViewElement( 'a', null, text.clone() ), new ViewText( 'x' ) ]
+			}
+		] );
+
+		expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>textx{}</i></a></p>' );
+	} );
+
+	it( 'should handle mutations switching inner and outer node when adding new text node before', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text italic="true" linkHref="foo">' +
+			'[]text' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>{}text</i></a></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const link = paragraph.getChild( 0 );
+		const italic = link.getChild( 0 );
+		const text = italic.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<i>x<a href="foo">text</a></i>';
+		view.fire( 'mutations', [
+			// First mutation - remove all children from link element.
+			{
+				type: 'children',
+				node: link,
+				oldChildren: [ italic ],
+				newChildren: []
+			},
+
+			// Second mutation - remove link from paragraph and put italic there.
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ link ],
+				newChildren: [ new ViewElement( 'i' ) ]
+			},
+
+			// Third mutation - italic's new children.
+			{
+				type: 'children',
+				node: italic,
+				oldChildren: [ text ],
+				newChildren: [ new ViewText( 'x' ), new ViewElement( 'a', null, 'text' ) ]
+			}
+		] );
+
+		expect( getViewData( view ) ).to.equal( '<p><a href="foo"><i>x{}text</i></a></p>' );
+	} );
+
+	it( 'should handle mutations switching inner and outer node - with text before', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'xxx<$text italic="true" linkHref="foo">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p>xxx<a href="foo"><i>text{}</i></a></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const textBefore = paragraph.getChild( 0 );
+		const link = paragraph.getChild( 1 );
+		const italic = link.getChild( 0 );
+		const text = italic.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = 'xxx<i><a href="foo">text</a>x</i>';
+		view.fire( 'mutations', [
+			// First mutation - remove all children from link element.
+			{
+				type: 'children',
+				node: link,
+				oldChildren: [ italic ],
+				newChildren: []
+			},
+
+			// Second mutation - remove link from paragraph and put italic there.
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ textBefore, link ],
+				newChildren: [ new ViewText( 'xxx' ), new ViewElement( 'i' ) ]
+			},
+
+			// Third mutation - italic's new children.
+			{
+				type: 'children',
+				node: italic,
+				oldChildren: [ text ],
+				newChildren: [ new ViewElement( 'a', null, 'text' ), new ViewText( 'x' ) ]
+			}
+		] );
+
+		expect( getViewData( view ) ).to.equal( '<p>xxx<a href="foo"><i>textx{}</i></a></p>' );
+	} );
+
+	// This happens when spell checker is applied on <strong> element and changes it to <b>.
+	it( 'should handle mutations replacing node', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<b>fixed text</b>';
+		view.fire( 'mutations', [
+			// Replace `<strong>` with `<b>`.
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ strong ],
+				newChildren: [ new ViewElement( 'b', null, 'fixed text' ) ]
+			}
+		] );
+
+		expect( getViewData( view, { withoutSelection: true } ) ).to.equal( '<p><strong>fixed text</strong></p>' );
+	} );
+
+	// Spell checker splits text inside attributes to two text nodes.
+	it( 'should handle mutations inside attribute element', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'this is foo text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>this is foo text{}</strong></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+		const text = strong.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].childNodes[ 0 ].innerHTML = 'this is bar text';
+		view.fire( 'mutations', [
+			{
+				type: 'children',
+				node: strong,
+				oldChildren: [ text ],
+				newChildren: [ new ViewText( 'this is bar' ), new ViewText( ' text' ) ]
+			}
+		] );
+
+		expect( getViewData( view, { withoutSelection: true } ) ).to.equal( '<p><strong>this is bar text</strong></p>' );
+	} );
+
+	it( 'should do nothing if elements mutated', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong><img />';
+		view.fire( 'mutations', [
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ strong ],
+				newChildren: [
+					new ViewElement( 'strong', null, new ViewText( 'text' ) ),
+					new ViewElement( 'img' )
+				]
+			}
+		] );
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+	} );
+
+	it( 'should do nothing if text is not changed', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong>';
+		view.fire( 'mutations', [
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ strong ],
+				newChildren: [ new ViewElement( 'strong', null, new ViewText( 'text' ) ) ]
+			}
+		] );
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+	} );
+
+	it( 'should do nothing on empty mutations', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong>';
+		view.fire( 'mutations', [] );
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+	} );
+
+	it( 'should do nothing if mutations does not have common ancestor', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<strong>text</strong>';
+		view.fire( 'mutations', [
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ strong ],
+				newChildren: [ strong ]
+			},
+			{
+				type: 'children',
+				node: new ViewContainerElement( 'div' ),
+				oldChildren: [],
+				newChildren: [ new ViewText( 'foo' ), new ViewText( 'bar' ) ]
+			}
+		] );
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+	} );
+
+	it( 'should handle view selection if one is returned from mutations', () => {
+		setModelData( model,
+			'<paragraph>' +
+			'<$text bold="true">' +
+			'text[]' +
+			'</$text>' +
+			'</paragraph>'
+		);
+
+		expect( getViewData( view ) ).to.equal( '<p><strong>text{}</strong></p>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+		const viewSelection = new ViewSelection( paragraph, 0 );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<b>textx</b>';
+		view.fire( 'mutations', [
+			// Replace `<strong>` with `<b>`.
+			{
+				type: 'children',
+				node: paragraph,
+				oldChildren: [ strong ],
+				newChildren: [ new ViewElement( 'b', null, new ViewText( 'textx' ) ) ]
+			}
+		], viewSelection );
+
+		expect( getModelData( model ) ).to.equal( '<paragraph><$text bold="true">[]textx</$text></paragraph>' );
+		expect( getViewData( view ) ).to.equal( '<p><strong>{}textx</strong></p>' );
+	} );
+
+	// #117.
+	it( 'should handle mixed mutations', () => {
+		setModelData( model, '<paragraph>[]<$text bold="true">Foo bar aple</$text></paragraph>' );
+
+		const paragraph = viewRoot.getChild( 0 );
+		const strong = paragraph.getChild( 0 );
+		const viewSelection = new ViewSelection( paragraph );
+
+		// Simulate mutations and DOM change.
+		domRoot.childNodes[ 0 ].innerHTML = '<strong>Foo bar </strong><b>apple</b>';
+		view.fire( 'mutations', [
+			{
+				type: 'text',
+				oldText: 'Foo bar aple',
+				newText: 'Foo bar ',
+				node: viewRoot.getChild( 0 ).getChild( 0 )
+			},
+			{
+				type: 'children',
+				oldChildren: [ strong ],
+				newChildren: [ strong, new ViewElement( 'b', null, new ViewText( 'apple' ) ) ],
+				node: paragraph
+			}
+		], viewSelection );
+
+		expect( getModelData( model ) ).to.equal( '<paragraph><$text bold="true">[]Foo bar apple</$text></paragraph>' );
+		expect( getViewData( view ) ).to.equal( '<p><strong>{}Foo bar apple</strong></p>' );
+	} );
+} );