From 874695961f94a98f7448526e56ed1d114879186e Mon Sep 17 00:00:00 2001 From: Van Anderson Date: Wed, 10 Feb 2021 13:26:49 -0600 Subject: [PATCH] Revisions to SideNav component migration Co-authored-by: Cole Bemis --- src/SideNav.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/SideNav.tsx b/src/SideNav.tsx index b330293e9a6..c67e741c1e6 100644 --- a/src/SideNav.tsx +++ b/src/SideNav.tsx @@ -10,12 +10,12 @@ import theme from './theme' import sx, {SxProp} from './sx' import * as History from 'history' -type StyledSideNavBaseProps = { +type SideNavBaseProps = { variant?: 'lightweight' | 'normal' bordered?: boolean } & ComponentProps -function SideNavBase({variant, className, bordered, children, ...props}: StyledSideNavBaseProps) { +function SideNavBase({variant, className, bordered, children, ...props}: SideNavBaseProps) { const variantClassName = variant === 'lightweight' ? 'lightweight' : 'normal' const newClassName = classnames(className, `variant-${variantClassName}`) @@ -30,7 +30,7 @@ function SideNavBase({variant, className, bordered, children, ...props}: StyledS ) } -const SideNav = styled(SideNavBase)` +const SideNav = styled(SideNavBase)` background-color: ${get('colors.white')}; ${props => @@ -51,9 +51,7 @@ type StyledSideNavLinkProps = { to?: History.LocationDescriptor selected?: boolean variant?: 'full' | 'normal' -} & SystemCommonProps & - SxProp & - SystemTypographyProps +} const SideNavLink = styled(Link).attrs(props => { const isReactRouter = typeof props.to === 'string'