Merge branch t/ckedtor5-engine/660 to master

Feature: Viewport will be scrolled to the selection upon user input. See ckeditor/ckeditor5-engine#660.
ckeditor · Aug 15, 2017 · 17f815e · 17f815e
2 parents 755c774 + a792518
commit 17f815e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/enter.js b/src/enter.js
@@ -36,6 +36,7 @@ export default class Enter extends Plugin {
 		this.listenTo( editingView, 'enter', ( evt, data ) => {
 			editor.execute( 'enter' );
 			data.preventDefault();
+			editingView.scrollToTheSelection();
 		}, { priority: 'low' } );
 	}
 }
diff --git a/tests/enter.js b/tests/enter.js
@@ -39,6 +39,18 @@ describe( 'Enter feature', () => {
 		expect( domEvt.preventDefault.calledOnce ).to.be.true;
 	} );
 
+	it( 'scrolls the editing document to the selection after executing the command', () => {
+		const view = editor.editing.view;
+		const domEvt = getDomEvent();
+		const executeSpy = editor.execute = sinon.spy();
+		const scrollSpy = sinon.stub( view, 'scrollToTheSelection' );
+
+		view.fire( 'enter', new DomEventData( editingView, domEvt ) );
+
+		sinon.assert.calledOnce( scrollSpy );
+		sinon.assert.callOrder( executeSpy, scrollSpy );
+	} );
+
 	function getDomEvent() {
 		return {
 			preventDefault: sinon.spy()