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): refactor tooltip handling and improve element reference management (#5331)

白熱ae097998c773
diff --git a/packages/sheets-formula-ui/src/controllers/menu.ts b/packages/sheets-formula-ui/src/controllers/menu.ts
index 1a678c1a87..4a6fb068ca 100644
--- a/packages/sheets-formula-ui/src/controllers/menu.ts
+++ b/packages/sheets-formula-ui/src/controllers/menu.ts
@@ -179,6 +179,7 @@ export function MoreFunctionsMenuItemFactory(accessor: IAccessor): IMenuItem {
return {
id: MoreFunctionsOperation.id,
title: 'formula.insert.more',
+ tooltip: 'formula.insert.tooltip',
type: MenuItemType.BUTTON,
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
disabled$: getCurrentRangeDisable$(accessor, {
diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index 13c6ad8706..0a8b31dd51 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -64,7 +64,7 @@ export function Ribbon(props: IRibbonProps) {
const containerRef = useRef<HTMLDivElement>(null!);
const toolbarItemRefs = useRef<Record<string, {
- width: number;
+ el: HTMLElement;
key: string;
order: number;
groupOrder: number;
@@ -217,7 +217,8 @@ export function Ribbon(props: IRibbonProps) {
const gapWidth = (allGroups.length - 1) * 8;
totalWidth += gapWidth;
- for (const { width, key } of sortedToolbarItems) {
+ for (const { el, key } of sortedToolbarItems) {
+ const { width } = el.getBoundingClientRect();
totalWidth += width + 8;
if (totalWidth > avaliableWidth) {
@@ -249,7 +250,7 @@ export function Ribbon(props: IRibbonProps) {
univer-flex univer-h-10 univer-min-w-min univer-items-center univer-px-3 univer-opacity-0
`, {
'univer-hidden': !fakeToolbarVisible,
- }, borderBottomClassName)}
+ }, divideXClassName, borderBottomClassName)}
>
{activeGroup.allGroups.map((groupItem, index) => (groupItem.children?.length || groupItem.item) && (
<Fragment key={groupItem.key}>
@@ -262,7 +263,7 @@ export function Ribbon(props: IRibbonProps) {
ref={(ref) => {
if (ref?.el) {
toolbarItemRefs.current[child.key] = {
- width: ref.el.getBoundingClientRect().width,
+ el: ref.el,
key: child.key,
order: index,
groupOrder: groupItem.order,
diff --git a/packages/ui/src/views/components/ribbon/ToolbarButton.tsx b/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
index fb103e1dbd..8739982b5a 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
@@ -57,7 +57,7 @@ univer-justify-center univer-rounded univer-border-none univer-bg-transparent un
univer-text-gray-900 univer-outline-none univer-transition-colors univer-animate-in univer-fade-in
dark:!univer-text-white dark:hover:!univer-bg-gray-700 dark:disabled:!univer-text-gray-600
disabled:univer-cursor-not-allowed disabled:univer-text-gray-300 disabled:hover:univer-bg-transparent
-hover:univer-bg-gray-100
+hover:univer-bg-gray-100 whitespace-nowrap univer-w-max
`;
/**
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index cfee247e26..4879f6b0e4 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -247,16 +247,12 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
}
return !hidden && (
- tooltipTitle
- ? (
- <TooltipWrapper
- ref={ref}
- title={tooltipTitle}
- placement="bottom"
- >
- {renderItem()}
- </TooltipWrapper>
- )
- : renderItem()
+ <TooltipWrapper
+ ref={ref}
+ title={tooltipTitle}
+ placement="bottom"
+ >
+ {renderItem()}
+ </TooltipWrapper>
);
});
diff --git a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
index fd35d1d8ec..5b9cf1bb75 100644
--- a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
+++ b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
@@ -37,6 +37,7 @@ export interface ITooltipWrapperRef {
export const TooltipWrapper = forwardRef<ITooltipWrapperRef, ITooltipProps>((props, ref) => {
const { children, ...tooltipProps } = props;
+
const spanRef = useRef<HTMLSpanElement>(null);
const [tooltipVisible, setTooltipVisible] = useState(false);
@@ -65,19 +66,25 @@ export const TooltipWrapper = forwardRef<ITooltipWrapperRef, ITooltipProps>((pro
el: spanRef.current,
}));
- return (
- <Tooltip
- visible={tooltipVisible}
- onVisibleChange={handleChangeTooltipVisible}
- {...tooltipProps}
- >
+ return tooltipProps.title
+ ? (
+ <Tooltip
+ visible={tooltipVisible}
+ onVisibleChange={handleChangeTooltipVisible}
+ {...tooltipProps}
+ >
+ <span ref={spanRef}>
+ <TooltipWrapperContext.Provider value={contextValue}>
+ {children}
+ </TooltipWrapperContext.Provider>
+ </span>
+ </Tooltip>
+ )
+ : (
<span ref={spanRef}>
- <TooltipWrapperContext.Provider value={contextValue}>
- {children}
- </TooltipWrapperContext.Provider>
+ {children}
</span>
- </Tooltip>
- );
+ );
});
export function DropdownWrapper(props: Omit<Partial<IDropdownProps>, 'overlay'> & { overlay: ReactNode; align?: 'start' | 'end' | 'center' }) {