@univerjs/engine-render 0.5.0 → 0.5.1

package/lib/types/base-object.d.ts

@@ -158,6 +158,7 @@ export declare abstract class BaseObject extends Disposable {
     triggerPointerLeave(evt: IPointerEvent | IMouseEvent): boolean;
     triggerPointerOver(evt: IPointerEvent | IMouseEvent): boolean;
     triggerPointerEnter(evt: IPointerEvent | IMouseEvent): boolean;
+    triggerPointerCancel(evt: IPointerEvent): boolean;
     triggerDragLeave(evt: IDragEvent | IMouseEvent): boolean;
     triggerDragOver(evt: IDragEvent | IMouseEvent): boolean;
     triggerDragEnter(evt: IDragEvent | IMouseEvent): boolean;

package/lib/types/basics/i-document-skeleton-cached.d.ts

@@ -91,6 +91,7 @@ export interface IDocumentSkeletonRow {
     ed: number;
     rowSource: ITableRow;
     parent?: IDocumentSkeletonTable;
+    isRepeatRow: boolean;
 }
 export interface IDocumentSkeletonColumn {
     lines: IDocumentSkeletonLine[];

package/lib/types/components/docs/layout/block/paragraph/bullet-ruler.d.ts

@@ -1,2 +1,2 @@
-import { GlyphType } from '@univerjs/core';
-export declare function getBulletOrderedSymbol(startIndex: number, startNumber: number, glyphType: GlyphType | string): string;
+import { ListGlyphType } from '@univerjs/core';
+export declare function getBulletOrderedSymbol(startIndex: number, startNumber: number, glyphType: ListGlyphType | string): string;

package/lib/types/components/docs/layout/line-breaker/tiny-inflate.d.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 export declare class Tree {
-    table: Uint16Array;
-    trans: Uint16Array;
+    table: Uint16Array<ArrayBuffer>;
+    trans: Uint16Array<ArrayBuffer>;
 }
 export declare class Data {
     source: Uint8Array;
@@ -28,4 +28,4 @@ export declare class Data {
     dtree: Tree;
     constructor(source: Uint8Array, dest: Uint8Array);
 }
-export default function tinf_uncompress(source: Uint8Array, dest: Uint8Array): Uint8Array;
+export default function tinf_uncompress(source: Uint8Array, dest: Uint8Array): Uint8Array<ArrayBufferLike>;

package/lib/types/components/docs/layout/line-breaker/trie-data.d.ts

@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-declare const _default: Uint8Array;
+declare const _default: Uint8Array<ArrayBuffer>;
 export default _default;

package/lib/types/components/docs/layout/model/glyph.d.ts

@@ -1,4 +1,4 @@
-import { GlyphType, IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';
+import { IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph, GlyphType } from '../../../../basics/i-document-skeleton-cached';
 import { IFontCreateConfig } from '../../../../basics/interfaces';
 import { IOpenTypeGlyphInfo } from '../shaping-engine/text-shaping';
 export declare function isSpace(char: string): boolean;

package/lib/types/components/sheets/extensions/font.d.ts

@@ -29,6 +29,7 @@ export declare class Font extends SheetExtension {
     getDocuments(): any;
     draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[], moreBoundsInfo: IDrawInfo): void;
     _renderFontEachCell(renderFontCtx: IRenderFontContext, row: number, col: number, fontMatrix: ObjectMatrix<IFontCacheItem>): boolean;
+    private _renderImages;
     /**
      * Change font render bounds, for overflow and filter icon & custom render.
      * @param renderFontContext

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

@@ -1,4 +1,4 @@
-import { BorderStyleTypes, HorizontalAlign, ICellWithCoord, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import { BorderStyleTypes, HorizontalAlign, ICellWithCoord, ImageCacheMap, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { BORDER_TYPE as BORDER_LTRB } from '../../basics/const';
 import { Canvas } from '../../canvas';
 import { UniverRenderingContext } from '../../context';
@@ -18,6 +18,7 @@ export interface IFontCacheItem {
     verticalAlign: VerticalAlign;
     horizontalAlign: HorizontalAlign;
     wrapStrategy: WrapStrategy;
+    imageCacheMap: ImageCacheMap;
 }
 type colorString = string;
 export interface IStylesCache {

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

@@ -1,4 +1,4 @@
-import { ICellData, ICellDataForSheetInterceptor, ICellInfo, ICellWithCoord, IColAutoWidthInfo, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISize, IStyleData, ITextRotation, IWorksheetData, Nullable, Styles, VerticalAlign, Worksheet, BooleanNumber, DocumentDataModel, HorizontalAlign, IConfigService, IContextService, LocaleService, ObjectMatrix, WrapStrategy } from '@univerjs/core';
+import { ICellData, ICellDataForSheetInterceptor, ICellInfo, ICellWithCoord, IColAutoWidthInfo, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISize, IStyleData, ITextRotation, IWorksheetData, Nullable, Styles, VerticalAlign, Worksheet, BooleanNumber, DocumentDataModel, HorizontalAlign, IConfigService, IContextService, ImageCacheMap, Injector, LocaleService, ObjectMatrix, WrapStrategy } from '@univerjs/core';
 import { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';
 import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
 import { Skeleton } from '../skeleton';
@@ -60,6 +60,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _styles;
     private readonly _contextService;
     private readonly _configService;
+    private _injector;
     private _rowHeightAccumulation;
     private _columnWidthAccumulation;
     private _rowTotalHeight;
@@ -81,6 +82,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _showGridlines;
     private _marginTop;
     private _marginLeft;
+    private _imageCacheMap;
     /**
      * Whether the row style precedes the column style.
      */
@@ -91,13 +93,14 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @deprecated avoid use `IWorksheetData` directly, use API provided by `Worksheet`, otherwise
      * `ViewModel` will be not working.
      */
-    _worksheetData: IWorksheetData, _cellData: ObjectMatrix<Nullable<ICellData>>, _styles: Styles, _localeService: LocaleService, _contextService: IContextService, _configService: IConfigService);
+    _worksheetData: IWorksheetData, _cellData: ObjectMatrix<Nullable<ICellData>>, _styles: Styles, _localeService: LocaleService, _contextService: IContextService, _configService: IConfigService, _injector: Injector);
     get rowHeightAccumulation(): number[];
     get rowTotalHeight(): number;
     get columnWidthAccumulation(): number[];
     get columnTotalWidth(): number;
     get rowHeaderWidth(): number;
     get columnHeaderHeight(): number;
+    get imageCacheMap(): ImageCacheMap;
     /**
      * Range of visible area(range in viewBounds)
      */
@@ -400,7 +403,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
         mergeRange?: IRange;
         cacheItem?: ICacheItem;
     } | undefined): void;
