@orsetra/shared-ui 1.1.2 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use client"
|
|
2
2
|
|
|
3
3
|
import { useState, useEffect } from "react"
|
|
4
|
-
import { usePathname } from "next/navigation"
|
|
4
|
+
import { usePathname, useSearchParams } from "next/navigation"
|
|
5
5
|
import { MainSidebar, type SidebarMode } from "./sidebar/main-sidebar"
|
|
6
6
|
import { Sidebar, SidebarProvider, useSidebar } from "./sidebar/sidebar"
|
|
7
7
|
import { type SidebarMenus, type MainMenuItem, type MenuApiResponse, resolveIcon } from "./sidebar/data"
|
|
@@ -19,17 +19,23 @@ interface LayoutContainerProps {
|
|
|
19
19
|
mode?: SidebarMode
|
|
20
20
|
userMenuConfig?: UserMenuConfig
|
|
21
21
|
fetchMenus?: () => Promise<MenuApiResponse>
|
|
22
|
+
getSidebarMode?: (pathname: string, searchParams: URLSearchParams) => SidebarMode
|
|
23
|
+
getCurrentMenu?: (pathname: string, searchParams: URLSearchParams) => string
|
|
22
24
|
}
|
|
23
25
|
|
|
24
|
-
function LayoutContent({ children, sidebarMenus = {}, user, onSignOut, mode = 'expanded', userMenuConfig, main_base_url, fetchMenus }: LayoutContainerProps) {
|
|
26
|
+
function LayoutContent({ children, sidebarMenus = {}, user, onSignOut, mode = 'expanded', userMenuConfig, main_base_url, fetchMenus, getSidebarMode, getCurrentMenu }: LayoutContainerProps) {
|
|
25
27
|
const pathname = usePathname()
|
|
28
|
+
const searchParams = useSearchParams()
|
|
26
29
|
const { setOpen } = useSidebar()
|
|
27
30
|
const isMobile = useIsMobile()
|
|
28
31
|
const [isMainSidebarOpen, setIsMainSidebarOpen] = useState(false)
|
|
29
32
|
const [currentMenu, setCurrentMenu] = useState<string>("overview")
|
|
30
|
-
|
|
33
|
+
|
|
34
|
+
// Use custom mode function if provided, otherwise use prop
|
|
35
|
+
const effectiveMode = getSidebarMode ? getSidebarMode(pathname, searchParams) : mode
|
|
36
|
+
const isMinimized = effectiveMode === 'minimized'
|
|
31
37
|
// Force hidden mode on mobile
|
|
32
|
-
const isHidden =
|
|
38
|
+
const isHidden = effectiveMode === 'hidden' || isMobile
|
|
33
39
|
|
|
34
40
|
const [mainMenuItems, setMainMenuItems] = useState<MainMenuItem[]>([])
|
|
35
41
|
const [fetchedSidebarMenus, setFetchedSidebarMenus] = useState<SidebarMenus>({})
|
|
@@ -78,9 +84,10 @@ function LayoutContent({ children, sidebarMenus = {}, user, onSignOut, mode = 'e
|
|
|
78
84
|
}, [pathname, isMobile])
|
|
79
85
|
|
|
80
86
|
useEffect(() => {
|
|
81
|
-
|
|
87
|
+
// Use custom menu function if provided, otherwise use default getMenuFromPath
|
|
88
|
+
const contextualMenu = getCurrentMenu ? getCurrentMenu(pathname, searchParams) : getMenuFromPath(pathname)
|
|
82
89
|
setCurrentMenu(contextualMenu)
|
|
83
|
-
}, [pathname])
|
|
90
|
+
}, [pathname, searchParams, getCurrentMenu])
|
|
84
91
|
|
|
85
92
|
const handleMainSidebarToggle = () => {
|
|
86
93
|
setIsMainSidebarOpen(!isMainSidebarOpen)
|
|
@@ -222,7 +222,7 @@ function Sidebar({ currentMenu, onMainMenuToggle, sidebarMenus = {}, main_base_u
|
|
|
222
222
|
|
|
223
223
|
{/* En-tête du menu principal sélectionné */}
|
|
224
224
|
{currentMenu && sectionLabels[currentMenu] && (
|
|
225
|
-
<div className="px-4
|
|
225
|
+
<div className="h-14 flex items-center px-4 border-b border-ui-border">
|
|
226
226
|
<h2 className="text-sm font-semibold text-text-primary">
|
|
227
227
|
{sectionLabels[currentMenu]}
|
|
228
228
|
</h2>
|