@univerjs/engine-render 0.1.0-alpha.3 → 0.1.0-beta.1

package/lib/types/basics/const.d.ts

@@ -104,7 +104,13 @@ export declare enum BORDER_TYPE {
     TOP = "t",
     BOTTOM = "b",
     LEFT = "l",
-    RIGHT = "r"
+    RIGHT = "r",
+    TL_BR = "tl_br",
+    TL_BC = "tl_bc",
+    TL_MR = "tl_mr",
+    BL_TR = "bl_tr",
+    ML_TR = "ml_tr",
+    BC_TR = "bc_tr"
 }
 export declare enum ORIENTATION_TYPE {
     UP = 0,

package/lib/types/basics/draw.d.ts

@@ -27,6 +27,7 @@ export interface IContext2D extends CanvasRenderingContext2D {
 }
 export declare function getDevicePixelRatio(): number;
 export declare function drawLineByBorderType(ctx: CanvasRenderingContext2D, type: BORDER_TYPE, position: IPosition): void;
+export declare function drawDiagonalLineByBorderType(ctx: CanvasRenderingContext2D, type: BORDER_TYPE, position: IPosition): void;
 export declare function clearLineByBorderType(ctx: CanvasRenderingContext2D, type: BORDER_TYPE, position: IPosition, scaleX: number, scaleY: number): void;
 export declare function setLineType(ctx: CanvasRenderingContext2D, style: BorderStyleTypes): void;
 export declare function getLineOffset(): number;

package/lib/types/components/docs/common/index.d.ts

@@ -18,7 +18,7 @@ export * from './convert-cursor';
 export * from './line';
 export * from './liquid';
 export * from './page';
-export * from './range';
 export * from './section';
 export * from './span';
+export * from './text-range';
 export * from './tools';

package/lib/types/components/docs/text-selection-render-manager.d.ts

@@ -22,9 +22,9 @@ import type { ISuccinctTextRangeParam, ITextRangeWithStyle, ITextSelectionStyle,
 import type { Engine } from '../../engine';
 import type { Scene } from '../../scene';
 import type { Viewport } from '../../viewport';
-import { TextRange } from './common/range';
+import { TextRange } from './common/text-range';
 import type { DocumentSkeleton } from './doc-skeleton';
-import type { IDocumentOffsetConfig } from './document';
+import type { Documents, IDocumentOffsetConfig } from './document';
 export declare function getCanvasOffsetByEngine(engine: Nullable<Engine>): {
     left: number;
     top: number;
@@ -73,11 +73,11 @@ export interface ITextSelectionRenderManager {
     focus(): void;
     blur(): void;
     deactivate(): void;
-    changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, viewport?: Nullable<Viewport>, documentOffsetConfig?: IDocumentOffsetConfig): void;
+    changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
     dispose(): void;
-    handleDblClick(evt: IPointerEvent | IMouseEvent, documentOffsetConfig: IDocumentOffsetConfig, viewport: Nullable<Viewport>): void;
-    handleTripleClick(evt: IPointerEvent | IMouseEvent, documentOffsetConfig: IDocumentOffsetConfig, viewport: Nullable<Viewport>): void;
-    eventTrigger(evt: IPointerEvent | IMouseEvent, documentOffsetConfig: IDocumentOffsetConfig, viewport: Nullable<Viewport>): void;
+    handleDblClick(evt: IPointerEvent | IMouseEvent): void;
+    handleTripleClick(evt: IPointerEvent | IMouseEvent): void;
+    eventTrigger(evt: IPointerEvent | IMouseEvent): void;
 }
 export interface IEditorInputConfig {
     event: Event | CompositionEvent | KeyboardEvent;
@@ -86,8 +86,6 @@ export interface IEditorInputConfig {
     rangeList?: TextRange[];
 }
 export declare class TextSelectionRenderManager extends RxDisposable implements ITextSelectionRenderManager {
-    private _docSkeleton?;
-    private _scene?;
     private readonly _onInputBefore$;
     readonly onInputBefore$: Observable<Nullable<IEditorInputConfig>>;
     private readonly _onKeydown$;
@@ -116,13 +114,15 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _viewportScrollY;
     private _rangeList;
     private _currentSegmentId;
-    private _documentOffsetConfig;
     private _selectionStyle;
     private _isSelectionEnabled;
     private _viewPortObserverMap;
     private _isIMEInputApply;
     private _activeViewport;
-    constructor(_docSkeleton?: Nullable<DocumentSkeleton>, _scene?: Nullable<Scene>, viewport?: Nullable<Viewport>);
+    private _docSkeleton;
+    private _scene;
+    private _document;
+    constructor();
     __getEditorContainer(): HTMLElement;
     getViewPort(): Viewport;
     setSegment(id: string): void;
@@ -136,10 +136,10 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     focus(): void;
     blur(): void;
     deactivate(): void;
-    changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, viewport?: Nullable<Viewport>, documentOffsetConfig?: IDocumentOffsetConfig): void;
-    handleDblClick(evt: IPointerEvent | IMouseEvent, documentOffsetConfig: IDocumentOffsetConfig, viewportMain: Nullable<Viewport>): void;
-    handleTripleClick(evt: IPointerEvent | IMouseEvent, documentOffsetConfig: IDocumentOffsetConfig, viewportMain: Nullable<Viewport>): void;
-    eventTrigger(evt: IPointerEvent | IMouseEvent, documentOffsetConfig: IDocumentOffsetConfig, viewportMain: Nullable<Viewport>): void;
+    changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
+    handleDblClick(evt: IPointerEvent | IMouseEvent): void;
+    handleTripleClick(evt: IPointerEvent | IMouseEvent): void;
+    eventTrigger(evt: IPointerEvent | IMouseEvent): void;
     removeAllTextRanges(): void;
     private _getAllTextRanges;
     private _getActiveRange;

package/lib/types/components/sheets/extensions/sheet-extension.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IRange } from '@univerjs/core';
+import { type IRange } from '@univerjs/core';
 import { ComponentExtension } from '../../extension';
 import type { SpreadsheetSkeleton } from '../sheet-skeleton';
 export declare enum SHEET_EXTENSION_TYPE {
@@ -22,7 +22,7 @@ export declare enum SHEET_EXTENSION_TYPE {
 export declare class SheetExtension extends ComponentExtension<SpreadsheetSkeleton, SHEET_EXTENSION_TYPE, IRange[]> {
     type: SHEET_EXTENSION_TYPE;
     getCellIndex(rowIndex: number, columnIndex: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], dataMergeCache: IRange[]): import("@univerjs/core").ISelectionCellWithCoord;
-    isRenderDiffRangesByCell(row: number, column: number, diffRanges?: IRange[]): boolean;
-    isRenderDiffRangesByColumn(column: number, diffRanges?: IRange[]): boolean;
-    isRenderDiffRangesByRow(row: number, diffRanges?: IRange[]): boolean;
+    isRenderDiffRangesByCell(range: IRange, diffRanges?: IRange[]): boolean;
+    isRenderDiffRangesByColumn(curStartColumn: number, curEndColumn: number, diffRanges?: IRange[]): boolean;
+    isRenderDiffRangesByRow(curStartRow: number, curEndRow: number, diffRanges?: IRange[]): boolean;
 }

package/lib/types/components/sheets/sheet-skeleton.d.ts

@@ -290,6 +290,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     intersectMergeRange(row: number, column: number): boolean;
     private _calculateStylesCache;
     private _resetCache;
+    private _makeDocumentSkeletonDirty;
     private _setCellCache;
     private _updateConfigAndGetDocumentModel;
     private _getDocumentDataByStyle;

package/lib/types/components/sheets/spreadsheet.d.ts

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IViewportBound } from '../../basics/vector2';
-import { Vector2 } from '../../basics/vector2';
+import type { IViewportBound, Vector2 } from '../../basics/vector2';
 import { Documents } from '../docs/document';
 import type { Background } from './extensions/background';
 import type { Border } from './extensions/border';
@@ -51,10 +50,6 @@ export declare class Spreadsheet extends SheetComponent {
         y: number;
     };
     makeForceDirty(state?: boolean): void;
-    getAncestorScrollXY(offsetX: number, offsetY: number): {
-        x: number;
-        y: number;
-    };
     getSelectionBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): {
         startRow: number;
         startColumn: number;

package/lib/types/thin-scene.d.ts

@@ -88,4 +88,8 @@ export declare abstract class ThinScene {
     pick(coord: Vector2): Nullable<BaseObject | ThinScene>;
     getViewports(): any[];
     removeViewport(key: string): void;
+    getAncestorScale(): {
+        scaleX: number;
+        scaleY: number;
+    };
 }

package/lib/types/viewport.d.ts

@@ -173,6 +173,7 @@ export declare class Viewport {
         x: number;
         y: number;
     };
+    private _getScale;
     getTransformedScroll(): {
         x: number;
         y: number;