Merge branch 'v4' of https://github.com/jackyzha0/quartz into v4

Author: codeyoma

.github/workflows/docker-build-push.yaml

@@ -37,7 +37,7 @@ jobs:
             network=host
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v3.9.1
+        uses: sigstore/cosign-installer@v3.9.2
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         if: github.event_name != 'pull_request'

package-lock.json

@@ -38,7 +38,7 @@
     "@clack/prompts": "^0.11.0",
     "@floating-ui/dom": "^1.7.2",
     "@myriaddreamin/rehype-typst": "^0.6.0",
-    "@napi-rs/simple-git": "0.1.19",
+    "@napi-rs/simple-git": "0.1.21",
     "@tweenjs/tween.js": "^25.0.0",
     "@types/he": "^1.2.3",
     "@types/nprogress": "^0.2.3",

package.json

@@ -55,6 +55,7 @@ export type FolderState = {
     collapsed: boolean
 }
 
+let numExplorers = 0
 export default ((userOpts?: Partial<Options>) => {
     const opts: Options = { ...defaultOptions, ...userOpts }
     const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()

quartz/components/Explorer.tsx

@@ -12,9 +12,9 @@ const OverflowList = ({
   )
 }
 
-let numExplorers = 0
+let numLists = 0
 export default () => {
-  const id = `list-${numExplorers++}`
+  const id = `list-${numLists++}`
 
   return {
     OverflowList: (props: JSX.HTMLAttributes<HTMLUListElement>) => (

quartz/components/OverflowList.tsx

@@ -17,6 +17,7 @@ const defaultOptions: Options = {
   layout: "modern",
 }
 
+let numTocs = 0
 export default ((opts?: Partial<Options>) => {
   const layout = opts?.layout ?? defaultOptions.layout
   const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()
@@ -29,12 +30,13 @@ export default ((opts?: Partial<Options>) => {
       return null
     }
 
+    const id = `toc-${numTocs++}`
     return (
       <div class={classNames(displayClass, "toc")}>
         <button
           type="button"
           class={fileData.collapseToc ? "collapsed toc-header" : "toc-header"}
-          aria-controls="toc-content"
+          aria-controls={id}
           aria-expanded={!fileData.collapseToc}
         >
           <h3>{i18n(cfg.locale).components.tableOfContents.title}</h3>
@@ -53,7 +55,10 @@ export default ((opts?: Partial<Options>) => {
             <polyline points="6 9 12 15 18 9"></polyline>
           </svg>
         </button>
-        <OverflowList class={fileData.collapseToc ? "collapsed toc-content" : "toc-content"}>
+        <OverflowList
+          id={id}
+          class={fileData.collapseToc ? "collapsed toc-content" : "toc-content"}
+        >
           {fileData.toc.map((tocEntry) => (
             <li key={tocEntry.slug} class={`depth-${tocEntry.depth}`}>
               <a href={`#${tocEntry.slug}`} data-for={tocEntry.slug}>