@univerjs/core 0.1.17 → 0.2.0

package/lib/types/common/interceptor.d.ts

@@ -10,7 +10,7 @@ export type IComposeInterceptors<T = any, C = any> = (interceptors: Array<IInter
 /**
  * A helper to compose a certain type of interceptors.
  */
-export declare const composeInterceptors: <T, C>(interceptors: Array<IInterceptor<T, C>>) => (initValue: Nullable<T>, initContext: C) => Nullable<T>;
+export declare const composeInterceptors: <T, C>(interceptors: Array<IInterceptor<T, C>>) => ReturnType<IComposeInterceptors<T, C>>;
 export declare class InterceptorManager<P extends Record<string, IInterceptor<any, any>>> {
     private _interceptorsByName;
     private _interceptorPoints;

package/lib/types/common/url.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+export declare function isLegalUrl(url: string): boolean;

package/lib/types/docs/data-model/document-data-model.d.ts

@@ -44,15 +44,15 @@ export declare class DocumentDataModel extends DocumentDataModelSimple {
     dispose(): void;
     getDrawings(): IDrawings | undefined;
     getDrawingsOrder(): string[] | undefined;
+    getCustomRanges(): import('../../types/interfaces/i-document-data').ICustomRange[] | undefined;
+    getCustomDecorations(): import('../../types/interfaces/i-document-data').ICustomDecoration[] | undefined;
     getRev(): number;
     incrementRev(): void;
     getSettings(): import('../../types/interfaces/i-document-data').IDocumentSettings | undefined;
     reset(snapshot: Partial<IDocumentData>): void;
     getSelfOrHeaderFooterModel(segmentId?: string): DocumentDataModel;
     getUnitId(): string;
-    apply(actions: JSONXActions): string | number | boolean | import('ot-json1').Doc[] | {
-        [k: string]: import('ot-json1').Doc;
-    } | null | undefined;
+    apply(actions: JSONXActions): IDocumentData | undefined;
     sliceBody(startOffset: number, endOffset: number): Nullable<IDocumentBody>;
     private _initializeHeaderFooterModel;
     updateDocumentId(unitId: string): void;

package/lib/types/docs/data-model/json-x/json-x.d.ts

@@ -34,5 +34,5 @@ export declare class JSONX {
     moveOp(from: Path, to: Path): JSONOp;
     insertOp(path: Path, value: any): JSONOp;
     replaceOp(path: Path, oldVal: any, newVal: any): JSONOp;
-    editOp(subOp: TextXAction[]): JSONOp;
+    editOp(subOp: TextXAction[], path?: string[]): JSONOp;
 }

package/lib/types/docs/data-model/text-x/apply-utils/common.d.ts

@@ -1,4 +1,4 @@
-import { ICustomBlock, ICustomRange, IDocumentBody, IParagraph, ISectionBreak, ITable, ITextRun } from '../../../../types/interfaces';
+import { ICustomBlock, ICustomDecoration, ICustomRange, IDocumentBody, IParagraph, ISectionBreak, ITable, ITextRun } from '../../../../types/interfaces';
 
 export declare function normalizeTextRuns(textRuns: ITextRun[]): ITextRun[];
 /**
@@ -22,9 +22,12 @@ export declare function insertSectionBreaks(body: IDocumentBody, insertBody: IDo
 export declare function insertCustomBlocks(body: IDocumentBody, insertBody: IDocumentBody, textLength: number, currentIndex: number): void;
 export declare function insertTables(body: IDocumentBody, insertBody: IDocumentBody, textLength: number, currentIndex: number): void;
 export declare function insertCustomRanges(body: IDocumentBody, insertBody: IDocumentBody, textLength: number, currentIndex: number): void;
+export declare function mergeDecorations(customDecorations: ICustomDecoration[]): ICustomDecoration[];
+export declare function insertCustomDecorations(body: IDocumentBody, insertBody: IDocumentBody, textLength: number, currentIndex: number): void;
 export declare function deleteTextRuns(body: IDocumentBody, textLength: number, currentIndex: number): ITextRun[];
 export declare function deleteParagraphs(body: IDocumentBody, textLength: number, currentIndex: number): IParagraph[];
 export declare function deleteSectionBreaks(body: IDocumentBody, textLength: number, currentIndex: number): ISectionBreak[];
 export declare function deleteCustomBlocks(body: IDocumentBody, textLength: number, currentIndex: number): ICustomBlock[];
 export declare function deleteTables(body: IDocumentBody, textLength: number, currentIndex: number): ITable[];
 export declare function deleteCustomRanges(body: IDocumentBody, textLength: number, currentIndex: number): ICustomRange[];
+export declare function deleteCustomDecorations(body: IDocumentBody, textLength: number, currentIndex: number, needOffset?: boolean): ICustomDecoration[];

package/lib/types/docs/data-model/text-x/utils.d.ts

@@ -1,7 +1,19 @@
 import { UpdateDocsAttributeType } from '../../../shared/command-enum';
-import { IDocumentBody } from '../../../types/interfaces/i-document-data';
+import { ICustomDecoration, IDocumentBody } from '../../../types/interfaces/i-document-data';
 import { IRetainAction } from './action-types';
 
 export declare function getBodySlice(body: IDocumentBody, startOffset: number, endOffset: number, returnEmptyTextRun?: boolean): IDocumentBody;
+export declare function normalizeBody(body: IDocumentBody): IDocumentBody;
+export declare function getCustomRangeSlice(body: IDocumentBody, startOffset: number, endOffset: number): {
+    customRanges: {
+        startIndex: number;
+        endIndex: number;
+        rangeId: string;
+        rangeType: import('../../../types/interfaces/i-document-data').CustomRangeType;
+    }[];
+    leftOffset: number;
+    rightOffset: number;
+};
+export declare function getCustomDecorationSlice(body: IDocumentBody, startOffset: number, endOffset: number): ICustomDecoration[];
 export declare function composeBody(thisBody: IDocumentBody, otherBody: IDocumentBody, coverType?: UpdateDocsAttributeType): IDocumentBody;
 export declare function isUselessRetainAction(action: IRetainAction): boolean;

package/lib/types/docs/data-model/types.d.ts

@@ -28,8 +28,8 @@ export declare enum DataStreamTreeTokenType {
     TABLE_ROW_START = "\u001B",// 表格开始
     TABLE_CELL_START = "\u001C",// 表格开始
     TABLE_CELL_END = "\u001D",// 表格开始
-    TABLE_ROW_END = "\u001E",// 表格开始
-    TABLE_END = "\u001F",// 表格结束
+    TABLE_ROW_END = "*",// 表格开始
+    TABLE_END = "+",// 表格结束
     CUSTOM_RANGE_START = "\u001F",// 自定义范围开始
     CUSTOM_RANGE_END = "\u001E",// 自定义范围结束
     COLUMN_BREAK = "\v",// 换列

package/lib/types/index.d.ts

@@ -106,3 +106,7 @@ export { AuthzIoLocalService } from './services/authz-io/authz-io-local.service'
 export { IAuthzIoService } from './services/authz-io/type';
 export { createDefaultUser } from './services/user-manager/const';
 export { skipParseTagNames } from './types/const/clipboard';
+export { normalizeBody, getCustomRangeSlice, getCustomDecorationSlice } from './docs/data-model/text-x/utils';
+export { updateAttributeByDelete } from './docs/data-model/text-x/apply-utils/delete-apply';
+export { updateAttributeByInsert } from './docs/data-model/text-x/apply-utils/insert-apply';
+export { nameCharacterCheck } from './shared/name';

package/lib/types/services/__tests__/index.d.ts

@@ -0,0 +1,18 @@
+import { ICommandService, Univer } from '@univerjs/core';
+import { Dependency } from '@wendellhu/redi';
+
+export declare const createTestBed: (dependencies?: Dependency[]) => {
+    univer: Univer;
+    get: {
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+    };
+    workbook: import('@univerjs/core').Workbook;
+    unitId: string;
+    subUnitId: string;
+    commandService: ICommandService;
+};

package/lib/types/services/command/command.service.d.ts

@@ -84,6 +84,7 @@ export interface IExecutionOptions {
     onlyLocal?: boolean;
     /** This command is from collaboration peers. */
     fromCollab?: boolean;
+    fromChangeset?: boolean;
     [key: PropertyKey]: string | number | boolean | undefined;
 }
 export type CommandListener = (commandInfo: Readonly<ICommandInfo>, options?: IExecutionOptions) => void;

package/lib/types/services/resource-loader/resource-loader.service.d.ts

@@ -3,6 +3,7 @@ import { IWorkbookData } from '../../types/interfaces';
 import { IResourceManagerService } from '../resource-manager/type';
 import { IUniverInstanceService } from '../instance/instance.service';
 import { Disposable } from '../../shared/lifecycle';
+import { DocumentDataModel } from '../../docs';
 import { IResourceLoaderService } from './type';
 
 export declare class ResourceLoaderService extends Disposable implements IResourceLoaderService {
@@ -11,4 +12,5 @@ export declare class ResourceLoaderService extends Disposable implements IResour
     constructor(_resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService);
     private _init;
     saveWorkbook: (workbook: Workbook) => IWorkbookData;
+    saveDoc(doc: DocumentDataModel): import('../../types/interfaces').IDocumentData;
 }

package/lib/types/services/resource-loader/type.d.ts

@@ -1,7 +1,10 @@
 import { Workbook } from '../../sheets/workbook';
 import { IWorkbookData } from '../../types/interfaces/i-workbook-data';
+import { IDocumentData } from '../../types/interfaces';
+import { DocumentDataModel } from '../../docs';
 
 export interface IResourceLoaderService {
     saveWorkbook: (workbook: Workbook) => IWorkbookData;
+    saveDoc: (doc: DocumentDataModel) => IDocumentData;
 }
 export declare const IResourceLoaderService: import('@wendellhu/redi').IdentifierDecorator<IResourceLoaderService>;

package/lib/types/services/resource-manager/resource-manager.service.d.ts

@@ -1,5 +1,6 @@
 import { Disposable } from '../../shared/lifecycle';
 import { IWorkbookData } from '../../types/interfaces/i-workbook-data';
+import { UniverInstanceType } from '../../common/unit';
 import { IResourceHook, IResourceManagerService, IResourceName } from './type';
 
 export declare class ResourceManagerService extends Disposable implements IResourceManagerService {
@@ -11,6 +12,10 @@ export declare class ResourceManagerService extends Disposable implements IResou
         name: `SHEET_${string}_PLUGIN` | `DOC_${string}_PLUGIN`;
         data: string;
     }[];
+    getResourcesByType(unitId: string, type: UniverInstanceType): {
+        name: `SHEET_${string}_PLUGIN` | `DOC_${string}_PLUGIN`;
+        data: string;
+    }[];
     registerPluginResource<T = unknown>(hook: IResourceHook<T>): import('@wendellhu/redi').IDisposable;
     disposePluginResource(pluginName: IResourceName): void;
     loadResources(unitId: string, resources: IWorkbookData['resources']): void;

package/lib/types/services/resource-manager/type.d.ts

@@ -19,6 +19,7 @@ export interface IResourceManagerService {
     disposePluginResource: (pluginName: IResourceName) => void;
     getAllResourceHooks: () => IResourceHook[];
     getResources: (unitId: string) => IWorkbookData['resources'];
+    getResourcesByType: (unitId: string, type: UniverInstanceType) => IWorkbookData['resources'];
     loadResources: (unitId: string, resources: IWorkbookData['resources']) => void;
     unloadResources(unitId: string): void;
 }

package/lib/types/services/user-manager/user-manager.service.d.ts

@@ -22,10 +22,10 @@ export declare class UserManagerService {
     private _model;
     private _userChange$;
     userChange$: import('rxjs').Observable<{
-        type: 'add' | 'delete';
+        type: "add" | "delete";
         user: IUser;
     } | {
-        type: 'clear';
+        type: "clear";
     }>;
     private _currentUser$;
     /**

package/lib/types/shared/__tests__/name.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+export {};

package/lib/types/shared/common.d.ts

@@ -1,11 +1,11 @@
 import { IRange } from '../types/interfaces';
 import { ICellData, ICellDataForSheetInterceptor } from '../types/interfaces/i-cell-data';
 import { IDocumentData } from '../types/interfaces/i-document-data';
-import { IRangeWithCoord, ISelectionCell, ISelectionCellWithCoord } from '../types/interfaces/i-selection-data';
+import { IRangeWithCoord, ISelectionCell, ISelectionCellWithMergeInfo } from '../types/interfaces/i-selection-data';
 import { IColorStyle, IStyleData } from '../types/interfaces/i-style-data';
 import { Nullable } from './types';
 
-export declare function makeCellToSelection(cellInfo: Nullable<ISelectionCellWithCoord>): Nullable<IRangeWithCoord>;
+export declare function makeCellToSelection(cellInfo: Nullable<ISelectionCellWithMergeInfo>): Nullable<IRangeWithCoord>;
 export declare function makeCellRangeToRangeData(cellInfo: Nullable<ISelectionCell>): Nullable<IRange>;
 export declare function isEmptyCell(cell: Nullable<ICellData>): boolean;
 export declare function isCellCoverable(cell: Nullable<ICellDataForSheetInterceptor>): boolean;
@@ -22,11 +22,6 @@ export declare function isFormulaString(value: any): boolean;
  * @returns
  */
 export declare function isFormulaId(value: any): boolean;
-/**
- * Convert rich text json to DOM
- * @param p
- */
-export declare function handleJsonToDom(p: IDocumentData): string;
 /**
  * transform style object to string
  * @param style

package/lib/types/shared/name.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+/**
+ * The name you entered for the worksheet or chart is invalid. Please ensure:
+
+    The name is no more than 31 characters.
+    The first and last characters cannot be '
+    The name does not contain any of the following characters: : \ / ? * [ or ].
+    The name is not empty.
+ * @param name
+ * @returns
+ */
+export declare function nameCharacterCheck(name: string): boolean;

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

@@ -36,6 +36,7 @@ export declare class Tools {
     static isWeChat(): boolean;
     static isAndroid(): boolean;
     static isIPhone(): boolean;
+    static isLegalUrl(url: string): boolean;
     static itCount(count: number): Function;
     static hasLength(target: IArguments | any[] | string, length?: number): boolean;
     static capitalize(str: string): string;
@@ -105,4 +106,5 @@ export declare class Tools {
      * @param value
      */
     static set(data: Record<string, any>, propertyPath: string, value: any): void;
+    static clamp(value: number, min: number, max: number): number;
 }

package/lib/types/sheets/__tests__/create-core-test-bed.d.ts

@@ -4,12 +4,12 @@ import { IWorkbookData } from '../../types/interfaces/i-workbook-data';
 export declare function createCoreTestBed(workbookData?: IWorkbookData): {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp | undefined): T;
-        <T_1>(id: import('@wendellhu/redi').DependencyIdentifier<T_1>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_1[];
-        <T_2>(id: import('@wendellhu/redi').DependencyIdentifier<T_2>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_2 | null;
-        <T_3>(id: import('@wendellhu/redi').DependencyIdentifier<T_3>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_3;
-        <T_4>(id: import('@wendellhu/redi').DependencyIdentifier<T_4>, quantity?: import('@wendellhu/redi').Quantity | undefined, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_4 | T_4[] | null;
-        <T_5>(id: import('@wendellhu/redi').DependencyIdentifier<T_5>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp | undefined, lookUp?: import('@wendellhu/redi').LookUp | undefined): T_5 | T_5[] | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
     };
     sheet: import('../workbook').Workbook;
 };

package/lib/types/sheets/range.d.ts

@@ -1,5 +1,5 @@
 import { IObjectMatrixPrimitiveType, Nullable, ObjectMatrix } from '../shared';
-import { HorizontalAlign, VerticalAlign, WrapStrategy, BooleanNumber, FontItalic, FontWeight } from '../types/enum';
+import { HorizontalAlign, VerticalAlign, BooleanNumber, FontItalic, FontWeight, WrapStrategy } from '../types/enum';
 import { IBorderData, ICellData, IDocumentBody, IDocumentData, IRange, IStyleBase, IStyleData, ITextDecoration, ITextRotation } from '../types/interfaces';
 import { Styles } from './styles';
 import { Worksheet } from './worksheet';
@@ -275,10 +275,6 @@ export declare class Range {
      * Returns whether the text in the cell wraps.
      */
     getWrap(): BooleanNumber;
-    /**
-     * Returns whether the text in the cells wrap.
-     */
-    getWraps(): BooleanNumber[][];
     /**
      * Returns the text wrapping strategies for the cells in the range.
      */

package/lib/types/types/interfaces/i-cell-custom-render.d.ts

@@ -1,15 +1,15 @@
 import { Nullable } from '../../shared';
 import { Worksheet } from '../../sheets/worksheet';
 import { Workbook } from '../../sheets/workbook';
-import { ISelectionCellWithCoord } from './i-selection-data';
+import { ISelectionCellWithMergeInfo } from './i-selection-data';
 import { IStyleData } from './i-style-data';
 import { ICellDataForSheetInterceptor } from './i-cell-data';
 
 export interface ICellRenderContext {
     data: ICellDataForSheetInterceptor;
     style: Nullable<IStyleData>;
-    primaryWithCoord: ISelectionCellWithCoord;
-    unitId?: string;
+    primaryWithCoord: ISelectionCellWithMergeInfo;
+    unitId: string;
     subUnitId: string;
     row: number;
     col: number;

package/lib/types/types/interfaces/i-cell-data.d.ts

@@ -64,4 +64,4 @@ export interface ICellDataForSheetInterceptor extends ICellData {
 export declare function isICellData(value: any): value is ICellData;
 export declare function getCellValueType(cell: ICellData): CellValueType | null | undefined;
 export declare function isNullCell(cell: Nullable<ICellData>): boolean;
-export declare function isCellV(cell: Nullable<ICellData | CellValue>): boolean;
+export declare function isCellV(cell: Nullable<ICellData | CellValue>): cell is string | number | boolean;

package/lib/types/types/interfaces/i-document-data.d.ts

@@ -98,6 +98,7 @@ export interface IDocumentBody {
     customBlocks?: ICustomBlock[];
     tables?: ITable[];
     customRanges?: ICustomRange[];
+    customDecorations?: ICustomDecoration[];
 }
 export interface IDocStyle {
     name: string;
@@ -202,6 +203,14 @@ export interface ICustomRange {
     rangeId: string;
     rangeType: CustomRangeType;
 }
+export interface ICustomRangeForInterceptor extends ICustomRange {
+    active?: boolean;
+    show?: boolean;
+}
+export interface ICustomDecorationForInterceptor extends ICustomDecoration {
+    active?: boolean;
+    show?: boolean;
+}
 export declare enum CustomRangeType {
     HYPERLINK = 0,
     FIELD = 1,// 17.16 Fields and Hyperlinks
@@ -219,6 +228,15 @@ export interface ICustomBlock {
     blockType?: BlockType;
     blockId: string;
 }
+export declare enum CustomDecorationType {
+    COMMENT = 0
+}
+export interface ICustomDecoration {
+    startIndex: number;
+    endIndex: number;
+    id: string;
+    type: CustomDecorationType;
+}
 /**
  * Type of block
  */
@@ -234,7 +252,11 @@ export interface IHeaderAndFooterBase {
     firstPageHeaderId?: string;
     firstPageFooterId?: string;
     useFirstPageHeaderFooter?: BooleanNumber;
-    useEvenPageHeaderFooter?: BooleanNumber;
+    evenAndOddHeaders?: BooleanNumber;
+}
+export declare enum DocumentFlavor {
+    TRADITIONAL = 0,
+    MODERN = 1
 }
 /**
  * Basics properties of doc style
@@ -243,6 +265,7 @@ export interface IDocStyleBase extends IMargin {
     pageNumberStart?: number;
     pageSize?: ISize;
     pageOrient?: PageOrientType;
+    documentFlavor?: DocumentFlavor;
     marginHeader?: number;
     marginFooter?: number;
     renderConfig?: IDocumentRenderConfig;

package/lib/types/types/interfaces/i-selection-data.d.ts

@@ -20,7 +20,7 @@ export interface IRangeWithCoord extends IPosition, IRange {
 }
 export interface ISelectionCell extends IRange, ISingleCell {
 }
-export interface ISelectionCellWithCoord extends IPosition, ISingleCell {
+export interface ISelectionCellWithMergeInfo extends IPosition, ISingleCell {
     mergeInfo: IRangeWithCoord;
 }
 export interface ISelection {
@@ -33,9 +33,13 @@ export interface ISelection {
      */
     primary: Nullable<ISelectionCell>;
 }
+/**
+ * Selection range Info, contains selectionrange & primaryrange
+ * primaryrange is the range of the highlighted cell.
+ */
 export interface ISelectionWithCoord {
     rangeWithCoord: IRangeWithCoord;
-    primaryWithCoord: Nullable<ISelectionCellWithCoord>;
+    primaryWithCoord: Nullable<ISelectionCellWithMergeInfo>;
 }
 export interface ITextRangeStart {
     startOffset: number;
@@ -46,6 +50,7 @@ export interface ITextRange extends ITextRangeStart {
 }
 export interface ITextRangeParam extends ITextRange {
     segmentId?: string;
+    segmentPage?: number;
     isActive?: boolean;
 }
 /**

package/lib/types/types/interfaces/i-style-data.d.ts

@@ -112,6 +112,10 @@ export interface IStyleBase {
      * underline
      */
     ul?: ITextDecoration;
+    /**
+     * bottomBorerLine
+     */
+    bbl?: ITextDecoration;
     /**
      * strikethrough
      */