@ckeditor/ckeditor5-table 31.0.0 → 31.1.0

package/src/tablecellproperties/commands/tablecellbordercolorcommand.js

@@ -32,7 +32,7 @@ export default class TableCellBorderColorCommand extends TableCellPropertyComman
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'borderColor', defaultValue );
+		super( editor, 'tableCellBorderColor', defaultValue );
 	}
 
 	/**

package/src/tablecellproperties/commands/tablecellborderstylecommand.js

@@ -32,7 +32,7 @@ export default class TableCellBorderStyleCommand extends TableCellPropertyComman
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'borderStyle', defaultValue );
+		super( editor, 'tableCellBorderStyle', defaultValue );
 	}
 
 	/**

package/src/tablecellproperties/commands/tablecellborderwidthcommand.js

@@ -40,7 +40,7 @@ export default class TableCellBorderWidthCommand extends TableCellPropertyComman
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'borderWidth', defaultValue );
+		super( editor, 'tableCellBorderWidth', defaultValue );
 	}
 
 	/**

package/src/tablecellproperties/commands/tablecellheightcommand.js

@@ -40,7 +40,7 @@ export default class TableCellHeightCommand extends TableCellPropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'height', defaultValue );
+		super( editor, 'tableCellHeight', defaultValue );
 	}
 
 	/**

package/src/tablecellproperties/commands/tablecellhorizontalalignmentcommand.js

@@ -31,6 +31,6 @@ export default class TableCellHorizontalAlignmentCommand extends TableCellProper
 	 * @param {String} defaultValue The default value for the "alignment" attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'horizontalAlignment', defaultValue );
+		super( editor, 'tableCellHorizontalAlignment', defaultValue );
 	}
 }

package/src/tablecellproperties/commands/tablecellpaddingcommand.js

@@ -40,7 +40,7 @@ export default class TableCellPaddingCommand extends TableCellPropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'padding', defaultValue );
+		super( editor, 'tableCellPadding', defaultValue );
 	}
 
 	/**

package/src/tablecellproperties/commands/tablecellverticalalignmentcommand.js

@@ -39,6 +39,6 @@ export default class TableCellVerticalAlignmentCommand extends TableCellProperty
 	 * @param {String} defaultValue The default value for the "alignment" attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'verticalAlignment', defaultValue );
+		super( editor, 'tableCellVerticalAlignment', defaultValue );
 	}
 }

package/src/tablecellproperties/commands/tablecellwidthcommand.js

@@ -40,7 +40,7 @@ export default class TableCellWidthCommand extends TableCellPropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'width', defaultValue );
+		super( editor, 'tableCellWidth', defaultValue );
 	}
 
 	/**

package/src/tablecellproperties/tablecellpropertiesediting.js

@@ -31,11 +31,11 @@ const ALIGN_VALUES_REG_EXP = /^(left|center|right|justify)$/;
  *
  * Introduces table cell model attributes and their conversion:
  *
- * - border: `borderStyle`, `borderColor` and `borderWidth`
- * - background color: `backgroundColor`
- * - cell padding: `padding`
- * - horizontal and vertical alignment: `horizontalAlignment`, `verticalAlignment`
- * - cell width and height: `width`, `height`
+ * - border: `tableCellBorderStyle`, `tableCellBorderColor` and `tableCellBorderWidth`
+ * - background color: `tableCellBackgroundColor`
+ * - cell padding: `tableCellPadding`
+ * - horizontal and vertical alignment: `tableCellHorizontalAlignment`, `tableCellVerticalAlignment`
+ * - cell width and height: `tableCellWidth`, `tableCellHeight`
  *
  * It also registers commands used to manipulate the above attributes:
  *
@@ -92,21 +92,15 @@ export default class TableCellPropertiesEditing extends Plugin {
 		editor.commands.add( 'tableCellBorderColor', new TableCellBorderColorCommand( editor, defaultTableCellProperties.borderColor ) );
 		editor.commands.add( 'tableCellBorderWidth', new TableCellBorderWidthCommand( editor, defaultTableCellProperties.borderWidth ) );
 
-		enableHorizontalAlignmentProperty( schema, conversion, defaultTableCellProperties.horizontalAlignment );
-		editor.commands.add(
-			'tableCellHorizontalAlignment',
-			new TableCellHorizontalAlignmentCommand( editor, defaultTableCellProperties.horizontalAlignment )
-		);
-
 		enableProperty( schema, conversion, {
-			modelAttribute: 'width',
+			modelAttribute: 'tableCellWidth',
 			styleName: 'width',
 			defaultValue: defaultTableCellProperties.width
 		} );
 		editor.commands.add( 'tableCellWidth', new TableCellWidthCommand( editor, defaultTableCellProperties.width ) );
 
 		enableProperty( schema, conversion, {
-			modelAttribute: 'height',
+			modelAttribute: 'tableCellHeight',
 			styleName: 'height',
 			defaultValue: defaultTableCellProperties.height
 		} );
@@ -114,7 +108,7 @@ export default class TableCellPropertiesEditing extends Plugin {
 
 		editor.data.addStyleProcessorRules( addPaddingRules );
 		enableProperty( schema, conversion, {
-			modelAttribute: 'padding',
+			modelAttribute: 'tableCellPadding',
 			styleName: 'padding',
 			reduceBoxSides: true,
 			defaultValue: defaultTableCellProperties.padding
@@ -123,7 +117,7 @@ export default class TableCellPropertiesEditing extends Plugin {
 
 		editor.data.addStyleProcessorRules( addBackgroundRules );
 		enableProperty( schema, conversion, {
-			modelAttribute: 'backgroundColor',
+			modelAttribute: 'tableCellBackgroundColor',
 			styleName: 'background-color',
 			defaultValue: defaultTableCellProperties.backgroundColor
 		} );
@@ -132,6 +126,12 @@ export default class TableCellPropertiesEditing extends Plugin {
 			new TableCellBackgroundColorCommand( editor, defaultTableCellProperties.backgroundColor )
 		);
 
+		enableHorizontalAlignmentProperty( schema, conversion, defaultTableCellProperties.horizontalAlignment );
+		editor.commands.add(
+			'tableCellHorizontalAlignment',
+			new TableCellHorizontalAlignmentCommand( editor, defaultTableCellProperties.horizontalAlignment )
+		);
+
 		enableVerticalAlignmentProperty( schema, conversion, defaultTableCellProperties.verticalAlignment );
 		editor.commands.add(
 			'tableCellVerticalAlignment',
@@ -140,26 +140,33 @@ export default class TableCellPropertiesEditing extends Plugin {
 	}
 }
 
-// Enables the `'borderStyle'`, `'borderColor'` and `'borderWidth'` attributes for table cells.
+// Enables the `'tableCellBorderStyle'`, `'tableCellBorderColor'` and `'tableCellBorderWidth'` attributes for table cells.
 //
 // @param {module:engine/model/schema~Schema} schema
 // @param {module:engine/conversion/conversion~Conversion} conversion
 // @param {Object} defaultBorder The default border values.
-// @param {String} defaultBorder.color The default `borderColor` value.
-// @param {String} defaultBorder.style The default `borderStyle` value.
-// @param {String} defaultBorder.width The default `borderWidth` value.
+// @param {String} defaultBorder.color The default `tableCellBorderColor` value.
+// @param {String} defaultBorder.style The default `tableCellBorderStyle` value.
+// @param {String} defaultBorder.width The default `tableCellBorderWidth` value.
 function enableBorderProperties( schema, conversion, defaultBorder ) {
+	const modelAttributes = {
+		width: 'tableCellBorderWidth',
+		color: 'tableCellBorderColor',
+		style: 'tableCellBorderStyle'
+	};
+
 	schema.extend( 'tableCell', {
-		allowAttributes: [ 'borderWidth', 'borderColor', 'borderStyle' ]
+		allowAttributes: Object.values( modelAttributes )
 	} );
-	upcastBorderStyles( conversion, 'td', defaultBorder );
-	upcastBorderStyles( conversion, 'th', defaultBorder );
-	downcastAttributeToStyle( conversion, { modelElement: 'tableCell', modelAttribute: 'borderStyle', styleName: 'border-style' } );
-	downcastAttributeToStyle( conversion, { modelElement: 'tableCell', modelAttribute: 'borderColor', styleName: 'border-color' } );
-	downcastAttributeToStyle( conversion, { modelElement: 'tableCell', modelAttribute: 'borderWidth', styleName: 'border-width' } );
+
+	upcastBorderStyles( conversion, 'td', modelAttributes, defaultBorder );
+	upcastBorderStyles( conversion, 'th', modelAttributes, defaultBorder );
+	downcastAttributeToStyle( conversion, { modelElement: 'tableCell', modelAttribute: modelAttributes.style, styleName: 'border-style' } );
+	downcastAttributeToStyle( conversion, { modelElement: 'tableCell', modelAttribute: modelAttributes.color, styleName: 'border-color' } );
+	downcastAttributeToStyle( conversion, { modelElement: 'tableCell', modelAttribute: modelAttributes.width, styleName: 'border-width' } );
 }
 
-// Enables the `'horizontalAlignment'` attribute for table cells.
+// Enables the `'tableCellHorizontalAlignment'` attribute for table cells.
 //
 // @param {module:engine/model/schema~Schema} schema
 // @param {module:engine/conversion/conversion~Conversion} conversion
@@ -167,14 +174,14 @@ function enableBorderProperties( schema, conversion, defaultBorder ) {
 // @param {String} defaultValue The default horizontal alignment value.
 function enableHorizontalAlignmentProperty( schema, conversion, defaultValue ) {
 	schema.extend( 'tableCell', {
-		allowAttributes: [ 'horizontalAlignment' ]
+		allowAttributes: [ 'tableCellHorizontalAlignment' ]
 	} );
 
 	conversion.for( 'downcast' )
 		.attributeToAttribute( {
 			model: {
 				name: 'tableCell',
-				key: 'horizontalAlignment'
+				key: 'tableCellHorizontalAlignment'
 			},
 			view: alignment => ( {
 				key: 'style',
@@ -194,7 +201,7 @@ function enableHorizontalAlignmentProperty( schema, conversion, defaultValue ) {
 				}
 			},
 			model: {
-				key: 'horizontalAlignment',
+				key: 'tableCellHorizontalAlignment',
 				value: viewElement => {
 					const align = viewElement.getStyle( 'text-align' );
 
@@ -211,7 +218,7 @@ function enableHorizontalAlignmentProperty( schema, conversion, defaultValue ) {
 				}
 			},
 			model: {
-				key: 'horizontalAlignment',
+				key: 'tableCellHorizontalAlignment',
 				value: viewElement => {
 					const align = viewElement.getAttribute( 'align' );
 
@@ -228,14 +235,14 @@ function enableHorizontalAlignmentProperty( schema, conversion, defaultValue ) {
 // @param {String} defaultValue The default vertical alignment value.
 function enableVerticalAlignmentProperty( schema, conversion, defaultValue ) {
 	schema.extend( 'tableCell', {
-		allowAttributes: [ 'verticalAlignment' ]
+		allowAttributes: [ 'tableCellVerticalAlignment' ]
 	} );
 
 	conversion.for( 'downcast' )
 		.attributeToAttribute( {
 			model: {
 				name: 'tableCell',
-				key: 'verticalAlignment'
+				key: 'tableCellVerticalAlignment'
 			},
 			view: alignment => ( {
 				key: 'style',
@@ -255,7 +262,7 @@ function enableVerticalAlignmentProperty( schema, conversion, defaultValue ) {
 				}
 			},
 			model: {
-				key: 'verticalAlignment',
+				key: 'tableCellVerticalAlignment',
 				value: viewElement => {
 					const align = viewElement.getStyle( 'vertical-align' );
 
@@ -272,7 +279,7 @@ function enableVerticalAlignmentProperty( schema, conversion, defaultValue ) {
 				}
 			},
 			model: {
-				key: 'verticalAlignment',
+				key: 'tableCellVerticalAlignment',
 				value: viewElement => {
 					const valign = viewElement.getAttribute( 'valign' );
 

package/src/tablecellproperties/ui/tablecellpropertiesview.js

@@ -430,6 +430,16 @@ export default class TableCellPropertiesView extends View {
 		this.keystrokes.listenTo( this.element );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	destroy() {
+		super.destroy();
+
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+	}
+
 	/**
 	 * Focuses the fist focusable field in the form.
 	 */

