@univerjs/engine-render 0.2.3 → 0.2.4-alpha.0

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

@@ -87,6 +87,8 @@ export declare function mergeInfoOffset(mergeInfo: IRangeWithCoord, offsetX: num
     endAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
     startRow: number;
     endRow: number;
+    unitId?: string;
+    sheetId?: string;
     startColumn: number;
     endColumn: number;
 };

package/lib/types/components/component.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { BaseObject } from '../base-object';
 import { IViewportInfo } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';

package/lib/types/components/docs/layout/hyphenation/hyphen.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { Lang } from './lang';
 
 export declare class Hyphen implements IDisposable {

package/lib/types/components/docs/layout/hyphenation/language-detector.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { Lang } from './lang';
 
 export declare class LanguageDetector implements IDisposable {

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

@@ -30,7 +30,7 @@ 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 getNumberUnitValue(unitValue: number | INumberUnit, benchMark: number): number;
+export declare function getNumberUnitValue(unitValue: Nullable<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;
 export declare function getLineHeightConfig(sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig): {

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

@@ -178,4 +178,4 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _detachEvent;
     private _activeSelectionRefresh;
 }
-export declare const ITextSelectionRenderManager: import('@wendellhu/redi').IdentifierDecorator<TextSelectionRenderManager>;
+export declare const ITextSelectionRenderManager: import('@univerjs/core').IdentifierDecorator<TextSelectionRenderManager>;

package/lib/types/components/docs/view-model/document-view-model.d.ts

@@ -1,5 +1,4 @@
-import { ICustomDecorationForInterceptor, ICustomRangeForInterceptor, IDocumentBody, ITextRun, Nullable, DocumentDataModel } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { ICustomDecorationForInterceptor, ICustomRangeForInterceptor, IDisposable, IDocumentBody, ITextRun, Nullable, DocumentDataModel } from '@univerjs/core';
 import { DataStreamTreeNode } from './data-stream-tree-node';
 
 export interface ICustomRangeInterceptor {

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

@@ -37,7 +37,7 @@ export declare const DEFAULT_PADDING_DATA: {
 };
 export declare const RENDER_RAW_FORMULA_KEY = "RENDER_RAW_FORMULA";
 export declare class SpreadsheetSkeleton extends Skeleton {
-    private _worksheet;
+    readonly worksheet: Worksheet;
     /**
      * @deprecated avoid use `IWorksheetData` directly, use API provided by `Worksheet`, otherwise
      * `ViewModel` will be not working.
@@ -65,7 +65,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _marginTop;
     private _marginLeft;
     private _renderRawFormula;
-    constructor(_worksheet: Worksheet | undefined, 
+    constructor(worksheet: Worksheet, 
     /**
      * @deprecated avoid use `IWorksheetData` directly, use API provided by `Worksheet`, otherwise
      * `ViewModel` will be not working.
@@ -88,23 +88,16 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     get mergeData(): IRange[];
     get rowHeaderWidthAndMarginLeft(): number;
     get columnHeaderHeightAndMarginTop(): number;
-    get worksheet(): Worksheet | undefined;
-    /**
-     * @deprecated
-     */
-    static create(worksheet: Worksheet | undefined, config: IWorksheetData, cellData: ObjectMatrix<Nullable<ICellData>>, styles: Styles, localeService: LocaleService, contextService: IContextService): SpreadsheetSkeleton;
-    /**
-     * TODO: DR-Univer, fix as unknown as
-     */
     dispose(): void;
     /**
      * @deprecated should never expose a property that is provided by another module!
      */
-    getCellData(): ObjectMatrix<Nullable<ICellData>>;
+    getsStyles(): Styles;
     /**
-     * @deprecated should never expose a property that is provided by another module!
+     * Get which Workbook and Worksheet this skeleton is attached to.
+     * @returns [unitId, sheetId]
      */
-    getsStyles(): Styles;
+    getLocation(): [string, string];
     private _initContextListener;
     setOverflowCache(value: ObjectMatrix<IRange>): void;
     setMarginLeft(left: number): void;
@@ -237,6 +230,8 @@ export declare class SpreadsheetSkeleton extends Skeleton {
             endAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
             startRow: number;
             endRow: number;
+            unitId?: string;
+            sheetId?: string;
             startColumn: number;
             endColumn: number;
         };

package/lib/types/render-engine.d.ts

@@ -1,11 +1,10 @@
-import { Plugin } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, Plugin } from '@univerjs/core';
 import { Engine } from './engine';
 
 /**
  * The global rendering engine.
  */
-export declare const IRenderingEngine: import('@wendellhu/redi').IdentifierDecorator<Engine>;
+export declare const IRenderingEngine: import('@univerjs/core').IdentifierDecorator<Engine>;
 export declare class UniverRenderEnginePlugin extends Plugin {
     readonly _injector: Injector;
     static pluginName: string;

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

@@ -1,5 +1,4 @@
-import { Nullable, UnitModel, UnitType, UniverInstanceType, Disposable, IUniverInstanceService } from '@univerjs/core';
-import { Dependency, DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';
+import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, UniverInstanceType, Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { BaseObject } from '../base-object';
 import { DocComponent } from '../components/docs/doc-component';
@@ -17,6 +16,7 @@ export interface IRenderManagerService extends IDisposable {
     removeRender(unitId: string): void;
     setCurrent(unitId: string): void;
     getRenderById(unitId: string): Nullable<IRender>;
+    getAllRenderersOfType(type: UniverInstanceType): RenderUnit[];
     getCurrentTypeOfRenderer(type: UniverInstanceType): Nullable<RenderUnit>;
     getRenderAll(): Map<string, IRender>;
     defaultEngine: Engine;
@@ -24,6 +24,8 @@ export interface IRenderManagerService extends IDisposable {
     createRender$: Observable<string>;
     /** @deprecated this design is very very weird! Remove it. */
     create(unitId: string): void;
+    created$: Observable<IRender>;
+    disposed$: Observable<string>;
     /** @deprecated There will be multi units to render at the same time, so there is no *current*. */
     getCurrent(): Nullable<IRender>;
     /** @deprecated There will be multi units to render at the same time, so there is no *first*. */
@@ -43,6 +45,10 @@ export declare class RenderManagerService extends Disposable implements IRenderM
     private readonly _createRender$;
     /** @deprecated */
     readonly createRender$: Observable<string>;
+    private readonly _renderCreated$;
+    readonly created$: Observable<IRender>;
+    private readonly _renderDisposed$;
+    readonly disposed$: Observable<string>;
     get defaultEngine(): Engine;
     private readonly _renderDependencies;
     constructor(_injector: Injector, _univerInstanceService: IUniverInstanceService);
@@ -52,6 +58,7 @@ export declare class RenderManagerService extends Disposable implements IRenderM
     private _getRenderControllersForType;
     create(unitId: string): void;
     createRender(unitId: string): IRender;
+    getAllRenderersOfType(type: UniverInstanceType): RenderUnit[];
     getCurrentTypeOfRenderer(type: UniverInstanceType): Nullable<RenderUnit>;
     withCurrentTypeOfUnit<T>(type: UniverInstanceType, id: DependencyIdentifier<T>): Nullable<T>;
     private _createRender;
@@ -66,5 +73,5 @@ export declare class RenderManagerService extends Disposable implements IRenderM
     getRenderAll(): Map<string, IRender>;
     private _disposeItem;
 }
-export declare const IRenderManagerService: import('@wendellhu/redi').IdentifierDecorator<IRenderManagerService>;
+export declare const IRenderManagerService: import('@univerjs/core').IdentifierDecorator<IRenderManagerService>;
 export declare function isDisposable(thing: unknown): thing is IDisposable;

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

@@ -1,5 +1,4 @@
-import { Nullable, UnitModel, UnitType, Disposable } from '@univerjs/core';
-import { Dependency, DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';
+import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, Disposable, Injector } from '@univerjs/core';
 import { Engine } from '../engine';
 import { Scene } from '../scene';
 import { RenderComponentType } from './render-manager.service';
@@ -40,7 +39,7 @@ export declare class RenderUnit extends Disposable implements IRender {
     set scene(scene: Scene);
     get scene(): Scene;
     get components(): Map<string, RenderComponentType>;
-    constructor(parentInjector: Injector, init: Pick<IRenderContext, 'engine' | 'scene' | 'isMainScene' | 'unit'>);
+    constructor(init: Pick<IRenderContext, 'engine' | 'scene' | 'isMainScene' | 'unit'>, parentInjector: Injector);
     dispose(): void;
     /**
      * Get render controller hold by this render unit.

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

@@ -1,5 +1,4 @@
-import { Disposable, EventSubject } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { Disposable, EventSubject, IDisposable } from '@univerjs/core';
 import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
 import { IEvent } from './basics/i-events';
 import { ITransformChangeState } from './basics/interfaces';