Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheet): editor and selection position (#1830)
Univere23992fcb0d8
diff --git a/packages/engine-render/src/shape/shape.ts b/packages/engine-render/src/shape/shape.tsindex 6558c8a93e..27feac1fa9 100644--- a/packages/engine-render/src/shape/shape.ts+++ b/packages/engine-render/src/shape/shape.ts@@ -271,7 +271,8 @@ export abstract class Shape<T> extends BaseObject {private static _renderStroke(ctx: UniverRenderingContext, props: IShapeProps) {const { stroke, strokeWidth, shadowEnabled, shadowForStrokeEnabled, strokeScaleEnabled, parent } = props;- let { scaleX, scaleY } = props;+ // let { scaleX, scaleY } = props;+ let { scaleX, scaleY } = ctx.getScale();if (!stroke || strokeWidth === 0) {return;}@@ -281,10 +282,7 @@ export abstract class Shape<T> extends BaseObject {}ctx.save();- if (strokeScaleEnabled && parent) {- const scaling = this._getObjectScaling();- ctx.scale(1 / scaling.scaleX, 1 / scaling.scaleY);- } else if (strokeScaleEnabled) {+ if (strokeScaleEnabled === false) {scaleX = scaleX ?? 1;scaleY = scaleY ?? 1;ctx.scale(1 / scaleX, 1 / scaleY);diff --git a/packages/sheets-ui/src/services/editor-bridge.service.ts b/packages/sheets-ui/src/services/editor-bridge.service.tsindex 1e37978278..2e78c3f964 100644--- a/packages/sheets-ui/src/services/editor-bridge.service.ts+++ b/packages/sheets-ui/src/services/editor-bridge.service.ts@@ -26,7 +26,7 @@ import {toDisposable,} from '@univerjs/core';import type { Engine, IDocumentLayoutObject, Scene } from '@univerjs/engine-render';-import { convertTextRotation, DeviceInputEventType, fixLineWidthByScale, getCanvasOffsetByEngine } from '@univerjs/engine-render';+import { convertTextRotation, DeviceInputEventType, getCanvasOffsetByEngine } from '@univerjs/engine-render';import type { ISheetLocation } from '@univerjs/sheets';import { IEditorService } from '@univerjs/ui';import type { KeyCode } from '@univerjs/ui';@@ -222,10 +222,10 @@ export class EditorBridgeService extends Disposable implements IEditorBridgeServconst { scaleX: precisionScaleX, scaleY: precisionScaleY } = scene.getPrecisionScale();const scrollXY = scene.getScrollXY(this._selectionRenderService.getViewPort());- startX = fixLineWidthByScale(skeleton.convertTransformToOffsetX(startX, scaleX, scrollXY), precisionScaleX);- startY = fixLineWidthByScale(skeleton.convertTransformToOffsetY(startY, scaleY, scrollXY), precisionScaleY);- endX = fixLineWidthByScale(skeleton.convertTransformToOffsetX(endX, scaleX, scrollXY), precisionScaleX);- endY = fixLineWidthByScale(skeleton.convertTransformToOffsetY(endY, scaleY, scrollXY), precisionScaleY);+ startX = skeleton.convertTransformToOffsetX(startX, scaleX, scrollXY);+ startY = skeleton.convertTransformToOffsetY(startY, scaleY, scrollXY);+ endX = skeleton.convertTransformToOffsetX(endX, scaleX, scrollXY);+ endY = skeleton.convertTransformToOffsetY(endY, scaleY, scrollXY);const workbook = this._currentUniverService.getCurrentUniverSheetInstance();const worksheet = workbook.getActiveSheet();diff --git a/packages/sheets-ui/src/services/selection/selection-shape.ts b/packages/sheets-ui/src/services/selection/selection-shape.tsindex 4c5435d850..e14549c026 100644--- a/packages/sheets-ui/src/services/selection/selection-shape.ts+++ b/packages/sheets-ui/src/services/selection/selection-shape.ts@@ -513,8 +513,8 @@ export class SelectionShape extends Disposable {this.fillControl.transformByState({width: AutofillSize - AutofillStrokeWidth,height: AutofillSize - AutofillStrokeWidth,- left: endX - startX - AutofillSize / 2 + AutofillStrokeWidth / 2,- top: endY - startY - AutofillSize / 2 + AutofillStrokeWidth / 2,+ left: endX - startX - AutofillSize / 2 + AutofillStrokeWidth / 2 - fixOnePixelBlurOffset,+ top: endY - startY - AutofillSize / 2 + AutofillStrokeWidth / 2 - fixOnePixelBlurOffset,strokeWidth: AutofillStrokeWidth,});this.fillControl.show();diff --git a/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx b/packages/sheets-ui/src/views/editor-container/EditorContainer.tsxindex 1ddfc3bdf3..174a8240e2 100644--- a/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx+++ b/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx@@ -82,8 +82,8 @@ export const EditorContainer: React.FC<ICellIEditorProps> = () => {});} else {setState({- width: endX - startX - FIX_ONE_PIXEL_BLUR_OFFSET * 2,- height: endY - startY - FIX_ONE_PIXEL_BLUR_OFFSET * 2,+ width: endX - startX - FIX_ONE_PIXEL_BLUR_OFFSET,+ height: endY - startY - FIX_ONE_PIXEL_BLUR_OFFSET,left: startX + FIX_ONE_PIXEL_BLUR_OFFSET,top: startY + FIX_ONE_PIXEL_BLUR_OFFSET,});