Skip to content

fix(react-toolbar): correct ToolbarDivider display style and mergeClasses order #35872

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

Closed
WolffM wants to merge 4 commits into from
+23 −1
Closed

fix(react-toolbar): correct ToolbarDivider display style and mergeClasses order #35872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d637409
Configure pipeline: copilot instructions, CI, and static analysis
WolffM Mar 13, 2026
4ce4c7c
Switch copilot-setup-steps to github-hosted runners (firewall enforce…
WolffM Mar 13, 2026
6ece11e
fix(react-toolbar): correct ToolbarDivider display style and mergeCla…
WolffM Mar 14, 2026
6f4feee
restore upstream copilot-setup-steps.yml
WolffM Mar 14, 2026
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-toolbar-fix-toolbar-divider-display-style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
Copy link
Copy Markdown

@github-actions github-actions bot Mar 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🕵🏾‍♀️ visual changes to review in the Visual Change Report

vr-tests-react-components/Avatar Converged 2 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/Avatar Converged.badgeMask.normal.chromium.png 4 Changed
vr-tests-react-components/Avatar Converged.badgeMask - RTL.normal.chromium.png 6 Changed
vr-tests-react-components/CalendarCompat 4 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/CalendarCompat.multiDayView - High Contrast.default.chromium.png 2267 Changed
vr-tests-react-components/CalendarCompat.multiDayView.default.chromium_1.png 670 Changed
vr-tests-react-components/CalendarCompat.multiDayView - Dark Mode.default.chromium.png 2192 Changed
vr-tests-react-components/CalendarCompat.multiDayView.default.chromium.png 667 Changed
vr-tests-react-components/Menu Converged - submenuIndicator slotted content 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/Menu Converged - submenuIndicator slotted content.default.submenus open.chromium.png 413 Changed
vr-tests-react-components/Positioning 2 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/Positioning.Positioning end.chromium.png 511 Changed
vr-tests-react-components/Positioning.Positioning end.updated 2 times.chromium.png 735 Changed
vr-tests-react-components/Skeleton converged 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/Skeleton converged.Opaque Skeleton with rectangle - Dark Mode.default.chromium.png 9 Changed
vr-tests-react-components/TagPicker 1 screenshots
Image Name Diff(in Pixels) Image Type
vr-tests-react-components/TagPicker.disabled.disabled input hover.chromium.png 677 Changed

There were 2 duplicate changes discarded. Check the build logs for more information.

"type": "patch",
"comment": "fix(react-toolbar): correct ToolbarDivider display style by fixing mergeClasses order",
"packageName": "@fluentui/react-toolbar",
"email": "copilot@microsoft.com",
"dependentChangeType": "patch"
}
12 changes: 12 additions & 0 deletions packages/react-components/react-toolbar/library/src/components/Toolbar/Toolbar.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,16 @@ describe('ToolbarDivider', () => {
cy.get(button).eq(0).type('{leftarrow}');
cy.get(button).eq(2).should('be.focused');
});

it('should render with inline-flex display in a horizontal toolbar', () => {
mount(
<Toolbar>
<ToolbarButton>Item 1</ToolbarButton>
<ToolbarDivider />
<ToolbarButton>Item 2</ToolbarButton>
</Toolbar>,
);

cy.get('.fui-Divider').should('have.css', 'display', 'inline-flex');
});
});
5 changes: 4 additions & 1 deletion ...nts/react-toolbar/library/src/components/ToolbarDivider/useToolbarDividerStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ const useBaseStyles = makeStyles({
export const useToolbarDividerStyles_unstable = (state: ToolbarDividerState): ToolbarDividerState => {
'use no memo';

const userClassName = state.root.className;
state.root.className = undefined;
useDividerStyles_unstable(state);
const { vertical } = state;
const toolbarDividerStyles = useBaseStyles();
state.root.className = mergeClasses(
state.root.className,
toolbarDividerStyles.root,
!vertical && toolbarDividerStyles.vertical,
state.root.className,
userClassName,
);
return state;
};
Loading