@ckeditor/ckeditor5-table 43.0.0-alpha.6 → 43.1.0-alpha.0

package/dist/utils/table-properties.d.ts

@@ -54,18 +54,48 @@ export interface NormalizedDefaultProperties {
     horizontalAlignment?: string;
 }
 /**
- * Returns the normalized configuration.
- *
- * @param options.includeAlignmentProperty Whether the "alignment" property should be added.
- * @param options.includePaddingProperty Whether the "padding" property should be added.
- * @param options.includeVerticalAlignmentProperty Whether the "verticalAlignment" property should be added.
- * @param options.includeHorizontalAlignmentProperty Whether the "horizontalAlignment" property should be added.
- * @param options.isRightToLeftContent Whether the content is right-to-left.
+ * Options used to determine which properties should be added to the normalized configuration.
  */
-export declare function getNormalizedDefaultProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: {
+export type NormalizeTableDefaultPropertiesOptions = {
+    /**
+     * Whether the "alignment" property should be added.
+     */
     includeAlignmentProperty?: boolean;
+    /**
+     * Whether the "padding" property should be added.
+     */
     includePaddingProperty?: boolean;
+    /**
+     * Whether the "verticalAlignment" property should be added.
+     */
     includeVerticalAlignmentProperty?: boolean;
+    /**
+     * Whether the "horizontalAlignment" property should be added.
+     */
     includeHorizontalAlignmentProperty?: boolean;
+    /**
+     * Whether the content is right-to-left.
+     */
     isRightToLeftContent?: boolean;
-}): NormalizedDefaultProperties;
+};
+/**
+ * Returns the normalized configuration.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export declare function getNormalizedDefaultProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: NormalizeTableDefaultPropertiesOptions): NormalizedDefaultProperties;
+/**
+ * Returns the normalized default table properties.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export declare function getNormalizedDefaultTableProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: NormalizeTableDefaultPropertiesOptions): NormalizedDefaultProperties;
+/**
+ * Returns the normalized default cell properties.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export declare function getNormalizedDefaultCellProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: NormalizeTableDefaultPropertiesOptions): NormalizedDefaultProperties;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-table",
-  "version": "43.0.0-alpha.6",
+  "version": "43.1.0-alpha.0",
   "description": "Table feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,13 +13,13 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "43.0.0-alpha.6",
-    "@ckeditor/ckeditor5-clipboard": "43.0.0-alpha.6",
-    "@ckeditor/ckeditor5-core": "43.0.0-alpha.6",
-    "@ckeditor/ckeditor5-engine": "43.0.0-alpha.6",
-    "@ckeditor/ckeditor5-ui": "43.0.0-alpha.6",
-    "@ckeditor/ckeditor5-utils": "43.0.0-alpha.6",
-    "@ckeditor/ckeditor5-widget": "43.0.0-alpha.6",
+    "ckeditor5": "43.1.0-alpha.0",
+    "@ckeditor/ckeditor5-clipboard": "43.1.0-alpha.0",
+    "@ckeditor/ckeditor5-core": "43.1.0-alpha.0",
+    "@ckeditor/ckeditor5-engine": "43.1.0-alpha.0",
+    "@ckeditor/ckeditor5-ui": "43.1.0-alpha.0",
+    "@ckeditor/ckeditor5-utils": "43.1.0-alpha.0",
+    "@ckeditor/ckeditor5-widget": "43.1.0-alpha.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/tablecellproperties/tablecellpropertiesediting.js

@@ -18,7 +18,7 @@ import TableCellHorizontalAlignmentCommand from './commands/tablecellhorizontala
 import TableCellBorderStyleCommand from './commands/tablecellborderstylecommand.js';
 import TableCellBorderColorCommand from './commands/tablecellbordercolorcommand.js';
 import TableCellBorderWidthCommand from './commands/tablecellborderwidthcommand.js';
-import { getNormalizedDefaultProperties } from '../utils/table-properties.js';
+import { getNormalizedDefaultCellProperties } from '../utils/table-properties.js';
 import { enableProperty } from '../utils/common.js';
 const VALIGN_VALUES_REG_EXP = /^(top|middle|bottom)$/;
 const ALIGN_VALUES_REG_EXP = /^(left|center|right|justify)$/;
@@ -62,7 +62,7 @@ export default class TableCellPropertiesEditing extends Plugin {
         const schema = editor.model.schema;
         const conversion = editor.conversion;
         editor.config.define('table.tableCellProperties.defaultProperties', {});
-        const defaultTableCellProperties = getNormalizedDefaultProperties(editor.config.get('table.tableCellProperties.defaultProperties'), {
+        const defaultTableCellProperties = getNormalizedDefaultCellProperties(editor.config.get('table.tableCellProperties.defaultProperties'), {
             includeVerticalAlignmentProperty: true,
             includeHorizontalAlignmentProperty: true,
             includePaddingProperty: true,

package/src/tablecellproperties/tablecellpropertiesui.js

@@ -13,7 +13,7 @@ import { debounce } from 'lodash-es';
 import { getTableWidgetAncestor } from '../utils/ui/widget.js';
 import { getBalloonCellPositionData, repositionContextualBalloon } from '../utils/ui/contextualballoon.js';
 import tableCellProperties from './../../theme/icons/table-cell-properties.svg';
-import { getNormalizedDefaultProperties } from '../utils/table-properties.js';
+import { getNormalizedDefaultCellProperties } from '../utils/table-properties.js';
 const ERROR_TEXT_TIMEOUT = 500;
 // Map of view properties and related commands.
 const propertyToCommandMap = {
@@ -62,7 +62,7 @@ export default class TableCellPropertiesUI extends Plugin {
     init() {
         const editor = this.editor;
         const t = editor.t;
-        this._defaultTableCellProperties = getNormalizedDefaultProperties(editor.config.get('table.tableCellProperties.defaultProperties'), {
+        this._defaultTableCellProperties = getNormalizedDefaultCellProperties(editor.config.get('table.tableCellProperties.defaultProperties'), {
             includeVerticalAlignmentProperty: true,
             includeHorizontalAlignmentProperty: true,
             includePaddingProperty: true,

package/src/tablecellwidth/tablecellwidthediting.js

@@ -8,7 +8,7 @@
 import { Plugin } from 'ckeditor5/src/core.js';
 import TableEditing from './../tableediting.js';
 import TableCellWidthCommand from './commands/tablecellwidthcommand.js';
-import { getNormalizedDefaultProperties } from '../utils/table-properties.js';
+import { getNormalizedDefaultCellProperties } from '../utils/table-properties.js';
 import { enableProperty } from '../utils/common.js';
 /**
  * The table cell width editing feature.
@@ -34,7 +34,7 @@ export default class TableCellWidthEditing extends Plugin {
      */
     init() {
         const editor = this.editor;
-        const defaultTableCellProperties = getNormalizedDefaultProperties(editor.config.get('table.tableCellProperties.defaultProperties'));
+        const defaultTableCellProperties = getNormalizedDefaultCellProperties(editor.config.get('table.tableCellProperties.defaultProperties'));
         enableProperty(editor.model.schema, editor.conversion, {
             modelAttribute: 'tableCellWidth',
             styleName: 'width',

package/src/tableproperties/tablepropertiesediting.js

@@ -16,7 +16,7 @@ import TableBorderWidthCommand from './commands/tableborderwidthcommand.js';
 import TableWidthCommand from './commands/tablewidthcommand.js';
 import TableHeightCommand from './commands/tableheightcommand.js';
 import TableAlignmentCommand from './commands/tablealignmentcommand.js';
-import { getNormalizedDefaultProperties } from '../utils/table-properties.js';
+import { getNormalizedDefaultTableProperties } from '../utils/table-properties.js';
 const ALIGN_VALUES_REG_EXP = /^(left|center|right)$/;
 const FLOAT_VALUES_REG_EXP = /^(left|none|right)$/;
 /**
@@ -57,7 +57,7 @@ export default class TablePropertiesEditing extends Plugin {
         const schema = editor.model.schema;
         const conversion = editor.conversion;
         editor.config.define('table.tableProperties.defaultProperties', {});
-        const defaultTableProperties = getNormalizedDefaultProperties(editor.config.get('table.tableProperties.defaultProperties'), {
+        const defaultTableProperties = getNormalizedDefaultTableProperties(editor.config.get('table.tableProperties.defaultProperties'), {
             includeAlignmentProperty: true
         });
         editor.data.addStyleProcessorRules(addBorderRules);

package/src/tableproperties/tablepropertiesui.js

@@ -13,7 +13,7 @@ import tableProperties from './../../theme/icons/table-properties.svg';
 import { colorFieldValidator, getLocalizedColorErrorText, getLocalizedLengthErrorText, lengthFieldValidator, lineWidthFieldValidator, defaultColors } from '../utils/ui/table-properties.js';
 import { getSelectionAffectedTableWidget } from '../utils/ui/widget.js';
 import { getBalloonTablePositionData, repositionContextualBalloon } from '../utils/ui/contextualballoon.js';
-import { getNormalizedDefaultProperties } from '../utils/table-properties.js';
+import { getNormalizedDefaultTableProperties } from '../utils/table-properties.js';
 const ERROR_TEXT_TIMEOUT = 500;
 // Map of view properties and related commands.
 const propertyToCommandMap = {
@@ -64,7 +64,7 @@ export default class TablePropertiesUI extends Plugin {
     init() {
         const editor = this.editor;
         const t = editor.t;
-        this._defaultTableProperties = getNormalizedDefaultProperties(editor.config.get('table.tableProperties.defaultProperties'), {
+        this._defaultTableProperties = getNormalizedDefaultTableProperties(editor.config.get('table.tableProperties.defaultProperties'), {
             includeAlignmentProperty: true
         });
         this._balloon = editor.plugins.get(ContextualBalloon);

package/src/utils/table-properties.d.ts

@@ -50,18 +50,48 @@ export interface NormalizedDefaultProperties {
     horizontalAlignment?: string;
 }
 /**
- * Returns the normalized configuration.
- *
- * @param options.includeAlignmentProperty Whether the "alignment" property should be added.
- * @param options.includePaddingProperty Whether the "padding" property should be added.
- * @param options.includeVerticalAlignmentProperty Whether the "verticalAlignment" property should be added.
- * @param options.includeHorizontalAlignmentProperty Whether the "horizontalAlignment" property should be added.
- * @param options.isRightToLeftContent Whether the content is right-to-left.
+ * Options used to determine which properties should be added to the normalized configuration.
  */
-export declare function getNormalizedDefaultProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: {
+export type NormalizeTableDefaultPropertiesOptions = {
+    /**
+     * Whether the "alignment" property should be added.
+     */
     includeAlignmentProperty?: boolean;
+    /**
+     * Whether the "padding" property should be added.
+     */
     includePaddingProperty?: boolean;
+    /**
+     * Whether the "verticalAlignment" property should be added.
+     */
     includeVerticalAlignmentProperty?: boolean;
+    /**
+     * Whether the "horizontalAlignment" property should be added.
+     */
     includeHorizontalAlignmentProperty?: boolean;
+    /**
+     * Whether the content is right-to-left.
+     */
     isRightToLeftContent?: boolean;
-}): NormalizedDefaultProperties;
+};
+/**
+ * Returns the normalized configuration.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export declare function getNormalizedDefaultProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: NormalizeTableDefaultPropertiesOptions): NormalizedDefaultProperties;
+/**
+ * Returns the normalized default table properties.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export declare function getNormalizedDefaultTableProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: NormalizeTableDefaultPropertiesOptions): NormalizedDefaultProperties;
+/**
+ * Returns the normalized default cell properties.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export declare function getNormalizedDefaultCellProperties(config: Partial<NormalizedDefaultProperties> | undefined, options?: NormalizeTableDefaultPropertiesOptions): NormalizedDefaultProperties;

package/src/utils/table-properties.js

@@ -54,11 +54,8 @@ export function addDefaultUnitToNumericValue(value, defaultUnit) {
 /**
  * Returns the normalized configuration.
  *
- * @param options.includeAlignmentProperty Whether the "alignment" property should be added.
- * @param options.includePaddingProperty Whether the "padding" property should be added.
- * @param options.includeVerticalAlignmentProperty Whether the "verticalAlignment" property should be added.
- * @param options.includeHorizontalAlignmentProperty Whether the "horizontalAlignment" property should be added.
- * @param options.isRightToLeftContent Whether the content is right-to-left.
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
  */
 export function getNormalizedDefaultProperties(config, options = {}) {
     const normalizedConfig = {
@@ -84,3 +81,35 @@ export function getNormalizedDefaultProperties(config, options = {}) {
     }
     return normalizedConfig;
 }
+/**
+ * Returns the normalized default table properties.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export function getNormalizedDefaultTableProperties(config, options) {
+    return getNormalizedDefaultProperties({
+        // It adds support for border none in the table element, keep it in sync with the content styles
+        // See more: https://github.com/ckeditor/ckeditor5/issues/6841#issuecomment-1959195608
+        borderStyle: 'double',
+        borderColor: 'hsl(0, 0%, 70%)',
+        borderWidth: '1px',
+        ...config
+    }, options);
+}
+/**
+ * Returns the normalized default cell properties.
+ *
+ * @param config The configuration to normalize.
+ * @param options Options used to determine which properties should be added.
+ */
+export function getNormalizedDefaultCellProperties(config, options) {
+    return getNormalizedDefaultProperties({
+        // It adds support for border none in the table element, keep it in sync with the content styles
+        // See more: https://github.com/ckeditor/ckeditor5/issues/6841#issuecomment-1959195608
+        borderStyle: 'solid',
+        borderColor: 'hsl(0, 0%, 75%)',
+        borderWidth: '1px',
+        ...config
+    }, options);
+}

package/theme/table.css

@@ -42,6 +42,23 @@
 	}
 }
 
+/**
+ * Expanding the table to the full height of the parent container is necessary because tables
+ * are rendered inside <figure> elements, which is kinda buggy in table height calculation.
+ * While setting `height: 100%` fixes the issue in the editing mode described here:
+ * https://github.com/ckeditor/ckeditor5/issues/6186
+ *
+ * it's causing another issue with the table height in the print preview mode here:
+ * https://github.com/ckeditor/ckeditor5/issues/16856
+ *
+ * For now, resetting the height to `initial` in the print mode works as a workaround.
+ */
+@media print {
+	.ck-content .table table {
+		height: initial;
+	}
+}
+
 /* Text alignment of the table header should match the editor settings and override the native browser styling,
 when content is available outside the editor. See https://github.com/ckeditor/ckeditor5/issues/6638 */
 .ck-content[dir="rtl"] .table th {