Skip to content

Commit 156249b

Browse files
committed
feat: extract popover from positioner
1 parent e67763f commit 156249b

14 files changed

Lines changed: 2055 additions & 932 deletions

src/components/Menu/DropdownMenu.tsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { Theme, withTheme } from '../../theme';
44
import { Button, ButtonGroup, ButtonProps } from '../Button';
55
import { Measurements, ViewMeasure } from '../Helpers';
66
import { Box } from '../Layout';
7-
import { Popover } from '../Popover';
8-
import { getPopoverStyles } from '../Popover/Popover.styles';
7+
import { Positioner } from '../Positioner';
8+
import { getPositionerStyles } from '../Positioner/Positioner.styles';
99

1010
export interface DropdownMenuProps {
1111
children: React.ReactNode;
@@ -39,9 +39,9 @@ class DropdownMenuBase extends React.Component<DropdownMenuProps> {
3939
const { targetMeasurements } = this.state;
4040

4141
return (
42-
<Popover
42+
<Positioner
4343
position="bottom"
44-
content={
44+
content={() => (
4545
<Box
4646
elevation={1}
4747
borderRadius={theme.controlBorderRadius.medium}
@@ -55,22 +55,21 @@ class DropdownMenuBase extends React.Component<DropdownMenuProps> {
5555
))}
5656
</ButtonGroup>
5757
</Box>
58-
}
58+
)}
5959
getStyles={(...params) => {
60-
const defaultStyles = getPopoverStyles(...params);
60+
const defaultStyles = getPositionerStyles(...params);
6161
return {
6262
...defaultStyles,
6363
modalContainerStyle: {
6464
...defaultStyles.modalContainerStyle,
6565
borderRadius: theme.controlBorderRadius.medium,
6666
},
67-
popoverStyle: {
68-
...defaultStyles.popoverStyle,
67+
positionerStyle: {
68+
...defaultStyles.positionerStyle,
6969
borderRadius: theme.controlBorderRadius.medium,
7070
},
7171
};
7272
}}
73-
showArrow={false}
7473
isVisible={isVisible}
7574
onClose={onClose}
7675
>
@@ -81,7 +80,7 @@ class DropdownMenuBase extends React.Component<DropdownMenuProps> {
8180
>
8281
{children}
8382
</ViewMeasure>
84-
</Popover>
83+
</Positioner>
8584
);
8685
};
8786
}

0 commit comments

Comments
 (0)