Merge pull request #1803 from ckeditor/i/5640

Internal: Revert "Fix: IME composistion broken in empty paragraph in Safari.". Closes ckeditor/ckeditor5#5638.
ckeditor · Oct 21, 2019 · 250f8f2 · 250f8f2
2 parents f7120e3 + 09ee56c
commit 250f8f2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 55 deletions.
diff --git a/src/view/renderer.js b/src/view/renderer.js
@@ -101,13 +101,6 @@ export default class Renderer {
 		 */
 		this.isFocused = false;
 
-		/**
-		 * Indicates if the composition is in progress inside the view document view.
-		 *
-		 * @member {Boolean}
-		 */
-		this.isComposing = false;
-
 		/**
 		 * The text node in which the inline filler was rendered.
 		 *
@@ -769,11 +762,6 @@ export default class Renderer {
 	 * @returns {Boolean}
 	 */
 	_domSelectionNeedsUpdate( domSelection ) {
-		// Remain DOM selection untouched while composing. See #1782.
-		if ( this.isComposing ) {
-			return false;
-		}
-
 		if ( !this.domConverter.isDomSelectionCorrect( domSelection ) ) {
 			// Current DOM selection is in incorrect position. We need to update it.
 			return true;

diff --git a/src/view/view.js b/src/view/view.js
@@ -105,7 +105,6 @@ export default class View {
 		 */
 		this._renderer = new Renderer( this.domConverter, this.document.selection );
 		this._renderer.bind( 'isFocused' ).to( this.document );
-		this._renderer.bind( 'isComposing' ).to( this.document );
 
 		/**
 		 * A DOM root attributes cache. It saves the initial values of DOM root attributes before the DOM element

diff --git a/tests/view/renderer.js b/tests/view/renderer.js
@@ -3706,48 +3706,6 @@ describe( 'Renderer', () => {
 				return viewData.repeat( repeat );
 			}
 		} );
-
-		// #1782
-		it( 'should leave dom selection untouched while composing', () => {
-			const { view: viewP, selection: newSelection } = parse( '<container:p>[]</container:p>' );
-
-			viewRoot._appendChild( viewP );
-			selection._setTo( newSelection );
-
-			renderer.markToSync( 'children', viewRoot );
-			renderer.render();
-
-			// Mock IME typing in Safari: <p>[c]</p>.
-			renderer.isComposing = true;
-			const domText = document.createTextNode( 'c' );
-			domRoot.firstChild.appendChild( domText );
-			const range = document.createRange();
-			range.setStart( domText, 0 );
-			range.setEnd( domText, 1 );
-			const domSelection = document.getSelection();
-			domSelection.removeAllRanges();
-			domSelection.addRange( range );
-
-			// <container:p>c[]</container:p>
-			viewP._appendChild( new ViewText( 'c' ) );
-			selection._setTo( [
-				new ViewRange( new ViewPosition( viewP.getChild( 0 ), 1 ), new ViewPosition( viewP.getChild( 0 ), 1 ) )
-			] );
-
-			renderer.markToSync( 'children', viewP );
-			renderer.render();
-
-			expect( domRoot.childNodes.length ).to.equal( 1 );
-			expect( domRoot.firstChild.childNodes.length ).to.equal( 1 );
-			expect( domRoot.firstChild.firstChild.data ).to.equal( 'c' );
-
-			const currentRange = domSelection.getRangeAt( 0 );
-			expect( currentRange.collapsed ).to.equal( false );
-			expect( currentRange.startContainer ).to.equal( domRoot.firstChild.firstChild );
-			expect( currentRange.startOffset ).to.equal( 0 );
-			expect( currentRange.endContainer ).to.equal( domRoot.firstChild.firstChild );
-			expect( currentRange.endOffset ).to.equal( 1 );
-		} );
 	} );
 
 	describe( '#922', () => {