-    _setFontStylesCache(row: number, col: number, cell: Nullable<ICellData>): void;
+    _setFontStylesCache(row: number, col: number, cell: Nullable<ICellDataForSheetInterceptor>): void;
     /**
      * Set border background and font to this._stylesCache cell by cell.
      * @param row {number}

package/lib/types/controllers/config.schema.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const PLUGIN_CONFIG_KEY = "engine-render.config";
+export declare const ENGINE_RENDER_PLUGIN_CONFIG_KEY = "engine-render.config";
 export declare const configSymbol: unique symbol;
 export interface IUniverEngineRenderConfig {
 }

package/lib/types/engine.d.ts

@@ -6,6 +6,12 @@ import { Disposable, EventSubject } from '@univerjs/core';
 import { Observable, Subject } from 'rxjs';
 import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
 import { Canvas, CanvasRenderMode } from './canvas';
+export interface IEngineOption {
+    elementWidth: number;
+    elementHeight: number;
+    dpr?: number;
+    renderMode?: CanvasRenderMode;
+}
 export declare class Engine extends Disposable {
     renderEvenInBackground: boolean;
     private readonly _beginFrame$;
@@ -14,6 +20,9 @@ export declare class Engine extends Disposable {
     readonly endFrame$: Observable<IBasicFrameInfo>;
     readonly renderFrameTimeMetric$: Subject<ITimeMetric>;
     readonly renderFrameTags$: Subject<[string, any]>;
+    /**
+     * Pass event to scene.input-manager
+     */
     onInputChanged$: EventSubject<IEvent>;
     onTransformChange$: EventSubject<ITransformChangeState>;
     private _scenes;
