@univerjs/engine-render 0.2.4-alpha.0 → 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/components/component.d.ts

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

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/hyphenation/hyphen.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
 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 '@univerjs/core';
+import { IDisposable } from '@wendellhu/redi';
 import { Lang } from './lang';
 
 export declare class LanguageDetector implements IDisposable {

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

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

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

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

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

@@ -1,10 +1,11 @@
-import { Injector, Plugin } from '@univerjs/core';
+import { Plugin } from '@univerjs/core';
+import { Injector } from '@wendellhu/redi';
 import { Engine } from './engine';
 
 /**
  * The global rendering engine.
  */
-export declare const IRenderingEngine: import('@univerjs/core').IdentifierDecorator<Engine>;
+export declare const IRenderingEngine: import('@wendellhu/redi').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,4 +1,5 @@
-import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, UniverInstanceType, Disposable, Injector, IUniverInstanceService } from '@univerjs/core';
+import { Nullable, UnitModel, UnitType, UniverInstanceType, Disposable, IUniverInstanceService } from '@univerjs/core';
+import { Dependency, DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 import { BaseObject } from '../base-object';
 import { DocComponent } from '../components/docs/doc-component';
@@ -73,5 +74,5 @@ export declare class RenderManagerService extends Disposable implements IRenderM
     getRenderAll(): Map<string, IRender>;
     private _disposeItem;
 }
-export declare const IRenderManagerService: import('@univerjs/core').IdentifierDecorator<IRenderManagerService>;
+export declare const IRenderManagerService: import('@wendellhu/redi').IdentifierDecorator<IRenderManagerService>;
 export declare function isDisposable(thing: unknown): thing is IDisposable;

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

@@ -1,4 +1,5 @@
-import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, Disposable, Injector } from '@univerjs/core';
+import { Nullable, UnitModel, UnitType, Disposable } from '@univerjs/core';
+import { Dependency, DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';
 import { Engine } from '../engine';
 import { Scene } from '../scene';
 import { RenderComponentType } from './render-manager.service';

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[];

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

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