diff --git a/src/components/Icon/Icon.js b/src/components/Icon/Icon.js index d0c63134..14fd48e3 100644 --- a/src/components/Icon/Icon.js +++ b/src/components/Icon/Icon.js @@ -7,7 +7,7 @@ import { IconsConsumer } from './IconsProvider'; import { COLORS } from '../../theme'; import * as glyphs from './glyphs'; -type IconProps = { +export type IconProps = { /** icon name */ name: string, /** icon color */ diff --git a/src/components/Navigation/Navigation.stories.js b/src/components/Navigation/Navigation.stories.js index 26fac3b6..0da6d500 100644 --- a/src/components/Navigation/Navigation.stories.js +++ b/src/components/Navigation/Navigation.stories.js @@ -10,6 +10,13 @@ export default (asStory) => { )) + .add('with icon size', () => ( + + + + + + )) .add('without icons', () => ( @@ -19,4 +26,3 @@ export default (asStory) => { )); }); }; - diff --git a/src/components/Navigation/NavigationItem.js b/src/components/Navigation/NavigationItem.js index e06a9708..65ad50f7 100644 --- a/src/components/Navigation/NavigationItem.js +++ b/src/components/Navigation/NavigationItem.js @@ -5,6 +5,7 @@ import React from 'react'; import { Icon } from '../Icon'; import { NavigationItemTag, NavigationItemLabel, NavigationItemIcon, NavigationItemLabelPreview } from './Navigation.theme'; import { COLORS } from '../../theme'; +import type { IconProps } from '../Icon/Icon'; type NavigationItemProps = { exact?: boolean, @@ -13,20 +14,24 @@ type NavigationItemProps = { color?: $Keys, icon?: string, label?: string, + iconSize?: $PropertyType, }; - -const NavigationItem = ({ icon, label, ...rest }: NavigationItemProps) => ( +const NavigationItem = ({ icon, label, iconSize, ...rest }: NavigationItemProps) => ( 0 }> { label && label.charAt(0).toUpperCase() } - + - { label && { label } } + { label && ( + + { label } + + ) } );