@@ -28,7 +37,6 @@ export declare class Engine extends Disposable {
     private _canvas;
     private _renderingQueueLaunched;
     private _renderFrameTasks;
-    private _renderFunction;
     private _requestNewFrameHandler;
     /**
      * frameCount
@@ -60,8 +68,11 @@ export declare class Engine extends Disposable {
     private _previousWidth;
     private _previousHeight;
     private _unitId;
-    constructor(elemWidth?: number, elemHeight?: number, pixelRatio?: number, mode?: CanvasRenderMode);
+    constructor();
+    constructor(unitId: string, options?: IEngineOption);
+    constructor(elemW: number, elemH: number, dpr?: number, renderMode?: CanvasRenderMode);
     _init(): void;
+    get unitId(): string;
     get elapsedTime(): number;
     get width(): number;
     get height(): number;
@@ -88,7 +99,7 @@ export declare class Engine extends Disposable {
      * To ensure mouse events remain bound to the host element,
      * preventing the events from becoming ineffective once the mouse leaves the host.
      */
-    setRemainCapture(): void;
+    setCapture(): void;
     getPixelRatio(): number;
     setContainer(elem: HTMLElement, resize?: boolean): void;
     resize(): void;
@@ -106,6 +117,11 @@ export declare class Engine extends Disposable {
      * @param renderFunction defines the function to continuously execute
      */
     runRenderLoop(renderFunction: () => void): void;
+    /**
+     * call itself by raf
+     * Exec all function in _renderFrameTasks in _renderFrame()
+     */
+    private _renderFunction;
     /**
      * stop executing a render loop function and remove it from the execution array
      * @param renderFunction defines the function to be removed. If not provided all functions will be removed.
@@ -135,11 +151,6 @@ export declare class Engine extends Disposable {
     private _renderFrame;
     private _cancelFrame;
     private _getHostWindow;
-    /**
-     * call itself by raf
-     * Exec all function in _renderFrameTasks in _renderFrame()
-     */
-    private _renderFunctionCore;
     private _handleKeyboardAction;
     private _handlePointerAction;
     private _handleDragAction;

package/lib/types/index.d.ts

@@ -48,5 +48,4 @@ export * from './scene-viewer';
 export * from './scroll-timer';
 export * from './shape';
 export { ThinEngine } from './thin-engine';
-export { ThinScene } from './thin-scene';
 export * from './viewport';

package/lib/types/scene.d.ts

@@ -53,7 +53,13 @@ export declare class Scene extends Disposable {
     onDblclick$: EventSubject<IMouseEvent | IPointerEvent>;
     onTripleClick$: EventSubject<IMouseEvent | IPointerEvent>;
     onMouseWheel$: EventSubject<IWheelEvent>;
+    /**
+     * @deprecated  use `fromGlobalEvent('keydown')` from rx.js instead.
+     */
     onKeyDown$: EventSubject<IKeyboardEvent>;
+    /**
+     * @deprecated  use `fromGlobalEvent('keyup')` from rx.js instead.
+     */
     onKeyUp$: EventSubject<IKeyboardEvent>;
     private _beforeRender$;
     readonly beforeRender$: import('rxjs').Observable<Nullable<Canvas>>;
@@ -253,8 +259,6 @@ export declare class Scene extends Disposable {
      * @return {Nullable<BaseObject | Scene>} object under the pointer
      */
     pick(coord: Vector2): Nullable<BaseObject | Scene>;
-    triggerKeyDown(evt: IKeyboardEvent): void;
-    triggerKeyUp(evt: IKeyboardEvent): void;
     triggerPointerUp(evt: IPointerEvent | IMouseEvent): boolean;
     triggerMouseWheel(evt: IWheelEvent): boolean;
     triggerPointerMove(evt: IPointerEvent | IMouseEvent): boolean;
@@ -264,6 +268,7 @@ export declare class Scene extends Disposable {
     triggerPointerOut(evt: IPointerEvent | IMouseEvent): boolean;
     triggerPointerLeave(evt: IPointerEvent | IMouseEvent): boolean;
     triggerPointerOver(evt: IPointerEvent | IMouseEvent): boolean;
+    triggerPointerCancel(evt: IPointerEvent): boolean;
     triggerPointerEnter(evt: IPointerEvent | IMouseEvent): boolean;
     triggerDragLeave(evt: IDragEvent): boolean;
     triggerDragOver(evt: IDragEvent): boolean;

package/lib/types/shape/checkbox.d.ts

@@ -1,14 +1,14 @@
 import { UniverRenderingContext } from '../context';
 import { IShapeProps, Shape } from './shape';
-export interface ICheckboxProps extends IShapeProps {
+export interface ICheckboxShapeProps extends IShapeProps {
     checked?: boolean;
 }
 export declare const CHECK_OBJECT_ARRAY: string[];
-export declare class Checkbox extends Shape<ICheckboxProps> {
+export declare class CheckboxShape extends Shape<ICheckboxShapeProps> {
     _checked: boolean;
-    constructor(key: string, props: ICheckboxProps);
+    constructor(key: string, props: ICheckboxShapeProps);
     get checked(): boolean;
-    static drawWith(ctx: UniverRenderingContext, props: ICheckboxProps): void;
+    static drawWith(ctx: UniverRenderingContext, props: ICheckboxShapeProps): void;
     protected _draw(ctx: UniverRenderingContext): void;
     toJson(): {
         [x: string]: any;