From 8bc0633b6ff1b6031a15e65b2bc5e70f9bd3df73 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Fri, 5 Feb 2016 18:43:52 +0000
Subject: [PATCH] Refactor AdvancedSearch/Filter to make buttons extensible

---
 core/ui/AdvancedSearch/Filter.tid             | 24 +------------------
 .../ui/AdvancedSearch/FilterButtons/clear.tid |  9 +++++++
 .../AdvancedSearch/FilterButtons/dropdown.tid | 19 +++++++++++++++
 .../AdvancedSearch/FilterButtons/export.tid   |  6 +++++
 4 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 core/ui/AdvancedSearch/FilterButtons/clear.tid
 create mode 100644 core/ui/AdvancedSearch/FilterButtons/dropdown.tid
 create mode 100644 core/ui/AdvancedSearch/FilterButtons/export.tid

diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index 93179bbaa..f6f13a863 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -3,35 +3,13 @@ tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Filter/Caption}}
 
 \define lingo-base() $:/language/Search/
-<$linkcatcher to="$:/temp/advancedsearch">
-
 <<lingo Filter/Hint>>
 
 <div class="tc-search tc-advanced-search">
 <$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/>
-<$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">
-{{$:/core/images/down-arrow}}
-</$button>
-<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<$button class="tc-btn-invisible">
-<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
-{{$:/core/images/close-button}}
-</$button>
-<$macrocall $name="exportButton" exportFilter={{$:/temp/advancedsearch}} lingoBase="$:/language/Buttons/ExportTiddlers/"/>
-</$reveal>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]"><$transclude/></$list>
 </div>
 
-<div class="tc-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/filterDropdown">> type="nomatch" text="" default="">
-<div class="tc-block-dropdown tc-edit-type-dropdown">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>
-</$list>
-</div>
-</$reveal>
-</div>
-
-</$linkcatcher>
-
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>""">
 <div class="tc-search-results">
diff --git a/core/ui/AdvancedSearch/FilterButtons/clear.tid b/core/ui/AdvancedSearch/FilterButtons/clear.tid
new file mode 100644
index 000000000..3dd22e03d
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/clear.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/clear
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+<$button class="tc-btn-invisible">
+<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
+{{$:/core/images/close-button}}
+</$button>
+</$reveal>
diff --git a/core/ui/AdvancedSearch/FilterButtons/dropdown.tid b/core/ui/AdvancedSearch/FilterButtons/dropdown.tid
new file mode 100644
index 000000000..ee1c5eb37
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/dropdown.tid
@@ -0,0 +1,19 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/dropdown
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<span class="tc-popup-keep">
+<$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">
+{{$:/core/images/down-arrow}}
+</$button>
+</span>
+
+<$reveal state=<<qualify "$:/state/filterDropdown">> type="popup" position="belowleft" animate="yes">
+<$linkcatcher to="$:/temp/advancedsearch">
+<div class="tc-block-dropdown-wrapper">
+<div class="tc-block-dropdown tc-edit-type-dropdown">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>
+</$list>
+</div>
+</div>
+</$linkcatcher>
+</$reveal>
diff --git a/core/ui/AdvancedSearch/FilterButtons/export.tid b/core/ui/AdvancedSearch/FilterButtons/export.tid
new file mode 100644
index 000000000..ec9ea91ac
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/export.tid
@@ -0,0 +1,6 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/export
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+<$macrocall $name="exportButton" exportFilter={{$:/temp/advancedsearch}} lingoBase="$:/language/Buttons/ExportTiddlers/"/>
+</$reveal>