Skip to content

Tabpane: improve key-kind default setting #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Tabpane: improve key-kind default setting #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions layouts/shortcodes/tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,34 @@
{{/* store all tab info in dict tab */ -}}
{{ $tab := dict "header" $header -}}
{{ with $.Get "lang" -}}
{{ $tab = merge $tab (dict "language" ($.Get "lang")) -}}
{{ $tab = merge $tab (dict "language" .) -}}
{{ end -}}
{{ with $.Get "highlight" -}}
{{ $tab = merge $tab (dict "highlight" ($.Get "highlight")) -}}
{{ $tab = merge $tab (dict "highlight" .) -}}
{{ end -}}
{{ with $.Get "text" -}}
{{ if ne ( printf "%T" . ) "bool" -}}
{{ errorf "Shortcode %q: boolean value expected for parameter %q, but got %s. Error position: %s" $.Name "text" (printf "%T" .) $.Position -}}
{{ end -}}
{{ $tab = merge $tab (dict "text" ($.Get "text")) -}}
{{ $tab = merge $tab (dict "text" .) -}}
{{ end -}}
{{ with $.Get "right" -}}
{{ if ne ( printf "%T" . ) "bool" -}}
{{ errorf "Shortcode %q: boolean value expected for parameter %q, but got %s. Error position: %s" $.Name "right" (printf "%T" .) $.Position -}}
{{ end -}}
{{ $tab = merge $tab (dict "rightpush" ($.Get "right")) -}}
{{ $tab = merge $tab (dict "rightpush" .) -}}
{{ end -}}
{{ with $.Get "disabled" -}}
{{ if ne ( printf "%T" . ) "bool" -}}
{{ errorf "Shortcode %q: boolean value expected for parameter %q, but got %s. Error position: %s" $.Name "disabled" (printf "%T" .) $.Position -}}
{{ end -}}
{{ $tab = merge $tab (dict "disabled" ($.Get "disabled")) -}}
{{ $tab = merge $tab (dict "disabled" .) -}}
{{ end -}}

{{ with $.Inner -}}
{{/* Trim any leading and trailing newlines from .Inner, this avoids
spurious lines during syntax highlighting */ -}}
{{ $tab = merge $tab (dict "content" $.Inner) -}}
{{ $tab = merge $tab (dict "content" .) -}}
{{ end -}}

{{/* add dict tab to parent's scratchpad */ -}}
Expand Down
57 changes: 30 additions & 27 deletions layouts/shortcodes/tabpane.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@
{{ $textPane := default false ($.Get "text") -}}
{{ $langEqualsHeader := default false ($.Get "langEqualsHeader") -}}
{{ $deprecatedPersistLang := $_persistLang | default true -}}
{{ $persistKeyKind := $_persist | default (cond (eq $langPane "") "lang" "header") -}}
{{ $persistTab := and $deprecatedPersistLang (ne $persistKeyKind "disabled") -}}
{{ $persistKeyKind := $_persist
| default (cond (or $textPane (ne "" $langPane)) "header" "lang") -}}
{{ $persistTabpane := and $deprecatedPersistLang (ne $persistKeyKind "disabled") -}}
{{ $rightPane := default false ($.Get "right") -}}
{{ $activeSet := false -}}
{{/* Scratchpad gets populated through call to .Inner */ -}}
Expand All @@ -59,10 +60,7 @@
<ul class="nav nav-tabs{{ if $rightPane }} justify-content-end{{ end }}" id="tabs-{{- $tabPaneOrdinal -}}" role="tablist">
{{ range $index, $element := $.Scratch.Get "tabs" -}}

{{ $disabled := false -}}
{{ with $element.disabled -}}
{{ $disabled = . -}}
{{ end -}}
{{ $enabled := not $element.disabled -}}

{{ $lang := $langPane -}}
{{ if $langEqualsHeader -}}
Expand All @@ -74,14 +72,21 @@

{{ $persistKey := "" -}}
{{ if eq $persistKeyKind "lang" -}}
{{ $persistKey = $lang -}}
{{ with $lang -}}
{{ $persistKey = . -}}
{{ else -}}
{{ with findRE "```(\\S+)" $element.content 1 -}}
{{ $persistKey = index . 1 -}}
{{ end -}}
{{ end -}}
{{ else if eq $persistKeyKind "header" -}}
{{ $persistKey = $element.header -}}
{{ end -}}
{{ $persistKey = $persistKey | lower -}}
{{ $persistTab := and $persistTabpane $persistKey $enabled -}}

{{/* Check for duplicate tab-persistence keys */ -}}
{{ if and $persistTab $persistKey -}}
{{ if $persistTab -}}
{{ if in $persistKeyList $persistKey -}}
{{ $duplicate = true -}}
{{ $duplicateKey = $persistKey -}}
Expand All @@ -101,23 +106,23 @@
{{ $tabid := printf "tabs-%02v-%v-tab" $tabPaneOrdinal $index | anchorize -}}
{{ $entryid := printf "tabs-%02v-%v" $tabPaneOrdinal $index | anchorize -}}

{{ $isActive := and $enabled (not $activeSet) -}}

<button class="nav-link
{{- if and ( not $activeSet ) ( not $disabled ) }} active{{ end -}}
{{ if $disabled }} disabled{{ end -}}"
{{- if $isActive -}}
{{ $activeSet = true }} active
{{- end -}}
{{ if not $enabled }} disabled{{ end -}}"
id="{{ $tabid }}" data-bs-toggle="tab" data-bs-target="#{{ $entryid }}" role="tab"
{{ if and $persistTab $persistKey -}}
{{ if $persistTab -}}
{{ printf "%s=%q " $tpPersistAttrName $persistKey | safeHTMLAttr -}}
{{ end -}}
aria-controls="{{- $entryid -}}" aria-selected="{{- cond ( and ( not $activeSet ) ( not $disabled ) ) "true" "false" -}}">
aria-controls="{{- $entryid -}}" aria-selected="{{ $isActive }}">
{{ index . "header" | markdownify }}
</button>
</li>

{{- if not $disabled -}}
{{ $activeSet = true -}}
{{ end -}}

{{ end }}
{{- end }}
</ul>

{{ if $duplicate -}}
Expand All @@ -138,10 +143,7 @@
{{ $lang = . -}}
{{ end -}}

{{ $disabled := false -}}
{{ with $element.disabled -}}
{{ $disabled = . -}}
{{ end -}}
{{ $enabled := not $element.disabled -}}

{{ $hloptions := $hloptionsPane -}}
{{ with $element.highlight -}}
Expand All @@ -155,7 +157,12 @@

{{ $tabid := printf "tabs-%02v-%v-tab" $tabPaneOrdinal $index | anchorize -}}
{{ $entryid := printf "tabs-%02v-%v" $tabPaneOrdinal $index | anchorize }}
<div class="{{ if $text }}tab-body {{end}}tab-pane fade{{ if and ( not $activeSet ) ( not $disabled ) }} show active{{ end }}"
{{ $isActive := and $enabled (not $activeSet) -}}

<div class="{{ if $text }}tab-body {{end}}tab-pane fade
{{- if $isActive -}}
{{ $activeSet = true }} show active
{{- end }}"
id="{{ $entryid }}" role="tabpanel" aria-labelled-by="{{ $tabid }}" tabindex="{{ $tabPaneOrdinal }}">
{{ if $text -}}
{{ index . "content" -}}
Expand All @@ -164,9 +171,5 @@
{{ end }}
</div>

{{- if not $disabled -}}
{{ $activeSet = true -}}
{{ end -}}

{{ end }}
{{- end }}
</div>