From e43ffe860bb225ca5ccada65fdb757e0b116e128 Mon Sep 17 00:00:00 2001 From: Simon Huber Date: Tue, 27 Oct 2020 18:33:06 +0100 Subject: [PATCH] Fix #4910 - "Editor link dropdown is broken in pre-release." (#4913) * fix #4910 in sidebarsegments/search * fix #4910 in editortoolbar/link-dropdown * fix #4910 in keyboard-driven-input macro * Update keyboard-driven-input_Macro.tid * Fix #4910 in tag-picker macro * Update tag-picker.tid --- core/ui/EditorToolbar/link-dropdown.tid | 6 +++++- core/ui/SideBarSegments/search.tid | 17 +++++++---------- core/wiki/macros/keyboard-driven-input.tid | 8 ++++++-- core/wiki/macros/tag-picker.tid | 12 +++++++----- .../macros/keyboard-driven-input_Macro.tid | 5 ++--- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid index c9c1989b6..671796ce4 100644 --- a/core/ui/EditorToolbar/link-dropdown.tid +++ b/core/ui/EditorToolbar/link-dropdown.tid @@ -37,8 +37,12 @@ title: $:/core/ui/EditorToolbar/link-dropdown <$linkcatcher actions=<> to=<>> +<$vars userInput={{{ [get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}> + {{$:/core/ui/SearchResults}} + + @@ -47,4 +51,4 @@ title: $:/core/ui/EditorToolbar/link-dropdown \end -<$macrocall $name="body" config-title=<>/> \ No newline at end of file +<$macrocall $name="body" config-title=<>/> diff --git a/core/ui/SideBarSegments/search.tid b/core/ui/SideBarSegments/search.tid index ee2d03928..a4c645168 100644 --- a/core/ui/SideBarSegments/search.tid +++ b/core/ui/SideBarSegments/search.tid @@ -19,17 +19,17 @@ tags: $:/tags/SideBarSegment \define search-results-list() \whitespace trim -<$set name="userInput" value={{$(searchTiddler)$}}> +<$vars userInput={{$(searchTiddler)$}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}> <$list filter="[minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""
{{$:/language/Search/Search/TooShort}}
""" variable="listItem"> -<$tiddler tiddler="$(configTiddler)$"> +<$tiddler tiddler=<>> {{$:/core/ui/SearchResults}} - + \end \define delete-state-tiddlers() <$action-deletetiddler $filter="[[$:/temp/search]] [] []"/> @@ -46,8 +46,7 @@ tags: $:/tags/SideBarSegment
-<$vars configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} searchTiddler="$:/temp/search/input" searchListState=<>> -<$vars titleSearchFilter={{{ [get[first-search-filter]] }}} allSearchFilter={{{ [get[second-search-filter]] }}}> +<$vars searchTiddler="$:/temp/search/input" searchListState=<>>
<$keyboard key="((input-tab-right))" actions=<>> <$keyboard key="((input-tab-left))" actions=<>> @@ -55,9 +54,9 @@ tags: $:/tags/SideBarSegment <$macrocall $name="keyboard-driven-input" tiddler="$:/temp/search" storeTitle=<> selectionStateTitle=<> refreshTitle="$:/temp/search/refresh" type="search" tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<> - class="tc-popup-handle" primaryListFilter=<> secondaryListFilter=<> - filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<> - inputAcceptActions=<> inputAcceptVariantActions=<> cancelPopups="yes" /> + class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<> + inputAcceptActions=<> inputAcceptVariantActions=<> cancelPopups="yes" + configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/> @@ -91,6 +90,4 @@ tags: $:/tags/SideBarSegment - -
diff --git a/core/wiki/macros/keyboard-driven-input.tid b/core/wiki/macros/keyboard-driven-input.tid index 98167f3ac..a2ce713da 100644 --- a/core/wiki/macros/keyboard-driven-input.tid +++ b/core/wiki/macros/keyboard-driven-input.tid @@ -24,7 +24,9 @@ $actions$ \define input-next-actions(afterOrBefore:"after",reverse:"") <$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore"> <$vars userInput={{{ [<__storeTitle__>get[text]] }}} selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}> -<$set name="filteredList" filter="[subfilter<__primaryListFilter__>addsuffix[-primaryList]] =[subfilter<__secondaryListFilter__>addsuffix[-secondaryList]]"> +<$set name="configTiddler" value={{{ [subfilter<__configTiddlerFilter__>] }}}> +<$vars primaryListFilter={{{ [get[first-search-filter]] }}} secondaryListFilter={{{ [get[second-search-filter]] }}}> +<$set name="filteredList" filter="[subfilteraddsuffix[-primaryList]] =[subfilteraddsuffix[-secondaryList]]"> <$set name="nextItem" value={{{ [enlist$afterOrBefore$] ~[enlist$reverse$nth[1]] }}}> <$list filter="[minlength[1]]"> <$action-setfield $tiddler=<<__selectionStateTitle__>> text=<>/> @@ -39,10 +41,12 @@ $actions$ + + \end -\define keyboard-driven-input(tiddler,storeTitle,field:"text",index:"",tag:"input",type,focus:"",inputAcceptActions,inputAcceptVariantActions,inputCancelActions,placeholder:"",default:"",class,primaryListFilter,secondaryListFilter,focusPopup,rows,minHeight,tabindex,size,autoHeight,filterMinLength:"0",refreshTitle,selectionStateTitle,cancelPopups:"") +\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) <$keyboard key="((input-accept))" actions=<<__inputAcceptActions__>>> <$keyboard key="((input-accept-variant))" actions=<<__inputAcceptVariantActions__>>> <$keyboard key="((input-up))" actions=<>> diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid index 283c81e3b..f3d71c642 100644 --- a/core/wiki/macros/tag-picker.tid +++ b/core/wiki/macros/tag-picker.tid @@ -1,5 +1,7 @@ title: $:/core/macros/tag-picker tags: $:/tags/Macro +first-search-filter: [tags[]!is[system]search:titlesort[]] +second-search-filter: [tags[]is[system]search:titlesort[]] \define delete-tag-state-tiddlers() <$action-deletetiddler $filter="[] [] []"/> @@ -38,11 +40,11 @@ $actions$
<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> - selectionStateTitle=<> primaryListFilter=<> secondaryListFilter=<> - inputAcceptActions="""<$macrocall $name="add-tag-actions" actions=<<__actions__>>/>""" inputCancelActions=<> tag="input" - placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<> - class="tc-edit-texteditor tc-popup-handle" tabindex=<> focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} - filterMinLength={{$:/config/Tags/MinLength}} cancelPopups=<> /> + selectionStateTitle=<> inputAcceptActions="""<$macrocall $name="add-tag-actions" actions=<<__actions__>>/>""" + inputCancelActions=<> tag="input" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} + focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex=<> + focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} + cancelPopups=<> configTiddlerFilter="[[$:/core/macros/tag-picker]]"/>  <$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}  <$set name="tag" value={{{ [get[text]] }}}> <$button set=<> setTo="" class=""> diff --git a/editions/tw5.com/tiddlers/macros/keyboard-driven-input_Macro.tid b/editions/tw5.com/tiddlers/macros/keyboard-driven-input_Macro.tid index b32084802..fc4bfaa6b 100644 --- a/editions/tw5.com/tiddlers/macros/keyboard-driven-input_Macro.tid +++ b/editions/tw5.com/tiddlers/macros/keyboard-driven-input_Macro.tid @@ -9,12 +9,11 @@ To create the input field or textarea, the <<.def keyboard-driven-input>> [[macr The additional parameters are: -| |purpose |h +|parameter |purpose |h |storeTitle |the title of the tiddler that stores the user input | |selectionStateTitle |the title of the tiddler that stores the selected entry with a -primaryList or -secondaryList suffix to make it unique | |inputAcceptActions |the actions that get processed when the user hits {{$:/config/shortcuts/input-accept}} | |inputAcceptVariantActions |the actions that get processed when the user hits {{$:/config/shortcuts/input-accept-variant}} | |inputCancelActions |the actions that get processed when the user hits {{$:/config/shortcuts/input-cancel}} | -|primaryListFilter |a filter that specifies the first item-list | -|secondaryListFilter |a second filter that specifies a second item-list | +|configTiddlerFilter |a ''filter'' that specifies the tiddler that stores the first item-filter in its <<.field first-search-filter>> field and the second item-filter in its <<.field second-search-filter>> field |