Skip to content

fix(nav): use icon mode earlier for non-Chinese locales #1791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gula00 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

fix(nav): use icon mode earlier for non-Chinese locales #1791

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions src/components/navbar/NavMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Link, useLocation } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import { NavigationDropdown } from './NavDropdowns';
import { isActive, getCurrentNavItem, type NavItem } from './constants';
import { useConfigStore } from '../../stores/useConfigStore';
Expand All @@ -20,14 +21,17 @@ interface NavMenuProps {
export function NavMenu({ navItems }: NavMenuProps) {
const location = useLocation();
const { isMenuItemHidden } = useConfigStore();
const { i18n } = useTranslation();

const isChinese = i18n.language.startsWith('zh');

// 过滤隐藏的菜单项
const visibleNavItems = navItems.filter(item => !isMenuItemHidden(item.path));

return (
<>
{/* 文字胶囊 (≥ 1024px) */}
<nav className="hidden lg:flex items-center gap-1 bg-gray-100 dark:bg-base-200 rounded-full p-1">
{/* 文字胶囊 (中文: ≥1024px, 非中文: ≥1280px) */}
<nav className={`hidden ${isChinese ? 'lg:flex' : 'xl:flex'} items-center gap-1 bg-gray-100 dark:bg-base-200 rounded-full p-1`}>
{visibleNavItems.map((item) => (
<Link
key={item.path}
Expand All @@ -52,8 +56,8 @@ export function NavMenu({ navItems }: NavMenuProps) {
))}
</nav>

{/* 图标胶囊 (820px - 1024px) - Logo 不显示文字 */}
<nav className="hidden min-[820px]:flex lg:hidden items-center gap-1 bg-gray-100 dark:bg-base-200 rounded-full p-1">
{/* 图标胶囊 (中文: 820px-1024px, 非中文: 820px-1280px) - Logo 不显示文字 */}
<nav className={`hidden min-[820px]:flex ${isChinese ? 'lg:hidden' : 'xl:hidden'} items-center gap-1 bg-gray-100 dark:bg-base-200 rounded-full p-1`}>
{visibleNavItems.map((item) => (
<Link
key={item.path}
Expand Down