@worktile/theia 20.2.3 → 20.2.4

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, getRealHeightByElement, 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, ELEMENT_KEY_TO_HEIGHTS, getCachedHeightByElement, isDebug, debugLog, 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';
@@ -10128,7 +10128,7 @@ class TheTable extends TheBaseElement {
             this.listenSelectstartEvent();
             this.listenTableContextMenuEvent();
             this.listenTableWrapperScroll();
-            this.subscribeScrollContainerScroll(this.tableWrapperLeft);
+            this.subscribeScrollContainerScroll();
             this.initHorizontalScrollbar();
             if (isPrintMode) {
                 this.cdr.markForCheck();
@@ -10188,15 +10188,12 @@ class TheTable extends TheBaseElement {
         }
         return { height, top };
     }
-    subscribeScrollContainerScroll(tableWrapperLeft) {
+    subscribeScrollContainerScroll() {
         this.ngZone.runOutsideAngular(() => {
             this.contextService.containerScrolled$
                 .pipe(takeUntil(this.destroy$), map$1(entires => {
                 const { event, direction } = entires;
                 if (direction === ScrollDirection.X) {
-                    const { left } = this.nativeElement.getBoundingClientRect();
-                    this.isScrolledXOfScrollContainer = tableWrapperLeft !== left;
-                    this.tableWrapperLeft = left;
                     this.setHeaderRowShadow();
                     this.setStickyElementLeftStyle();
                 }
@@ -10235,7 +10232,7 @@ class TheTable extends TheBaseElement {
         }
     }
     updateFreezeState() {
-        this.isFreezeRow = this.freezeRowPipe.transform(this.element, this.tablePluginOptions, this.editor);
+        this.isFreezeRow = this.freezeRowPipe.transform(this.element, this.tablePluginOptions, this.editor) && this.children.length > 1;
         this.isFreezeColumn = this.freezeColumnPipe.transform(this.element, this.tablePluginOptions, this.tableWrapperWidth, this.editor);
     }
     setTableHeaderStyle() {
@@ -10283,8 +10280,10 @@ class TheTable extends TheBaseElement {
             }
             else {
                 if (this.readonly) {
-                    cellsWidth = getColumnsWidth(headerRow);
-                    gridColumns = getGridColumns(headerRow, cellsWidth);
+                    // 预览模式且没有colgroup，使用数据行的宽度计算固定列宽
+                    const dataRow = this.tbodyElement.nativeElement.childNodes[1];
+                    cellsWidth = getColumnsWidth(dataRow);
+                    gridColumns = getGridColumns(dataRow, cellsWidth);
                 }
                 else {
                     const columnCount = this.element.children[0].children.length;
@@ -10723,9 +10722,11 @@ class TheTable extends TheBaseElement {
             const cornerControl = this.cornerControl.nativeElement;
             const rowControl = this.rowControlsButtonWrapper.first?.nativeElement;
             const buffer = this.isInTable ? -TABLE_CONTROL : 0;
-            if (this.isStickyTop && this.isScrolledXOfScrollContainer) {
+            if (this.isStickyTop) {
+                this.getWrapperWidthAndLeft();
+                const controlButtonBorder = 1;
                 stickyRows.forEach((element) => {
-                    this.renderer.setStyle(element, 'left', `${this.tableWrapperLeft}px`);
+                    this.renderer.setStyle(element, 'left', `${this.tableWrapperLeft + (this.readonly ? 0 : this.getColControlButtonWidth() - controlButtonBorder)}px`);
                 });
                 this.renderer.setStyle(cornerControl, 'left', `${this.tableWrapperLeft + buffer}px`);
                 rowControl && this.renderer.setStyle(rowControl, 'left', `${this.tableWrapperLeft + buffer}px`);
@@ -14390,7 +14391,7 @@ class TheImage extends TheBaseElement {
         if (!AngularEditor.isEnabledVirtualScroll(this.editor)) {
             return;
         }
-        const realHeight = getRealHeightByElement(this.editor, this.element);
+        const realHeight = getCachedHeightByElement(this.editor, this.element);
         if (realHeight) {
             const blockCard = getBlockCardByNativeElement(this.nativeElement);
             if (blockCard) {
@@ -14577,7 +14578,7 @@ class TheImage extends TheBaseElement {
                 width: this.imageEntry.width,
                 height: this.imageEntry.height
             }, { at: this.selection });
-            this.cacheImageHeight(this.getRealHeight());
+            this.cacheImageHeight(this.calcHeight());
         }
     }
     cancelUpload() {
@@ -14684,7 +14685,7 @@ class TheImage extends TheBaseElement {
                 // }
                 const result = this.clearMinHeight();
                 if (!result) {
-                    this.cacheImageHeight(this.getRealHeight());
+                    this.cacheImageHeight(this.calcHeight());
                 }
             }, 0);
         }