From 7e89117208fd0edab0c3903784f19588085ace3a Mon Sep 17 00:00:00 2001
From: Quentin Fremeaux <quentin.f.60@gmail.com>
Date: Wed, 16 Oct 2019 16:00:00 +0200
Subject: [PATCH] FIX issue with composed HOC and forwarded ref (#1)

* FIX change way to forwardRef

* TYPO trailing comma
---
 src/lib/handleViewport.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lib/handleViewport.js b/src/lib/handleViewport.js
index 88071af..7783b68 100644
--- a/src/lib/handleViewport.js
+++ b/src/lib/handleViewport.js
@@ -1,17 +1,16 @@
 // HOC for handleViewport
 import React, { useRef, forwardRef } from 'react';
-import hoistNonReactStatic from 'hoist-non-react-statics';
 import useInViewport from './useInViewport';
 
 const noop = () => {};
 
 function handleViewport(TargetComponent, options, config = { disconnectOnLeave: false }) {
-  const ForwardedRefComponent = forwardRef((props, ref) => {
-    return <TargetComponent {...props} forwardedRef={ref} />;
-  });
-
-  const InViewport = ({ onEnterViewport = noop, onLeaveViewport = noop, ...restProps }) => {
-    const node = useRef();
+  const InViewport = ({
+    onEnterViewport = noop,
+    onLeaveViewport = noop,
+    ...restProps
+  }, ref) => {
+    const node = useRef(ref);
     const { inViewport, enterCount, leaveCount } = useInViewport(
       node,
       options,
@@ -21,9 +20,9 @@ function handleViewport(TargetComponent, options, config = { disconnectOnLeave:
         onLeaveViewport
       }
     );
-
+    
     return (
-      <ForwardedRefComponent
+      <TargetComponent
         {...restProps}
         inViewport={inViewport}
         enterCount={enterCount}
@@ -33,7 +32,9 @@ function handleViewport(TargetComponent, options, config = { disconnectOnLeave:
     );
   };
 
-  return hoistNonReactStatic(InViewport, ForwardedRefComponent);
+  const name = TargetComponent.displayName || TargetComponent.name || 'Component';
+  InViewport.displayName = `handleViewport(${name})`;
+  return forwardRef(InViewport);
 }
 
 export default handleViewport;