(hotfix) Use indexOf instead of latest item for cancel action. Refact…

…orized action press callback
FaridSafi · Apr 6, 2018 · c0add09 · c0add09 · SBIWebteam · Jun 8, 2018
1 parent ecc5ca9
commit c0add09
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/Actions.js b/src/Actions.js
@@ -13,25 +13,20 @@ export default class Actions extends React.Component {
   }
 
   onActionsPress() {
-    const options = Object.keys(this.props.options);
-    const cancelButtonIndex = Object.keys(this.props.options).length - 1;
+    const { options } = this.props;
+    const optionKeys = Object.keys(options);
+    const cancelButtonIndex = optionKeys.indexOf('Cancel');
     this.context.actionSheet().showActionSheetWithOptions(
       {
-        options,
+        options: optionKeys,
         cancelButtonIndex,
         tintColor: this.props.optionTintColor,
       },
       (buttonIndex) => {
-        let i = 0;
-        Object.keys(this.props.options).forEach((key) => {
-          if (this.props.options[key]) {
-            if (buttonIndex === i) {
-              this.props.options[key](this.props);
-              return;
-            }
-            i += 1;
-          }
-        });
+        const key = optionKeys[buttonIndex];
+        if (key) {
+          options[key](this.props);
+        }
       },
     );
   }