@folklore/hooks 0.0.19 → 0.0.22

package/dist/cjs.js

@@ -148,12 +148,14 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
       setLoaded = _useState6[1];
 
   var apiRef = react.useRef(typeof window.DM !== 'undefined' ? window.DM : null);
-  var elementRef = react.useRef(null);
-  var playerRef = react.useRef(null);
   var ready = apiLoaded && playerReady;
   var videoId = react.useMemo(function () {
     return getVideoId(id);
   }, [id]);
+  var elementRef = react.useRef(null);
+  var playerRef = react.useRef(null);
+  var playerElementRef = react.useRef(elementRef.current);
+  var elementHasChanged = elementRef.current !== playerElementRef.current;
 
   var _useState7 = react.useState(initialMuted),
       _useState8 = _slicedToArray__default["default"](_useState7, 2),
@@ -190,6 +192,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
     var canceled = false;
 
     if (!apiLoaded && videoId !== null) {
+      debug$3('Load API');
       services.loadDailymotion().then(function (api) {
         if (!canceled) {
           apiRef.current = api;
@@ -230,9 +233,10 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
     var player = currentPlayer;
 
     if (player !== null) {
-      player.load(id, {
+      player.load(videoId, {
         params: playerParams
       });
+      debug$3('Load video [ID: %s]', videoId);
     } else {
       player = DM.player(element, {
         video: videoId,
@@ -240,13 +244,16 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         height: height,
         params: playerParams
       });
-      playerRef.current = player;
+      debug$3('Create player [ID: %s]', videoId);
     }
 
     if (!playerReady) {
       setPlayerReady(true);
     }
-  }, [apiLoaded, elementRef.current, videoId, width, height, autoplay, muted, start, controls, queueAutoplayNext, queueEnable, sharingEnable, uiLogo, uiStartScreenInfo]);
+
+    playerRef.current = player;
+    playerElementRef.current = element;
+  }, [apiLoaded, elementHasChanged, videoId, width, height, autoplay, muted, start, controls, queueAutoplayNext, queueEnable, sharingEnable, uiLogo, uiStartScreenInfo]);
   react.useEffect(function () {
     var _playerRef$current2 = playerRef.current,
         player = _playerRef$current2 === void 0 ? null : _playerRef$current2;
@@ -260,6 +267,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
 
     function onPlaybackReady() {
       setLoaded(true);
+      debug$3('onPlaybackReady [ID: %s]', videoId);
     }
 
     function onLoadedMetadata() {
@@ -267,6 +275,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         duration: player.duration
       });
       setMetadata(currentMetadata);
+      debug$3('onLoadedMetadata [ID: %s]', videoId);
     }
 
     function onDurationChange() {
@@ -274,11 +283,13 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         duration: player.duration
       });
       setMetadata(currentMetadata);
+      debug$3('onDurationChange [ID: %s]', videoId);
     }
 
     function onVolumeChange() {
       setMuted(player.muted);
       setVolumeState(player.volume);
+      debug$3('onVolumeChange [ID: %s]', videoId);
     }
 
     function onPlay() {
@@ -288,6 +299,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         ended: false
       });
       setPlayState(currentPlayState);
+      debug$3('onPlay [ID: %s]', videoId);
     }
 
     function onPause() {
@@ -297,6 +309,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         ended: false
       });
       setPlayState(currentPlayState);
+      debug$3('onPause [ID: %s]', videoId);
     }
 
     function onEnd() {
@@ -306,6 +319,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         ended: true
       });
       setPlayState(currentPlayState);
+      debug$3('onEnd [ID: %s]', videoId);
     }
 
     function onPlaying() {
@@ -313,6 +327,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         buffering: false
       });
       setPlayState(currentPlayState);
+      debug$3('onPlaying [ID: %s]', videoId);
     }
 
     function onWaiting() {
@@ -320,6 +335,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         buffering: true
       });
       setPlayState(currentPlayState);
+      debug$3('onWaiting [ID: %s]', videoId);
     }
 
     function onAdStart() {
@@ -327,6 +343,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         adPlaying: true
       });
       setPlayState(currentPlayState);
+      debug$3('onAdStart [ID: %s]', videoId);
     }
 
     function onAdEnd() {
@@ -334,6 +351,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         adPlaying: false
       });
       setPlayState(currentPlayState);
+      debug$3('onAdEnd [ID: %s]', videoId);
     }
 
     player.addEventListener('playback_ready', onPlaybackReady);
