diff --git a/.oxfmtrc.json b/.oxfmtrc.json index 9b44a58..b4ec645 100644 --- a/.oxfmtrc.json +++ b/.oxfmtrc.json @@ -19,4 +19,4 @@ }, "tabWidth": 2, "trailingComma": "es5" -} +} \ No newline at end of file diff --git a/.oxlintrc.json b/.oxlintrc.json index b8e298d..30b931b 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -30,4 +30,4 @@ "import", "vitest" ] -} +} \ No newline at end of file diff --git a/apps/web/components.json b/apps/web/components.json index 31e2e6e..3493f32 100644 --- a/apps/web/components.json +++ b/apps/web/components.json @@ -20,4 +20,4 @@ "rtl": true, "menuColor": "default", "menuAccent": "subtle" -} +} \ No newline at end of file diff --git a/apps/web/tsconfig.app.json b/apps/web/tsconfig.app.json index 9f5944e..a96847f 100644 --- a/apps/web/tsconfig.app.json +++ b/apps/web/tsconfig.app.json @@ -28,4 +28,4 @@ } }, "include": ["src"] -} +} \ No newline at end of file diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 5899638..d817437 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -11,4 +11,4 @@ "@workspace/ui/*": ["../../packages/ui/src/*"] } } -} +} \ No newline at end of file diff --git a/apps/web/tsconfig.node.json b/apps/web/tsconfig.node.json index d3c52ea..65adef7 100644 --- a/apps/web/tsconfig.node.json +++ b/apps/web/tsconfig.node.json @@ -21,4 +21,4 @@ "noFallthroughCasesInSwitch": true }, "include": ["vite.config.ts"] -} +} \ No newline at end of file diff --git a/package.json b/package.json index 8c385ec..4da7a5c 100644 --- a/package.json +++ b/package.json @@ -26,4 +26,4 @@ "docs", "packages/*" ] -} +} \ No newline at end of file diff --git a/packages/blocks/src/blocks/layouts/vega/index.tsx b/packages/blocks/src/blocks/layouts/vega/index.tsx index 0510509..194d318 100644 --- a/packages/blocks/src/blocks/layouts/vega/index.tsx +++ b/packages/blocks/src/blocks/layouts/vega/index.tsx @@ -1,7 +1,7 @@ -import { Icon } from "@icones/react"; -import { Button } from "@workspace/ui/components/button"; -import { cn } from "@workspace/ui/lib/utils"; -import React from "react"; +import { Icon } from "@icones/react" +import { Button } from "@workspace/ui/components/button" +import { cn } from "@workspace/ui/lib/utils" +import React from "react" type Props = { children: React.ReactNode @@ -29,30 +29,26 @@ export function Layout({ children, className }: Props) { "[--app-header-height:--spacing(18)]", "[--app-aside-width:--spacing(56)]", "[--app-split-gap:--spacing(4)]", - className, + className )} data-slot="root" > -
-
- header -
-
+
+
header
+
-
- {children} -
+
{children}
@@ -61,7 +57,11 @@ export function Layout({ children, className }: Props) { const links = [ { key: "inbox", label: "收件箱", icon: }, - { key: "starred", label: "已加星标", icon: }, + { + key: "starred", + label: "已加星标", + icon: , + }, { key: "sent", label: "已发送", icon: }, { key: "drafts", label: "草稿", icon: }, { key: "deleted", label: "已删除", icon: }, @@ -90,7 +90,13 @@ function isGroup(item: NavGroup | NavItem): item is NavGroup { return (item as NavGroup).items !== undefined } -function Navigation({ items, className }: { items: NavItems; className?: string }) { +function Navigation({ + items, + className, +}: { + items: NavItems + className?: string +}) { return (
    {items.map((item, index) => { @@ -104,12 +110,14 @@ function Navigation({ items, className }: { items: NavItems; className?: string "not-last:mb-4", previousItem && isGroup(previousItem) ? "mt-0" - : "not-first:mt-4", + : "not-first:mt-4" )} > - {item.label} + + {item.label} +
      - {item.items.map(subItem => ( + {item.items.map((subItem) => (
    • - ); + ) } return ( @@ -131,13 +139,17 @@ function Navigation({ items, className }: { items: NavItems; className?: string current={item.key === "drafts"} /> - ); + ) })}
    ) } -function NavigationItem({ label, icon, current }: { +function NavigationItem({ + label, + icon, + current, +}: { label: string icon: React.ReactNode current: boolean @@ -146,7 +158,7 @@ function NavigationItem({ label, icon, current }: {