fix: default sidebar triggers & behavior (#8498)

This commit is contained in:
David Luzar 2024-09-11 20:19:14 +02:00 committed by GitHub
parent 813f9b702e
commit 01e83cc9a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -37,14 +37,11 @@ const DefaultSidebarTrigger = withInternalFallback(
); );
DefaultSidebarTrigger.displayName = "DefaultSidebarTrigger"; DefaultSidebarTrigger.displayName = "DefaultSidebarTrigger";
const DefaultTabTriggers = ({ const DefaultTabTriggers = ({ children }: { children: React.ReactNode }) => {
children,
...rest
}: { children: React.ReactNode } & React.HTMLAttributes<HTMLDivElement>) => {
const { DefaultSidebarTabTriggersTunnel } = useTunnels(); const { DefaultSidebarTabTriggersTunnel } = useTunnels();
return ( return (
<DefaultSidebarTabTriggersTunnel.In> <DefaultSidebarTabTriggersTunnel.In>
<Sidebar.TabTriggers {...rest}>{children}</Sidebar.TabTriggers> {children}
</DefaultSidebarTabTriggersTunnel.In> </DefaultSidebarTabTriggersTunnel.In>
); );
}; };
@ -76,7 +73,8 @@ export const DefaultSidebar = Object.assign(
return ( return (
<Sidebar <Sidebar
{...rest} {...rest}
name={"default"} name="default"
key="default"
className={clsx("default-sidebar", className)} className={clsx("default-sidebar", className)}
docked={ docked={
isForceDocked || (docked ?? appState.defaultSidebarDockedPreference) isForceDocked || (docked ?? appState.defaultSidebarDockedPreference)
@ -94,15 +92,15 @@ export const DefaultSidebar = Object.assign(
> >
<Sidebar.Tabs> <Sidebar.Tabs>
<Sidebar.Header> <Sidebar.Header>
<DefaultSidebar.TabTriggers> <Sidebar.TabTriggers>
<Sidebar.TabTrigger tab={CANVAS_SEARCH_TAB}> <Sidebar.TabTrigger tab={CANVAS_SEARCH_TAB}>
{searchIcon} {searchIcon}
</Sidebar.TabTrigger> </Sidebar.TabTrigger>
<Sidebar.TabTrigger tab={LIBRARY_SIDEBAR_TAB}> <Sidebar.TabTrigger tab={LIBRARY_SIDEBAR_TAB}>
{LibraryIcon} {LibraryIcon}
</Sidebar.TabTrigger> </Sidebar.TabTrigger>
</DefaultSidebar.TabTriggers> <DefaultSidebarTabTriggersTunnel.Out />
{rest.__fallback && <DefaultSidebarTabTriggersTunnel.Out />} </Sidebar.TabTriggers>
</Sidebar.Header> </Sidebar.Header>
<Sidebar.Tab tab={LIBRARY_SIDEBAR_TAB}> <Sidebar.Tab tab={LIBRARY_SIDEBAR_TAB}>
<LibraryMenu /> <LibraryMenu />