fix(sheet): selection size and editor position (#1743)

* fix(sheet): selection size and editor position * fix(sheet): remove redundant code
dream-num · Mar 29, 2024 · fd83cbf · fd83cbf
1 parent 52c0b6e
commit fd83cbf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/sheets-formula/src/common/selection.ts b/packages/sheets-formula/src/common/selection.ts
@@ -24,7 +24,7 @@ export function getFormulaRefSelectionStyle(themeService: ThemeService, refColor
     const fill = new ColorKit(refColor).setAlpha(0.05).toRgbString();
     return {
         id,
-        strokeWidth: 1.5,
+        strokeWidth: 1,
         stroke: refColor,
         // strokeDash: 10,
         fill,

diff --git a/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx b/packages/sheets-ui/src/views/editor-container/EditorContainer.tsx
@@ -20,6 +20,7 @@ import { useDependency } from '@wendellhu/redi/react-bindings';
 import React, { useEffect, useState } from 'react';
 
 import { IEditorService, TextEditor } from '@univerjs/ui';
+import { FIX_ONE_PIXEL_BLUR_OFFSET } from '@univerjs/engine-render';
 import { ICellEditorManagerService } from '../../services/editor/cell-editor-manager.service';
 import styles from './index.module.less';
 
@@ -81,10 +82,10 @@ export const EditorContainer: React.FC<ICellIEditorProps> = () => {
                 });
             } else {
                 setState({
-                    width: endX - startX,
-                    height: endY - startY,
-                    left: startX,
-                    top: startY,
+                    width: endX - startX - FIX_ONE_PIXEL_BLUR_OFFSET * 2,
+                    height: endY - startY - FIX_ONE_PIXEL_BLUR_OFFSET * 2,
+                    left: startX + FIX_ONE_PIXEL_BLUR_OFFSET,
+                    top: startY + FIX_ONE_PIXEL_BLUR_OFFSET,
                 });
 
                 const editor = editorService.getEditor(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);

diff --git a/packages/sheets-ui/src/views/editor-container/index.module.less b/packages/sheets-ui/src/views/editor-container/index.module.less
@@ -9,8 +9,7 @@
     width: 100px;
     height: 50px;
 
-    border: 1.5px solid rgb(var(--primary-color));
-    outline: 1.5px solid rgba(var(--primary-color-hover), 0.5);
+    border: 1px solid rgb(var(--primary-color));
     box-shadow: none;
 
     .editor-input {

diff --git a/packages/sheets/src/basics/selection.ts b/packages/sheets/src/basics/selection.ts
@@ -151,7 +151,7 @@ export function getNormalSelectionStyle(themeService: ThemeService): ISelectionS
     const styleSheet = themeService.getCurrentTheme();
     const fill = new ColorKit(styleSheet.primaryColor).setAlpha(0.07).toRgbString();
     return {
-        strokeWidth: 1.5,
+        strokeWidth: 1,
         stroke: styleSheet.primaryColor,
         // strokeDash: 8,
         fill,