@worktile/theia 14.3.11 → 14.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worktile/theia",
-  "version": "14.3.11",
+  "version": "14.3.13",
   "description": "theia editor",
   "author": "YanDong <nanianqiumo@foxmail.com>",
   "homepage": "https://github.com/atinc/theia#readme",

package/plugins/table/components/table.component.d.ts

@@ -1,5 +1,5 @@
 import { OnInit, ElementRef, OnDestroy, ChangeDetectorRef, NgZone, AfterViewInit, Renderer2, QueryList } from '@angular/core';
-import { Subject, Subscription } from 'rxjs';
+import { Subject } from 'rxjs';
 import { Editor } from 'slate';
 import { TheBaseElementComponent, ThePluginOption } from '../../../interfaces';
 import { TableCellElement, TableElement } from '../../../custom-types';
@@ -9,6 +9,7 @@ import { TableStore } from '../table.store';
 import { TableService } from '../table.service';
 import { ThePluginTableOption, TheTableColumn } from '../table.types';
 import { TableFreezeColumnPipe, TableFreezeRowPipe } from '../table.pipe';
+import { TheContextService } from '../../../services/context.service';
 import * as i0 from "@angular/core";
 export declare class TheTableComponent extends TheBaseElementComponent<TableElement, Editor> implements OnInit, AfterViewInit, OnDestroy {
     eventDispatcher: TableCellEventDispatcher;
@@ -21,7 +22,9 @@ export declare class TheTableComponent extends TheBaseElementComponent<TableElem
     private freezeColumnPipe;
     freezeRowPipe: TableFreezeRowPipe;
     private renderer;
+    private contextService;
     headerRow: boolean;
+    isSelectedAllCell: boolean;
     destroy$: Subject<any>;
     rowControls: {
         height: number;
@@ -32,11 +35,11 @@ export declare class TheTableComponent extends TheBaseElementComponent<TableElem
     tablePluginOptions: ThePluginOption<ThePluginTableOption>;
     isStickyTop: boolean;
     scrollContainerTop: number;
-    scrollContainerRef: Subscription;
+    tableWrapperMarginTop: number;
+    previousScrollContainer: string;
     get columns(): TheTableColumn[];
     get nativeElement(): HTMLElement;
     get tbodyNativeElement(): HTMLElement;
-    get isSelectedAllCell(): boolean;
     tableWrapper: ElementRef<HTMLElement>;
     theTableElement: ElementRef;
     tbodyElement: ElementRef;
@@ -45,7 +48,7 @@ export declare class TheTableComponent extends TheBaseElementComponent<TableElem
     rowControlsButtonWrapper: QueryList<ElementRef<HTMLElement>>;
     handleMousedown(event: MouseEvent): void;
     onContextChange(): void;
-    constructor(elementRef: ElementRef<HTMLElement>, eventDispatcher: TableCellEventDispatcher, resizeNotifier: ColumnResizeNotifierSource, tableStore: TableStore, cdr: ChangeDetectorRef, ngZone: NgZone, tableService: TableService, theTableContextMenuService: TheTableContextMenuService, freezeColumnPipe: TableFreezeColumnPipe, freezeRowPipe: TableFreezeRowPipe, renderer: Renderer2);
+    constructor(elementRef: ElementRef<HTMLElement>, eventDispatcher: TableCellEventDispatcher, resizeNotifier: ColumnResizeNotifierSource, tableStore: TableStore, cdr: ChangeDetectorRef, ngZone: NgZone, tableService: TableService, theTableContextMenuService: TheTableContextMenuService, freezeColumnPipe: TableFreezeColumnPipe, freezeRowPipe: TableFreezeRowPipe, renderer: Renderer2, contextService: TheContextService);
     ngOnInit(): void;
     getWrapperWidth(): number;
     /**

package/plugins/table/components/table.component.scss

@@ -166,7 +166,7 @@ $top-cell-z-index: 13;
         grid-auto-flow: column;
         box-sizing: content-box;
         background: variables.$white;
-        border-bottom: $controls-border;
+        // border-bottom: $controls-border;
         overflow-x: hidden;
         box-shadow: 0 6px 4px -4px rgba(0, 0, 0, 0.1);
 
@@ -377,7 +377,7 @@ $top-cell-z-index: 13;
     &.the-table-with-sticky-row {
         .slate-element-table-row.the-sticky-row {
             z-index: 115;
-            padding-top: 36px;
+            padding-top: 0;
         }
         .the-table-row-controls-inner {
             .the-table-row-controls-button-wrap {

package/plugins/table/table.editor.d.ts

@@ -12,7 +12,7 @@ export declare const TableEditor: {
     removeColumn(editor: Editor, colIndex?: number, optionsParam?: TableOptions): void;
     clearCell(editor: Editor, nodeEntry?: NodeEntry<CustomElement>, optionsParam?: TableOptions): void;
     isActive(editor: Editor): boolean;
-    getSelectedCells(editor: Editor): import("./table.types").SelectedCell[];
+    getSelectedCells(editor: Editor): import("./table.types").CellPosition[];
     isAlignActive(editor: TheEditor, alignment: Alignment): boolean;
     setAlign(editor: Editor, alignment: Alignment): boolean;
     setVerticalAlign(editor: TheEditor, alignment: VerticalAlignment): boolean;

package/plugins/table/table.store.d.ts

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { Editor } from 'slate';
 import { TablePosition } from './utils';
 import { ColorType } from '../../constants/color-select';
-import { SelectedCell, TheTableOptions } from './table.types';
+import { CellPosition, TheTableOptions } from './table.types';
 import { TableElement } from '../../custom-types';
 import * as i0 from "@angular/core";
 export declare class TableStore {
@@ -27,27 +27,32 @@ export declare class TableStore {
     isRightClicking: boolean;
     maxCol: number;
     isModSelecting: boolean;
-    get selectedCells(): SelectedCell[];
-    get dangerousCells(): SelectedCell[];
+    get selectedCells(): CellPosition[];
+    get dangerousCells(): CellPosition[];
     constructor();
+    isSelectedAllCell: () => boolean;
     getTableEntry(): import("slate").NodeEntry<TableElement>;
     getTablePath(): import("slate").Path;
-    setSelectedCells(cells: SelectedCell[], pos: TablePosition): void;
+    setSelectedCells(cells: CellPosition[], pos: TablePosition): void;
     initEditor(editor: Editor): void;
     /**
-     * 多选模式下需要合并数据
-     * @param cells SelectedCell[]
+     * 去重重复的单元格位置
      * @returns
      */
-    buildModCells(cells: SelectedCell[]): SelectedCell[];
+    private uniqueCellPosition;
+    /**
+     * 获取一定范围内所有的单元格
+     * @returns
+     */
+    private getCellPositionsFromRange;
     selectRow(editor: Editor, index: number): void;
     selectColumn(editor: Editor, index: number): void;
     selectTable(editor: Editor): void;
-    private getTableCellsAndPosition;
     selectCells(editor: Editor): void;
     getMinAndMaxCellIndex(maxRow: number, maxCol: number, minRow: number, minCol: number, table: TableElement): any;
     selectCell(cell: HTMLTableCellElement, editor: Editor): void;
-    selectedCellsChange(): Observable<SelectedCell[]>;
+    getCellPositionsBeforeMerge({ row, col }: CellPosition): CellPosition[];
+    selectedCellsChange(): Observable<CellPosition[]>;
     cellsPositionChange(): Observable<object>;
     changeCells(): void;
     emitTableChange(): void;
@@ -58,10 +63,10 @@ export declare class TableStore {
     selectCellOngoing(cell: HTMLTableCellElement, editor: Editor): void;
     selectCellEnd(editor: Editor): void;
     focusCell(editor: Editor, path: number[]): void;
-    dangerousCellsChange(): Observable<SelectedCell[]>;
+    dangerousCellsChange(): Observable<CellPosition[]>;
     setDangerousCells(): void;
     clearDangerousCells(): void;
-    dangerousOrSelectedCellsChange(): Observable<SelectedCell[]>;
+    dangerousOrSelectedCellsChange(): Observable<CellPosition[]>;
     setDangerousRows(): void;
     setDangerousColumns(): void;
     setDangerousTable(): void;

package/plugins/table/table.types.d.ts

@@ -52,7 +52,7 @@ export interface ThePluginTableOption {
     setFullscreen?: (editor: Editor, event: MouseEvent, element: Element) => void;
     fullscreenAction?: (editor: Editor) => Observable<boolean>;
 }
-export interface SelectedCell {
+export interface CellPosition {
     row: number;
     col: number;
 }

package/plugins/table/utils/get-select-cell-node.d.ts

@@ -1,6 +1,6 @@
 import { Editor } from 'slate';
-import { SelectedCell } from '../table.types';
-export declare function getSelectCellNode(editor: Editor, selectedCells: SelectedCell[]): {
+import { CellPosition } from '../table.types';
+export declare function getSelectCellNode(editor: Editor, selectedCells: CellPosition[]): {
     node: import("@worktile/theia").TableCellElement;
     row: number;
     col: number;

package/plugins/table/utils/handle-cell.d.ts

@@ -0,0 +1,2 @@
+import { CellPosition } from '../table.types';
+export declare function sortCell(cells: CellPosition[]): void;

package/plugins/table/utils/is-selection-in-table.d.ts

@@ -1,5 +1,5 @@
 import { Editor } from 'slate';
-import { SelectedCell, TableOptions } from '../table.types';
+import { CellPosition, TableOptions } from '../table.types';
 /**
  * Is the selection in a table
  */
@@ -10,4 +10,4 @@ export declare function isSelectionInTable(opts: TableOptions, editor: Editor):
  * @param cells
  * @returns boolean
  */
-export declare function isRectangularInTableCells(editor: Editor, cells: SelectedCell[]): boolean;
+export declare function isRectangularInTableCells(editor: Editor, cells: CellPosition[]): boolean;

package/plugins/table/utils/merge-cell.d.ts

@@ -1,6 +1,6 @@
 import { Path, Editor } from 'slate';
 import { TableCellElement } from '../../../custom-types';
-import { SelectedCell } from '../table.types';
+import { CellPosition } from '../table.types';
 export interface SelectedCellInfo {
     col: number;
     row: number;
@@ -17,5 +17,5 @@ export declare function calculateCellSpan(selectCellNodes: SelectedCellInfo[], l
     rowspan: number;
     colspan: number;
 };
-export declare function mergeCell(editor: Editor, selectedCells: SelectedCell[]): void;
+export declare function mergeCell(editor: Editor, selectedCells: CellPosition[]): void;
 export declare function mergeCellContent(editor: Editor, leftTopCellPath: Path, cellPath: Path): void;

package/plugins/table/utils/set-menu-cell-invisibility.d.ts

@@ -1,7 +1,7 @@
 import { Editor } from 'slate';
-import { MenuEntity, SelectedCell } from '../table.types';
+import { MenuEntity, CellPosition } from '../table.types';
 export declare function setCellMenuVisibility(editor: Editor, menuList: MenuEntity[], tableInfo: {
-    selectedCells: SelectedCell[];
+    selectedCells: CellPosition[];
     isFullscreen?: boolean;
     selectedRowsIndex?: number[];
     selectedColumnsIndex?: number[];

package/plugins/table/utils/table-position.d.ts

@@ -1,6 +1,6 @@
 import { Node, Path, NodeEntry, Element } from 'slate';
 import { TableCellElement, TableElement, TableRowElement } from '../../../custom-types';
-import { SelectedCell, TableOptions } from '../table.types';
+import { CellPosition, TableOptions } from '../table.types';
 export declare class TablePosition {
     tableEntry?: NodeEntry<TableElement>;
     rowEntry?: NodeEntry<Element>;
@@ -93,5 +93,5 @@ export declare class TablePosition {
     /**
      * find cell data with col and row
      */
-    findCellByPath(cell: SelectedCell): TableCellElement;
+    findCellByPath(cell: CellPosition): TableCellElement;
 }