Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
73 changes: 42 additions & 31 deletions packages/theme-default/src/components/Nav/NavMenuGroup.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import {
matchNavbar,
type NavItem,
type NavItemWithChildren,
type NavItemWithLink,
type NavItemWithLinkAndChildren,
} from '@rspress/shared';
import { Link, Tag } from '@theme';
import Down from '@theme-assets/down';
import { useRef, useState } from 'react';
import { SvgWrapper } from '../SvgWrapper';
import * as styles from './index.module.scss';
import { NavMenuSingleItem } from './NavMenuSingleItem';

export interface NavMenuGroupItem {
Expand Down Expand Up @@ -42,21 +41,26 @@ function ActiveGroupItem({ item }: { item: NavItemWithLink }) {
}

function NormalGroupItem({ item }: { item: NavItemWithLink }) {
const content = (
<div
className={`rp-rounded-2xl ${item.link ? 'hover:rp-bg-mute' : ''}`}
style={{
padding: '0.4rem 1.5rem 0.4rem 0.75rem',
}}
>
<div className="rp-flex">
{item.tag && <Tag tag={item.tag} />}
<span>{item.text}</span>
</div>
</div>
);
return (
<div key={item.link} className="rp-font-medium rp-my-1">
<Link href={item.link}>
<div
className="rp-rounded-2xl hover:rp-bg-mute"
style={{
padding: '0.4rem 1.5rem 0.4rem 0.75rem',
}}
>
<div className="rp-flex">
{item.tag && <Tag tag={item.tag} />}
<span>{item.text}</span>
</div>
</div>
</Link>
{item.link ? (
<Link href={item.link}>{content}</Link>
) : (
<div style={{ padding: ' 0 0 0 0.4rem' }}>{content}</div>
)}
</div>
);
}
Expand Down Expand Up @@ -96,21 +100,21 @@ export function NavMenuGroup(item: NavMenuGroupItem) {
}
return <NormalGroupItem key={item.link} item={item} />;
};
const renderGroup = (
item: NavItemWithChildren | NavItemWithLinkAndChildren,
) => {
return (
<div>
{'link' in item ? (
renderLinkItem(item as NavItemWithLink)
) : (
<p className="rp-font-bold rp-text-gray-400 rp-my-1 not:first:rp-border">
{item.text}
</p>
)}
{item.items.map(renderLinkItem)}
</div>
);
const renderGroup = (items: NavItem[]) => {
return items.map(item => {
return (
<div className={styles.navGroup} key={item.text}>
{'items' in item ? (
<>
{renderLinkItem(item as NavItemWithLink)}
{renderGroup(item.items)}
</>
) : (
renderLinkItem(item)
)}
</div>
);
});
};
return (
<div
Expand Down Expand Up @@ -163,7 +167,14 @@ export function NavMenuGroup(item: NavMenuGroupItem) {
{groupItems.map(item => {
return (
<div key={item.text}>
{'items' in item ? renderGroup(item) : renderLinkItem(item)}
{'items' in item ? (
<>
{renderLinkItem(item as NavItemWithLink)}
{renderGroup(item.items)}
</>
) : (
renderLinkItem(item)
)}
</div>
);
})}
Expand Down
28 changes: 16 additions & 12 deletions packages/theme-default/src/components/Nav/NavMenuSingleItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,23 @@ export function NavMenuSingleItem(
) {
const { pathname } = item;
const isActive = new RegExp(item.activeMatch || item.link).test(pathname);

return (
const content = (
<div
key={item.text}
className={`rspress-nav-menu-item ${styles.singleItem} ${
isActive ? `${styles.activeItem} rspress-nav-menu-item-active` : ''
} rp-text-sm rp-font-medium rp-mx-0.5 rp-px-3 rp-py-2 rp-flex rp-items-center`}
>
<Tag tag={item.tag} />
{item.text}
{item.rightIcon}
</div>
);
return item.link ? (
<Link href={normalizeHref(item.link)} onClick={item.onClick}>
<div
key={item.text}
className={`rspress-nav-menu-item ${styles.singleItem} ${
isActive ? `${styles.activeItem} rspress-nav-menu-item-active` : ''
} rp-text-sm rp-font-medium rp-mx-0.5 rp-px-3 rp-py-2 rp-flex rp-items-center`}
>
<Tag tag={item.tag} />
{item.text}
{item.rightIcon}
</div>
{content}
</Link>
) : (
content
);
}
3 changes: 3 additions & 0 deletions packages/theme-default/src/components/Nav/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
.rightNav {
display: none;
}
.navGroup {
padding-left: 1em;
}

.singleItem {
word-break: keep-all;
Expand Down