@coffic/cosy-ui 0.5.4 → 0.5.6

package/dist/components/layouts/AppLayout.astro

@@ -202,23 +202,23 @@ const {
 	head={metaConfig.head}
 	debug={debug}
 	{...rest}>
+	<ClientRouter />
 	{showHeader && <Header {...headerConfig} debug={debug} transition:persist />}
 
 	<Container flex="row" gap="md" size="full" padding="none">
 		<!-- 侧边栏容器 -->
-		{showSidebar && <Sidebar {...sidebarConfig} />}
+		{showSidebar && <Sidebar {...sidebarConfig} transition:name="sidebar" transition:persist />}
 
 		<!-- 主内容区域 -->
 		<Main {...mainContentConfig}>
 			<slot />
-			<ClientRouter />
 		</Main>
 	</Container>
 
 	<!-- Footer -->
 	{
 		showFooter && (
-			<Container size="full" padding="none">
+			<Container size="full" padding="none" transition:persist>
 				<Footer {...footerConfig} />
 			</Container>
 		)

package/dist/components/layouts/BaseLayout.astro

@@ -82,7 +82,7 @@ let bodyClasses = debug ? 'cosy:border cosy:border-red-500' : className || '';
 		{description && <meta name="description" content={description} />}
 		{keywords && <meta name="keywords" content={keywords} />}
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.png" />
 
 		<!-- 自定义样式 -->
 		{customStyles && <style set:html={customStyles} />}

package/dist/components/layouts/Footer.astro

@@ -178,13 +178,12 @@ const {
 	mediaLink,
 	techStackLink,
 	debug = false,
-	lang: userLang,
 } = Astro.props as FooterProps;
 
 // 获取当前语言
-const langInfo = LanguageUtil.getCurrentLanguage(userLang);
+const lang = LanguageUtil.getCurrentLanguage(Astro);
 // 创建文本获取函数
-const t = createTextGetter(langInfo, 'footer');
+const t = createTextGetter(lang, 'footer');
 
 const currentYear = new Date().getFullYear();
 
@@ -211,12 +210,14 @@ const debugClasses = debug
 	class:list={[
 		'cosy:footer cosy:z-50 cosy:sm:footer-horizontal cosy:bg-base-200 cosy:text-base-content cosy:p-10',
 		debugClasses.footer,
-	]}>
+	]}
+>
 	<div
 		class:list={[
 			'cosy:flex cosy:flex-col cosy:md:h-56 cosy:gap-8 cosy:container cosy:mx-auto cosy:items-center cosy:w-full cosy:md:flex-row cosy:md:justify-between',
 			debugClasses.section,
-		]}>
+		]}
+	>
 		{/* 品牌区域 */}
 		<aside class:list={['cosy:max-w-xs cosy:text-center', debugClasses.aside]}>
 			<a href={homeLink} class="cosy:flex cosy:items-center cosy:gap-2 cosy:mb-4 cosy:no-underline">
@@ -247,7 +248,8 @@ const debugClasses = debug
 								class="cosy:btn cosy:btn-circle cosy:btn-ghost cosy:btn-sm"
 								target="_blank"
 								rel="noopener noreferrer"
-								aria-label={link.name}>
+								aria-label={link.name}
+							>
 								<SocialIcon platform={link.platform} />
 							</a>
 						))}
@@ -261,7 +263,8 @@ const debugClasses = debug
 			class:list={[
 				'cosy:flex cosy:h-full cosy:flex-col cosy:justify-center cosy:gap-8 cosy:mx-auto cosy:max-w-xl cosy:text-center cosy:items-center cosy:w-full cosy:md:flex-row cosy:md:justify-between cosy:md:items-start',
 				debugClasses.section,
-			]}>
+			]}
+		>
 			{/* 产品导航 */}
 			{products.length > 0 && <NavSection title={t('products')} links={products} />}
 
@@ -325,7 +328,8 @@ const debugClasses = debug
 			class:list={[
 				'cosy:p-4 cosy:bg-primary cosy:text-primary-content cosy:w-full',
 				debugClasses.aside,
-			]}>
+			]}
+		>
 			<p class="cosy:text-center">{inspirationalSlogan}</p>
 		</aside>
 	)
