@folklore/hooks 0.0.63 → 0.0.65

package/dist/cjs.js

@@ -1742,17 +1742,19 @@ function useWindowSize() {
     onChange = null
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const [size, setSize] = react.useState(currentSize);
+  const sizeRef = react.useRef(size);
   const updateSize = react.useCallback(() => {
     const newSize = getWindowSize();
     if (currentSize.width !== newSize.width || currentSize.height !== newSize.height) {
       currentSize = newSize;
     }
-    if (size.width !== newSize.width || size.height !== newSize.height) {
+    if (sizeRef.current.width !== newSize.width || sizeRef.current.height !== newSize.height) {
+      sizeRef.current = newSize;
       setSize(newSize);
       return newSize;
     }
     return null;
-  }, [size, setSize]);
+  }, [setSize]);
   const onResize = react.useCallback(() => {
     const newSize = updateSize();
     if (newSize !== null && onChange !== null) {
@@ -1825,18 +1827,21 @@ const getWindowScroll = () => ({
   x: typeof window !== 'undefined' ? window.scrollX || 0 : 0,
   y: typeof window !== 'undefined' ? window.scrollY || 0 : 0
 });
-const currentScroll = getWindowScroll();
+let currentScroll = getWindowScroll();
 function useWindowScroll() {
   let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     onChange = null
   } = opts;
   const [scroll, setScroll] = react.useState(currentScroll);
+  const scrollRef = react.useRef(scroll);
   const updateScroll = react.useCallback(() => {
     const newScroll = getWindowScroll();
     if (currentScroll.x !== newScroll.x || currentScroll.y !== newScroll.y) {
-      currentScroll.x = newScroll.x;
-      currentScroll.y = newScroll.y;
+      currentScroll = newScroll;
+    }
+    if (scrollRef.current.x !== newScroll.x || scrollRef.current.y !== newScroll.y) {
+      scrollRef.current = newScroll;
       setScroll(newScroll);
       return newScroll;
     }

package/dist/es.js

@@ -1731,17 +1731,19 @@ function useWindowSize() {
     onChange = null
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const [size, setSize] = useState(currentSize);
+  const sizeRef = useRef(size);
   const updateSize = useCallback(() => {
     const newSize = getWindowSize();
     if (currentSize.width !== newSize.width || currentSize.height !== newSize.height) {
       currentSize = newSize;
     }
-    if (size.width !== newSize.width || size.height !== newSize.height) {
+    if (sizeRef.current.width !== newSize.width || sizeRef.current.height !== newSize.height) {
+      sizeRef.current = newSize;
       setSize(newSize);
       return newSize;
     }
     return null;
-  }, [size, setSize]);
+  }, [setSize]);
   const onResize = useCallback(() => {
     const newSize = updateSize();
     if (newSize !== null && onChange !== null) {
@@ -1814,18 +1816,21 @@ const getWindowScroll = () => ({
   x: typeof window !== 'undefined' ? window.scrollX || 0 : 0,
   y: typeof window !== 'undefined' ? window.scrollY || 0 : 0
 });
-const currentScroll = getWindowScroll();
+let currentScroll = getWindowScroll();
 function useWindowScroll() {
   let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     onChange = null
   } = opts;
   const [scroll, setScroll] = useState(currentScroll);
+  const scrollRef = useRef(scroll);
   const updateScroll = useCallback(() => {
     const newScroll = getWindowScroll();
     if (currentScroll.x !== newScroll.x || currentScroll.y !== newScroll.y) {
-      currentScroll.x = newScroll.x;
-      currentScroll.y = newScroll.y;
+      currentScroll = newScroll;
+    }
+    if (scrollRef.current.x !== newScroll.x || scrollRef.current.y !== newScroll.y) {
+      scrollRef.current = newScroll;
       setScroll(newScroll);
       return newScroll;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/hooks",
-    "version": "0.0.63",
+    "version": "0.0.65",
     "description": "React hooks",
     "keywords": [
         "javascript",
@@ -49,10 +49,10 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3ff38e649f2a87788753de0b5ba53843a68ab202",
+    "gitHead": "68405a5d9870a928ba8a5aff525ea835fa01b552",
     "dependencies": {
         "@folklore/events": "^0.0.5",
-        "@folklore/services": "^0.1.40",
+        "@folklore/services": "^0.1.41",
         "cancelable-promise": "^4.3.1",
         "debug": "^4.3.4",
         "lodash": "^4.17.21",