Merge branch 'fix/header' into 'develop-news'

fix header

See merge request !56

src/app/(main)/(home)/components/featured-news/index.tsx

@@ -57,7 +57,7 @@ function FeaturedNews() {
                     {primaryItem.categories[0]?.name || "Tin nổi bật"}
                   </span>
 
-                  <h3 className="max-w-3xl text-[20px] font-bold leading-[1.28] text-white md:text-[28px] xl:text-[32px]">
+                  <h3 className="max-w-3xl line-clamp-3 text-[20px] font-bold leading-[1.28] text-white md:text-[28px] xl:text-[32px]">
                     {primaryItem.title}
                   </h3>
 
@@ -70,8 +70,8 @@ function FeaturedNews() {
               </div>
             </Link>
           ) : (
-            <div className="relative min-h-[260px] overflow-hidden rounded-[24px] bg-[#e9eef8] shadow-[0_18px_38px_rgba(28,52,120,0.12)] md:min-h-[320px] xl:min-h-[350px]">
-              <div className="flex h-full min-h-[260px] flex-col justify-end p-4 md:min-h-[320px] md:p-5 xl:min-h-[350px]">
+            <div className="relative min-h-[260px] overflow-hidden rounded-3xl bg-[#e9eef8] shadow-[0_18px_38px_rgba(28,52,120,0.12)] md:min-h-[320px] xl:min-h-[350px]">
+              <div className="flex h-full min-h-[260px] flex-col justify-end p-4 md:min-h-80 md:p-5 xl:min-h-[350px]">
                 <span className="mb-2 h-8 w-28 rounded-[10px] bg-white/80" />
                 <div className="h-8 w-3/4 rounded bg-white/90 md:h-10" />
                 <div className="mt-2 h-5 w-28 rounded bg-white/70" />

src/app/(main)/[...slug]/templates/ArticlePage.tsx

@@ -93,7 +93,7 @@ export default function ArticlePage({ category, allCategories }: ArticlePageProp
           {categoryMenu.length > 0 ? <ListCategory categories={categoryMenu} /> : <br />}
 
           <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
-            <main className="lg:col-span-2 bg-background">
+            <main className="lg:col-span-2 bg-white">
               <div className="pb-5 overflow-hidden">
                 {paginatedPosts.length ? (
                   paginatedPosts.map((item) => {

src/app/(main)/layout.tsx

@@ -9,7 +9,7 @@ export default function Layout({
   children: React.ReactNode;
 }>) {
   return (
-    <main className="flex flex-col min-h-screen bg-background">
+    <main className="flex flex-col min-h-screen bg-white">
       <Header />
       <div className="flex-1">{children}</div>
       <ScrollToTopButton />

src/components/base/list-category/index.tsx

@@ -22,7 +22,7 @@ const ListCategory: React.FC<{ categories?: Category[] }> = ({ categories = [] }
     <div className="border-t border-gray-200 bg-white py-2">
       <div className="w-full px-4 sm:px-6 lg:px-8">
         <div className="py-3">
-          <div className="flex flex-wrap items-center max-w-full overflow-x-auto">
+          <div className="flex max-w-full items-center gap-3 overflow-x-auto pb-1">
             {categories.map((category) => {
               const href = resolveHref(category);
               const menu = { id: category.id, name: category.name, link: href };
@@ -30,7 +30,7 @@ const ListCategory: React.FC<{ categories?: Category[] }> = ({ categories = [] }
 
               return (
                 <div key={category.id} className="shrink-0">
-                  <MenuItem menu={menu} active={active} />
+                  <MenuItem menu={menu} active={active} variant="secondary" />
                 </div>
               );
             })}

src/components/base/menu-category/index.tsx

 'use client'
+
 type Menu = {
   id: string | number
   name: string
@@ -7,19 +8,22 @@ type Menu = {
 }
 
 import { buttonVariants } from '@components/ui/button'
+import { HoverCard, HoverCardContent, HoverCardTrigger } from '@components/ui/hover-card'
 import { cn } from '@lib/utils'
-import { useCallback, useMemo } from 'react'
-import { HoverCard, HoverCardTrigger, HoverCardContent } from '@components/ui/hover-card'
-import { cva } from 'class-variance-authority'
-import { usePathname } from 'next/navigation'
 import Link from 'next/link'
+import { usePathname } from 'next/navigation'
+import { useCallback, useMemo } from 'react'
 
 export function MenuItem(props: { variant?: 'main' | 'secondary'; menu: Menu; active?: boolean }) {
   const { menu, variant = 'main', active } = props
 
   const pathname = usePathname()
-  const isActive = pathname.startsWith(menu.link ?? '');
+  const normalizedLink = menu.link && menu.link !== '#' ? menu.link : '/'
+  const hasChildren = Boolean(menu.children?.length)
+  const isRoot = normalizedLink === '/'
+  const isActive = active || (isRoot ? pathname === '/' : pathname.startsWith(normalizedLink))
   const linkId = useMemo(() => `trigger_${menu.id}`, [menu.id])
+
   const hoverCardRef = useCallback(
     (element: HTMLDivElement) => {
       if (!element) return
@@ -28,76 +32,67 @@ export function MenuItem(props: { variant?: 'main' | 'secondary'; menu: Menu; ac
     [linkId]
   )
 
-  return (
-    <HoverCard openDelay={0} closeDelay={0}>
-      <HoverCardTrigger asChild>
+  const trigger = (
     <Link
-          aria-selected={active || isActive}
+      aria-selected={isActive}
       id={linkId}
-          target={(menu.link ?? '').startsWith('/') ? '_self' : '_blank'}
-          href={menu.link ?? '/'}
-          className={menuItemTriggerVariant({ variant })}
+      target={normalizedLink.startsWith('/') ? '_self' : '_blank'}
+      href={normalizedLink}
+      className={menuItemTriggerClass(variant)}
     >
-          {menu.name}
+      <span className="relative z-10 truncate">{menu.name}</span>
+      {variant === 'main' ? <span className="menu-item-underline" aria-hidden="true" /> : null}
     </Link>
-      </HoverCardTrigger>
+  )
+
+  if (!hasChildren) {
+    return trigger
+  }
 
-      {menu.children && (
-        <HoverCardContent ref={hoverCardRef} className={menuItemHoverBoxVariant({ variant })}>
-          {menu.children.map((subMenu) => (
-            <Link key={subMenu.id} href={subMenu.link ?? '/'} className={menuItemChildVariant({ variant })}>
+  return (
+    <HoverCard openDelay={80} closeDelay={120}>
+      <HoverCardTrigger asChild>{trigger}</HoverCardTrigger>
+      <HoverCardContent ref={hoverCardRef} className={menuItemHoverBoxVariant(variant)}>
+        {menu.children?.map((subMenu) => (
+          <Link key={subMenu.id} href={subMenu.link ?? '/'} className={menuItemChildVariant(variant)}>
             {subMenu.name}
           </Link>
         ))}
       </HoverCardContent>
-      )}
     </HoverCard>
   )
 }
 
-const menuItemTriggerVariant = cva(
-  cn(buttonVariants({ variant: 'ghost' }), 'font-semibold focus-visible:ring-0 focus-visible:ring-offset-0 py-'),
-  {
-    variants: {
-      variant: {
-        main: cn(
-          'font-semibold text-[#363636] text-2xl hover:text-muted-foreground hover:bg-white py-3.5 px-5',
-          'aria-selected:text-muted-foreground'
-        ),
-        secondary: cn(
-          'font-boldtext-primary border-t-2 border-t-transparent rounded-none',
-          'hover:text-primary/90',
-          'aria-selected:border-t-secondary aria-selected:bg-accent',
-          'aria-selected:bg-[#E9C826]'
+function menuItemTriggerClass(variant: 'main' | 'secondary') {
+  if (variant === 'secondary') {
+    return cn(
+      'inline-flex h-[36px] items-center justify-center rounded-full border border-[#d6dfeb] bg-white px-5 text-[13px] font-medium leading-none text-[#5f6b7d] shadow-none transition-colors duration-150',
+      'hover:border-[#c5d2e3] hover:bg-[#f7faff] hover:text-[#1b5aa1]',
+      'aria-selected:border-[#16559d] aria-selected:bg-[#16559d] aria-selected:text-white',
+      'focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0'
     )
   }
-    },
-    defaultVariants: {
-      variant: 'main'
-    }
-  }
-)
 
-const menuItemHoverBoxVariant = cva('flex w-full flex-col gap-2 p-0', {
-  variants: {
-    variant: {
-      main: 'bg-secondary',
-      secondary: 'bg-muted '
-    }
-  },
-  defaultVariants: {
-    variant: 'main'
-  }
-})
+  return cn(
+    buttonVariants({ variant: 'ghost' }),
+    'group relative inline-flex h-[60px] rounded-none border-b-2 border-transparent px-3 py-0 text-[15px] font-semibold text-slate-700 shadow-none transition-colors duration-150',
+    'hover:bg-transparent hover:text-[#2f57ff]',
+    'aria-selected:bg-transparent aria-selected:text-[#2f57ff]',
+    'focus-visible:ring-0 focus-visible:ring-offset-0 xl:px-4'
+  )
+}
 
-const menuItemChildVariant = cva(cn(buttonVariants({ variant: 'ghost' }), 'justify-start'), {
-  variants: {
-    variant: {
-      main: 'text-secondary-foreground hover:text-muted-foreground hover:bg-secondary',
-      secondary: 'text-accent-foreground hover:text-primary/90 '
-    }
-  },
-  defaultVariants: {
-    variant: 'main'
-  }
-})
+function menuItemHoverBoxVariant(variant: 'main' | 'secondary') {
+  return cn(
+    'mt-1 flex w-full min-w-[220px] flex-col gap-1 rounded-md border border-slate-200 bg-white p-2 shadow-[0_12px_30px_rgba(15,23,42,0.12)]',
+    variant === 'secondary' ? 'bg-white' : ''
+  )
+}
+
+function menuItemChildVariant(_variant: 'main' | 'secondary') {
+  return cn(
+    buttonVariants({ variant: 'ghost' }),
+    'h-10 justify-start rounded-md px-3 text-sm font-medium text-slate-600 transition-colors',
+    'hover:bg-slate-50 hover:text-[#2f57ff]'
+  )
+}

src/components/base/menu-item/index.tsx

-import { usePathname } from "next/navigation";
-import Link from "next/link";
+'use client'
+
+import { buttonVariants } from '@components/ui/button'
+import { HoverCard, HoverCardContent, HoverCardTrigger } from '@components/ui/hover-card'
+import { cn } from '@lib/utils'
+import { cva } from 'class-variance-authority'
+import Link from 'next/link'
+import { usePathname } from 'next/navigation'
+import { useCallback, useMemo } from 'react'
 
 type MenuItemProps = {
-  title: string;
-  link?: string;
-  items: { title: string; link: string }[];
-};
+  title: string
+  link?: string
+  items: { title: string; link: string }[]
+}
 
 const MenuItem = ({ title, link, items }: MenuItemProps) => {
-  const pathname = usePathname();
-  const isActive = !!link && (pathname === link || (link !== "/" && pathname.startsWith(link)));
+  const pathname = usePathname()
+  const normalizedLink = link && link !== '#' ? link : '/'
+  const hasChildren = items.length > 0
+  const isRoot = normalizedLink === '/'
+  const isActive = isRoot ? pathname === '/' : pathname === normalizedLink || pathname.startsWith(normalizedLink)
+  const linkId = useMemo(() => `header-trigger-${title}`, [title])
 
-  return (
-    <div className="group relative">
+  const hoverCardRef = useCallback(
+    (element: HTMLDivElement) => {
+      if (!element) return
+      const triggerWidth = document.getElementById(linkId)?.offsetWidth ?? 220
+      element.style.minWidth = `${Math.max(triggerWidth, 320)}px`
+      element.style.maxWidth = '420px'
+    },
+    [linkId]
+  )
+
+  const trigger = (
     <Link
-        href={link ?? "#"}
-        className={`px-3 py-5 text-[16px] font-semibold transition block
-            ${isActive ? "text-[#E8C518]" : "text-[#124588] hover:text-[#E8C518]"}
-      `}
+      id={linkId}
+      href={normalizedLink}
+      aria-selected={isActive}
+      className={menuItemTriggerVariant()}
     >
-        {title}
+      <span className="relative z-10 whitespace-nowrap">{title}</span>
+      <span
+        className={`absolute bottom-[11px] left-1/2 h-[2px] -translate-x-1/2 rounded-full bg-[#2f57ff] transition-all duration-200 ${
+          isActive ? 'w-[44px]' : 'w-0 group-hover:w-[44px]'
+        }`}
+        aria-hidden="true"
+      />
     </Link>
+  )
+
+  if (!hasChildren) {
+    return <div className="relative shrink-0">{trigger}</div>
+  }
+
+  return (
+    <HoverCard openDelay={0} closeDelay={90}>
+      <HoverCardTrigger asChild>{trigger}</HoverCardTrigger>
+      <HoverCardContent
+        ref={hoverCardRef}
+        align="start"
+        sideOffset={0}
+        className={menuItemHoverBoxVariant()}
+      >
+        {items.map((item) => {
+          const isItemActive = pathname === item.link
 
-      {/* Dropdown */}
-      <div className="absolute left-0 top-full hidden group-hover:block bg-[#124588]/98 text-white text-[14px] font-medium min-w-[220px] shadow-lg">
-        {items.map((item, i) => {
-          const isItemActive = pathname === item.link;
           return (
             <Link
-              key={i}
+              key={item.link}
               href={item.link}
-              className={`block px-5 py-3 cursor-pointer whitespace-nowrap transition ${isItemActive ? "bg-[#e8c518]/80" : "hover:bg-[#e8c518]/80"
-                }`}
+              className={menuItemChildVariant({ active: isItemActive })}
             >
               {item.title}
             </Link>
-          );
+          )
         })}
-      </div>
-    </div>
-  );
-};
+      </HoverCardContent>
+    </HoverCard>
+  )
+}
+
+const menuItemTriggerVariant = cva(
+  cn(
+    buttonVariants({ variant: 'ghost' }),
+    'group relative inline-flex h-[58px] shrink-0 items-center whitespace-nowrap rounded-none bg-transparent px-[4px] py-0 text-[14px] font-semibold leading-none tracking-normal text-[#43506a] shadow-none transition',
+    'hover:bg-transparent hover:text-[#2f57ff]',
+    'aria-selected:bg-transparent aria-selected:text-[#2f57ff]',
+    'focus-visible:ring-0 focus-visible:ring-offset-0'
+  )
+)
+
+const menuItemHoverBoxVariant = cva(
+  'z-[80] flex w-auto flex-col gap-1 rounded-b-md rounded-t-none border border-slate-200 bg-white p-2 text-[13px] font-medium text-slate-600 shadow-[0_18px_36px_rgba(15,23,42,0.16)]'
+)
+
+const menuItemChildVariant = cva(
+  cn(
+    buttonVariants({ variant: 'ghost' }),
+    'h-auto min-h-10 justify-start rounded-md px-3 py-2.5 text-left text-sm font-medium leading-6 whitespace-normal break-words transition'
+  ),
+  {
+    variants: {
+      active: {
+        true: 'bg-[#eef3ff] text-[#2f57ff]',
+        false: 'text-slate-600 hover:bg-[#eef3ff] hover:text-[#2f57ff]'
+      }
+    },
+    defaultVariants: {
+      active: false
+    }
+  }
+)
 
-export default MenuItem;
+export default MenuItem

src/components/ui/hover-card.tsx

@@ -13,6 +13,7 @@ const HoverCardContent = React.forwardRef<
   React.ElementRef<typeof HoverCardPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>
 >(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
+  <HoverCardPrimitive.Portal>
     <HoverCardPrimitive.Content
       ref={ref}
       align={align}
@@ -23,6 +24,7 @@ const HoverCardContent = React.forwardRef<
       )}
       {...props}
     />
+  </HoverCardPrimitive.Portal>
 ))
 HoverCardContent.displayName = HoverCardPrimitive.Content.displayName
 

src/styles/_components.css

@@ -13,6 +13,24 @@
     @apply fixed top-0 right-0 left-0;
   }
 
+  .header-menu-scroll {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+  }
+
+  .header-menu-scroll::-webkit-scrollbar {
+    display: none;
+  }
+
+  .menu-item-underline {
+    @apply absolute bottom-0 left-1/2 h-[2px] w-0 -translate-x-1/2 rounded-full bg-[#2f57ff] transition-all duration-200;
+  }
+
+  [aria-selected="true"] > .menu-item-underline,
+  a:hover > .menu-item-underline {
+    @apply w-[44px];
+  }
+
   /* Scrollbar */
   .scrollbar {
     scrollbar-color: rgba(6, 62, 142, 0.38) rgba(219, 232, 255, 0.38);