@ckeditor/ckeditor5-ui 35.2.1 → 35.3.1

package/src/dropdown/utils.js

@@ -2,11 +2,9 @@
  * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module ui/dropdown/utils
  */
-
 import DropdownPanelView from './dropdownpanelview';
 import DropdownView from './dropdownview';
 import DropdownButtonView from './button/dropdownbuttonview';
@@ -15,15 +13,12 @@ import ListView from '../list/listview';
 import ListItemView from '../list/listitemview';
 import ListSeparatorView from '../list/listseparatorview';
 import ButtonView from '../button/buttonview';
+import SplitButtonView from './button/splitbuttonview';
 import SwitchButtonView from '../button/switchbuttonview';
-
 import clickOutsideHandler from '../bindings/clickoutsidehandler';
-
 import { global, priorities, logWarning } from '@ckeditor/ckeditor5-utils';
-
 import '../../theme/components/dropdown/toolbardropdown.css';
 import '../../theme/components/dropdown/listdropdown.css';
-
 /**
  * A helper for creating dropdowns. It creates an instance of a {@link module:ui/dropdown/dropdownview~DropdownView dropdown},
  * with a {@link module:ui/dropdown/button/dropdownbutton~DropdownButton button},
@@ -86,25 +81,20 @@ import '../../theme/components/dropdown/listdropdown.css';
  * {@link module:ui/dropdown/button/dropdownbutton~DropdownButton} interface.
  * @returns {module:ui/dropdown/dropdownview~DropdownView} The dropdown view instance.
  */
