@folklore/hooks 0.0.23 → 0.0.26

package/dist/cjs.js

@@ -427,19 +427,33 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
   }, metadata), playState);
 };
 
-var documentEventsManager = typeof document !== 'undefined' ? new EventsManager__default["default"](document) : null;
+var eventsManager$1 = typeof document !== 'undefined' ? new EventsManager__default["default"](document) : null;
 
-var windowEventsManager = typeof window !== 'undefined' ? new EventsManager__default["default"](window) : null;
+var useDocumentEvent = function useDocumentEvent(event, callback) {
+  react.useEffect(function () {
+    if (eventsManager$1 !== null && callback !== null) {
+      eventsManager$1.subscribe(event, callback);
+    }
+
+    return function () {
+      if (eventsManager$1 !== null && callback !== null) {
+        eventsManager$1.unsubscribe(event, callback);
+      }
+    };
+  }, [event, callback]);
+};
+
+var eventsManager = typeof window !== 'undefined' ? new EventsManager__default["default"](window) : null;
 
 var useWindowEvent = function useWindowEvent(event, callback) {
   react.useEffect(function () {
-    if (windowEventsManager !== null && callback !== null) {
-      windowEventsManager.subscribe(event, callback);
+    if (eventsManager !== null && callback !== null) {
+      eventsManager.subscribe(event, callback);
     }
 
     return function () {
-      if (windowEventsManager !== null && callback !== null) {
-        windowEventsManager.unsubscribe(event, callback);
+      if (eventsManager !== null && callback !== null) {
+        eventsManager.unsubscribe(event, callback);
       }
     };
   }, [event, callback]);
@@ -449,7 +463,13 @@ function useKeyboard() {
   var keyMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var onKeyDown = react.useCallback(function (event) {
     var key = event.key;
-    var callback = (typeof keyMap[key] === 'function' ? keyMap[key] : (keyMap[key] || {}).down) || null;
+    var callback = null;
+
+    if (typeof keyMap === 'function') {
+      callback = keyMap;
+    } else if (typeof keyMap[key] !== 'undefined') {
+      callback = typeof keyMap[key] === 'function' ? keyMap[key] : (keyMap[key] || {}).down || null;
+    }
 
     if (callback !== null) {
       callback(event);
@@ -457,7 +477,13 @@ function useKeyboard() {
   }, [keyMap]);
   var onKeyUp = react.useCallback(function (event) {
     var key = event.key;
-    var callback = (typeof keyMap[key] !== 'undefined' && typeof keyMap[key] !== 'function' ? (keyMap[key] || {}).up : null) || null;
+    var callback = null;
+
+    if (typeof keyMap === 'function') {
+      callback = keyMap;
+    } else if (typeof keyMap[key] !== 'undefined') {
+      callback = typeof keyMap[key] === 'function' ? keyMap[key] : (keyMap[key] || {}).up || null;
+    }
 
     if (callback !== null) {
       callback(event);
@@ -1618,9 +1644,98 @@ function useVideoPlayer(params) {
   return player;
 }
 
-exports.documentEventsManager = documentEventsManager;
+var getWindowScroll = function getWindowScroll() {
+  return {
+    x: typeof window !== 'undefined' ? window.scrollX || 0 : 0,
+    y: typeof window !== 'undefined' ? window.scrollY || 0 : 0
+  };
+};
+
+var currentScroll = getWindowScroll();
+
+var useWindowScroll = function useWindowScroll() {
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _opts$onChange = opts.onChange,
+      onChange = _opts$onChange === void 0 ? null : _opts$onChange;
+
+  var _useState = react.useState(currentScroll),
+      _useState2 = _slicedToArray__default["default"](_useState, 2),
+      scroll = _useState2[0],
+      setScroll = _useState2[1];
+
+  var updateScroll = react.useCallback(function () {
+    var newScroll = getWindowScroll();
+
+    if (currentScroll.x !== newScroll.x || currentScroll.y !== newScroll.y) {
+      currentScroll.x = newScroll.x;
+      currentScroll.y = newScroll.y;
+      setScroll(newScroll);
+      return newScroll;
+    }
+
+    return null;
+  }, [setScroll]);
+  var onScroll = react.useCallback(function () {
+    var newScroll = updateScroll();
+
+    if (newScroll !== null && onChange !== null) {
+      onChange(newScroll);
+    }
+  }, [updateScroll, onChange]);
+  useWindowEvent('scroll', onScroll);
+  react.useEffect(function () {
+    onScroll();
+  }, []);
+  return scroll;
+};
+
+var getWindowSize = function getWindowSize() {
+  return {
+    width: typeof window !== 'undefined' ? window.innerWidth || 0 : 0,
+    height: typeof window !== 'undefined' ? window.innerHeight || 0 : 0
+  };
+};
+var currentSize = getWindowSize();
+
+function useWindowSize() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? null : _ref$onChange;
+
+  var _useState = react.useState(currentSize),
+      _useState2 = _slicedToArray__default["default"](_useState, 2),
+      size = _useState2[0],
+      setSize = _useState2[1];
+
+  var updateSize = react.useCallback(function () {
+    var newSize = getWindowSize();
+
+    if (currentSize.width !== newSize.width || currentSize.height !== newSize.height) {
+      currentSize = newSize;
+      setSize(newSize);
+      return newSize;
+    }
+
+    return null;
+  }, [setSize]);
+  var onResize = react.useCallback(function () {
+    var newSize = updateSize();
+
+    if (newSize !== null && onChange !== null) {
+      onChange(newSize);
+    }
+  }, [onChange]);
+  useWindowEvent('resize', onResize);
+  react.useEffect(function () {
+    onResize();
+  }, []);
+  return size;
+}
+
+exports.documentEventsManager = eventsManager$1;
 exports.getObserver = getObserver;
 exports.useDailymotionPlayer = useDailymotionPlayer;
+exports.useDocumentEvent = useDocumentEvent;
 exports.useIntersectionObserver = useIntersectionObserver;
 exports.useKeyboard = useKeyboard;
 exports.useNativeVideoPlayer = useNativeVideoPlayer;
@@ -1629,5 +1744,8 @@ exports.usePlayerCurrentTime = usePlayerCurrentTime;
 exports.useResizeObserver = useResizeObserver;
 exports.useVideoPlayer = useVideoPlayer;
 exports.useVimeoPlayer = useVimeoPlayer;
+exports.useWindowEvent = useWindowEvent;
+exports.useWindowScroll = useWindowScroll;
+exports.useWindowSize = useWindowSize;
 exports.useYouTubePlayer = useYouTubePlayer;
-exports.windowEventsManager = windowEventsManager;
+exports.windowEventsManager = eventsManager;

package/dist/es.js

@@ -415,19 +415,33 @@ var useDailymotionPlayer = function useDailymotionPlayer() {
   }, metadata), playState);
 };
 
-var documentEventsManager = typeof document !== 'undefined' ? new EventsManager(document) : null;
+var eventsManager$1 = typeof document !== 'undefined' ? new EventsManager(document) : null;
 
-var windowEventsManager = typeof window !== 'undefined' ? new EventsManager(window) : null;
+var useDocumentEvent = function useDocumentEvent(event, callback) {
+  useEffect(function () {
+    if (eventsManager$1 !== null && callback !== null) {
+      eventsManager$1.subscribe(event, callback);
+    }
+
+    return function () {
+      if (eventsManager$1 !== null && callback !== null) {
+        eventsManager$1.unsubscribe(event, callback);
+      }
+    };
+  }, [event, callback]);
+};
+
+var eventsManager = typeof window !== 'undefined' ? new EventsManager(window) : null;
 
 var useWindowEvent = function useWindowEvent(event, callback) {
   useEffect(function () {
-    if (windowEventsManager !== null && callback !== null) {
-      windowEventsManager.subscribe(event, callback);
+    if (eventsManager !== null && callback !== null) {
+      eventsManager.subscribe(event, callback);
     }
 
     return function () {
-      if (windowEventsManager !== null && callback !== null) {
-        windowEventsManager.unsubscribe(event, callback);
+      if (eventsManager !== null && callback !== null) {
+        eventsManager.unsubscribe(event, callback);
       }
     };
   }, [event, callback]);
@@ -437,7 +451,13 @@ function useKeyboard() {
   var keyMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var onKeyDown = useCallback(function (event) {
     var key = event.key;
-    var callback = (typeof keyMap[key] === 'function' ? keyMap[key] : (keyMap[key] || {}).down) || null;
+    var callback = null;
+
+    if (typeof keyMap === 'function') {
+      callback = keyMap;
+    } else if (typeof keyMap[key] !== 'undefined') {
+      callback = typeof keyMap[key] === 'function' ? keyMap[key] : (keyMap[key] || {}).down || null;
+    }
 
     if (callback !== null) {
       callback(event);
@@ -445,7 +465,13 @@ function useKeyboard() {
   }, [keyMap]);
   var onKeyUp = useCallback(function (event) {
     var key = event.key;
-    var callback = (typeof keyMap[key] !== 'undefined' && typeof keyMap[key] !== 'function' ? (keyMap[key] || {}).up : null) || null;
+    var callback = null;
+
+    if (typeof keyMap === 'function') {
+      callback = keyMap;
+    } else if (typeof keyMap[key] !== 'undefined') {
+      callback = typeof keyMap[key] === 'function' ? keyMap[key] : (keyMap[key] || {}).up || null;
+    }
 
     if (callback !== null) {
       callback(event);
@@ -1606,4 +1632,92 @@ function useVideoPlayer(params) {
   return player;
 }
 
-export { documentEventsManager, getObserver, useDailymotionPlayer, useIntersectionObserver, useKeyboard, useNativeVideoPlayer, useObserver, usePlayerCurrentTime, useResizeObserver, useVideoPlayer, useVimeoPlayer, useYouTubePlayer, windowEventsManager };
+var getWindowScroll = function getWindowScroll() {
+  return {
+    x: typeof window !== 'undefined' ? window.scrollX || 0 : 0,
+    y: typeof window !== 'undefined' ? window.scrollY || 0 : 0
+  };
+};
+
+var currentScroll = getWindowScroll();
+
+var useWindowScroll = function useWindowScroll() {
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _opts$onChange = opts.onChange,
+      onChange = _opts$onChange === void 0 ? null : _opts$onChange;
+
+  var _useState = useState(currentScroll),
+      _useState2 = _slicedToArray(_useState, 2),
+      scroll = _useState2[0],
+      setScroll = _useState2[1];
+
+  var updateScroll = useCallback(function () {
+    var newScroll = getWindowScroll();
+
+    if (currentScroll.x !== newScroll.x || currentScroll.y !== newScroll.y) {
+      currentScroll.x = newScroll.x;
+      currentScroll.y = newScroll.y;
+      setScroll(newScroll);
+      return newScroll;
+    }
+
+    return null;
+  }, [setScroll]);
+  var onScroll = useCallback(function () {
+    var newScroll = updateScroll();
+
+    if (newScroll !== null && onChange !== null) {
+      onChange(newScroll);
+    }
+  }, [updateScroll, onChange]);
+  useWindowEvent('scroll', onScroll);
+  useEffect(function () {
+    onScroll();
+  }, []);
+  return scroll;
+};
+
+var getWindowSize = function getWindowSize() {
+  return {
+    width: typeof window !== 'undefined' ? window.innerWidth || 0 : 0,
+    height: typeof window !== 'undefined' ? window.innerHeight || 0 : 0
+  };
+};
+var currentSize = getWindowSize();
+
+function useWindowSize() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? null : _ref$onChange;
+
+  var _useState = useState(currentSize),
+      _useState2 = _slicedToArray(_useState, 2),
+      size = _useState2[0],
+      setSize = _useState2[1];
+
+  var updateSize = useCallback(function () {
+    var newSize = getWindowSize();
+
+    if (currentSize.width !== newSize.width || currentSize.height !== newSize.height) {
+      currentSize = newSize;
+      setSize(newSize);
+      return newSize;
+    }
+
+    return null;
+  }, [setSize]);
+  var onResize = useCallback(function () {
+    var newSize = updateSize();
+
+    if (newSize !== null && onChange !== null) {
+      onChange(newSize);
+    }
+  }, [onChange]);
+  useWindowEvent('resize', onResize);
+  useEffect(function () {
+    onResize();
+  }, []);
+  return size;
+}
+
+export { eventsManager$1 as documentEventsManager, getObserver, useDailymotionPlayer, useDocumentEvent, useIntersectionObserver, useKeyboard, useNativeVideoPlayer, useObserver, usePlayerCurrentTime, useResizeObserver, useVideoPlayer, useVimeoPlayer, useWindowEvent, useWindowScroll, useWindowSize, useYouTubePlayer, eventsManager as windowEventsManager };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/hooks",
-    "version": "0.0.23",
+    "version": "0.0.26",
     "description": "React hooks",
     "keywords": [
         "javascript",
@@ -48,7 +48,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "85e1b0e9e6ddd91680edabaeeb7f252400adbb92",
+    "gitHead": "318ecab2c776c3267abf57bffef8012cfcd937f5",
     "dependencies": {
         "@folklore/events": "^0.0.3",
         "@folklore/services": "^0.1.36",