@univerjs/engine-render 0.1.2 → 0.1.3

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

@@ -27,7 +27,14 @@ export interface IContext2D extends CanvasRenderingContext2D {
     backingStorePixelRatio: number;
 }
 export declare function getDevicePixelRatio(): number;
-export declare function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition): void;
+/**
+ *
+ * @param ctx canvas context
+ * @param type top bottom left right
+ * @param lineWidthBuffer Solving the problem of mitered corners in the drawing of borders thicker than 2 pixels, caused by the line segments being centered.
+ * @param position border draw position
+ */
+export declare function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, lineWidthBuffer: number, position: IPosition): void;
 export declare function drawDiagonalLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition): void;
 export declare function clearLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition): void;
 export declare function setLineType(ctx: UniverRenderingContext, style: BorderStyleTypes): void;

package/lib/types/basics/text-rotation.d.ts

@@ -15,7 +15,7 @@
  */
 import { type ITextRotation } from '@univerjs/core';
 export declare const VERTICAL_ROTATE_ANGLE = 90;
-export declare function convertTextRotation(textRotation: ITextRotation): {
+export declare function convertTextRotation(textRotation?: ITextRotation): {
     centerAngle: number;
     vertexAngle: number;
 };

package/lib/types/components/component.d.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { IDisposable } from '@wendellhu/redi';
 import { BaseObject } from '../base-object';
 import type { IViewportBound } from '../basics/vector2';
 import type { UniverRenderingContext } from '../context';
@@ -20,8 +21,7 @@ import type { ComponentExtension } from './extension';
 export declare class RenderComponent<T, U, V> extends BaseObject {
     private _extensions;
     get extensions(): Map<string, ComponentExtension<T, U, V>>;
-    register(...extensions: Array<ComponentExtension<T, U, V>>): void;
-    unRegister(...uKeys: string[]): void;
+    register(...extensions: Array<ComponentExtension<T, U, V>>): IDisposable;
     getExtensionsByOrder(): ComponentExtension<T, U, V>[];
     getExtensionByKey(uKey: string): ComponentExtension<T, U, V> | undefined;
     draw(ctx: UniverRenderingContext, bounds?: IViewportBound): void;

package/lib/types/components/docs/text-selection-render-manager.d.ts

@@ -111,8 +111,9 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _container;
     private _inputParent;
     private _input;
-    private _moveObserver;
-    private _upObserver;
+    private _moveObservers;
+    private _upObservers;
+    private _scrollTimers;
     private _viewportScrollX;
     private _viewportScrollY;
     private _rangeList;

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

@@ -18,4 +18,5 @@ export * from './docs';
 export * from './extension';
 export * from './sheets';
 export * from './skeleton';
+export { RENDER_RAW_FORMULA_KEY } from './sheets/sheet-skeleton';
 export * from './slides';

package/lib/types/components/sheets/extensions/font.d.ts

@@ -13,19 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IColorStyle, IRange, IScale } from '@univerjs/core';
-import { ObjectMatrix } from '@univerjs/core';
+import type { IRange, IScale } from '@univerjs/core';
 import type { UniverRenderingContext } from '../../../context';
 import { type SpreadsheetSkeleton } from '../sheet-skeleton';
-import type { Spreadsheet } from '../spreadsheet';
 import { SheetExtension } from './sheet-extension';
+export interface ISheetFontRenderExtension {
+    fontRenderExtension?: {
+        leftOffset?: number;
+        rightOffset?: number;
+        topOffset?: number;
+        downOffset?: number;
+        isSkip?: boolean;
+    };
+}
 export declare class Font extends SheetExtension {
     uKey: string;
     Z_INDEX: number;
-    changeFontColor: ObjectMatrix<IColorStyle>;
-    get spreadsheet(): Spreadsheet;
     getDocuments(): any;
-    setChangeFontColor(r: number, c: number, color: IColorStyle): void;
     draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges?: IRange[]): void;
     private _renderDocuments;
     private _clipRectangle;

package/lib/types/components/sheets/interfaces.d.ts

@@ -26,7 +26,8 @@ export interface BorderCacheItem {
 }
 export interface IFontCacheItem {
     documentSkeleton: DocumentSkeleton;
-    angle?: number;
+    vertexAngle?: number;
+    centerAngle?: number;
     verticalAlign: VerticalAlign;
     horizontalAlign: HorizontalAlign;
     wrapStrategy: WrapStrategy;

package/lib/types/components/sheets/sheet-skeleton.d.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICellData, IPaddingData, IRange, ISelectionCellWithCoord, ITextRotation, IWorksheetData, LocaleService, Nullable, Styles, Worksheet } from '@univerjs/core';
-import { BooleanNumber, DocumentDataModel, HorizontalAlign, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import type { ICellData, IPaddingData, IRange, ISelectionCellWithCoord, ITextRotation, IWorksheetData, Nullable, Styles, Worksheet } from '@univerjs/core';
+import { BooleanNumber, DocumentDataModel, HorizontalAlign, IContextService, LocaleService, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import type { IBoundRectNoAngle, IViewportBound } from '../../basics/vector2';
 import { DocumentSkeleton } from '../docs/doc-skeleton';
 import { Skeleton } from '../skeleton';
@@ -48,14 +48,16 @@ export interface IDocumentLayoutObject {
     paddingData: IPaddingData;
     fill?: Nullable<string>;
 }
+export declare const RENDER_RAW_FORMULA_KEY = "RENDER_RAW_FORMULA";
 export declare class SpreadsheetSkeleton extends Skeleton {
     private _worksheet;
     private _config;
     private _cellData;
     private _styles;
+    private readonly _contextService;
     private _rowHeightAccumulation;
-    private _rowTotalHeight;
     private _columnWidthAccumulation;
+    private _rowTotalHeight;
     private _columnTotalWidth;
     private _rowHeaderWidth;
     private _columnHeaderHeight;
@@ -63,11 +65,13 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _dataMergeCache;
     private _overflowCache;
     private _stylesCache;
+    /** A matrix to store if a (row, column) position has render cache. */
     private _renderedCellCache;
     private _showGridlines;
     private _marginTop;
     private _marginLeft;
-    constructor(_worksheet: Worksheet | undefined, _config: IWorksheetData, _cellData: ObjectMatrix<Nullable<ICellData>>, _styles: Styles, _localeService: LocaleService);
+    private _renderRawFormula;
+    constructor(_worksheet: Worksheet | undefined, _config: IWorksheetData, _cellData: ObjectMatrix<Nullable<ICellData>>, _styles: Styles, _localeService: LocaleService, _contextService: IContextService);
     get rowHeightAccumulation(): number[];
     get rowTotalHeight(): number;
     get columnWidthAccumulation(): number[];
@@ -82,14 +86,11 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     get mergeData(): IRange[];
     get rowHeaderWidthAndMarginLeft(): number;
     get columnHeaderHeightAndMarginTop(): number;
+    get worksheet(): Worksheet | undefined;
     /**
      * @deprecated
      */
-    static create(worksheet: Worksheet | undefined, config: IWorksheetData, cellData: ObjectMatrix<Nullable<ICellData>>, styles: Styles, LocaleService: LocaleService): SpreadsheetSkeleton;
-    /**
-     * @deprecated should never expose a property that is provided by another module!
-     */
-    getWorksheetConfig(): IWorksheetData;
+    static create(worksheet: Worksheet | undefined, config: IWorksheetData, cellData: ObjectMatrix<Nullable<ICellData>>, styles: Styles, localeService: LocaleService, contextService: IContextService): SpreadsheetSkeleton;
     /**
      * @deprecated should never expose a property that is provided by another module!
      */
@@ -98,6 +99,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @deprecated should never expose a property that is provided by another module!
      */
     getsStyles(): Styles;
+    private _initContextListener;
     setOverflowCache(value: ObjectMatrix<IRange>): void;
     setMarginLeft(left: number): void;
     setMarginTop(top: number): void;
@@ -106,7 +108,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     calculate(bounds?: IViewportBound): this;
     calculateAutoHeightInRange(ranges: Nullable<IRange[]>): IRowAutoHeightInfo[];
     private _calculateRowAutoHeight;
-    updateLayout(): this | undefined;
+    private _updateLayout;
     private _dynamicallyUpdateRowHeaderWidth;
     getRowColumnSegment(bounds?: IViewportBound): {
         startRow: number;
@@ -114,6 +116,11 @@ export declare class SpreadsheetSkeleton extends Skeleton {
         startColumn: number;
         endColumn: number;
     };
+    /**
+     * @deprecated should never expose a property that is provided by another module!
+     * @returns
+     */
+    getWorksheetConfig(): IWorksheetData;
     getRowColumnSegmentByViewBound(bound?: IBoundRectNoAngle): {
         startRow: number;
         endRow: number;
@@ -295,6 +302,11 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _setCellCache;
     private _updateConfigAndGetDocumentModel;
     private _getDocumentDataByStyle;
+    /**
+     * pro/issues/344
+     * In Excel, for the border rendering of merged cells to take effect, the outermost cells need to have the same border style.
+     */
+    private _setMergeBorderProps;
     private _setBorderProps;
     private _getFontFormat;
     private _getOtherStyle;

package/lib/types/context.d.ts

@@ -39,7 +39,7 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
     set lineJoin(val: CanvasLineJoin);
     get lineWidth(): number;
     set lineWidth(val: number);
-    setLineWidthNative(val: number): void;
+    setLineWidthByPrecision(val: number): void;
     get miterLimit(): number;
     set miterLimit(val: number);
     get shadowBlur(): number;
@@ -56,16 +56,31 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
     set font(val: string);
     get fontKerning(): CanvasFontKerning;
     set fontKerning(val: CanvasFontKerning);
+    get fontStretch(): CanvasFontStretch;
+    set fontStretch(val: CanvasFontStretch);
+    get fontVariantCaps(): CanvasFontVariantCaps;
+    set fontVariantCaps(val: CanvasFontVariantCaps);
+    get letterSpacing(): string;
+    set letterSpacing(val: string);
+    get textRendering(): CanvasTextRendering;
+    set textRendering(val: CanvasTextRendering);
+    get wordSpacing(): string;
+    set wordSpacing(val: string);
     get textAlign(): CanvasTextAlign;
     set textAlign(val: CanvasTextAlign);
     get textBaseline(): CanvasTextBaseline;
     set textBaseline(val: CanvasTextBaseline);
     private _getScale;
+    getScale(): {
+        scaleX: number;
+        scaleY: number;
+    };
     getContextAttributes(): CanvasRenderingContext2DSettings;
     isPointInStroke(x: number, y: number): boolean;
     isPointInStroke(path: Path2D, x: number, y: number): boolean;
     createConicGradient(startAngle: number, x: number, y: number): CanvasGradient;
     roundRect(x: number, y: number, w: number, h: number, radii?: number | DOMPointInit | Array<number | DOMPointInit>): void;
+    roundRectByPrecision(x: number, y: number, w: number, h: number, radii?: number | DOMPointInit | Array<number | DOMPointInit>): void;
     getTransform(): DOMMatrix;
     resetTransform(): void;
     drawFocusIfNeeded(element: Element): void;
@@ -80,12 +95,23 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
      * @method
      */
     arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterClockwise?: boolean): void;
+    /**
+     * arc function.
+     * @method
+     */
+    arcByPrecision(x: number, y: number, radius: number, startAngle: number, endAngle: number, counterClockwise?: boolean): void;
     /**
      * arcTo function.
      * @method
      *
      */
     arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    /**
+     * arcTo function.
+     * @method
+     *
+     */
+    arcToByPrecision(x1: number, y1: number, x2: number, y2: number, radius: number): void;
     /**
      * beginPath function.
      * @method
@@ -96,11 +122,21 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
      * @method
      */
     bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    /**
+     * bezierCurveTo function precision.
+     * @method
+     */
+    bezierCurveToByPrecision(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
     /**
      * clearRect function.
      * @method
      */
     clearRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * clearRect function.
+     * @method
+     */
+    clearRectByPrecision(x: number, y: number, width: number, height: number): void;
     /**
      * clip function.
      * @method
@@ -162,11 +198,21 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
      * @method
      */
     fillRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * fillRect function precision.
+     * @method
+     */
+    fillRectByPrecision(x: number, y: number, width: number, height: number): void;
     /**
      * strokeRect function.
      * @method
      */
     strokeRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * strokeRect function precision.
+     * @method
+     */
+    strokeRectPrecision(x: number, y: number, width: number, height: number): void;
     /**
      * fillText function.
      * @method
@@ -192,16 +238,31 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
      * @method
      */
     lineTo(x: number, y: number): void;
+    /**
+     * lineTo function precision.
+     * @method
+     */
+    lineToByPrecision(x: number, y: number): void;
     /**
      * moveTo function.
      * @method
      */
     moveTo(x: number, y: number): void;
+    /**
+     * moveTo function precision.
+     * @method
+     */
+    moveToByPrecision(x: number, y: number): void;
     /**
      * rect function.
      * @method
      */
     rect(x: number, y: number, width: number, height: number): void;
+    /**
+     * rect function.
+     * @method
+     */
+    rectByPrecision(x: number, y: number, width: number, height: number): void;
     /**
      * putImageData function.
      * @method
@@ -258,6 +319,11 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
      * @method
      */
     strokeText(text: string, x: number, y: number, maxWidth?: number): void;
+    /**
+     * strokeText function precision.
+     * @method
+     */
+    strokeTextByPrecision(text: string, x: number, y: number, maxWidth?: number): void;
     /**
      * transform function.
      * @method

package/lib/types/scene.d.ts

@@ -21,8 +21,8 @@ import type { ISceneTransformState } from './basics/interfaces';
 import { Vector2 } from './basics/vector2';
 import type { UniverRenderingContext } from './context';
 import { Layer } from './layer';
-import type { ITransformerConfig } from './scene.-transformer';
-import { Transformer } from './scene.-transformer';
+import type { ITransformerConfig } from './scene.transformer';
+import { Transformer } from './scene.transformer';
 import type { SceneViewer } from './scene-viewer';
 import type { ThinEngine } from './thin-engine';
 import { ThinScene } from './thin-scene';