slate-angular 20.2.12 → 20.2.14

package/fesm2022/slate-angular.mjs

@@ -1498,6 +1498,9 @@ const ELEMENT_KEY_TO_HEIGHTS = new WeakMap();
 const EDITOR_TO_BUSINESS_TOP = new WeakMap();
 const EDITOR_TO_ROOT_NODE_WIDTH = new WeakMap();
 const EDITOR_TO_IS_FROM_SCROLL_TO = new WeakMap();
+const isValidNumber = (value) => {
+    return typeof value === 'number' && !Number.isNaN(value);
+};
 const debugLog = (type, ...args) => {
     const doc = document;
     VirtualScrollDebugOverlay.log(doc, type, ...args);
@@ -1506,7 +1509,7 @@ const cacheHeightByElement = (editor, element, height) => {
     if (!AngularEditor.isEnabledVirtualScroll(editor)) {
         return;
     }
-    if (typeof height !== 'number') {
+    if (!isValidNumber(height)) {
         console.error('cacheHeightByElement: height must be number', height);
         return;
     }
@@ -1565,9 +1568,11 @@ const measureHeightByIndics = (editor, indics, force = false) => {
             }
             return;
         }
-        hasChanged = true;
         const currentHeight = calcHeightByElement(editor, element);
-        if (isDebug) {
+        if (isValidNumber(currentHeight) && currentHeight !== preHeight) {
+            hasChanged = true;
+        }
+        if (isDebug && isValidNumber(currentHeight)) {
             debugLog('log', 'measureHeightByIndics: height not equal, index: ', index, 'preHeight: ', preHeight, 'height: ', currentHeight);
         }
     });
@@ -3813,9 +3818,12 @@ class SlateEditable {
                 if (entries.length > 0 && entries[0].contentRect.width !== editorResizeObserverRectWidth) {
                     editorResizeObserverRectWidth = entries[0].contentRect.width;
                     this.keyHeightMap.clear();
-                    const firstElement = this.inViewportChildren[0];
-                    const firstDomElement = AngularEditor.toDOMNode(this.editor, firstElement);
-                    const target = firstDomElement || this.virtualTopHeightElement;
+                    let target = this.virtualTopHeightElement;
+                    if (this.inViewportChildren[0]) {
+                        const firstElement = this.inViewportChildren[0];
+                        const firstDomElement = AngularEditor.toDOMNode(this.editor, firstElement);
+                        target = firstDomElement;
+                    }
                     EDITOR_TO_ROOT_NODE_WIDTH.set(this.editor, target.offsetWidth);
                     updatePreRenderingElementWidth(this.editor);
                     if (isDebug) {
@@ -3834,12 +3842,14 @@ class SlateEditable {
                 });
             }), debounceTime(500), filter(() => pendingRemeasureIndics.length > 0))
                 .subscribe(() => {
-                measureHeightByIndics(this.editor, pendingRemeasureIndics, true);
-                pendingRemeasureIndics = [];
-                if (isDebug) {
-                    debugLog('log', 'exist pendingRemeasureIndics: ', pendingRemeasureIndics, 'will try to update virtual viewport');
+                const changed = measureHeightByIndics(this.editor, pendingRemeasureIndics, true);
+                if (changed) {
+                    this.tryUpdateVirtualViewport();
+                    if (isDebug) {
+                        debugLog('log', 'exist pendingRemeasureIndics: ', pendingRemeasureIndics, 'will try to update virtual viewport');
+                    }
                 }
-                this.tryUpdateVirtualViewport();
+                pendingRemeasureIndics = [];
             });
         }
     }
@@ -3948,7 +3958,7 @@ class SlateEditable {
                             }
                         }
                     }
-                    if (!AngularEditor.isReadOnly(this.editor) && this.editor.selection) {
+                    if (this.editor.selection) {
                         this.toNativeSelection(false);
                     }
                 }
@@ -3970,7 +3980,7 @@ class SlateEditable {
             };
         }
         const scrollTop = this.virtualScrollConfig.scrollTop;
