slate-angular 20.2.3 → 20.2.5

package/fesm2022/slate-angular.mjs

@@ -1473,7 +1473,7 @@ const measureHeightByIndics = (editor, indics, force = false) => {
     let hasChanged = false;
     indics.forEach((index, i) => {
         const element = editor.children[index];
-        const preHeight = getRealHeightByElement(editor, element, 0);
+        const preHeight = getRealHeightByElement(editor, element);
         if (preHeight && !force) {
             if (isDebug) {
                 const height = measureHeightByElement(editor, element);
@@ -1491,7 +1491,7 @@ const measureHeightByIndics = (editor, indics, force = false) => {
 const getBusinessTop = (editor) => {
     return EDITOR_TO_BUSINESS_TOP.get(editor) ?? 0;
 };
-const getRealHeightByElement = (editor, element, defaultHeight) => {
+const getRealHeightByElement = (editor, element) => {
     const heights = ELEMENT_KEY_TO_HEIGHTS.get(editor);
     const key = AngularEditor.findKey(editor, element);
     const height = heights?.get(key.id);
@@ -1501,20 +1501,19 @@ const getRealHeightByElement = (editor, element, defaultHeight) => {
     if (heights?.has(key.id)) {
         console.error('getBlockHeight: invalid height value', key.id, height);
     }
-    return editor.getRoughHeight(element, defaultHeight);
+    return null;
 };
 const buildHeightsAndAccumulatedHeights = (editor) => {
     const children = (editor.children || []);
     const heights = new Array(children.length);
-    const visibleStates = new Array(children.length);
     const accumulatedHeights = new Array(children.length + 1);
     accumulatedHeights[0] = 0;
     for (let i = 0; i < children.length; i++) {
-        const height = getRealHeightByElement(editor, children[i], VIRTUAL_SCROLL_DEFAULT_BLOCK_HEIGHT);
+        const height = getRealHeightByElement(editor, children[i]) || editor.getRoughHeight(children[i]);
         heights[i] = height;
         accumulatedHeights[i + 1] = accumulatedHeights[i] + height;
     }
-    return { heights, accumulatedHeights, visibleStates };
+    return { heights, accumulatedHeights };
 };
 const calculateVirtualTopHeight = (editor, startIndex) => {
     const { accumulatedHeights } = buildHeightsAndAccumulatedHeights(editor);
@@ -3084,10 +3083,11 @@ class ListRender {
             for (let i = 0; i < children.length; i++) {
                 const rootNodes = [...getRootNodes(this.views[i], this.blockCards[i])];
                 const index = this.viewContext.editor.children.indexOf(children[i]);
-                const height = getRealHeightByElement(this.viewContext.editor, children[i]);
+                const height = getRealHeightByElement(this.viewContext.editor, children[i]) ||
+                    this.viewContext.editor.getRoughHeight(children[i]);
                 rootNodes.forEach(rootNode => {
                     rootNode.setAttribute('debug-index', index.toString());
-                    rootNode.setAttribute('debug-height', height.toString());
+                    rootNode.setAttribute('debug-height', height?.toString());
                 });
             }
         }
@@ -3899,7 +3899,7 @@ class SlateEditable {
             }, 100);
         }
         const adjustedScrollTop = Math.max(0, scrollTop - getBusinessTop(this.editor));
-        const { heights, accumulatedHeights, visibleStates } = buildHeightsAndAccumulatedHeights(this.editor);
+        const { heights, accumulatedHeights } = buildHeightsAndAccumulatedHeights(this.editor);
         const totalHeight = accumulatedHeights[elementLength];
         const maxScrollTop = Math.max(0, totalHeight - viewportHeight);
         const limitedScrollTop = Math.min(adjustedScrollTop, maxScrollTop);
@@ -3911,7 +3911,8 @@ class SlateEditable {
         for (let i = 0; i < elementLength && accumulatedOffset < viewBottom; i++) {
             const currentHeight = heights[i];
             const nextOffset = accumulatedOffset + currentHeight;
-            if (!visibleStates[i]) {
+            const isVisible = this.editor.isVisible(children[i]);
+            if (!isVisible) {
                 accumulatedOffset = nextOffset;
                 continue;
             }
@@ -4021,11 +4022,9 @@ class SlateEditable {
                 debugLog('log', 'oldIndexesInViewport:', oldIndexesInViewport);
                 debugLog('log', 'newIndexesInViewport:', newIndexesInViewport);
                 // this.editor.children[index] will be undefined when it is removed
-                debugLog('log', 'changedIndexesOfTop:', needRemoveOnTop ? '-' : needAddOnTop ? '+' : '-', changedIndexesOfTop, changedIndexesOfTop.map(index => (this.editor.children[index] &&
-                    getRealHeightByElement(this.editor, this.editor.children[index], 0)) ||
+                debugLog('log', 'changedIndexesOfTop:', needRemoveOnTop ? '-' : needAddOnTop ? '+' : '-', changedIndexesOfTop, changedIndexesOfTop.map(index => (this.editor.children[index] && getRealHeightByElement(this.editor, this.editor.children[index])) ||
                     0));
-                debugLog('log', 'changedIndexesOfBottom:', needAddOnBottom ? '+' : needRemoveOnBottom ? '-' : '+', changedIndexesOfBottom, changedIndexesOfBottom.map(index => (this.editor.children[index] &&
-                    getRealHeightByElement(this.editor, this.editor.children[index], 0)) ||
+                debugLog('log', 'changedIndexesOfBottom:', needAddOnBottom ? '+' : needRemoveOnBottom ? '-' : '+', changedIndexesOfBottom, changedIndexesOfBottom.map(index => (this.editor.children[index] && getRealHeightByElement(this.editor, this.editor.children[index])) ||
                     0));
                 const needTop = virtualView.heights.slice(0, newIndexesInViewport[0]).reduce((acc, height) => acc + height, 0);
                 const needBottom = virtualView.heights