Fix primefaces#5927: BodyCell memory leak when not editable

melloware · Feb 19, 2024 · cfb1ed3 · cfb1ed3
1 parent 69b9adc
commit cfb1ed3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/components/lib/hooks/useEventListener.js b/components/lib/hooks/useEventListener.js
@@ -44,15 +44,13 @@ export const useEventListener = ({ target = 'document', type, listener, options,
             unbind();
             when && bind();
         }
-        return () => {
-            // #5927 prevent memory leak by releasing
-            prevListener = null;
-            prevOptions = null;
-        };
     }, [listener, options, when]);
 
     useUnmountEffect(() => {
         unbind();
+        // #5927 prevent memory leak by releasing
+        prevListener = null;
+        prevOptions = null;
     });
 
     return [bind, unbind];

diff --git a/components/lib/hooks/useOverlayScrollListener.js b/components/lib/hooks/useOverlayScrollListener.js
@@ -52,15 +52,13 @@ export const useOverlayScrollListener = ({ target, listener, options, when = tru
             unbind();
             when && bind();
         }
-        return () => {
-            // #5927 prevent memory leak by releasing
-            prevListener = null;
-            prevOptions = null;
-        };
     }, [listener, options]);
 
     useUnmountEffect(() => {
         unbind();
+        // #5927 prevent memory leak by releasing
+        prevListener = null;
+        prevOptions = null;
     });
 
     return [bind, unbind];

diff --git a/components/lib/hooks/usePrevious.js b/components/lib/hooks/usePrevious.js
@@ -1,11 +1,15 @@
 import * as React from 'react';
 
 export const usePrevious = (newValue) => {
-    const ref = React.useRef(undefined);
+    const ref = React.useRef(null);
 
     React.useEffect(() => {
         ref.current = newValue;
-    });
+
+        return () => {
+            ref.current = null;
+        };
+    }, [newValue]);
 
     return ref.current;
 };