@univerjs/engine-render 0.23.0 → 0.24.0

package/lib/cjs/index.js

@@ -4715,8 +4715,9 @@ var SpreadsheetColumnHeader = class extends SpreadsheetHeader {
 		const segment = spreadsheetSkeleton.rowColumnSegment;
 		if (!segment) return;
 		if (segment.startColumn === -1 && segment.endColumn === -1) return;
-		const { rowHeaderWidth } = spreadsheetSkeleton;
-		ctx.translateWithPrecision(rowHeaderWidth, 0);
+		const { columnHeaderHeight, columnHeaderHeightAndMarginTop, rowHeaderWidthAndMarginLeft } = spreadsheetSkeleton;
+		const marginTop = columnHeaderHeightAndMarginTop - columnHeaderHeight;
+		ctx.translateWithPrecision(rowHeaderWidthAndMarginLeft, marginTop);
 		const extensions = this.getExtensionsByOrder();
 		for (const extension of extensions) extension.draw(ctx, parentScale, spreadsheetSkeleton);
 	}
@@ -4724,8 +4725,9 @@ var SpreadsheetColumnHeader = class extends SpreadsheetHeader {
 		const oCoord = this.getInverseCoord(coord);
 		const skeleton = this.getSkeleton();
 		if (!skeleton) return false;
-		const { rowHeaderWidth, columnHeaderHeight } = skeleton;
-		if (oCoord.x > rowHeaderWidth && oCoord.y >= 0 && oCoord.y <= columnHeaderHeight) return true;
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeight, columnHeaderHeightAndMarginTop } = skeleton;
+		const marginTop = columnHeaderHeightAndMarginTop - columnHeaderHeight;
+		if (oCoord.x > rowHeaderWidthAndMarginLeft && oCoord.y >= marginTop && oCoord.y <= columnHeaderHeightAndMarginTop) return true;
 		return false;
 	}
 	_initialDefaultExtension() {
@@ -18974,8 +18976,9 @@ var SpreadsheetRowHeader = class extends SpreadsheetHeader {
 		const segment = spreadsheetSkeleton.rowColumnSegment;
 		if (!segment) return;
 		if (segment.startRow === -1 && segment.endRow === -1) return;
-		const { columnHeaderHeight } = spreadsheetSkeleton;
-		ctx.translateWithPrecision(0, columnHeaderHeight);
+		const { columnHeaderHeightAndMarginTop, rowHeaderWidth, rowHeaderWidthAndMarginLeft } = spreadsheetSkeleton;
+		const marginLeft = rowHeaderWidthAndMarginLeft - rowHeaderWidth;
+		ctx.translateWithPrecision(marginLeft, columnHeaderHeightAndMarginTop);
 		const extensions = this.getExtensionsByOrder();
 		for (const extension of extensions) extension.draw(ctx, parentScale, spreadsheetSkeleton);
 	}
@@ -18983,8 +18986,9 @@ var SpreadsheetRowHeader = class extends SpreadsheetHeader {
 		const oCoord = this.getInverseCoord(coord);
 		const skeleton = this.getSkeleton();
 		if (!skeleton) return false;
-		const { rowHeaderWidth, columnHeaderHeight } = skeleton;
-		if (oCoord.x >= 0 && oCoord.x <= rowHeaderWidth && oCoord.y > columnHeaderHeight) return true;
+		const { rowHeaderWidth, rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
+		const marginLeft = rowHeaderWidthAndMarginLeft - rowHeaderWidth;
+		if (oCoord.x >= marginLeft && oCoord.x <= rowHeaderWidthAndMarginLeft && oCoord.y > columnHeaderHeightAndMarginTop) return true;
 		return false;
 	}
 	_initialDefaultExtension() {
@@ -22144,8 +22148,8 @@ var Spreadsheet = class extends SheetComponent {
 		const oCoord = this.getInverseCoord(coord);
 		const skeleton = this.getSkeleton();
 		if (!skeleton) return false;
-		const { rowHeaderWidth, columnHeaderHeight } = skeleton;
-		if (oCoord.x > rowHeaderWidth && oCoord.y > columnHeaderHeight) return true;
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
+		if (oCoord.x > rowHeaderWidthAndMarginLeft && oCoord.y > columnHeaderHeightAndMarginTop) return true;
 		return false;
 	}
 	getNoMergeCellPositionByIndex(rowIndex, columnIndex) {
@@ -22213,7 +22217,7 @@ var Spreadsheet = class extends SheetComponent {
 	}
 	renderByViewports(mainCtx, viewportInfo, spreadsheetSkeleton) {
 		const { diffBounds, diffX, diffY, viewPortPosition, cacheCanvas, leftOrigin, topOrigin, bufferEdgeX, bufferEdgeY, isDirty: isViewportDirty, isForceDirty: isViewportForceDirty } = viewportInfo;
-		const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = spreadsheetSkeleton;
 		const { a: scaleX = 1, d: scaleY = 1 } = mainCtx.getTransform();
 		const bufferEdgeSizeX = bufferEdgeX * scaleX / window.devicePixelRatio;
 		const bufferEdgeSizeY = bufferEdgeY * scaleY / window.devicePixelRatio;
@@ -22246,20 +22250,20 @@ var Spreadsheet = class extends SheetComponent {
 				bufferEdgeY,
 				scaleX,
 				scaleY,
-				columnHeaderHeight,
-				rowHeaderWidth
+				columnHeaderHeightAndMarginTop,
+				rowHeaderWidthAndMarginLeft
 			});
 		}
 		const sourceLeft = bufferEdgeSizeX * Math.min(1, window.devicePixelRatio);
 		const sourceTop = bufferEdgeSizeY * Math.min(1, window.devicePixelRatio);
 		const { left, top, right, bottom } = viewPortPosition;
-		const dw = right - left + rowHeaderWidth;
-		const dh = bottom - top + columnHeaderHeight;
+		const dw = right - left + rowHeaderWidthAndMarginLeft;
+		const dh = bottom - top + columnHeaderHeightAndMarginTop;
 		this._applyCache(cacheCanvas, mainCtx, sourceLeft, sourceTop, dw, dh, left, top, dw, dh);
 		cacheCtx.restore();
 	}
 	paintNewAreaForScrolling(viewportInfo, param) {
-		const { cacheCanvas, cacheCtx, mainCtx, topOrigin, leftOrigin, bufferEdgeX, bufferEdgeY, scaleX, scaleY, columnHeaderHeight, rowHeaderWidth } = param;
+		const { cacheCanvas, cacheCtx, mainCtx, topOrigin, leftOrigin, bufferEdgeX, bufferEdgeY, scaleX, scaleY, columnHeaderHeightAndMarginTop, rowHeaderWidthAndMarginLeft } = param;
 		const { shouldCacheUpdate, diffCacheBounds, diffX, diffY } = viewportInfo;
 		cacheCtx.save();
 		cacheCtx.setTransform(1, 0, 0, 1, 0, 0);
@@ -22272,8 +22276,8 @@ var Spreadsheet = class extends SheetComponent {
 		cacheCtx.translateWithPrecision(m.e / m.a - leftOrigin + bufferEdgeX, m.f / m.d - topOrigin + bufferEdgeY);
 		if (shouldCacheUpdate) for (const diffBound of diffCacheBounds) {
 			const { left: diffLeft, right: diffRight, bottom: diffBottom, top: diffTop } = diffBound;
-			const x = diffLeft - rowHeaderWidth;
-			const y = diffTop - columnHeaderHeight;
+			const x = diffLeft - rowHeaderWidthAndMarginLeft;
+			const y = diffTop - columnHeaderHeightAndMarginTop;
 			const w = diffRight - diffLeft;
 			const h = diffBottom - diffTop;
 			cacheCtx.clearRectByPrecision(x, y, w, h);
@@ -22319,9 +22323,9 @@ var Spreadsheet = class extends SheetComponent {
 		if (!segment) return;
 		if (segment.startRow === -1 && segment.endRow === -1 || segment.startColumn === -1 && segment.endColumn === -1) return;
 		mainCtx.save();
-		const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;
-		mainCtx.translateWithPrecision(rowHeaderWidth, columnHeaderHeight);
-		(_this$getScene = this.getScene()) === null || _this$getScene === void 0 || _this$getScene.updateTransformerZero(spreadsheetSkeleton.rowHeaderWidth, spreadsheetSkeleton.columnHeaderHeight);
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = spreadsheetSkeleton;
+		mainCtx.translateWithPrecision(rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop);
+		(_this$getScene = this.getScene()) === null || _this$getScene === void 0 || _this$getScene.updateTransformerZero(rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop);
 		const { viewportKey } = viewportInfo;
 		if (sheetContentViewportKeys.includes(viewportKey)) if (viewportInfo && viewportInfo.cacheCanvas) this.renderByViewports(mainCtx, viewportInfo, spreadsheetSkeleton);
 		else this._draw(mainCtx, viewportInfo);
@@ -24458,14 +24462,13 @@ let Engine = class Engine extends _univerjs_core.Disposable {
 	}
 	_getPassive() {
 		let passiveSupported = false;
-		const noop = () => {};
 		try {
 			const options = { passive: { get() {
 				passiveSupported = true;
 			} } };
 			const canvasEle = this.getCanvasElement();
-			canvasEle.addEventListener("test", noop, options);
-			canvasEle.removeEventListener("test", noop, options);
+			canvasEle.addEventListener("test", _univerjs_core.noop, options);
+			canvasEle.removeEventListener("test", _univerjs_core.noop, options);
 		} catch (e) {}
 		return passiveSupported;
 	}
@@ -24492,7 +24495,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "0.23.0";
+var version = "0.24.0";
 
 //#endregion
 //#region src/config/config.ts

package/lib/es/index.js

@@ -1,5 +1,5 @@
 import { t as EnUs } from "./en-us-ClVoWMyT.js";
-import { AlignTypeH, AlignTypeV, BaselineOffset, BooleanNumber, BorderStyleTypes, BulletAlignment, COLORS, CellValueType, ColorKit, ColumnSeparatorType, CustomDecorationType, CustomRangeType, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DataStreamTreeNodeType, DataStreamTreeTokenType, Disposable, DisposableCollection, DocumentDataModel, DocumentFlavor, EventSubject, FontStyleType, GridType, HorizontalAlign, IConfigService, IContextService, IUniverInstanceService, Inject, Injector, ListGlyphType, LocaleService, MOVE_BUFFER_VALUE, NAMED_STYLE_MAP, NAMED_STYLE_SPACE_MAP, NumberUnitType, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRESET_LIST_TYPE, PageOrientType, Plugin, PositionedObjectLayoutType, Range, Rectangle, Registry, SectionType, SheetSkeleton, Skeleton, SpacingRule, TableAlignmentType, TableRowHeightRule, TableTextWrapType, TextDecoration, ThemeService, Tools, UniverInstanceType, VerticalAlign, VerticalAlignmentType, WrapStrategy, WrapTextType, addLinkToDocumentModel, checkParagraphHasIndentByStyle, createIdentifier, deleteContent, extractPureTextFromCell, getCellInfoInMergeData, getColorStyle, getDisplayValueFromCell, horizontalLineSegmentsSubtraction, insertTextToContent, invertColorByMatrix, isClassDependencyItem, isNullCell, isWhiteColor, merge, mergeWith, numberToABC, numberToListABC, registerDependencies, remove, requestImmediateMacroTask, searchArray, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
+import { AlignTypeH, AlignTypeV, BaselineOffset, BooleanNumber, BorderStyleTypes, BulletAlignment, COLORS, CellValueType, ColorKit, ColumnSeparatorType, CustomDecorationType, CustomRangeType, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DataStreamTreeNodeType, DataStreamTreeTokenType, Disposable, DisposableCollection, DocumentDataModel, DocumentFlavor, EventSubject, FontStyleType, GridType, HorizontalAlign, IConfigService, IContextService, IUniverInstanceService, Inject, Injector, ListGlyphType, LocaleService, MOVE_BUFFER_VALUE, NAMED_STYLE_MAP, NAMED_STYLE_SPACE_MAP, NumberUnitType, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PRESET_LIST_TYPE, PageOrientType, Plugin, PositionedObjectLayoutType, Range, Rectangle, Registry, SectionType, SheetSkeleton, Skeleton, SpacingRule, TableAlignmentType, TableRowHeightRule, TableTextWrapType, TextDecoration, ThemeService, Tools, UniverInstanceType, VerticalAlign, VerticalAlignmentType, WrapStrategy, WrapTextType, addLinkToDocumentModel, checkParagraphHasIndentByStyle, createIdentifier, deleteContent, extractPureTextFromCell, getCellInfoInMergeData, getColorStyle, getDisplayValueFromCell, horizontalLineSegmentsSubtraction, insertTextToContent, invertColorByMatrix, isClassDependencyItem, isNullCell, isWhiteColor, merge, mergeWith, noop, numberToABC, numberToListABC, registerDependencies, remove, requestImmediateMacroTask, searchArray, sortRules, sortRulesByDesc, toDisposable } from "@univerjs/core";
 import * as cjk from "cjk-regex";
 import { BehaviorSubject, Observable, Subject, Subscription, debounceTime, distinctUntilChanged, shareReplay, startWith } from "rxjs";
 import { parse } from "opentype.js";
@@ -4686,8 +4686,9 @@ var SpreadsheetColumnHeader = class extends SpreadsheetHeader {
 		const segment = spreadsheetSkeleton.rowColumnSegment;
 		if (!segment) return;
 		if (segment.startColumn === -1 && segment.endColumn === -1) return;
-		const { rowHeaderWidth } = spreadsheetSkeleton;
-		ctx.translateWithPrecision(rowHeaderWidth, 0);
+		const { columnHeaderHeight, columnHeaderHeightAndMarginTop, rowHeaderWidthAndMarginLeft } = spreadsheetSkeleton;
+		const marginTop = columnHeaderHeightAndMarginTop - columnHeaderHeight;
+		ctx.translateWithPrecision(rowHeaderWidthAndMarginLeft, marginTop);
 		const extensions = this.getExtensionsByOrder();
 		for (const extension of extensions) extension.draw(ctx, parentScale, spreadsheetSkeleton);
 	}
@@ -4695,8 +4696,9 @@ var SpreadsheetColumnHeader = class extends SpreadsheetHeader {
 		const oCoord = this.getInverseCoord(coord);
 		const skeleton = this.getSkeleton();
 		if (!skeleton) return false;
-		const { rowHeaderWidth, columnHeaderHeight } = skeleton;
-		if (oCoord.x > rowHeaderWidth && oCoord.y >= 0 && oCoord.y <= columnHeaderHeight) return true;
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeight, columnHeaderHeightAndMarginTop } = skeleton;
+		const marginTop = columnHeaderHeightAndMarginTop - columnHeaderHeight;
+		if (oCoord.x > rowHeaderWidthAndMarginLeft && oCoord.y >= marginTop && oCoord.y <= columnHeaderHeightAndMarginTop) return true;
 		return false;
 	}
 	_initialDefaultExtension() {
@@ -18945,8 +18947,9 @@ var SpreadsheetRowHeader = class extends SpreadsheetHeader {
 		const segment = spreadsheetSkeleton.rowColumnSegment;
 		if (!segment) return;
 		if (segment.startRow === -1 && segment.endRow === -1) return;
-		const { columnHeaderHeight } = spreadsheetSkeleton;
-		ctx.translateWithPrecision(0, columnHeaderHeight);
+		const { columnHeaderHeightAndMarginTop, rowHeaderWidth, rowHeaderWidthAndMarginLeft } = spreadsheetSkeleton;
+		const marginLeft = rowHeaderWidthAndMarginLeft - rowHeaderWidth;
+		ctx.translateWithPrecision(marginLeft, columnHeaderHeightAndMarginTop);
 		const extensions = this.getExtensionsByOrder();
 		for (const extension of extensions) extension.draw(ctx, parentScale, spreadsheetSkeleton);
 	}
@@ -18954,8 +18957,9 @@ var SpreadsheetRowHeader = class extends SpreadsheetHeader {
 		const oCoord = this.getInverseCoord(coord);
 		const skeleton = this.getSkeleton();
 		if (!skeleton) return false;
-		const { rowHeaderWidth, columnHeaderHeight } = skeleton;
-		if (oCoord.x >= 0 && oCoord.x <= rowHeaderWidth && oCoord.y > columnHeaderHeight) return true;
+		const { rowHeaderWidth, rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
+		const marginLeft = rowHeaderWidthAndMarginLeft - rowHeaderWidth;
+		if (oCoord.x >= marginLeft && oCoord.x <= rowHeaderWidthAndMarginLeft && oCoord.y > columnHeaderHeightAndMarginTop) return true;
 		return false;
 	}
 	_initialDefaultExtension() {
@@ -22115,8 +22119,8 @@ var Spreadsheet = class extends SheetComponent {
 		const oCoord = this.getInverseCoord(coord);
 		const skeleton = this.getSkeleton();
 		if (!skeleton) return false;
-		const { rowHeaderWidth, columnHeaderHeight } = skeleton;
-		if (oCoord.x > rowHeaderWidth && oCoord.y > columnHeaderHeight) return true;
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
+		if (oCoord.x > rowHeaderWidthAndMarginLeft && oCoord.y > columnHeaderHeightAndMarginTop) return true;
 		return false;
 	}
 	getNoMergeCellPositionByIndex(rowIndex, columnIndex) {
@@ -22184,7 +22188,7 @@ var Spreadsheet = class extends SheetComponent {
 	}
 	renderByViewports(mainCtx, viewportInfo, spreadsheetSkeleton) {
 		const { diffBounds, diffX, diffY, viewPortPosition, cacheCanvas, leftOrigin, topOrigin, bufferEdgeX, bufferEdgeY, isDirty: isViewportDirty, isForceDirty: isViewportForceDirty } = viewportInfo;
-		const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = spreadsheetSkeleton;
 		const { a: scaleX = 1, d: scaleY = 1 } = mainCtx.getTransform();
 		const bufferEdgeSizeX = bufferEdgeX * scaleX / window.devicePixelRatio;
 		const bufferEdgeSizeY = bufferEdgeY * scaleY / window.devicePixelRatio;
@@ -22217,20 +22221,20 @@ var Spreadsheet = class extends SheetComponent {
 				bufferEdgeY,
 				scaleX,
 				scaleY,
-				columnHeaderHeight,
-				rowHeaderWidth
+				columnHeaderHeightAndMarginTop,
+				rowHeaderWidthAndMarginLeft
 			});
 		}
 		const sourceLeft = bufferEdgeSizeX * Math.min(1, window.devicePixelRatio);
 		const sourceTop = bufferEdgeSizeY * Math.min(1, window.devicePixelRatio);
 		const { left, top, right, bottom } = viewPortPosition;
-		const dw = right - left + rowHeaderWidth;
-		const dh = bottom - top + columnHeaderHeight;
+		const dw = right - left + rowHeaderWidthAndMarginLeft;
+		const dh = bottom - top + columnHeaderHeightAndMarginTop;
 		this._applyCache(cacheCanvas, mainCtx, sourceLeft, sourceTop, dw, dh, left, top, dw, dh);
 		cacheCtx.restore();
 	}
 	paintNewAreaForScrolling(viewportInfo, param) {
-		const { cacheCanvas, cacheCtx, mainCtx, topOrigin, leftOrigin, bufferEdgeX, bufferEdgeY, scaleX, scaleY, columnHeaderHeight, rowHeaderWidth } = param;
+		const { cacheCanvas, cacheCtx, mainCtx, topOrigin, leftOrigin, bufferEdgeX, bufferEdgeY, scaleX, scaleY, columnHeaderHeightAndMarginTop, rowHeaderWidthAndMarginLeft } = param;
 		const { shouldCacheUpdate, diffCacheBounds, diffX, diffY } = viewportInfo;
 		cacheCtx.save();
 		cacheCtx.setTransform(1, 0, 0, 1, 0, 0);
@@ -22243,8 +22247,8 @@ var Spreadsheet = class extends SheetComponent {
 		cacheCtx.translateWithPrecision(m.e / m.a - leftOrigin + bufferEdgeX, m.f / m.d - topOrigin + bufferEdgeY);
 		if (shouldCacheUpdate) for (const diffBound of diffCacheBounds) {
 			const { left: diffLeft, right: diffRight, bottom: diffBottom, top: diffTop } = diffBound;
-			const x = diffLeft - rowHeaderWidth;
-			const y = diffTop - columnHeaderHeight;
+			const x = diffLeft - rowHeaderWidthAndMarginLeft;
+			const y = diffTop - columnHeaderHeightAndMarginTop;
 			const w = diffRight - diffLeft;
 			const h = diffBottom - diffTop;
 			cacheCtx.clearRectByPrecision(x, y, w, h);
@@ -22290,9 +22294,9 @@ var Spreadsheet = class extends SheetComponent {
 		if (!segment) return;
 		if (segment.startRow === -1 && segment.endRow === -1 || segment.startColumn === -1 && segment.endColumn === -1) return;
 		mainCtx.save();
-		const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;
-		mainCtx.translateWithPrecision(rowHeaderWidth, columnHeaderHeight);
-		(_this$getScene = this.getScene()) === null || _this$getScene === void 0 || _this$getScene.updateTransformerZero(spreadsheetSkeleton.rowHeaderWidth, spreadsheetSkeleton.columnHeaderHeight);
+		const { rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = spreadsheetSkeleton;
+		mainCtx.translateWithPrecision(rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop);
+		(_this$getScene = this.getScene()) === null || _this$getScene === void 0 || _this$getScene.updateTransformerZero(rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop);
 		const { viewportKey } = viewportInfo;
 		if (sheetContentViewportKeys.includes(viewportKey)) if (viewportInfo && viewportInfo.cacheCanvas) this.renderByViewports(mainCtx, viewportInfo, spreadsheetSkeleton);
 		else this._draw(mainCtx, viewportInfo);
@@ -24429,7 +24433,6 @@ let Engine = class Engine extends Disposable {
 	}
 	_getPassive() {
 		let passiveSupported = false;
-		const noop = () => {};
 		try {
 			const options = { passive: { get() {
 				passiveSupported = true;
@@ -24463,7 +24466,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-render";
-var version = "0.23.0";
+var version = "0.24.0";
 
 //#endregion
 //#region src/config/config.ts

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

@@ -80,8 +80,8 @@ export interface IPaintForScrolling {
     leftOrigin: number;
     bufferEdgeX: number;
     bufferEdgeY: number;
-    rowHeaderWidth: number;
-    columnHeaderHeight: number;
+    rowHeaderWidthAndMarginLeft: number;
+    columnHeaderHeightAndMarginTop: number;
     scaleX: number;
     scaleY: number;
 }