load synchronously if possible

u-wave · May 1, 2022 · 968ed15 · 968ed15
1 parent 7097029
commit 968ed15
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/src/index.js b/src/index.js
@@ -206,7 +206,7 @@ function useYouTube(container, {
     let instance = null;
     let cancelled = false;
 
-    loadSdk().then(() => {
+    loadSdk(() => {
       if (!cancelled) {
         instance = createPlayer.current();
       }

diff --git a/src/loadSdk.js b/src/loadSdk.js
@@ -2,12 +2,6 @@
 
 function loadSdk() {
   return new Promise((resolve, reject) => {
-    if (typeof window.YT === 'object' && typeof window.YT.ready === 'function') {
-      // A YouTube SDK is already loaded, so reuse that
-      window.YT.ready(resolve);
-      return;
-    }
-
     const script = document.createElement('script');
     script.async = true;
     script.src = 'https://www.youtube.com/iframe_api';
@@ -27,9 +21,13 @@ function loadSdk() {
 }
 
 let sdk = null;
-export default function getSdk() {
-  if (!sdk) {
-    sdk = loadSdk();
+export default function getSdk(callback) {
+  if (typeof window.YT === 'object' && typeof window.YT.ready === 'function') {
+    // A YouTube SDK is already loaded, so reuse that
+    window.YT.ready(callback);
+    return;
   }
-  return sdk;
+
+  sdk ??= loadSdk();
+  sdk.then(callback);
 }
diff --git a/test/util/createYouTube.js b/test/util/createYouTube.js
@@ -55,9 +55,9 @@ export default function createYouTube() {
 
   const YouTube = proxyquire('../../src/index.js', {
     './loadSdk': {
-      default() {
+      default(callback) {
         global.YT = sdkMock;
-        return Promise.resolve(sdkMock);
+        setImmediate(() => callback(sdkMock));
       },
     },
   }).default;