Merge pull request #267 from ckeditor/i/6116

Internal: We need to take care of putting the selection in a correct position. See ckeditor/ckeditor5#6116.
ckeditor · Mar 9, 2020 · edbaf3a · edbaf3a
2 parents 0b105f4 + 7e83043
commit edbaf3a
Show file tree

Hide file tree

Showing 4 changed files with 326 additions and 264 deletions.
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "@ckeditor/ckeditor5-clipboard": "^17.0.0",
     "@ckeditor/ckeditor5-editor-classic": "^17.0.0",
     "@ckeditor/ckeditor5-engine": "^17.0.0",
+    "@ckeditor/ckeditor5-horizontal-line": "^17.0.0",
     "@ckeditor/ckeditor5-image": "^17.0.0",
     "@ckeditor/ckeditor5-indent": "^17.0.0",
     "@ckeditor/ckeditor5-list": "^17.0.0",

diff --git a/src/tableselection.js b/src/tableselection.js
@@ -304,12 +304,14 @@ export default class TableSelection extends Plugin {
 
 			clearTableCellsContents( model, selectedTableCells );
 
-			// The insertContent() helper passes the actual DocumentSelection,
-			// while the deleteContent() helper always operates on the abstract clones.
-			if ( selection.is( 'documentSelection' ) ) {
-				writer.setSelection( tableCellToSelect, 'in' );
-			} else {
-				selection.setTo( tableCellToSelect, 'in' );
+			const rangeToSelect = model.schema.getNearestSelectionRange( writer.createPositionAt( tableCellToSelect, 0 ) );
+
+			if ( rangeToSelect ) {
+				if ( selection.is( 'documentSelection' ) ) {
+					writer.setSelection( rangeToSelect );
+				} else {
+					selection.setTo( rangeToSelect );
+				}
 			}
 		} );
 	}