diff --git a/packages/mobile/src/horizontal-menu/HorizontalMenu.tsx b/packages/mobile/src/horizontal-menu/HorizontalMenu.tsx index a83669efb..3becf551f 100644 --- a/packages/mobile/src/horizontal-menu/HorizontalMenu.tsx +++ b/packages/mobile/src/horizontal-menu/HorizontalMenu.tsx @@ -1,4 +1,4 @@ -import {BaseMenuItem, styled, Flex, Card} from '@qiwi/pijma-core' +import {BaseMenuItem, styled, Flex, Card, Box} from '@qiwi/pijma-core' import React from 'react' import {HorizontalMenuItem} from './HorizontalMenuItem' @@ -42,13 +42,18 @@ export const HorizontalMenu = ({ wrap="nowrap" px={4} children={items.map((item, index) => ( - + } /> ))} /> diff --git a/packages/mobile/src/horizontal-menu/HorizontalMenuItem.tsx b/packages/mobile/src/horizontal-menu/HorizontalMenuItem.tsx index 6bf48fd80..f48762bff 100644 --- a/packages/mobile/src/horizontal-menu/HorizontalMenuItem.tsx +++ b/packages/mobile/src/horizontal-menu/HorizontalMenuItem.tsx @@ -1,13 +1,14 @@ -import {Card, LinkControl, Lnk, Typo} from '@qiwi/pijma-core' +import {Card, LinkControl, Lnk} from '@qiwi/pijma-core' import React from 'react' +import {Text} from '../typography' + export interface HorizontalMenuItemProps { active: boolean id: string href?: string target?: string reverse?: boolean - isLast?: boolean onClick?: () => void } @@ -30,22 +31,12 @@ export const HorizontalMenuItem: React.FC = props => ( onMouseUp={renderProps.onMouseUp} onMouseDown={renderProps.onMouseDown} cursor="pointer" - mr={props.isLast ? 0 : 6} + display="block" pb={1} bb={`4px solid ${ renderProps.hover || props.active ? '#ff8c00' : 'transparent' }`} - children={ - - } + children={} /> )} /> diff --git a/packages/mobile/src/select-menu/SelectMenuItem.tsx b/packages/mobile/src/select-menu/SelectMenuItem.tsx index db6773f0c..cf1b66bf3 100644 --- a/packages/mobile/src/select-menu/SelectMenuItem.tsx +++ b/packages/mobile/src/select-menu/SelectMenuItem.tsx @@ -1,6 +1,8 @@ -import {Card, LinkControl, Lnk, Typo} from '@qiwi/pijma-core' +import {Card, LinkControl, Lnk} from '@qiwi/pijma-core' import React from 'react' +import {Text} from '../typography' + export interface SelectMenuItemProps { id: string href?: string @@ -28,20 +30,11 @@ export const SelectMenuItem: React.FC = props => ( onMouseUp={renderProps.onMouseUp} onMouseDown={renderProps.onMouseDown} cursor="pointer" + display="block" px={4} py={2} bg={`${renderProps.hover ? '#f5f5f5' : 'transparent'}`} - children={ - - } + children={} /> )} />