@ckeditor/ckeditor5-table 34.2.0 → 35.1.0

package/src/ui/inserttableview.js

@@ -7,7 +7,9 @@
  * @module table/ui/inserttableview
  */
 
-import { View } from 'ckeditor5/src/ui';
+import { View, addKeyboardHandlingForGrid } from 'ckeditor5/src/ui';
+
+import { KeystrokeHandler, FocusTracker, uid } from 'ckeditor5/src/utils';
 
 import './../../theme/inserttable.css';
 
@@ -28,6 +30,16 @@ export default class InsertTableView extends View {
 
 		const bind = this.bindTemplate;
 
+		/**
+		 * A unique id of a label element displaying the current geometry of the table.
+		 * Used by every {@link #items item} of the view as a pointer to an accessible label.
+		 *
+		 * @private
+		 * @readonly
+		 * @member {String}
+		 */
+		this._geometryLabelId = `ck-editor__label_${ uid() }`;
+
 		/**
 		 * A collection of table size box items.
 		 *
@@ -36,6 +48,16 @@ export default class InsertTableView extends View {
 		 */
 		this.items = this._createGridCollection();
 
+		this.keystrokes = new KeystrokeHandler();
+
+		/**
+		 * Tracks information about the DOM focus in the grid.
+		 *
+		 * @readonly
+		 * @member {module:utils/focustracker~FocusTracker}
+		 */
+		this.focusTracker = new FocusTracker();
+
 		/**
 		 * The currently selected number of rows of the new table.
 		 *
@@ -81,7 +103,11 @@ export default class InsertTableView extends View {
 				{
 					tag: 'div',
 					attributes: {
-						class: [ 'ck-insert-table-dropdown__label' ]
+						id: this._geometryLabelId,
+						class: [
+							'ck',
+							'ck-insert-table-dropdown__label'
+						]
 					},
 					children: [
 						{
@@ -98,13 +124,34 @@ export default class InsertTableView extends View {
 
 				click: bind.to( () => {
 					this.fire( 'execute' );
+				} ),
+
+				keydown: bind.to( evt => {
+					if ( evt.key === 'Enter' ) {
+						this.fire( 'execute' );
+						evt.preventDefault();
+					}
 				} )
 			}
 		} );
 
+		// #rows and #columns are set via changes to #focusTracker on mouse over.
 		this.on( 'boxover', ( evt, domEvt ) => {
 			const { row, column } = domEvt.target.dataset;
 
+			this.items.get( ( row - 1 ) * 10 + ( column - 1 ) ).focus();
+		} );
+
+		// This allows the #rows and #columns to be updated when:
+		// * the user navigates the grid using the keyboard,
+		// * the user moves the mouse over grid items.
+		this.focusTracker.on( 'change:focusedElement', ( evt, name, focusedElement ) => {
+			if ( !focusedElement ) {
+				return;
+			}
+
+			const { row, column } = focusedElement.dataset;
+
 			// As row & column indexes are zero-based transform it to number of selected rows & columns.
 			this.set( {
 				rows: parseInt( row ),
@@ -112,29 +159,39 @@ export default class InsertTableView extends View {
 			} );
 		} );
 
-		this.on( 'change:columns', () => {
-			this._highlightGridBoxes();
-		} );
+		this.on( 'change:columns', () => this._highlightGridBoxes() );
+		this.on( 'change:rows', () => this._highlightGridBoxes() );
+	}
+
+	render() {
+		super.render();
 
-		this.on( 'change:rows', () => {
-			this._highlightGridBoxes();
+		addKeyboardHandlingForGrid( {
+			keystrokeHandler: this.keystrokes,
+			focusTracker: this.focusTracker,
+			gridItems: this.items,
+			numberOfColumns: 10
 		} );
+
+		for ( const item of this.items ) {
+			this.focusTracker.add( item.element );
+		}
+
+		this.keystrokes.listenTo( this.element );
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	focus() {
-		// The dropdown panel expects DropdownPanelFocusable interface on views passed to dropdown panel. See #30.
-		// The method should be implemented while working on keyboard support for this view. See #22.
+		this.items.get( 0 ).focus();
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	focusLast() {
-		// The dropdown panel expects DropdownPanelFocusable interface on views passed to dropdown panel. See #30.
-		// The method should be implemented while working on keyboard support for this view. See #22.
+		this.items.get( 0 ).focus();
 	}
 
 	/**
@@ -170,7 +227,7 @@ export default class InsertTableView extends View {
 			const row = Math.floor( index / 10 );
 			const column = index % 10;
 
-			boxes.push( new TableSizeGridBoxView( this.locale, row + 1, column + 1 ) );
+			boxes.push( new TableSizeGridBoxView( this.locale, row + 1, column + 1, this._geometryLabelId ) );
 		}
 
 		return this.createCollection( boxes );
@@ -194,7 +251,7 @@ class TableSizeGridBoxView extends View {
 	/**
 	 * @inheritDoc
 	 */
-	constructor( locale, row, column ) {
+	constructor( locale, row, column, ariaLabelledById ) {
 		super( locale );
 
 		const bind = this.bindTemplate;
@@ -211,12 +268,22 @@ class TableSizeGridBoxView extends View {
 			tag: 'div',
 			attributes: {
 				class: [
+					'ck',
 					'ck-insert-table-dropdown-grid-box',
 					bind.if( 'isOn', 'ck-on' )
 				],
 				'data-row': row,
-				'data-column': column
+				'data-column': column,
+				'tabindex': -1,
+				'aria-labelledby': ariaLabelledById
 			}
 		} );
 	}
+
+	/**
+	 * @inheritDoc
+	 */
+	focus() {
+		this.element.focus();
+	}
 }

