浏览代码

Remove Position, Range, Selection imports from engine/model.

Maciej Gołaszewski 7 年之前
父节点
当前提交
ec613b0b4b

+ 3 - 3
packages/ckeditor5-basic-styles/package.json

@@ -11,13 +11,13 @@
   ],
   "dependencies": {
     "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-engine": "^11.0.0",
-    "@ckeditor/ckeditor5-ui": "^11.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^11.1.0"
+    "@ckeditor/ckeditor5-theme-lark": "^11.1.0",
+    "@ckeditor/ckeditor5-ui": "^11.1.0"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-cloud-services": "^10.1.0",
     "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
+    "@ckeditor/ckeditor5-engine": "^11.0.0",
     "@ckeditor/ckeditor5-essentials": "^10.1.2",
     "@ckeditor/ckeditor5-paragraph": "^10.0.3",
     "@ckeditor/ckeditor5-utils": "^11.0.0",

+ 8 - 6
packages/ckeditor5-basic-styles/tests/attributecommand.js

@@ -7,8 +7,6 @@ import AttributeCommand from '../src/attributecommand';
 
 import ModelTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/modeltesteditor';
 
-import Range from '@ckeditor/ckeditor5-engine/src/model/range';
-import Position from '@ckeditor/ckeditor5-engine/src/model/position';
 import { setData, getData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
 describe( 'AttributeCommand', () => {
@@ -227,10 +225,14 @@ describe( 'AttributeCommand', () => {
 
 			model.change( writer => {
 				// Simulate clicking right arrow key by changing selection ranges.
-				writer.setSelection( new Range( new Position( root, [ 0, 2 ] ), new Position( root, [ 0, 2 ] ) ) );
+				writer.setSelection( writer.createRange(
+					writer.createPositionAt( root.getNodeByPath( [ 0 ] ), 2 )
+				) );
 
 				// Get back to previous selection.
-				writer.setSelection( new Range( new Position( root, [ 0, 1 ] ), new Position( root, [ 0, 1 ] ) ) );
+				writer.setSelection( writer.createRange(
+					writer.createPositionAt( root.getNodeByPath( [ 0 ] ), 1 )
+				) );
 			} );
 
 			expect( command.value ).to.be.false;
@@ -249,14 +251,14 @@ describe( 'AttributeCommand', () => {
 			// Attribute should be stored.
 			// Simulate clicking somewhere else in the editor.
 			model.change( writer => {
-				writer.setSelection( [ new Range( new Position( root, [ 0, 2 ] ), new Position( root, [ 0, 2 ] ) ) ] );
+				writer.setSelection( [ writer.createRange( writer.createPositionAt( root.getNodeByPath( [ 0 ] ), 2 ) ) ] );
 			} );
 
 			expect( command.value ).to.be.false;
 
 			// Go back to where attribute was stored.
 			model.change( writer => {
-				writer.setSelection( new Range( new Position( root, [ 1, 0 ] ), new Position( root, [ 1, 0 ] ) ) );
+				writer.setSelection( writer.createRange( writer.createPositionAt( root.getNodeByPath( [ 1 ] ), 0 ) ) );
 			} );
 
 			// Attribute should be restored.