Merge pull request #211 from oWallyson/master

Added keyCode to choice objects
Choices-js · Jul 19, 2017 · 40242f6 · 40242f6
2 parents d3ebae6 + dba6093
commit 40242f6
Show file tree

Hide file tree

Showing 10 changed files with 478 additions and 417 deletions.
diff --git a/assets/scripts/dist/choices.js b/assets/scripts/dist/choices.js
diff --git a/assets/scripts/dist/choices.js.map b/assets/scripts/dist/choices.js.map
diff --git a/assets/scripts/dist/choices.min.js b/assets/scripts/dist/choices.min.js
diff --git a/assets/scripts/src/actions/index.js b/assets/scripts/src/actions/index.js
@@ -1,12 +1,13 @@
-export const addItem = (value, label, id, choiceId, groupId, customProperties) => {
+export const addItem = (value, label, id, choiceId, groupId, customProperties, keyCode) => {
   return {
     type: 'ADD_ITEM',
     value,
     label,
     id,
     choiceId,
     groupId,
-    customProperties
+    customProperties,
+    keyCode
   };
 };
 
@@ -26,7 +27,7 @@ export const highlightItem = (id, highlighted) => {
   };
 };
 
-export const addChoice = (value, label, id, groupId, disabled, elementId, customProperties) => {
+export const addChoice = (value, label, id, groupId, disabled, elementId, customProperties, keyCode) => {
   return {
     type: 'ADD_CHOICE',
     value,
@@ -35,7 +36,8 @@ export const addChoice = (value, label, id, groupId, disabled, elementId, custom
     groupId,
     disabled,
     elementId: elementId,
-    customProperties
+    customProperties,
+    keyCode
   };
 };
 

diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js
@@ -835,15 +835,17 @@ class Choices {
                 true,
                 false,
                 -1,
-                item.customProperties
+                item.customProperties,
+                null
               );
             } else {
               this._addItem(
                 item.value,
                 item.label,
                 item.id,
                 undefined,
-                item.customProperties
+                item.customProperties,
+                null
               );
             }
           } else if (itemType === 'String') {
@@ -853,7 +855,8 @@ class Choices {
                 item,
                 true,
                 false,
-                -1
+                -1,
+                null
               );
             } else {
               this._addItem(item);
@@ -898,7 +901,8 @@ class Choices {
               foundChoice.label,
               foundChoice.id,
               foundChoice.groupId,
-              foundChoice.customProperties
+              foundChoice.customProperties,
+              foundChoice.keyCode
             );
           } else if (!this.config.silent) {
             console.warn('Attempting to select choice already selected');
@@ -948,7 +952,8 @@ class Choices {
                 result.selected,
                 result.disabled,
                 undefined,
-                result['customProperties']
+                result['customProperties'],
+                null
               );
             }
           });
@@ -1155,8 +1160,12 @@ class Choices {
     // If we are clicking on an option
     const id = element.getAttribute('data-id');
     const choice = this.store.getChoiceById(id);
+    const passedKeyCode  = activeItems[0].keyCode !== null ? activeItems[0].keyCode : null
     const hasActiveDropdown = this.dropdown.classList.contains(this.config.classNames.activeState);
 
+    // Update choice keyCode
+    choice.keyCode = passedKeyCode
+
     triggerEvent(this.passedElement, 'choice', {
       choice,
     });
@@ -1170,7 +1179,8 @@ class Choices {
           choice.label,
           choice.id,
           choice.groupId,
-          choice.customProperties
+          choice.customProperties,
+          choice.keyCode
         );
         this._triggerChange(choice.value);
       }
@@ -1343,7 +1353,8 @@ class Choices {
               result.selected,
               result.disabled,
               undefined,
-              result['customProperties']
+              result['customProperties'],
+              null
             );
           }
         });
@@ -1539,7 +1550,7 @@ class Choices {
       if (this.isTextElement && target.value) {
         const value = this.input.value;
         const canAddItem = this._canAddItem(activeItems, value);
-
+        
         // All is good, add
         if (canAddItem.response) {
           if (hasActiveDropdown) {
@@ -1562,6 +1573,8 @@ class Choices {
 
         // If we have a highlighted choice
         if (highlighted) {
+          // add enter keyCode value
+          activeItems[0].keyCode = enterKey
           this._handleChoiceAction(activeItems, highlighted);
         }
 
@@ -2099,8 +2112,9 @@ class Choices {
    * @return {Object} Class instance
    * @public
    */
-  _addItem(value, label = null, choiceId = -1, groupId = -1, customProperties = null) {
+  _addItem(value, label = null, choiceId = -1, groupId = -1, customProperties = null, keyCode = null) {
     let passedValue = isType('String', value) ? value.trim() : value;
+    let passedKeyCode = keyCode
     const items = this.store.getItems();
     const passedLabel = label || passedValue;
     const passedOptionId = parseInt(choiceId, 10) || -1;
@@ -2121,7 +2135,7 @@ class Choices {
       passedValue += this.config.appendValue.toString();
     }
 
-    this.store.dispatch(addItem(passedValue, passedLabel, id, passedOptionId, groupId, customProperties));
+    this.store.dispatch(addItem(passedValue, passedLabel, id, passedOptionId, groupId, customProperties, passedKeyCode));
 
     if (this.isSelectOneElement) {
       this.removeActiveItems(id);
@@ -2134,12 +2148,14 @@ class Choices {
         value: passedValue,
         label: passedLabel,
         groupValue: group.value,
+        keyCode: passedKeyCode
       });
     } else {
       triggerEvent(this.passedElement, 'addItem', {
         id,
         value: passedValue,
         label: passedLabel,
+        keyCode: passedKeyCode
       });
     }
 
@@ -2195,7 +2211,7 @@ class Choices {
    * @return
    * @private
    */
-  _addChoice(value, label = null, isSelected = false, isDisabled = false, groupId = -1, customProperties = null) {
+  _addChoice(value, label = null, isSelected = false, isDisabled = false, groupId = -1, customProperties = null, keyCode = null) {
     if (typeof value === 'undefined' || value === null) {
       return;
     }
@@ -2213,7 +2229,8 @@ class Choices {
       groupId,
       isDisabled,
       choiceElementId,
-      customProperties
+      customProperties,
+      keyCode
     ));
 
     if (isSelected) {
@@ -2222,7 +2239,8 @@ class Choices {
         choiceLabel,
         choiceId,
         undefined,
-        customProperties
+        customProperties,
+        keyCode
       );
     }
   }

diff --git a/assets/scripts/src/reducers/choices.js b/assets/scripts/src/reducers/choices.js
@@ -16,7 +16,8 @@ const choices = (state = [], action) => {
         selected: false,
         active: true,
         score: 9999,
-        customProperties: action.customProperties
+        customProperties: action.customProperties,
+        keyCode: null
       }];
     }
 

diff --git a/assets/scripts/src/reducers/items.js b/assets/scripts/src/reducers/items.js
@@ -10,7 +10,8 @@ const items = (state = [], action) => {
         label: action.label,
         active: true,
         highlighted: false,
-        customProperties: action.customProperties
+        customProperties: action.customProperties,
+        keyCode: null
       }];
 
       return newState.map((item) => {