From 537d62e9a9d54d5bdf6e568912a48108b4e6e189 Mon Sep 17 00:00:00 2001
From: "github@finnesand.no" <github@finnesand.no>
Date: Thu, 20 Aug 2020 17:19:30 +0200
Subject: [PATCH] fix forwardRef

---
 src/base/attachAttrs.ts | 13 +++++++++++--
 src/base/index.ts       |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/base/attachAttrs.ts b/src/base/attachAttrs.ts
index 0232054..554913e 100644
--- a/src/base/attachAttrs.ts
+++ b/src/base/attachAttrs.ts
@@ -1,4 +1,5 @@
 import render from '../system/render';
+import { forwardRef } from '../system/setup';
 import getFilteredProps from './getFilteredProps';
 
 function as(this: any, a: any) {
@@ -14,7 +15,7 @@ function withComponent(this: any, attrsIn: any, val: any, filter: string[]) {
 
   const { mergedProps } = this;
   const WrappedComponent = (props?: any, ref = { current: null }) => {
-    const refOut = ref && ref.current ? { ref } : {};
+    const refOut = ref && forwardRef ? { ref } : {};
     const styles = typeof val === 'function' ? val(props) : val;
     const attrs = typeof attrsIn === 'function' ? attrsIn(props) : attrsIn;
     const initValues = this.getInitialValues(props);
@@ -35,10 +36,18 @@ function withComponent(this: any, attrsIn: any, val: any, filter: string[]) {
     });
   };
 
+  // if used without forwardRef
   attachAttrsBound(WrappedComponent, { ...attrsIn, ...mergedProps, ...val });
+
+  const Forwarded = forwardRef
+    ? forwardRef(WrappedComponent)
+    : WrappedComponent;
+  // if used with forwardRef
+  attachAttrsBound(Forwarded, { ...mergedProps, ...val });
+
   this.mergedProps = {};
 
-  return WrappedComponent;
+  return forwardRef ? Forwarded : WrappedComponent;
 }
 
 function merge(this: any, components: any) {
diff --git a/src/base/index.ts b/src/base/index.ts
index 8738bf8..7852281 100644
--- a/src/base/index.ts
+++ b/src/base/index.ts
@@ -86,7 +86,7 @@ class Base {
 
     const { mergedProps } = this;
     const WrappedComponent = (props?: any, ref = { current: null }) => {
-      const refOut = ref && ref.current ? { ref } : {};
+      const refOut = ref && forwardRef ? { ref } : {};
       const styles = typeof val === 'function' ? val(props) : val;
       const initValues = this.getInitialValues(props);
       const variantStyles = this.getVariantStyles(props);