Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(MenuItem): Item separator - replace ::before with box-shadow #1105

Merged
miroslavstastny merged 4 commits into from
Mar 26, 2019
Merged

fix(MenuItem): Item separator - replace ::before with box-shadow #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb6805
fix(MenuItem): Item separator - replace ::before with box-shadow
miroslavstastny Mar 26, 2019
33472dd
Merge remote-tracking branch 'origin/master' into fix/menu-remove-before
miroslavstastny Mar 26, 2019
5da347e
Changelog
miroslavstastny Mar 26, 2019
83e3695
Merge branch 'master' into fix/menu-remove-before
miroslavstastny Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Fixes
- Fix narration for `Menu` @miroslavstastny ([#1105](https://github.com/stardust-ui/react/pull/1105))

<!--------------------------------[ v0.25.0 ]------------------------------- -->
## [v0.25.0](https://github.com/stardust-ui/react/tree/v0.25.0) (2019-03-26)
[Compare changes](https://github.com/stardust-ui/react/compare/v0.24.0...v0.25.0)
Expand Down
33 changes: 8 additions & 25 deletions packages/react/src/themes/teams/components/Menu/menuItemStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,30 +76,6 @@ const getFocusedStyles = ({
}
}

const itemSeparator: ComponentSlotStyleFunction<MenuItemPropsAndState, MenuVariables> = ({
props,
variables: v,
}): ICSSInJSStyle => {
const { iconOnly, pills, primary, underlined, vertical } = props

return (
!vertical &&
!pills &&
!underlined &&
!iconOnly && {
'::before': {
position: 'absolute',
content: '""',
top: 0,
right: 0,
width: pxToRem(1),
height: '100%',
...(primary ? { background: v.primaryBorderColor } : { background: v.borderColor }),
},
}
)
}

const pointingBeak: ComponentSlotStyleFunction<MenuItemPropsAndState, MenuVariables> = ({
props,
variables: v,
Expand Down Expand Up @@ -162,6 +138,7 @@ const menuItemStyles: ComponentSlotStylesInput<MenuItemPropsAndState, MenuVariab
isFromKeyboard,
pills,
pointing,
primary,
secondary,
underlined,
vertical,
Expand Down Expand Up @@ -212,7 +189,13 @@ const menuItemStyles: ComponentSlotStylesInput<MenuItemPropsAndState, MenuVariab
marginBottom: verticalPointingBottomMargin,
}),

...itemSeparator({ props, variables: v, theme, colors }),
// item separator
...(!vertical &&
!pills &&
!underlined &&
!iconOnly && {
boxShadow: `-1px 0 0 0 ${primary ? v.primaryBorderColor : v.borderColor} inset`,
}),

// active styles
...(active && {
Expand Down