package/src/utils/ui/contextualballoon.js

@@ -63,7 +63,7 @@ export function getBalloonTablePositionData( editor ) {
 	const viewTable = editor.editing.mapper.toViewElement( modelTable );
 
 	return {
-		target: editor.editing.view.domConverter.viewToDom( viewTable ),
+		target: editor.editing.view.domConverter.mapViewToDom( viewTable ),
 		positions: BALLOON_POSITIONS
 	};
 }
@@ -92,7 +92,7 @@ export function getBalloonCellPositionData( editor ) {
 	const viewTableCell = mapper.toViewElement( modelTableCell );
 
 	return {
-		target: domConverter.viewToDom( viewTableCell ),
+		target: domConverter.mapViewToDom( viewTableCell ),
 		positions: BALLOON_POSITIONS
 	};
 }
@@ -118,7 +118,7 @@ function createBoundingRect( ranges, editor ) {
 	const rects = Array.from( ranges ).map( range => {
 		const modelTableCell = getTableCellAtPosition( range.start );
 		const viewTableCell = mapper.toViewElement( modelTableCell );
-		return new Rect( domConverter.viewToDom( viewTableCell ) );
+		return new Rect( domConverter.mapViewToDom( viewTableCell ) );
 	} );
 
 	return Rect.getBoundingRect( rects );

package/src/utils/ui/widget.js

@@ -32,7 +32,13 @@ export function getSelectedTableWidget( selection ) {
  * @returns {module:engine/view/element~Element|null}
  */
 export function getTableWidgetAncestor( selection ) {
-	let parent = selection.getFirstPosition().parent;
+	const selectionPosition = selection.getFirstPosition();
+
+	if ( !selectionPosition ) {
+		return null;
+	}
+
+	let parent = selectionPosition.parent;
 
 	while ( parent ) {
 		if ( parent.is( 'element' ) && isTableWidget( parent ) ) {

package/theme/tablecolumnresize.css

@@ -12,9 +12,12 @@
 	--ck-table-column-resizer-position-offset: calc(var(--ck-table-column-resizer-width) * -0.5 - 0.5px);
 }
 
+.ck-content .table .ck-table-resized {
+	table-layout: fixed;
+}
+
 .ck-content .table table {
 	overflow: hidden;
-	table-layout: fixed;
 }
 
 .ck-content .table td,
@@ -22,7 +25,7 @@
 	position: relative;
 }
 
-.ck-content .table .table-column-resizer {
+.ck.ck-editor__editable .table .ck-table-column-resizer {
 	position: absolute;
 	/* The resizer element resides in each cell so to occupy the entire height of the table, which is unknown from a CSS point of view,
 	   it is extended to an extremely high height. Even for screens with a very high pixel density, the resizer will fulfill its role as
@@ -37,23 +40,23 @@
 	z-index: var(--ck-z-default);
 }
 
+.ck.ck-editor__editable.ck-column-resize_disabled .table .ck-table-column-resizer {
+	display: none;
+}
+
 /* The resizer elements, which are extended to an extremely high height, break the drag & drop feature in Chrome. To make it work again,
    all resizers must be hidden while the table is dragged. */
-.ck-content .table[draggable] .table-column-resizer {
+.ck.ck-editor__editable .table[draggable] .ck-table-column-resizer {
 	display: none;
 }
 
-.ck-content .table .table-column-resizer:hover,
-.ck-content .table .table-column-resizer__active {
+.ck.ck-editor__editable .table .ck-table-column-resizer:hover,
+.ck.ck-editor__editable .table .ck-table-column-resizer__active {
 	background-color: var(--ck-color-table-column-resizer-hover);
 	opacity: 0.25;
 }
 
-.ck-content[dir=rtl] .table .table-column-resizer {
+.ck.ck-editor__editable[dir=rtl] .table .ck-table-column-resizer {
 	left: var(--ck-table-column-resizer-position-offset);
 	right: unset;
 }
-
-.ck-content.ck-read-only .table .table-column-resizer {
-	display: none;
-}