@ckeditor/ckeditor5-list 46.0.0-alpha.3 → 46.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-list",
-  "version": "46.0.0-alpha.3",
+  "version": "46.0.0-alpha.4",
   "description": "Ordered and unordered lists feature to CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,16 +13,16 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@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-enter": "46.0.0-alpha.3",
-    "@ckeditor/ckeditor5-font": "46.0.0-alpha.3",
-    "@ckeditor/ckeditor5-icons": "46.0.0-alpha.3",
-    "@ckeditor/ckeditor5-typing": "46.0.0-alpha.3",
-    "@ckeditor/ckeditor5-ui": "46.0.0-alpha.3",
-    "@ckeditor/ckeditor5-utils": "46.0.0-alpha.3",
-    "ckeditor5": "46.0.0-alpha.3"
+    "@ckeditor/ckeditor5-clipboard": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-core": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-engine": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-enter": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-font": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-icons": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-typing": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-ui": "46.0.0-alpha.4",
+    "@ckeditor/ckeditor5-utils": "46.0.0-alpha.4",
+    "ckeditor5": "46.0.0-alpha.4"
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/list/converters.js

@@ -135,8 +135,11 @@ export function reconvertItemsOnDataChange(model, editing, attributeNames, listE
                 stack.length = itemIndent + 1;
             }
             // Update the stack for the current indent level.
-            stack[itemIndent] = Object.fromEntries(Array.from(node.getAttributes())
-                .filter(([key]) => attributeNames.includes(key)));
+            stack[itemIndent] = {
+                modelAttributes: Object.fromEntries(Array.from(node.getAttributes())
+                    .filter(([key]) => attributeNames.includes(key))),
+                modelElement: node
+            };
             // Find all blocks of the current node.
             const blocks = getListItemBlocks(node, { direction: 'forward' });
             for (const block of blocks) {
@@ -194,7 +197,8 @@ export function reconvertItemsOnDataChange(model, editing, attributeNames, listE
             const eventName = `checkAttributes:${isListItemElement ? 'item' : 'list'}`;
             const needsRefresh = listEditing.fire(eventName, {
                 viewElement: element,
-                modelAttributes: stack[indent]
+                modelAttributes: stack[indent].modelAttributes,
+                modelReferenceElement: stack[indent].modelElement
             });
             if (needsRefresh) {
                 break;

package/src/list/listediting.d.ts

@@ -11,6 +11,7 @@ import { Delete } from 'ckeditor5/src/typing.js';
 import { Enter } from 'ckeditor5/src/enter.js';
 import { ListFormatting } from '../listformatting.js';
 import { ListUtils } from './listutils.js';
+import { type ListElement } from './utils/model.js';
 import { ListBlocksIterable } from './utils/listwalker.js';
 import { ClipboardPipeline } from 'ckeditor5/src/clipboard.js';
 import '../../theme/documentlist.css';
@@ -205,6 +206,7 @@ export type ListEditingCheckAttributesEvent = {
                 id?: string;
             };
             modelAttributes: ListItemAttributesMap;
+            modelReferenceElement: ListElement;
         }
     ];
     return: boolean;

package/src/listproperties/listpropertiesediting.js

@@ -81,8 +81,11 @@ export class ListPropertiesEditing extends Plugin {
             }
         });
         // Verify if the list view element (ul or ol) requires refreshing.
-        listEditing.on('checkAttributes:list', (evt, { viewElement, modelAttributes }) => {
+        listEditing.on('checkAttributes:list', (evt, { viewElement, modelAttributes, modelReferenceElement }) => {
             for (const strategy of strategies) {
+                if (!strategy.appliesToListItem(modelReferenceElement)) {
+                    continue;
+                }
                 if (strategy.getAttributeOnUpcast(viewElement) != modelAttributes[strategy.attributeName]) {
                     evt.return = true;
                     evt.stop();

package/theme/listformatting.css

@@ -10,6 +10,24 @@
 }
 
 .ck-content li {
+	/* Opinionated list content styling: prevents content shift
+	 * when a list becomes multi-block (Enter + Backspace scenario).
+	 * See: https://github.com/ckeditor/ckeditor5/pull/18801
+	 */
+	& > p:first-of-type {
+		margin-top: 0;
+	}
+
+	/* Prevents margins from appearing when a bogus paragraph
+	 * receives line height or text alignment.
+	 * Ensures a consistent experience with the first paragraph.
+	 * See: https://github.com/ckeditor/ckeditor5/pull/18801
+	 */
+	& > p:only-child {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+
 	&.ck-list-marker-bold::marker {
 		font-weight: bold;
 	}