8
0
Эх сурвалжийг харах

Merge pull request #32 from ckeditor/t/ckeditor5-ui-default/12

t/ckeditor5-ui-default/12: Implement dropdown component
Piotrek Koszuliński 9 жил өмнө
parent
commit
8778162fb6

+ 5 - 1
packages/ckeditor5-ui/src/editorui/boxed/boxededitoruiview.js

@@ -31,7 +31,11 @@ export default class BoxedEditorUIView extends EditorUIView {
 			tag: 'div',
 
 			attributes: {
-				class: 'ck-reset ck-editor',
+				class: [
+					'ck-reset',
+					'ck-editor',
+					'ck-rounded-corners'
+				],
 				role: 'application',
 				dir: 'ltr',
 				lang: locale.lang,

+ 1 - 1
packages/ckeditor5-ui/src/region.js

@@ -51,7 +51,7 @@ export default class Region {
 
 		if ( regionElement ) {
 			this.views.on( 'add', ( evt, childView, index ) => {
-				regionElement.insertBefore( childView.element, regionElement.childNodes[ index + 1 ] );
+				regionElement.insertBefore( childView.element, regionElement.childNodes[ index ] );
 			} );
 
 			this.views.on( 'remove', ( evt, childView ) => {

+ 14 - 1
packages/ckeditor5-ui/tests/region.js

@@ -35,15 +35,28 @@ describe( 'View', () => {
 
 	describe( 'views collection', () => {
 		it( 'updates DOM when adding views', () => {
+			let view;
+
 			region.init( el );
 
 			expect( region.element.childNodes.length ).to.be.equal( 0 );
 
-			region.views.add( new TestViewA() );
+			view = new TestViewA();
+			region.views.add( view, 0 );
 			expect( region.element.childNodes.length ).to.be.equal( 1 );
 
 			region.views.add( new TestViewA() );
 			expect( region.element.childNodes.length ).to.be.equal( 2 );
+
+			view = new TestViewA();
+			region.views.add( view, 1 );
+			expect( region.element.childNodes.length ).to.be.equal( 3 );
+			expect( region.element.childNodes[ 1 ] ).to.equal( view.element );
+
+			view = new TestViewA();
+			region.views.add( view, 0 );
+			expect( region.element.childNodes.length ).to.be.equal( 4 );
+			expect( region.element.childNodes[ 0 ] ).to.equal( view.element );
 		} );
 
 		it( 'does not update DOM when no region element', () => {