@ckeditor/ckeditor5-list 47.1.0-alpha.2 → 47.2.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-list",
-  "version": "47.1.0-alpha.2",
+  "version": "47.2.0-alpha.0",
   "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": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-core": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-engine": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-enter": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-font": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-icons": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-typing": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-ui": "47.1.0-alpha.2",
-    "@ckeditor/ckeditor5-utils": "47.1.0-alpha.2",
-    "ckeditor5": "47.1.0-alpha.2"
+    "@ckeditor/ckeditor5-clipboard": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-core": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-engine": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-enter": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-font": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-icons": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-typing": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-ui": "47.2.0-alpha.0",
+    "@ckeditor/ckeditor5-utils": "47.2.0-alpha.0",
+    "ckeditor5": "47.2.0-alpha.0"
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/list/converters.d.ts

@@ -5,7 +5,7 @@
 /**
  * @module list/list/converters
  */
-import { type DowncastAttributeEvent, type EditingController, type ModelElement, type DowncastElementCreatorFunction, type Mapper, type Model, type UpcastElementEvent, type ViewElement, type DowncastRemoveEvent, type EditingView, type MapperModelToViewPositionEvent, type ModelSchema } from 'ckeditor5/src/engine.js';
+import { type DowncastAttributeEvent, type ViewDowncastWriter, type EditingController, type ModelElement, type DowncastElementCreatorFunction, type Mapper, type Model, type UpcastElementEvent, type ViewElement, type DowncastRemoveEvent, type EditingView, type MapperModelToViewPositionEvent, type ModelSchema } from 'ckeditor5/src/engine.js';
 import type { GetCallback } from 'ckeditor5/src/utils.js';
 import { type ListElement } from './utils/model.js';
 import type { ListEditing, ListDowncastStrategy } from './listediting.js';
@@ -59,8 +59,9 @@ export declare function bogusParagraphCreator(attributeNames: Array<string>, { d
  * @param element The model element.
  * @param mapper The mapper instance.
  * @param model The model.
+ * @param writer The view downcast writer.
  */
-export declare function findMappedViewElement(element: ModelElement, mapper: Mapper, model: Model): ViewElement | null;
+export declare function findMappedViewElement(element: ModelElement, mapper: Mapper, model: Model, writer: ViewDowncastWriter): ViewElement | undefined;
 /**
  * The model to view custom position mapping for cases when marker is injected at the beginning of a block.
  *

package/src/list/converters.js

@@ -161,6 +161,9 @@ export function reconvertItemsOnDataChange(model, editing, attributeNames, listE
         if (!viewElement) {
             return false;
         }
+        if (isItemBlockInsideStructureSlot(viewElement)) {
+            return true;
+        }
         const needsRefresh = listEditing.fire('checkElement', {
             modelElement: item,
             viewElement
@@ -180,6 +183,19 @@ export function reconvertItemsOnDataChange(model, editing, attributeNames, listE
         }
         return false;
     }
+    function isItemBlockInsideStructureSlot(viewElement) {
+        viewElement = viewElement.parent;
+        while (viewElement.is('attributeElement') && ['ol', 'ul', 'li'].includes(viewElement.name)) {
+            viewElement = viewElement.parent;
+        }
+        // List item inside elementToStructure slot parent without mapping then it requires refresh for correct positions
+        // as structure child elements does not have mapping from model and position would land in wrong place.
+        if (viewElement.getCustomProperty('$structureSlotParent') &&
+            !editing.mapper.toModelElement(viewElement)) {
+            return true;
+        }
+        return false;
+    }
     function doesItemWrappingRequiresRefresh(item, stack, changedItems) {
         // Items directly affected by some "change" don't need a refresh, they will be converted by their own changes.
         if (changedItems.has(item)) {
@@ -240,7 +256,7 @@ export function listItemDowncastConverter(attributeNames, strategies, model, { d
         };
         // Use positions mapping instead of mapper.toViewElement( listItem ) to find outermost view element.
         // This is for cases when mapping is using inner view element like in the code blocks (pre > code).
-        const viewElement = findMappedViewElement(listItem, mapper, model);
+        const viewElement = findMappedViewElement(listItem, mapper, model, writer);
         // Remove custom item marker.
         removeCustomMarkerElements(viewElement, writer, mapper);
         // Unwrap element from current list wrappers.
@@ -311,11 +327,20 @@ export function bogusParagraphCreator(attributeNames, { dataPipeline } = {}) {
  * @param element The model element.
  * @param mapper The mapper instance.
  * @param model The model.
+ * @param writer The view downcast writer.
  */
-export function findMappedViewElement(element, mapper, model) {
+export function findMappedViewElement(element, mapper, model, writer) {
     const modelRange = model.createRangeOn(element);
     const viewRange = mapper.toViewRange(modelRange).getTrimmed();
-    return viewRange.end.nodeBefore;
+    const viewWalker = viewRange.getWalker();
+    for (const { item } of viewWalker) {
+        if (item.is('element') && item.getCustomProperty('listItemMarker')) {
+            viewWalker.jumpTo(writer.createPositionAfter(item));
+        }
+        else if (item.is('element') && !item.getCustomProperty('listItemWrapper')) {
+            return item;
+        }
+    }
 }
 /**
  * The model to view custom position mapping for cases when marker is injected at the beginning of a block.