-        const viewportHeight = this.virtualScrollConfig.viewportHeight ?? 0;
+        let viewportHeight = this.virtualScrollConfig.viewportHeight ?? 0;
         if (!viewportHeight) {
             return {
                 inViewportChildren: [],
@@ -3991,20 +4001,23 @@ class SlateEditable {
                 EDITOR_TO_BUSINESS_TOP.set(this.editor, businessTop);
                 if (isDebug) {
                     debugLog('log', 'businessTop', businessTop);
+                    this.virtualTopHeightElement.setAttribute('data-business-top', businessTop.toString());
                 }
             }, 100);
         }
-        const adjustedScrollTop = Math.max(0, scrollTop - getBusinessTop(this.editor));
+        const businessTop = getBusinessTop(this.editor);
         const { heights, accumulatedHeights } = buildHeightsAndAccumulatedHeights(this.editor, visibleStates);
-        const totalHeight = accumulatedHeights[elementLength];
-        const maxScrollTop = Math.max(0, totalHeight - viewportHeight);
-        const limitedScrollTop = Math.min(adjustedScrollTop, maxScrollTop);
-        const viewBottom = limitedScrollTop + viewportHeight;
+        const totalHeight = accumulatedHeights[elementLength] + businessTop;
+        let startPosition = Math.max(scrollTop - businessTop, 0);
+        let endPosition = startPosition + viewportHeight;
+        if (scrollTop < businessTop) {
+            endPosition = startPosition + viewportHeight - (businessTop - scrollTop);
+        }
         let accumulatedOffset = 0;
         let inViewportStartIndex = -1;
         const visible = [];
         const inViewportIndics = [];
