slate-angular 20.2.4 → 20.2.6

package/fesm2022/slate-angular.mjs

@@ -1454,6 +1454,7 @@ const isDebugScrollTop = localStorage.getItem(SLATE_DEBUG_KEY_SCROLL_TOP) === 't
 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 debugLog = (type, ...args) => {
     const doc = document;
     VirtualScrollDebugOverlay.log(doc, type, ...args);
@@ -1473,7 +1474,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 +1492,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,7 +1502,7 @@ 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 || []);
@@ -1509,7 +1510,7 @@ const buildHeightsAndAccumulatedHeights = (editor) => {
     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;
     }
@@ -1530,6 +1531,11 @@ const scrollToElement = (editor, element, scrollTo) => {
     }
     const { accumulatedHeights } = buildHeightsAndAccumulatedHeights(editor);
     scrollTo((accumulatedHeights[anchorIndex] ?? 0) + getBusinessTop(editor));
+    EDITOR_TO_IS_FROM_SCROLL_TO.set(editor, true);
+    setTimeout(() => {
+        console.log('scrollToElement: end scroll');
+        EDITOR_TO_IS_FROM_SCROLL_TO.set(editor, false);
+    }, 0);
 };
 
 const withAngular = (editor, clipboardFormatKey = 'x-slate-fragment') => {
@@ -3083,10 +3089,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());
                 });
             }
         }
@@ -3801,7 +3808,8 @@ class SlateEditable {
         if (isDebug) {
             debugLog('log', 'tryUpdateVirtualViewport');
         }
-        if (this.inViewportIndics.length > 0) {
+        const isFromScrollTo = EDITOR_TO_IS_FROM_SCROLL_TO.get(this.editor);
+        if (this.inViewportIndics.length > 0 && !isFromScrollTo) {
             const topHeight = this.getActualVirtualTopHeight();
             const refreshVirtualTopHeight = calculateVirtualTopHeight(this.editor, this.inViewportIndics[0]);
             if (topHeight !== refreshVirtualTopHeight) {
@@ -3819,7 +3827,7 @@ class SlateEditable {
             }
             let virtualView = this.calculateVirtualViewport();
             let diff = this.diffVirtualViewport(virtualView);
-            if (diff.isDifferent && diff.needRemoveOnTop) {
+            if (diff.isDifferent && diff.needRemoveOnTop && !isFromScrollTo) {
                 const remeasureIndics = diff.changedIndexesOfTop;
                 const changed = measureHeightByIndics(this.editor, remeasureIndics);
                 if (changed) {
@@ -3832,7 +3840,7 @@ class SlateEditable {
                 if (this.listRender.initialized) {
                     const { preRenderingCount, childrenWithPreRendering, childrenWithPreRenderingIndics } = this.handlePreRendering();
                     this.listRender.update(childrenWithPreRendering, this.editor, this.context, preRenderingCount, childrenWithPreRenderingIndics);
-                    if (diff.needAddOnTop) {
+                    if (diff.needAddOnTop && !isFromScrollTo) {
                         const remeasureAddedIndics = diff.changedIndexesOfTop;
                         if (isDebug) {
                             debugLog('log', 'needAddOnTop to remeasure heights: ', remeasureAddedIndics);
@@ -4021,11 +4029,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
@@ -5273,5 +5279,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_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, calculateVirtualTopHeight, check, completeTable, createClipboardData, createText, createThrottleRAF, debugLog, defaultScrollSelectionIntoView, fallbackCopyText, getBlockCardByNativeElement, getBusinessTop, getCardTargetAttribute, getClipboardData, getClipboardFromHTMLText, getContentHeight, getDataTransferClipboard, getDataTransferClipboardText, getNavigatorClipboard, getPlainText, getRealHeightByElement, 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, measureHeightByElement, measureHeightByIndics, normalize, scrollToElement, setClipboardData, setDataTransferClipboard, setDataTransferClipboardText, 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, calculateVirtualTopHeight, check, completeTable, createClipboardData, createText, createThrottleRAF, debugLog, defaultScrollSelectionIntoView, fallbackCopyText, getBlockCardByNativeElement, getBusinessTop, getCardTargetAttribute, getClipboardData, getClipboardFromHTMLText, getContentHeight, getDataTransferClipboard, getDataTransferClipboardText, getNavigatorClipboard, getPlainText, getRealHeightByElement, 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, measureHeightByElement, measureHeightByIndics, normalize, scrollToElement, setClipboardData, setDataTransferClipboard, setDataTransferClipboardText, setNavigatorClipboard, shallowCompare, stripHtml, withAngular };
 //# sourceMappingURL=slate-angular.mjs.map