@ckeditor/ckeditor5-table 46.0.0-alpha.3 → 46.0.0-alpha.5

package/package.json

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

package/src/converters/tableproperties.d.ts

@@ -26,6 +26,7 @@ export declare function upcastStyleToAttribute(conversion: Conversion, options:
     viewElement: string | RegExp;
     defaultValue: string;
     reduceBoxSides?: boolean;
+    shouldUpcast?: (viewElement: ViewElement) => boolean;
 }): void;
 /**
  * The style values for border styles.

package/src/converters/tableproperties.js

@@ -16,7 +16,7 @@ import { first } from 'ckeditor5/src/utils.js';
  * @internal
  */
 export function upcastStyleToAttribute(conversion, options) {
-    const { modelAttribute, styleName, attributeName, attributeType, viewElement, defaultValue, reduceBoxSides = false } = options;
+    const { modelAttribute, styleName, attributeName, attributeType, viewElement, defaultValue, shouldUpcast = () => true, reduceBoxSides = false } = options;
     conversion.for('upcast').attributeToAttribute({
         view: {
             name: viewElement,
@@ -28,8 +28,7 @@ export function upcastStyleToAttribute(conversion, options) {
             key: modelAttribute,
             value: (viewElement, conversionApi, data) => {
                 // Ignore table elements inside figures and figures without the table class.
-                if (viewElement.name == 'table' && viewElement.parent.name == 'figure' ||
-                    viewElement.name == 'figure' && !viewElement.hasClass('table')) {
+                if (!shouldUpcast(viewElement)) {
                     return;
                 }
                 const localDefaultValue = getDefaultValueAdjusted(defaultValue, '', data);

package/src/tableproperties/tablepropertiesediting.js

@@ -276,6 +276,11 @@ function enableTableToFigureProperty(schema, conversion, options) {
         allowAttributes: [modelAttribute]
     });
     schema.setAttributeProperties(modelAttribute, { isFormatting: true });
-    upcastStyleToAttribute(conversion, { viewElement: /^(table|figure)$/, ...options });
+    upcastStyleToAttribute(conversion, {
+        viewElement: /^(table|figure)$/,
+        shouldUpcast: (viewElement) => !(viewElement.name == 'table' && viewElement.parent.name == 'figure' ||
+            viewElement.name == 'figure' && !viewElement.hasClass('table')),
+        ...options
+    });
     downcastAttributeToStyle(conversion, { modelElement: 'table', ...options });
 }

package/theme/table.css

@@ -54,9 +54,29 @@
 
 				& > td,
 				& > th {
-					/* stylelint-enable no-descending-specificity */
+					/* Opinionated table content styling: prevents content from shifting
+					 * when Enter is pressed in the first cell.
+					 * See: https://github.com/ckeditor/ckeditor5/pull/18801
+					 */
+					& > p:first-of-type {
+						margin-top: 0;
+					}
+
+					/* Mirrors the rule above for the last paragraph to keep the
+					 * experience consistent with the first paragraph.
+					 *
+					 * Together, these rules prevent margins from appearing when a
+					 * bogus paragraph becomes a real paragraph after it receives line
+					 * height, text alignment, or other block style.
+					 *
+					 * See: https://github.com/ckeditor/ckeditor5/pull/18801
+					 */
+					& > p:last-of-type {
+						margin-bottom: 0;
+					}
+
 					min-width: 2em;
-					padding: .4em;
+					padding: 0.4em;
 
 					/* The border is inherited from .ck-editor__nested-editable styles, so theoretically it's not necessary here.
 					However, the border is a content style, so it should use .ck-content (so it works outside the editor).