Skip to content

Commit 7bc15f0

Browse files
committed
[#201] Replace react-popover with react-popopo
1 parent 7966e7b commit 7bc15f0

5 files changed

Lines changed: 2582 additions & 2534 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"immutability-helper": "^2.8.1",
4747
"lodash": "^4.17.11",
4848
"prop-types": "^15.7.2",
49-
"react-popopo": "^2.1.3",
49+
"react-popopo": "^2.1.8",
5050
"react-redux": "^5.0.7",
5151
"redux": "^4.0.0",
5252
"redux-actions": "^2.6.1",
Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
33

4-
import {
5-
PopoverWrapper,
6-
Popover,
7-
PopoverContainer,
8-
PopoverContent,
9-
PopoverTrigger
10-
} from 'react-popopo'
4+
import { Popover } from 'react-popopo'
115

12-
import {
13-
CustomPopoverContent
14-
} from 'rt/styles/Base'
6+
import { CustomPopoverContent } from 'rt/styles/Base'
157

168
import {
179
LaneMenuTitle,
@@ -23,20 +15,18 @@ import {
2315
MenuButton,
2416
} from 'rt/styles/Elements'
2517

26-
const LaneMenu = ({t, onDelete}) => {
27-
return (
28-
<Popover className="menu" position="bottom" PopoverContent={CustomPopoverContent} trigger={<MenuButton></MenuButton>}>
29-
<LaneMenuHeader>
30-
<LaneMenuTitle>{t('Lane actions')}</LaneMenuTitle>
31-
<DeleteWrapper>
32-
<GenDelButton>&#10006;</GenDelButton>
33-
</DeleteWrapper>
34-
</LaneMenuHeader>
35-
<LaneMenuContent>
36-
<LaneMenuItem onClick={onDelete}>{t('Delete lane')}</LaneMenuItem>
37-
</LaneMenuContent>
38-
</Popover>
39-
)
40-
}
18+
const LaneMenu = ({t, onDelete}) => (
19+
<Popover className="menu" position="bottom" PopoverContent={CustomPopoverContent} trigger={<MenuButton></MenuButton>}>
20+
<LaneMenuHeader>
21+
<LaneMenuTitle>{t('Lane actions')}</LaneMenuTitle>
22+
<DeleteWrapper>
23+
<GenDelButton>&#10006;</GenDelButton>
24+
</DeleteWrapper>
25+
</LaneMenuHeader>
26+
<LaneMenuContent>
27+
<LaneMenuItem onClick={onDelete}>{t('Delete lane')}</LaneMenuItem>
28+
</LaneMenuContent>
29+
</Popover>
30+
)
4131

4232
export default LaneMenu;

src/styles/Base.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,10 @@ export const GlobalStyle = createGlobalStyle`
5353
}
5454
`
5555

56-
export const CustomPopoverContainer = styled(CustomPopoverContainer)`
56+
export const CustomPopoverContainer = styled(PopoverContainer)`
5757
position: absolute;
5858
right: 10px;
5959
flex-flow: column nowrap;
60-
.popover.popover--active .popover__content {
61-
visibility: visible;
62-
opacity: 1;
63-
transition-delay: 100ms;
64-
}
6560
`
6661

6762
export const CustomPopoverContent = styled(PopoverContent)`
@@ -80,6 +75,11 @@ export const CustomPopoverContent = styled(PopoverContent)`
8075
padding: 5px;
8176
left: 50%;
8277
transform: translateX(-50%);
78+
${props => props.active && `
79+
visibility: visible;
80+
opacity: 1;
81+
transition-delay: 100ms;
82+
`}
8383
&::before {
8484
content: "";
8585
position: absolute;

0 commit comments

Comments
 (0)