@univerjs/core 0.1.12 → 0.1.13

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

@@ -12,10 +12,22 @@ export declare class Rectangle {
     static contains(src: IRange, target: IRange): boolean;
     static realContain(src: IRange, target: IRange): boolean;
     static union(...ranges: IRange[]): IRange;
+    static realUnion(...ranges: IRange[]): IRange;
     static getRelativeRange: (range: IRange, originRange: IRange) => IRange;
     static getPositionRange: (relativeRange: IRange, originRange: IRange, absoluteRange?: IRange) => IRange;
     static moveHorizontal: (range: IRange, step?: number, length?: number) => IRange;
     static moveVertical: (range: IRange, step?: number, length?: number) => IRange;
     static moveOffset: (range: IRange, offsetX: number, offsetY: number) => IRange;
     static subtract(range1: IRange, range2: IRange): IRange[];
+    static hasIntersectionBetweenTwoBounds(rect1: {
+        left: number;
+        top: number;
+        right: number;
+        bottom: number;
+    }, rect2: {
+        left: number;
+        top: number;
+        right: number;
+        bottom: number;
+    }): boolean;
 }

package/lib/types/{services/floating-object/floating-object-interfaces.d.ts → shared/shape.d.ts}

@@ -25,10 +25,9 @@ export interface IOffset {
     left?: number;
     top?: number;
 }
