[search] added clear/close button

undergroundwires · Aug 24, 2020 · d6fa9a2 · d6fa9a2
1 parent ec15af0
commit d6fa9a2
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 39 deletions.
diff --git a/src/presentation/Scripts/TheScripts.vue b/src/presentation/Scripts/TheScripts.vue
@@ -7,17 +7,30 @@
                 v-show="!this.isSearching" />
         </div>
         <div class="scripts">
-            <div v-if="!isSearching || searchHasMatches">
-                    <CardList v-if="this.showCards" />
-                    <div v-else-if="this.showList" class="tree">
-                        <div v-if="this.isSearching" class="search-query">
-                            Searching for "{{this.searchQuery | threeDotsTrim}}"</div>
-                        <ScriptsTree />
-                    </div>
+            <div v-if="!isSearching">
+                <CardList v-if="currentGrouping === Grouping.Cards"/>
+                <div class="tree" v-if="currentGrouping === Grouping.None">
+                    <ScriptsTree />
+                </div>
             </div>
-            <div v-else class="search-no-matches">
-                <div>Sorry, no matches for "{{this.searchQuery | threeDotsTrim}}" 😞</div>
-                <div>Feel free to extend the scripts <a :href="repositoryUrl" target="_blank" class="child github" >here</a> ✨</div>
+            <div v-else> <!-- Searching -->
+                <div class="search">
+                    <div class="search__query">
+                        <div>Searching for "{{this.searchQuery | threeDotsTrim}}"</div>
+                        <div class="search__query__close-button">
+                            <font-awesome-icon
+                                :icon="['fas', 'times']" 
+                                v-on:click="clearSearchQueryAsync()"/>
+                        </div>
+                    </div>
+                    <div v-if="!searchHasMatches" class="search-no-matches">
+                        <div>Sorry, no matches for "{{this.searchQuery | threeDotsTrim}}" 😞</div>
+                        <div>Feel free to extend the scripts <a :href="repositoryUrl" target="_blank" class="child github" >here</a> ✨</div>
+                    </div>
+                </div>
+                <div v-if="searchHasMatches" class="tree tree--searching">
+                    <ScriptsTree />
+                </div>
             </div>
         </div>
     </div>
@@ -54,38 +67,34 @@
     },
     })
     export default class TheScripts extends StatefulVue {
-        public showCards = false;
-        public showList = false;
         public repositoryUrl = '';
-        private searchQuery = '';
-        private isSearching = false;
-        private searchHasMatches = false;
+        public Grouping = Grouping; // Make it accessible from view
+        public currentGrouping = Grouping.Cards;
+        public searchQuery = '';
+        public isSearching = false;
+        public searchHasMatches = false;
 
-        private currentGrouping: Grouping;
 
         public async mounted() {
             const state = await this.getCurrentStateAsync();
             this.repositoryUrl = state.app.repositoryUrl;
             state.filter.filterRemoved.on(() => {
                 this.isSearching = false;
-                this.updateGroups();
             });
             state.filter.filtered.on((result: IFilterResult) => {
                 this.searchQuery = result.query;
                 this.isSearching = true;
                 this.searchHasMatches = result.hasAnyMatches();
-                this.updateGroups();
             });
         }
 
-        public onGroupingChanged(group: Grouping) {
-            this.currentGrouping = group;
-            this.updateGroups();
+        public async clearSearchQueryAsync() {
+            const state = await this.getCurrentStateAsync();
+            state.filter.removeFilter();
         }
 
-        private updateGroups(): void {
-            this.showCards = !this.isSearching && this.currentGrouping === Grouping.Cards;
-            this.showList = this.isSearching || this.currentGrouping === Grouping.None;
+        public onGroupingChanged(group: Grouping) {
+            this.currentGrouping = group;
         }
     }
 </script>
@@ -95,28 +104,49 @@
 @import "@/presentation/styles/fonts.scss";
 .scripts {
     margin-top:10px;
-    .search-no-matches {
+    .tree {
+        padding-left: 3%;
+        padding-top: 15px;
+        padding-bottom: 15px;
+        &--searching {
+            padding-top: 0px;
+        }
+    }
+}
+
+.search {
+    display: flex;
+    flex-direction: column;
+    background-color: $slate;
+    &__query {
+        display: flex;
+        justify-content: center;
+        flex-direction: row;
+        align-items: center;
+        margin-top: 1em;
+        color: $gray;
+        &__close-button {
+            cursor: pointer;
+            font-size: 1.25em;
+            margin-left: 0.25rem;
+            &:hover {
+                opacity: 0.9;
+            }
+        }
+    }
+    &-no-matches {
         display:flex;
         flex-direction: column;
         word-break:break-word;
-        color: $white;
         text-transform: uppercase;
         color: $light-gray;
         font-size: 1.5em;
-        background-color: $slate;
-        padding:5%;
+        padding:10px;
         text-align:center;
-        a {
-            color: $gray;
+        > div {
+            padding-bottom:13px;
         }
-    }
-    .tree {
-        padding-left: 3%;
-        padding-top: 15px;
-        padding-bottom: 15px;
-        .search-query {
-            display: flex;
-            justify-content: center;
+        a {
             color: $gray;
         }
     }

diff --git a/src/presentation/TheSearchBar.vue b/src/presentation/TheSearchBar.vue
@@ -2,7 +2,7 @@
   <div class="search" v-non-collapsing>
       <input type="search" class="searchTerm"
         :placeholder="searchPlaceHolder"
-        @input="updateFilterAsync($event.target.value)" >
+        v-model="searchQuery" >
       <div class="iconWrapper">
           <font-awesome-icon :icon="['fas', 'search']" />
       </div>
@@ -13,21 +13,25 @@
 import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
 import { StatefulVue } from './StatefulVue';
 import { NonCollapsing } from '@/presentation/Scripts/Cards/NonCollapsingDirective';
+import { IUserFilter } from '@/application/State/IApplicationState';
 
 @Component( {
     directives: { NonCollapsing },
   },
 )
 export default class TheSearchBar extends StatefulVue {
   public searchPlaceHolder = 'Search';
+  public searchQuery = '';
 
   public async mounted() {
     const state = await this.getCurrentStateAsync();
     const totalScripts = state.app.totalScripts;
     const totalCategories = state.app.totalCategories;
     this.searchPlaceHolder = `Search in ${totalScripts} scripts`;
+    this.beginReacting(state.filter);
   }
 
+  @Watch('searchQuery')
   public async updateFilterAsync(filter: |string) {
     const state = await this.getCurrentStateAsync();
     if (!filter) {
@@ -37,6 +41,10 @@ export default class TheSearchBar extends StatefulVue {
     }
   }
 
+  private beginReacting(filter: IUserFilter) {
+    filter.filtered.on((result) => this.searchQuery = result.query);
+    filter.filterRemoved.on(() => this.searchQuery = '');
+  }
 }
 </script>