Skip to content

Commit 9c80b9d

Browse files
authored
fix(toolbar): hide tooltip when menu open to prevent overlap (#839)
1 parent 1acf377 commit 9c80b9d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/toolbar/ToolbarButtonPopup.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import type {ToolbarBaseProps, ToolbarButtonPopupData} from './types';
66
export type ToolbarButtonPopupProps<E> = ToolbarBaseProps<E> & ToolbarButtonPopupData<E>;
77

88
export function ToolbarButtonPopup<E>(props: ToolbarButtonPopupProps<E>) {
9-
const {className, editor, isActive, isEnable, renderPopup, ...buttonProps} = props;
9+
const {className, editor, isActive, isEnable, renderPopup, disableTooltip, ...buttonProps} =
10+
props;
1011

1112
const [anchorElement, setAnchorElement] = useElementState();
1213
const [isOpen, , close, toggle] = useBooleanState(false);
@@ -23,6 +24,7 @@ export function ToolbarButtonPopup<E>(props: ToolbarButtonPopupProps<E>) {
2324
enabled={enabled}
2425
className={className}
2526
onClick={toggle}
27+
disableTooltip={disableTooltip || isOpen}
2628
/>
2729
{isOpen &&
2830
renderPopup({

src/toolbar/ToolbarListButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export function ToolbarListButton<E>({
9090
if (popupItem) setPopupItem(undefined);
9191
else toggleOpen();
9292
}}
93-
disableTooltip={disableTooltip}
93+
disableTooltip={disableTooltip || popupOpen}
9494
>
9595
{buttonContent}
9696
</ToolbarButtonView>

0 commit comments

Comments
 (0)