Merge pull request #615 from matteodem/feature/autosuggest-no-docs-on…

…-empty Respect noDocumentsOnEmpty for autosuggest, fixes #566
matteodem · Jun 23, 2017 · 4829f47 · 4829f47
2 parents 82abff6 + 0846e9c
commit 4829f47
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/packages/easy:search/package.js b/packages/easy:search/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'easy:search',
   summary: "Easy-to-use search with Blaze Components (+ Elastic Search Support)",
-  version: "2.2.0",
+  version: "2.2.1",
   git: "https://github.com/matteodem/meteor-easy-search.git",
   documentation: "../../README.md"
 });
@@ -12,7 +12,7 @@ Package.onUse(function(api) {
   api.use([
     'ecmascript',
     'easysearch:core@2.2.0',
-    'easysearch:components@2.2.0',
+    'easysearch:components@2.2.1',
   ]);
 
   api.export('EasySearch');

diff --git a/packages/easysearch:autosuggest/README.md b/packages/easysearch:autosuggest/README.md
@@ -18,6 +18,7 @@ You can pass in following parameters to the `EasySearch.Autosuggest` component.
 * __labelField__: String that specifies the search result field to display, by default the first of index `fields`
 * __changeConfiguration__: Function to change the configuration that is passed to selectize.
 * __renderSuggestion__: String that specifies a custom template to render the autosuggest, by default `EasySearch_Autosuggest_DefaultRenderSuggestion`
+* __noDocumentsOnEmpty__: Same as for EasySearch.Input
 
 ## How to install
 

diff --git a/packages/easysearch:autosuggest/lib/autosuggest.js b/packages/easysearch:autosuggest/lib/autosuggest.js
@@ -1,4 +1,5 @@
 import { Template } from 'meteor/templating'
+import { Cursor } from 'meteor/easy:search'
 import { SingleIndexComponent } from 'meteor/easysearch:components'
 
 const getDataValue = (scope, val, defaultVal) => scope.getData()[val] || defaultVal
@@ -12,11 +13,11 @@ class AutosuggestComponent extends SingleIndexComponent
    * @returns {Cursor}
    */
   search(str) {
-    const methods = this.index.getComponentMethods(this.name)
+    if (!this.shouldShowDocuments(str)) return Cursor.emptyCursor
 
-    methods.search(str)
+    super.search(str)
 
-    return methods.getCursor()
+    return this.index.getComponentMethods(this.name).getCursor()
   }
 
   /**

diff --git a/packages/easysearch:autosuggest/package.js b/packages/easysearch:autosuggest/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'easysearch:autosuggest',
   summary: "Selectize Autosuggest Component for EasySearch",
-  version: "2.2.0",
+  version: "2.2.1",
   git: "https://github.com/matteodem/meteor-easy-search.git",
   documentation: 'README.md'
 });

diff --git a/packages/easysearch:components/lib/base.js b/packages/easysearch:components/lib/base.js
@@ -70,6 +70,15 @@ BaseComponent = class BaseComponent extends BlazeComponent {
     return {};
   }
 
+  /**
+   * @param {String} searchStr
+   *
+   * @returns {Boolean}
+   */
+  shouldShowDocuments(searchStr) {
+    return !this.getData().noDocumentsOnEmpty || 0 < searchStr.length;
+  }
+
   /**
    * Search the component.
    *
@@ -78,7 +87,7 @@ BaseComponent = class BaseComponent extends BlazeComponent {
   search(searchString) {
     check(searchString, String);
 
-    const showDocuments = !this.getData().noDocumentsOnEmpty || 0 < searchString.length;
+    const showDocuments = this.shouldShowDocuments(searchString);
 
     this.eachIndex(function (index, name) {
       index.getComponentDict(name).set('showDocuments', showDocuments);

diff --git a/packages/easysearch:components/package.js b/packages/easysearch:components/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'easysearch:components',
   summary: "Blaze Components for EasySearch",
-  version: "2.2.0",
+  version: "2.2.1",
   git: "https://github.com/matteodem/meteor-easy-search.git",
   documentation: 'README.md'
 });