search for multiple terms

Author: mathieudutour

bower.json

@@ -4,7 +4,7 @@
     "react-search-input.js",
     "react-search-input.css"
   ],
-  "version": "0.2.4",
+  "version": "0.2.5",
   "homepage": "https://github.com/enki-com/react-search-input",
   "description": "Simple react.js component for a search input, providing a filter function.",
   "keywords": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-search-input",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Simple react.js component for a search input, providing a filter function.",
   "main": "react-search-input.js",
   "dependencies": {

react-search-input.js

@@ -78,35 +78,42 @@
             term = term.toLowerCase();
           }
 
-          if (keys) {
-            if( typeof keys === 'string' ) {
-              keys = [keys];
-            }
-            for (var i = 0; i < keys.length; i++) {
-              var values = _getValuesForKey(keys[i], item);
+          var terms = term.split(' ');
+          var foundCount = 0;
+          terms.forEach(function(term) {
+            if (keys) {
+              if (typeof keys === 'string') {
+                keys = [keys];
+              }
               var found = false;
-              values.forEach(function(value) {
-                try {
-                  if (value && value.search(term) !== -1) {
-                    found = true;
-                  }
-                } catch(e) {
+              for (var i = 0; i < keys.length; i++) {
+                var values = _getValuesForKey(keys[i], item);
+                values.forEach(function(value) {
+                  try {
+                    if (value && value.search(term) !== -1) {
+                      found = true;
+                    }
+                  } catch(e) {}
+                });
+                if (found) {
+                  break;
                 }
-              });
+              }
+
               if (found) {
-                return true;
+                foundCount++;
               }
+            } else {
+              try {
+                var stringValue = item.toLowerCase();
+                if (stringValue.search(term) !== -1) {
+                  foundCount++;
+                }
+              } catch(e) {}
             }
-            return false;
-          } else {
-            try {
-              var stringValue = item.toLowerCase();
-              return (stringValue.search(term) !== -1);
-            } catch(e) {
-              return false;
-            }
-          }
-        }.bind(this);
+          });
+          return foundCount === terms.length;;
+        };
       }
     }
   });