Skip to content

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.

fix(ui): revert column width input to initial value on menu close (#3562)

白熱3cc239252c24
diff --git a/packages/design/src/components/input-number/InputNumber.tsx b/packages/design/src/components/input-number/InputNumber.tsx
index bd08bc6509..e2337ed1a9 100644
--- a/packages/design/src/components/input-number/InputNumber.tsx
+++ b/packages/design/src/components/input-number/InputNumber.tsx
@@ -16,6 +16,7 @@
import RcInputNumber from 'rc-input-number';
import React, { forwardRef } from 'react';
+import type { InputNumberProps } from 'rc-input-number';
import styles from './index.module.less';
@@ -85,7 +86,7 @@ export interface IInputNumberProps {
* Callback when user press enter
* @param e
*/
- onPressEnter?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+ onPressEnter?: InputNumberProps['onPressEnter'];
}
export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>((props, ref) => {
@@ -112,6 +113,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>((prop
return (
<RcInputNumber
+ ref={ref}
prefixCls={styles.inputNumber}
className={className}
value={value}
@@ -125,7 +127,6 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>((prop
onKeyDown={onKeyDown}
onChange={handleChange}
onPressEnter={onPressEnter}
- ref={ref}
/>
);
});
diff --git a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
index de1e251ad9..c865d1c4d4 100644
--- a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
+++ b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
@@ -16,8 +16,9 @@
import { LocaleService, useDependency } from '@univerjs/core';
import { InputNumber } from '@univerjs/design';
-import React, { useEffect, useState } from 'react';
+import { IContextMenuService } from '@univerjs/ui';
+import React, { useEffect, useState } from 'react';
import styles from './index.module.less';
import type { IMenuItemInputProps } from './interface';
@@ -25,7 +26,7 @@ export const MenuItemInput = (props: IMenuItemInputProps) => {
const { prefix, suffix, value, onChange, min = Number.MIN_SAFE_INTEGER, max = Number.MAX_SAFE_INTEGER } = props;
const localeService = useDependency(LocaleService);
-
+ const contextMenuService = useDependency(IContextMenuService);
const [inputValue, setInputValue] = useState<string>(); // Initialized to an empty string
const handleChange = (value: number | null) => {
@@ -33,6 +34,12 @@ export const MenuItemInput = (props: IMenuItemInputProps) => {
onChange(value?.toString() ?? '');
};
+ useEffect(() => {
+ if (!contextMenuService.visible) {
+ setInputValue(value);
+ }
+ }, [contextMenuService.visible]);
+
useEffect(() => {
setInputValue(value);
}, [value]);
diff --git a/packages/ui/src/components/custom-label/CustomLabel.tsx b/packages/ui/src/components/custom-label/CustomLabel.tsx
index 5610de4683..c3f92fbc88 100644
--- a/packages/ui/src/components/custom-label/CustomLabel.tsx
+++ b/packages/ui/src/components/custom-label/CustomLabel.tsx
@@ -57,6 +57,7 @@ export function CustomLabel(props: ICustomLabelProps): JSX.Element {
};
}
}, [value$]);
+
const realValue = useMemo(() => {
return value ?? subscribedValue;
}, [subscribedValue, value]);
@@ -77,10 +78,6 @@ export function CustomLabel(props: ICustomLabelProps): JSX.Element {
}, [icon]);
// if value is not valid, use primary color
- // let isValid = false;
- // if (realValue && typeof realValue === 'string') {
- // isValid = new ColorKit(realValue).isValid;
- // }
const isValid = useMemo(() => {
if (realValue && typeof realValue === 'string') {
return new ColorKit(realValue).isValid;
diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
index e82955060a..803b5cec75 100644
--- a/packages/ui/src/components/menu/desktop/Menu.tsx
+++ b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -234,7 +234,13 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
}}
>
<span className={styles.menuItemContent}>
- <CustomLabel value={value} title={title} label={label} icon={item.icon} onChange={onChange} />
+ <CustomLabel
+ value={value}
+ title={title}
+ label={label}
+ icon={item.icon}
+ onChange={onChange}
+ />
</span>
</DesignMenuItem>
);
diff --git a/packages/ui/src/services/contextmenu/contextmenu.service.ts b/packages/ui/src/services/contextmenu/contextmenu.service.ts
index 705d4e9a13..2b2fd83807 100644
--- a/packages/ui/src/services/contextmenu/contextmenu.service.ts
+++ b/packages/ui/src/services/contextmenu/contextmenu.service.ts
@@ -15,8 +15,8 @@
*/
import { createIdentifier, Disposable, toDisposable } from '@univerjs/core';
-import type { IMouseEvent, IPointerEvent } from '@univerjs/engine-render';
import type { IDisposable } from '@univerjs/core';
+import type { IMouseEvent, IPointerEvent } from '@univerjs/engine-render';
export interface IContextMenuHandler {
/** A callback to open context menu with given position and menu type. */
diff --git a/packages/ui/src/views/components/context-menu/ContextMenu.tsx b/packages/ui/src/views/components/context-menu/ContextMenu.tsx
index b233318e12..12d7d6b038 100644
--- a/packages/ui/src/views/components/context-menu/ContextMenu.tsx
+++ b/packages/ui/src/views/components/context-menu/ContextMenu.tsx
@@ -62,9 +62,12 @@ export function DesktopContextMenu() {
}, [contextMenuService]);
function handleContextMenu(event: IMouseEvent, menuType: string) {
- setMenuType(menuType);
- setOffset([event.clientX, event.clientY]);
- setVisible(true);
+ setVisible(false);
+ requestAnimationFrame(() => {
+ setMenuType(menuType);
+ setOffset([event.clientX, event.clientY]);
+ setVisible(true);
+ });
}
function handleClose() {