UI lazy init

packages/ckeditor5-alignment/src/alignmentui.ts

@@ -76,18 +76,22 @@ export default class AlignmentUI extends Plugin {
 			const dropdownView = createDropdown( locale );
 
 			// Add existing alignment buttons to dropdown's toolbar.
-			const buttons = options.map( option => componentFactory.create( `alignment:${ option.name }` ) ) as Array<ButtonView>;
-			addToolbarToDropdown( dropdownView, buttons, { enableActiveItemFocusOnDropdownOpen: true } );
+			addToolbarToDropdown(
+				dropdownView,
+				() => options.map( option => componentFactory.create( `alignment:${ option.name }` ) ) as Array<ButtonView>,
+				{
+					enableActiveItemFocusOnDropdownOpen: true,
+					isVertical: true,
+					ariaLabel: t( 'Text alignment toolbar' )
+				}
+			);
 
 			// Configure dropdown properties an behavior.
 			dropdownView.buttonView.set( {
 				label: t( 'Text alignment' ),
 				tooltip: true
 			} );
 
-			dropdownView.toolbarView!.isVertical = true;
-			dropdownView.toolbarView!.ariaLabel = t( 'Text alignment toolbar' );
-
 			dropdownView.extendTemplate( {
 				attributes: {
 					class: 'ck-alignment-dropdown'
@@ -96,23 +100,13 @@ export default class AlignmentUI extends Plugin {
 
 			// The default icon depends on the direction of the content.
 			const defaultIcon = locale.contentLanguageDirection === 'rtl' ? iconsMap.get( 'right' ) : iconsMap.get( 'left' );
+			const command = editor.commands.get( 'alignment' )!;
 
 			// Change icon to reflect current selection's alignment.
-			dropdownView.buttonView.bind( 'icon' ).toMany( buttons, 'isOn', ( ...areActive ) => {
-				// Get the index of an active button.
-				const index = areActive.findIndex( value => value );
-
-				// If none of the commands is active, display either defaultIcon or the first button's icon.
-				if ( index < 0 ) {
-					return defaultIcon;
-				}
-
-				// Return active button's icon.
-				return buttons[ index ].icon;
-			} );
+			dropdownView.buttonView.bind( 'icon' ).to( command, 'value', value => iconsMap.get( value ) || defaultIcon );
 
 			// Enable button if any of the buttons is enabled.
-			dropdownView.bind( 'isEnabled' ).toMany( buttons, 'isEnabled', ( ...areEnabled ) => areEnabled.some( isEnabled => isEnabled ) );
+			dropdownView.bind( 'isEnabled' ).to( command, 'isEnabled' );
 
 			// Focus the editable after executing the command.
 			// Overrides a default behaviour where the focus is moved to the dropdown button (#12125).

packages/ckeditor5-alignment/tests/alignmentui.js

@@ -242,13 +242,25 @@ describe( 'Alignment UI', () => {
 		} );
 
 		it( '#toolbarView has the basic properties', () => {
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.toolbarView ).to.be.undefined;
+
+			// Trigger toolbar view creation (lazy init).
+			dropdown.isOpen = true;
+
 			const toolbarView = dropdown.toolbarView;
 
 			expect( toolbarView ).to.have.property( 'isVertical', true );
 			expect( toolbarView ).to.have.property( 'ariaLabel', 'Text alignment toolbar' );
 		} );
 
 		it( 'should hold defined buttons', () => {
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.toolbarView ).to.be.undefined;
+
+			// Trigger toolbar view creation (lazy init).
+			dropdown.isOpen = true;
+
 			const items = [ ...dropdown.toolbarView.items ].map( item => item.label );
 
 			expect( items ).to.have.length( 4 );
@@ -259,7 +271,45 @@ describe( 'Alignment UI', () => {
 			expect( items.includes( 'Justify' ) ).to.be.true;
 		} );
 
+		it( 'should use icon related to current command value', () => {
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.toolbarView ).to.be.undefined;
+
+			// Trigger toolbar view creation (lazy init).
+			dropdown.isOpen = true;
+
+			expect( dropdown.buttonView.icon ).to.equal( alignLeftIcon );
+
+			command.value = 'right';
+
+			expect( dropdown.buttonView.icon ).to.equal( alignRightIcon );
+		} );
+
+		it( 'should be disabled if command is not enabled', () => {
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.toolbarView ).to.be.undefined;
+
+			// Trigger toolbar view creation (lazy init).
+			dropdown.isOpen = true;
+
+			command.isEnabled = true;
+			expect( dropdown.isEnabled ).to.be.true;
+
+			command.isEnabled = false;
+			expect( dropdown.isEnabled ).to.be.false;
+		} );
+
 		it( 'should focus the first active button when dropdown is opened', () => {
+			dropdown.render();
+			document.body.appendChild( dropdown.element );
+
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.toolbarView ).to.be.undefined;
+
+			// Trigger toolbar view creation (lazy init).
+			dropdown.isOpen = true;
+			dropdown.isOpen = false;
+
 			const buttonAlignLeft = dropdown.toolbarView.items.get( 0 );
 			const buttonAlignRight = dropdown.toolbarView.items.get( 1 );
 			const spy = sinon.spy( buttonAlignRight, 'focus' );
@@ -268,9 +318,17 @@ describe( 'Alignment UI', () => {
 			buttonAlignRight.isOn = true;
 			dropdown.isOpen = true;
 			sinon.assert.calledOnce( spy );
+
+			dropdown.element.remove();
 		} );
 
 		it( 'should return focus to editable after executing a command', () => {
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.toolbarView ).to.be.undefined;
+
+			// Trigger toolbar view creation (lazy init).
+			dropdown.isOpen = true;
+
 			const buttonAlignLeft = dropdown.toolbarView.items.get( 0 );
 			const spy = sinon.spy( editor.editing.view, 'focus' );
 			dropdown.render();
@@ -302,6 +360,12 @@ describe( 'Alignment UI', () => {
 			} );
 
 			it( 'should hold only defined buttons', () => {
+				// Make sure that toolbar view is not created before first dropdown open.
+				expect( dropdown.toolbarView ).to.be.undefined;
+
+				// Trigger toolbar view creation (lazy init).
+				dropdown.isOpen = true;
+
 				const items = [ ...dropdown.toolbarView.items ].map( item => item.label );
 
 				expect( items ).to.have.length( 2 );
@@ -311,6 +375,7 @@ describe( 'Alignment UI', () => {
 			} );
 
 			it( 'should have default icon set (LTR content)', () => {
+				command.value = undefined;
 				expect( dropdown.buttonView.icon ).to.equal( alignLeftIcon );
 			} );
 
@@ -328,6 +393,7 @@ describe( 'Alignment UI', () => {
 					} )
 					.then( newEditor => {
 						dropdown = newEditor.ui.componentFactory.create( 'alignment' );
+						editor.commands.get( 'alignment' ).value = undefined;
 
 						expect( dropdown.buttonView.icon ).to.equal( alignRightIcon );
 

packages/ckeditor5-code-block/src/codeblockui.ts

@@ -73,7 +73,7 @@ export default class CodeBlockUI extends Plugin {
 			dropdownView.class = 'ck-code-block-dropdown';
 			dropdownView.bind( 'isEnabled' ).to( command );
 
-			addListToDropdown( dropdownView, this._getLanguageListItemDefinitions( normalizedLanguageDefs ) );
+			addListToDropdown( dropdownView, () => this._getLanguageListItemDefinitions( normalizedLanguageDefs ) );
 
 			return dropdownView;
 		} );

packages/ckeditor5-code-block/tests/codeblock-integration.js

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
+/* global document */
+
 import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
 import Enter from '@ckeditor/ckeditor5-enter/src/enter';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
@@ -133,6 +135,17 @@ describe( 'CodeBlock - integration', () => {
 		it( 'should create a second code block with the same language as the first one', () => {
 			const dropdown = editor.ui.componentFactory.create( 'codeBlock' );
 			const codeBlock = dropdown.buttonView;
+
+			dropdown.render();
+			document.body.appendChild( dropdown.element );
+
+			// Make sure that toolbar view is not created before first dropdown open.
+			expect( dropdown.listView ).to.be.undefined;
+
+			// Trigger list view creation (lazy init).
+			dropdown.isOpen = true;
+			dropdown.isOpen = false;
+
 			const listView = dropdown.panelView.children.first;
 			const cSharpButton = listView.items.get( 2 ).children.first;
 
@@ -153,6 +166,8 @@ describe( 'CodeBlock - integration', () => {
 			// Clicking the button once again should create the code block with the C# language instead of the default (plaintext).
 			codeBlock.fire( 'execute' );
 			expect( getData( editor.model ) ).to.equal( '<codeBlock language="cs">[]</codeBlock>' );
+
+			dropdown.element.remove();
 		} );
 	} );
 

packages/ckeditor5-code-block/tests/codeblockui.js

@@ -68,6 +68,16 @@ describe( 'CodeBlockUI', () => {
 
 		it( 'executes the command when executed one of the available language buttons from the list', () => {
 			const dropdown = editor.ui.componentFactory.create( 'codeBlock' );
+
+			dropdown.render();
+			document.body.appendChild( dropdown.element );
+
+			// Make sure that list view is not created before first dropdown open.
+			expect( dropdown.listView ).to.be.undefined;
+
+			// Trigger list view creation (lazy init).
+			dropdown.isOpen = true;
+
 			const executeSpy = sinon.stub( editor, 'execute' );
 			const focusSpy = sinon.stub( editor.editing.view, 'focus' );
 			const listView = dropdown.panelView.children.first;
@@ -82,11 +92,20 @@ describe( 'CodeBlockUI', () => {
 				language: 'cs',
 				forceValue: true
 			} );
+
+			dropdown.element.remove();
 		} );
 
 		describe( 'language list', () => {
 			it( 'corresponds to the config', () => {
 				const dropdown = editor.ui.componentFactory.create( 'codeBlock' );
+
+				// Make sure that list view is not created before first dropdown open.
+				expect( dropdown.listView ).to.be.undefined;
+
+				// Trigger list view creation (lazy init).
+				dropdown.isOpen = true;
+
 				const listView = dropdown.panelView.children.first;
 
 				expect( listView.items
@@ -157,6 +176,13 @@ describe( 'CodeBlockUI', () => {
 
 			it( 'sets item\'s #isOn depending on the value of the CodeBlockCommand', () => {
 				const dropdown = editor.ui.componentFactory.create( 'codeBlock' );
+
+				// Make sure that list view is not created before first dropdown open.
+				expect( dropdown.listView ).to.be.undefined;
+
+				// Trigger list view creation (lazy init).
+				dropdown.isOpen = true;
+
 				const listView = dropdown.panelView.children.first;
 
 				expect( listView.items.get( 2 ).children.first.isOn ).to.be.false;
@@ -177,6 +203,13 @@ describe( 'CodeBlockUI', () => {
 						const editor = newEditor;
 
 						const dropdown = editor.ui.componentFactory.create( 'codeBlock' );
+
+						// Make sure that list view is not created before first dropdown open.
+						expect( dropdown.listView ).to.be.undefined;
+
+						// Trigger list view creation (lazy init).
+						dropdown.isOpen = true;
+
 						const listView = dropdown.panelView.children.first;
 
 						expect( listView.items.first.children.first.label ).to.equal( 'Zwykły tekst' );

packages/ckeditor5-find-and-replace/src/findandreplaceui.js

@@ -52,11 +52,17 @@ export default class FindAndReplaceUI extends Plugin {
 		// Register the toolbar dropdown component.
 		editor.ui.componentFactory.add( 'findAndReplace', locale => {
 			const dropdown = createDropdown( locale );
-			const formView = this.formView = new FindAndReplaceFormView( editor.locale );
 
 			// Dropdown should be disabled when in source editing mode. See #10001.
 			dropdown.bind( 'isEnabled' ).to( editor.commands.get( 'find' ) );
-			dropdown.panelView.children.add( formView );
+
+			dropdown.once( 'change:isOpen', () => {
+				this.formView = new FindAndReplaceFormView( editor.locale );
+
+				dropdown.panelView.children.add( this.formView );
+
+				this._setupFormView( this.formView );
+			} );
 
 			// Every time a dropdown is opened, the search text field should get focused and selected for better UX.
 			// Note: Using the low priority here to make sure the following listener starts working after
@@ -68,19 +74,18 @@ export default class FindAndReplaceUI extends Plugin {
 			// and no longer should be marked in the content.
 			dropdown.on( 'change:isOpen', ( event, name, isOpen ) => {
 				if ( isOpen ) {
-					formView.disableCssTransitions();
+					this.formView.disableCssTransitions();
 
-					formView.reset();
-					formView._findInputView.fieldView.select();
+					this.formView.reset();
+					this.formView._findInputView.fieldView.select();
 
-					formView.enableCssTransitions();
+					this.formView.enableCssTransitions();
 				} else {
 					this.fire( 'searchReseted' );
 				}
 			}, { priority: 'low' } );
 
 			this._setupDropdownButton( dropdown );
-			this._setupFormView( formView );
 
 			return dropdown;
 		} );

packages/ckeditor5-find-and-replace/tests/findandreplace.js

@@ -197,7 +197,7 @@ describe( 'FindAndReplace', () => {
 				// (#10014).
 				editor.setData( LONG_TEXT );
 
-				toolbarDropdownView.buttonView.arrowView.fire( 'execute' );
+				toolbarDropdownView.buttonView.fire( 'execute' );
 				findAndReplaceUI.formView._findInputView.fieldView.value = 'nothingtobefound';
 				findAndReplaceUI.formView._findButtonView.fire( 'execute' );
 

packages/ckeditor5-find-and-replace/tests/findandreplaceui.js

@@ -31,12 +31,17 @@ describe( 'FindAndReplaceUI', () => {
 			.then( newEditor => {
 				editor = newEditor;
 				dropdown = editor.ui.componentFactory.create( 'findAndReplace' );
-				form = dropdown.panelView.children.get( 0 );
 				findCommand = editor.commands.get( 'find' );
 				plugin = editor.plugins.get( 'FindAndReplaceUI' );
 
 				dropdown.render();
 				global.document.body.appendChild( dropdown.element );
+
+				// Trigger lazy init.
+				dropdown.isOpen = true;
+				dropdown.isOpen = false;
+
+				form = dropdown.panelView.children.get( 0 );
 			} );
 	} );
 

packages/ckeditor5-find-and-replace/tests/ui/findandreplaceformview.js

@@ -213,6 +213,12 @@ describe( 'FindAndReplaceFormView', () => {
 				} );
 
 				describe( 'options dropdown', () => {
+					beforeEach( () => {
+						// Trigger lazy init.
+						view._optionsDropdown.isOpen = true;
+						view._optionsDropdown.isOpen = false;
+					} );
+
 					it( 'should be a dropdown', () => {
 						expect( view._optionsDropdown ).to.be.instanceOf( DropdownView );
 						expect( view._optionsDropdown.class ).to.equal( 'ck-options-dropdown' );
@@ -764,10 +770,14 @@ describe( 'FindAndReplaceFormView', () => {
 				toolbar: [ 'findAndReplace' ]
 			} );
 
-			view = editor.plugins.get( 'FindAndReplaceUI' ).formView;
 			dropdown = editor.ui.view.toolbar.items
 				.find( item => item.buttonView && item.buttonView.label == 'Find and replace' );
 
+			// Trigger lazy init.
+			dropdown.isOpen = true;
+
+			view = editor.plugins.get( 'FindAndReplaceUI' ).formView;
+
 			findInput = view._findInputView;
 			matchCounterElement = findInput.element.firstChild.childNodes[ 2 ];
 			replaceInput = view._replaceInputView;
@@ -777,7 +787,12 @@ describe( 'FindAndReplaceFormView', () => {
 			replaceButton = view._replaceButtonView;
 			replaceAllButton = view._replaceAllButtonView;
 
+			// Trigger lazy init.
+			view._optionsDropdown.isOpen = true;
+			view._optionsDropdown.isOpen = false;
+
 			const optionsListView = view._optionsDropdown.panelView.children.get( 0 );
+
 			matchCaseSwitch = optionsListView.items.get( 0 ).children.get( 0 );
 			wholeWordsOnlySwitch = optionsListView.items.get( 1 ).children.get( 0 );
 		} );