Merge branch 'master' into u/mhluska/support-lists

Author: mathieudutour

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2

.eslintrc

@@ -6,3 +6,4 @@ example/lib
 example/app.bundle.js
 /lib
 coverage
+.vscode/

.gitignore

@@ -2,3 +2,4 @@ language: node_js
 node_js:
   - "4"
   - "5"
+  - "6"

.travis.yml

@@ -8,7 +8,4 @@ build:
 clean:
 	rm -rf lib && rm -rf example/lib && rm -f example/app.bundle.js
 
-lint:
-	$(BIN)/eslint src && $(BIN)/eslint tests
-
-PHONY: build clean lint
+PHONY: build clean

Makefile

@@ -83,6 +83,10 @@ Define if the search should be case sensitive. Default is `false`
 
 Define if the search should be fuzzy. Default is `false`
 
+##### sortResults
+
+Define if search results should be sorted by relevance (only works with fuzzy search). Default is `false`
+
 ##### value
 
 Define the value of the input.
@@ -97,7 +101,7 @@ If an array `keys` is an array, the function will return true if at least one of
 
 ### Static Methods
 
-##### filter(searchTerm, [keys], [caseSensitive])
+##### filter(searchTerm, [keys], [{caseSensitive, fuzzy, sortResults}])
 
 Return a function which can be used to filter an array. `searchTerm` can be a `regex` or a `String`. `keys` can be `String`, `[String]` or `null`.
 

README.md

@@ -17,12 +17,12 @@ const App = React.createClass({
 
     return (
       <div>
-        <SearchInput className="search-input" onChange={this.searchUpdated} />
+        <SearchInput className='search-input' onChange={this.searchUpdated} />
         {filteredEmails.map(email => {
           return (
-            <div className="mail" key={email.id}>
-              <div className="from">{email.user.name}</div>
-              <div className="subject">{email.subject}</div>
+            <div className='mail' key={email.id}>
+              <div className='from'>{email.user.name}</div>
+              <div className='subject'>{email.subject}</div>
             </div>
           )
         })}

example/src/app.js

@@ -1,6 +1,6 @@
 {
   "name": "react-search-input",
-  "version": "0.10.4",
+  "version": "0.11.1",
   "description": "Simple react.js component for a search input, providing a filter function.",
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
@@ -9,28 +9,20 @@
     "src"
   ],
   "devDependencies": {
-    "babel": "^6.5.2",
     "babel-cli": "^6.8.0",
-    "babel-core": "^6.7.6",
-    "babel-eslint": "^6.0.2",
-    "babel-polyfill": "^6.7.4",
+    "babel-jest": "^19.0.0",
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-0": "^6.5.0",
-    "babel-register": "^6.7.2",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^5.3.0",
-    "eslint": "^3.3.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-plugin-promise": "^2.0.1",
-    "eslint-plugin-standard": "^2.0.0",
-    "mocha": "^3.0.2",
+    "immutable": "^3.8.1",
+    "jest": "^19.0.2",
     "react": "^15.1.0",
     "react-dom": "^15.1.0",
-    "sinon": "^1.17.3",
-    "webpack": "^1.12.15"
+    "standard": "^10.0.2",
+    "webpack": "^2.2.1"
   },
   "scripts": {
+    "test": "standard && jest",
     "prepublish": "make clean build"
   },
   "repository": {
@@ -46,13 +38,15 @@
     "javascript",
     "react-component"
   ],
-  "author": "Mathieu Dutour",
+  "author": "Mathieu Dutour <mathieu@dutour.me>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/enkidevs/react-search-input/issues"
   },
   "homepage": "https://github.com/enkidevs/react-search-input",
   "dependencies": {
-    "fuse.js": "^2.2.0"
+    "fuse.js": "^3.0.0",
+    "prop-types": "^15.5.8",
+    "create-react-class": "^15.5.2"
   }
 }

package.json

@@ -5,17 +5,17 @@
 }
 
 .search-input::before {
-  content: "\26b2";
+  content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAAAXNSR0IArs4c6QAAAQJJREFUKBWVkr2uQUEUhf3ET6GRaC5aFRoJKrf1BKpb8SwqovYGXkCj00k0QnRKEYkILYobvpUYmeMMyVnJl7P3mjN7Zu9zwiGv2qRFyMMSRrAFp6JPN8XzBj+wgDkUYAg7WINTYdwpDECxrRLJHeq2accdkgm8bzTvNAg2EDOGeUYI1KNO1gkuzTA1g8T7ojbn4ONQWPuHPWgeHmnzCqoe15tkSNPgPEAn68oVcOmA2XMtGK9FoE/VhOTTVNExqLCGZnxCv2pYauEC6lF0oQxX6IOvb7yX9NPEQafan+aPXDdQC18LsO6Tip5BBY6gIQaSbnMCFRCBZRcIvFkbsvCr4AFGOCxQy+JdGQAAAABJRU5ErkJggg==');
   display: block;
   position: absolute;
   width: 15px;
   z-index: 3;
   height: 15px;
-  transform: rotate(-45deg);
   font-size: 20px;
   top: 11px;
-  left: 13px;
+  left: 16px;
   line-height: 32px;
+  opacity: 0.6;
 }
 
 .search-input > input {

react-search-input.css

@@ -0,0 +1,86 @@
+/* globals test expect */
+import { Map } from 'immutable'
+import { getValuesForKey } from '../util'
+
+test('should get the values to search on in an object', () => {
+  const value = getValuesForKey('foo', {
+    foo: 'bar'
+  })
+  expect(value).toEqual(['bar'])
+})
+
+test('should get the values to search on in an array', () => {
+  const value = getValuesForKey('foo', [{
+    foo: 'bar'
+  }])
+  expect(value).toEqual(['bar'])
+})
+
+test('should get the values to search on in a nested object', () => {
+  const value = getValuesForKey('foo.bar', {
+    foo: {
+      bar: 'baz'
+    }
+  })
+  expect(value).toEqual(['baz'])
+})
+
+test('should get the values to search on in a nested array', () => {
+  const value = getValuesForKey('foo', {
+    foo: ['bar', 'baz']
+  })
+  expect(value).toEqual(['bar', 'baz'])
+})
+
+test('should get the values to search on in a nested array', () => {
+  const value = getValuesForKey('foo.bar', {
+    foo: [{
+      bar: 'baz'
+    }, {
+      bar: 'baz2'
+    }]
+  })
+  expect(value).toEqual(['baz', 'baz2'])
+})
+
+test('should get the values to search on in a nested array with an index', () => {
+  const value = getValuesForKey('foo.1.bar', {
+    foo: [{
+      bar: 'baz'
+    }, {
+      bar: 'baz2'
+    }]
+  })
+  expect(value).toEqual(['baz2'])
+})
+
+test('should ignore undefined values', () => {
+  const value = getValuesForKey('fooz', {
+    foo: [{
+      bar: 'baz'
+    }, {
+      bar: 'baz2'
+    }]
+  })
+  expect(value).toEqual([])
+})
+
+test('should get the values to search on in an immutable map', () => {
+  const value = getValuesForKey('foo.bar', Map({
+    foo: {
+      bar: 'baz'
+    }
+  }))
+  expect(value).toEqual(['baz'])
+})
+
+test('should ignore non-string and non-number values', () => {
+  const value = getValuesForKey('foo.bar', {
+    foo: [{
+      bar: []
+    }, {
+      bar: []
+    }]
+  })
+  expect(value).toEqual([])
+})