From 09ec8f3c0a51aa2ee6f3a53e8c28019b0839f808 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 7 May 2020 11:19:36 -0500 Subject: [PATCH 1/3] ensure correct display name for forwardRef components --- src/components/badge/badge_group/badge_group.tsx | 5 ++++- .../header/header_section/header_section_item_button.tsx | 5 ++++- .../__snapshots__/tabbed_content.test.tsx.snap | 4 ++-- src/components/tabs/tabs.tsx | 8 ++++---- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/badge/badge_group/badge_group.tsx b/src/components/badge/badge_group/badge_group.tsx index 9c90547d1d6..0b696ee2504 100644 --- a/src/components/badge/badge_group/badge_group.tsx +++ b/src/components/badge/badge_group/badge_group.tsx @@ -42,7 +42,7 @@ export interface EuiBadgeGroupProps { children?: ReactNode; } -export const EuiBadgeGroup = React.forwardRef< +const EuiBadgeGroup = React.forwardRef< HTMLDivElement, CommonProps & HTMLAttributes & EuiBadgeGroupProps >( @@ -65,3 +65,6 @@ export const EuiBadgeGroup = React.forwardRef< ); } ); + +EuiBadgeGroup.displayName = 'EuiBadgeGroup'; +export { EuiBadgeGroup }; diff --git a/src/components/header/header_section/header_section_item_button.tsx b/src/components/header/header_section/header_section_item_button.tsx index 2d10b227f1f..d1ebbfd9fa5 100644 --- a/src/components/header/header_section/header_section_item_button.tsx +++ b/src/components/header/header_section/header_section_item_button.tsx @@ -40,7 +40,7 @@ type Props = CommonProps & export type EuiHeaderSectionItemButtonRef = HTMLButtonElement; -export const EuiHeaderSectionItemButton = React.forwardRef< +const EuiHeaderSectionItemButton = React.forwardRef< EuiHeaderSectionItemButtonRef, PropsWithChildren >( @@ -74,3 +74,6 @@ export const EuiHeaderSectionItemButton = React.forwardRef< ); } ); + +EuiHeaderSectionItemButton.displayName = 'EuiHeaderSectionItemButton'; +export { EuiHeaderSectionItemButton }; diff --git a/src/components/tabs/tabbed_content/__snapshots__/tabbed_content.test.tsx.snap b/src/components/tabs/tabbed_content/__snapshots__/tabbed_content.test.tsx.snap index 71d9b0a0faf..8df27831e12 100644 --- a/src/components/tabs/tabbed_content/__snapshots__/tabbed_content.test.tsx.snap +++ b/src/components/tabs/tabbed_content/__snapshots__/tabbed_content.test.tsx.snap @@ -76,7 +76,7 @@ exports[`EuiTabbedContent behavior when uncontrolled, the selected tab should up } >
-
- +
->( +const EuiTabs = React.forwardRef>( ( { children, @@ -87,3 +84,6 @@ export const EuiTabs = React.forwardRef< ); } ); + +EuiTabs.displayName = 'EuiTabs'; +export { EuiTabs }; From fb549106c34cf0d25350f6455bb862607a622b9b Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 7 May 2020 12:39:05 -0500 Subject: [PATCH 2/3] export const --- src/components/badge/badge_group/badge_group.tsx | 3 +-- .../header/header_section/header_section_item_button.tsx | 3 +-- src/components/tabs/tabs.tsx | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/badge/badge_group/badge_group.tsx b/src/components/badge/badge_group/badge_group.tsx index 0b696ee2504..35331f026e1 100644 --- a/src/components/badge/badge_group/badge_group.tsx +++ b/src/components/badge/badge_group/badge_group.tsx @@ -42,7 +42,7 @@ export interface EuiBadgeGroupProps { children?: ReactNode; } -const EuiBadgeGroup = React.forwardRef< +export const EuiBadgeGroup = React.forwardRef< HTMLDivElement, CommonProps & HTMLAttributes & EuiBadgeGroupProps >( @@ -67,4 +67,3 @@ const EuiBadgeGroup = React.forwardRef< ); EuiBadgeGroup.displayName = 'EuiBadgeGroup'; -export { EuiBadgeGroup }; diff --git a/src/components/header/header_section/header_section_item_button.tsx b/src/components/header/header_section/header_section_item_button.tsx index d1ebbfd9fa5..5d7893e167c 100644 --- a/src/components/header/header_section/header_section_item_button.tsx +++ b/src/components/header/header_section/header_section_item_button.tsx @@ -40,7 +40,7 @@ type Props = CommonProps & export type EuiHeaderSectionItemButtonRef = HTMLButtonElement; -const EuiHeaderSectionItemButton = React.forwardRef< +export const EuiHeaderSectionItemButton = React.forwardRef< EuiHeaderSectionItemButtonRef, PropsWithChildren >( @@ -76,4 +76,3 @@ const EuiHeaderSectionItemButton = React.forwardRef< ); EuiHeaderSectionItemButton.displayName = 'EuiHeaderSectionItemButton'; -export { EuiHeaderSectionItemButton }; diff --git a/src/components/tabs/tabs.tsx b/src/components/tabs/tabs.tsx index afccda09fa1..6462f76a7d0 100644 --- a/src/components/tabs/tabs.tsx +++ b/src/components/tabs/tabs.tsx @@ -55,7 +55,10 @@ export type EuiTabsProps = CommonProps & export type EuiTabRef = HTMLDivElement; -const EuiTabs = React.forwardRef>( +export const EuiTabs = React.forwardRef< + EuiTabRef, + PropsWithChildren +>( ( { children, @@ -86,4 +89,3 @@ const EuiTabs = React.forwardRef>( ); EuiTabs.displayName = 'EuiTabs'; -export { EuiTabs }; From d52f5abb19072bb86240c9ebbc64273dbf5ca2af Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 7 May 2020 13:42:31 -0500 Subject: [PATCH 3/3] CL --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a11155fc62c..964eec427d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Added `aria-hidden = true` to `EuiRangeSlider` and `EuiRangeTrack` if `showInput = true` ([#3423](https://github.com/elastic/eui/pull/3423)) - Added `testenv` mock for `EuiCode` and `EuiCodeBlock` ([#3405](https://github.com/elastic/eui/pull/3405)) +- Added `displayName` to components using `React.forwardRef` ([#3440](https://github.com/elastic/eui/pull/3440)) **Bug Fixes**