fix(ui) : improve control visibility while preserving header styling

2026-10-14 15:35:40 +07:00
parent 8d051c9e4b
commit d229cb3942
10 changed files with 109 additions and 29 deletions
@@ -30,7 +30,7 @@ export function PublicNavigation() {
  return <>
    <nav aria-label="เมนูหลัก" className="hidden items-center gap-1 lg:flex">
      {destinations.slice(1).map(({ href, label, icon }) =>
-        <Link key={href} href={href} aria-current={isCurrent(href) ? "page" : undefined}
+        <Link key={href} href={href} data-slot="button" data-variant="ghost" aria-current={isCurrent(href) ? "page" : undefined}
          className={buttonVariants({ variant: "ghost", size: "sm" })}>
          {icon ? <Image src={icon} alt="" width={24} height={24} className="size-6 object-contain" /> : <ChartNoAxesCombinedIcon data-icon="inline-start" aria-hidden="true" />}{label}
        </Link>)}
@@ -47,7 +47,7 @@ export function PublicNavigation() {
          </DrawerHeader>
          <nav aria-label="เมนูหลักบนมือถือ" className="grid gap-1 p-4">
            {destinations.map(({ href, label, icon }) =>
-              <DrawerClose key={href} render={<Link href={href} aria-current={isCurrent(href) ? "page" : undefined}
+              <DrawerClose key={href} nativeButton={false} render={<Link href={href} aria-current={isCurrent(href) ? "page" : undefined}
                className="flex min-h-11 items-center gap-3 rounded-lg px-3 text-sm hover:bg-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring" />}>
                {icon ? <Image src={icon} alt="" width={20} height={20} className="size-5 object-contain" /> : href === "/analytics" ? <ChartNoAxesCombinedIcon aria-hidden="true" /> : <BookOpenIcon aria-hidden="true" />}{label}
                {isCurrent(href) ? <span className="ml-auto text-xs text-primary">ปัจจุบัน</span> : null}