Skip to content
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

[DashboardLayout] Fix sidebar CSS transitions for some breakpoints #4522

Merged
merged 8 commits into from
Jan 7, 2025
Merged

[DashboardLayout] Fix sidebar CSS transitions for some breakpoints #4522

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6af50e4
fix: hasDrawerTransition's logics
gil-obradors Dec 8, 2024
36308da
there
apedroferreira Dec 24, 2024
d171d77
Merge remote-tracking branch 'upstream/master' into patch-1
apedroferreira Dec 24, 2024
41bf8db
Merge remote-tracking branch 'upstream/master' into patch-1
apedroferreira Dec 24, 2024
e6d7250
Fix tests
apedroferreira Dec 24, 2024
7ddc805
Merge branch 'master' into patch-1
apedroferreira Dec 24, 2024
bfd4c6f
Merge remote-tracking branch 'upstream/master' into patch-1
apedroferreira Jan 6, 2025
49f5872
Merge remote-tracking branch 'upstream/master' into patch-1
apedroferreira Jan 7, 2025
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
3 changes: 1 addition & 2 deletions packages/toolpad-core/src/DashboardLayout/DashboardLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ function DashboardLayout(props: DashboardLayoutProps) {
[toggleNavigationExpanded],
);

const hasDrawerTransitions =
isOverSmViewport && (disableCollapsibleSidebar || !isUnderMdViewport);
const hasDrawerTransitions = isOverSmViewport && !disableCollapsibleSidebar;
Copy link
Member

@apedroferreira apedroferreira Dec 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
const hasDrawerTransitions = isOverSmViewport && !disableCollapsibleSidebar;
const hasDrawerTransitions = isOverSmViewport && (!disableCollapsibleSidebar || isOverMdViewport);

Thanks a lot for your PR!

Looks like this suggestion would be the correct logic instead, as when disableCollapsibleSidebar is true, the non-persistent drawer menu shows up to the md breakpoint as opposed to just sm.

This would require replacing the isUnderMdViewport variable with isOverMdViewport and inverting all logic where isUnderMdViewport is currently being used (it's only in a couple of places).

Copy link
Member

@apedroferreira apedroferreira Dec 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

My first suggestion was incorrect, the new one should be good!
Sorry if it caused any confusion.


const ToolbarActionsSlot = slots?.toolbarActions ?? ToolbarActions;
const ToolbarAccountSlot = slots?.toolbarAccount ?? Account;
Expand Down
Loading