Merge 2fb6f63b41 into e3b582676e

* fix: properly handle tabs overflow

* chore: rebuild css

assets/css/chroma/dark.css

@@ -74,7 +74,7 @@
   /* CommentPreprocFile */ .chroma .cpf { color: #8b949e; font-weight: bold; font-style: italic }
   /* Generic */ .chroma .g {  }
   /* GenericDeleted */ .chroma .gd { color: #ffa198; background-color: #490202 }
-  /* GenericEmph */ .chroma .ge { font-style: italic }
+  /* GenericEmph */ .chroma .ge { color: inherit; font-style: italic }
   /* GenericError */ .chroma .gr { color: #ffa198 }
   /* GenericHeading */ .chroma .gh { color: #79c0ff; font-weight: bold }
   /* GenericInserted */ .chroma .gi { color: #56d364; background-color: #0f5323 }

assets/css/compiled/main.css

@@ -914,9 +914,15 @@ video {
 .hx-overflow-x-hidden {
   overflow-x: hidden;
 }
+.hx-overflow-y-hidden {
+  overflow-y: hidden;
+}
 .hx-overscroll-contain {
   overscroll-behavior: contain;
 }
+.hx-overscroll-x-contain {
+  overscroll-behavior-x: contain;
+}
 .hx-text-ellipsis {
   text-overflow: ellipsis;
 }

assets/js/tabs.js

@@ -1,14 +1,14 @@
-document.querySelectorAll('.tabs-toggle').forEach(function (button) {
+document.querySelectorAll('.hextra-tabs-toggle').forEach(function (button) {
   button.addEventListener('click', function (e) {
     // set parent tabs to unselected
-    const tabs = Array.from(e.target.parentElement.querySelectorAll('.tabs-toggle'));
+    const tabs = Array.from(e.target.parentElement.querySelectorAll('.hextra-tabs-toggle'));
     tabs.map(tab => tab.dataset.state = '');
 
     // set current tab to selected
     e.target.dataset.state = 'selected';
 
     // set all panels to unselected
-    const panelsContainer = e.target.parentElement.nextElementSibling;
+    const panelsContainer = e.target.parentElement.parentElement.nextElementSibling;
     Array.from(panelsContainer.children).forEach(function (panel) {
       panel.dataset.state = '';
     });

exampleSite/content/docs/guide/configuration.md

@@ -251,6 +251,23 @@ Options for `flexsearch.index`:
 - `heading` - level 1 and level 2 headings
 - `title` - only include the page title
 
+To customize the search tokenize, set the `params.search.flexsearch.tokenize` parameter in the config file:
+
+```yaml {filename="hugo.yaml"}
+params:
+    # ...
+    flexsearch:
+      # full | forward | reverse | strict 
+      tokenize: forward
+```
+
+Options for [`flexsearch.tokenize`](https://github.com/nextapps-de/flexsearch/#tokenizer-prefix-search):
+
+- `strict` - index whole words
+- `forward` - incrementally index words in forward direction
+- `reverse` - incrementally index words in both directions
+- `full` - index every possible combination
+
 To exclude a page from the search index, set the `excludeSearch: true` in the front matter of the page:
 
 ```yaml {filename="content/docs/guide/configuration.md"}

exampleSite/content/docs/guide/configuration.zh-cn.md

@@ -219,6 +219,25 @@ params:
 - `heading` - 一级和二级标题
 - `title` - 仅搜索标题
 
+要自定义检索分词，请在配置文件中设置`params.search.flexsearch.tokenize`：
+
+```hugo.yaml
+params:
+    # ...
+    flexsearch:
+      # full | forward | reverse | strict 
+      tokenize: forward
+```
+
+[`flexsearch.tokenize`](https://github.com/nextapps-de/flexsearch/#tokenizer-prefix-search)的可选项:
+
+- `strict` - 严格单词匹配
+- `forward` - 单词前缀匹配
+- `reverse` - 单词前后缀匹配
+- `full` - 单词子串匹配。
+
+> 在默认的分词逻辑下，中文一句话就是一个“单词”
+
 要从搜索索引中排除页面，更改 front matter 中的 `excludeSearch: true`:
 
 ```yaml {filename="content/docs/guide/configuration.md"}

exampleSite/content/docs/guide/markdown.fa.md

@@ -28,14 +28,28 @@ Hugo از سینتکس [مارک‌داون](https://en.wikipedia.org/wiki/Markd
 
 [^1]: نقل‌قول بالا گزیده‌ای از [سخنرانی](https://www.youtube.com/watch?v=PAAkCSZUG1c) راب پایک در Gopherfest، در تاریخ ۲۷ آبان ۱۳۹۴ است.
 
+```markdown {filename=Markdown}
+> با اشتراک‌گذاری حافظه ارتباط برقرار نکنید، حافظه را با برقراری ارتباط به اشتراک بگذارید.<br>
+> — <cite>راب پایک[^1]</cite>
+
+[^1]: نقل‌قول بالا گزیده‌ای از [سخنرانی](https://www.youtube.com/watch?v=PAAkCSZUG1c) راب پایک در Gopherfest، در تاریخ ۲۷ آبان ۱۳۹۴ است.
+```
+
 ### جدول‌ها
 
 جدول‌ها بخشی از مشخصات اصلی مارک‌داون نیستند، اما Hugo از آنها در خارج از جعبه پشتیبانی می‌کند.
 
-   نام | سن
+|     نام | سن  |
---------|------
+|--------|------|
-    گودرز | ۳۰
+|    گودرز |  ۳۰|
-  آصف | ۳۴
+|  آصف |    ۳۴  |
+
+```markdown {filename=Markdown}
+|     نام | سن  |
+|--------|------|
+|    گودرز |  ۳۰|
+|  آصف |    ۳۴  |
+```
 
 #### مارک‌داون درون‌خطی درون جدول‌ها
 
@@ -43,6 +57,12 @@ Hugo از سینتکس [مارک‌داون](https://en.wikipedia.org/wiki/Markd
 | --------  | -------- | ------ |
 | *کج* | **توپر** | `کد` |
 
+```markdown {filename=Markdown}
+| کج   | توپر     | کد   |
+| --------  | -------- | ------ |
+| *کج* | **توپر** | `کد` |
+```
+
 ### بلوک‌های کد
 
 {{< cards >}}
@@ -57,12 +77,24 @@ Hugo از سینتکس [مارک‌داون](https://en.wikipedia.org/wiki/Markd
 2. دومین آیتم
 3. سومین آیتم
 
+```markdown {filename=Markdown}
+1. اولین آیتم
+2. دومین آیتم
+3. سومین آیتم
+```
+
 #### فهرست مرتب‌نشده
 
 * فهرست آیتم
 * یک آیتم دیگه
 * و یک آیتم دیگه
 
+```markdown {filename=Markdown}
+* فهرست آیتم
+* یک آیتم دیگه
+* و یک آیتم دیگه
+```
+
 #### فهرست تو در تو
 
 * میوه
@@ -73,13 +105,31 @@ Hugo از سینتکس [مارک‌داون](https://en.wikipedia.org/wiki/Markd
   * شیر
   * پنیر
 
+```markdown {filename=Markdown}
+* میوه
+  * سیب
+  * پرتقال
+  * موز
+* لبنیات
+  * شیر
+  * پنیر
+```
+
 ### عکس‌ها
 
-![](https://source.unsplash.com/featured/800x600?landscape)
+![landscape](https://source.unsplash.com/featured/800x600?landscape)
+
+```markdown {filename=Markdown}
+![landscape](https://source.unsplash.com/featured/800x600?landscape)
+```
 
 با توضیحات:
 
-![](https://source.unsplash.com/featured/800x600?landscape "یک چشم‌انداز Unsplash")
+![landscape](https://source.unsplash.com/featured/800x600?landscape "یک چشم‌انداز Unsplash")
+
+```markdown {filename=Markdown}
+![landscape](https://source.unsplash.com/featured/800x600?landscape "یک چشم‌انداز Unsplash")
+```
 
 ## پیکربندی
 

exampleSite/content/docs/guide/markdown.md

@@ -28,14 +28,28 @@ Blockquote with attribution
 
 [^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015.
 
+```markdown {filename=Markdown}
+> Don't communicate by sharing memory, share memory by communicating.<br>
+> — <cite>Rob Pike[^1]</cite>
+
+[^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015.
+```
+
 ### Tables
 
 Tables aren't part of the core Markdown spec, but Hugo supports them out-of-the-box.
 
-   Name | Age
+|   Name | Age  |
---------|------
+|--------|------|
-    Bob | 27
+|    Bob | 27   |
-  Alice | 23
+|  Alice | 23   |
+
+```markdown {filename=Markdown}
+|   Name | Age  |
+|--------|------|
+|    Bob | 27   |
+|  Alice | 23   |
+```
 
 #### Inline Markdown within tables
 
@@ -43,6 +57,12 @@ Tables aren't part of the core Markdown spec, but Hugo supports them out-of-the-
 | --------  | -------- | ------ |
 | *italics* | **bold** | `code` |
 
+```markdown {filename=Markdown}
+| Italics   | Bold     | Code   |
+| --------  | -------- | ------ |
+| *italics* | **bold** | `code` |
+```
+
 ### Code Blocks
 
 {{< cards >}}
@@ -57,12 +77,24 @@ Tables aren't part of the core Markdown spec, but Hugo supports them out-of-the-
 2. Second item
 3. Third item
 
+```markdown {filename=Markdown}
+1. First item
+2. Second item
+3. Third item
+```
+
 #### Unordered List
 
 * List item
 * Another item
 * And another item
 
+```markdown {filename=Markdown}
+* List item
+* Another item
+* And another item
+```
+
 #### Nested list
 
 * Fruit
@@ -73,13 +105,31 @@ Tables aren't part of the core Markdown spec, but Hugo supports them out-of-the-
   * Milk
   * Cheese
 
+```markdown {filename=Markdown}
+* Fruit
+  * Apple
+  * Orange
+  * Banana
+* Dairy
+  * Milk
+  * Cheese
+```
+
 ### Images
 
-![](https://source.unsplash.com/featured/800x600?landscape)
+![landscape](https://source.unsplash.com/featured/800x600?landscape)
+
+```markdown {filename=Markdown}
+![landscape](https://source.unsplash.com/featured/800x600?landscape)
+```
 
 With caption:
 
-![](https://source.unsplash.com/featured/800x600?landscape "Unsplash Landscape")
+![landscape](https://source.unsplash.com/featured/800x600?landscape "Unsplash Landscape")
+
+```markdown {filename=Markdown}
+![landscape](https://source.unsplash.com/featured/800x600?landscape "Unsplash Landscape")
+```
 
 ## Configuration
 

exampleSite/content/docs/guide/markdown.zh-cn.md

@@ -28,14 +28,28 @@ Hugo 支持 [Markdown](https://en.wikipedia.org/wiki/Markdown) 来书写内容
 
 [^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015.
 
+```markdown {filename=Markdown}
+> Don't communicate by sharing memory, share memory by communicating.<br>
+> — <cite>Rob Pike[^1]</cite>
+
+[^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015.
+```
+
 ### 表格
 
 表格并非核心 Markdown 规范，但 Hugo 支持开箱即用的表格：
 
-   Name | Age
+|   Name | Age  |
---------|------
+|--------|------|
-    Bob | 27
+|    Bob | 27   |
-  Alice | 23
+|  Alice | 23   |
+
+```markdown {filename=Markdown}
+|   Name | Age  |
+|--------|------|
+|    Bob | 27   |
+|  Alice | 23   |
+```
 
 #### Markdown 表格中的内联
 
@@ -43,6 +57,12 @@ Hugo 支持 [Markdown](https://en.wikipedia.org/wiki/Markdown) 来书写内容
 | --------  | -------- | ------ |
 | *italics* | **bold** | `code` |
 
+```markdown {filename=Markdown}
+| Italics   | Bold     | Code   |
+| --------  | -------- | ------ |
+| *italics* | **bold** | `code` |
+```
+
 ### 代码块
 
 {{< cards >}}
@@ -57,12 +77,24 @@ Hugo 支持 [Markdown](https://en.wikipedia.org/wiki/Markdown) 来书写内容
 2. Second item
 3. Third item
 
+```markdown {filename=Markdown}
+1. First item
+2. Second item
+3. Third item
+```
+
 #### 无序列表
 
 * List item
 * Another item
 * And another item
 
+```markdown {filename=Markdown}
+* List item
+* Another item
+* And another item
+```
+
 #### 嵌套列表
 
 * Fruit
@@ -73,13 +105,31 @@ Hugo 支持 [Markdown](https://en.wikipedia.org/wiki/Markdown) 来书写内容
   * Milk
   * Cheese
 
+```markdown {filename=Markdown}
+* Fruit
+  * Apple
+  * Orange
+  * Banana
+* Dairy
+  * Milk
+  * Cheese
+```
+
 ### 图片
 
-![](https://source.unsplash.com/featured/800x600?landscape)
+![landscape](https://source.unsplash.com/featured/800x600?landscape)
+
+```markdown {filename=Markdown}
+![landscape](https://source.unsplash.com/featured/800x600?landscape)
+```
 
 带有标题：
 
-![](https://source.unsplash.com/featured/800x600?landscape "Unsplash Landscape")
+![landscape](https://source.unsplash.com/featured/800x600?landscape "Unsplash Landscape")
+
+```markdown {filename=Markdown}
+![landscape](https://source.unsplash.com/featured/800x600?landscape "Unsplash Landscape")
+```
 
 ## 配置
 

exampleSite/content/docs/guide/syntax-highlighting.md

@@ -78,11 +78,18 @@ def main():
     say_hello()
 ```
 
-
 ### Copy Button
 
-By default, copy button is enabled for code blocks.
+By default, copy button is enabled for code blocks. Its behavior can changed by modifying the site configuration file:
 
+```yaml {linenos=table,linenostart=42,filename="hugo.yaml"}
+params:
+  highlight:
+    copy:
+      enable: true
+      # hover | always
+      display: hover
+```
 
 ## Supported Languages
 

exampleSite/hugo.yaml

@@ -151,6 +151,12 @@ params:
       sortBy: date
       sortOrder: desc # or "asc"
 
+  highlight:
+    copy:
+      enable: true
+      # hover | always
+      display: hover
+
   comments:
     enable: false
     type: giscus

exampleSite/hugo_stats.json

@@ -222,6 +222,8 @@
       "hextra-footer",
       "hextra-scrollbar",
       "hextra-sidebar-collapsible-button",
+      "hextra-tabs-panel",
+      "hextra-tabs-toggle",
       "hextra-toc",
       "highlight",
       "hover:dark:hx-bg-primary-500/10",
@@ -392,7 +394,9 @@
       "hx-overflow-x-auto",
       "hx-overflow-x-hidden",
       "hx-overflow-y-auto",
+      "hx-overflow-y-hidden",
       "hx-overscroll-contain",
+      "hx-overscroll-x-contain",
       "hx-p-0.5",
       "hx-p-1",
       "hx-p-1.5",
@@ -603,8 +607,6 @@
       "steps",
       "subheading-anchor",
       "success-icon",
-      "tabs-panel",
-      "tabs-toggle",
       "theme-toggle",
       "xl:hx-block"
     ],

layouts/shortcodes/tab.html

@@ -1,7 +1,7 @@
 {{- $defaultIndex := int ((.Parent.Get "defaultIndex") | default "0") -}}
 
 <div
-  class="tabs-panel hx-rounded hx-pt-6 hx-hidden data-[state=selected]:hx-block"
+  class="hextra-tabs-panel hx-rounded hx-pt-6 hx-hidden data-[state=selected]:hx-block"
   id="tabs-panel-{{ .Ordinal }}"
   role="tabpanel"
   {{ if eq .Ordinal $defaultIndex }}tabindex="0"{{ end }}

layouts/shortcodes/tabs.html

@@ -5,21 +5,22 @@
   {{ errorf "no items provided" }}
 {{- end -}}
 
-
+<div class="hextra-scrollbar hx-overflow-x-auto hx-overflow-y-hidden hx-overscroll-x-contain">
-<div class="hx-mt-4 hx-flex hx-w-max hx-min-w-full hx-border-b hx-border-gray-200 hx-pb-px dark:hx-border-neutral-800">
+  <div class="hx-mt-4 hx-flex hx-w-max hx-min-w-full hx-border-b hx-border-gray-200 hx-pb-px dark:hx-border-neutral-800">
-  {{- range $i, $item := $items -}}
+    {{- range $i, $item := $items -}}
-    <button
+      <button
-      class="tabs-toggle data-[state=selected]:hx-border-primary-500 data-[state=selected]:hx-text-primary-600 hx-mr-2 hx-rounded-t hx-p-2 hx-font-medium hx-leading-5 hx-transition-colors -hx-mb-0.5 hx-select-none hx-border-b-2 hx-border-transparent hx-text-gray-600 hover:hx-border-gray-200 hover:hx-text-black dark:hx-text-gray-200 dark:hover:hx-border-neutral-800 dark:hover:hx-text-white"
+        class="hextra-tabs-toggle data-[state=selected]:hx-border-primary-500 data-[state=selected]:hx-text-primary-600 hx-mr-2 hx-rounded-t hx-p-2 hx-font-medium hx-leading-5 hx-transition-colors -hx-mb-0.5 hx-select-none hx-border-b-2 hx-border-transparent hx-text-gray-600 hover:hx-border-gray-200 hover:hx-text-black dark:hx-text-gray-200 dark:hover:hx-border-neutral-800 dark:hover:hx-text-white"
-      role="tab"
+        role="tab"
-      type="button"
+        type="button"
-      aria-controls="tabs-panel-{{ $i }}"
+        aria-controls="tabs-panel-{{ $i }}"
-      {{ if eq $i $defaultIndex }}aria-selected="true"{{ end }}
+        {{ if eq $i $defaultIndex }}aria-selected="true"{{ end }}
-      {{ if eq $i $defaultIndex }}tabindex="0"{{ end }}
+        {{ if eq $i $defaultIndex }}tabindex="0"{{ end }}
-      {{ if eq $i $defaultIndex }}data-state="selected"{{ end }}
+        {{ if eq $i $defaultIndex }}data-state="selected"{{ end }}
-    >
+      >
-      {{- $item -}}
+        {{- $item -}}
-    </button>
+      </button>
-  {{- end -}}
+    {{- end -}}
+  </div>
 </div>
 <div>
   {{ .Inner }}