From 96f5eadb5f2bd8a9eeace79d030697dd95170674 Mon Sep 17 00:00:00 2001
From: sevichecc <91365763+Sevichecc@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:48:03 +0800
Subject: [PATCH] merge with upsteam  
 https://github.com/importantimport/urara/commit/1d6a799ca1ef14118881aa3602390052d47c5217

---
 src/lib/components/header.svelte     |  2 +-
 src/lib/components/header_nav.svelte | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/header.svelte b/src/lib/components/header.svelte
index 6f02b691..bcfb6260 100644
--- a/src/lib/components/header.svelte
+++ b/src/lib/components/header.svelte
@@ -61,7 +61,7 @@
         {#if headerConfig.nav}
           <Nav {path} {title} {pin} {scrollY} nav={headerConfig.nav} />
         {/if}
-        <a href="/" sveltekit:prefetch class="btn btn-ghost normal-case text-lg">{site.title}</a>
+        <a href="/" data-sveltekit-prefetch class="btn btn-ghost normal-case text-lg">{site.title}</a>
       </div>
       <div class="navbar-end">
         {#if headerConfig.search}
diff --git a/src/lib/components/header_nav.svelte b/src/lib/components/header_nav.svelte
index a25d9f45..70b54bef 100644
--- a/src/lib/components/header_nav.svelte
+++ b/src/lib/components/header_nav.svelte
@@ -6,6 +6,8 @@
   export let pin: boolean
 </script>
 
+<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+<!-- reference: https://github.com/saadeghi/daisyui/issues/1285 -->
 <div class="dropdown lg:hidden">
   <label for="navbar-dropdown" tabindex="0" class="btn btn-square btn-ghost">
     <span class="i-heroicons-outline-menu-alt-1" />
@@ -14,11 +16,12 @@
     id="navbar-dropdown"
     tabindex="0"
     class:hidden={!pin}
-    class="menu menu-compact dropdown-content bg-base-100 text-base-content shadow-lg rounded-box min-w-max max-w-52 p-2">
+    class="menu menu-compact dropdown-content bg-base-100 text-base-content shadow-lg rounded-box min-w-max max-w-52 p-2
+    ">
     {#each nav as { text, link, children }}
       {#if link && !children}
         <li>
-          <a sveltekit:prefetch class:font-bold={link === path} href={link}>{text}</a>
+          <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
         </li>
       {:else if children}
         <li tabindex="0">
@@ -29,7 +32,7 @@
           <ul class="bg-base-100 text-base-content shadow-lg p-2">
             {#each children as { text, link }}
               <li>
-                <a sveltekit:prefetch class:font-bold={link === path} href={link}>{text}</a>
+                <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
               </li>
             {/each}
           </ul>
@@ -49,18 +52,19 @@
     {#each nav as { text, link, children }}
       {#if link && !children}
         <li>
-          <a sveltekit:prefetch class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a>
+          <a data-sveltekit-prefetch class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a>
         </li>
       {:else if children}
-        <li tabindex="0">
-          <span class:font-bold={children.some(({ link }) => link === path)} class="!rounded-btn gap-1">
-            {text}
-            <span class="i-heroicons-solid-chevron-down -mr-1" />
-          </span>
-          <ul class="bg-base-100 text-base-content shadow-lg p-2">
+      <li >
+        <span class:font-bold={children.some(({ link }) => link === path)} class="!rounded-btn gap-1">
+          {text}
+          <span class="i-heroicons-solid-chevron-down -mr-1" />
+        </span>
+        <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+          <ul tabindex="0" class="menu rounded-box bg-base-100 text-base-content shadow-lg p-2">
             {#each children as { text, link }}
               <li>
-                <a sveltekit:prefetch class:font-bold={link === path} href={link}>{text}</a>
+                <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
               </li>
             {/each}
           </ul>