fix(intersection detector): remove observer state variabe and condition

dhis2 · Sep 15, 2020 · 3fc4637 · 3fc4637
1 parent 768d0be
commit 3fc4637
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/core/src/IntersectionDetector/IntersectionDetector.js b/packages/core/src/IntersectionDetector/IntersectionDetector.js
@@ -13,6 +13,7 @@ export const IntersectionDetector = ({
     onChange,
     children,
     className,
+    dataTest,
     rootRef,
 }) => {
     // Use useRef instead of useState to prevent unnecessary re-render:
@@ -21,10 +22,6 @@ export const IntersectionDetector = ({
     //   heavy) children.  Also: If the parent re-renders (e. g. due to a state
     //   change), then this component will re-render as well.
 
-    // @var {Object}
-    // @prop {IntersectionObserver} current
-    const observer = useRef()
-
     // @var {Object}
     // @prop {bool} current
     const isIntersecting = useRef()
@@ -37,7 +34,7 @@ export const IntersectionDetector = ({
         const rootEl = rootRef.current
         const intersectionEl = intersectionRef.current
 
-        if (rootEl && intersectionEl && !observer.current) {
+        if (rootEl && intersectionEl) {
             const onIntersection = entries => {
                 // Currently there's no way to supply multiple thresholds,
                 // so a single entry can be assumed safely
@@ -63,7 +60,6 @@ export const IntersectionDetector = ({
             )
 
             intersectionObserver.observe(intersectionEl)
-            observer.current = intersectionObserver
 
             // Make sure to clean up everything when un-mounting.
             // Using an arrow function instead of just returning
@@ -73,7 +69,7 @@ export const IntersectionDetector = ({
     }, [rootRef.current, intersectionRef.current])
 
     return (
-        <div ref={intersectionRef} className={className}>
+        <div ref={intersectionRef} className={className} data-test={dataTest}>
             {children}
 
             <style jsx>{`
@@ -90,6 +86,7 @@ export const IntersectionDetector = ({
 
 IntersectionDetector.defaultProps = {
     threshold: 0,
+    dataTest: 'dhis2-uicore-intersectiondetector',
 }
 
 /**
@@ -112,5 +109,6 @@ IntersectionDetector.propTypes = {
 
     children: PropTypes.any,
     className: PropTypes.string,
+    dataTest: PropTypes.string,
     threshold: PropTypes.number,
 }
diff --git a/packages/widgets/src/Transfer/OptionsContainer.js b/packages/widgets/src/Transfer/OptionsContainer.js
@@ -21,7 +21,6 @@ export const OptionsContainer = ({
 }) => {
     const optionsRef = useRef(null)
     const wrapperRef = useRef(null)
-
     const resizeCounter = useResizeCounter(wrapperRef.current)
 
     return (