Skip to content

Commit 11e7fa0

Browse files
benjamincanacbenjamincanac
authored
fix(highlight): stop injecting tabindex="0" on pre blocks (#239)
1 parent 141d9d9 commit 11e7fa0

13 files changed

Lines changed: 20 additions & 32 deletions

‎packages/comark/SPEC/COMARK/attributes/wrapped-pre-highlighted.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ const variable = "value"
3030
"language": "ts",
3131
"attr": "value",
3232
"class": "shiki shiki-themes min-light nord dark:nord . class",
33-
"style": "background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9",
34-
"tabindex": "0"
33+
"style": "background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9"
3534
},
3635
[
3736
"code",
@@ -96,7 +95,7 @@ const variable = "value"
9695
## HTML
9796

9897
```html
99-
<pre language="ts" attr="value" class="shiki shiki-themes min-light nord dark:nord . class" tabindex="0" style="background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9"><code class="language-ts"><span class="line" style="display: inline"><span style="color:#D32F2F;--shiki-dark:#81A1C1">const</span><span style="color:#1976D2;--shiki-dark:#D8DEE9"> variable</span><span style="color:#D32F2F;--shiki-dark:#81A1C1"> =</span><span style="color:#22863A;--shiki-dark:#ECEFF4"> "</span><span style="color:#22863A;--shiki-dark:#A3BE8C">value</span><span style="color:#22863A;--shiki-dark:#ECEFF4">"</span></span></code></pre>
98+
<pre language="ts" attr="value" class="shiki shiki-themes min-light nord dark:nord . class" style="background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9"><code class="language-ts"><span class="line" style="display: inline"><span style="color:#D32F2F;--shiki-dark:#81A1C1">const</span><span style="color:#1976D2;--shiki-dark:#D8DEE9"> variable</span><span style="color:#D32F2F;--shiki-dark:#81A1C1"> =</span><span style="color:#22863A;--shiki-dark:#ECEFF4"> "</span><span style="color:#22863A;--shiki-dark:#A3BE8C">value</span><span style="color:#22863A;--shiki-dark:#ECEFF4">"</span></span></code></pre>
10099
```
101100

102101
## Markdown

‎packages/comark/SPEC/COMARK/shiki-codeblock-dual-theme.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ console.log(greeting)
3232
{
3333
"language": "typescript",
3434
"class": "shiki shiki-themes min-light nord dark:nord",
35-
"tabindex": "0",
3635
"style": "background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9"
3736
},
3837
[
@@ -162,7 +161,7 @@ console.log(greeting)
162161
## HTML
163162

164163
```html
165-
<pre language="typescript" class="shiki shiki-themes min-light nord dark:nord" tabindex="0" style="background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9"><code class="language-typescript"><span class="line" style="display: inline"><span style="color:#D32F2F;--shiki-dark:#81A1C1">const</span><span style="color:#1976D2;--shiki-dark:#D8DEE9"> greeting</span><span style="color:#D32F2F;--shiki-dark:#81A1C1">:</span><span style="color:#1976D2;--shiki-dark:#8FBCBB"> string</span><span style="color:#D32F2F;--shiki-dark:#81A1C1"> =</span><span style="color:#22863A;--shiki-dark:#ECEFF4"> "</span><span style="color:#22863A;--shiki-dark:#A3BE8C">Hello, World!</span><span style="color:#22863A;--shiki-dark:#ECEFF4">"</span></span>
164+
<pre language="typescript" class="shiki shiki-themes min-light nord dark:nord" style="background-color:#ffffff;color:#212121;--shiki-dark-bg:#2e3440;--shiki-dark:#d8dee9"><code class="language-typescript"><span class="line" style="display: inline"><span style="color:#D32F2F;--shiki-dark:#81A1C1">const</span><span style="color:#1976D2;--shiki-dark:#D8DEE9"> greeting</span><span style="color:#D32F2F;--shiki-dark:#81A1C1">:</span><span style="color:#1976D2;--shiki-dark:#8FBCBB"> string</span><span style="color:#D32F2F;--shiki-dark:#81A1C1"> =</span><span style="color:#22863A;--shiki-dark:#ECEFF4"> "</span><span style="color:#22863A;--shiki-dark:#A3BE8C">Hello, World!</span><span style="color:#22863A;--shiki-dark:#ECEFF4">"</span></span>
166165
<span class="line" style="display: inline"><span style="color:#1976D2;--shiki-dark:#D8DEE9">console</span><span style="color:#6F42C1;--shiki-dark:#ECEFF4">.</span><span style="color:#6F42C1;--shiki-dark:#88C0D0">log</span><span style="color:#24292EFF;--shiki-dark:#D8DEE9FF">(</span><span style="color:#24292EFF;--shiki-dark:#D8DEE9">greeting</span><span style="color:#24292EFF;--shiki-dark:#D8DEE9FF">)</span></span></code></pre>
167166
```
168167

‎packages/comark/SPEC/COMARK/shiki-codeblock-highlight-complex.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ func main() {
4848
10
4949
],
5050
"class": "shiki shiki-themes github-dark dark:github-dark",
51-
"tabindex": "0",
5251
"style": "background-color:#24292e;color:#e1e4e8"
5352
},
5453
[
@@ -397,7 +396,7 @@ func main() {
397396
## HTML
398397

399398
```html
400-
<pre language="go" highlights="[1,3,5,6,7,10]" class="shiki shiki-themes github-dark dark:github-dark" tabindex="0" style="background-color:#24292e;color:#e1e4e8"><code class="language-go"><span class="line highlight" style="display: inline-block"><span style="color:#F97583">package</span><span style="color:#B392F0"> main</span></span>
399+
<pre language="go" highlights="[1,3,5,6,7,10]" class="shiki shiki-themes github-dark dark:github-dark" style="background-color:#24292e;color:#e1e4e8"><code class="language-go"><span class="line highlight" style="display: inline-block"><span style="color:#F97583">package</span><span style="color:#B392F0"> main</span></span>
401400
<span class="line" style="display: inline"></span>
402401
<span class="line highlight" style="display: inline-block"><span style="color:#F97583">import</span><span style="color:#9ECBFF"> "</span><span style="color:#B392F0">fmt</span><span style="color:#9ECBFF">"</span></span>
403402
<span class="line" style="display: inline"></span>

‎packages/comark/SPEC/COMARK/shiki-codeblock-language-meta.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ console.log(greeting)
3737
],
3838
"meta": "some meta",
3939
"class": "shiki shiki-themes github-dark dark:github-dark",
40-
"tabindex": "0",
4140
"style": "background-color:#24292e;color:#e1e4e8"
4241
},
4342
[
@@ -132,7 +131,7 @@ console.log(greeting)
132131
## HTML
133132

134133
```html
135-
<pre language="typescript" filename="filename" highlights="[1,2]" meta="some meta" class="shiki shiki-themes github-dark dark:github-dark" tabindex="0" style="background-color:#24292e;color:#e1e4e8"><code class="language-typescript"><span class="line highlight" style="display: inline-block"><span style="color:#F97583">const</span><span style="color:#79B8FF"> greeting</span><span style="color:#F97583">:</span><span style="color:#79B8FF"> string</span><span style="color:#F97583"> =</span><span style="color:#9ECBFF"> "Hello, World!"</span></span>
134+
<pre language="typescript" filename="filename" highlights="[1,2]" meta="some meta" class="shiki shiki-themes github-dark dark:github-dark" style="background-color:#24292e;color:#e1e4e8"><code class="language-typescript"><span class="line highlight" style="display: inline-block"><span style="color:#F97583">const</span><span style="color:#79B8FF"> greeting</span><span style="color:#F97583">:</span><span style="color:#79B8FF"> string</span><span style="color:#F97583"> =</span><span style="color:#9ECBFF"> "Hello, World!"</span></span>
136135
<span class="line highlight" style="display: inline-block"><span style="color:#E1E4E8">console.</span><span style="color:#B392F0">log</span><span style="color:#E1E4E8">(greeting)</span></span></code></pre>
137136
```
138137

‎packages/comark/SPEC/COMARK/shiki-codeblock-language-only.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ console.log(greeting)
2929
"pre",
3030
{
3131
"language": "typescript",
32-
"class": "shiki shiki-themes github-dark dark:github-dark",
33-
"tabindex": "0"
32+
"class": "shiki shiki-themes github-dark dark:github-dark"
3433
},
3534
[
3635
"code",
@@ -124,7 +123,7 @@ console.log(greeting)
124123
## HTML
125124

126125
```html
127-
<pre language="typescript" class="shiki shiki-themes github-dark dark:github-dark" tabindex="0"><code class="language-typescript"><span class="line" style="display: inline"><span style="color:#F97583">const</span><span style="color:#79B8FF"> greeting</span><span style="color:#F97583">:</span><span style="color:#79B8FF"> string</span><span style="color:#F97583"> =</span><span style="color:#9ECBFF"> "Hello, World!"</span></span>
126+
<pre language="typescript" class="shiki shiki-themes github-dark dark:github-dark"><code class="language-typescript"><span class="line" style="display: inline"><span style="color:#F97583">const</span><span style="color:#79B8FF"> greeting</span><span style="color:#F97583">:</span><span style="color:#79B8FF"> string</span><span style="color:#F97583"> =</span><span style="color:#9ECBFF"> "Hello, World!"</span></span>
128127
<span class="line" style="display: inline"><span style="color:#E1E4E8">console.</span><span style="color:#B392F0">log</span><span style="color:#E1E4E8">(greeting)</span></span></code></pre>
129128
```
130129

‎packages/comark/SPEC/COMARK/shiki-codeblock-no-language.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ No language specified
3030
"pre",
3131
{
3232
"class": "shiki shiki-themes github-dark dark:github-dark",
33-
"tabindex": "0",
3433
"style": "background-color:#24292e;color:#e1e4e8"
3534
},
3635
[
@@ -70,7 +69,7 @@ No language specified
7069
## HTML
7170

7271
```html
73-
<pre class="shiki shiki-themes github-dark dark:github-dark" tabindex="0" style="background-color:#24292e;color:#e1e4e8"><code><span class="line" style="display: inline"><span>Plain text code block</span></span>
72+
<pre class="shiki shiki-themes github-dark dark:github-dark" style="background-color:#24292e;color:#e1e4e8"><code><span class="line" style="display: inline"><span>Plain text code block</span></span>
7473
<span class="line" style="display: inline"><span>No language specified</span></span></code></pre>
7574
```
7675

‎packages/comark/SPEC/COMARK/shiki-codeblock-rust-example.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ fn main() {
4141
4
4242
],
4343
"class": "shiki shiki-themes github-dark dark:github-dark",
44-
"tabindex": "0",
4544
"style": "background-color:#24292e;color:#e1e4e8"
4645
},
4746
[
@@ -237,7 +236,7 @@ fn main() {
237236
## HTML
238237

239238
```html
240-
<pre language="rust" filename="main.rs" highlights="[1,2,3,4]" class="shiki shiki-themes github-dark dark:github-dark" tabindex="0" style="background-color:#24292e;color:#e1e4e8"><code class="language-rust"><span class="line highlight" style="display: inline-block"><span style="color:#F97583">fn</span><span style="color:#B392F0"> main</span><span style="color:#E1E4E8">() {</span></span>
239+
<pre language="rust" filename="main.rs" highlights="[1,2,3,4]" class="shiki shiki-themes github-dark dark:github-dark" style="background-color:#24292e;color:#e1e4e8"><code class="language-rust"><span class="line highlight" style="display: inline-block"><span style="color:#F97583">fn</span><span style="color:#B392F0"> main</span><span style="color:#E1E4E8">() {</span></span>
241240
<span class="line highlight" style="display: inline-block"><span style="color:#F97583"> let</span><span style="color:#E1E4E8"> x </span><span style="color:#F97583">=</span><span style="color:#79B8FF"> 5</span><span style="color:#E1E4E8">;</span></span>
242241
<span class="line highlight" style="display: inline-block"><span style="color:#F97583"> let</span><span style="color:#E1E4E8"> y </span><span style="color:#F97583">=</span><span style="color:#79B8FF"> 10</span><span style="color:#E1E4E8">;</span></span>
243242
<span class="line highlight" style="display: inline-block"><span style="color:#B392F0"> println!</span><span style="color:#E1E4E8">(</span><span style="color:#9ECBFF">"Sum: {}"</span><span style="color:#E1E4E8">, x </span><span style="color:#F97583">+</span><span style="color:#E1E4E8"> y);</span></span>

‎packages/comark/SPEC/COMARK/shiki-codeblock-special-chars.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ options:
3535
"language": "html",
3636
"filename": "template.html",
3737
"class": "shiki shiki-themes github-dark dark:github-dark",
38-
"tabindex": "0",
3938
"style": "background-color:#24292e;color:#e1e4e8"
4039
},
4140
[
@@ -287,7 +286,7 @@ options:
287286
## HTML
288287

289288
```html
290-
<pre language="html" filename="template.html" class="shiki shiki-themes github-dark dark:github-dark" tabindex="0" style="background-color:#24292e;color:#e1e4e8"><code class="language-html"><span class="line" style="display: inline"><span style="color:#E1E4E8">&lt;</span><span style="color:#85E89D">div</span><span style="color:#B392F0"> class</span><span style="color:#E1E4E8">=</span><span style="color:#9ECBFF">"container"</span><span style="color:#E1E4E8">&gt;</span></span>
289+
<pre language="html" filename="template.html" class="shiki shiki-themes github-dark dark:github-dark" style="background-color:#24292e;color:#e1e4e8"><code class="language-html"><span class="line" style="display: inline"><span style="color:#E1E4E8">&lt;</span><span style="color:#85E89D">div</span><span style="color:#B392F0"> class</span><span style="color:#E1E4E8">=</span><span style="color:#9ECBFF">"container"</span><span style="color:#E1E4E8">&gt;</span></span>
291290
<span class="line" style="display: inline"><span style="color:#E1E4E8"> &lt;</span><span style="color:#85E89D">h1</span><span style="color:#E1E4E8">&gt;Title & Subtitle&lt;/</span><span style="color:#85E89D">h1</span><span style="color:#E1E4E8">&gt;</span></span>
292291
<span class="line" style="display: inline"><span style="color:#E1E4E8"> &lt;</span><span style="color:#85E89D">p</span><span style="color:#E1E4E8">&gt;Text with "quotes" and 'apostrophes'&lt;/</span><span style="color:#85E89D">p</span><span style="color:#E1E4E8">&gt;</span></span>
293292
<span class="line" style="display: inline"><span style="color:#E1E4E8"> &lt;</span><span style="color:#85E89D">script</span><span style="color:#E1E4E8">&gt;</span><span style="color:#B392F0">alert</span><span style="color:#E1E4E8">(</span><span style="color:#9ECBFF">'XSS &lt; &gt; test'</span><span style="color:#E1E4E8">);&lt;/</span><span style="color:#85E89D">script</span><span style="color:#E1E4E8">&gt;</span></span>

‎packages/comark/SPEC/COMARK/shiki-codeblock-twoslash.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ const message = "Hello from twoslash"
3232
{
3333
"language": "ts",
3434
"meta": "twoslash",
35-
"class": "shiki shiki-themes min-light twoslash lsp dark:min-light",
36-
"tabindex": "0"
35+
"class": "shiki shiki-themes min-light twoslash lsp dark:min-light"
3736
},
3837
[
3938
"code",
@@ -151,7 +150,7 @@ const message = "Hello from twoslash"
151150
## HTML
152151

153152
```html
154-
<pre language="ts" meta="twoslash" class="shiki shiki-themes min-light twoslash lsp dark:min-light" tabindex="0"><code class="language-ts"><span class="line" style="display: inline"><span style="color:#D32F2F">const</span><span style="color:#1976D2"> </span><span style="color:#1976D2"><span class="twoslash-hover twoslash-query-persisted"><span class="twoslash-popup-container"><div class="twoslash-popup-arrow"></div>
153+
<pre language="ts" meta="twoslash" class="shiki shiki-themes min-light twoslash lsp dark:min-light"><code class="language-ts"><span class="line" style="display: inline"><span style="color:#D32F2F">const</span><span style="color:#1976D2"> </span><span style="color:#1976D2"><span class="twoslash-hover twoslash-query-persisted"><span class="twoslash-popup-container"><div class="twoslash-popup-arrow"></div>
155154
<code class="twoslash-popup-code"><span style="color:#D32F2F">const</span><span style="color:#1976D2"> message</span><span style="color:#D32F2F">:</span><span style="color:#22863A"> "Hello from twoslash"</span></code></span>message</span></span><span style="color:#D32F2F"> =</span><span style="color:#22863A"> "Hello from twoslash"</span></span>
156155
<span class="line" style="display: inline"></span></code></pre>
157156
```

‎packages/comark/SPEC/COMARK/shiki-codeblock-with-empty-lines.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ More content here.
3737
"language": "markdown",
3838
"filename": "content.md",
3939
"class": "shiki shiki-themes github-dark dark:github-dark",
40-
"tabindex": "0",
4140
"style": "background-color:#24292e;color:#e1e4e8"
4241
},
4342
[
@@ -137,7 +136,7 @@ More content here.
137136
## HTML
138137

139138
```html
140-
<pre language="markdown" filename="content.md" class="shiki shiki-themes github-dark dark:github-dark" tabindex="0" style="background-color:#24292e;color:#e1e4e8"><code class="language-markdown"><span class="line" style="display: inline"><span style="color:#79B8FF;--shiki-light-font-weight:bold"># My Page Title</span></span>
139+
<pre language="markdown" filename="content.md" class="shiki shiki-themes github-dark dark:github-dark" style="background-color:#24292e;color:#e1e4e8"><code class="language-markdown"><span class="line" style="display: inline"><span style="color:#79B8FF;--shiki-light-font-weight:bold"># My Page Title</span></span>
141140
<span class="line" style="display: inline"></span>
142141
<span class="line" style="display: inline"><span style="color:#E1E4E8">This is the opening paragraph used as the description.</span></span>
143142
<span class="line" style="display: inline"></span>

0 commit comments

Comments
 (0)