@worktile/theia 20.2.11 → 20.2.13

package/fesm2022/worktile-theia.mjs

@@ -10,7 +10,7 @@ import { cloneDeep, map, every, assign, defaults, groupBy, uniq, isEqual } from
 export { assign, cloneDeep, debounce, defaults, groupBy, isEqual, map, uniq } from 'lodash';
 import { Editor, Element, Span, Range, Path, Node, Point, Text, Transforms, Operation, createEditor } from 'slate';
 import * as i4 from 'slate-angular';
-import { FAKE_LEFT_BLOCK_CARD_OFFSET, FAKE_RIGHT_BLOCK_CARD_OFFSET, getClipboardData, AngularEditor, hotkeys, getPlainText as getPlainText$1, createClipboardData, setClipboardData, BaseElementComponent, IS_SAFARI, ELEMENT_TO_COMPONENT, SlateModule, getBlockCardByNativeElement, SLATE_BLOCK_CARD_CLASS_NAME, EDITOR_TO_VIRTUAL_SCROLL_SELECTION, BaseElementFlavour, hasBlockCard, isCardLeft, ELEMENT_KEY_TO_HEIGHTS, getCachedHeightByElement, isDebug, debugLog, DEFAULT_ELEMENT_HEIGHT, DefaultTextFlavour, defaultScrollSelectionIntoView, getDataTransferClipboard, SLATE_DEBUG_KEY, withAngular } from 'slate-angular';
+import { FAKE_LEFT_BLOCK_CARD_OFFSET, FAKE_RIGHT_BLOCK_CARD_OFFSET, getClipboardData, AngularEditor, hotkeys, getPlainText as getPlainText$1, createClipboardData, setClipboardData, BaseElementComponent, IS_SAFARI, ELEMENT_TO_COMPONENT, SlateModule, getBlockCardByNativeElement, SLATE_BLOCK_CARD_CLASS_NAME, EDITOR_TO_VIRTUAL_SCROLL_SELECTION, BaseElementFlavour, hasBlockCard, isCardLeft, getCachedHeightByElement, isDebug, debugLog, cacheHeightByElement, DEFAULT_ELEMENT_HEIGHT, DefaultTextFlavour, defaultScrollSelectionIntoView, getDataTransferClipboard, SLATE_DEBUG_KEY, withAngular } from 'slate-angular';
 import { HistoryEditor, withHistory } from 'slate-history';
 import { NODE_TO_PARENT, NODE_TO_INDEX, NODE_TO_ELEMENT, DOMEditor, EDITOR_TO_ELEMENT } from 'slate-dom';
 import { TheiaConverter } from '@atinc/selene';
@@ -7229,9 +7229,7 @@ class TheCode extends TheBaseElement {
         this.useMode();
         this.useAutoWrap();
         this.useHeight();
-        if (this.isCollapsedAndNonReadonly) {
-            this.useAutofocus();
-        }
+        this.useAutofocus();
     }
     codeChange($event) {
         this.isHightLight = false;
@@ -7272,7 +7270,9 @@ class TheCode extends TheBaseElement {
         this.options = { ...this.options, readonly: this.readonly, cursorBlinkRate: this.readonly ? -1 : 500 };
     }
     useAutofocus() {
-        this.options = { ...this.options, autofocus: this.readonly ? false : true };
+        if (this.isCollapsedAndNonReadonly && Range.isCollapsed(this.editor.selection)) {
+            this.options = { ...this.options, autofocus: this.readonly ? false : true };
+        }
     }
     onResize({ height }) {
         this.resizeHeight = height;
@@ -14431,14 +14431,6 @@ class TheImage extends TheBaseElement {
         }
         super.ngOnDestroy();
     }
-    cacheImageHeight(height) {
-        if (!AngularEditor.isEnabledVirtualScroll(this.editor)) {
-            return;
-        }
-        const heights = ELEMENT_KEY_TO_HEIGHTS.get(this.editor);
-        const key = AngularEditor.findKey(this.editor, this.element);
-        heights.set(key.id, height);
-    }
     setImageMinHeight() {
         if (!AngularEditor.isEnabledVirtualScroll(this.editor)) {
             return;
@@ -14449,9 +14441,6 @@ class TheImage extends TheBaseElement {
             if (blockCard) {
                 const minHeight = realHeight - ROOT_ELEMENT_MARGIN_BOTTOM;
                 blockCard.style.minHeight = minHeight + 'px';
-                // if (isDebug) {
-                // debugLog('warn', 'setImageMinHeight in blockCard, realHeight（cache）: ', realHeight, this.element.key, 'minHeight: ', minHeight);
-                // }
             }
             else {
                 if (isDebug) {
@@ -14461,7 +14450,7 @@ class TheImage extends TheBaseElement {
         }
         else {
             if (isDebug) {
-                debugLog('warn', 'image render and can not find cache height', this.element.key, this.editor.children.indexOf(this.element));
+                debugLog('warn', 'image render and no cache height', this.element.key, 'index: ', this.editor.children.indexOf(this.element));
             }
         }
     }
@@ -14630,7 +14619,6 @@ class TheImage extends TheBaseElement {
                 width: this.imageEntry.width,
                 height: this.imageEntry.height
             }, { at: this.selection });
-            this.cacheImageHeight(this.calcHeight());
         }
     }
     cancelUpload() {
@@ -14719,26 +14707,10 @@ class TheImage extends TheBaseElement {
         this.naturalWidth = img.naturalWidth;
         this.naturalHeight = img.naturalHeight;
         if (AngularEditor.isEnabledVirtualScroll(this.editor)) {
-            // if (isDebug) {
-            //     const realHeight = this.getRealHeight();
-            //     debugLog('warn', 'imageLoaded, realHeight: ', realHeight, this.element.key, this.editor.children.indexOf(this.element));
-            // }
             this.imageLoadedCacheHeightTimer = setTimeout(() => {
-                // if (isDebug) {
-                //     const realHeight = this.getRealHeight();
-                //     debugLog(
-                //         'warn',
-                //         'imageLoaded, realHeight setTimeout period: ',
-                //         realHeight,
-                //         this.element.key,
-                //         'index: ',
-                //         this.editor.children.indexOf(this.element)
-                //     );
-                // }
                 const result = this.clearMinHeight();
-                if (!result) {
-                    this.cacheImageHeight(this.calcHeight());
-                }
+                const height = this.calcHeight();
+                cacheHeightByElement(this.editor, this.element, height);
             }, 0);
         }
     }