@coffic/cosy-ui 0.9.60 → 0.9.62

package/dist/src/common/layout-utils.ts

@@ -28,7 +28,7 @@ export function getContainerMinHeightClass(headerHeight: HeaderHeight = 'md'): s
 }
 
 /**
- * 计算Sidebar的top值
+ * 计算Sidebar的top值，防止被头部遮挡
  * @param headerHeight 头部高度
  * @returns CSS 类名字符串
  */
@@ -46,7 +46,7 @@ export function getSidebarTopClass(headerHeight: HeaderHeight = 'md'): string {
 }
 
 /**
- * 计算Sidebar的高度值
+ * 计算Sidebar的高度值，防止被头部遮挡
  * @param headerHeight 头部高度
  * @returns CSS 类名字符串
  */
@@ -60,8 +60,5 @@ export function getSidebarHeightClass(headerHeight: HeaderHeight = 'md'): string
         lg: 'cosy:h-[calc(100vh-4rem)]',
         xl: 'cosy:h-[calc(100vh-5rem)]',
     };
-    return (
-        heightValueMap[headerHeight] ||
-        'cosy:h-[calc(100vh-3rem)]'
-    );
+    return heightValueMap[headerHeight]
 }

package/dist/src-astro/layout-app/AppLayout.astro

@@ -277,10 +277,6 @@ const {
   enableClientRouter = true,
 }: Props = Astro.props as Props;
 
-const containerMinHeightClass = getContainerMinHeightClass(
-  headerConfig?.height as HeaderHeight
-);
-
 const sidebarTopClass = getSidebarTopClass(
   headerConfig?.height as HeaderHeight
 );
@@ -315,21 +311,24 @@ const sidebarHeightClass = getSidebarHeightClass(
       .padding('none')
       .width('full')
       .centered(true)
-      .class(containerMinHeightClass)
+      .class('cosy:min-h-screen')
       .build()}>
     <!-- 侧边栏容器 -->
     {
       showSidebar && (
-        <Sidebar
-          {...sidebarConfig}
-          topClass={sidebarTopClass}
-          heightClass={sidebarHeightClass}
-        />
+        <div
+          aria-label="AppLayout-Sidebar-Container"
+          class:list={['cosy:sticky', sidebarTopClass, sidebarHeightClass]}>
+          <Sidebar {...sidebarConfig} />
+        </div>
       )
     }
 
     <!-- 主内容区域 -->
-    <Main {...mainContentConfig} class="cosy:flex-1 cosy:min-w-xs">
+    <Main
+      aria-label="AppLayout-Main-Container"
+      {...mainContentConfig}
+      class="cosy:flex-1 cosy:min-w-xs">
       <Skeleton
         showLoading={true}
         loadingSize="xl"
@@ -343,7 +342,10 @@ const sidebarHeightClass = getSidebarHeightClass(
   <!-- Footer -->
   {
     showFooter && (
-      <Container width="full" padding="none">
+      <Container
+        aria-label="AppLayout-Footer-Container"
+        width="full"
+        padding="none">
         <Footer {...footerConfig} />
       </Container>
     )

package/dist/src-astro/sidebar/DesktopSidebar.astro

@@ -23,7 +23,6 @@
 
 import '../../style.ts';
 import { SidebarNav } from '../../index-astro';
-import { getMarginTopClass, getMarginBottomClass } from './utils.ts';
 import type { ISidebarProps } from '../../index-astro';
 
 export interface Props extends ISidebarProps {
@@ -37,41 +36,9 @@ export interface Props extends ISidebarProps {
    * @default false
    */
   debug?: boolean;
-
-  /**
-   * 顶部外边距
-   * @default 'none'
-   */
-  marginTop?: string;
-
-  /**
-   * 底部外边距
-   * @default 'none'
-   */
-  marginBottom?: string;
-
-  /**
-   * 顶部定位类名
-   * @default 'cosy:top-12'
-   */
-  topClass?: string;
-
-  /**
-   * 高度类名
-   * @default 'cosy:h-[calc(100vh-3rem)]'
-   */
-  heightClass?: string;
 }
 
-const {
-  sidebarItems,
-  class: className,
-  debug = false,
-  marginTop = 'none',
-  marginBottom = 'none',
-  topClass = 'cosy:top-12',
-  heightClass = 'cosy:h-[calc(100vh-3rem)]',
-} = Astro.props;
+const { sidebarItems, class: className, debug = false } = Astro.props;
 
 // 自动获取当前路径
 const currentPath = Astro.url.pathname;
@@ -83,16 +50,10 @@ const debugClass = debug ? 'cosy:border cosy:border-red-500' : '';
 <aside
   data-desktop-sidebar
   data-current-path={currentPath}
-  data-margin-top={marginTop}
-  data-margin-bottom={marginBottom}
   class:list={[
     className,
     debugClass,
-    'cosy:hidden cosy:w-60 cosy:lg:block cosy:bg-base-200 cosy:px-4 cosy:overflow-y-auto cosy:sticky',
-    topClass,
-    heightClass,
-    getMarginTopClass(marginTop),
-    getMarginBottomClass(marginBottom),
+    'cosy:hidden cosy:w-60 cosy:lg:block cosy:bg-base-200 cosy:px-4 cosy:overflow-y-auto cosy:h-full',
   ]}>
   <SidebarNav
     sidebarItems={sidebarItems}

package/dist/src-astro/sidebar/Sidebar.astro

@@ -37,53 +37,13 @@ export interface Props extends ISidebarProps {
    * @default false
    */
   debug?: boolean;
-
-  /**
-   * 顶部外边距
-   * @default 'none'
-   */
-  marginTop?: string;
-
-  /**
-   * 底部外边距
-   * @default 'none'
-   */
-  marginBottom?: string;
-
-  /**
-   * 顶部定位类名
-   * @default 'cosy:top-12'
-   */
-  topClass?: string;
-
-  /**
-   * 高度类名
-   * @default 'cosy:h-[calc(100vh-3rem)]'
-   */
-  heightClass?: string;
 }
 
-const {
-  sidebarItems,
-  class: className,
-  debug = false,
-  marginTop = 'none',
-  marginBottom = 'none',
-  topClass = 'cosy:top-12',
-  heightClass = 'cosy:h-[calc(100vh-3rem)]',
-} = Astro.props;
+const { sidebarItems, class: className, debug = false } = Astro.props;
 ---
 
 {/* 移动端侧边栏 */}
 <MobileSidebar sidebarItems={sidebarItems} debug={debug} />
 
 {/* 桌面端侧边栏 */}
-<DesktopSidebar
-  sidebarItems={sidebarItems}
-  class={className}
-  debug={debug}
-  marginTop={marginTop}
-  marginBottom={marginBottom}
-  topClass={topClass}
-  heightClass={heightClass}
-/>
+<DesktopSidebar sidebarItems={sidebarItems} class={className} debug={debug} />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffic/cosy-ui",
-  "version": "0.9.60",
+  "version": "0.9.62",
   "description": "An astro component library",
   "author": {
     "name": "nookery",