fix(DIST-713): Removed extra timing (#149)

Typeform · Feb 4, 2021 · 04d64ab · 04d64ab
1 parent 2c90dd7
commit 04d64ab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/core/views/components/iframe.js b/src/core/views/components/iframe.js
@@ -22,7 +22,7 @@ class Iframe extends Component {
   }
 
   async handleLoad() {
-    this.props.onLoad(this.iframeRef)
+    await Promise.resolve(this.props.onLoad(this.iframeRef))
     await this.triggerIframeRedraw()
   }
 
@@ -42,7 +42,7 @@ class Iframe extends Component {
         setTimeout(() => {
           this.iframeRef.style.display = 'block'
           resolve()
-        }, 500)
+        })
       } catch (err) {
         reject(err)
       }

diff --git a/src/core/views/popup.js b/src/core/views/popup.js
@@ -66,8 +66,8 @@ const popupWrapper = styled(BaseWrapper)`
   ${({ size }) =>
     size &&
     `
-    height: calc(${size}% - 80px); 
-    width: calc(${size}% - 80px); 
+    height: calc(${size}% - 80px);
+    width: calc(${size}% - 80px);
   `}
   transition: all 300ms ease-out;
 `
@@ -258,17 +258,20 @@ class Popup extends Component {
   }
 
   handleIframeLoad(iframeRef) {
-    this.setState({ iframeLoaded: true }, () => {
-      setTimeout(() => {
-        if (this.state.isLoading) {
-          this.updateIcon(<IconCloseImage alt="close-typeform" data-qa="popup-close-button" src={closeImg} />)
-          this.handleSidePanelOpen()
-          this.setState({ frameAnimate: true, isLoading: false })
-          if (iframeRef && iframeRef.contentWindow) {
-            iframeRef.contentWindow.focus()
+    return new Promise((resolve) => {
+      this.setState({ iframeLoaded: true }, () => {
+        setTimeout(() => {
+          if (this.state.isLoading) {
+            this.updateIcon(<IconCloseImage alt="close-typeform" data-qa="popup-close-button" src={closeImg} />)
+            this.handleSidePanelOpen()
+            this.setState({ frameAnimate: true, isLoading: false })
+            if (iframeRef && iframeRef.contentWindow) {
+              iframeRef.contentWindow.focus()
+            }
           }
-        }
-      }, 500)
+          resolve()
+        }, 500)
+      })
     })
   }