-        for (let i = 0; i < elementLength && accumulatedOffset < viewBottom; i++) {
+        for (let i = 0; i < elementLength && accumulatedOffset < endPosition; i++) {
             const currentHeight = heights[i];
             const nextOffset = accumulatedOffset + currentHeight;
             const isVisible = visibleStates[i];
@@ -4013,7 +4026,7 @@ class SlateEditable {
                 continue;
             }
             // 可视区域有交集，加入渲染
-            if (nextOffset > limitedScrollTop && accumulatedOffset < viewBottom) {
+            if (nextOffset > startPosition && accumulatedOffset < endPosition) {
                 if (inViewportStartIndex === -1)
                     inViewportStartIndex = i; // 第一个相交起始位置
                 visible.push(children[i]);
@@ -5370,5 +5383,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AngularEditor, BaseComponent, BaseElementComponent, BaseElementFlavour, BaseFlavour, BaseLeafComponent, BaseLeafFlavour, BaseTextComponent, BaseTextFlavour, BlockCardRef, DEFAULT_ELEMENT_HEIGHT, DefaultTextFlavour, EDITOR_TO_AFTER_VIEW_INIT_QUEUE, EDITOR_TO_BUSINESS_TOP, EDITOR_TO_IS_FROM_SCROLL_TO, EDITOR_TO_ROOT_NODE_WIDTH, EDITOR_TO_VIRTUAL_SCROLL_SELECTION, ELEMENT_KEY_TO_HEIGHTS, ELEMENT_TO_COMPONENT, FAKE_LEFT_BLOCK_CARD_OFFSET, FAKE_RIGHT_BLOCK_CARD_OFFSET, FlavourRef, HAS_BEFORE_INPUT_SUPPORT, IS_ANDROID, IS_APPLE, IS_CHROME, IS_CHROME_LEGACY, IS_EDGE_LEGACY, IS_ENABLED_VIRTUAL_SCROLL, IS_FIREFOX, IS_FIREFOX_LEGACY, IS_IOS, IS_QQBROWSER, IS_SAFARI, IS_UC_MOBILE, IS_WECHATBROWSER, PLACEHOLDER_SYMBOL, SLATE_BLOCK_CARD_CLASS_NAME, SLATE_DEBUG_KEY, SLATE_DEBUG_KEY_SCROLL_TOP, SlateBlockCard, SlateChildrenOutlet, SlateEditable, SlateErrorCode, SlateFragmentAttributeKey, SlateModule, SlateString, VIRTUAL_SCROLL_DEFAULT_BLOCK_HEIGHT, VoidTextFlavour, blobAsString, buildHTMLText, buildHeightsAndAccumulatedHeights, cacheHeightByElement, calcHeightByElement, calculateVirtualTopHeight, check, clearMinHeightByElement, completeTable, createClipboardData, createText, createThrottleRAF, debugLog, defaultScrollSelectionIntoView, fallbackCopyText, getBlockCardByNativeElement, getBusinessTop, getCachedHeightByElement, getCardTargetAttribute, getClipboardData, getClipboardFromHTMLText, getContentHeight, getDataTransferClipboard, getDataTransferClipboardText, getNavigatorClipboard, getPlainText, getSelection, getSlateFragmentAttribute, getZeroTextNode, hasAfterContextChange, hasBeforeContextChange, hasBlockCard, hasBlockCardWithNode, hotkeys, isCardCenterByTargetAttr, isCardLeft, isCardLeftByTargetAttr, isCardRightByTargetAttr, isClipboardFile, isClipboardReadSupported, isClipboardWriteSupported, isClipboardWriteTextSupported, isComponentType, isDOMText, isDebug, isDebugScrollTop, isDecoratorRangeListEqual, isFlavourType, isInvalidTable, isTemplateRef, isValid, measureHeightByIndics, normalize, scrollToElement, setClipboardData, setDataTransferClipboard, setDataTransferClipboardText, setMinHeightByElement, setNavigatorClipboard, shallowCompare, stripHtml, withAngular };
+export { AngularEditor, BaseComponent, BaseElementComponent, BaseElementFlavour, BaseFlavour, BaseLeafComponent, BaseLeafFlavour, BaseTextComponent, BaseTextFlavour, BlockCardRef, DEFAULT_ELEMENT_HEIGHT, DefaultTextFlavour, EDITOR_TO_AFTER_VIEW_INIT_QUEUE, EDITOR_TO_BUSINESS_TOP, EDITOR_TO_IS_FROM_SCROLL_TO, EDITOR_TO_ROOT_NODE_WIDTH, EDITOR_TO_VIRTUAL_SCROLL_SELECTION, ELEMENT_KEY_TO_HEIGHTS, ELEMENT_TO_COMPONENT, FAKE_LEFT_BLOCK_CARD_OFFSET, FAKE_RIGHT_BLOCK_CARD_OFFSET, FlavourRef, HAS_BEFORE_INPUT_SUPPORT, IS_ANDROID, IS_APPLE, IS_CHROME, IS_CHROME_LEGACY, IS_EDGE_LEGACY, IS_ENABLED_VIRTUAL_SCROLL, IS_FIREFOX, IS_FIREFOX_LEGACY, IS_IOS, IS_QQBROWSER, IS_SAFARI, IS_UC_MOBILE, IS_WECHATBROWSER, PLACEHOLDER_SYMBOL, SLATE_BLOCK_CARD_CLASS_NAME, SLATE_DEBUG_KEY, SLATE_DEBUG_KEY_SCROLL_TOP, SlateBlockCard, SlateChildrenOutlet, SlateEditable, SlateErrorCode, SlateFragmentAttributeKey, SlateModule, SlateString, VIRTUAL_SCROLL_DEFAULT_BLOCK_HEIGHT, VoidTextFlavour, blobAsString, buildHTMLText, buildHeightsAndAccumulatedHeights, cacheHeightByElement, calcHeightByElement, calculateVirtualTopHeight, check, clearMinHeightByElement, completeTable, createClipboardData, createText, createThrottleRAF, debugLog, defaultScrollSelectionIntoView, fallbackCopyText, getBlockCardByNativeElement, getBusinessTop, getCachedHeightByElement, getCardTargetAttribute, getClipboardData, getClipboardFromHTMLText, getContentHeight, getDataTransferClipboard, getDataTransferClipboardText, getNavigatorClipboard, getPlainText, getSelection, getSlateFragmentAttribute, getZeroTextNode, hasAfterContextChange, hasBeforeContextChange, hasBlockCard, hasBlockCardWithNode, hotkeys, isCardCenterByTargetAttr, isCardLeft, isCardLeftByTargetAttr, isCardRightByTargetAttr, isClipboardFile, isClipboardReadSupported, isClipboardWriteSupported, isClipboardWriteTextSupported, isComponentType, isDOMText, isDebug, isDebugScrollTop, isDecoratorRangeListEqual, isFlavourType, isInvalidTable, isTemplateRef, isValid, isValidNumber, measureHeightByIndics, normalize, scrollToElement, setClipboardData, setDataTransferClipboard, setDataTransferClipboardText, setMinHeightByElement, setNavigatorClipboard, shallowCompare, stripHtml, withAngular };
 //# sourceMappingURL=slate-angular.mjs.map