Merge pull request #2498 from hmhealey/plt2285

PLT-2285 Adding spinner after clicking invite channel member button

1 files changed, 6 insertions, 3 deletions

diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx
index ed3a29a61..f6fd91688 100644
--- a/webapp/components/user_list_row.jsx
+++ b/webapp/components/user_list_row.jsx
@@ -6,7 +6,7 @@ import PreferenceStore from 'stores/preference_store.jsx';
 import * as Utils from 'utils/utils.jsx';
 import React from 'react';
 
-export default function UserListRow({user, actions}) {
+export default function UserListRow({user, actions, actionProps}) {
     const nameFormat = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', '');
 
     let name = user.username;
@@ -21,6 +21,7 @@ export default function UserListRow({user, actions}) {
             <Action
                 key={index.toString()}
                 user={user}
+                {...actionProps}
             />
         );
     });
@@ -56,10 +57,12 @@ export default function UserListRow({user, actions}) {
 }
 
 UserListRow.defaultProps = {
-    actions: []
+    actions: [],
+    actionProps: {}
 };
 
 UserListRow.propTypes = {
     user: React.PropTypes.object.isRequired,
-    actions: React.PropTypes.arrayOf(React.PropTypes.func)
+    actions: React.PropTypes.arrayOf(React.PropTypes.func),
+    actionProps: React.PropTypes.object
 };