Skip to content

fix(ui): keep ribbon dropdowns open with disabled siblings #7602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jikkai merged 1 commit into from
Aug 27, 2026
+26 −4
Merged

fix(ui): keep ribbon dropdowns open with disabled siblings #7602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const TooltipWrapperContext = createContext({
setDropdownVisible: (_visible: boolean) => {},
});

// Ribbon dropdowns share one open key; disabled items must only clear it when they own it.
const ToolbarDropdownContext = createContext<{
openDropdownKey: string | null;
setOpenDropdownKey: (key: string | null) => void;
Expand Down Expand Up @@ -158,10 +159,10 @@ export function DropdownWrapper(props: Omit<Partial<IDropdownProps>, 'overlay'>
const overlayRef = useRef<HTMLDivElement>(null);

useEffect(() => {
if (disabled) {
if (disabled && dropdownVisible) {
setDropdownVisible(false);
}
}, [disabled, setDropdownVisible]);
}, [disabled, dropdownVisible, setDropdownVisible]);

useEffect(() => {
const ownerDocument = triggerRef.current?.ownerDocument;
Expand Down Expand Up @@ -268,10 +269,10 @@ export function DropdownMenuWrapper({
const { dropdownVisible, setDropdownVisible } = useContext(TooltipWrapperContext);

useEffect(() => {
if (disabled) {
if (disabled && dropdownVisible) {
setDropdownVisible(false);
}
}, [disabled, setDropdownVisible]);
}, [disabled, dropdownVisible, setDropdownVisible]);

const menuManagerService = useDependency(IMenuManagerService);
const resolveMenuItems = () => menuId ? menuManagerService.getMenuByPositionKey(menuId) : [];
Expand Down
21 changes: 21 additions & 0 deletions packages/ui/src/views/components/ribbon/__tests__/TooltipButtonWrapper.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,27 @@ describe('DropdownMenuLabel', () => {
});

describe('DropdownWrapper', () => {
it('keeps an enabled dropdown open when a sibling is disabled', () => {
const { getByRole, queryByText } = render(
<ToolbarDropdownProvider>
<TooltipWrapper dropdownKey="disabled-dropdown">
<DropdownWrapper disabled overlay={<div>Disabled content</div>}>
<button type="button">Disabled dropdown</button>
</DropdownWrapper>
</TooltipWrapper>
<TooltipWrapper dropdownKey="enabled-dropdown">
<DropdownWrapper overlay={<div>Enabled content</div>}>
<button type="button">Enabled dropdown</button>
</DropdownWrapper>
</TooltipWrapper>
</ToolbarDropdownProvider>
);

fireEvent.click(getByRole('button', { name: 'Enabled dropdown' }));

expect(queryByText('Enabled content')).not.toBeNull();
});

it('opens toward the left in RTL layouts', async () => {
const { findByText, getByRole } = render(
<ConfigProvider direction="rtl" mountContainer={document.body}>
Expand Down