From 536737826276ed10ec749092067f744354e1c461 Mon Sep 17 00:00:00 2001 From: Tobias Lohse Date: Wed, 17 Apr 2019 18:08:25 -0500 Subject: [PATCH 1/2] add displayName to forwardRef --- packages/styled-components/src/models/StyledComponent.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/styled-components/src/models/StyledComponent.js b/packages/styled-components/src/models/StyledComponent.js index f37772ae3..810f0cbb7 100644 --- a/packages/styled-components/src/models/StyledComponent.js +++ b/packages/styled-components/src/models/StyledComponent.js @@ -277,15 +277,16 @@ export default function createStyledComponent(target: Target, options: Object, r * forwardRef creates a new interim component, which we'll take advantage of * instead of extending ParentComponent to create _another_ interim class */ - const WrappedStyledComponent = React.forwardRef((props, ref) => ( + const forwardRef = (props, ref) => ( - )); + ); + forwardRef.displayName = displayName; + const WrappedStyledComponent = React.forwardRef(forwardRef) // $FlowFixMe WrappedStyledComponent.attrs = finalAttrs; // $FlowFixMe WrappedStyledComponent.componentStyle = componentStyle; - WrappedStyledComponent.displayName = displayName; // $FlowFixMe WrappedStyledComponent.foldedComponentIds = isTargetStyledComp From 1cedb2ea5d2e6dc6543ec6346c6946d9fc596478 Mon Sep 17 00:00:00 2001 From: Tobias Lohse Date: Wed, 17 Apr 2019 18:16:30 -0500 Subject: [PATCH 2/2] Update StyledComponent.js --- packages/styled-components/src/models/StyledComponent.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/styled-components/src/models/StyledComponent.js b/packages/styled-components/src/models/StyledComponent.js index 810f0cbb7..3300091ce 100644 --- a/packages/styled-components/src/models/StyledComponent.js +++ b/packages/styled-components/src/models/StyledComponent.js @@ -277,11 +277,13 @@ export default function createStyledComponent(target: Target, options: Object, r * forwardRef creates a new interim component, which we'll take advantage of * instead of extending ParentComponent to create _another_ interim class */ + let WrappedStyledComponent; const forwardRef = (props, ref) => ( ); forwardRef.displayName = displayName; - const WrappedStyledComponent = React.forwardRef(forwardRef) + WrappedStyledComponent = React.forwardRef(forwardRef); + WrappedStyledComponent.displayName = displayName; // $FlowFixMe WrappedStyledComponent.attrs = finalAttrs;