slate-angular 20.2.0-next.4 → 20.2.0-next.5

package/fesm2022/slate-angular.mjs

@@ -2579,7 +2579,7 @@ class SlateEditable {
                 return;
             }
             if (diff.isMissingTop) {
-                const result = this.remeasureHeightByIndics([...diff.diffTopRenderedIndexes]);
+                const result = this.remeasureHeightByIndics(diff.diffTopRenderedIndexes);
                 if (result) {
                     virtualView = this.refreshVirtualView();
                     diff = this.diffVirtualView(virtualView, 'second');
@@ -2646,7 +2646,6 @@ class SlateEditable {
         this.renderedChildren = [];
         this.virtualVisibleIndexes = new Set();
         this.measuredHeights = new Map();
-        this.measurePending = false;
         // the height from scroll container top to editor top height element
         this.businessHeight = 0;
         this.virtualScrollInitialized = false;
@@ -2995,16 +2994,21 @@ class SlateEditable {
         }
         const elementLength = children.length;
         const adjustedScrollTop = Math.max(0, scrollTop - this.businessHeight);
-        const viewBottom = scrollTop + viewportHeight;
+        const heights = children.map((_, idx) => this.getBlockHeight(idx));
+        const accumulatedHeights = this.buildAccumulatedHeight(heights);
+        const totalHeight = accumulatedHeights[elementLength];
+        const maxScrollTop = Math.max(0, totalHeight - viewportHeight);
+        const limitedScrollTop = Math.min(adjustedScrollTop, maxScrollTop);
+        const viewBottom = limitedScrollTop + viewportHeight + this.businessHeight;
         let accumulatedOffset = 0;
         let visibleStartIndex = -1;
         const visible = [];
         const visibleIndexes = [];
         for (let i = 0; i < elementLength && accumulatedOffset < viewBottom; i++) {
-            const currentHeight = this.getBlockHeight(i);
+            const currentHeight = heights[i];
             const nextOffset = accumulatedOffset + currentHeight;
             // 可视区域有交集，加入渲染
-            if (nextOffset > adjustedScrollTop && accumulatedOffset < viewBottom) {
+            if (nextOffset > limitedScrollTop && accumulatedOffset < viewBottom) {
                 if (visibleStartIndex === -1)
                     visibleStartIndex = i; // 第一个相交起始位置
                 visible.push(children[i]);
@@ -3012,11 +3016,14 @@ class SlateEditable {
             }
             accumulatedOffset = nextOffset;
         }
-        const visibleEndIndex = visibleStartIndex === -1 ? elementLength - 1 : visibleIndexes.length - 1;
-        const heights = children.map((_, idx) => this.getBlockHeight(idx));
-        const accumulatedHeights = this.buildAccumulatedHeight(heights);
+        if (visibleStartIndex === -1 && elementLength) {
+            visibleStartIndex = elementLength - 1;
+            visible.push(children[visibleStartIndex]);
+            visibleIndexes.push(visibleStartIndex);
+        }
+        const visibleEndIndex = visibleStartIndex === -1 ? elementLength - 1 : (visibleIndexes[visibleIndexes.length - 1] ?? visibleStartIndex);
         const top = visibleStartIndex === -1 ? 0 : accumulatedHeights[visibleStartIndex];
-        const bottom = accumulatedHeights[elementLength] - accumulatedHeights[visibleEndIndex];
+        const bottom = totalHeight - accumulatedHeights[visibleEndIndex + 1];
         return {
             renderedChildren: visible.length ? visible : children,
             visibleIndexes: new Set(visibleIndexes),
@@ -3139,20 +3146,6 @@ class SlateEditable {
         }
         return accumulatedHeights;
     }
-    getBufferBelowHeight(viewportHeight, visibleStart, bufferCount) {
-        let blockHeight = 0;
-        let start = visibleStart;
-        // 循环累计高度超出视图高度代表找到向下缓冲区的起始位置
-        while (blockHeight < viewportHeight) {
-            blockHeight += this.getBlockHeight(start);
-            start++;
-        }
-        let bufferHeight = 0;
-        for (let i = start; i < start + bufferCount; i++) {
-            bufferHeight += this.getBlockHeight(i);
-        }
-        return bufferHeight;
-    }
     scheduleMeasureVisibleHeights() {
         if (!this.shouldUseVirtual()) {
             return;