Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Add collapsible ShareNav sidebar

Mike Cao482d6c1e4707
diff --git a/src/app/share/[slug]/[[...path]]/ShareNav.tsx b/src/app/share/[slug]/[[...path]]/ShareNav.tsx
index fa100b177..65e973139 100644
--- a/src/app/share/[slug]/[[...path]]/ShareNav.tsx
+++ b/src/app/share/[slug]/[[...path]]/ShareNav.tsx
@@ -1,12 +1,29 @@
-import { Column, Icon, Row, Text, ThemeButton } from '@umami/react-zen';
+import { Button, Column, Icon, Row, Text, ThemeButton } from '@umami/react-zen';
import { SideMenu } from '@/components/common/SideMenu';
import { useMessages, useNavigation, useShare } from '@/components/hooks';
-import { AlignEndHorizontal, Clock, Eye, Sheet, Tag, User } from '@/components/icons';
+import {
+ AlignEndHorizontal,
+ Clock,
+ Eye,
+ PanelLeftClose,
+ PanelLeftOpen,
+ Sheet,
+ Tag,
+ User,
+} from '@/components/icons';
import { LanguageButton } from '@/components/input/LanguageButton';
import { PreferencesButton } from '@/components/input/PreferencesButton';
import { Funnel, Lightning, Logo, Magnet, Money, Network, Path, Target } from '@/components/svg';
-export function ShareNav({ onItemClick }: { onItemClick?: () => void }) {
+export function ShareNav({
+ collapsed,
+ onCollapse,
+ onItemClick,
+}: {
+ collapsed?: boolean;
+ onCollapse?: (collapsed: boolean) => void;
+ onItemClick?: () => void;
+}) {
const share = useShare();
const { formatMessage, labels } = useMessages();
const { pathname } = useNavigation();
@@ -130,35 +147,56 @@ export function ShareNav({ onItemClick }: { onItemClick?: () => void }) {
.find(({ path }) => path && pathname.endsWith(path.split('?')[0]))?.id;
return (
- <Column position="fixed" padding="3" width="240px" maxHeight="100vh" height="100vh">
- <Row as="header" gap alignItems="center" paddingY="3" marginLeft="3">
- <a href={logoUrl} target="_blank" rel="noopener">
- <Row alignItems="center" gap>
- {logoImage ? (
- <img src={logoImage} alt={logoName} style={{ height: 24 }} />
- ) : (
- <Icon>
- <Logo />
- </Icon>
- )}
- <Text weight="bold">{logoName}</Text>
- </Row>
- </a>
+ <Column
+ position="fixed"
+ padding="3"
+ width={collapsed ? '60px' : '240px'}
+ maxHeight="100vh"
+ height="100vh"
+ border="right"
+ borderColor="4"
+ >
+ <Row
+ as="header"
+ gap
+ alignItems="center"
+ paddingY="3"
+ justifyContent={collapsed ? 'center' : undefined}
+ >
+ {!collapsed && (
+ <a href={logoUrl} target="_blank" rel="noopener" style={{ marginLeft: 12 }}>
+ <Row alignItems="center" gap>
+ {logoImage ? (
+ <img src={logoImage} alt={logoName} style={{ height: 24 }} />
+ ) : (
+ <Icon>
+ <Logo />
+ </Icon>
+ )}
+ <Text weight="bold">{logoName}</Text>
+ </Row>
+ </a>
+ )}
+ <Button variant="quiet" onPress={() => onCollapse?.(!collapsed)}>
+ <Icon>{collapsed ? <PanelLeftOpen /> : <PanelLeftClose />}</Icon>
+ </Button>
</Row>
- <Column>
- <SideMenu
- items={items}
- selectedKey={selectedKey}
- allowMinimize={false}
- onItemClick={onItemClick}
- />
- </Column>
+ {!collapsed && (
+ <Column>
+ <SideMenu
+ items={items}
+ selectedKey={selectedKey}
+ allowMinimize={false}
+ onItemClick={onItemClick}
+ />
+ </Column>
+ )}
<Column flexGrow={1} justifyContent="flex-end">
- <Row>
+ <Column gap="2">
<ThemeButton />
<LanguageButton />
<PreferencesButton />
- </Row>
+ </Column>
</Column>
</Column>
);
diff --git a/src/app/share/[slug]/[[...path]]/SharePage.tsx b/src/app/share/[slug]/[[...path]]/SharePage.tsx
index d80bc3b15..aab32c1fd 100644
--- a/src/app/share/[slug]/[[...path]]/SharePage.tsx
+++ b/src/app/share/[slug]/[[...path]]/SharePage.tsx
@@ -1,7 +1,7 @@
'use client';
import { Column, Grid, Row, useTheme } from '@umami/react-zen';
import { usePathname } from 'next/navigation';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
import { AttributionPage } from '@/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage';
import { BreakdownPage } from '@/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage';
import { FunnelsPage } from '@/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage';
@@ -52,6 +52,7 @@ function getSharePath(pathname: string) {
}
export function SharePage() {
+ const [navCollapsed, setNavCollapsed] = useState(false);
const share = useShare();
const { setTheme } = useTheme();
const pathname = usePathname();
@@ -78,7 +79,7 @@ export function SharePage() {
const PageComponent = PAGE_COMPONENTS[pageKey] || WebsitePage;
return (
- <Grid columns={{ xs: '1fr', lg: '240px 1fr' }} width="100%">
+ <Grid columns={{ xs: '1fr', lg: `${navCollapsed ? '60px' : '240px'} 1fr` }} width="100%">
<Row display={{ xs: 'flex', lg: 'none' }} alignItems="center" gap padding="3">
<MobileMenuButton>
{({ close }) => {
@@ -87,7 +88,7 @@ export function SharePage() {
</MobileMenuButton>
</Row>
<Column display={{ xs: 'none', lg: 'flex' }} marginRight="2">
- <ShareNav />
+ <ShareNav collapsed={navCollapsed} onCollapse={setNavCollapsed} />
</Column>
<PageBody gap>
<WebsiteProvider websiteId={websiteId}>