@univerjs/engine-render 0.2.3 → 0.2.4

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

@@ -12,13 +12,18 @@ export interface ISkeletonResourceReference {
     skeHeaders: Map<string, Map<number, IDocumentSkeletonHeaderFooter>>;
     skeFooters: Map<string, Map<number, IDocumentSkeletonHeaderFooter>>;
     skeListLevel?: Map<string, IDocumentSkeletonBullet[]>;
-    drawingAnchor?: Map<number, IDocumentSkeletonDrawingAnchor>;
+    drawingAnchor?: Map<string, Map<number, IDocumentSkeletonDrawingAnchor>>;
 }
 export interface IDocumentSkeletonDrawingAnchor {
     elements: IDocumentSkeletonLine[];
     paragraphIndex: number;
     top: number;
 }
+export declare enum DocumentSkeletonPageType {
+    BODY = 0,
+    HEADER = 1,
+    FOOTER = 2
+}
 export interface IDocumentSkeletonPage {
     sections: IDocumentSkeletonSection[];
     headerId: string;
@@ -42,6 +47,8 @@ export interface IDocumentSkeletonPage {
     st: number;
     ed: number;
     skeDrawings: Map<string, IDocumentSkeletonDrawing>;
+    segmentId: string;
+    type: DocumentSkeletonPageType;
     renderConfig?: IDocumentRenderConfig;
     parent?: IDocumentSkeletonCached;
 }

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

@@ -1,6 +1,6 @@
 import { BooleanNumber, GridType, IDocStyleBase, IDocumentLayout, IOffset, IParagraphStyle, IReferenceSource, IScale, ISectionBreakBase, ISize, ITextStyle, ITransformState, LocaleService } from '@univerjs/core';
 import { DocumentViewModel } from '../components/docs/view-model/document-view-model';
-import { IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonHeaderFooter } from './i-document-skeleton-cached';
+import { DocumentSkeletonPageType, IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonHeaderFooter } from './i-document-skeleton-cached';
 import { Vector2 } from './vector2';
 import { ITransformerConfig } from './transformer-config';
 
@@ -64,7 +64,7 @@ export interface IParagraphConfig {
     paragraphStyle?: IParagraphStyle;
     skeHeaders: Map<string, Map<number, IDocumentSkeletonHeaderFooter>>;
     skeFooters: Map<string, Map<number, IDocumentSkeletonHeaderFooter>>;
-    drawingAnchor?: Map<number, IDocumentSkeletonDrawingAnchor>;
+    pDrawingAnchor?: Map<number, IDocumentSkeletonDrawingAnchor>;
 }
 export interface IFontCreateConfig {
     fontStyle: IDocumentSkeletonFontStyle;
@@ -89,7 +89,7 @@ export interface INodeSearch {
     section: number;
     page: number;
     segmentPage: number;
-    isInBody: boolean;
+    pageType: DocumentSkeletonPageType;
 }
 export interface INodePosition extends INodeSearch {
     isBack: boolean;

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/docs/layout/doc-skeleton.d.ts

@@ -11,6 +11,11 @@ export declare enum DocumentSkeletonState {
     READY = "ready",
     INVALID = "invalid"
 }
+export interface IFindNodeRestrictions {
+    strict: boolean;
+    segmentId: string;
+    segmentPage: number;
+}
 export declare class DocumentSkeleton extends Skeleton {
     private _docViewModel;
     private _skeletonData;
@@ -39,7 +44,8 @@ export declare class DocumentSkeleton extends Skeleton {
         pageNumber: number;
         page: Nullable<IDocumentSkeletonPage>;
     };
-    findNodeByCoord(coord: Vector2, pageLayoutType: PageLayoutType, pageMarginLeft: number, pageMarginTop: number): Nullable<INodeInfo>;
+    findNodeByCoord(coord: Vector2, pageLayoutType: PageLayoutType, pageMarginLeft: number, pageMarginTop: number, restrictions?: IFindNodeRestrictions): Nullable<INodeInfo>;
+    private _collectNearestNode;
     private _getNearestNode;
     private _getPageBoundingBox;
     private _translatePage;

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

@@ -14,6 +14,7 @@ export declare class LineBreaker implements IBreakPoints {
     private _lastPos;
     private _curClass;
     private _codePoint;
+    private _lastCodePoint;
     private _nextClass;
     private _LB8a;
     private _LB21a;

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

@@ -1,23 +1,10 @@
-/**
- * Copyright 2023-present DreamNum Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+import { Nullable } from '@univerjs/core';
+
 export interface ILineBreakRule {
-    (codePoint: number, className: number): boolean;
+    (codePoint: number, lastCodePoint: Nullable<number>, className: number): boolean;
 }
 export declare class Rule {
     private _rules;
     add(key: string, rule: ILineBreakRule): void;
-    shouldBreak(codePoint: number, className: number): boolean;
+    shouldBreak(codePoint: number, lastCodePoint: Nullable<number>, className: number): boolean;
 }

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

@@ -1,4 +1,5 @@
-import { IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonLine, LineType } from '../../../../basics/i-document-skeleton-cached';
+import { Nullable } from '@univerjs/core';
+import { IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonLine, IDocumentSkeletonPage, LineType } from '../../../../basics/i-document-skeleton-cached';
 
 interface ILineBoundingBox {
     lineHeight: number;
@@ -11,8 +12,8 @@ interface ILineBoundingBox {
     marginTop?: number;
     spaceBelowApply?: number;
 }
-export declare function createSkeletonLine(paragraphIndex: number, lineType: LineType, lineBoundingBox: ILineBoundingBox, columnWidth: number, lineIndex?: number, isParagraphStart?: boolean, pageSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, headersDrawings?: Map<string, IDocumentSkeletonDrawing>, footersDrawings?: Map<string, IDocumentSkeletonDrawing>): IDocumentSkeletonLine;
-export declare function calculateLineTopByDrawings(lineHeight?: number, lineTop?: number, pageSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, headersDrawings?: Map<string, IDocumentSkeletonDrawing>, footersDrawings?: Map<string, IDocumentSkeletonDrawing>): number;
+export declare function createSkeletonLine(paragraphIndex: number, lineType: LineType, lineBoundingBox: ILineBoundingBox, columnWidth: number, lineIndex: number | undefined, isParagraphStart: boolean | undefined, page: IDocumentSkeletonPage, headerPage: Nullable<IDocumentSkeletonPage>, footerPage: Nullable<IDocumentSkeletonPage>): IDocumentSkeletonLine;
+export declare function calculateLineTopByDrawings(lineHeight: number | undefined, lineTop: number | undefined, page: IDocumentSkeletonPage, headerPage: Nullable<IDocumentSkeletonPage>, footerPage: Nullable<IDocumentSkeletonPage>): number;
 export declare function updateDivideInfo(divide: IDocumentSkeletonDivide, states: Partial<IDocumentSkeletonDivide>): void;
 export declare function setLineMarginBottom(line: IDocumentSkeletonLine, marginBottom: number): void;
 export declare function collisionDetection(drawing: IDocumentSkeletonDrawing, lineHeight: number, lineTop: number, columnLeft: number, columnWidth: number): boolean;

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): {
@@ -81,9 +81,7 @@ export interface ILayoutContext {
     dataModel: DocumentDataModel;
     docsConfig: IDocsConfig;
     skeleton: IDocumentSkeletonCached;
-    layoutStartPointer: {
-        paragraphIndex: Nullable<number>;
-    };
+    layoutStartPointer: Record<string, Nullable<number>>;
     isDirty: boolean;
     skeletonResourceReference: ISkeletonResourceReference;
     drawingsCache: Map<string, {
@@ -91,7 +89,7 @@ export interface ILayoutContext {
         page: IDocumentSkeletonPage;
         drawing: IDocumentSkeletonDrawing;
     }>;
-    paragraphConfigCache: Map<number, IParagraphConfig>;
+    paragraphConfigCache: Map<string, Map<number, IParagraphConfig>>;
     sectionBreakConfigCache: Map<number, ISectionBreakConfig>;
     paragraphsOpenNewPage: Set<number>;
     hyphen: Hyphen;
@@ -102,4 +100,5 @@ export declare const DEFAULT_PAGE_SIZE: {
     height: number;
 };
 export declare function prepareSectionBreakConfig(ctx: ILayoutContext, nodeIndex: number): ISectionBreakConfig;
+export declare function resetContext(ctx: ILayoutContext): void;
 export {};

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

@@ -51,6 +51,7 @@ export declare class NodePositionConvertToCursor {
         contentBoxPointGroup: IPoint[][];
         cursorList: ITextRange[];
     };
+    private _isValidPosition;
     private _resetCurrentNodePositionState;
     private _setNodePositionState;
     private _checkPreviousNodePositionState;

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

@@ -53,6 +53,7 @@ export interface ITextSelectionRenderManager {
     enableSelection(): void;
     disableSelection(): void;
     setSegment(id: string): void;
+    getSegment(): string;
     setSegmentPage(pageIndex: number): void;
     getSegmentPage(): number;
     setStyle(style: ITextSelectionStyle): void;

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-manager/render-manager.service.d.ts

@@ -17,6 +17,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 +25,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 +46,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 +59,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;

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

@@ -40,7 +40,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/scene.d.ts

@@ -85,7 +85,7 @@ export declare class Scene extends ThinScene {
     getAllObjectsByOrderForPick(isDesc?: boolean): BaseObject[];
     getObject(oKey: string): BaseObject | undefined;
     getObjectIncludeInGroup(oKey: string): BaseObject | undefined;
-    fuzzyMathObjects(oKey: string): BaseObject[];
+    fuzzyMathObjects(oKey: string, matchStart?: boolean): BaseObject[];
     addViewport(...viewport: Viewport[]): this;
     removeViewport(key: string): Viewport | undefined;
     getViewports(): Viewport[];