From ee4c1edb79f6a153d5787187e4691e106548d18f Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Tue, 1 Aug 2023 17:12:40 -0700 Subject: [PATCH] Misc types cleanup - exporting/importing `_EuiFlyoutSide` directly lets us skip the potential `undefined` type of the flyout prop --- .../collapsible_nav_button/collapsible_nav_button.tsx | 6 +++--- src/components/flyout/flyout.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/collapsible_nav_beta/collapsible_nav_button/collapsible_nav_button.tsx b/src/components/collapsible_nav_beta/collapsible_nav_button/collapsible_nav_button.tsx index f64ab5033de..d135f0f5c21 100644 --- a/src/components/collapsible_nav_beta/collapsible_nav_button/collapsible_nav_button.tsx +++ b/src/components/collapsible_nav_beta/collapsible_nav_button/collapsible_nav_button.tsx @@ -12,15 +12,15 @@ import { useEuiTheme } from '../../../services'; import { CommonProps } from '../../common'; import { EuiButtonIcon, EuiButtonIconPropsForButton } from '../../button'; import { useEuiI18n } from '../../i18n'; +import { _EuiFlyoutSide } from '../../flyout/flyout'; -import { EuiCollapsibleNavBetaProps } from '../'; import { euiCollapsibleNavButtonWrapperStyles } from './collapsible_nav_button.styles'; export type EuiCollapsibleNavButtonProps = CommonProps & Partial & { isCollapsed: boolean; isSmallScreen: boolean; - side: EuiCollapsibleNavBetaProps['side']; + side: _EuiFlyoutSide; }; export const EuiCollapsibleNavButton = forwardRef< @@ -29,7 +29,7 @@ export const EuiCollapsibleNavButton = forwardRef< >(({ isCollapsed, isSmallScreen, side, ...rest }, ref) => { const euiTheme = useEuiTheme(); const styles = euiCollapsibleNavButtonWrapperStyles(euiTheme); - const cssStyles = [styles.euiCollapsibleNavButtonWrapper, styles[side!]]; + const cssStyles = [styles.euiCollapsibleNavButtonWrapper, styles[side]]; let iconType: string; if (isSmallScreen) { diff --git a/src/components/flyout/flyout.tsx b/src/components/flyout/flyout.tsx index f6f001f2cc0..4a7b132aa51 100644 --- a/src/components/flyout/flyout.tsx +++ b/src/components/flyout/flyout.tsx @@ -46,7 +46,7 @@ export const TYPES = ['push', 'overlay'] as const; type _EuiFlyoutType = (typeof TYPES)[number]; export const SIDES = ['left', 'right'] as const; -type _EuiFlyoutSide = (typeof SIDES)[number]; +export type _EuiFlyoutSide = (typeof SIDES)[number]; export const SIZES = ['s', 'm', 'l'] as const; export type EuiFlyoutSize = (typeof SIZES)[number];