package/src/tableproperties/commands/tablealignmentcommand.js

@@ -31,6 +31,6 @@ export default class TableAlignmentCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value for the "alignment" attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'alignment', defaultValue );
+		super( editor, 'tableAlignment', defaultValue );
 	}
 }

package/src/tableproperties/commands/tablebackgroundcolorcommand.js

@@ -31,6 +31,6 @@ export default class TableBackgroundColorCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'backgroundColor', defaultValue );
+		super( editor, 'tableBackgroundColor', defaultValue );
 	}
 }

package/src/tableproperties/commands/tablebordercolorcommand.js

@@ -32,7 +32,7 @@ export default class TableBorderColorCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'borderColor', defaultValue );
+		super( editor, 'tableBorderColor', defaultValue );
 	}
 
 	/**

package/src/tableproperties/commands/tableborderstylecommand.js

@@ -32,7 +32,7 @@ export default class TableBorderStyleCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'borderStyle', defaultValue );
+		super( editor, 'tableBorderStyle', defaultValue );
 	}
 
 	/**

package/src/tableproperties/commands/tableborderwidthcommand.js

@@ -40,7 +40,7 @@ export default class TableBorderWidthCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'borderWidth', defaultValue );
+		super( editor, 'tableBorderWidth', defaultValue );
 	}
 
 	/**

package/src/tableproperties/commands/tableheightcommand.js

@@ -40,7 +40,7 @@ export default class TableHeightCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'height', defaultValue );
+		super( editor, 'tableHeight', defaultValue );
 	}
 
 	/**

package/src/tableproperties/commands/tablewidthcommand.js

@@ -40,7 +40,7 @@ export default class TableWidthCommand extends TablePropertyCommand {
 	 * @param {String} defaultValue The default value of the attribute.
 	 */
 	constructor( editor, defaultValue ) {
-		super( editor, 'width', defaultValue );
+		super( editor, 'tableWidth', defaultValue );
 	}
 
 	/**

package/src/tableproperties/tablepropertiesediting.js

@@ -34,10 +34,10 @@ const FLOAT_VALUES_REG_EXP = /^(left|none|right)$/;
  *
  * Introduces table's model attributes and their conversion:
  *
- * - border: `borderStyle`, `borderColor` and `borderWidth`
- * - background color: `backgroundColor`
- * - horizontal alignment: `alignment`
- * - width & height: `width` & `height`
+ * - border: `tableBorderStyle`, `tableBorderColor` and `tableBorderWidth`
+ * - background color: `tableBackgroundColor`
+ * - horizontal alignment: `tableAlignment`
+ * - width & height: `tableWidth` & `tableHeight`
  *
  * It also registers commands used to manipulate the above attributes:
  *
@@ -91,14 +91,14 @@ export default class TablePropertiesEditing extends Plugin {
 		editor.commands.add( 'tableAlignment', new TableAlignmentCommand( editor, defaultTableProperties.alignment ) );
 
 		enableTableToFigureProperty( schema, conversion, {
-			modelAttribute: 'width',
+			modelAttribute: 'tableWidth',
 			styleName: 'width',
 			defaultValue: defaultTableProperties.width
 		} );
 		editor.commands.add( 'tableWidth', new TableWidthCommand( editor, defaultTableProperties.width ) );
 
 		enableTableToFigureProperty( schema, conversion, {
-			modelAttribute: 'height',
+			modelAttribute: 'tableHeight',
 			styleName: 'height',
 			defaultValue: defaultTableProperties.height
 		} );
@@ -106,7 +106,7 @@ export default class TablePropertiesEditing extends Plugin {
 
 		editor.data.addStyleProcessorRules( addBackgroundRules );
 		enableProperty( schema, conversion, {
-			modelAttribute: 'backgroundColor',
+			modelAttribute: 'tableBackgroundColor',
 			styleName: 'background-color',
 			defaultValue: defaultTableProperties.backgroundColor
 		} );
@@ -117,22 +117,30 @@ export default class TablePropertiesEditing extends Plugin {
 	}
 }
 
-// Enables `'borderStyle'`, `'borderColor'` and `'borderWidth'` attributes for table.
+// Enables `tableBorderStyle'`, `tableBorderColor'` and `tableBorderWidth'` attributes for table.
 //
 // @param {module:engine/model/schema~Schema} schema
 // @param {module:engine/conversion/conversion~Conversion} conversion
 // @param {Object} defaultBorder The default border values.
-// @param {String} defaultBorder.color The default `borderColor` value.
-// @param {String} defaultBorder.style The default `borderStyle` value.
-// @param {String} defaultBorder.width The default `borderWidth` value.
+// @param {String} defaultBorder.color The default `tableBorderColor` value.
+// @param {String} defaultBorder.style The default `tableBorderStyle` value.
+// @param {String} defaultBorder.width The default `tableBorderWidth` value.
 function enableBorderProperties( schema, conversion, defaultBorder ) {
+	const modelAttributes = {
+		width: 'tableBorderWidth',
+		color: 'tableBorderColor',
+		style: 'tableBorderStyle'
+	};
+
 	schema.extend( 'table', {
-		allowAttributes: [ 'borderWidth', 'borderColor', 'borderStyle' ]
+		allowAttributes: Object.values( modelAttributes )
 	} );
-	upcastBorderStyles( conversion, 'table', defaultBorder );
-	downcastTableAttribute( conversion, { modelAttribute: 'borderColor', styleName: 'border-color' } );
-	downcastTableAttribute( conversion, { modelAttribute: 'borderStyle', styleName: 'border-style' } );
-	downcastTableAttribute( conversion, { modelAttribute: 'borderWidth', styleName: 'border-width' } );
+
+	upcastBorderStyles( conversion, 'table', modelAttributes, defaultBorder );
+
+	downcastTableAttribute( conversion, { modelAttribute: modelAttributes.color, styleName: 'border-color' } );
+	downcastTableAttribute( conversion, { modelAttribute: modelAttributes.style, styleName: 'border-style' } );
+	downcastTableAttribute( conversion, { modelAttribute: modelAttributes.width, styleName: 'border-width' } );
 }
 
 // Enables the `'alignment'` attribute for table.
@@ -142,14 +150,14 @@ function enableBorderProperties( schema, conversion, defaultBorder ) {
 // @param {String} defaultValue The default alignment value.
 function enableAlignmentProperty( schema, conversion, defaultValue ) {
 	schema.extend( 'table', {
-		allowAttributes: [ 'alignment' ]
+		allowAttributes: [ 'tableAlignment' ]
 	} );
 
 	conversion.for( 'downcast' )
 		.attributeToAttribute( {
 			model: {
 				name: 'table',
-				key: 'alignment'
+				key: 'tableAlignment'
 			},
 			view: alignment => ( {
 				key: 'style',
@@ -171,7 +179,7 @@ function enableAlignmentProperty( schema, conversion, defaultValue ) {
 				}
 			},
 			model: {
-				key: 'alignment',
+				key: 'tableAlignment',
 				value: viewElement => {
 					let align = viewElement.getStyle( 'float' );
 
@@ -193,7 +201,7 @@ function enableAlignmentProperty( schema, conversion, defaultValue ) {
 			},
 			model: {
 				name: 'table',
-				key: 'alignment',
+				key: 'tableAlignment',
 				value: viewElement => {
 					const align = viewElement.getAttribute( 'align' );
 

package/src/tableproperties/ui/tablepropertiesview.js

@@ -379,6 +379,16 @@ export default class TablePropertiesView extends View {
 		this.keystrokes.listenTo( this.element );
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	destroy() {
+		super.destroy();
+
+		this.focusTracker.destroy();
+		this.keystrokes.destroy();
+	}
+
 	/**
 	 * Focuses the fist focusable field in the form.
 	 */