@@ -336,7 +340,8 @@ const debugClasses = debug
 	class:list={[
 		'cosy:footer cosy:footer-center cosy:p-4 cosy:bg-base-300 cosy:text-base-content',
 		debugClasses.footer,
-	]}>
+	]}
+>
 	<aside class:list={['cosy:items-center cosy:grid-flow-col', debugClasses.aside]}>
 		<p class="cosy:opacity-70 cosy:text-sm">
 			© {currentYear}

package/dist/components/layouts/Sidebar.astro

@@ -117,3 +117,59 @@ const currentSection = sidebarItems.find((section) =>
 		<SidebarNav sidebarItems={sidebarItems} currentPath={currentPath} debug={debug} />
 	</div>
 </aside>
+
+<script>
+	// 处理侧边栏滚动位置保存和恢复
+	document.addEventListener('astro:before-preparation', () => {
+		// 获取桌面侧边栏滚动容器
+		const desktopSidebarContent = document.querySelector(
+			'aside[data-sidebar] .cosy\\:overflow-y-auto'
+		);
+
+		// 保存滚动位置到localStorage
+		if (desktopSidebarContent) {
+			localStorage.setItem('sidebarScrollPosition', desktopSidebarContent.scrollTop.toString());
+		}
+
+		// 获取移动端侧边栏滚动容器
+		const mobileSidebarContent = document.querySelector(
+			'.cosy\\:h-\\[calc\\(100vh-8rem\\)\\].cosy\\:overflow-y-auto'
+		);
+
+		// 保存移动端滚动位置
+		if (mobileSidebarContent) {
+			localStorage.setItem(
+				'mobileSidebarScrollPosition',
+				mobileSidebarContent.scrollTop.toString()
+			);
+		}
+	});
+
+	document.addEventListener('astro:page-load', () => {
+		// 获取桌面侧边栏滚动容器
+		const desktopSidebarContent = document.querySelector(
+			'aside[data-sidebar] .cosy\\:overflow-y-auto'
+		);
+
+		// 恢复滚动位置
+		if (desktopSidebarContent) {
+			const savedPosition = localStorage.getItem('sidebarScrollPosition');
+			if (savedPosition) {
+				desktopSidebarContent.scrollTop = parseInt(savedPosition, 10);
+			}
+		}
+
+		// 获取移动端侧边栏滚动容器
+		const mobileSidebarContent = document.querySelector(
+			'.cosy\\:h-\\[calc\\(100vh-8rem\\)\\].cosy\\:overflow-y-auto'
+		);
+
+		// 恢复移动端滚动位置
+		if (mobileSidebarContent) {
+			const savedMobilePosition = localStorage.getItem('mobileSidebarScrollPosition');
+			if (savedMobilePosition) {
+				mobileSidebarContent.scrollTop = parseInt(savedMobilePosition, 10);
+			}
+		}
+	});
+</script>

package/dist/components/navigation/TableOfContents.astro

@@ -106,12 +106,11 @@ const {
 	maxDepth = 3,
 	containerSelector = 'main',
 	minHeadings = 2,
-	lang: userLang,
 	title,
 } = Astro.props;
 
 // 获取当前语言
-const langInfo = LanguageUtil.getCurrentLanguage(userLang);
+const langInfo = LanguageUtil.getCurrentLanguage(Astro);
 // 创建文本获取函数
 const t = createTextGetter(langInfo, 'tableOfContents');
 // 获取标题文本，如果用户提供了标题则使用用户提供的标题
@@ -126,7 +125,8 @@ const tocId = `toc-${Math.random().toString(36).substring(2, 9)}`;
 		<div
 			class={`toc-container toc-scroll-container ${fixed ? 'cosy:w-64' : 'cosy:w-full cosy:max-w-xs'}`}
 			id={`${tocId}-container`}
-			style="display: none;">
+			style="display: none;"
+		>
 			<div class="cosy:bg-base-100 cosy:shadow-inner cosy:card">
 				<div class="cosy:p-4 cosy:card-body">
 					<div class="cosy:mb-2 cosy:font-bold cosy:text-lg cosy:card-title">{titleText}</div>

package/dist/integration.ts

@@ -1,12 +1,12 @@
-import { defineIntegration } from "astro-integration-kit";
+import { defineIntegration } from 'astro-integration-kit';
 
 export const integration = defineIntegration({
-	name: "astro-cosy",
+	name: 'cosy-ui',
 	setup() {
 		return {
 			hooks: {
-				"astro:config:setup": ({ logger }) => {
-					logger.info("astro-cosy integration setup");
+				'astro:config:setup': ({ logger }) => {
+					logger.info('cosy-ui integration setup');
 				},
 			},
 		};

package/dist/style.ts

@@ -1 +1,2 @@
-import './app.css'; 
+// 为了让vite处理css文件，所以建立这个文件
+import './app.css';

package/dist/types/footer.ts

@@ -1,143 +1,138 @@
 export interface Logo {
-    src: string;
-    alt: string;
+	src: string;
+	alt: string;
 }
 
 export interface Product {
-    name: string;
-    href: string;
-    external?: boolean;
+	name: string;
+	href: string;
+	external?: boolean;
 }
 
 export interface FooterProps {
-    /**
-     * 关于链接
-     */
-    aboutLink?: string;
-
-    /**
-     * 博客链接
-     */
-    blogLink?: string;
-
-    /**
-     * 职业链接
-     */
-    careersLink?: string;
-
-    /**
-     * 公司名称
-     */
-    company: string;
-
-    /**
-     * 联系链接
-     */
-    contactLink?: string;
-
-    /**
-     * 版权信息
-     */
-    copyright: string;
-
-    /**
-     * 调试模式
-     */
-    debug?: boolean;
-
-    /**
-     * 是否启用日志输出
-     * @default false
-     */
-    enableLogging?: boolean;
-
-    /**
-     * 常见问题链接
-     */
-    faqLink?: string;
-
-    /**
-     * 历史链接
-     */
-    historyLink?: string;
-
-    /**
-     * 首页链接
-     */
-    homeLink: string;
-
-    /**
-     * ICP备案号
-     */
-    icp?: string;
-
-    /**
-     * 激励标语
-     */
-    inspirationalSlogan: string;
-
-    /**
-     * 语言代码，默认自动检测
-     */
-    lang?: string;
-
-    /**
-     * 徽标
-     */
-    logo?: Logo;
-
-    /**
-     * 媒体链接
-     */
-    mediaLink?: string;
-
-    /**
-     * 新闻链接
-     */
-    newsLink?: string;
-
-    /**
-     * 合作伙伴链接
-     */
-    partnersLink?: string;
-
-    /**
-     * 隐私链接
-     */
-    privacyLink?: string;
-
-    /**
-     * 产品
-     */
-    products?: Product[];
-
-    /**
-     * 站点名称
-     */
-    siteName: string;
-
-    /**
-     * 标语
-     */
-    slogan: string;
-
-    /**
-     * 社交链接
-     */
-    socialLinks?: string[];
-
-    /**
-     * 团队链接
-     */
-    teamLink?: string;
-
-    /**
-     * 技术栈链接
-     */
-    techStackLink?: string;
-
-    /**
-     * 条款链接
-     */
-    termsLink?: string;
+	/**
+	 * 关于链接
+	 */
+	aboutLink?: string;
+
+	/**
+	 * 博客链接
+	 */
+	blogLink?: string;
+
+	/**
+	 * 职业链接
+	 */
+	careersLink?: string;
+
+	/**
+	 * 公司名称
+	 */
+	company: string;
+
+	/**
+	 * 联系链接
+	 */
+	contactLink?: string;
+
+	/**
+	 * 版权信息
+	 */
+	copyright: string;
+
+	/**
+	 * 调试模式
+	 */
+	debug?: boolean;
+
+	/**
+	 * 是否启用日志输出
+	 * @default false
+	 */
+	enableLogging?: boolean;
+
+	/**
+	 * 常见问题链接
+	 */
+	faqLink?: string;
+
+	/**
+	 * 历史链接
+	 */
+	historyLink?: string;
+
+	/**
+	 * 首页链接
+	 */
+	homeLink: string;
+
+	/**
+	 * ICP备案号
+	 */
+	icp?: string;
+
+	/**
+	 * 激励标语
+	 */
+	inspirationalSlogan: string;
+
+	/**
+	 * 徽标
+	 */
+	logo?: Logo;
+
+	/**
+	 * 媒体链接
+	 */
+	mediaLink?: string;
+
+	/**
+	 * 新闻链接
+	 */
+	newsLink?: string;
+
+	/**
+	 * 合作伙伴链接
+	 */
+	partnersLink?: string;
+
+	/**
+	 * 隐私链接
+	 */
+	privacyLink?: string;
+
+	/**
+	 * 产品
+	 */
+	products?: Product[];
+
+	/**
+	 * 站点名称
+	 */
+	siteName: string;
+
+	/**
+	 * 标语
+	 */
+	slogan: string;
+
+	/**
+	 * 社交链接
+	 */
+	socialLinks?: string[];
+
+	/**
+	 * 团队链接
+	 */
+	teamLink?: string;
+
+	/**
+	 * 技术栈链接
+	 */
+	techStackLink?: string;
+
+	/**
+	 * 条款链接
+	 */
+	termsLink?: string;
 }

package/dist/types/header.ts

@@ -1,69 +1,64 @@
 export interface HeaderProps {
-    /**
-     * 当前语言代码
-     */
-    currentLocale?: string;
+	/**
+	 * 侧边栏是否默认展开
+	 * @default false
+	 */
+	defaultSidebarOpen?: boolean;
 
-    /**
-     * 侧边栏是否默认展开
-     * @default false
-     */
-    defaultSidebarOpen?: boolean;
+	/**
+	 * 导航栏高度
+	 * @default "md"
+	 */
+	height?: '3xs' | '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 
-    /**
-     * 导航栏高度
-     * @default "md"
-     */
-    height?: '3xs' | '2xs' | 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+	/**
+	 * 语言选项列表
+	 */
+	languages?: string[];
 
-    /**
-     * 语言选项列表
-     */
-    languages?: string[];
+	/**
+	 * Logo图片元数据
+	 */
+	logo?: ImageMetadata;
 
-    /**
-     * Logo图片元数据
-     */
-    logo?: ImageMetadata;
+	/**
+	 * Logo 链接地址
+	 * @default "/"
+	 */
+	logoHref?: string;
 
-    /**
-     * Logo 链接地址
-     * @default "/"
-     */
-    logoHref?: string;
+	/**
+	 * 导航菜单项
+	 */
+	navItems?: NavItem[];
 
-    /**
-     * 导航菜单项
-     */
-    navItems?: NavItem[];
+	/**
+	 * 是否显示侧边栏切换按钮
+	 * @default false
+	 */
+	showSidebarToggle?: boolean;
 
-    /**
-     * 是否显示侧边栏切换按钮
-     * @default false
-     */
-    showSidebarToggle?: boolean;
+	/**
+	 * 社交链接
+	 */
+	socialLinks?: Array<{
+		name: string;
+		url: string;
+		icon: any;
+	}>;
 
-    /**
-     * 社交链接
-     */
-    socialLinks?: Array<{
-        name: string;
-        url: string;
-        icon: any;
-    }>;
+	/**
+	 * 是否固定在顶部
+	 * @default true
+	 */
+	sticky?: boolean;
 
-    /**
-     * 是否固定在顶部
-     * @default true
-     */
-    sticky?: boolean;
+	rounded?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
 
-    rounded?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
+	paddingHorizontal?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl';
+	paddingVertical?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl';
 
-    paddingHorizontal?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl';
-    paddingVertical?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl';
-
-    navPosition?: 'start' | 'center' | 'end';
+	navPosition?: 'start' | 'center' | 'end';
 }
 
-export type NavItem = { href: string; label: string; };
+export type NavItem = { href: string; label: string };

package/dist/utils/i18n.ts

@@ -1,66 +1,64 @@
 /**
  * 国际化文本配置
- * 
+ *
  * 提供组件的多语言文本内容
  */
 
-import type { SupportedLanguage, LanguageInfo } from './language';
-
 // 定义文本内容的类型
 type TextContent = Record<string, Record<string, string>>;
 
 // 多语言文本内容
-export const texts: Record<SupportedLanguage, TextContent> = {
-    'en': {
-        tableOfContents: {
-            title: 'Table of Contents',
-            loading: 'Loading...'
-        },
-        footer: {
-            products: 'Products',
-            about: 'About',
-            aboutUs: 'About Us',
-            team: 'Our Team',
-            careers: 'Careers',
-            contactUs: 'Contact Us',
-            resources: 'Resources',
-            news: 'News',
-            blog: 'Blog',
-            faq: 'FAQ',
-            history: 'History',
-            techStack: 'Tech Stack',
-            legal: 'Legal',
-            terms: 'Terms of Service',
-            privacy: 'Privacy Policy',
-            slogan: 'Build a beautiful digital experience',
-            allRightsReserved: 'All Rights Reserved'
-        }
-    },
-    'zh-cn': {
-        tableOfContents: {
-            title: '目录',
-            loading: '加载中...'
-        },
-        footer: {
-            products: '产品',
-            about: '关于',
-            aboutUs: '关于我们',
-            team: '团队介绍',
-            careers: '加入我们',
-            contactUs: '联系我们',
-            defaultSlogan: '优雅、高效的组件库',
-            resources: '资源',
-            news: '新闻动态',
-            blog: '技术博客',
-            faq: '常见问题',
-            history: '发展历程',
-            techStack: '技术栈',
-            legal: '法律',
-            terms: '服务条款',
-            privacy: '隐私政策',
-            allRightsReserved: '保留所有权利'
-        }
-    }
+export const texts: Record<string, TextContent> = {
+	en: {
+		tableOfContents: {
+			title: 'Table of Contents',
+			loading: 'Loading...',
+		},
+		footer: {
+			products: 'Products',
+			about: 'About',
+			aboutUs: 'About Us',
+			team: 'Our Team',
+			careers: 'Careers',
+			contactUs: 'Contact Us',
+			resources: 'Resources',
+			news: 'News',
+			blog: 'Blog',
+			faq: 'FAQ',
+			history: 'History',
+			techStack: 'Tech Stack',
+			legal: 'Legal',
+			terms: 'Terms of Service',
+			privacy: 'Privacy Policy',
+			slogan: 'Build a beautiful digital experience',
+			allRightsReserved: 'All Rights Reserved',
+		},
+	},
+	'zh-cn': {
+		tableOfContents: {
+			title: '目录',
+			loading: '加载中...',
+		},
+		footer: {
+			products: '产品',
+			about: '关于',
+			aboutUs: '关于我们',
+			team: '团队介绍',
+			careers: '加入我们',
+			contactUs: '联系我们',
+			defaultSlogan: '优雅、高效的组件库',
+			resources: '资源',
+			news: '新闻动态',
+			blog: '技术博客',
+			faq: '常见问题',
+			history: '发展历程',
+			techStack: '技术栈',
+			legal: '法律',
+			terms: '服务条款',
+			privacy: '隐私政策',
+			allRightsReserved: '保留所有权利',
+		},
+	},
 };
 
 /**
@@ -70,8 +68,8 @@ export const texts: Record<SupportedLanguage, TextContent> = {
  * @param key 文本键名
  * @returns 对应的文本内容
  */
-export function getText(lang: SupportedLanguage, component: string, key: string): string {
-    return texts[lang]?.[component]?.[key] || texts['en'][component]?.[key] || '';
+export function getText(lang: string, component: string, key: string): string {
+	return texts[lang]?.[component]?.[key] || texts['en'][component]?.[key] || '';
 }
 
 /**
@@ -80,6 +78,6 @@ export function getText(lang: SupportedLanguage, component: string, key: string)
  * @param component 组件名称
  * @returns 文本获取函数
  */
-export function createTextGetter(langInfo: LanguageInfo, component: string) {
-    return (key: string): string => getText(langInfo.code, component, key);
-} 
+export function createTextGetter(langInfo: string, component: string) {
+	return (key: string): string => getText(langInfo, component, key);
+}

package/dist/utils/language.ts

@@ -1,175 +1,115 @@
 /**
  * 语言工具模块
- * 
+ *
  * 提供语言相关的工具函数，用于多语言支持
  */
 
 import { getRelativeLocaleUrl } from 'astro:i18n';
 import { logger } from './logger';
-import { LinkUtil } from './link';
 import type { AstroGlobal } from 'astro';
 
-// 支持的语言列表
-export const SUPPORTED_LANGUAGES = ['en', 'zh-cn', 'zh'] as const;
-export type SupportedLanguage = typeof SUPPORTED_LANGUAGES[number];
-
 // 默认语言
-export const DEFAULT_LANGUAGE: SupportedLanguage = 'en';
+export const DEFAULT_LANGUAGE = 'en';
 
 export class LanguageUtil {
-    static getRelativeLink(locale: string, astro: AstroGlobal): string {
-        const debug = false;
-        const currentLocale = astro.currentLocale;
-        const originalPath = astro.originPathname;
-        const result = getRelativeLocaleUrl(locale, originalPath.replaceAll("/" + currentLocale, ""));
-
-        if (debug) {
-            logger.debug(`getRelativeLink: locale=${locale}, currentPath=${originalPath}, currentLocale=${currentLocale}, result=${result}`);
-        }
-
-        return result;
-    }
-
-    static getLanguageName(code: string | undefined): string {
-        switch (code) {
-            case 'en':
-                return 'English';
-            case 'zh-cn':
-                return '简体中文';
-            case 'zh':
-                return '中文';
-            case undefined:
-            default:
-                return 'not known';
-        }
-    }
-
-    /**
-     * 检查语言是否被支持
-     * @param lang 要检查的语言代码
-     * @returns 如果语言被支持返回true，否则返回false
-     */
-    static isLanguageSupported(lang?: string): lang is SupportedLanguage {
-        if (!lang) return false;
-        return SUPPORTED_LANGUAGES.includes(lang as SupportedLanguage);
-    }
-
-    /**
-     * 获取有效的语言代码
-     * @param lang 用户提供的语言代码
-     * @returns 有效的语言代码，如果提供的语言不支持则返回默认语言
-     */
-    static getValidLanguage(lang?: string): SupportedLanguage {
-        if (lang && this.isLanguageSupported(lang)) {
-            return lang;
-        }
-        return DEFAULT_LANGUAGE;
-    }
-
-    /**
-     * 从URL中提取语言代码
-     * @param url 当前URL（可选）
-     * @returns 从URL中提取的语言代码，如果无法提取则返回undefined
-     */
-    static getLanguageFromURL(url?: string): string | undefined {
-        let currentUrl = url;
-
-        if (currentUrl === undefined) {
-            if (typeof window === 'undefined') return undefined;
-            currentUrl = window.location.href;
-        }
-
-        // 尝试从路径中提取语言代码
-        // 例如: /zh-cn/components/button
-        const pathMatch = currentUrl.match(/^\/([\w-]+)\//);
-        if (pathMatch && this.isLanguageSupported(pathMatch[1])) {
-            return pathMatch[1];
-        }
-
-        // 如果网站运行在二级目录，则从路径中提取语言代码
-        // 例如: /docs/zh-cn/components/button
-        const pathMatch2 = currentUrl.match(/^\/([^\/]+)\/([\w-]+)\//);
-        if (pathMatch2 && this.isLanguageSupported(pathMatch2[2])) {
-            return pathMatch2[2];
-        }
-
-        // 尝试从查询参数中提取语言代码
-        // 例如: ?lang=zh-cn
-        const urlParams = new URLSearchParams(currentUrl.split('?')[1]);
-        const langParam = urlParams.get('lang');
-        if (langParam && this.isLanguageSupported(langParam)) {
-            return langParam;
-        }
-
-        return undefined;
-    }
-
-    /**
-     * 从浏览器设置中获取首选语言
-     * @returns 从浏览器设置中获取的语言代码，如果无法获取则返回undefined
-     */
-    static getLanguageFromBrowser(): string | undefined {
-        if (typeof navigator === 'undefined') return undefined;
-
-        // 获取浏览器语言
-        const browserLang = navigator.language.toLowerCase();
-
-        // 检查完整匹配
-        if (this.isLanguageSupported(browserLang)) {
-            return browserLang;
-        }
-
-        // 检查语言前缀匹配
-        // 例如: zh-TW -> zh-cn
-        const langPrefix = browserLang.split('-')[0];
-        for (const lang of SUPPORTED_LANGUAGES) {
-            if (lang.startsWith(langPrefix)) {
-                return lang;
-            }
-        }
-
-        return undefined;
-    }
-    /**
-     * 获取当前语言
-     * @param userLang 用户指定的语言（可选）
-     * @param url 当前URL（可选）
-     * @returns 当前应使用的语言信息，包括语言代码和来源
-     */
-    static getCurrentLanguage(userLang?: string, url?: string): string {
-        // 如果用户指定了语言，优先使用用户指定的语言
-        if (userLang) {
-            if (this.isLanguageSupported(userLang)) {
-                return userLang as SupportedLanguage;
-            } else {
-                // 用户指定的语言不支持，使用默认语言
-                return DEFAULT_LANGUAGE;
-            }
-        }
-
-        // 否则自动检测语言
-        return this.detectLanguage();
-    }
-
-    /**
-     * 自动检测当前语言
-     * @param url 当前URL（可选）
-     * @returns 检测到的语言信息，包括语言代码和来源
-     */
-    static detectLanguage(url?: string): string {
-        // 尝试从URL中获取语言
-        const urlLang = this.getLanguageFromURL(url);
-        if (urlLang) {
-            return urlLang as SupportedLanguage;
-        }
-
-        // 尝试从浏览器设置中获取语言
-        const browserLang = this.getLanguageFromBrowser();
-        if (browserLang) {
-            return browserLang as SupportedLanguage;
-        }
-
-        // 如果无法检测，返回默认语言
-        return DEFAULT_LANGUAGE;
-    }
+	static getRelativeLink(locale: string, astro: AstroGlobal): string {
+		const debug = false;
+		const currentLocale = astro.currentLocale;
+		const originalPath = astro.originPathname;
+		const result = getRelativeLocaleUrl(locale, originalPath.replaceAll('/' + currentLocale, ''));
+
+		if (debug) {
+			logger.debug(
+				`getRelativeLink: locale=${locale}, currentPath=${originalPath}, currentLocale=${currentLocale}, result=${result}`
+			);
+		}
+
+		return result;
+	}
+
+	static getLanguageName(code: string | undefined): string {
+		switch (code) {
+			case 'en':
+				return 'English';
+			case 'zh-cn':
+				return '简体中文';
+			case 'zh':
+				return '中文';
+			case undefined:
+			default:
+				return 'not known';
+		}
+	}
+
+	/**
+	 * 获取当前语言
+	 * @param astro Astro全局对象
+	 * @returns 当前应使用的语言代码
+	 */
+	static getCurrentLanguage(astro: AstroGlobal): string {
+		// 尝试从URL中获取语言
+		const urlLang = this.getLanguageFromURL(astro.url.pathname);
+		if (urlLang) {
+			return urlLang;
+		}
+
+		// 尝试从浏览器设置中获取语言
+		const browserLang = this.getLanguageFromBrowser();
+		if (browserLang) {
+			return browserLang;
+		}
+
+		// 如果无法检测，返回默认语言
+		return DEFAULT_LANGUAGE;
+	}
+
+	/**
+	 * 从URL中提取语言代码
+	 * @param url 当前URL
+	 * @returns 从URL中提取的语言代码，如果无法提取则返回undefined
+	 */
+	private static getLanguageFromURL(url: string): string | undefined {
+		let currentUrl = url;
+
+		if (currentUrl === undefined) {
+			if (typeof window === 'undefined') return undefined;
+			currentUrl = window.location.href;
+		}
+
+		// 尝试从路径中提取语言代码
+		// 例如: /zh-cn/components/button
+		const pathMatch = currentUrl.match(/^\/([\w-]+)\//);
+		if (pathMatch) {
+			return pathMatch[1];
+		}
+
+		// 如果网站运行在二级目录，则从路径中提取语言代码
+		// 例如: /docs/zh-cn/components/button
+		const pathMatch2 = currentUrl.match(/^\/([^\/]+)\/([\w-]+)\//);
+		if (pathMatch2) {
+			return pathMatch2[2];
+		}
+
+		// 尝试从查询参数中提取语言代码
+		// 例如: ?lang=zh-cn
+		const urlParams = new URLSearchParams(currentUrl.split('?')[1]);
+		const langParam = urlParams.get('lang');
+		if (langParam) {
+			return langParam;
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * 从浏览器设置中获取首选语言
+	 * @returns 从浏览器设置中获取的语言代码，如果无法获取则返回undefined
+	 */
+	private static getLanguageFromBrowser(): string | undefined {
+		if (typeof navigator === 'undefined') return undefined;
+
+		// 获取浏览器语言
+		const browserLang = navigator.language.toLowerCase();
+		return browserLang;
+	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@coffic/cosy-ui",
-    "version": "0.5.4",
+    "version": "0.5.6",
     "description": "An astro component library",
     "author": {
         "name": "nookery",
@@ -31,7 +31,7 @@
         "index.ts"
     ],
     "scripts": {
-        "dev": "astro dev --host 0.0.0.0 --port 5678",
+        "dev": "astro dev --host 0.0.0.0 --port 6677",
         "preview:docs": "astro preview --host 0.0.0.0 --port 4330 --outDir dist-docs",
         "preview": "npm run preview:docs",
         "build": "vite build && npm run build:docs && tsx scripts/post-build.ts",