From 654c13df8aee2e43992c6629d2249d56667fec67 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Fri, 16 Nov 2018 16:07:37 -0800
Subject: fix: bug where we did not call onClose config

---
 packages/instant/src/index.umd.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/instant/src/index.umd.ts b/packages/instant/src/index.umd.ts
index 9703c6fc0..518326e21 100644
--- a/packages/instant/src/index.umd.ts
+++ b/packages/instant/src/index.umd.ts
@@ -53,14 +53,19 @@ export const render = (config: ZeroExInstantConfig, selector: string = DEFAULT_Z
         injectedDiv.setAttribute('id', INJECTED_DIV_ID);
         injectedDiv.setAttribute('class', INJECTED_DIV_CLASS);
         appendTo.appendChild(injectedDiv);
-        const removeFromDom = () => appendTo.removeChild(injectedDiv);
+        const closeInstant = () => {
+            if (config.onClose) {
+                config.onClose();
+            }
+            appendTo.removeChild(injectedDiv);
+        };
         const instantOverlayProps = {
             ...config,
             // If we are using the history API, just go back to close
-            onClose: () => (config.shouldDisablePushToHistory ? removeFromDom() : window.history.back()),
+            onClose: () => (config.shouldDisablePushToHistory ? closeInstant() : window.history.back()),
         };
         ReactDOM.render(React.createElement(ZeroExInstantOverlay, instantOverlayProps), injectedDiv);
-        return removeFromDom;
+        return closeInstant;
     };
     if (config.shouldDisablePushToHistory) {
         renderInstant();
@@ -83,9 +88,6 @@ export const render = (config: ZeroExInstantConfig, selector: string = DEFAULT_Z
             } else {
                 // User pressed back, so close instant.
                 removeInstant();
-                if (!_.isUndefined(config.onClose)) {
-                    config.onClose();
-                }
             }
         };
     }
-- 
cgit