@ckeditor/ckeditor5-table 35.3.2 → 36.0.0

package/src/tablecellproperties/tablecellpropertiesui.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -113,7 +113,7 @@ export default class TableCellPropertiesUI extends Plugin {
 		 *
 		 * @member {module:table/tablecellproperties/ui/tablecellpropertiesview~TableCellPropertiesView}
 		 */
-		this.view = this._createPropertiesView();
+		this.view = null;
 
 		/**
 		 * The batch used to undo all changes made by the form (which are live, as the user types)
@@ -124,6 +124,15 @@ export default class TableCellPropertiesUI extends Plugin {
 		 */
 		this._undoStepBatch = null;
 
+		/**
+		 * Flag used to indicate whether view is ready to execute update commands
+		 * (it finished loading initial data).
+		 *
+		 * @private
+		 * @member {Boolean}
+		 */
+		this._isReady = false;
+
 		editor.ui.componentFactory.add( 'tableCellProperties', locale => {
 			const view = new ButtonView( locale );
 
@@ -154,7 +163,9 @@ export default class TableCellPropertiesUI extends Plugin {
 
 		// Destroy created UI components as they are not automatically destroyed.
 		// See https://github.com/ckeditor/ckeditor5/issues/1341.
-		this.view.destroy();
+		if ( this.view ) {
+			this.view.destroy();
+		}
 	}
 
 	/**
@@ -166,12 +177,12 @@ export default class TableCellPropertiesUI extends Plugin {
 	 */
 	_createPropertiesView() {
 		const editor = this.editor;
-		const viewDocument = editor.editing.view.document;
 		const config = editor.config.get( 'table.tableCellProperties' );
 		const borderColorsConfig = normalizeColorOptions( config.borderColors );
 		const localizedBorderColors = getLocalizedColorOptions( editor.locale, borderColorsConfig );
 		const backgroundColorsConfig = normalizeColorOptions( config.backgroundColors );
 		const localizedBackgroundColors = getLocalizedColorOptions( editor.locale, backgroundColorsConfig );
+
 		const view = new TableCellPropertiesView( editor.locale, {
 			borderColors: localizedBorderColors,
 			backgroundColors: localizedBackgroundColors,
@@ -201,15 +212,6 @@ export default class TableCellPropertiesUI extends Plugin {
 			cancel();
 		} );
 
-		// Reposition the balloon or hide the form if a table cell is no longer selected.
-		this.listenTo( editor.ui, 'update', () => {
-			if ( !getTableWidgetAncestor( viewDocument.selection ) ) {
-				this._hideView();
-			} else if ( this._isViewVisible ) {
-				repositionContextualBalloon( editor, 'cell' );
-			}
-		} );
-
 		// Close on click outside of balloon panel element.
 		clickOutsideHandler( {
 			emitter: view,
@@ -319,6 +321,8 @@ export default class TableCellPropertiesUI extends Plugin {
 
 				this.view.set( property, value );
 			} );
+
+		this._isReady = true;
 	}
 
 	/**
@@ -333,6 +337,14 @@ export default class TableCellPropertiesUI extends Plugin {
 	_showView() {
 		const editor = this.editor;
 
+		if ( !this.view ) {
+			this.view = this._createPropertiesView();
+		}
+
+		this.listenTo( editor.ui, 'update', () => {
+			this._updateView();
+		} );
+
 		// Update the view with the model values.
 		this._fillViewFormFromCommandValues();
 
@@ -354,14 +366,12 @@ export default class TableCellPropertiesUI extends Plugin {
 	 * @protected
 	 */
 	_hideView() {
-		if ( !this._isViewInBalloon ) {
-			return;
-		}
-
 		const editor = this.editor;
 
 		this.stopListening( editor.ui, 'update' );
 
+		this._isReady = false;
+
 		// Blur any input element before removing it from DOM to prevent issues in some browsers.
 		// See https://github.com/ckeditor/ckeditor5/issues/1501.
 		this.view.saveButtonView.focus();
@@ -373,6 +383,22 @@ export default class TableCellPropertiesUI extends Plugin {
 		this.editor.editing.view.focus();
 	}
 
+	/**
+	 * Repositions the {@link #_balloon} or hides the {@link #view} if a table cell is no longer selected.
+	 *
+	 * @protected
+	 */
+	_updateView() {
+		const editor = this.editor;
+		const viewDocument = editor.editing.view.document;
+
+		if ( !getTableWidgetAncestor( viewDocument.selection ) ) {
+			this._hideView();
+		} else if ( this._isViewVisible ) {
+			repositionContextualBalloon( editor, 'cell' );
+		}
+	}
+
 	/**
 	 * Returns `true` when the {@link #view} is visible in the {@link #_balloon}.
 	 *
@@ -380,7 +406,7 @@ export default class TableCellPropertiesUI extends Plugin {
 	 * @type {Boolean}
 	 */
 	get _isViewVisible() {
-		return this._balloon.visibleView === this.view;
+		return !!this.view && this._balloon.visibleView === this.view;
 	}
 
 	/**
@@ -390,7 +416,7 @@ export default class TableCellPropertiesUI extends Plugin {
 	 * @type {Boolean}
 	 */
 	get _isViewInBalloon() {
-		return this._balloon.hasView( this.view );
+		return !!this.view && this._balloon.hasView( this.view );
 	}
 
 	/**
@@ -399,14 +425,12 @@ export default class TableCellPropertiesUI extends Plugin {
 	 *
 	 * @private
 	 * @param {String} commandName
-	 * @param {String} defaultValue The default value of the command.
 	 * @returns {Function}
 	 */
-	_getPropertyChangeCallback( commandName, defaultValue ) {
-		return ( evt, propertyName, newValue, oldValue ) => {
-			// If the "oldValue" is missing and "newValue" is set to the default value, do not execute the command.
-			// It is an initial call (when opening the table properties view).
-			if ( !oldValue && defaultValue === newValue ) {
+	_getPropertyChangeCallback( commandName ) {
+		return ( evt, propertyName, newValue ) => {
+			// Do not execute the command on initial call (opening the table properties view).
+			if ( !this._isReady ) {
 				return;
 			}
 
@@ -428,21 +452,18 @@ export default class TableCellPropertiesUI extends Plugin {
 	 * @param {module:ui/view~View} options.viewField
 	 * @param {Function} options.validator
 	 * @param {String} options.errorText
-	 * @param {String} options.defaultValue
 	 * @returns {Function}
 	 */
 	_getValidatedPropertyChangeCallback( options ) {
-		const { commandName, viewField, validator, errorText, defaultValue } = options;
+		const { commandName, viewField, validator, errorText } = options;
 		const setErrorTextDebounced = debounce( () => {
 			viewField.errorText = errorText;
 		}, ERROR_TEXT_TIMEOUT );
 
-		return ( evt, propertyName, newValue, oldValue ) => {
+		return ( evt, propertyName, newValue ) => {
 			setErrorTextDebounced.cancel();
-
-			// If the "oldValue" is missing and "newValue" is set to the default value, do not execute the command.
-			// It is an initial call (when opening the table properties view).
-			if ( !oldValue && defaultValue === newValue ) {
+			// Do not execute the command on initial call (opening the table properties view).
+			if ( !this._isReady ) {
 				return;
 			}
 

package/src/tablecellproperties/ui/tablecellpropertiesview.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablecellproperties.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablecellwidth/commands/tablecellwidthcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablecellwidth/tablecellwidthediting.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableclipboard.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablecolumnresize/constants.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablecolumnresize/converters.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -68,9 +68,11 @@ export function downcastTableColumnWidthsAttribute() {
 	return dispatcher => dispatcher.on( 'attribute:columnWidths:table', ( evt, data, conversionApi ) => {
 		const viewWriter = conversionApi.writer;
 		const modelTable = data.item;
+		const viewElement = conversionApi.mapper.toViewElement( modelTable );
 
-		const viewTable = [ ...conversionApi.mapper.toViewElement( modelTable ).getChildren() ]
-			.find( viewChild => viewChild.is( 'element', 'table' ) );
+		const viewTable = viewElement.is( 'element', 'table' ) ?
+			viewElement :
+			Array.from( viewElement.getChildren() ).find( viewChild => viewChild.is( 'element', 'table' ) );
 
 		if ( data.attributeNewValue ) {
 			// If new value is the same as the old, the operation is not applied (see the `writer.setAttributeOnItem()`).

package/src/tablecolumnresize/tablecolumnresizeediting.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -35,7 +35,6 @@ import {
 	getTableWidthInPixels,
 	normalizeColumnWidths,
 	toPrecision,
-	ensureColumnResizerElement,
 	getDomCellOuterWidth
 } from './utils';
 
@@ -715,18 +714,17 @@ export default class TableColumnResizeEditing extends Plugin {
 	 * @private
 	 */
 	_registerResizerInserter() {
-		const view = this.editor.editing.view;
-
-		view.on( 'render', () => {
-			for ( const item of view.createRangeIn( view.document.getRoot() ) ) {
-				if ( ![ 'td', 'th' ].includes( item.item.name ) ) {
-					continue;
-				}
-
-				view.change( viewWriter => {
-					ensureColumnResizerElement( viewWriter, item.item );
-				} );
-			}
-		}, { priority: 'lowest' } );
+		this.editor.conversion.for( 'editingDowncast' ).add( dispatcher => {
+			dispatcher.on( 'insert:tableCell', ( evt, data, conversionApi ) => {
+				const modelElement = data.item;
+				const viewElement = conversionApi.mapper.toViewElement( modelElement );
+				const viewWriter = conversionApi.writer;
+
+				viewWriter.insert(
+					viewWriter.createPositionAt( viewElement, 'end' ),
+					viewWriter.createUIElement( 'div', { class: 'ck-table-column-resizer' } )
+				);
+			}, { priority: 'lowest' } );
+		} );
 	}
 }

package/src/tablecolumnresize/tablecolumnwidthscommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablecolumnresize/tablewidthresizecommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -39,8 +39,8 @@ export default class TableWidthResizeCommand extends TablePropertyCommand {
 	 * Changes the `tableWidth` and `columnWidths` attribute values for the given or currently selected table.
 	 *
 	 * @param {Object} options
-	 * @param {String} [options.tableWidth] The new table width.
-	 * @param {String} [options.columnWidths] The new table column widths.
+	 * @param {String} [options.tableWidth] The new table width. If skipped, the model attribute will be removed.
+	 * @param {String} [options.columnWidths] The new table column widths. If skipped, the model attribute will be removed.
 	 * @param {module:engine/model/element~Element} [options.table] The table that is affected by the resize.
 	 */
 	execute( options = {} ) {
@@ -51,10 +51,15 @@ export default class TableWidthResizeCommand extends TablePropertyCommand {
 		model.change( writer => {
 			if ( tableWidth ) {
 				writer.setAttribute( this.attributeName, tableWidth, table );
-				writer.setAttribute( 'columnWidths', columnWidths, table );
 			} else {
 				writer.removeAttribute( this.attributeName, table );
 			}
+
+			if ( columnWidths ) {
+				writer.setAttribute( 'columnWidths', columnWidths, table );
+			} else {
+				writer.removeAttribute( 'columnWidths', table );
+			}
 		} );
 	}
 }

package/src/tablecolumnresize/utils.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -282,30 +282,6 @@ function calculateMissingColumnWidths( columnWidths ) {
 		.map( columnWidth => toPrecision( columnWidth ) );
 }
 
-/**
- * Inserts column resizer element into a view cell if it is missing.
- *
- * @param {module:engine/view/downcastwriter~DowncastWriter} viewWriter View writer instance.
- * @param {module:engine/view/element~Element} viewCell View cell where resizer should be put.
- */
-export function ensureColumnResizerElement( viewWriter, viewCell ) {
-	let viewTableColumnResizerElement = [ ...viewCell.getChildren() ]
-		.find( viewElement => viewElement.hasClass( 'ck-table-column-resizer' ) );
-
-	if ( viewTableColumnResizerElement ) {
-		return;
-	}
-
-	viewTableColumnResizerElement = viewWriter.createUIElement( 'div', {
-		class: 'ck-table-column-resizer'
-	} );
-
-	viewWriter.insert(
-		viewWriter.createPositionAt( viewCell, 'end' ),
-		viewTableColumnResizerElement
-	);
-}
-
 /**
  * Calculates the total horizontal space taken by the cell. That includes:
  *  * width,

package/src/tablecolumnresize.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableediting.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -152,11 +152,6 @@ export default class TableEditing extends Plugin {
 			view: 'rowspan'
 		} );
 
-		// Manually adjust model position mappings in a special case, when a table cell contains a paragraph, which is bound
-		// to its parent (to the table cell). This custom model-to-view position mapping is necessary in data pipeline only,
-		// because only during this conversion a paragraph can be bound to its parent.
-		editor.data.mapper.on( 'modelToViewPosition', mapTableCellModelPositionToView() );
-
 		// Define the config.
 		editor.config.define( 'table.defaultHeadings.rows', 0 );
 		editor.config.define( 'table.defaultHeadings.columns', 0 );
@@ -197,40 +192,6 @@ export default class TableEditing extends Plugin {
 	}
 }
 
-// Creates a mapper callback to adjust model position mappings in a table cell containing a paragraph, which is bound to its parent
-// (to the table cell). Only positions after this paragraph have to be adjusted, because after binding this paragraph to the table cell,
-// elements located after this paragraph would point either to a non-existent offset inside `tableCell` (if paragraph is empty), or after
-// the first character of the paragraph's text. See https://github.com/ckeditor/ckeditor5/issues/10116.
-//
-// <tableCell><paragraph></paragraph>^</tableCell> -> <td>^&nbsp;</td>
-//
-// <tableCell><paragraph>foobar</paragraph>^</tableCell> -> <td>foobar^</td>
-//
-// @returns {Function}
-function mapTableCellModelPositionToView() {
-	return ( evt, data ) => {
-		const modelParent = data.modelPosition.parent;
-		const modelNodeBefore = data.modelPosition.nodeBefore;
-
-		if ( !modelParent.is( 'element', 'tableCell' ) ) {
-			return;
-		}
-
-		if ( !modelNodeBefore || !modelNodeBefore.is( 'element', 'paragraph' ) ) {
-			return;
-		}
-
-		const viewNodeBefore = data.mapper.toViewElement( modelNodeBefore );
-		const viewParent = data.mapper.toViewElement( modelParent );
-
-		if ( viewNodeBefore === viewParent ) {
-			// Since the paragraph has already been bound to its parent, update the current position in the model with paragraph's
-			// max offset, so it points to the place which should normally (in all other cases) be the end position of this paragraph.
-			data.viewPosition = data.mapper.findPositionIn( viewParent, modelNodeBefore.maxOffset );
-		}
-	};
-}
-
 // Returns fixed colspan and rowspan attrbutes values.
 //
 // @private

package/src/tablekeyboard.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablemouse/mouseeventsobserver.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tablemouse.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tablealignmentcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tablebackgroundcolorcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tablebordercolorcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tableborderstylecommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tableborderwidthcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tableheightcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tablepropertycommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/commands/tablewidthcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 

package/src/tableproperties/tablepropertiesediting.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -242,6 +242,12 @@ function enableTableToFigureProperty( schema, conversion, options ) {
 	schema.extend( 'table', {
 		allowAttributes: [ modelAttribute ]
 	} );
-	upcastStyleToAttribute( conversion, { viewElement: /^(table|figure)$/, ...options } );
+
+	upcastStyleToAttribute( conversion, {
+		viewElement: /^(table|figure)$/,
+		shouldUpcast: element => !( element.name == 'table' && element.parent.name == 'figure' ),
+		...options
+	} );
+
 	downcastAttributeToStyle( conversion, { modelElement: 'table', ...options } );
 }