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

package/dist/index.js

@@ -2251,6 +2251,9 @@ import { DomEventObserver, Matcher, ModelTreeWalker, getViewFillerOffset } from
         if (!viewElement) {
             return false;
         }
+        if (isItemBlockInsideStructureSlot(viewElement)) {
+            return true;
+        }
         const needsRefresh = listEditing.fire('checkElement', {
             modelElement: item,
             viewElement
@@ -2269,6 +2272,22 @@ import { DomEventObserver, Matcher, ModelTreeWalker, getViewFillerOffset } from
         }
         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)) {
@@ -2328,7 +2347,7 @@ import { DomEventObserver, Matcher, ModelTreeWalker, getViewFillerOffset } from
         };
         // 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.
@@ -2400,10 +2419,18 @@ import { DomEventObserver, Matcher, ModelTreeWalker, getViewFillerOffset } from
  * @param element The model element.
  * @param mapper The mapper instance.
  * @param model The model.
- */ function findMappedViewElement(element, mapper, model) {
+ * @param writer The view downcast writer.
+ */ 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.