@univerjs/engine-render 1.0.0-alpha.0 → 1.0.0-alpha.2

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

@@ -62,6 +62,10 @@ export declare enum CURSOR_TYPE {
     SOUTH_WEST_RESIZE = "sw-resize",
     SOUTH_RESIZE = "s-resize",
     WEST_RESIZE = "w-resize",
+    EAST_WEST_RESIZE = "ew-resize",
+    NORTH_SOUTH_RESIZE = "ns-resize",
+    NORTH_EAST_SOUTH_WEST_RESIZE = "nesw-resize",
+    NORTH_WEST_SOUTH_EAST_RESIZE = "nwse-resize",
     TEXT = "text",
     WAIT = "wait",
     HELP = "help",

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IColorStyle, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraph, IParagraphBorder, IParagraphProperties, ITable, ITableRow, ITextStyle, PageOrientType } from '@univerjs/core';
+import type { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IColorStyle, IColumnGroup, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraph, IParagraphBorder, IParagraphProperties, ITable, ITableRow, ITextStyle, PageOrientType } from '@univerjs/core';
 import type { BreakPointType } from '../components/docs/layout/line-breaker/break';
 export interface IDocumentSkeletonCached extends ISkeletonResourceReference {
     pages: IDocumentSkeletonPage[];
@@ -69,6 +69,7 @@ export interface IDocumentSkeletonPage {
     ed: number;
     skeDrawings: Map<string, IDocumentSkeletonDrawing>;
     skeTables: Map<string, IDocumentSkeletonTable>;
+    skeColumnGroups: Map<string, IDocumentSkeletonColumnGroup>;
     segmentId: string;
     type: DocumentSkeletonPageType;
     renderConfig?: IDocumentRenderConfig;
@@ -108,6 +109,29 @@ export interface IDocumentSkeletonRow {
     parent?: IDocumentSkeletonTable;
     isRepeatRow: boolean;
 }
+export interface IDocumentSkeletonColumnGroup {
+    columns: IDocumentSkeletonColumnGroupColumn[];
+    width: number;
+    height: number;
+    top: number;
+    left: number;
+    st: number;
+    ed: number;
+    columnGroupId: string;
+    columnGroupSource: IColumnGroup;
+    parent?: IDocumentSkeletonPage;
+}
+export interface IDocumentSkeletonColumnGroupColumn {
+    columnId: string;
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+    st: number;
+    ed: number;
+    page: IDocumentSkeletonPage;
+    parent?: IDocumentSkeletonColumnGroup;
+}
 export interface IDocumentSkeletonColumn {
     lines: IDocumentSkeletonLine[];
     left: number;

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

@@ -46,6 +46,7 @@ export declare class Documents extends DocComponent {
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     private _drawTable;
+    private _drawColumnGroups;
     private _drawTableCellBackgrounds;
     private _getTableViewport;
     private _getRenderUnitId;
@@ -54,6 +55,7 @@ export declare class Documents extends DocComponent {
     private _drawBorderBottom;
     private _drawGlyphGroupBackgrounds;
     private _drawTableCell;
+    private _drawNestedPageContent;
     private _drawTableCellBordersAndBg;
     private _getTableCellSource;
     private _resolveTableCellBorder;

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

@@ -0,0 +1,23 @@
+/**
+ * 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 { Nullable } from '@univerjs/core';
+import type { IDocumentSkeletonColumnGroup, IDocumentSkeletonPage } 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';
+import type { ILayoutContext } from '../tools';
+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;

package/lib/types/components/docs/layout/model/page.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 { IDocumentBody, ITable, Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../basics/i-document-skeleton-cached';
 import type { ISectionBreakConfig } from '../../../../basics/interfaces';
 import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
@@ -27,3 +27,4 @@ export declare function createNullCellPage(ctx: ILayoutContext, sectionBreakConf
 };
 export declare function createSkeletonCellPages(ctx: ILayoutContext, viewModel: DocumentViewModel, cellNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, tableConfig: ITable, row: number, col: number, availableHeight?: number, maxCellPageHeight?: number): IDocumentSkeletonPage[];
 export declare function expandCellPageHeightForInlineDrawings(pages: IDocumentSkeletonPage[]): void;
+export declare function applyTrailingBlockRangeSpaceBelow(pages: IDocumentSkeletonPage[], body: Nullable<IDocumentBody>, containerEndIndex: number): void;

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

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 import type { DocumentDataModel, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable, PositionedObjectLayoutType } from '@univerjs/core';
-import type { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSection, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonSection, IDocumentSkeletonTable, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
 import type { IDocsConfig, IParagraphConfig, ISectionBreakConfig } from '../../../basics/interfaces';
+import type { IBoundRectNoAngle } from '../../../basics/vector2';
+import type { IDocumentCompatibilityPolicy } from '../document-compatibility';
 import type { DataStreamTreeNode } from '../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../view-model/document-view-model';
 import type { Hyphen } from './hyphenation/hyphen';
@@ -64,10 +66,88 @@ export declare function getCharSpaceConfig(sectionBreakConfig: ISectionBreakConf
     gridType: GridType;
     snapToGrid: BooleanNumber;
 };
-export declare function updateBlockIndex(pages: IDocumentSkeletonPage[], start?: number): void;
+export declare function updateBlockIndex(pages: IDocumentSkeletonPage[], start?: number, documentCompatibilityPolicy?: IDocumentCompatibilityPolicy): void;
 export declare function updateInlineDrawingCoordsAndBorder(ctx: ILayoutContext, pages: IDocumentSkeletonPage[]): void;
 export declare function glyphIterator(pages: IDocumentSkeletonPage[], cb: (glyph: IDocumentSkeletonGlyph, divide: IDocumentSkeletonDivide, line: IDocumentSkeletonLine, column: IDocumentSkeletonColumn, section: IDocumentSkeletonSection, page: IDocumentSkeletonPage) => void): void;
 export declare function lineIterator(pagesOrCells: (IDocumentSkeletonPage)[], cb: (line: IDocumentSkeletonLine, column: IDocumentSkeletonColumn, section: IDocumentSkeletonSection, page: IDocumentSkeletonPage) => void): void;
+export type DocumentSkeletonLineSource = 'page' | 'table-cell' | 'column';
+export interface IDocumentSkeletonLineIteratorOptions {
+    docsLeft?: number;
+    pageMarginTop?: number;
+    tableCellInsetX?: number;
+    unitId?: string;
+}
+export interface IDocumentSkeletonLineContext {
+    clipLeft?: number;
+    clipRight?: number;
+    column: IDocumentSkeletonColumn;
+    line: IDocumentSkeletonLine;
+    lineWidth: number;
+    page: IDocumentSkeletonPage;
+    pageIndex: number;
+    pageLeft: number;
+    section: IDocumentSkeletonSection;
+    sectionTop: number;
+    source: DocumentSkeletonLineSource;
+    visualLeft?: number;
+    visualWidth?: number;
+}
+export type DocumentSkeletonTableSource = 'page' | 'column' | 'header' | 'footer';
+type HeaderFooterSkeletonMap = Map<string, Map<number, IDocumentSkeletonPage>>;
+export interface IDocumentSkeletonTableCellGeometry {
+    cell: IDocumentSkeletonPage;
+    cellRect: IBoundRectNoAngle;
+    clipLeft: number;
+    clipRight: number;
+    columnIndex: number;
+    pageLeft: number;
+    pageTop: number;
+    row: IDocumentSkeletonRow;
+    rowIndex: number;
+    visualLeft: number;
+    visualWidth: number;
+}
+export interface IDocumentSkeletonTableContext {
+    cells: IDocumentSkeletonTableCellGeometry[];
+    page: IDocumentSkeletonPage;
+    pageIndex: number;
+    pageLeft: number;
+    pageTop: number;
+    rootPage: IDocumentSkeletonPage;
+    source: DocumentSkeletonTableSource;
+    table: IDocumentSkeletonTable;
+    tableId: string;
+    tableRect: IBoundRectNoAngle;
+}
+export interface IDocumentSkeletonTableIteratorOptions {
+    docsLeft?: number;
+    docsTop?: number;
+    pageMarginTop?: number;
+    resolveViewport?: boolean;
+    skeFooters?: HeaderFooterSkeletonMap;
+    skeHeaders?: HeaderFooterSkeletonMap;
+    tableCellInsetX?: number;
+    unitId?: string;
+}
+export declare function documentSkeletonTableIterator(pages: IDocumentSkeletonPage[], options?: IDocumentSkeletonTableIteratorOptions): IDocumentSkeletonTableContext[];
+export declare function documentSkeletonLineIterator(pages: IDocumentSkeletonPage[], options: IDocumentSkeletonLineIteratorOptions, cb: (context: IDocumentSkeletonLineContext) => void): void;
+export declare function getDocumentSkeletonNestedPageOffset(page: IDocumentSkeletonPage): {
+    left: number;
+    top: number;
+} | undefined;
+export interface IDocumentSkeletonColumnPagePathInfo {
+    columnGroupId: string;
+    columnIndex: number;
+    pageIndex: number;
+}
+export declare function getDocumentSkeletonColumnPagePathInfo(position: {
+    path?: (string | number)[];
+}): IDocumentSkeletonColumnPagePathInfo | undefined;
+export declare function compareDocumentSkeletonNestedPagePathOrder(pos1: {
+    path?: (string | number)[];
+}, pos2: {
+    path?: (string | number)[];
+}): boolean | undefined;
 export declare function columnIterator(pages: IDocumentSkeletonPage[], iteratorFunction: (column: IDocumentSkeletonColumn) => void): void;
 export declare function getPositionHorizon(positionH: IObjectPositionH, column: IDocumentSkeletonColumn, page: IDocumentSkeletonPage, objectWidth: number, isPageBreak?: boolean): number | undefined;
 export declare function getPositionVertical(positionV: IObjectPositionV, page: IDocumentSkeletonPage, lineTop: number, lineHeight: number, objectHeight: number, blockAnchorTop?: number, isPageBreak?: boolean): number | undefined;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel, ICustomBlock, ICustomDecorationForInterceptor, ICustomRangeForInterceptor, ICustomTable, IDisposable, IParagraph, ISectionBreak, ITable, ITextRun, Nullable } from '@univerjs/core';
+import type { DocumentDataModel, IColumnGroup, ICustomBlock, ICustomColumnGroup, ICustomDecorationForInterceptor, ICustomRangeForInterceptor, ICustomTable, IDisposable, IParagraph, ISectionBreak, ITable, ITextRun, Nullable } from '@univerjs/core';
 import { DataStreamTreeNode } from './data-stream-tree-node';
 interface ITableNodeCache {
     table: DataStreamTreeNode;
@@ -35,8 +35,13 @@ interface ITableCoupleCache {
     table: ICustomTable;
     tableSource: ITable;
 }
+interface IColumnGroupCoupleCache {
+    columnGroup: ICustomColumnGroup;
+    columnGroupSource: IColumnGroup;
+}
 export declare class DocumentViewModel implements IDisposable {
     private _documentDataModel;
+    private _tableSource?;
     private _interceptor;
     private _cacheSize;
     private _textRunsCache;
@@ -44,6 +49,7 @@ export declare class DocumentViewModel implements IDisposable {
     private _sectionBreakCache;
     private _customBlockCache;
     private _tableCache;
+    private _columnGroupCache;
     private _tableNodeCache;
     private _children;
     private _editArea;
@@ -53,7 +59,7 @@ export declare class DocumentViewModel implements IDisposable {
     private _footerTreeMap;
     private readonly _segmentViewModels$;
     readonly segmentViewModels$: import("rxjs").Observable<DocumentViewModel[]>;
-    constructor(_documentDataModel: DocumentDataModel);
+    constructor(_documentDataModel: DocumentDataModel, _tableSource?: Record<string, ITable> | undefined);
     registerCustomRangeInterceptor(interceptor: ICustomRangeInterceptor): IDisposable;
     dispose(): void;
     getHeaderFooterTreeMap(): {
@@ -74,6 +80,7 @@ export declare class DocumentViewModel implements IDisposable {
     getCustomBlock(index: number): ICustomBlock | undefined;
     getCustomBlockWithoutSetCurrentIndex(index: number): ICustomBlock | undefined;
     getTableByStartIndex(index: number): ITableCoupleCache | undefined;
+    getColumnGroupByStartIndex(index: number): IColumnGroupCoupleCache | undefined;
     findTableNodeById(id: string): DataStreamTreeNode | undefined;
     getCustomRangeRaw(index: number): import("@univerjs/core").ICustomRange<Record<string, any>> | undefined;
     getCustomRange(index: number): Nullable<ICustomRangeForInterceptor>;
@@ -84,6 +91,7 @@ export declare class DocumentViewModel implements IDisposable {
     private _buildSectionBreakCache;
     private _buildCustomBlockCache;
     private _buildTableCache;
+    private _buildColumnGroupCache;
     private _buildTextRunsCache;
     private _buildHeaderFooterViewModel;
 }

package/lib/types/index.d.ts

@@ -26,7 +26,8 @@ export { getTableIdAndSliceIndex } from './components/docs/layout/block/table';
 export * from './components/docs/layout/doc-simple-skeleton';
 export { DocumentSkeleton } from './components/docs/layout/doc-skeleton';
 export type { IFindNodeRestrictions } from './components/docs/layout/doc-skeleton';
-export { getCharSpaceApply, getLastLine, getNumberUnitValue, getPageFromPath, glyphIterator, lineIterator, } from './components/docs/layout/tools';
+export { compareDocumentSkeletonNestedPagePathOrder, documentSkeletonLineIterator, documentSkeletonTableIterator, getCharSpaceApply, getDocumentSkeletonColumnPagePathInfo, getDocumentSkeletonNestedPageOffset, getLastLine, getNumberUnitValue, getPageFromPath, glyphIterator, lineIterator, } from './components/docs/layout/tools';
+export type { IDocumentSkeletonColumnPagePathInfo, IDocumentSkeletonLineContext, IDocumentSkeletonLineIteratorOptions, IDocumentSkeletonTableCellGeometry, IDocumentSkeletonTableContext, IDocumentSkeletonTableIteratorOptions } from './components/docs/layout/tools';
 export { getLastColumn } from './components/docs/layout/tools';
 export { Liquid } from './components/docs/liquid';
 export type { DocsTableRenderViewportProvider, IDocsTableRenderViewport, } from './components/docs/table-render-viewport';