-export function createDropdown( locale, ButtonClass = DropdownButtonView ) {
-	const buttonView = new ButtonClass( locale );
-
-	const panelView = new DropdownPanelView( locale );
-	const dropdownView = new DropdownView( locale, buttonView, panelView );
-
-	buttonView.bind( 'isEnabled' ).to( dropdownView );
-
-	if ( buttonView instanceof DropdownButtonView ) {
-		buttonView.bind( 'isOn' ).to( dropdownView, 'isOpen' );
-	} else {
-		buttonView.arrowView.bind( 'isOn' ).to( dropdownView, 'isOpen' );
-	}
-
-	addDefaultBehavior( dropdownView );
-
-	return dropdownView;
+export function createDropdown(locale, ButtonClass = DropdownButtonView) {
+    const buttonView = new ButtonClass(locale);
+    const panelView = new DropdownPanelView(locale);
+    const dropdownView = new DropdownView(locale, buttonView, panelView);
+    buttonView.bind('isEnabled').to(dropdownView);
+    if (buttonView instanceof SplitButtonView) {
+        buttonView.arrowView.bind('isOn').to(dropdownView, 'isOpen');
+    }
+    else {
+        buttonView.bind('isOn').to(dropdownView, 'isOpen');
+    }
+    addDefaultBehavior(dropdownView);
+    return dropdownView;
 }
-
 /**
  * Adds an instance of {@link module:ui/toolbar/toolbarview~ToolbarView} to a dropdown.
  *
@@ -140,30 +130,24 @@ export function createDropdown( locale, ButtonClass = DropdownButtonView ) {
  * as a whole resulting in the focus moving to its first focusable item (default behavior of
  * {@link module:ui/dropdown/dropdownview~DropdownView}).
  */
-export function addToolbarToDropdown( dropdownView, buttons, options = {} ) {
-	const locale = dropdownView.locale;
-	const t = locale.t;
-	const toolbarView = dropdownView.toolbarView = new ToolbarView( locale );
-
-	toolbarView.set( 'ariaLabel', t( 'Dropdown toolbar' ) );
-
-	dropdownView.extendTemplate( {
-		attributes: {
-			class: [ 'ck-toolbar-dropdown' ]
-		}
-	} );
-
-	buttons.map( view => toolbarView.items.add( view ) );
-
-	if ( options.enableActiveItemFocusOnDropdownOpen ) {
-		// Accessibility: Focus the first active button in the toolbar when the dropdown gets open.
-		focusChildOnDropdownOpen( dropdownView, () => toolbarView.items.find( item => item.isOn ) );
-	}
-
-	dropdownView.panelView.children.add( toolbarView );
-	toolbarView.items.delegate( 'execute' ).to( dropdownView );
+export function addToolbarToDropdown(dropdownView, buttons, options = {}) {
+    const locale = dropdownView.locale;
+    const t = locale.t;
+    const toolbarView = dropdownView.toolbarView = new ToolbarView(locale);
+    toolbarView.set('ariaLabel', t('Dropdown toolbar'));
+    dropdownView.extendTemplate({
+        attributes: {
+            class: ['ck-toolbar-dropdown']
+        }
+    });
+    buttons.map(view => toolbarView.items.add(view));
+    if (options.enableActiveItemFocusOnDropdownOpen) {
+        // Accessibility: Focus the first active button in the toolbar when the dropdown gets open.
+        focusChildOnDropdownOpen(dropdownView, () => toolbarView.items.find((item) => item.isOn));
+    }
+    dropdownView.panelView.children.add(toolbarView);
+    toolbarView.items.delegate('execute').to(dropdownView);
 }
-
 /**
  * Adds an instance of {@link module:ui/list/listview~ListView} to a dropdown.
  *
@@ -209,47 +193,40 @@ export function addToolbarToDropdown( dropdownView, buttons, options = {} ) {
  * @param {Iterable.<module:ui/dropdown/utils~ListDropdownItemDefinition>} items
  * A collection of the list item definitions to populate the list.
  */
-export function addListToDropdown( dropdownView, items ) {
-	const locale = dropdownView.locale;
-	const listView = dropdownView.listView = new ListView( locale );
-
-	listView.items.bindTo( items ).using( ( { type, model } ) => {
-		if ( type === 'separator' ) {
-			return new ListSeparatorView( locale );
-		} else if ( type === 'button' || type === 'switchbutton' ) {
-			const listItemView = new ListItemView( locale );
-			let buttonView;
-
-			if ( type === 'button' ) {
-				buttonView = new ButtonView( locale );
-			} else {
-				buttonView = new SwitchButtonView( locale );
-			}
-
-			// Bind all model properties to the button view.
-			buttonView.bind( ...Object.keys( model ) ).to( model );
-			buttonView.delegate( 'execute' ).to( listItemView );
-
-			listItemView.children.add( buttonView );
-
-			return listItemView;
-		}
-	} );
-
-	dropdownView.panelView.children.add( listView );
-
-	listView.items.delegate( 'execute' ).to( dropdownView );
-
-	// Accessibility: Focus the first active button in the list when the dropdown gets open.
-	focusChildOnDropdownOpen( dropdownView, () => listView.items.find( item => {
-		if ( item instanceof ListItemView ) {
-			return item.children.first.isOn;
-		}
-
-		return false;
-	} ) );
+export function addListToDropdown(dropdownView, items) {
+    const locale = dropdownView.locale;
+    const listView = dropdownView.listView = new ListView(locale);
+    listView.items.bindTo(items).using(def => {
+        if (def.type === 'separator') {
+            return new ListSeparatorView(locale);
+        }
+        else if (def.type === 'button' || def.type === 'switchbutton') {
+            const listItemView = new ListItemView(locale);
+            let buttonView;
+            if (def.type === 'button') {
+                buttonView = new ButtonView(locale);
+            }
+            else {
+                buttonView = new SwitchButtonView(locale);
+            }
+            // Bind all model properties to the button view.
+            buttonView.bind(...Object.keys(def.model)).to(def.model);
+            buttonView.delegate('execute').to(listItemView);
+            listItemView.children.add(buttonView);
+            return listItemView;
+        }
+        return null;
+    });
+    dropdownView.panelView.children.add(listView);
+    listView.items.delegate('execute').to(dropdownView);
+    // Accessibility: Focus the first active button in the list when the dropdown gets open.
+    focusChildOnDropdownOpen(dropdownView, () => listView.items.find(item => {
+        if (item instanceof ListItemView) {
+            return item.children.first.isOn;
+        }
+        return false;
+    }));
 }
-
 /**
  * A helper to be used on an existing {@link module:ui/dropdown/dropdownview~DropdownView} that focuses
  * a specific child in DOM when the dropdown {@link module:ui/dropdown/dropdownview~DropdownView#isOpen gets open}.
@@ -260,159 +237,133 @@ export function addListToDropdown( dropdownView, items ) {
  * If falsy value is returned, a default behavior of the dropdown will engage focusing the first focusable child in
  * the {@link module:ui/dropdown/dropdownview~DropdownView#panelView}.
  */
-export function focusChildOnDropdownOpen( dropdownView, childSelectorCallback ) {
-	dropdownView.on( 'change:isOpen', () => {
-		if ( !dropdownView.isOpen ) {
-			return;
-		}
-
-		const childToFocus = childSelectorCallback();
-
-		if ( !childToFocus ) {
-			return;
-		}
-
-		if ( typeof childToFocus.focus === 'function' ) {
-			childToFocus.focus();
-		} else {
-			/**
-			 * The child view of a {@link module:ui/dropdown/dropdownview~DropdownView dropdown} is missing the `focus()` method
-			 * and could not be focused when the dropdown got {@link module:ui/dropdown/dropdownview~DropdownView#isOpen open}.
-			 *
-			 * Making the content of a dropdown focusable in this case greatly improves the accessibility. Please make the view instance
-			 * implements the {@link module:ui/dropdown/dropdownpanelfocusable~DropdownPanelFocusable focusable interface} for the best user
-			 * experience.
-			 *
-			 * @error ui-dropdown-focus-child-on-open-child-missing-focus
-			 * @param {module:ui/view~View} view
-			 */
-			logWarning( 'ui-dropdown-focus-child-on-open-child-missing-focus', { view: childToFocus } );
-		}
-
-	// * Let the panel show up first (do not focus an invisible element).
-	// * Execute after focusDropdownPanelOnOpen(). See focusDropdownPanelOnOpen() to learn more.
-	}, { priority: priorities.low - 10 } );
+export function focusChildOnDropdownOpen(dropdownView, childSelectorCallback) {
+    dropdownView.on('change:isOpen', () => {
+        if (!dropdownView.isOpen) {
+            return;
+        }
+        const childToFocus = childSelectorCallback();
+        if (!childToFocus) {
+            return;
+        }
+        if (typeof childToFocus.focus === 'function') {
+            childToFocus.focus();
+        }
+        else {
+            /**
+             * The child view of a {@link module:ui/dropdown/dropdownview~DropdownView dropdown} is missing the `focus()` method
+             * and could not be focused when the dropdown got {@link module:ui/dropdown/dropdownview~DropdownView#isOpen open}.
+             *
+             * Making the content of a dropdown focusable in this case greatly improves the accessibility. Please make the view instance
+             * implements the {@link module:ui/dropdown/dropdownpanelfocusable~DropdownPanelFocusable focusable interface} for the best user
+             * experience.
+             *
+             * @error ui-dropdown-focus-child-on-open-child-missing-focus
+             * @param {module:ui/view~View} view
+             */
+            logWarning('ui-dropdown-focus-child-on-open-child-missing-focus', { view: childToFocus });
+        }
+        // * Let the panel show up first (do not focus an invisible element).
+        // * Execute after focusDropdownPanelOnOpen(). See focusDropdownPanelOnOpen() to learn more.
+    }, { priority: priorities.low - 10 });
 }
-
 // Add a set of default behaviors to dropdown view.
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function addDefaultBehavior( dropdownView ) {
-	closeDropdownOnClickOutside( dropdownView );
-	closeDropdownOnExecute( dropdownView );
-	closeDropdownOnBlur( dropdownView );
-	focusDropdownContentsOnArrows( dropdownView );
-	focusDropdownButtonOnClose( dropdownView );
-	focusDropdownPanelOnOpen( dropdownView );
+function addDefaultBehavior(dropdownView) {
+    closeDropdownOnClickOutside(dropdownView);
+    closeDropdownOnExecute(dropdownView);
+    closeDropdownOnBlur(dropdownView);
+    focusDropdownContentsOnArrows(dropdownView);
+    focusDropdownButtonOnClose(dropdownView);
+    focusDropdownPanelOnOpen(dropdownView);
 }
-
 // Adds a behavior to a dropdownView that closes opened dropdown when user clicks outside the dropdown.
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function closeDropdownOnClickOutside( dropdownView ) {
-	dropdownView.on( 'render', () => {
-		clickOutsideHandler( {
-			emitter: dropdownView,
-			activator: () => dropdownView.isOpen,
-			callback: () => {
-				dropdownView.isOpen = false;
-			},
-			contextElements: [ dropdownView.element ]
-		} );
-	} );
+function closeDropdownOnClickOutside(dropdownView) {
+    dropdownView.on('render', () => {
+        clickOutsideHandler({
+            emitter: dropdownView,
+            activator: () => dropdownView.isOpen,
+            callback: () => {
+                dropdownView.isOpen = false;
+            },
+            contextElements: [dropdownView.element]
+        });
+    });
 }
-
 // Adds a behavior to a dropdownView that closes the dropdown view on "execute" event.
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function closeDropdownOnExecute( dropdownView ) {
-	// Close the dropdown when one of the list items has been executed.
-	dropdownView.on( 'execute', evt => {
-		// Toggling a switch button view should not close the dropdown.
-		if ( evt.source instanceof SwitchButtonView ) {
-			return;
-		}
-
-		dropdownView.isOpen = false;
-	} );
+function closeDropdownOnExecute(dropdownView) {
+    // Close the dropdown when one of the list items has been executed.
+    dropdownView.on('execute', evt => {
+        // Toggling a switch button view should not close the dropdown.
+        if (evt.source instanceof SwitchButtonView) {
+            return;
+        }
+        dropdownView.isOpen = false;
+    });
 }
-
 // Adds a behavior to a dropdown view that closes opened dropdown when it loses focus.
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function closeDropdownOnBlur( dropdownView ) {
-	dropdownView.focusTracker.on( 'change:isFocused', ( evt, name, isFocused ) => {
-		if ( dropdownView.isOpen && !isFocused ) {
-			dropdownView.isOpen = false;
-		}
-	} );
+function closeDropdownOnBlur(dropdownView) {
+    dropdownView.focusTracker.on('change:isFocused', (evt, name, isFocused) => {
+        if (dropdownView.isOpen && !isFocused) {
+            dropdownView.isOpen = false;
+        }
+    });
 }
-
 // Adds a behavior to a dropdownView that focuses the dropdown's panel view contents on keystrokes.
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function focusDropdownContentsOnArrows( dropdownView ) {
-	// If the dropdown panel is already open, the arrow down key should focus the first child of the #panelView.
-	dropdownView.keystrokes.set( 'arrowdown', ( data, cancel ) => {
-		if ( dropdownView.isOpen ) {
-			dropdownView.panelView.focus();
-			cancel();
-		}
-	} );
-
-	// If the dropdown panel is already open, the arrow up key should focus the last child of the #panelView.
-	dropdownView.keystrokes.set( 'arrowup', ( data, cancel ) => {
-		if ( dropdownView.isOpen ) {
-			dropdownView.panelView.focusLast();
-			cancel();
-		}
-	} );
+function focusDropdownContentsOnArrows(dropdownView) {
+    // If the dropdown panel is already open, the arrow down key should focus the first child of the #panelView.
+    dropdownView.keystrokes.set('arrowdown', (data, cancel) => {
+        if (dropdownView.isOpen) {
+            dropdownView.panelView.focus();
+            cancel();
+        }
+    });
+    // If the dropdown panel is already open, the arrow up key should focus the last child of the #panelView.
+    dropdownView.keystrokes.set('arrowup', (data, cancel) => {
+        if (dropdownView.isOpen) {
+            dropdownView.panelView.focusLast();
+            cancel();
+        }
+    });
 }
-
 // Adds a behavior that focuses the #buttonView when the dropdown was closed but focus was within the #panelView element.
 // This makes sure the focus is never lost.
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function focusDropdownButtonOnClose( dropdownView ) {
-	dropdownView.on( 'change:isOpen', ( evt, name, isOpen ) => {
-		if ( isOpen ) {
-			return;
-		}
-
-		// If the dropdown was closed, move the focus back to the button (#12125).
-		// Don't touch the focus, if it moved somewhere else (e.g. moved to the editing root on #execute) (#12178).
-		// Note: Don't use the state of the DropdownView#focusTracker here. It fires #blur with the timeout.
-		if ( dropdownView.panelView.element.contains( global.document.activeElement ) ) {
-			dropdownView.buttonView.focus();
-		}
-	} );
+function focusDropdownButtonOnClose(dropdownView) {
+    dropdownView.on('change:isOpen', (evt, name, isOpen) => {
+        if (isOpen) {
+            return;
+        }
+        // If the dropdown was closed, move the focus back to the button (#12125).
+        // Don't touch the focus, if it moved somewhere else (e.g. moved to the editing root on #execute) (#12178).
+        // Note: Don't use the state of the DropdownView#focusTracker here. It fires #blur with the timeout.
+        if (dropdownView.panelView.element.contains(global.document.activeElement)) {
+            dropdownView.buttonView.focus();
+        }
+    });
 }
-
 // Adds a behavior that focuses the #panelView when dropdown gets open (accessibility).
 //
 // @param {module:ui/dropdown/dropdownview~DropdownView} dropdownView
-function focusDropdownPanelOnOpen( dropdownView ) {
-	dropdownView.on( 'change:isOpen', ( evt, name, isOpen ) => {
-		if ( !isOpen ) {
-			return;
-		}
-
-		// Focus the first item in the dropdown when the dropdown opened.
-		dropdownView.panelView.focus();
-
-	// * Let the panel show up first (do not focus an invisible element).
-	// * Also, execute before focusChildOnDropdownOpen() to make sure this helper does not break the
-	//   focus of a specific child by kicking in too late and resetting the focus in the panel.
-	}, { priority: 'low' } );
+function focusDropdownPanelOnOpen(dropdownView) {
+    dropdownView.on('change:isOpen', (evt, name, isOpen) => {
+        if (!isOpen) {
+            return;
+        }
+        // Focus the first item in the dropdown when the dropdown opened.
+        dropdownView.panelView.focus();
+        // * Let the panel show up first (do not focus an invisible element).
+        // * Also, execute before focusChildOnDropdownOpen() to make sure this helper does not break the
+        //   focus of a specific child by kicking in too late and resetting the focus in the panel.
+    }, { priority: 'low' });
 }
-
-/**
- * A definition of the list item used by the {@link module:ui/dropdown/utils~addListToDropdown}
- * utility.
- *
- * @typedef {Object} module:ui/dropdown/utils~ListDropdownItemDefinition
- *
- * @property {String} type Either `'separator'`, `'button'` or `'switchbutton'`.
- * @property {module:ui/model~Model} [model] Model of the item (when **not** `'separator'`).
- * Its properties fuel the newly created list item (or its children, depending on the `type`).
- */