@@ -952,6 +970,7 @@ function useYouTubePlayer(id) {
   var elementRef = react.useRef(null);
   var playerRef = react.useRef(null);
   var playerElementRef = react.useRef(elementRef.current);
+  var elementHasChanged = elementRef.current !== playerElementRef.current;
   var videoId = react.useMemo(function () {
     return getVideoId(id);
   }, [id]);
@@ -989,6 +1008,7 @@ function useYouTubePlayer(id) {
     var canceled = false;
 
     if (!apiLoaded && videoId !== null) {
+      debug$1('Load API');
       services.loadYouTube().then(function (api) {
         if (!canceled) {
           apiRef.current = api;
@@ -1054,7 +1074,7 @@ function useYouTubePlayer(id) {
       debug$1('iFrame switched');
       destroyPlayer();
     }
-  }); // Create player
+  }, [elementHasChanged]); // Create player
 
   react.useEffect(function () {
     var _apiRef$current = apiRef.current,
@@ -1071,12 +1091,11 @@ function useYouTubePlayer(id) {
 
     var player = currentPlayer;
 
-    if (player !== null) {
+    if (player !== null && typeof player.loadVideoById !== 'undefined') {
       debug$1('Switch video [ID: %s]', videoId);
       player.loadVideoById(videoId);
     } else {
       debug$1('Create player [ID: %s]', videoId);
-      var iframe = elementRef.current;
 
       var onReady = function onReady(_ref2) {
         var target = _ref2.target;
@@ -1122,7 +1141,7 @@ function useYouTubePlayer(id) {
         debug$1('onStateChange %s [ID: %s]', stateLabel, videoId);
       };
 
-      player = new YT.Player(iframe, {
+      player = new YT.Player(element, {
         videoId: videoId,
         playerVars: {
           controls: controls,
@@ -1138,11 +1157,11 @@ function useYouTubePlayer(id) {
           onStateChange: onStateChange
         }
       });
-      playerElementRef.current = iframe;
     }
 
     playerRef.current = player;
-  }, [apiLoaded, videoId, elementRef.current, setPlayState, setReady, setMetadata, destroyPlayer]);
+    playerElementRef.current = element;
+  }, [apiLoaded, videoId, elementHasChanged, setPlayState, setReady, setMetadata, destroyPlayer]);
   var playing = playState.playing;
   var getCurrentTime = react.useCallback(function (p) {
     return p.getCurrentTime();
@@ -1217,6 +1236,8 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
   var apiRef = react.useRef(null);
   var elementRef = react.useRef(null);
   var playerRef = react.useRef(null);
+  var playerElementRef = react.useRef(elementRef.current);
+  var elementHasChanged = elementRef.current !== playerElementRef.current;
   var videoId = react.useMemo(function () {
     return getVideoId(id);
   }, [id]);
@@ -1260,6 +1281,7 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
     var canceled = false;
 
     if (!apiLoaded && id !== null) {
+      debug('Load API');
       services.loadVimeo().then(function (api) {
         if (!canceled) {
           apiRef.current = api;
@@ -1314,7 +1336,6 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
       playerRef.current = null;
     }
   }, []);
-  var playerElementRef = react.useRef(elementRef.current);
   react.useEffect(function () {
     var currentPlayer = playerRef.current;
 
@@ -1322,7 +1343,7 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
       debug('iFrame switched');
       destroyVideo();
     }
-  }); // Create player
+  }, [elementHasChanged]); // Create player
 
   react.useEffect(function () {
     var _apiRef$current = apiRef.current,
@@ -1355,7 +1376,6 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
       }).catch(function (e) {
         debug('ERROR: %o', e);
       });
-      playerElementRef.current = element;
     } else {
       debug('Load video [ID: %s]', videoId);
       player.loadVideo(videoId).catch(function (e) {
@@ -1364,7 +1384,8 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
     }
 
     playerRef.current = player;
-  }, [apiLoaded, videoId, elementRef.current, setReady, destroyVideo, setLoaded]); // Bind player events
+    playerElementRef.current = element;
+  }, [apiLoaded, videoId, elementHasChanged, setReady, destroyVideo, setLoaded]); // Bind player events
 
   react.useEffect(function () {
     var player = playerRef.current;
@@ -1430,7 +1451,8 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
 
     var onVolumeChange = function onVolumeChange(_ref4) {
       var newVolume = _ref4.volume;
-      return setVolumeState(newVolume);
+      setVolumeState(newVolume);
+      debug('onVolumeChange [ID: %s]', videoId);
     };
 
     var onEnded = function onEnded() {
@@ -1440,6 +1462,7 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
         ended: true,
         buffering: false
       });
+      debug('onEnded [ID: %s]', videoId);
     };
 
     var onBufferStart = function onBufferStart() {

package/dist/es.js

@@ -136,12 +136,14 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
       setLoaded = _useState6[1];
 
   var apiRef = useRef(typeof window.DM !== 'undefined' ? window.DM : null);
-  var elementRef = useRef(null);
-  var playerRef = useRef(null);
   var ready = apiLoaded && playerReady;
   var videoId = useMemo(function () {
     return getVideoId(id);
   }, [id]);
+  var elementRef = useRef(null);
+  var playerRef = useRef(null);
+  var playerElementRef = useRef(elementRef.current);
+  var elementHasChanged = elementRef.current !== playerElementRef.current;
 
   var _useState7 = useState(initialMuted),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -178,6 +180,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
     var canceled = false;
 
     if (!apiLoaded && videoId !== null) {
+      debug$3('Load API');
       loadDailymotion().then(function (api) {
         if (!canceled) {
           apiRef.current = api;
@@ -218,9 +221,10 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
     var player = currentPlayer;
 
     if (player !== null) {
-      player.load(id, {
+      player.load(videoId, {
         params: playerParams
       });
+      debug$3('Load video [ID: %s]', videoId);
     } else {
       player = DM.player(element, {
         video: videoId,
@@ -228,13 +232,16 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         height: height,
         params: playerParams
       });
-      playerRef.current = player;
+      debug$3('Create player [ID: %s]', videoId);
     }
 
     if (!playerReady) {
       setPlayerReady(true);
     }
-  }, [apiLoaded, elementRef.current, videoId, width, height, autoplay, muted, start, controls, queueAutoplayNext, queueEnable, sharingEnable, uiLogo, uiStartScreenInfo]);
+
+    playerRef.current = player;
+    playerElementRef.current = element;
+  }, [apiLoaded, elementHasChanged, videoId, width, height, autoplay, muted, start, controls, queueAutoplayNext, queueEnable, sharingEnable, uiLogo, uiStartScreenInfo]);
   useEffect(function () {
     var _playerRef$current2 = playerRef.current,
         player = _playerRef$current2 === void 0 ? null : _playerRef$current2;
@@ -248,6 +255,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
 
     function onPlaybackReady() {
       setLoaded(true);
+      debug$3('onPlaybackReady [ID: %s]', videoId);
     }
 
     function onLoadedMetadata() {
@@ -255,6 +263,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         duration: player.duration
       });
       setMetadata(currentMetadata);
+      debug$3('onLoadedMetadata [ID: %s]', videoId);
     }
 
     function onDurationChange() {
@@ -262,11 +271,13 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         duration: player.duration
       });
       setMetadata(currentMetadata);
+      debug$3('onDurationChange [ID: %s]', videoId);
     }
 
     function onVolumeChange() {
       setMuted(player.muted);
       setVolumeState(player.volume);
+      debug$3('onVolumeChange [ID: %s]', videoId);
     }
 
     function onPlay() {
@@ -276,6 +287,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         ended: false
       });
       setPlayState(currentPlayState);
+      debug$3('onPlay [ID: %s]', videoId);
     }
 
     function onPause() {
@@ -285,6 +297,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         ended: false
       });
       setPlayState(currentPlayState);
+      debug$3('onPause [ID: %s]', videoId);
     }
 
     function onEnd() {
@@ -294,6 +307,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         ended: true
       });
       setPlayState(currentPlayState);
