Merge branch 'feature/modularise-code' of github.com:jshjohnson/Choices into feature/modularise-code

README.md

@@ -408,7 +408,7 @@ const example = new Choices(element, {
 ### renderSelectedChoices
 **Type:** `String` **Default:** `auto`
 
-**Input types affected:** `select-one`, `select-multiple`
+**Input types affected:** `select-multiple`
 
 **Usage:** Whether selected choices should be removed from the list. By default choices are removed when they are selected in multiple select box. To always render choices pass `always`.
 

package.json

@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "classnames": "^2.2.5",
-    "fuse.js": "^2.2.2",
+    "fuse.js": "^3.1.0",
     "redux": "^3.3.1"
   },
   "npmName": "choices.js",

src/scripts/dist/choices.js

@@ -428,7 +428,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	          if (_this.isSelectOneElement) {
 	            return choice.groupId === group.id;
 	          }
-	          return choice.groupId === group.id && !choice.selected;
+	          return choice.groupId === group.id && (_this.config.renderSelectedChoices === 'always' || !choice.selected);
 	        });
 
 	        if (groupChoices.length >= 1) {

src/scripts/src/choices.js

@@ -345,7 +345,7 @@ class Choices {
         if (this.isSelectOneElement) {
           return choice.groupId === group.id;
         }
-        return choice.groupId === group.id && !choice.selected;
+        return choice.groupId === group.id && (this.config.renderSelectedChoices === 'always' || !choice.selected);
       });
 
       if (groupChoices.length >= 1) {

src/scripts/src/reducers/choices.js

@@ -71,7 +71,7 @@ const choices = (state = [], action) => {
         // Set active state based on whether choice is
         // within filtered results
         choice.active = filteredResults.some((result) => {
-          if (result.item.id === choice.id) {
+          if (result.id === choice.id) {
             choice.score = result.score;
             return true;
           }