-export interface ITransformState extends IOffset, ISize, IScale {
-    angle?: number;
-    skewX?: number;
-    skewY?: number;
-    flipX?: boolean;
-    flipY?: boolean;
+export interface ISrcRect extends IOffset {
+    right?: number;
+    bottom?: number;
+}
+export interface IAbsoluteTransform extends ISize, IOffset, IScale {
 }

package/lib/types/sheets/sheet-snapshot-utils.d.ts

@@ -5,9 +5,9 @@ export declare const DEFAULT_WORKSHEET_ROW_COUNT = 1000;
 export declare const DEFAULT_WORKSHEET_COLUMN_COUNT_KEY = "DEFAULT_WORKSHEET_COLUMN_COUNT";
 export declare const DEFAULT_WORKSHEET_COLUMN_COUNT = 20;
 export declare const DEFAULT_WORKSHEET_ROW_HEIGHT_KEY = "DEFAULT_WORKSHEET_ROW_HEIGHT";
-export declare const DEFAULT_WORKSHEET_ROW_HEIGHT = 19;
+export declare const DEFAULT_WORKSHEET_ROW_HEIGHT = 24;
 export declare const DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY = "DEFAULT_WORKSHEET_COLUMN_WIDTH";
-export declare const DEFAULT_WORKSHEET_COLUMN_WIDTH = 73;
+export declare const DEFAULT_WORKSHEET_COLUMN_WIDTH = 88;
 export declare const DEFAULT_WORKSHEET_ROW_TITLE_WIDTH_KEY = "DEFAULT_WORKSHEET_ROW_TITLE_WIDTH";
 export declare const DEFAULT_WORKSHEET_ROW_TITLE_WIDTH = 46;
 export declare const DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT_KEY = "DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT";

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

@@ -1,3 +1,4 @@
+import { Observable } from 'rxjs';
 import { ILogService } from '../services/log/log.service';
 import { Nullable } from '../shared';
 import { IGridRange, IRangeType, IWorkbookData, IWorksheetData } from '../types/interfaces';
@@ -13,12 +14,12 @@ export declare class Workbook extends UnitModel<IWorkbookData, UniverInstanceTyp
     private readonly _logService;
     type: UniverInstanceType.UNIVER_SHEET;
     private readonly _sheetCreated$;
-    readonly sheetCreated$: import('rxjs').Observable<Worksheet>;
+    readonly sheetCreated$: Observable<Worksheet>;
     private readonly _sheetDisposed$;
-    readonly sheetDisposed$: import('rxjs').Observable<Worksheet>;
+    readonly sheetDisposed$: Observable<Worksheet>;
     private readonly _activeSheet$;
     private get _activeSheet();
-    readonly activeSheet$: import('rxjs').Observable<Nullable<Worksheet>>;
+    readonly activeSheet$: Observable<Nullable<Worksheet>>;
     /**
      * sheets list
      * @private
@@ -36,6 +37,8 @@ export declare class Workbook extends UnitModel<IWorkbookData, UniverInstanceTyp
     private _snapshot;
     private _unitId;
     private _count;
+    private readonly _name$;
+    readonly name$: Observable<string>;
     get name(): string;
     constructor(workbookData: Partial<IWorkbookData> | undefined, _logService: ILogService);
     dispose(): void;

package/lib/types/slides/slide-model.d.ts

@@ -18,6 +18,6 @@ export declare class SlideDataModel extends UnitModel<ISlideData, UniverInstance
         [elementId: string]: import('../types/interfaces').IPageElement;
     } | undefined;
     getElement(pageId: string, elementId: string): import('../types/interfaces').IPageElement | undefined;
-    getPageSize(): import('..').ISize;
+    getPageSize(): import('../shared').ISize;
     addPage(): ISlidePage;
 }

package/lib/types/types/enum/index.d.ts

@@ -26,7 +26,7 @@ export * from './interpolation-point-type';
 export * from './locale-type';
 export * from './protection-type';
 export * from './relative-date';
-export * from './shape-type';
 export * from './sheet-types';
 export * from './text-style';
 export * from './theme-color-type';
+export * from './prst-geom-type';

package/lib/types/types/enum/prst-geom-type.d.ts

@@ -0,0 +1,118 @@
+/**
+ * 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 enum BasicShapes {
+    Line = "line",
+    LineInv = "lineInv",
+    Triangle = "triangle",
+    RtTriangle = "rtTriangle",
+    Rect = "rect",
+    Diamond = "diamond",
+    Parallelogram = "parallelogram",
+    Trapezoid = "trapezoid",
+    NonIsocelesTrapezoid = "nonIsocelesTrapezoid",
+    Pentagon = "pentagon",
+    Hexagon = "hexagon",
+    Heptagon = "heptagon",
+    Octagon = "octagon",
+    Decagon = "decagon",
+    Dodecagon = "dodecagon",
+    Star4 = "star4",
+    Star5 = "star5",
+    Star6 = "star6",
+    Star7 = "star7",
+    Star8 = "star8",
+    Star10 = "star10",
+    Star12 = "star12",
+    Star16 = "star16",
+    Star24 = "star24",
+    Star32 = "star32",
+    RoundRect = "roundRect",
+    Round1Rect = "round1Rect",
+    Round2SameRect = "round2SameRect",
+    Round2DiagRect = "round2DiagRect",
+    Ellipse = "ellipse"
+}
+export declare enum ArrowsAndMarkersShapes {
+    RightArrow = "rightArrow",
+    LeftArrow = "leftArrow",
+    UpArrow = "upArrow",
+    DownArrow = "downArrow",
+    LeftRightArrow = "leftRightArrow",
+    UpDownArrow = "upDownArrow",
+    QuadArrow = "quadArrow",
+    LeftRightUpArrow = "leftRightUpArrow",
+    BentArrow = "bentArrow",
+    UturnArrow = "uturnArrow",
+    CircularArrow = "circularArrow",
+    NotchedRightArrow = "notchedRightArrow",
+    HomePlate = "homePlate",
+    Chevron = "chevron",
+    LeftCircularArrow = "leftCircularArrow",
+    LeftRightCircularArrow = "leftRightCircularArrow"
+}
+export declare enum OtherShapes {
+    Plaque = "plaque",
+    Can = "can",
+    Cube = "cube",
+    Bevel = "bevel",
+    Donut = "donut",
+    NoSmoking = "noSmoking",
+    BlockArc = "blockArc",
+    FoldedCorner = "foldedCorner"
+}
+export declare enum SpecialShapes {
+    SmileyFace = "smileyFace",
+    Heart = "heart",
+    LightningBolt = "lightningBolt",
+    Sun = "sun",
+    Moon = "moon",
+    Cloud = "cloud",
+    Arc = "arc",
+    Backpack = "backpack",
+    Frame = "frame",
+    HalfFrame = "halfFrame",
+    Corner = "corner",
+    Chord = "chord",
+    Pie = "pie",
+    Teardrop = "teardrop",
+    WedgeRectCallout = "wedgeRectCallout",
+    WedgeRRectCallout = "wedgeRRectCallout",
+    WedgeEllipseCallout = "wedgeEllipseCallout",
+    CloudCallout = "cloudCallout",
+    BorderCallout1 = "borderCallout1",
+    BorderCallout2 = "borderCallout2",
+    BorderCallout3 = "borderCallout3",
+    AccentCallout1 = "accentCallout1",
+    AccentCallout2 = "accentCallout2",
+    AccentCallout3 = "accentCallout3",
+    Callout1 = "callout1",
+    Callout2 = "callout2",
+    Callout3 = "callout3",
+    ActionButtonBackPrevious = "actionButtonBackPrevious",
+    ActionButtonEnd = "actionButtonEnd",
+    ActionButtonForwardNext = "actionButtonForwardNext",
+    ActionButtonHelp = "actionButtonHelp",
+    ActionButtonHome = "actionButtonHome",
+    ActionButtonInformation = "actionButtonInformation",
+    ActionButtonMovie = "actionButtonMovie",
+    ActionButtonReturn = "actionButtonReturn",
+    ActionButtonSound = "actionButtonSound"
+}
+/**
+ * 20.1.9.18 prstGeom (Preset geometry)
+ */
+export type ShapeType = BasicShapes | ArrowsAndMarkersShapes | OtherShapes | SpecialShapes;
+export type PresetGeometryType = ShapeType | 'custom';

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

@@ -47,6 +47,7 @@ export interface ICellMarks {
     tr?: ICellMarksStyle;
     bl?: ICellMarksStyle;
     br?: ICellMarksStyle;
+    isSkip?: boolean;
 }
 export interface ICellDataForSheetInterceptor extends ICellData {
     interceptorStyle?: Nullable<IStyleData>;

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

@@ -6,4 +6,5 @@ export interface ICellValidationData {
     validStatus: DataValidationStatus;
     rule: IDataValidationRule;
     validator: any;
+    isSkip?: boolean;
 }

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

@@ -1,4 +1,5 @@
-import { ISize } from '../../services/floating-object/floating-object-interfaces';
+import { Nullable } from '../../common/type-util';
+import { IAbsoluteTransform, ISize } from '../../shared/shape';
 import { BooleanNumber, CellValueType, HorizontalAlign, LocaleType, TextDirection, VerticalAlign, WrapStrategy } from '../enum';
 import { IExtraModelData } from './i-extra-model-data';
 import { IColorStyle, IStyleBase } from './i-style-data';
@@ -28,6 +29,7 @@ export interface IReferenceSource {
     headers?: IHeaders;
     lists?: ILists;
     drawings?: IDrawings;
+    drawingsOrder?: string[];
 }
 export interface IDocumentSettings {
     zoomRatio?: number;
@@ -54,7 +56,7 @@ export interface ILists {
  * Set of Drawings
  */
 export interface IDrawings {
-    [objectId: string]: IDrawing;
+    [drawingId: string]: IDocDrawingBase;
 }
 /**
  * Set of IStyles
@@ -373,11 +375,11 @@ export interface IBullet {
  * 20.4.2.19 wrapTight (Tight Wrapping)
  * 20.4.2.20 wrapTopAndBottom (Top and Bottom Wrapping)
  */
-export interface IDrawing {
-    objectId: string;
+export interface IDocDrawingBase extends IDrawingParam {
+    drawingId: string;
     title: string;
     description: string;
-    objectTransform: IObjectTransform;
+    docTransform: IDocDrawingPosition;
     layoutType: PositionedObjectLayoutType;
     behindDoc?: BooleanNumber;
     start?: number[];
@@ -412,7 +414,7 @@ export declare enum PositionedObjectLayoutType {
 /**
  * Properties of a draw object
  */
-export interface IObjectTransform {
+export interface IDocDrawingPosition {
     size: ISize;
     positionH: IObjectPositionH;
     positionV: IObjectPositionV;
@@ -678,3 +680,51 @@ export declare enum PageOrientType {
     PORTRAIT = 0,
     LANDSCAPE = 1
 }
+/** @deprecated */
+export declare enum ArrangeTypeEnum {
+    forward = 0,
+    backward = 1,
+    front = 2,
+    back = 3
+}
+/** @deprecated */
+export declare enum DrawingTypeEnum {
+    UNRECOGNIZED = -1,
+    DRAWING_IMAGE = 0,
+    DRAWING_SHAPE = 1,
+    DRAWING_CHART = 2,
+    DRAWING_TABLE = 3,
+    DRAWING_SMART_ART = 4,
+    DRAWING_VIDEO = 5,
+    DRAWING_GROUP = 6,
+    DRAWING_UNIT = 7,
+    DRAWING_DOM = 8
+}
+/** @deprecated */
+export type DrawingType = DrawingTypeEnum | number;
+/** @deprecated */
+export interface IDrawingSpace {
+    unitId: string;
+    subUnitId: string;
+}
+/** @deprecated */
+export interface IDrawingSearch extends IDrawingSpace {
+    drawingId: string;
+}
+/** @deprecated */
+export interface IRotationSkewFlipTransform {
+    angle?: number;
+    skewX?: number;
+    skewY?: number;
+    flipX?: boolean;
+    flipY?: boolean;
+}
+/** @deprecated */
+export interface ITransformState extends IAbsoluteTransform, IRotationSkewFlipTransform {
+}
+/** @deprecated */
+export interface IDrawingParam extends IDrawingSearch {
+    drawingType: DrawingType;
+    transform?: Nullable<ITransformState>;
+    groupId?: string;
+}

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

@@ -1,8 +1,8 @@
-import { ISize, ITransformState } from '../../services/floating-object/floating-object-interfaces';
+import { ISize } from '../../shared/shape';
 import { IKeyType, Nullable } from '../../shared/types';
 import { LocaleType, ThemeColorType } from '../enum';
-import { ShapeType } from '../enum/shape-type';
-import { ICustomBlock, IDocumentData, ILists } from './i-document-data';
+import { ShapeType } from '../enum/prst-geom-type';
+import { ICustomBlock, IDocumentData, ILists, ITransformState } from './i-document-data';
 import { IExtraModelData } from './i-extra-model-data';
 import { IImageProperties } from './i-image-properties';
 import { IPlaceholder } from './i-placeholder';