From 8b60cab6a22eb29a2ae105512e2f7a4d8e897c24 Mon Sep 17 00:00:00 2001 From: Simon Huber Date: Thu, 24 Oct 2024 15:34:23 +0200 Subject: [PATCH] Keyboard driven input rework (#8678) * Update tag-picker.tid * rework kb-driven-input macro to procedures + new syntax * rework change-input-tab to procedure * fix * remove console log :) * replace defines with procedures * fix link-dropdown * fix focus-selector in new-field dropdown * revert changing the footpring of change-input-tab + make it work as procedure * update change-input-tab procedure * refactor change-input-tab procedure and keep tags/Macro tag * simplify complicated filter * add tags/Global tag * remove tags/Global tag * rename variable --- core/ui/AdvancedSearch/Filter.tid | 44 +++--- core/ui/AdvancedSearch/Shadows.tid | 43 +++--- core/ui/AdvancedSearch/Standard.tid | 28 ++-- core/ui/AdvancedSearch/System.tid | 45 +++--- core/ui/EditTemplate/fields.tid | 55 ++++--- core/ui/EditTemplate/type.tid | 8 +- core/ui/EditorToolbar/link-dropdown.tid | 37 ++--- core/ui/SideBarSegments/search.tid | 28 ++-- core/wiki/macros/keyboard-driven-input.tid | 160 ++++++++++++--------- core/wiki/macros/tag-picker.tid | 28 ++-- 10 files changed, 272 insertions(+), 204 deletions(-) diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid index a8baf9d30..7369e4c40 100644 --- a/core/ui/AdvancedSearch/Filter.tid +++ b/core/ui/AdvancedSearch/Filter.tid @@ -2,18 +2,28 @@ title: $:/core/ui/AdvancedSearch/Filter tags: $:/tags/AdvancedSearch caption: {{$:/language/Search/Filter/Caption}} -\define lingo-base() $:/language/Search/ -\define set-next-input-tab(beforeafter:"after") -<$macrocall $name="change-input-tab" +\procedure lingo-base() $:/language/Search/ +\procedure set-next-input-tab() +<$transclude $variable="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" - beforeafter="$beforeafter$" + beforeafter="after" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>" /> \end -\define cancel-search-actions() +\procedure set-previous-input-tab() +<$transclude $variable="change-input-tab" + stateTitle="$:/state/tab--1498284803" + tag="$:/tags/AdvancedSearch" + beforeafter="before" + defaultState="$:/core/ui/AdvancedSearch/System" + actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>" +/> +\end + +\procedure cancel-search-actions() \whitespace trim <$list filter="[{$:/temp/advancedsearch/input}!match{$:/temp/advancedsearch}]"> <$list-empty> @@ -24,30 +34,30 @@ caption: {{$:/language/Search/Filter/Caption}} \end -\define input-accept-actions() +\procedure input-accept-actions() \whitespace trim <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"> <$list-empty> - <$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"> - <$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/> + <$list filter="[get[text]!is[missing]] :else[get[text]is[shadow]]"> + <$action-navigate $to={{{ [get[text]] }}}/> <$/list-empty> - <$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/> + <$action-navigate $to={{{ [get[text]] }}}/> \end -\define input-accept-variant-actions() +\procedure input-accept-variant-actions() \whitespace trim <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"> <$list-empty> - <$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"> + <$list filter="[get[text]!is[missing]] :else[get[text]is[shadow]]"> <$list filter="[<__tiddler__>get[text]minlength[1]]"> - <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/> + <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/> - <$list filter="[<__tiddler__>get[text]minlength[1]]"> - <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/> + <$list filter="[get[text]minlength[1]]"> + <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/> \end @@ -58,8 +68,8 @@ caption: {{$:/language/Search/Filter/Caption}}
<$keyboard key="((input-tab-right))" actions=<> class="tc-small-gap-right"> - <$keyboard key="((input-tab-left))" actions=<>> - <$macrocall $name="keyboard-driven-input" + <$keyboard key="((input-tab-left))" actions=<>> + <$transclude $variable="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch" refreshTitle="$:/temp/advancedsearch/refresh" @@ -84,7 +94,7 @@ caption: {{$:/language/Search/Filter/Caption}} <$set name="resultCount" value="<$count filter={{$:/temp/advancedsearch}}/>">

<>

<$list filter={{$:/temp/advancedsearch}}> - addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}> + addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] :and[then[]else[tc-list-item-selected]] }}}> <$transclude tiddler="$:/core/ui/ListItemTemplate"/> diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid index 043aee590..c786ef871 100644 --- a/core/ui/AdvancedSearch/Shadows.tid +++ b/core/ui/AdvancedSearch/Shadows.tid @@ -3,18 +3,27 @@ tags: $:/tags/AdvancedSearch caption: {{$:/language/Search/Shadows/Caption}} first-search-filter: [all[shadows]searchsort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -\define lingo-base() $:/language/Search/ +\procedure lingo-base() $:/language/Search/ -\define set-next-input-tab(beforeafter:"after") -<$macrocall $name="change-input-tab" +\procedure set-next-input-tab() +<$transclude $variable="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" - beforeafter="$beforeafter$" + beforeafter="after" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> \end -\define cancel-search-actions() +\procedure set-previous-input-tab() +<$transclude $variable="change-input-tab" + stateTitle="$:/state/tab--1498284803" + tag="$:/tags/AdvancedSearch" + beforeafter="before" + defaultState="$:/core/ui/AdvancedSearch/System" + actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> +\end + +\procedure cancel-search-actions() \whitespace trim <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" @@ -25,22 +34,22 @@ first-search-filter: [all[shadows]searchsort[title]limit[250]] -[[$:/ <$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/> \end -\define input-accept-actions() +\procedure input-accept-actions() \whitespace trim <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" - emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>"> - <$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/> + emptyMessage="<$list filter='[get[text]!is[missing]] :else[get[text]is[shadow]]'><$action-navigate $to={{{ [get[text]] }}}/>"> + <$action-navigate $to={{{ [get[text]] }}}/> \end -\define input-accept-variant-actions() +\procedure input-accept-variant-actions() \whitespace trim <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" - emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [<__tiddler__>get[text]] }}}/>"> - <$list filter="[<__tiddler__>get[text]minlength[1]]"> - <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/> + emptyMessage="<$list filter='[get[text]!is[missing]] :else[get[text]is[shadow]]'><$list filter='[get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [get[text]] }}}/>"> + <$list filter="[get[text]minlength[1]]"> + <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/> \end @@ -50,8 +59,8 @@ first-search-filter: [all[shadows]searchsort[title]limit[250]] -[[$:/
<$keyboard key="((input-tab-right))" actions=<>> -<$keyboard key="((input-tab-left))" actions=<>> -<$macrocall $name="keyboard-driven-input" +<$keyboard key="((input-tab-left))" actions=<>> +<$transclude $variable="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch" refreshTitle="$:/temp/advancedsearch/refresh" @@ -79,7 +88,7 @@ first-search-filter: [all[shadows]searchsort[title]limit[250]] -[[$:/ <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="
{{$:/language/Search/Search/TooShort}}
" variable="listItem"> -<$set name="resultCount" value={{{ [all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] +[count[]]}}}> +<$set name="resultCount" value={{{ [all[shadows]search{$:/temp/advancedsearch}] :except[[$:/temp/advancedsearch]] :except[[$:/temp/advancedsearch/input]] :and[count[]]}}}>
@@ -89,8 +98,8 @@ first-search-filter: [all[shadows]searchsort[title]limit[250]] -[[$:/ <> <%endif%> -<$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]"> -addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}> +<$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] :else[[$:/temp/advancedsearch]] :else[[$:/temp/advancedsearch/input]]"> +addsuffix[-primaryList]] :else[[$:/temp/advancedsearch/selected-item]get[text]] :and[then[]else[tc-list-item-selected]] }}}> <$transclude tiddler="$:/core/ui/ListItemTemplate"/> diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid index c0a2ebe3d..c85c8b9f2 100644 --- a/core/ui/AdvancedSearch/Standard.tid +++ b/core/ui/AdvancedSearch/Standard.tid @@ -2,16 +2,20 @@ title: $:/core/ui/AdvancedSearch/Standard tags: $:/tags/AdvancedSearch caption: {{$:/language/Search/Standard/Caption}} -\define lingo-base() $:/language/Search/ -\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> +\procedure lingo-base() $:/language/Search/ +\procedure set-next-input-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="after" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> -\define next-search-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<>/>"/> +\procedure set-previous-input-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="before" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> -\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />"><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/> +\procedure next-search-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="after" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<>/>"/> -\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/> +\procedure previous-search-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="before" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<>/>"/> -\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [<__tiddler__>get[text]] }}}/>"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/> +\procedure cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />"><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/> + +\procedure input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[get[text]!is[missing]] :else[get[text]is[shadow]]'><$action-navigate $to={{{ [get[text]] }}}/>"><$action-navigate $to={{{ [get[text]] }}}/> + +\procedure input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[get[text]!is[missing]] :else[get[text]is[shadow]]'><$list filter='[get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [get[text]] }}}/>"><$list filter="[get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/> \whitespace trim @@ -19,10 +23,10 @@ caption: {{$:/language/Search/Standard/Caption}}
<$keyboard key="((input-tab-right))" actions=<>> -<$keyboard key="((input-tab-left))" actions=<>> +<$keyboard key="((input-tab-left))" actions=<>> <$keyboard key="shift-alt-Right" actions=<>> -<$keyboard key="shift-alt-Left" actions=<>> -<$macrocall $name="keyboard-driven-input" +<$keyboard key="shift-alt-Left" actions=<>> +<$transclude $variable="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch" refreshTitle="$:/temp/advancedsearch/refresh" @@ -33,7 +37,7 @@ caption: {{$:/language/Search/Standard/Caption}} inputCancelActions=<> inputAcceptActions=<> inputAcceptVariantActions=<> - configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]" + configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]" filterMinLength={{$:/config/Search/MinLength}}/> @@ -55,13 +59,13 @@ caption: {{$:/language/Search/Standard/Caption}} variable="listItem"> <$vars userInput={{{ [[$:/temp/advancedsearch]get[text]] }}} - configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} + configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}] }}} searchListState="$:/temp/advancedsearch/selected-item"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]"> <$list-empty> <$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude mode="block"/> -<$macrocall $name="tabs" +<$transclude $variable="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<>/>" diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid index 5e1ec0254..90b5a9501 100644 --- a/core/ui/AdvancedSearch/System.tid +++ b/core/ui/AdvancedSearch/System.tid @@ -1,19 +1,28 @@ title: $:/core/ui/AdvancedSearch/System tags: $:/tags/AdvancedSearch caption: {{$:/language/Search/System/Caption}} -first-search-filter: [is[system]searchsort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]] +first-search-filter: [is[system]searchsort[title]limit[250]] :except[[$:/temp/advancedsearch]] :except[[$:/temp/advancedsearch/input]] :except[[$:/temp/advancedsearch/selected-item]] -\define lingo-base() $:/language/Search/ -\define set-next-input-tab(beforeafter:"after",stateTitle,tag,defaultState,currentTabTiddler) -<$macrocall $name="change-input-tab" +\procedure lingo-base() $:/language/Search/ +\procedure set-next-input-tab() +<$transclude $variable="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" - beforeafter="$beforeafter$" + beforeafter="after" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> \end -\define cancel-search-actions() +\procedure set-previous-input-tab() +<$transclude $variable="change-input-tab" + stateTitle="$:/state/tab--1498284803" + tag="$:/tags/AdvancedSearch" + beforeafter="before" + defaultState="$:/core/ui/AdvancedSearch/System" + actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<>/>"/> +\end + +\procedure cancel-search-actions() \whitespace trim <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" @@ -24,22 +33,22 @@ first-search-filter: [is[system]searchsort[title]limit[250]] -[[$:/te <$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/> \end -\define input-accept-actions() +\procedure input-accept-actions() \whitespace trim <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" - emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>"> - <$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/> + emptyMessage="<$list filter='[get[text]!is[missing]] :else[get[text]is[shadow]]'><$action-navigate $to={{{ [get[text]] }}}/>"> + <$action-navigate $to={{{ [get[text]] }}}/> \end -\define input-accept-variant-actions() +\procedure input-accept-variant-actions() \whitespace trim <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" - emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [<__tiddler__>get[text]] }}}/>"> - <$list filter="[<__tiddler__>get[text]minlength[1]]"> - <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/> + emptyMessage="<$list filter='[get[text]!is[missing]] :else[get[text]is[shadow]]'><$list filter='[get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{ [get[text]] }}}/>"> + <$list filter="[get[text]minlength[1]]"> + <$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/> \end @@ -49,8 +58,8 @@ first-search-filter: [is[system]searchsort[title]limit[250]] -[[$:/te
<$keyboard key="((input-tab-right))" actions=<>> -<$keyboard key="((input-tab-left))" actions=<>> -<$macrocall $name="keyboard-driven-input" +<$keyboard key="((input-tab-left))" actions=<>> +<$transclude $variable="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch" refreshTitle="$:/temp/advancedsearch/refresh" @@ -78,7 +87,7 @@ first-search-filter: [is[system]searchsort[title]limit[250]] -[[$:/te <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="
{{$:/language/Search/Search/TooShort}}
" variable="listItem"> -<$set name="resultCount" value={{{ [is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]] +[count[]] }}}> +<$set name="resultCount" value={{{ [is[system]search{$:/temp/advancedsearch}] :except[[$:/temp/advancedsearch]] :except[[$:/temp/advancedsearch/input]] :except[[$:/temp/advancedsearch/selected-item]] +[count[]] }}}>
@@ -88,8 +97,8 @@ first-search-filter: [is[system]searchsort[title]limit[250]] -[[$:/te <> <%endif%> -<$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]"> -addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}> +<$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] :except[[$:/temp/advancedsearch]] :except[[$:/temp/advancedsearch/input]] :except[[$:/temp/advancedsearch/selected-item]]"> +addsuffix[-primaryList]] :except[[$:/temp/advancedsearch/selected-item]get[text]] :and[then[]else[tc-list-item-selected]] }}}> <$transclude tiddler="$:/core/ui/ListItemTemplate"/> diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index 0edc33505..9eedad1fa 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -1,35 +1,32 @@ title: $:/core/ui/EditTemplate/fields tags: $:/tags/EditTemplate -\define lingo-base() $:/language/EditTemplate/ -\define config-title() -$:/config/EditTemplateFields/Visibility/$(currentField)$ -\end +\procedure lingo-base() $:/language/EditTemplate/ +\function tf.config-title() [[$:/config/EditTemplateFields/Visibility/]addsuffix[$(currentField)$]substitute[]get[text]] -\define config-filter() -[[hide]] -[title{$(config-title)$}] -\end +\function tf.config-filter() [[hide]] :except[title] -\define get-field-value-tiddler-filter() [subfiltersha256[16]addprefix[/]addprefix] -\define get-field-editor-filter() [get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] +\procedure get-field-value-tiddler-filter() [subfiltersha256[16]addprefix[/]addprefix] +\procedure get-field-editor-filter() [get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] -\define current-tiddler-new-field-selector() -[data-tiddler-title="$(currentTiddlerCSSescaped)$"] .tc-edit-field-add-name-wrapper input -\end +\procedure prefix.bracket() [ +\procedure suffix.bracket() ] -\define new-field-actions() +\function tf.current-tiddler-new-field-selector() [[data-tiddler-title=]addprefix[$(prefix.bracket)$]substitute[]addsuffixaddsuffix[$(suffix.bracket)$]substitute[]] .tc-edit-field-add-name-wrapper input :and[join[ ]] + +\procedure new-field-actions() \whitespace trim <$action-sendmessage $message="tm-add-field" $name={{{ [get[text]] }}} $value={{{ [get[text]] :map[subfilterget[text]] }}}/> <$set name="safeNewFieldValueTiddlerPrefix" value=<> emptyValue=<> > <$action-deletetiddler $filter="[] [prefix[$:/temp/NewFieldValue]prefix] [] []"/> -<$action-sendmessage $message="tm-focus-selector" $param=<>/> +<$action-sendmessage $message="tm-focus-selector" $param=<>/> \end -\define delete-state-tiddlers() <$action-deletetiddler $filter="[] [] []"/> +\procedure delete-state-tiddlers() <$action-deletetiddler $filter="[] [] []"/> -\define cancel-search-actions-inner() +\procedure cancel-search-actions-inner() \whitespace trim <$list filter="[has[text]] [has[text]]" @@ -39,7 +36,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ \end -\define cancel-search-actions() +\procedure cancel-search-actions() \whitespace trim <$set name="userInput" value={{{ [get[text]] }}}> <$list @@ -50,7 +47,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ \end -\define new-field() +\procedure new-field() \whitespace trim <$vars name={{{ [get[text]] }}}> <$reveal type="nomatch" text="" default=<>> @@ -75,15 +72,15 @@ $value={{{ [subfilterget[text]] }}}/> <$set name="newFieldValueTiddlerPrefix" value=<> emptyValue=<> >
- +
-<$list filter="[all[current]fields[]] +[sort[title]]" variable="currentField" storyview="pop"> -<$list filter=<> variable="temp"> +<$list filter="[all[current]fields[]] :and[sort[title]]" variable="currentField" storyview="pop"> +<$list filter=<> variable="temp"> @@ -107,10 +104,10 @@ $value={{{ [subfilterget[text]] }}}/> <$vars refreshTitle=<> storeTitle=<> searchListState=<>>
-<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> +<$transclude $variable="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> selectionStateTitle=<> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} - focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] ~[[false]] }}} cancelPopups="yes" + focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] :else[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/config/EditMode/fieldname-filter]]" inputCancelActions=<> /> <$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}} <$reveal state=<> type="nomatch" text="" default=""> @@ -121,8 +118,8 @@ $value={{{ [subfilterget[text]] }}}/> <>
<$set name="newFieldName" value={{{ [get[text]] }}}> -<$list filter="[!is[shadow]!is[system]fields[]search:titlesort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type" variable="currentField"> -<$list filter="[addsuffix[-primaryList]] -[get[text]]" emptyMessage="""<$link to=<> class="tc-list-item-selected"><$text text=<>/>"""> +<$list filter="[!is[shadow]!is[system]fields[]search:titlesort[]] :except[[created]] :except[[creator]] :except[[draft.of]] :except[[draft.title]] :except[[modified]] :except[[modifier]] :except[[tags]] :except[[text]] :except[[title]] :except[[type]]" variable="currentField"> +<$list filter="[addsuffix[-primaryList]] :except[get[text]]" emptyMessage="""<$link to=<> class="tc-list-item-selected"><$text text=<>/>"""> <$link to=<>> <$text text=<>/> @@ -131,8 +128,8 @@ $value={{{ [subfilterget[text]] }}}/>
<>
-<$list filter="[fields[]search:titlesort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField"> -<$list filter="[addsuffix[-secondaryList]] -[get[text]]" emptyMessage="""<$link to=<> class="tc-list-item-selected"><$text text=<>/>"""> +<$list filter="[fields[]search:titlesort[]] :except[!is[shadow]!is[system]fields[]]" variable="currentField"> +<$list filter="[addsuffix[-secondaryList]] :except[get[text]]" emptyMessage="""<$link to=<> class="tc-list-item-selected"><$text text=<>/>"""> <$link to=<>> <$text text=<>/> @@ -151,7 +148,7 @@ $value={{{ [subfilterget[text]] }}}/> -<$macrocall $name="new-field"/> +<$transclude $variable="new-field"/> diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid index c1c38b72a..259a701b7 100644 --- a/core/ui/EditTemplate/type.tid +++ b/core/ui/EditTemplate/type.tid @@ -2,15 +2,15 @@ title: $:/core/ui/EditTemplate/type tags: $:/tags/EditTemplate first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[description]sort[group-sort]removeprefix[$:/language/Docs/Types/]search] -\define lingo-base() $:/language/EditTemplate/ -\define input-cancel-actions() <$list filter="[get[text]] [get[type]] +[limit[1]]" emptyMessage="""<>"""><$action-sendmessage $message="tm-remove-field" $param="type"/><$action-deletetiddler $filter="[] [] []"/> +\procedure lingo-base() $:/language/EditTemplate/ +\procedure input-cancel-actions() <$list filter="[get[text]] [get[type]] :and[limit[1]]" emptyMessage="""<>"""><$action-sendmessage $message="tm-remove-field" $param="type"/><$action-deletetiddler $filter="[] [] []"/> \whitespace trim <$set name="refreshTitle" value=<>>
<>
<$fieldmangler> -<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> selectionStateTitle=<> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<>/><$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[] [] [] []"/> +<$transclude $variable="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> selectionStateTitle=<> field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] :else[[false]] }}} cancelPopups="yes" configTiddlerFilter="[[$:/core/ui/EditTemplate/type]]" inputCancelActions=<>/><$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}<$action-deletetiddler $filter="[] [] [] []"/>
@@ -23,7 +23,7 @@ first-search-filter: [all[shadows+tiddlers]prefix[$:/language/Docs/Types/]sort[d <$text text={{!!group}}/>
<$set name="userInput" value={{{ [get[text]] }}}> -<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]group{!!group}] +[sort[description]] +[removeprefix[$:/language/Docs/Types/]] +[search]">addsuffix[-primaryList]] -[get[text]] +[then[]else[tc-list-item-selected]] }}}><$link to={{{ [addprefix[$:/language/Docs/Types/]get[name]] }}}><$view tiddler={{{ [addprefix[$:/language/Docs/Types/]] }}} field="description"/><$text text=" "/>(<$view tiddler={{{ [addprefix[$:/language/Docs/Types/]] }}} field="name"/>) +<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]group{!!group}] :and[sort[description]] :and[removeprefix[$:/language/Docs/Types/]] :and[search]">addsuffix[-primaryList]] :except[get[text]] :and[then[]else[tc-list-item-selected]] }}}><$link to={{{ [addprefix[$:/language/Docs/Types/]get[name]] }}}><$view tiddler={{{ [addprefix[$:/language/Docs/Types/]] }}} field="description"/><$text text=" "/>(<$view tiddler={{{ [addprefix[$:/language/Docs/Types/]] }}} field="name"/>) diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid index d2887a180..2b75a32ce 100644 --- a/core/ui/EditorToolbar/link-dropdown.tid +++ b/core/ui/EditorToolbar/link-dropdown.tid @@ -1,44 +1,49 @@ title: $:/core/ui/EditorToolbar/link-dropdown -\define lingo-base() $:/language/Buttons/Link/ +\procedure lingo-base() $:/language/Buttons/Link/ -\define add-link-actions() +\procedure add-link-actions() \whitespace trim -<$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(linkTiddler)$}} /> +<$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{{ [get[text]] }}} /> <$action-deletetiddler $filter="[] [] [] [] []"/> \end -\define get-focus-selector() [data-tiddler-title="$(cssEscapedTitle)$"] .tc-create-wikitext-link input +\procedure prefix.bracket() [ +\procedure suffix.bracket() ] -\define cancel-search-actions-inner() +\function tf.get-focus-selector() [[data-tiddler-title=]addprefix[$(prefix.bracket)$]substitute[]addsuffixaddsuffix[$(suffix.bracket)$]substitute[]] .tc-create-wikitext-link input :and[join[ ]] + +\procedure cancel-search-actions-inner() <$set name="userInput" value={{{ [get[text]] }}}><$list filter="[get[text]!match]" emptyMessage="<$action-deletetiddler $filter='[] [] [] []'/>"><$action-setfield $tiddler=<> text=<>/><$action-setfield $tiddler=<> text="yes"/> \end -\define cancel-search-actions() <$list filter="[!has[text]] +[!has[text]]" emptyMessage="<>"><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> +\procedure cancel-search-actions() <$list filter="[!has[text]] :and[!has[text]]" emptyMessage="<>"><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> -\define external-link() +\procedure external-link() \whitespace trim <$button class="tc-btn-invisible tc-btn-mini" style="width: auto; display: inline-block; background-colour: inherit;" actions=<>> {{$:/core/images/chevron-right}} \end -\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<>/>"/> +\procedure set-next-input-tab() <$transclude $variable="change-input-tab-after" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<>/>"/> -\define body(config-title) +\procedure set-previous-input-tab() <$transclude $variable="change-input-tab-before" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<>/>"/> + +\procedure body(config-title) \whitespace trim ''<>'' -<$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" searchListState=<> refreshTitle=<> storeTitle=<>> +<$vars searchTiddler={{{ [addsuffix[/search]] }}} linkTiddler={{{ [addsuffix[/link]] }}} linktext="" searchListState=<> refreshTitle=<> storeTitle=<>> <$vars linkTiddler=<>> <$keyboard key="((input-tab-right))" actions=<>> -<$keyboard key="((input-tab-left))" actions=<> class="tc-create-wikitext-link"> -<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> +<$keyboard key="((input-tab-left))" actions=<> class="tc-create-wikitext-link"> +<$transclude $variable="keyboard-driven-input" tiddler=<> storeTitle=<> selectionStateTitle=<> refreshTitle=<> type="search" filterMinLength="1" tag="input" focus="true" class="tc-popup-handle" inputCancelActions=<> inputAcceptActions=<> placeholder={{$:/language/Search/Search}} default="" - configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]" /> + configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]" /> @@ -46,7 +51,7 @@ title: $:/core/ui/EditorToolbar/link-dropdown <> <$button class="tc-btn-invisible tc-btn-mini" style="width: auto; display: inline-block; background-colour: inherit;"> -<><$set name="cssEscapedTitle" value={{{ [escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<>/> +<><$set name="cssEscapedTitle" value={{{ [escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<>/> {{$:/core/images/close-button}} @@ -56,7 +61,7 @@ title: $:/core/ui/EditorToolbar/link-dropdown <$linkcatcher actions=<> to=<>> -<$vars userInput={{{ [get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}> +<$vars userInput={{{ [get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}] }}}> {{$:/core/ui/SearchResults}} @@ -70,4 +75,4 @@ title: $:/core/ui/EditorToolbar/link-dropdown \end -<$macrocall $name="body" config-title=<>/> +<$transclude $variable="body" config-title=<>/> diff --git a/core/ui/SideBarSegments/search.tid b/core/ui/SideBarSegments/search.tid index 690210307..d4aa7923f 100644 --- a/core/ui/SideBarSegments/search.tid +++ b/core/ui/SideBarSegments/search.tid @@ -3,12 +3,12 @@ tags: $:/tags/SideBarSegment \whitespace trim -\define count-popup-button() +\procedure count-popup-button() \whitespace trim <$button popup=<> class="tc-btn-invisible"> {{$:/core/images/down-arrow}} -<$list filter="[{$(searchTiddler)$}minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem"> -<$vars userInput={{{ [get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} replaceRegexp="limit\[\d+\]"> +<$list filter="[get[text]minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem"> +<$vars userInput={{{ [get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}] }}} replaceRegexp="limit\[\d+\]"> <$vars primaryListFilter={{{ [get[first-search-filter]search-replace:g:regexp,[]] }}} secondaryListFilter={{{ [get[second-search-filter]search-replace:g:regexp,[]] }}}> <$set name="resultCount" value="""<$count filter="[subfilter] [subfilter]"/>"""> {{$:/language/Search/Matches}} @@ -19,9 +19,9 @@ tags: $:/tags/SideBarSegment \end -\define search-results-list() +\procedure search-results-list() \whitespace trim -<$vars userInput={{$(searchTiddler)$}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}> +<$vars userInput={{{ [get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}] }}}> <$list filter="[minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""
{{$:/language/Search/Search/TooShort}}
""" variable="listItem"> <$tiddler tiddler=<>> @@ -34,30 +34,32 @@ tags: $:/tags/SideBarSegment \end -\define cancel-search-actions() <$list filter="[get[text]!match{$:/temp/search}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/search]] [] []"/>"""><$action-setfield $tiddler="$:/temp/search" text={{{ [get[text]] }}}/><$action-setfield $tiddler="$:/temp/search/refresh" text="yes"/> +\procedure cancel-search-actions() <$list filter="[get[text]!match{$:/temp/search}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/search]] [] []"/>"""><$action-setfield $tiddler="$:/temp/search" text={{{ [get[text]] }}}/><$action-setfield $tiddler="$:/temp/search/refresh" text="yes"/> -\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/> +\procedure input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[get[text]!is[missing]] :else[get[text]is[shadow]]"><$action-navigate $to={{{ [get[text]] }}}/>"""><$action-navigate $to={{{ [get[text]] }}}/> -\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [<__tiddler__>get[text]] }}}/> +\procedure input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[get[text]!is[missing]] :else[get[text]is[shadow]]"><$list filter="[get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/>"""><$list filter="[get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{ [get[text]] }}}/> -\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<>/>"""/> +\procedure set-next-input-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="after" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<>/>"""/> -\define advanced-search-actions() <$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search/input}}/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/search/input}}/><><$action-navigate $to="$:/AdvancedSearch"/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/><$action-deletetiddler $filter="$:/temp/search $:/temp/search/input $:/temp/search/refresh []"/> +\procedure set-previous-input-tab() <$transclude $variable="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="before" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<>/>"""/> + +\procedure advanced-search-actions() <$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search/input}}/><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/search/input}}/><><$action-navigate $to="$:/AdvancedSearch"/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/><$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/><$action-deletetiddler $filter="$:/temp/search $:/temp/search/input $:/temp/search/refresh []"/>
<$vars editTiddler="$:/temp/search" searchTiddler="$:/temp/search/input" searchListState=<>>
<$keyboard key="((input-tab-right))" actions=<>> -<$keyboard key="((input-tab-left))" actions=<>> +<$keyboard key="((input-tab-left))" actions=<>> <$keyboard key="((advanced-search-sidebar))" actions=<>>
-<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> +<$transclude $variable="keyboard-driven-input" tiddler=<> storeTitle=<> selectionStateTitle=<> refreshTitle="$:/temp/search/refresh" type="search" tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<> class="tc-tiny-gap-right tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<> inputAcceptActions=<> inputAcceptVariantActions=<> cancelPopups="yes" - configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/> + configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] :else[{$:/config/SearchResults/Default}]"/> diff --git a/core/wiki/macros/keyboard-driven-input.tid b/core/wiki/macros/keyboard-driven-input.tid index 7983ea9f0..5d28f1125 100644 --- a/core/wiki/macros/keyboard-driven-input.tid +++ b/core/wiki/macros/keyboard-driven-input.tid @@ -1,105 +1,137 @@ title: $:/core/macros/keyboard-driven-input tags: $:/tags/Macro -\define change-input-tab(stateTitle,tag,beforeafter,defaultState,actions) +\procedure prefix.bracket() [ +\procedure suffix.bracket() ] + +\function tf.change-input-tab.next-tab() [[all]addprefixaddsuffixaddsuffix[shadows+tiddlers]addsuffixaddsuffix[tag!has]addsuffixaddsuffix[draft.of]addsuffixaddsuffixaddsuffix[]addsuffixaddsuffix[ :else]addsuffixaddsuffixaddsuffixaddsuffixaddsuffix[match]addsuffixaddsuffix[after]addsuffixaddsuffix[then]addsuffixaddsuffix[ :else]addsuffixaddsuffixaddsuffixaddsuffixaddsuffix[match]addsuffixaddsuffix[before]addsuffixaddsuffix[then]addsuffix] + +\procedure change-input-tab(stateTitle,tag,beforeafter,defaultState,actions) \whitespace trim -<$set name="tabsList" filter="[all[shadows+tiddlers]tag<__tag__>!has[draft.of]]"> +<$set name="tabsList" filter="[!is[blank]enlist-input[]] :else[all[shadows+tiddlers]tag!has[draft.of]]"> <$let - currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}} + currentState={{{ [!is[missing]get[text]] :else[] }}} firstTab={{{ [enlistnth[1]] }}} lastTab={{{ [enlistlast[]] }}} - nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix] }}} + nextTabSubFilter=<> + nextTab={{{ [subfilter] }}} > - <$action-setfield $tiddler=<<__stateTitle__>> text=<>/> - $actions$ + <$action-setfield $tiddler=<> text=<>/> + <> \end -\define keyboard-input-actions() +\procedure keyboard-input-actions() \whitespace trim -<$list filter="[<__index__>match[]]"> - <$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/> - -<$list filter="[<__index__>!match[]]"> - <$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>getindex<__index__>] }}}/> - +<%if [match[]] %> + <$action-setfield $tiddler=<> text={{{ [get] }}}/> +<% endif %> +<%if [!match[]] %> + <$action-setfield $tiddler=<> text={{{ [getindex] }}}/> +<% endif %> \end -\define input-next-actions-inner() +\procedure input-next-actions-inner() \whitespace trim -<$list filter="[minlength[1]]" variable="ignore"> - <$action-setfield $tiddler=<<__selectionStateTitle__>> text=<>/> - <$list filter="[<__index__>match[]]"> - <$action-setfield $tiddler=<<__tiddler__>> $field=<<__field__>> $value={{{ [] +[splitregexp[(?:.(?!-))+$]] }}}/> - - <$list filter="[<__index__>!match[]]"> - <$action-setfield $tiddler=<<__tiddler__>> $index=<<__index__>> $value={{{ [] +[splitregexp[(?:.(?!-))+$]] }}}/> - - <$action-setfield $tiddler=<<__refreshTitle__>> text="yes"/> - +<%if [minlength[1]] %> + <$action-setfield $tiddler=<> text=<>/> + <%if [match[]] %> + <$action-setfield $tiddler=<> $field=<> $value={{{ [] :and[splitregexp[(?:.(?!-))+$]] }}}/> + <% endif %> + <%if [!match[]] %> + <$action-setfield $tiddler=<> $index=<> $value={{{ [] :and[splitregexp[(?:.(?!-))+$]] }}}/> + <% endif %> + <$action-setfield $tiddler=<> text="yes"/> +<% endif %> \end -\define input-next-actions(afterOrBefore:"after",reverse:"") +\procedure input-next-actions-after() \whitespace trim -<$list - filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" - variable="ignore" -> +<%if [get[text]minlength] [match[0]] %> <$let - userInput={{{ [<__storeTitle__>get[text]] }}} - selectedItem={{{ [<__selectionStateTitle__>get[text]] }}} - configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}} - primaryListFilter={{{ [get<__firstSearchFilterField__>] }}} - secondaryListFilter={{{ [get<__secondSearchFilterField__>] }}} + userInput={{{ [get[text]] }}} + selectedItem={{{ [get[text]] }}} + configTiddler={{{ [subfilter] }}} + primaryListFilter={{{ [get] }}} + secondaryListFilter={{{ [get] }}} > <$set name="filteredList" - filter="[subfilteraddsuffix[-primaryList]] =[subfilteraddsuffix[-secondaryList]]" + filter="[subfilteraddsuffix[-primaryList]] :all[subfilteraddsuffix[-secondaryList]]" > <$let - nextItem={{{ [enlist$afterOrBefore$] ~[enlist$reverse$nth[1]] }}} + nextItem={{{ [enlistafter] :else[enlistnth[1]] }}} firstItem={{{ [enlistnth[1]] }}} lastItem={{{ [enlistlast[]] }}} > - <$list filter="[match!match]" variable="ignore"> - <$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]thenaddsuffix[-userInput]] ~[] }}}> - <> - - - <$list filter="[match!match]" variable="ignore"> - <$set name="nextItem" value={{{ [[$afterOrBefore$]match[after]thenaddsuffix[-userInput]] ~[] }}}> - <> - - - <$list filter="[matchmatch]" variable="ignore"> + <%if [match!match] [!match!match] %> + <> + <%elseif [match!match] %> <$set name="nextItem" value={{{ [addsuffix[-userInput]] }}}> <> - - <$list filter="[!match!match]" variable="ignore"> - <> - + <%elseif [matchmatch] %> + <$set name="nextItem" value={{{ [addsuffix[-userInput]] }}}> + <> + + <% endif %> - +<% endif %> \end -\define keyboard-driven-input(tiddler,storeTitle,field:"text",index:"",tag:"input",type,focus:"",inputAcceptActions,inputAcceptVariantActions,inputCancelActions,placeholder:"",default:"",class,focusPopup,rows,minHeight,tabindex,size,autoHeight,filterMinLength:"0",refreshTitle,selectionStateTitle,cancelPopups:"",configTiddlerFilter,firstSearchFilterField:"first-search-filter",secondSearchFilterField:"second-search-filter") +\procedure input-next-actions-before() \whitespace trim -<$keyboard key="((input-accept))" actions=<<__inputAcceptActions__>>> -<$keyboard key="((input-accept-variant))" actions=<<__inputAcceptVariantActions__>>> -<$keyboard key="((input-up))" actions=<>> -<$keyboard key="((input-down))" actions=<>> -<$keyboard key="((input-cancel))" actions=<<__inputCancelActions__>>> +<%if [get[text]minlength] [match[0]] %> + <$let + userInput={{{ [get[text]] }}} + selectedItem={{{ [get[text]] }}} + configTiddler={{{ [subfilter] }}} + primaryListFilter={{{ [get] }}} + secondaryListFilter={{{ [get] }}} + > + <$set + name="filteredList" + filter="[subfilteraddsuffix[-primaryList]] :all[subfilteraddsuffix[-secondaryList]]" + > + <$let + nextItem={{{ [enlistbefore] :else[enlistreverse[]nth[1]] }}} + firstItem={{{ [enlistnth[1]] }}} + lastItem={{{ [enlistlast[]] }}} + > + <%if [match!match] %> + <$set name="nextItem" value={{{ [addsuffix[-userInput]] }}}> + <> + + <%elseif [match!match] [!match!match] %> + <> + <%elseif [matchmatch] %> + <$set name="nextItem" value={{{ [addsuffix[-userInput]] }}}> + <> + + <% endif %> + + + +<% endif %> +\end + +\procedure keyboard-driven-input(tiddler,storeTitle,field:"text",index:"",tag:"input",type,focus:"",inputAcceptActions,inputAcceptVariantActions,inputCancelActions,placeholder:"",default:"",class,focusPopup,rows,minHeight,tabindex,size,autoHeight,filterMinLength:"0",refreshTitle,selectionStateTitle,cancelPopups:"",configTiddlerFilter,firstSearchFilterField:"first-search-filter",secondSearchFilterField:"second-search-filter") +\whitespace trim +<$keyboard key="((input-accept))" actions=<>> +<$keyboard key="((input-accept-variant))" actions=<>> +<$keyboard key="((input-up))" actions=<>> +<$keyboard key="((input-down))" actions=<>> +<$keyboard key="((input-cancel))" actions=<>> <$edit-text - tiddler=<<__tiddler__>> field=<<__field__>> index=<<__index__>> - inputActions=<> tag=<<__tag__>> class=<<__class__>> - placeholder=<<__placeholder__>> default=<<__default__>> focusPopup=<<__focusPopup__>> - focus=<<__focus__>> type=<<__type__>> rows=<<__rows__>> minHeight=<<__minHeight__>> - tabindex=<<__tabindex__>> size=<<__size__>> autoHeight=<<__autoHeight__>> - refreshTitle=<<__refreshTitle__>> cancelPopups=<<__cancelPopups__>> + tiddler=<> field=<> index=<> + inputActions=<> tag=<> class=<> + placeholder=<> default=<> focusPopup=<> + focus=<> type=<> rows=<> minHeight=<> + tabindex=<> size=<> autoHeight=<> + refreshTitle=<> cancelPopups=<> /> diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid index ae3e16818..2ceaab7c4 100644 --- a/core/wiki/macros/tag-picker.tid +++ b/core/wiki/macros/tag-picker.tid @@ -13,11 +13,11 @@ second-search-filter: [subfilteris[system]search:title \function tf.tagpicker-dropdown-id() [] - [[$(saveTiddler)$-[$(tagField)$-$(tagListFilter)$]substitute[]sha256[]] +[join[/]] + [[$(saveTiddler)$-[$(tagField)$-$(tagListFilter)$]substitute[]sha256[]] :and[join[/]] \end \function tf.tagpicker-dropdown-class() [sha256[]addprefix[tc-]] -\function tf.get-tagpicker-focus-selector() [addprefix[.]] .tc-popup-handle +[join[ ]] +\function tf.get-tagpicker-focus-selector() [addprefix[.]] .tc-popup-handle :and[join[ ]] \procedure add-tag-actions() <$let tag=<<_tf.getTag>> > - <$action-listops $tiddler=<> $field=<> $subfilter='+[toggletrim[]]'/> + <$action-listops $tiddler=<> $field=<> $subfilter=':and[toggletrim[]]'/> <%if [] :intersection[getenlist-input[]] %> <%else%> @@ -46,7 +46,7 @@ second-search-filter: [subfilteris[system]search:title The second ESC tries to close the "draft tiddler" --> \procedure clear-tags-actions-inner() -<%if [has[text]] ~[has[text]] %> +<%if [has[text]] :else[has[text]] %> <> <%else%> <> @@ -90,7 +90,7 @@ The second ESC tries to close the "draft tiddler" <$let currentTiddler=<> - button-classes=`tc-btn-invisible ${[addsuffix] -[get[text]] :then[[]] ~tc-tag-button-selected }$` + button-classes=`tc-btn-invisible ${[addsuffix] :except[get[text]] :then[[]] ~tc-tag-button-selected }$` get-tagpicker-focus-selector=`${[]}$` > {{||$:/core/ui/TagPickerTagTemplate}} @@ -102,10 +102,10 @@ The second ESC tries to close the "draft tiddler" \procedure tag-picker-inner() -
] +[join[ ]] }}}> +
] :and[join[ ]] }}}>
- <$macrocall $name="keyboard-driven-input" + <$transclude $variable="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> @@ -117,7 +117,7 @@ The second ESC tries to close the "draft tiddler" focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex=<> - focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} + focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] :else[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} cancelPopups=<> configTiddlerFilter="[[$:/core/macros/tag-picker]]" @@ -146,9 +146,9 @@ The second ESC tries to close the "draft tiddler"
<%if [has[text]] %>
- <$macrocall $name="tag-picker-listTags" filter=<> suffix="-primaryList" empty={{$:/language/EditTemplate/Tags/EmptyMessage}}/> + <$transclude $variable="tag-picker-listTags" filter=<> suffix="-primaryList" empty={{$:/language/EditTemplate/Tags/EmptyMessage}}/>
- <$macrocall $name="tag-picker-listTags" filter=<> suffix="-secondaryList" empty={{$:/language/EditTemplate/Tags/EmptyMessage/System}}/> + <$transclude $variable="tag-picker-listTags" filter=<> suffix="-secondaryList" empty={{$:/language/EditTemplate/Tags/EmptyMessage/System}}/>
<%endif%>
@@ -161,7 +161,7 @@ The second ESC tries to close the "draft tiddler" \function _tf.getUserInput() [get[text]] \function _tf.getTag() [get[text]] -\function _tf.makeTagNameTiddler() [[$:/temp/NewTagName]] [!match[tags]] +[join[/]] [] +[join[]] +\function _tf.makeTagNameTiddler() [[$:/temp/NewTagName]] [!match[tags]] :and[join[/]] [] :and[join[]] @@ -174,10 +174,10 @@ The second ESC tries to close the "draft tiddler" saveTiddler={{{ [is[blank]thenelse] }}} newTagNameTiddler={{{ [[newTagNameTiddler]is[variable]then] :else[<_tf.makeTagNameTiddler>] }}} - storeTitle={{{ [[$:/temp/NewTagName/input]] [!match[tags]] +[join[/]] [] +[join[]] }}} + storeTitle={{{ [[$:/temp/NewTagName/input]] [!match[tags]] :and[join[/]] [] :and[join[]] }}} newTagNameSelectionTiddlerQualified=<> - tagSelectionState={{{ [!match[]] ~[] }}} + tagSelectionState={{{ [!match[]] :else[] }}} refreshTitle=<> @@ -186,6 +186,6 @@ The second ESC tries to close the "draft tiddler" cancelPopups="yes" > - <$macrocall $name="tag-picker-inner"/> + <$transclude $variable="tag-picker-inner"/> \end
<$text text=<>/>: -<$keyboard key="((delete-field))" actions="""<$action-deletefield $field=<>/><$set name="currentTiddlerCSSescaped" value={{{ [escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<>/>"""> +<$keyboard key="((delete-field))" actions="""<$action-deletefield $field=<>/><$set name="currentTiddlerCSSescaped" value={{{ [escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<>/>"""> <$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] }}} />