@univerjs/engine-render 1.0.0-rc.0 → 1.0.1

package/lib/types/basics/document-node-tools.d.ts

@@ -27,6 +27,8 @@ export declare function getParagraphByGlyph(glyph: Nullable<IDocumentSkeletonGly
     styleId?: string;
     paragraphStyle?: import("@univerjs/core").IParagraphStyle;
     bullet?: import("@univerjs/core").IBullet;
+    sourceBullet?: import("@univerjs/core").IBullet | null;
+    directBullet?: import("@univerjs/core").IBullet | null;
 } | undefined;
 export declare function isPlaceholderOrSpace(glyph: Nullable<IDocumentSkeletonGlyph>): boolean;
 export declare function isSameLine(glyph1: Nullable<IDocumentSkeletonGlyph>, glyph2: Nullable<IDocumentSkeletonGlyph>): boolean;

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

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IColorStyle, IColumnGroup, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraph, IParagraphBorder, IParagraphProperties, ITable, ITableRow, ITextStyle, PageOrientType, TabStopLeader } from '@univerjs/core';
+import type { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IColorStyle, IDocDrawingBase, INestingLevel, IParagraphBorder, IParagraphProperties, ITable, ITableRow, PageOrientType, TabStopLeader } from '@univerjs/core';
+import type { IDocumentLayoutColumnGroup, IDocumentLayoutParagraph, IDocumentLayoutRenderConfig, IDocumentLayoutTextStyle } from '../components/docs/document-layout-presentation';
 import type { BreakPointType } from '../components/docs/layout/line-breaker/break';
 export interface IDocumentSkeletonCached extends ISkeletonResourceReference {
     pages: IDocumentSkeletonPage[];
@@ -25,7 +26,7 @@ export interface IDocumentSkeletonCached extends ISkeletonResourceReference {
 }
 export interface IParagraphList {
     bullet: IDocumentSkeletonBullet;
-    paragraph: IParagraph;
+    paragraph: IDocumentLayoutParagraph;
 }
 export interface IDocumentSkeletonParagraphBorders {
     borderTop?: IParagraphBorder;
@@ -76,6 +77,8 @@ export interface IDocumentSkeletonPage {
     originMarginBottom: number;
     marginBottom: number;
     left: number;
+    /** Cell lines use logical axes; the page bounds remain physical after layout. */
+    cellTextDirection?: 'tbRlV';
     pageNumber: number;
     pageNumberStart: number;
     verticalAlign: boolean;
@@ -102,7 +105,7 @@ export interface IDocumentSkeletonPage {
     skeColumnGroups: Map<string, IDocumentSkeletonColumnGroup>;
     segmentId: string;
     type: DocumentSkeletonPageType;
-    renderConfig?: IDocumentRenderConfig;
+    renderConfig?: IDocumentLayoutRenderConfig;
     parent?: IDocumentSkeletonCached | IDocumentSkeletonRow | IDocumentSkeletonColumnGroupColumn | IDocumentSkeletonNote;
 }
 export interface IDocumentSkeletonNoteDecoration {
@@ -166,7 +169,7 @@ export interface IDocumentSkeletonColumnGroup {
     st: number;
     ed: number;
     columnGroupId: string;
-    columnGroupSource: IColumnGroup;
+    columnGroupSource: IDocumentLayoutColumnGroup;
     parent?: IDocumentSkeletonPage;
 }
 export interface IDocumentSkeletonColumnGroupColumn {
@@ -203,6 +206,8 @@ export interface IDocumentSkeletonLine {
     top: number;
     asc: number;
     dsc: number;
+    drawingMLBaselineHeight?: number;
+    drawingMLNormalLineHeight?: number;
     paddingTop: number;
     paddingBottom: number;
     marginTop: number;
@@ -222,6 +227,8 @@ export interface IDocumentSkeletonLine {
     paragraphBorders?: IDocumentSkeletonParagraphBorders;
     paragraphPaddingLeft?: number;
     paragraphPaddingRight?: number;
+    borderTopSpace?: number;
+    borderBottomSpace?: number;
     backgroundColor?: IColorStyle;
     bullet?: IDocumentSkeletonBullet;
     width?: number;
@@ -250,13 +257,17 @@ export interface IDocumentSkeletonGlyph {
     width: number;
     bBox: IDocumentSkeletonBoundingBox;
     xOffset: number;
+    /** Automatic CJK/Latin gaps on the left and right; omitted at a wrapped line edge. */
+    autoSpacing?: [number, number];
+    /** Left-side punctuation space removed during shaping, restorable at a new line boundary. */
+    leadingPunctuationCompression?: number;
     left: number;
     count: number;
     content: string;
     raw: string;
     adjustability: IAdjustability;
     isJustifiable: boolean;
-    ts?: ITextStyle;
+    ts?: IDocumentLayoutTextStyle;
     fontStyle?: IDocumentSkeletonFontStyle;
     parent?: IDocumentSkeletonDivide;
     url?: string;
@@ -265,12 +276,23 @@ export interface IDocumentSkeletonGlyph {
     noteId?: string;
     noteSeparator?: boolean;
     fauxBoldStrokeWidth?: number;
+    /** Runtime-only advance adjustment, recomputed when a shaped word is split across lines. */
+    kerningAdjustment?: number;
     tabLeader?: TabStopLeader;
+    tabAlignedTextWidth?: number;
+    /** Runtime-only positions for tracked text that shares one shaping glyph. */
+    textSpacing?: {
+        content: string;
+        segments: Array<{
+            content: string;
+            left: number;
+        }>;
+    };
 }
 export interface IDocumentSkeletonBullet {
     listId: string;
     symbol: string;
-    ts: ITextStyle;
+    ts: IDocumentLayoutTextStyle;
     fontStyle?: IDocumentSkeletonFontStyle;
     startIndexItem: number;
     startNumber?: number;
@@ -308,6 +330,7 @@ export interface IDocumentSkeletonDrawing {
     };
 }
 export interface IDocumentSkeletonFontStyle {
+    fontKerning?: CanvasFontKerning;
     fontString: string;
     fontSize: number;
     originFontSize: number;
@@ -318,6 +341,9 @@ export interface IDocumentSkeletonBoundingBox {
     width: number;
     ba: number;
     bd: number;
+    /** Font metrics retained for the caret when ba/bd are overridden for fixed line layout. */
+    fontAscent?: number;
+    fontDescent?: number;
     normalLineHeight?: number;
     aba: number;
     abd: number;

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

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { BooleanNumber, GridType, IDocStyleBase, IDocumentLayout, IOffset, IParagraphStyle, IReferenceSource, IScale, ISectionBreakBase, ISize, ITextStyle, ITransformState, LocaleService } from '@univerjs/core';
+import type { BooleanNumber, GridType, IDocStyleBase, IDocumentLayout, IOffset, IReferenceSource, IScale, ISectionBreakBase, ISize, ITransformState, LocaleService } from '@univerjs/core';
 import type { IDocumentCompatibilityPolicy } from '../components/docs/document-compatibility';
+import type { IDocumentLayoutParagraphStyle, IDocumentLayoutRenderConfig, IDocumentLayoutTextStyle } from '../components/docs/document-layout-presentation';
 import type { DataStreamTreeNode } from '../components/docs/view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../components/docs/view-model/document-view-model';
 import type { DocumentSkeletonPageType, IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonHeaderFooter, IDocumentSkeletonTable } from './i-document-skeleton-cached';
@@ -61,7 +62,7 @@ export interface IFontLocale {
 }
 export interface IDocsConfig extends IReferenceSource, IDocumentLayout {
     localeService: LocaleService;
-    documentTextStyle?: ITextStyle;
+    documentTextStyle?: IDocumentLayoutTextStyle;
     documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
     headerTreeMap: Map<string, DocumentViewModel>;
     footerTreeMap: Map<string, DocumentViewModel>;
@@ -77,10 +78,14 @@ export interface IFooterIds {
     firstPageFooterId?: string;
 }
 export interface ISectionBreakConfig extends IDocStyleBase, ISectionBreakBase, IDocsConfig {
+    renderConfig?: IDocumentLayoutRenderConfig;
     sectionId: string;
     /** Cell continuation pages retain their segment and physical row-slice budgets. */
     cellTableId?: string;
+    /** Absolute final paragraph mark excluded by this cell's w:hideMark property. */
+    cellHiddenEndMarkIndex?: number;
     cellPageHeights?: readonly number[];
+    fontFamilyFallbacks?: Record<string, string>;
     headerIds?: IHeaderIds;
     footerIds?: IFooterIds;
     useFirstPageHeaderFooter?: BooleanNumber;
@@ -107,24 +112,28 @@ export interface IParagraphConfig {
     pptxEmptyParagraphFontSize?: number;
     pptxHasExplicitEndParaFontSize?: boolean;
     sumPptxParagraphSpacing?: boolean;
-    docxFallbackAnchorLeft?: IParagraphStyle['indentStart'];
+    docxFallbackAnchorLeft?: IDocumentLayoutParagraphStyle['indentStart'];
     paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     topBottomCustomBlockFlowBottom?: number;
     skeTablesInParagraph?: IParagraphTableCache[];
     bulletSkeleton?: IDocumentSkeletonBullet;
-    paragraphStyle?: IParagraphStyle;
+    paragraphStyle?: IDocumentLayoutParagraphStyle;
+    borderTopSpace?: number;
+    borderBottomSpace?: number;
     skeHeaders: Map<string, Map<number, IDocumentSkeletonHeaderFooter>>;
     skeFooters: Map<string, Map<number, IDocumentSkeletonHeaderFooter>>;
     pDrawingAnchor?: Map<number, IDocumentSkeletonDrawingAnchor>;
 }
 export interface IFontCreateConfig {
     fontStyle: IDocumentSkeletonFontStyle;
-    textStyle: ITextStyle;
+    textStyle: IDocumentLayoutTextStyle;
     charSpace: number;
     snapToGrid: BooleanNumber;
     documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
     gridType?: GridType;
+    balanceSingleByteDoubleByteWidth?: BooleanNumber;
+    balanceSpaceWidth?: boolean;
     pageWidth?: number;
 }
 export interface INodeInfo {

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IPosition, IRange, IRangeWithCoord, IScale, IStyleBase, Nullable } from '@univerjs/core';
+import type { IPosition, IRange, IRangeWithCoord, IScale, ITextStyle, Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonFontStyle } from './i-document-skeleton-cached';
 import type { IBoundRectNoAngle } from './vector2';
 export declare function hasScrollableOverflow(contentSize: number, viewportSize: number): boolean;
@@ -58,7 +58,9 @@ 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 function getFontStyleString(textStyle?: Nullable<IStyleBase>): IDocumentSkeletonFontStyle;
+export declare function getFontStyleString(textStyle?: Nullable<ITextStyle>, fontFamilyFallbacks?: Record<string, string>): IDocumentSkeletonFontStyle;
+/** Office display casing preserves one source character instead of expanding forms such as ß to SS. */
+export declare function getTextWithCaps(content: string, caps?: boolean): string;
 export declare function hasAllLatin(text: string): boolean;
 export declare function hasBasicLatin(text: string): boolean;
 export declare function hasLatinOneSupplement(text: string): boolean;

package/lib/types/basics/transformer-config.d.ts

@@ -18,6 +18,8 @@ import type { BaseObject } from '../base-object';
 import type { IMouseEvent, IPointerEvent } from './i-events';
 export interface ITransformerConfig {
     isCropper?: boolean;
+    /** Minimum crop-handle hit target in screen pixels; does not change its appearance. */
+    cropAnchorHitSize?: number;
     hoverEnabled?: boolean;
     hoverEnterFunc?: Nullable<(e: IPointerEvent | IMouseEvent) => void>;
     hoverLeaveFunc?: Nullable<(e: IPointerEvent | IMouseEvent) => void>;
@@ -42,6 +44,8 @@ export interface ITransformerConfig {
     borderSpacing?: number;
     resizeEnabled?: boolean;
     moveEnabled?: boolean;
+    /** Start moving only when the object was already selected before pointer down. */
+    moveOnlyWhenSelected?: boolean;
     enabledAnchors?: number[];
     anchorFill?: string;
     anchorStroke?: string;

package/lib/types/components/docs/custom-glyph-renderer.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 type { IDisposable } from '@univerjs/core';
+import type { UniverRenderingContext } from '../../context';
+export interface IDocCustomGlyphRenderInput {
+    bold?: boolean;
+    italic?: boolean;
+    content: string;
+    context: UniverRenderingContext;
+    fontSizePx: number;
+    glyphKey?: string;
+    x: number;
+    y: number;
+}
+export type DocCustomGlyphRenderer = (input: IDocCustomGlyphRenderInput) => boolean;
+export interface IDocCustomGlyphRendererRegistration {
+    fontFamily: string;
+    renderer: DocCustomGlyphRenderer;
+    strokeRenderer?: DocCustomGlyphRenderer;
+}
+export declare function registerDocCustomGlyphRenderer(registration: IDocCustomGlyphRendererRegistration): IDisposable;
+export declare function getDocCustomGlyphRenderer(fontFamily: string | undefined): DocCustomGlyphRenderer | undefined;
+export declare function getDocCustomGlyphStrokeRenderer(fontFamily: string | undefined): DocCustomGlyphRenderer | undefined;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ITable } from '@univerjs/core';
+import type { ITable, ITextStyle } from '@univerjs/core';
 import type { IDocumentSkeletonBoundingBox, IDocumentSkeletonFontStyle } from '../../basics/i-document-skeleton-cached';
 import { DocumentFlavor } from '@univerjs/core';
 interface IFontMetricScaleRule {
@@ -24,7 +24,7 @@ interface IFontMetricScaleRule {
     widthScale?: number;
 }
 export interface IDocumentCompatibilityPolicy {
-    mode: 'modern' | 'traditional' | 'unspecified';
+    mode: 'modern' | 'traditional' | 'unspecified' | 'drawingml';
     applyDocumentDefaultParagraphStyle: boolean;
     useWordStyleLineHeight: boolean;
     font: {
@@ -36,8 +36,10 @@ export interface IDocumentCompatibilityPolicy {
         allowImportedTableMarginOverflow: boolean;
     };
 }
-export declare function getDocumentCompatibilityPolicy(documentFlavor?: DocumentFlavor): IDocumentCompatibilityPolicy;
+export declare function getDocumentCompatibilityPolicy(documentFlavor?: DocumentFlavor, fontMetricScaleEnabled?: boolean): IDocumentCompatibilityPolicy;
 export declare function applyFontMetricCompatibility(content: string, fontStyle: IDocumentSkeletonFontStyle, bBox: IDocumentSkeletonBoundingBox, policy: IDocumentCompatibilityPolicy): IDocumentSkeletonBoundingBox;
+export declare function getSmallCapsFontStyle(raw: string, textStyle: ITextStyle | undefined, fontStyle: IDocumentSkeletonFontStyle, policy: IDocumentCompatibilityPolicy): IDocumentSkeletonFontStyle;
+export declare function getNominalFontLineHeight(fontSize: number, policy?: IDocumentCompatibilityPolicy): number | undefined;
 export declare function isTraditionalDocumentCompatibility(policy?: IDocumentCompatibilityPolicy): boolean;
 export declare function shouldAllowImportedTableMarginOverflow(policy: IDocumentCompatibilityPolicy, tableSource: ITable | unknown): boolean;
 export {};

package/lib/types/components/docs/document-layout-presentation.d.ts

@@ -0,0 +1,104 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 type { BooleanNumber, DocumentDataModel, IColumn, IColumnGroup, ICustomColumnGroup, IDisposable, IDocTextOutline, IDocumentBody, IDocumentData, IDocumentRenderConfig, IDocumentStyle, IParagraph, IParagraphStyle, ISectionBreak, ITextDecoration, ITextRun, ITextStyle, JSONXActions } from '@univerjs/core';
+/** Transient layout data. These fields are never part of a document model or snapshot. */
+export interface IDocumentLayoutTextDecoration extends ITextDecoration {
+    offset?: number;
+    offsetReference?: 'line-bottom' | 'baseline';
+}
+export interface IDocumentLayoutTextStyle extends ITextStyle {
+    fontRenderScale?: number;
+    textSkewX?: number;
+    textAdvance?: number;
+    customGlyphKey?: string;
+    customGlyphGroup?: string;
+    lineAscent?: number;
+    lineDescent?: number;
+    textPaintOffsets?: Array<{
+        x: number;
+        y: number;
+    }>;
+    textOutline?: IDocTextOutline & {
+        lineCap?: 'butt' | 'round' | 'square';
+        lineJoin?: 'bevel' | 'miter' | 'round';
+        miterLimit?: number;
+    };
+    ul?: IDocumentLayoutTextDecoration;
+    st?: IDocumentLayoutTextDecoration;
+    ol?: IDocumentLayoutTextDecoration;
+}
+export interface IDocumentLayoutRenderConfig extends IDocumentRenderConfig {
+    topAlignExactLineSpacing?: BooleanNumber;
+    useTextInkForHitTesting?: BooleanNumber;
+    preservePunctuationSpacing?: BooleanNumber;
+    applyTextPosition?: BooleanNumber;
+    paintTextOutline?: BooleanNumber;
+    useCustomGlyphRenderer?: BooleanNumber;
+}
+export interface IDocumentLayoutParagraphStyle extends IParagraphStyle {
+    fixedTabStops?: BooleanNumber;
+    textStyle?: IDocumentLayoutTextStyle;
+    paragraphMarkTextStyle?: IDocumentLayoutTextStyle;
+}
+export interface IDocumentLayoutParagraph extends IParagraph {
+    paragraphStyle?: IDocumentLayoutParagraphStyle;
+}
+export interface IDocumentLayoutTextRun extends ITextRun {
+    ts?: IDocumentLayoutTextStyle;
+}
+export interface IDocumentLayoutColumn extends IColumn {
+    topOffset?: IColumn['minWidth'];
+}
+export interface IDocumentLayoutColumnGroup extends IColumnGroup {
+    horizontalPadding?: IColumnGroup['gap'];
+    minHeight?: IColumnGroup['gap'];
+    clipContent?: BooleanNumber;
+    columns: IDocumentLayoutColumn[];
+}
+export interface IDocumentLayoutCustomColumnGroup extends ICustomColumnGroup {
+    horizontalPadding?: IColumnGroup['gap'];
+    minHeight?: IColumnGroup['gap'];
+    clipContent?: BooleanNumber;
+    columns?: IDocumentLayoutColumn[];
+}
+export interface IDocumentLayoutSectionBreak extends ISectionBreak {
+    renderConfig?: IDocumentLayoutRenderConfig;
+}
+export interface IDocumentLayoutStyle extends IDocumentStyle {
+    fontMetricScaleEnabled?: BooleanNumber;
+    textStyle?: IDocumentLayoutTextStyle;
+    renderConfig?: IDocumentLayoutRenderConfig;
+}
+export interface IDocumentLayoutBody extends IDocumentBody {
+    textRuns?: IDocumentLayoutTextRun[];
+    paragraphs?: IDocumentLayoutParagraph[];
+    sectionBreaks?: IDocumentLayoutSectionBreak[];
+    columnGroups?: IDocumentLayoutCustomColumnGroup[];
+}
+/** A read-only layout projection owned by an external host, not a persisted Doc snapshot. */
+export interface IDocumentLayoutSnapshot extends IDocumentData {
+    documentStyle: IDocumentLayoutStyle;
+    body?: IDocumentLayoutBody;
+}
+/** Synchronous, model-only hooks for host layout metadata and its local undo history. */
+export interface IDocumentLayoutPresentation {
+    getSnapshot(document: IDocumentData): IDocumentLayoutSnapshot;
+    captureState(): unknown;
+    applyActions(actions: JSONXActions, document: IDocumentData): void;
+    restoreState(state: unknown): void;
+}
+export declare function registerDocumentLayoutPresentation(model: DocumentDataModel, presentation: IDocumentLayoutPresentation): IDisposable;
+export declare function getDocumentLayoutPresentation(model: DocumentDataModel): IDocumentLayoutPresentation | undefined;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICustomRange, Nullable } from '@univerjs/core';
+import type { ICustomRange, IDisposable, Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonGlyph, IDocumentSkeletonPage, IDocumentSkeletonSection } from '../../basics/i-document-skeleton-cached';
 import type { Transform } from '../../basics/transform';
 import type { IViewportInfo } from '../../basics/vector2';
@@ -36,10 +36,22 @@ export interface IDocumentOffsetConfig extends IPageMarginLayout {
     documentTransform: Transform;
 }
 export declare function drawSectionColumnSeparators(ctx: UniverRenderingContext, section: IDocumentSkeletonSection, height: number, offsetX?: number, offsetY?: number): void;
+export interface IDocumentGlyphPaint {
+    group?: string;
+    transform: readonly [number, number, number, number, number, number];
+    draw(context: UniverRenderingContext): void;
+}
 export declare class Documents extends DocComponent {
+    private _glyphPaintSink?;
+    private _glyphPaints;
+    /** Route actual Docs glyph painters into a host's ordered compositor. */
+    setGlyphPaintSink(sink: (paints: readonly IDocumentGlyphPaint[]) => void): IDisposable;
+    /** Most recent glyph frame routed to the host, also used for isolated ink measurement. */
+    getGlyphPaints(): readonly IDocumentGlyphPaint[];
     private readonly _pageRender$;
     readonly pageRender$: import("rxjs").Observable<IPageRenderConfig>;
     private _drawLiquid;
+    private _inactiveAreaOpacity;
     constructor(oKey: string, documentSkeleton?: DocumentSkeleton, config?: IDocumentsConfig);
     static create(oKey: string, documentSkeleton?: DocumentSkeleton, config?: IDocumentsConfig): Documents;
     dispose(): void;
@@ -47,14 +59,20 @@ export declare class Documents extends DocComponent {
     getEngine(): Nullable<import("../..").Engine>;
     isHit(coord: Vector2): boolean;
     changeSkeleton(newSkeleton: DocumentSkeleton): this;
+    /** Editor-only emphasis; standalone and export renderers retain full document colors. */
+    setInactiveAreaOpacity(opacity: number): void;
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
+    private _drawBodySections;
+    private _getColumnDrawLayout;
+    private _drawGlyphGroup;
+    private _paintGlyph;
     private _drawTable;
     private _drawColumnGroups;
     private _drawTableCellBackgrounds;
     private _getTableViewport;
     private _getRenderUnitId;
-    private _getDocumentCompatibilityPolicy;
+    private _getDocumentFlavor;
     private _drawLineBackground;
     private _drawParagraphBorders;
     private _drawGlyphGroupBackgrounds;

package/lib/types/components/docs/extensions/font-and-base-line.d.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import type { IScale } from '@univerjs/core';
-import type { IBoundRectNoAngle } from '../../../basics';
 import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
+import type { IBoundRectNoAngle } from '../../../basics/vector2';
 import type { UniverRenderingContext } from '../../../context';
 import type { IDrawInfo } from '../../extension';
 import { docExtension } from '../doc-extension';
@@ -46,6 +46,10 @@ export declare class FontAndBaseLine extends docExtension {
     private _colorWithOpacity;
     private _clamp;
     private _fillText;
+    private _paintText;
+    private _paintTextAtPoint;
+    private _paintTextAtSinglePoint;
+    private _paintGlyphText;
     private _getTabLeaderCharacter;
     clearCache(): void;
 }

package/lib/types/components/docs/layout/block/column.d.ts

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IColumnGroup, Nullable } from '@univerjs/core';
+import type { Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonColumnGroup, IDocumentSkeletonPage } from '../../../../basics/i-document-skeleton-cached';
 import type { ISectionBreakConfig } from '../../../../basics/interfaces';
+import type { IDocumentLayoutColumnGroup } from '../../document-layout-presentation';
 import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../../view-model/document-view-model';
 import type { ILayoutContext } from '../tools';
@@ -33,5 +34,5 @@ interface IColumnGroupLayout {
 }
 export declare function createColumnGroupSkeleton(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, columnGroupNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): Nullable<IDocumentSkeletonColumnGroup>;
 export declare function appendColumnGroupBlockLine(page: IDocumentSkeletonPage, columnGroup: IDocumentSkeletonColumnGroup): boolean;
-export declare function calculateColumnGroupLayout(source: IColumnGroup, availableWidth: number, columnHeights: number[]): IColumnGroupLayout;
+export declare function calculateColumnGroupLayout(source: IDocumentLayoutColumnGroup, availableWidth: number, columnHeights: number[]): IColumnGroupLayout;
 export {};

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

@@ -13,31 +13,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { ITabStop } from '@univerjs/core';
 import type { IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSection, IDocumentSkeletonTable } from '../../../../../basics/i-document-skeleton-cached';
 import type { IParagraphConfig, IParagraphTableCache, ISectionBreakConfig } from '../../../../../basics/interfaces';
 import type { IFloatObject, ILayoutContext } from '../../tools';
 import { BooleanNumber, GridType, SpacingRule } from '@univerjs/core';
 import { BreakPointType } from '../../line-breaker/break';
-declare function isGlyphGroupBeyondDivideWidth(glyphGroup: IDocumentSkeletonGlyph[], offsetLeft: number, divideWidth: number, hangingPunctuation?: boolean): boolean;
-export declare function layoutParagraph(ctx: ILayoutContext, glyphGroup: IDocumentSkeletonGlyph[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, isParagraphFirstShapedText: boolean, breakPointType?: BreakPointType, renderBullet?: boolean): IDocumentSkeletonPage[];
-declare function _adjustExplicitTabStop(divide: IDocumentSkeletonDivide, followingGlyphs: IDocumentSkeletonGlyph[], paragraphConfig: IParagraphConfig): void;
+declare function isGlyphGroupBeyondDivideWidth(glyphGroup: IDocumentSkeletonGlyph[], offsetLeft: number, divideWidth: number, hangingPunctuation?: boolean, precedingGlyphs?: IDocumentSkeletonGlyph[], preserveWordSpacing?: boolean, lineWrapTolerance?: number, includeParagraphMark?: boolean, justifyWordSpacing?: boolean): boolean;
+export declare function layoutParagraph(ctx: ILayoutContext, glyphGroup: IDocumentSkeletonGlyph[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, isParagraphFirstShapedText: boolean, breakPointType?: BreakPointType, renderBullet?: boolean, startNewLine?: boolean): IDocumentSkeletonPage[];
+declare function _adjustExplicitTabStop(divide: IDocumentSkeletonDivide, followingGlyphs: IDocumentSkeletonGlyph[], paragraphConfig: IParagraphConfig, tabStops?: ITabStop[] | undefined): void;
+declare function __getWrapTablePosition(table: IDocumentSkeletonTable, column: IDocumentSkeletonColumn, lineTop: number, lineHeight: number, drawingAnchorTop?: number): {
+    left: number;
+    top: number;
+} | undefined;
 declare function __avoidFlowAffectingDrawingsForTable(table: IDocumentSkeletonTable, page: IDocumentSkeletonPage, column: IDocumentSkeletonColumn): void;
+declare function __avoidNonOverlappingFloatingTables(table: IDocumentSkeletonTable, page: IDocumentSkeletonPage): void;
 declare function _updateAndPositionTable(ctx: ILayoutContext, lineTop: number, lineHeight: number, page: IDocumentSkeletonPage, pages: IDocumentSkeletonPage[], column: IDocumentSkeletonColumn, section: IDocumentSkeletonSection, skeTablesInParagraph: IParagraphTableCache[], paragraphIndex: number, sectionBreakConfig: ISectionBreakConfig, drawingAnchorTop?: number): boolean;
+export declare function isNonFlowFloatingAnchor(glyphGroup: IDocumentSkeletonGlyph[], paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>): boolean;
 declare function _reLayoutCheck(ctx: ILayoutContext, floatObjects: IFloatObject[], column: IDocumentSkeletonColumn, paragraphIndex: number): void;
 export declare const __testing: {
     reLayoutCheck: typeof _reLayoutCheck;
+    getWrapTablePosition: typeof __getWrapTablePosition;
     avoidFlowAffectingDrawingsForTable: typeof __avoidFlowAffectingDrawingsForTable;
+    avoidNonOverlappingFloatingTables: typeof __avoidNonOverlappingFloatingTables;
     isGlyphGroupBeyondDivideWidth: typeof isGlyphGroupBeyondDivideWidth;
     checkPageBreak: typeof __checkPageBreak;
     updateAndPositionTable: typeof _updateAndPositionTable;
     adjustExplicitTabStop: typeof _adjustExplicitTabStop;
 };
-export declare function getLineHeightMetrics(glyphLineHeight: number, paragraphLineGapDefault: number, linePitch: number, gridType: GridType, lineSpacing: number, spacingRule: SpacingRule, snapToGrid: BooleanNumber, useWordStyleLineHeight?: boolean, scaleAutoLineSpacingByGlyphHeight?: boolean, normalLineHeight?: number, snapAutoLineSpacingToWholeGridLines?: boolean): {
+export declare function getLineHeightMetrics(glyphLineHeight: number, paragraphLineGapDefault: number, linePitch: number, gridType: GridType, lineSpacing: number, spacingRule: SpacingRule, snapToGrid: BooleanNumber, useWordStyleLineHeight?: boolean, scaleAutoLineSpacingByGlyphHeight?: boolean, normalLineHeight?: number, snapAutoLineSpacingToWholeGridLines?: boolean, drawingMLLineHeight?: number, topAlignExactLineSpacing?: boolean): {
     paddingTop: number;
     paddingBottom: number;
     contentHeight: number;
     lineSpacingApply: number;
 };
-export declare function updateInlineDrawingPosition(line: IDocumentSkeletonLine, paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, unitId?: string, blockAnchorTop?: number, paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>): void;
+export declare function updateInlineDrawingPosition(line: IDocumentSkeletonLine, paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, unitId?: string, blockAnchorTop?: number, paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, documentCompatibilityPolicy?: IParagraphConfig['documentCompatibilityPolicy']): void;
 declare function __checkPageBreak(column: IDocumentSkeletonColumn): boolean;
 export {};

package/lib/types/components/docs/layout/block/table.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { INumberUnit, ITable, Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable, IParagraphList } from '../../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonTable } from '../../../../basics/i-document-skeleton-cached';
 import type { ISectionBreakConfig } from '../../../../basics/interfaces';
 import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../../view-model/document-view-model';
@@ -39,13 +39,13 @@ export interface ITableSkeletonBuildState {
     currentColumnIndex: number;
     currentRowLeft: number;
     currentRowHeight: number;
+    mergedCellContentHeights: Map<string, number>;
     currentCellBuild: Nullable<ICellSkeletonBuildState>;
 }
 export declare function startTableSkeletonBuild(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, tableNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): Nullable<ITableSkeletonBuildState>;
 export declare function stepTableSkeletonBuild(state: ITableSkeletonBuildState): boolean;
-export declare function cachePrecomputedTableSkeleton(ctx: ILayoutContext, tableStartIndex: number, tableSkeleton: IDocumentSkeletonTable): void;
+export declare function cachePrecomputedTableSkeleton(ctx: ILayoutContext, tableNode: DataStreamTreeNode, tableSkeleton: IDocumentSkeletonTable): void;
 export declare function createTableSkeleton(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, tableNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): Nullable<IDocumentSkeletonTable>;
-export declare function rollbackListCache(listLevel: Map<string, IParagraphList[][]>, table: DataStreamTreeNode): void;
 export interface ISlicedTableSkeletonParams {
     skeTables: IDocumentSkeletonTable[];
     fromCurrentPage: boolean;
@@ -79,8 +79,9 @@ interface ICreateTableCache {
 }
 export declare function startTableSkeletonsBuild(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, tableNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, availableHeight: number): Nullable<ISlicedTableSkeletonBuildState>;
 export declare function stepTableSkeletonsBuild(state: ISlicedTableSkeletonBuildState): boolean;
-export declare function cachePrecomputedSlicedTableSkeletons(ctx: ILayoutContext, tableStartIndex: number, availableHeight: number, result: ISlicedTableSkeletonParams): void;
+export declare function cachePrecomputedSlicedTableSkeletons(ctx: ILayoutContext, tableNode: DataStreamTreeNode, availableHeight: number, result: ISlicedTableSkeletonParams): void;
 export declare function createTableSkeletons(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, tableNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, availableHeight: number): ISlicedTableSkeletonParams;
+export declare function resolveTableLayoutColumns(table: ITable, availableWidth: number, traditional?: boolean): ITable;
 export declare function getTableLeft(pageWidth: number, tableWidth: number, align: TableAlignmentType, indent?: INumberUnit): number;
 export declare function getNullTableSkeleton(st: number, ed: number, table: ITable): IDocumentSkeletonTable;
 export declare function getTableSliceId(tableId: string, sliceIndex: number): string;

package/lib/types/components/docs/layout/doc-skeleton.d.ts

@@ -45,6 +45,8 @@ export declare class DocumentSkeleton extends Skeleton {
     readonly dirty$: import("rxjs").Observable<boolean>;
     private _layoutProgress$;
     readonly layoutProgress$: import("rxjs").Observable<IDocumentLayoutProgress>;
+    private readonly _layoutPageMaterialized$;
+    readonly layoutPageMaterialized$: import("rxjs").Observable<void>;
     private _skeletonData;
     private _findLiquid;
     private _hyphen;
@@ -61,6 +63,8 @@ export declare class DocumentSkeleton extends Skeleton {
     private _topLevelBlockSections;
     private _topLevelBlocks;
     private readonly _isolateIncrementalPublications;
+    private _modernPageWidth;
+    private _modernHorizontalMargin;
     constructor(_docViewModel: DocumentViewModel, localeService: LocaleService, options?: {
         isolateIncrementalPublications?: boolean;
     });
@@ -79,6 +83,8 @@ export declare class DocumentSkeleton extends Skeleton {
         anchor?: number;
         priorityAnchor?: number;
         invalidation?: IDocumentLayoutInvalidation;
+        modernPageWidth?: number;
+        modernHorizontalMargin?: number;
         bounds?: IViewportInfo;
         reuseUnaffectedTail?: boolean;
         /** The caller proved this edit only changes offset-preserving render metadata. */
@@ -122,6 +128,8 @@ export declare class DocumentSkeleton extends Skeleton {
      */
     hasCompleteLayout(): boolean;
     getSkeletonData(): Nullable<IDocumentSkeletonCached>;
+    /** Invalidate measurements captured before the requested fonts finished loading. */
+    invalidateFontMetrics(fontStyles: readonly string[]): void;
     /**
      * Refreshes Custom Block viewport-only metrics without rebuilding document flow.
      * Pure presentation metrics are published as one batch. Flow metrics are only
@@ -160,6 +168,11 @@ export declare class DocumentSkeleton extends Skeleton {
     findNodeByCoord(coord: Vector2, pageLayoutType: PageLayoutType, pageMarginLeft: number, pageMarginTop: number, restrictions?: IFindNodeRestrictions): Nullable<INodeInfo>;
     private _findNodeByCoord;
     private _collectNearestNode;
+    private _getHitTestPageLayout;
+    private _collectNearestTableNode;
+    private _collectNearestColumnGroupNode;
+    private _collectNearestTextNode;
+    private _collectNearestInkNode;
     private _getNearestNode;
     private _getPageBoundingBox;
     private _translatePage;