Skip to content

Commit c0f9412

Browse files
juliusmarmingecodex
andcommitted
Keep sidebar state helper Fast Refresh safe
Co-authored-by: codex <[email protected]>
1 parent 86f1fb3 commit c0f9412

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

‎apps/web/src/components/ui/sidebar.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
SidebarMenuSubButton,
88
SidebarProvider,
99
SidebarTrigger,
10-
resolveSidebarState,
1110
} from "./sidebar";
11+
import { resolveSidebarState } from "./sidebarState";
1212

1313
function renderSidebarButton(className?: string) {
1414
return renderToStaticMarkup(

‎apps/web/src/components/ui/sidebar.tsx‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { Skeleton } from "~/components/ui/skeleton";
1919
import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
2020
import { useIsMobile } from "~/hooks/useMediaQuery";
2121
import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage";
22+
import { resolveSidebarState, type ResponsiveSidebarState } from "./sidebarState";
2223
import * as Schema from "effect/Schema";
2324

2425
const SIDEBAR_COOKIE_NAME = "sidebar_state";
@@ -29,7 +30,7 @@ const SIDEBAR_WIDTH_ICON = "3rem";
2930
const SIDEBAR_RESIZE_DEFAULT_MIN_WIDTH = 16 * 16;
3031

3132
type SidebarContextProps = {
32-
state: "expanded" | "collapsed";
33+
state: ResponsiveSidebarState;
3334
open: boolean;
3435
setOpen: (open: boolean) => void;
3536
openMobile: boolean;
@@ -90,14 +91,6 @@ function useSidebarVisibility() {
9091
return isMobile ? openMobile : open;
9192
}
9293

93-
function resolveSidebarState(input: {
94-
isMobile: boolean;
95-
open: boolean;
96-
openMobile: boolean;
97-
}): SidebarContextProps["state"] {
98-
return (input.isMobile ? input.openMobile : input.open) ? "expanded" : "collapsed";
99-
}
100-
10194
function SidebarProvider({
10295
defaultOpen = true,
10396
open: openProp,
@@ -1022,7 +1015,6 @@ export {
10221015
SidebarRail,
10231016
SidebarSeparator,
10241017
SidebarTrigger,
1025-
resolveSidebarState,
10261018
useSidebar,
10271019
useSidebarVisibility,
10281020
};
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export type ResponsiveSidebarState = "expanded" | "collapsed";
2+
3+
export function resolveSidebarState(input: {
4+
isMobile: boolean;
5+
open: boolean;
6+
openMobile: boolean;
7+
}): ResponsiveSidebarState {
8+
return (input.isMobile ? input.openMobile : input.open) ? "expanded" : "collapsed";
9+
}

0 commit comments

Comments
 (0)