@univerjs/engine-render 0.2.12 → 0.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/engine-render",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "private": false,
   "description": "UniverSheet normal base-render",
   "author": "DreamNum <developer@univer.ai>",
@@ -47,23 +47,23 @@
   ],
   "peerDependencies": {
     "rxjs": ">=7.0.0",
-    "@univerjs/core": "0.2.12"
+    "@univerjs/core": "0.2.13"
   },
   "dependencies": {
     "@floating-ui/dom": "^1.6.10",
     "@floating-ui/utils": "^0.2.7",
     "cjk-regex": "^3.1.0",
     "franc-min": "^6.2.0",
-    "opentype.js": "^1.3.4"
+    "opentype.js": "^1.3.4",
+    "@univerjs/core": "0.2.13"
   },
   "devDependencies": {
     "@types/opentype.js": "^1.3.8",
     "rxjs": "^7.8.1",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.2",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.4",
     "vitest": "^2.0.5",
-    "@univerjs/core": "0.2.12",
-    "@univerjs/shared": "0.2.12"
+    "@univerjs-infra/shared": "0.2.13"
   },
   "browser": {
     "fs": false

package/lib/types/components/docs/text-selection/convert-rect-range.d.ts

@@ -1,29 +0,0 @@
-import { Nullable } from '@univerjs/core';
-import { INodePosition, IPoint } from '../../../basics';
-import { IDocumentOffsetConfig } from '../document';
-import { DocumentSkeleton } from '../layout/doc-skeleton';
-export declare function isValidRectRange(anchorNodePosition: INodePosition, focusNodePosition: INodePosition): boolean;
-export declare function isInSameTableCell(anchorNodePosition: INodePosition, focusNodePosition: INodePosition): boolean;
-export declare function compareNodePositionInTable(a: INodePosition, b: INodePosition): boolean;
-interface IRectRangeNodePositions {
-    anchor: INodePosition;
-    focus: INodePosition;
-}
-export declare class NodePositionConvertToRectRange {
-    private _documentOffsetConfig;
-    private _docSkeleton;
-    private _liquid;
-    constructor(_documentOffsetConfig: IDocumentOffsetConfig, _docSkeleton: DocumentSkeleton);
-    getRangePointData(startNodePosition: INodePosition, endNodePosition: INodePosition): {
-        pointGroup: IPoint[][];
-        startRow: number;
-        startColumn: number;
-        endRow: number;
-        endColumn: number;
-        tableId: string;
-    } | undefined;
-    getNodePositionGroup(anchorNodePosition: INodePosition, focusNodePosition: INodePosition): Nullable<IRectRangeNodePositions[]>;
-    private _collectPositionGroup;
-    private _getTableRectRangeInfo;
-}
-export {};

package/lib/types/components/docs/text-selection/convert-text-range.d.ts

@@ -1,65 +0,0 @@
-import { IPosition, ITextRange, Nullable } from '@univerjs/core';
-import { IDocumentSkeletonCached, IDocumentSkeletonPage } from '../../../basics/i-document-skeleton-cached';
-import { INodePosition } from '../../../basics/interfaces';
-import { IPoint } from '../../../basics/vector2';
-import { DocumentSkeleton } from '../layout/doc-skeleton';
-import { IDocumentOffsetConfig } from '../document';
-export declare enum NodePositionStateType {
-    NORMAL = 0,
-    START = 1,
-    END = 2
-}
-export declare enum NodePositionType {
-    page = 0,
-    section = 1,
-    column = 2,
-    line = 3,
-    divide = 4,
-    glyph = 5
-}
-export interface ICurrentNodePositionState {
-    page: NodePositionStateType;
-    section: NodePositionStateType;
-    column: NodePositionStateType;
-    line: NodePositionStateType;
-    divide: NodePositionStateType;
-    glyph: NodePositionStateType;
-}
-export declare const NodePositionMap: {
-    page: number;
-    section: number;
-    column: number;
-    line: number;
-    divide: number;
-    glyph: number;
-};
-export declare function compareNodePositionLogic(pos1: INodePosition, pos2: INodePosition): boolean;
-export declare function compareNodePosition(pos1: INodePosition, pos2: INodePosition): {
-    start: INodePosition;
-    end: INodePosition;
-};
-export declare function getOneTextSelectionRange(rangeList: ITextRange[]): Nullable<ITextRange>;
-export declare function pushToPoints(position: IPosition): {
-    x: number;
-    y: number;
-}[];
-export declare function getPageFromPath(skeletonData: IDocumentSkeletonCached, path: (string | number)[]): Nullable<IDocumentSkeletonPage>;
-export declare class NodePositionConvertToCursor {
-    private _documentOffsetConfig;
-    private _docSkeleton;
-    private _liquid;
-    private _currentStartState;
-    private _currentEndState;
-    constructor(_documentOffsetConfig: IDocumentOffsetConfig, _docSkeleton: DocumentSkeleton);
-    getRangePointData(startOrigin: Nullable<INodePosition>, endOrigin: Nullable<INodePosition>): {
-        borderBoxPointGroup: IPoint[][];
-        contentBoxPointGroup: IPoint[][];
-        cursorList: ITextRange[];
-    };
-    private _isValidPosition;
-    private _resetCurrentNodePositionState;
-    private _setNodePositionState;
-    private _checkPreviousNodePositionState;
-    private _getSelectionRuler;
-    private _selectionIterator;
-}

package/lib/types/components/docs/text-selection/range-interface.d.ts

@@ -1,21 +0,0 @@
-import { Nullable } from '@univerjs/core';
-import { INodePosition, ITextSelectionStyle, RANGE_DIRECTION } from '../../../basics';
-export declare enum DOC_RANGE_TYPE {
-    RECT = "RECT",
-    TEXT = "TEXT"
-}
-export interface IDocRange {
-    rangeType: DOC_RANGE_TYPE;
-    anchorNodePosition?: Nullable<INodePosition>;
-    focusNodePosition?: Nullable<INodePosition>;
-    style: ITextSelectionStyle;
-    get startOffset(): Nullable<number>;
-    get endOffset(): Nullable<number>;
-    get collapsed(): boolean;
-    get startNodePosition(): Nullable<INodePosition>;
-    get endNodePosition(): Nullable<INodePosition>;
-    get direction(): RANGE_DIRECTION;
-    isActive(): boolean;
-    dispose(): void;
-    refresh(): void;
-}

package/lib/types/components/docs/text-selection/rect-range.d.ts

@@ -1,48 +0,0 @@
-import { Nullable } from '@univerjs/core';
-import { INodePosition, ITextSelectionStyle, RANGE_DIRECTION } from '../../../basics';
-import { ThinScene } from '../../../thin-scene';
-import { Documents } from '../document';
-import { DocumentSkeleton } from '../layout/doc-skeleton';
-import { IDocRange, DOC_RANGE_TYPE } from './range-interface';
-export declare function convertPositionsToRectRanges(scene: ThinScene, document: Documents, docSkeleton: DocumentSkeleton, anchorNodePosition: INodePosition, focusNodePosition: INodePosition, style?: ITextSelectionStyle, segmentId?: string): RectRange[];
-export declare class RectRange implements IDocRange {
-    private _scene;
-    private _document;
-    private _docSkeleton;
-    anchorNodePosition: INodePosition;
-    focusNodePosition: INodePosition;
-    style: ITextSelectionStyle;
-    private _segmentId;
-    rangeType: DOC_RANGE_TYPE;
-    private _rangeShape;
-    private _current;
-    private _startRow;
-    private _startCol;
-    private _endRow;
-    private _endCol;
-    private _tableId;
-    constructor(_scene: ThinScene, _document: Documents, _docSkeleton: DocumentSkeleton, anchorNodePosition: INodePosition, focusNodePosition: INodePosition, style?: ITextSelectionStyle, _segmentId?: string);
-    get startOffset(): Nullable<number>;
-    get endOffset(): Nullable<number>;
-    get collapsed(): boolean;
-    get startRow(): number;
-    get startColumn(): number;
-    get endRow(): number;
-    get endColumn(): number;
-    get tableId(): string;
-    get segmentId(): string;
-    get spanEntireRow(): boolean;
-    get spanEntireColumn(): boolean;
-    get spanEntireTable(): boolean;
-    get startNodePosition(): INodePosition;
-    get endNodePosition(): INodePosition;
-    get direction(): RANGE_DIRECTION;
-    isActive(): boolean;
-    activate(): void;
-    deactivate(): void;
-    dispose(): void;
-    isIntersection(compareRange: RectRange): boolean;
-    refresh(): void;
-    private _updateTableInfo;
-    private _createOrUpdateRange;
-}

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

@@ -1,27 +0,0 @@
-import { Nullable } from '@univerjs/core';
-import { IDocumentSkeletonGlyph, INodePosition, ITextSelectionStyle } from '../../../basics';
-import { DocumentSkeleton } from '../layout/doc-skeleton';
-import { Engine } from '../../../engine';
-import { Documents } from '../document';
-import { Scene } from '../../../scene';
-import { RectRange } from './rect-range';
-import { TextRange } from './text-range';
-interface IDocRangeList {
-    textRanges: TextRange[];
-    rectRanges: RectRange[];
-}
-export declare function getTextRangeFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<TextRange>;
-export declare function getRectRangeFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<RectRange>;
-export declare function getRangeListFromCharIndex(startOffset: number, endOffset: number, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<IDocRangeList>;
-export declare function getRangeListFromSelection(anchorPosition: INodePosition, focusPosition: INodePosition, scene: Scene, document: Documents, skeleton: DocumentSkeleton, style: ITextSelectionStyle, segmentId: string, segmentPage: number): Nullable<IDocRangeList>;
-export declare function getCanvasOffsetByEngine(engine: Nullable<Engine>): {
-    left: number;
-    top: number;
-};
-export declare function getParagraphInfoByGlyph(node: IDocumentSkeletonGlyph): {
-    st: number;
-    ed: number;
-    content: string;
-    nodeIndex: number;
-} | undefined;
-export {};

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

@@ -1,68 +0,0 @@
-import { Nullable } from '@univerjs/core';
-import { INodePosition } from '../../../basics/interfaces';
-import { ISuccinctDocRangeParam, ITextSelectionStyle, RANGE_DIRECTION } from '../../../basics/range';
-import { IPoint } from '../../../basics/vector2';
-import { Scene } from '../../../scene';
-import { Rect } from '../../../shape/rect';
-import { ThinScene } from '../../../thin-scene';
-import { DocumentSkeleton } from '../layout/doc-skeleton';
-import { Documents } from '../document';
-import { IDocRange, DOC_RANGE_TYPE } from './range-interface';
-export declare const TEXT_RANGE_LAYER_INDEX = 3;
-export declare function cursorConvertToTextRange(scene: Scene, range: ISuccinctDocRangeParam, docSkeleton: DocumentSkeleton, document: Documents): Nullable<TextRange>;
-export declare function getAnchorBounding(pointsGroup: IPoint[][]): {
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-};
-export declare function getLineBounding(pointsGroup: IPoint[][]): {
-    left: number;
-    right: number;
-    top: number;
-    bottom: number;
-}[];
-export declare class TextRange implements IDocRange {
-    private _scene;
-    private _document;
-    private _docSkeleton;
-    anchorNodePosition?: Nullable<INodePosition>;
-    focusNodePosition?: Nullable<INodePosition>;
-    style: ITextSelectionStyle;
-    private _segmentId;
-    rangeType: DOC_RANGE_TYPE;
-    private _current;
-    private _rangeShape;
-    private _anchorShape;
-    private _cursorList;
-    private _anchorBlinkTimer;
-    constructor(_scene: ThinScene, _document: Documents, _docSkeleton: DocumentSkeleton, anchorNodePosition?: Nullable<INodePosition>, focusNodePosition?: Nullable<INodePosition>, style?: ITextSelectionStyle, _segmentId?: string);
-    private _anchorBlink;
-    get startOffset(): number | undefined;
-    get endOffset(): number | undefined;
-    get collapsed(): boolean;
-    get startNodePosition(): INodePosition | null;
-    get endNodePosition(): Nullable<INodePosition>;
-    get direction(): RANGE_DIRECTION;
-    get segmentId(): string;
-    getAbsolutePosition(): {
-        left: number;
-        top: number;
-        width: number;
-        height: number;
-    } | undefined;
-    getAnchor(): Nullable<Rect<import('../../../shape/rect').IRectProps>>;
-    activeStatic(): void;
-    deactivateStatic(): void;
-    isActive(): boolean;
-    activate(): void;
-    deactivate(): void;
-    dispose(): void;
-    isIntersection(compareRange: TextRange): boolean;
-    refresh(): void;
-    private _isEmpty;
-    private _isCollapsed;
-    private _createOrUpdateRange;
-    private _createOrUpdateAnchor;
-    private _setCursorList;
-}

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

@@ -1,193 +0,0 @@
-import { Nullable, ILogService, RxDisposable } from '@univerjs/core';
-import { Observable } from 'rxjs';
-import { IMouseEvent, IPointerEvent } from '../../../basics/i-events';
-import { INodePosition } from '../../../basics/interfaces';
-import { ISuccinctDocRangeParam, ITextRangeWithStyle, ITextSelectionStyle, RANGE_DIRECTION } from '../../../basics/range';
-import { Scene } from '../../../scene';
-import { Viewport } from '../../../viewport';
-import { DocumentSkeleton } from '../layout/doc-skeleton';
-import { Documents } from '../document';
-import { TextRange } from './text-range';
-import { RectRange } from './rect-range';
-export interface ITextSelectionInnerParam {
-    textRanges: TextRange[];
-    rectRanges: RectRange[];
-    segmentId: string;
-    isEditing: boolean;
-    style: ITextSelectionStyle;
-    segmentPage: number;
-    options?: {
-        [key: string]: boolean;
-    };
-}
-export interface IActiveTextRange {
-    startOffset: number;
-    endOffset: number;
-    collapsed: boolean;
-    startNodePosition: Nullable<INodePosition>;
-    endNodePosition: Nullable<INodePosition>;
-    direction: RANGE_DIRECTION;
-    segmentId: string;
-    segmentPage: number;
-    style: ITextSelectionStyle;
-}
-export interface ITextSelectionRenderManager {
-    readonly onInputBefore$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onKeydown$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onInput$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onPointerDown$: Observable<void>;
-    readonly onCompositionstart$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onCompositionupdate$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onCompositionend$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onSelectionStart$: Observable<Nullable<INodePosition>>;
-    readonly onPaste$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onFocus$: Observable<Nullable<IEditorInputConfig>>;
-    readonly onBlur$: Observable<Nullable<IEditorInputConfig>>;
-    readonly textSelectionInner$: Observable<Nullable<ITextSelectionInnerParam>>;
-    __getEditorContainer(): HTMLElement;
-    getViewPort(): Viewport;
-    enableSelection(): void;
-    disableSelection(): void;
-    setSegment(id: string): void;
-    getSegment(): string;
-    setSegmentPage(pageIndex: number): void;
-    getSegmentPage(): number;
-    setStyle(style: ITextSelectionStyle): void;
-    resetStyle(): void;
-    removeAllRanges(): void;
-    addDocRanges(ranges: ISuccinctDocRangeParam[], isEditing?: boolean, options?: {
-        [key: string]: boolean;
-    }): void;
-    sync(): void;
-    activate(x: number, y: number): void;
-    deactivate(): void;
-    hasFocus(): boolean;
-    focus(): void;
-    blur(): void;
-    focusEditor(): void;
-    blurEditor(): void;
-    changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
-    dispose(): void;
-    handleDblClick(evt: IPointerEvent | IMouseEvent): void;
-    handleTripleClick(evt: IPointerEvent | IMouseEvent): void;
-    onPointDown(evt: IPointerEvent | IMouseEvent): void;
-    setCursorManually(evtOffsetX: number, evtOffsetY: number): void;
-}
-export interface IEditorInputConfig {
-    event: Event | CompositionEvent | KeyboardEvent;
-    content?: string;
-    activeRange?: Nullable<ITextRangeWithStyle>;
-    rangeList?: TextRange[];
-}
-export declare class TextSelectionRenderManager extends RxDisposable implements ITextSelectionRenderManager {
-    private readonly _logService;
-    private readonly _onInputBefore$;
-    readonly onInputBefore$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onKeydown$;
-    readonly onKeydown$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onInput$;
-    readonly onInput$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onCompositionstart$;
-    readonly onCompositionstart$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onCompositionupdate$;
-    readonly onCompositionupdate$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onCompositionend$;
-    readonly onCompositionend$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onSelectionStart$;
-    readonly onSelectionStart$: Observable<Nullable<INodePosition>>;
-    private readonly _onPaste$;
-    readonly onPaste$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _textSelectionInner$;
-    readonly textSelectionInner$: Observable<Nullable<ITextSelectionInnerParam>>;
-    private readonly _onFocus$;
-    readonly onFocus$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onBlur$;
-    readonly onBlur$: Observable<Nullable<IEditorInputConfig>>;
-    private readonly _onPointerDown$;
-    readonly onPointerDown$: Observable<void>;
-    private _container;
-    private _inputParent;
-    private _input;
-    private _scrollTimers;
-    private _rangeList;
-    private _rangeListCache;
-    private _rectRangeList;
-    private _rectRangeListCache;
-    private _anchorNodePosition;
-    private _focusNodePosition;
-    private _currentSegmentId;
-    private _currentSegmentPage;
-    private _selectionStyle;
-    private _isSelectionEnabled;
-    private _viewPortObserverMap;
-    private _isIMEInputApply;
-    private _activeViewport;
-    private _docSkeleton;
-    private _scene;
-    private _document;
-    private _scenePointerMoveSubs;
-    private _scenePointerUpSubs;
-    private _editorFocusing;
-    constructor(_logService: ILogService);
-    __getEditorContainer(): HTMLElement;
-    getViewPort(): Viewport;
-    setSegment(id: string): void;
-    getSegment(): string;
-    setSegmentPage(pageIndex: number): void;
-    getSegmentPage(): number;
-    setStyle(style?: ITextSelectionStyle): void;
-    resetStyle(): void;
-    enableSelection(): void;
-    disableSelection(): void;
-    addDocRanges(ranges: ISuccinctDocRangeParam[], isEditing?: boolean, options?: {
-        [key: string]: boolean;
-    }): void;
-    setCursorManually(evtOffsetX: number, evtOffsetY: number): void;
-    sync(): void;
-    activate(x: number, y: number): void;
-    hasFocus(): boolean;
-    focus(): void;
-    blur(): void;
-    focusEditor(): void;
-    blurEditor(): void;
-    deactivate(): void;
-    changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
-    handleDblClick(evt: IPointerEvent | IMouseEvent): void;
-    handleTripleClick(evt: IPointerEvent | IMouseEvent): void;
-    onPointDown(evt: IPointerEvent | IMouseEvent): void;
-    removeAllRanges(): void;
-    private _setSystemHighlightColorToStyle;
-    private _getAllTextRanges;
-    private _getAllRectRanges;
-    private _getActiveRange;
-    private _getActiveRangeInstance;
-    dispose(): void;
-    private _initDOM;
-    private _initInput;
-    private _getNodePosition;
-    private _interactTextRanges;
-    private _interactRectRanges;
-    private _removeAllRanges;
-    private _removeAllCacheRanges;
-    private _removeAllTextRanges;
-    private _removeAllRectRanges;
-    private _deactivateAllTextRanges;
-    private _deactivateAllRectRanges;
-    private _addTextRangesToCache;
-    private _addTextRange;
-    private _addRectRangesToCache;
-    private _addRectRanges;
-    private _createTextRangeByAnchorPosition;
-    private _updateActiveRangePosition;
-    private _isEmpty;
-    private _getCanvasOffset;
-    private _updateInputPosition;
-    private _moving;
-    private _attachScrollEvent;
-    private _initInputEvents;
-    private _eventHandle;
-    private _getTransformCoordForDocumentOffset;
-    private _findNodeByCoord;
-    private _detachEvent;
-}
-export declare const ITextSelectionRenderManager: import('@univerjs/core').IdentifierDecorator<TextSelectionRenderManager>;