+      debug$3('onEnd [ID: %s]', videoId);
     }
 
     function onPlaying() {
@@ -301,6 +315,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         buffering: false
       });
       setPlayState(currentPlayState);
+      debug$3('onPlaying [ID: %s]', videoId);
     }
 
     function onWaiting() {
@@ -308,6 +323,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         buffering: true
       });
       setPlayState(currentPlayState);
+      debug$3('onWaiting [ID: %s]', videoId);
     }
 
     function onAdStart() {
@@ -315,6 +331,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         adPlaying: true
       });
       setPlayState(currentPlayState);
+      debug$3('onAdStart [ID: %s]', videoId);
     }
 
     function onAdEnd() {
@@ -322,6 +339,7 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
         adPlaying: false
       });
       setPlayState(currentPlayState);
+      debug$3('onAdEnd [ID: %s]', videoId);
     }
 
     player.addEventListener('playback_ready', onPlaybackReady);
@@ -940,6 +958,7 @@ function useYouTubePlayer(id) {
   var elementRef = useRef(null);
   var playerRef = useRef(null);
   var playerElementRef = useRef(elementRef.current);
+  var elementHasChanged = elementRef.current !== playerElementRef.current;
   var videoId = useMemo(function () {
     return getVideoId(id);
   }, [id]);
@@ -977,6 +996,7 @@ function useYouTubePlayer(id) {
     var canceled = false;
 
     if (!apiLoaded && videoId !== null) {
+      debug$1('Load API');
       loadYouTube().then(function (api) {
         if (!canceled) {
           apiRef.current = api;
@@ -1042,7 +1062,7 @@ function useYouTubePlayer(id) {
       debug$1('iFrame switched');
       destroyPlayer();
     }
-  }); // Create player
+  }, [elementHasChanged]); // Create player
 
   useEffect(function () {
     var _apiRef$current = apiRef.current,
@@ -1059,12 +1079,11 @@ function useYouTubePlayer(id) {
 
     var player = currentPlayer;
 
-    if (player !== null) {
+    if (player !== null && typeof player.loadVideoById !== 'undefined') {
       debug$1('Switch video [ID: %s]', videoId);
       player.loadVideoById(videoId);
     } else {
       debug$1('Create player [ID: %s]', videoId);
-      var iframe = elementRef.current;
 
       var onReady = function onReady(_ref2) {
         var target = _ref2.target;
@@ -1110,7 +1129,7 @@ function useYouTubePlayer(id) {
         debug$1('onStateChange %s [ID: %s]', stateLabel, videoId);
       };
 
-      player = new YT.Player(iframe, {
+      player = new YT.Player(element, {
         videoId: videoId,
         playerVars: {
           controls: controls,
@@ -1126,11 +1145,11 @@ function useYouTubePlayer(id) {
           onStateChange: onStateChange
         }
       });
-      playerElementRef.current = iframe;
     }
 
     playerRef.current = player;
-  }, [apiLoaded, videoId, elementRef.current, setPlayState, setReady, setMetadata, destroyPlayer]);
+    playerElementRef.current = element;
+  }, [apiLoaded, videoId, elementHasChanged, setPlayState, setReady, setMetadata, destroyPlayer]);
   var playing = playState.playing;
   var getCurrentTime = useCallback(function (p) {
     return p.getCurrentTime();
@@ -1205,6 +1224,8 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
   var apiRef = useRef(null);
   var elementRef = useRef(null);
   var playerRef = useRef(null);
+  var playerElementRef = useRef(elementRef.current);
+  var elementHasChanged = elementRef.current !== playerElementRef.current;
   var videoId = useMemo(function () {
     return getVideoId(id);
   }, [id]);
@@ -1248,6 +1269,7 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
     var canceled = false;
 
     if (!apiLoaded && id !== null) {
+      debug('Load API');
       loadVimeo().then(function (api) {
         if (!canceled) {
           apiRef.current = api;
@@ -1302,7 +1324,6 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
       playerRef.current = null;
     }
   }, []);
-  var playerElementRef = useRef(elementRef.current);
   useEffect(function () {
     var currentPlayer = playerRef.current;
 
@@ -1310,7 +1331,7 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
       debug('iFrame switched');
       destroyVideo();
     }
-  }); // Create player
+  }, [elementHasChanged]); // Create player
 
   useEffect(function () {
     var _apiRef$current = apiRef.current,
@@ -1343,7 +1364,6 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
       }).catch(function (e) {
         debug('ERROR: %o', e);
       });
-      playerElementRef.current = element;
     } else {
       debug('Load video [ID: %s]', videoId);
       player.loadVideo(videoId).catch(function (e) {
@@ -1352,7 +1372,8 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
     }
 
     playerRef.current = player;
-  }, [apiLoaded, videoId, elementRef.current, setReady, destroyVideo, setLoaded]); // Bind player events
+    playerElementRef.current = element;
+  }, [apiLoaded, videoId, elementHasChanged, setReady, destroyVideo, setLoaded]); // Bind player events
 
   useEffect(function () {
     var player = playerRef.current;
@@ -1418,7 +1439,8 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
 
     var onVolumeChange = function onVolumeChange(_ref4) {
       var newVolume = _ref4.volume;
-      return setVolumeState(newVolume);
+      setVolumeState(newVolume);
+      debug('onVolumeChange [ID: %s]', videoId);
     };
 
     var onEnded = function onEnded() {
@@ -1428,6 +1450,7 @@ var useVimeoPlayer = function useVimeoPlayer(id) {
         ended: true,
         buffering: false
       });
+      debug('onEnded [ID: %s]', videoId);
     };
 
     var onBufferStart = function onBufferStart() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/hooks",
-    "version": "0.0.19",
+    "version": "0.0.22",
     "description": "React hooks",
     "keywords": [
         "javascript",
@@ -48,7 +48,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "71f0712c94ed09c0e761dddb8e6fc677582c0ddf",
+    "gitHead": "22a55f41d8b6f80e1f3673bb3e2c077860488afe",
     "dependencies": {
         "@folklore/events": "^0.0.3",
         "@folklore/services": "^0.1.36",