Merge pull request #93 from sudowork/master

Prevent onClick properly when controlled
mathieudutour · Jun 7, 2019 · fd8220b · fd8220b
2 parents a4e0f24 + de29340
commit fd8220b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/index.js b/src/index.js
@@ -114,15 +114,15 @@ const ProgressButton = createReactClass({
   },
 
   handleClick (e) {
-    if (this.props.controlled) {
+    const shouldAllowClick = (this.props.shouldAllowClickOnLoading ||
+        this.state.currentState !== STATE.LOADING) &&
+        this.state.currentState !== STATE.DISABLED
+    if (this.props.controlled && shouldAllowClick) {
       this.props.onClick(e)
       return true
     }
 
-    if ((this.props.shouldAllowClickOnLoading ||
-        this.state.currentState !== STATE.LOADING) &&
-        this.state.currentState !== STATE.DISABLED
-    ) {
+    if (shouldAllowClick) {
       this.loading()
       const ret = this.props.onClick(e)
       this.handlePromise(ret)