Przeglądaj źródła

Reverted changes in Renderer class.

Kamil Piechaczek 5 lat temu
rodzic
commit
62cfb979eb

+ 5 - 12
packages/ckeditor5-engine/src/view/renderer.js

@@ -41,9 +41,10 @@ export default class Renderer {
 	/**
 	 * Creates a renderer instance.
 	 *
-	 * @param {module:engine/view/view~View} view View editing controller.
+	 * @param {module:engine/view/domconverter~DomConverter} domConverter Converter instance.
+	 * @param {module:engine/view/documentselection~DocumentSelection} selection View selection.
 	 */
-	constructor( view ) {
+	constructor( domConverter, selection ) {
 		/**
 		 * Set of DOM Documents instances.
 		 *
@@ -58,7 +59,7 @@ export default class Renderer {
 		 * @readonly
 		 * @member {module:engine/view/domconverter~DomConverter}
 		 */
-		this.domConverter = view.domConverter;
+		this.domConverter = domConverter;
 
 		/**
 		 * Set of nodes which attributes changed and may need to be rendered.
@@ -90,7 +91,7 @@ export default class Renderer {
 		 * @readonly
 		 * @member {module:engine/view/documentselection~DocumentSelection}
 		 */
-		this.selection = view.document.selection;
+		this.selection = selection;
 
 		/**
 		 * Indicates if the view document is focused and selection can be rendered. Selection will not be rendered if
@@ -115,14 +116,6 @@ export default class Renderer {
 		 * @type {null|HTMLElement}
 		 */
 		this._fakeSelectionContainer = null;
-
-		/**
-		 * Reference to the {@link module:engine/view/view~View#document}.
-		 *
-		 * @private
-		 * @member {module:engine/view/document~Document}
-		 */
-		this._viewDocument = view.document;
 	}
 
 	/**

+ 1 - 1
packages/ckeditor5-engine/src/view/view.js

@@ -106,7 +106,7 @@ export default class View {
 		 * @protected
 		 * @type {module:engine/view/renderer~Renderer}
 		 */
-		this._renderer = new Renderer( this );
+		this._renderer = new Renderer( this.domConverter, this.document.selection );
 		this._renderer.bind( 'isFocused' ).to( this.document );
 
 		/**

+ 8 - 9
packages/ckeditor5-engine/tests/view/renderer.js

@@ -14,8 +14,11 @@ import ViewText from '../../src/view/text';
 import ViewRange from '../../src/view/range';
 import ViewPosition from '../../src/view/position';
 import UIElement from '../../src/view/uielement';
+import DocumentSelection from '../../src/view/documentselection';
+import DomConverter from '../../src/view/domconverter';
 import Renderer from '../../src/view/renderer';
 import DocumentFragment from '../../src/view/documentfragment';
+import ViewDocument from '../../src/view/document';
 import DowncastWriter from '../../src/view/downcastwriter';
 
 import { parse, stringify, setData as setViewData, getData as getViewData } from '../../src/dev-utils/view';
@@ -29,21 +32,17 @@ import { expectToThrowCKEditorError } from '@ckeditor/ckeditor5-utils/tests/_uti
 import { StylesProcessor } from '../../src/view/stylesmap';
 
 describe( 'Renderer', () => {
-	let view, selection, domConverter, renderer, viewDocument;
+	let selection, domConverter, renderer, viewDocument;
 	let stylesProcessor;
 
 	testUtils.createSinonSandbox();
 
 	beforeEach( () => {
 		stylesProcessor = new StylesProcessor();
-
-		view = new View( stylesProcessor );
-		viewDocument = view.document;
-
-		renderer = new Renderer( view );
-		domConverter = renderer.domConverter;
-		selection = renderer.selection;
-
+		viewDocument = new ViewDocument( stylesProcessor );
+		selection = new DocumentSelection();
+		domConverter = new DomConverter( viewDocument );
+		renderer = new Renderer( domConverter, selection );
 		renderer.domDocuments.add( document );
 	} );