@univerjs/engine-render 0.1.0-beta.5 → 0.1.2

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

@@ -56,6 +56,8 @@ export declare function precisionTo(num: number, accurate: number): number;
  * var time = performance.now(); for(let i=0;i<100000000;i++){ fixLineWidthByScale(i, 0.666); }; console.log(performance.now()-time);
  */
 export declare function fixLineWidthByScale(num: number, scale: number): number;
+export declare const UNIVER_GLOBAL_DEFAULT_FONT_SIZE = 11;
+export declare const UNIVER_GLOBAL_DEFAULT_FONT_FAMILY = "Arial";
 export declare function getFontStyleString(textStyle?: IStyleBase, localeService?: LocaleService): {
     fontCache: string;
     fontString: string;
@@ -120,3 +122,5 @@ export declare function getSizeForDom(dom: HTMLElement): {
     width: number;
     height: number;
 };
+export declare function ptToPixel(pt: number): number;
+export declare function pixelToPt(px: number): number;

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

@@ -17,12 +17,20 @@ import type { Nullable } from '@univerjs/core';
 import type { INodePosition } from '../../../basics/interfaces';
 import type { ISuccinctTextRangeParam, ITextSelectionStyle } from '../../../basics/range';
 import { RANGE_DIRECTION } from '../../../basics/range';
+import type { IPoint } from '../../../basics/vector2';
 import type { Scene } from '../../../scene';
 import { Rect } from '../../../shape/rect';
 import type { ThinScene } from '../../../thin-scene';
 import type { DocumentSkeleton } from '../doc-skeleton';
 import type { Documents } from '../document';
+export declare const TEXT_RANGE_LAYER_INDEX = 1;
 export declare function cursorConvertToTextRange(scene: Scene, range: ISuccinctTextRangeParam, docSkeleton: DocumentSkeleton, document: Documents): Nullable<TextRange>;
+export declare function getAnchorBounding(pointsGroup: IPoint[][]): {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+};
 export declare class TextRange {
     private _scene;
     private _document;
@@ -34,7 +42,9 @@ export declare class TextRange {
     private _rangeShape;
     private _anchorShape;
     private _cursorList;
+    private _anchorBlinkTimer;
     constructor(_scene: ThinScene, _document: Documents, _docSkeleton: DocumentSkeleton, anchorNodePosition?: Nullable<INodePosition>, focusNodePosition?: Nullable<INodePosition>, style?: ITextSelectionStyle);
+    private _anchorBlink;
     get startOffset(): number | undefined;
     get endOffset(): number | undefined;
     get collapsed(): boolean;
@@ -53,7 +63,6 @@ export declare class TextRange {
     private _isEmpty;
     private _isCollapsed;
     private _createOrUpdateRange;
-    private _getAnchorBounding;
     private _createOrUpdateAnchor;
     private _setCursorList;
 }

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

@@ -43,7 +43,6 @@ export declare function getLastSpan(page: IDocumentSkeletonPage): IDocumentSkele
 export declare function isColumnFull(page: IDocumentSkeletonPage): boolean;
 export declare function isBlankPage(page: IDocumentSkeletonPage): boolean;
 export declare function isBlankColumn(column: IDocumentSkeletonColumn): boolean;
-export declare function reCalculateLineDivide(): void;
 export declare function getNumberUnitValue(unitValue: number | INumberUnit, benchMark: number): number;
 export declare function getCharSpaceApply(charSpace: number | undefined, defaultTabStop: number, gridType?: GridType, snapToGrid?: BooleanNumber): number;
 export declare function validationGrid(gridType?: GridType, snapToGrid?: BooleanNumber): boolean;

package/lib/types/components/docs/document.d.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import './extensions';
 import type { Nullable } from '@univerjs/core';
 import { Observable } from '@univerjs/core';
 import type { IDocumentSkeletonPage } from '../../basics/i-document-skeleton-cached';

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

@@ -24,19 +24,15 @@ import type { Scene } from '../../scene';
 import type { Viewport } from '../../viewport';
 import { TextRange } from './common/text-range';
 import type { DocumentSkeleton } from './doc-skeleton';
-import type { Documents, IDocumentOffsetConfig } from './document';
+import type { Documents } from './document';
 export declare function getCanvasOffsetByEngine(engine: Nullable<Engine>): {
     left: number;
     top: number;
 };
-interface IAddTextRangesConfig {
-    scene: Scene;
-    skeleton: DocumentSkeleton;
-    documentOffsetConfig: IDocumentOffsetConfig;
-}
 export interface ITextSelectionInnerParam {
     textRanges: TextRange[];
     segmentId: string;
+    isEditing: boolean;
     style: ITextSelectionStyle;
 }
 export interface IActiveTextRange {
@@ -58,6 +54,8 @@ export interface ITextSelectionRenderManager {
     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;
@@ -67,12 +65,13 @@ export interface ITextSelectionRenderManager {
     setStyle(style: ITextSelectionStyle): void;
     resetStyle(): void;
     removeAllTextRanges(): void;
-    addTextRanges(ranges: ISuccinctTextRangeParam[], config?: IAddTextRangesConfig): void;
+    addTextRanges(ranges: ISuccinctTextRangeParam[], isEditing?: boolean): void;
     sync(): void;
     activate(x: number, y: number): void;
+    deactivate(): void;
+    hasFocus(): boolean;
     focus(): void;
     blur(): void;
-    deactivate(): void;
     changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
     dispose(): void;
     handleDblClick(evt: IPointerEvent | IMouseEvent): void;
@@ -105,10 +104,13 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     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 _container;
     private _inputParent;
     private _input;
-    private _cursor;
     private _moveObserver;
     private _upObserver;
     private _viewportScrollX;
@@ -131,9 +133,10 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     resetStyle(): void;
     enableSelection(): void;
     disableSelection(): void;
-    addTextRanges(ranges: ISuccinctTextRangeParam[]): void;
+    addTextRanges(ranges: ISuccinctTextRangeParam[], isEditing?: boolean): void;
     sync(): void;
     activate(x: number, y: number): void;
+    hasFocus(): boolean;
     focus(): void;
     blur(): void;
     deactivate(): void;
@@ -149,7 +152,6 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     dispose(): void;
     private _initDOM;
     private _initInput;
-    private _initDOMCursor;
     private _getNodePosition;
     private _interactTextRange;
     private _removeAllTextRanges;
@@ -159,8 +161,7 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _updateActiveRangeFocusPosition;
     private _isEmpty;
     private _getCanvasOffset;
-    private _scrollToSelection;
-    private _updateDomCursorPositionAndSize;
+    private _updateInputPosition;
     private _moving;
     private _attachScrollEvent;
     private _initInputEvents;
@@ -171,4 +172,3 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _activeSelectionRefresh;
 }
 export declare const ITextSelectionRenderManager: import("@wendellhu/redi").IdentifierDecorator<TextSelectionRenderManager>;
-export {};

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

@@ -23,7 +23,6 @@ import type { IStylesCache } from './interfaces';
  * Obtain the height and width of a cell's text, taking into account scenarios with rotated text.
  * @param documentSkeleton Data of the document's ViewModel
  * @param angleInDegree The rotation angle of an Excel cell, it's **degree**
- * @returns
  */
 export declare function getDocsSkeletonPageSize(documentSkeleton: DocumentSkeleton, angleInDegree?: number): {
     width: number;
@@ -85,26 +84,18 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     get columnHeaderHeightAndMarginTop(): number;
     /**
      * @deprecated
-     * @param config
-     * @param cellData
-     * @param styles
-     * @param LocaleService
-     * @returns
      */
     static create(worksheet: Worksheet | undefined, config: IWorksheetData, cellData: ObjectMatrix<Nullable<ICellData>>, styles: Styles, LocaleService: LocaleService): SpreadsheetSkeleton;
     /**
      * @deprecated should never expose a property that is provided by another module!
-     * @returns
      */
     getWorksheetConfig(): IWorksheetData;
     /**
      * @deprecated should never expose a property that is provided by another module!
-     * @returns
      */
     getCellData(): ObjectMatrix<Nullable<ICellData>>;
     /**
      * @deprecated should never expose a property that is provided by another module!
-     * @returns
      */
     getsStyles(): Styles;
     setOverflowCache(value: ObjectMatrix<IRange>): void;
@@ -116,6 +107,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     calculateAutoHeightInRange(ranges: Nullable<IRange[]>): IRowAutoHeightInfo[];
     private _calculateRowAutoHeight;
     updateLayout(): this | undefined;
+    private _dynamicallyUpdateRowHeaderWidth;
     getRowColumnSegment(bounds?: IViewportBound): {
         startRow: number;
         endRow: number;
@@ -162,7 +154,9 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @param offsetY HTML coordinate system, mouse position y.
      * @param scaleX render scene scale x-axis, scene.getAncestorScale
      * @param scaleY render scene scale y-axis, scene.getAncestorScale
-     * @param scrollXY  render viewport scroll {x, y}, scene.getScrollXYByRelativeCoords, scene.getScrollXY
+     * @param scrollXY render viewport scroll {x, y}, scene.getScrollXYByRelativeCoords, scene.getScrollXY
+     * @param scrollXY.x
+     * @param scrollXY.y
      * @returns Selection data with coordinates
      */
     calculateCellIndexByPosition(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
@@ -176,6 +170,8 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @param scaleX render scene scale x-axis, scene.getAncestorScale
      * @param scaleY render scene scale y-axis, scene.getAncestorScale
      * @param scrollXY  render viewport scroll {x, y}, scene.getScrollXYByRelativeCoords, scene.getScrollXY
+     * @param scrollXY.x
+     * @param scrollXY.y
      * @returns Hit cell coordinates
      */
     getCellPositionByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
@@ -201,7 +197,8 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @param offsetY scaled offset y
      * @param scaleY scale y
      * @param scrollXY
-     * @returns
+     * @param scrollXY.x
+     * @param scrollXY.y
      */
     getRowPositionByOffsetY(offsetY: number, scaleY: number, scrollXY: {
         x: number;
@@ -221,8 +218,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * Return cell information corresponding to the current coordinates, including the merged cell object.
      * @param row Specified Row Coordinate
      * @param column Specified Column Coordinate
-     * @param scaleX render scene scale x-axis, current Horizontal Scale, scene.getAncestorScale
-     * @param scaleY render scene scale y-axis, current Vertical Scale, scene.getAncestorScale
      */
     getCellByIndex(row: number, column: number): ISelectionCellWithCoord;
     getCellByIndexWithNoHeader(row: number, column: number): {
@@ -281,7 +276,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      *
      * @param rowHeightAccumulation Row layout information
      * @param columnWidthAccumulation Column layout information
-     * @param bounds The range of the visible area of the canvas
+     * @param viewBound The range of the visible area of the canvas
      * @returns The range cell index of the canvas visible area
      */
     protected _getBounding(rowHeightAccumulation: number[], columnWidthAccumulation: number[], viewBound?: IBoundRectNoAngle): {
@@ -307,7 +302,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * Cache the merged cells on the current screen to improve computational performance.
      * @param mergeData all marge data
      * @param rowColumnSegment current screen range, include row and column
-     * @returns
      */
     private _getMergeCells;
 }

package/lib/types/layer.d.ts

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Disposable } from '@univerjs/core';
 import { BaseObject } from './base-object';
 import type { UniverRenderingContext } from './context';
 import type { ThinScene } from './thin-scene';
-export declare class Layer {
+export declare class Layer extends Disposable {
     private _scene;
     private _zIndex;
     private _allowCache;

package/lib/types/render-manager.service.d.ts

@@ -23,16 +23,20 @@ import { Engine } from './engine';
 import { Scene } from './scene';
 export interface IRenderManagerService {
     currentRender$: Observable<Nullable<string>>;
+    createRender$: Observable<Nullable<string>>;
     dispose(): void;
     createRenderWithParent(unitId: string, parentUnitId: string): IRender;
     createRender(unitId: string): IRender;
     addItem(unitId: string, item: IRender): void;
     removeItem(unitId: string): void;
     setCurrent(unitId: string): void;
-    getCurrent(): Nullable<IRender>;
     getRenderById(unitId: string): Nullable<IRender>;
     getRenderAll(): Map<string, IRender>;
     defaultEngine: Engine;
+    create(unitId: Nullable<string>): void;
+    getCurrent(): Nullable<IRender>;
+    getFirst(): Nullable<IRender>;
+    has(unitId: string): boolean;
 }
 export type RenderComponentType = SheetComponent | DocComponent | Slide | BaseObject;
 export interface IRender {
@@ -49,15 +53,20 @@ export declare class RenderManagerService implements IRenderManagerService {
     private _renderMap;
     private readonly _currentRender$;
     readonly currentRender$: Observable<Nullable<string>>;
+    private readonly _createRender$;
+    readonly createRender$: Observable<Nullable<string>>;
     get defaultEngine(): Engine;
     dispose(): void;
     createRenderWithParent(unitId: string, parentUnitId: string): IRender;
+    create(unitId: Nullable<string>): void;
     createRender(unitId: string): IRender;
     private _createRender;
     addItem(unitId: string, item: IRender): void;
     removeItem(unitId: string): void;
+    has(unitId: string): boolean;
     setCurrent(unitId: string): void;
-    getCurrent(): Nullable<IRender>;
+    getCurrent(): IRender | undefined;
+    getFirst(): IRender;
     getRenderById(unitId: string): Nullable<IRender>;
     getRenderAll(): Map<string, IRender>;
     private _disposeItem;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { Nullable } from '@univerjs/core';
-import { Observable } from '@univerjs/core';
+import { Disposable, Observable } from '@univerjs/core';
 import type { BaseObject } from './base-object';
 import type { IMouseEvent, IPointerEvent } from './basics/i-events';
 import { Group } from './group';
@@ -65,7 +65,7 @@ export interface ITransformerConfig {
  * primitives and shapes. Transforming tool is not changing `width` and `height` properties of nodes
  * when you resize them. Instead it changes `scaleX` and `scaleY` properties.
  */
-export declare class Transformer implements ITransformerConfig {
+export declare class Transformer extends Disposable implements ITransformerConfig {
     private _scene;
     hoverEnabled: boolean;
     hoverEnterFunc: Nullable<(e: IPointerEvent | IMouseEvent) => void>;

package/lib/types/scene.input-manager.d.ts

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Disposable } from '@univerjs/core';
 import type { IMouseEvent } from './basics/i-events';
 import type { ThinScene } from './thin-scene';
-export declare class InputManager {
+export declare class InputManager extends Disposable {
     /** The distance in pixel that you have to move to prevent some events */
     static DragMovementThreshold: number;
     /** Time in milliseconds to wait to raise long press events if button is still pressed */

package/lib/types/shape/base-scroll-bar.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Nullable } from '@univerjs/core';
+import { Disposable, type Nullable } from '@univerjs/core';
 import type { Vector2 } from '../basics/vector2';
 import type { UniverRenderingContext } from '../context';
 import type { ThinScene } from '../thin-scene';
@@ -32,7 +32,7 @@ export interface IScrollBarProps {
     enableVertical?: boolean;
     mainScene?: ThinScene;
 }
-export declare class BaseScrollBar {
+export declare class BaseScrollBar extends Disposable {
     enableHorizontal: boolean;
     enableVertical: boolean;
     horizontalThumbWidth: number;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { EventState, Nullable, Observer } from '@univerjs/core';
-import { Observable } from '@univerjs/core';
+import { Disposable, Observable } from '@univerjs/core';
 import type { BaseObject } from './base-object';
 import type { EVENT_TYPE } from './basics/const';
 import { RENDER_CLASS_TYPE } from './basics/const';
@@ -23,7 +23,7 @@ import type { ITransformChangeState } from './basics/interfaces';
 import { Transform } from './basics/transform';
 import type { IViewportBound, Vector2 } from './basics/vector2';
 import type { UniverRenderingContext } from './context';
-export declare abstract class ThinScene {
+export declare abstract class ThinScene extends Disposable {
     onTransformChangeObservable: Observable<ITransformChangeState>;
     onPointerDownObserver: Observable<IMouseEvent | IPointerEvent>;
     onPointerMoveObserver: Observable<IMouseEvent | IPointerEvent>;