Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(DropdownMenu): Allow positionFixed prop to be passed through #1538

Merged
merged 1 commit into from Jul 9, 2019
Merged

fix(DropdownMenu): Allow positionFixed prop to be passed through #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/lib/Components/DropdownsPage.js
View file
Open in desktop
Expand Up @@ -94,7 +94,9 @@ DropdownMenu.propTypes = {
cssModule: PropTypes.object,
// Custom modifiers that are passed to DropdownMenu.js, see https://popper.js.org/popper-documentation.html#modifiers
modifiers: PropTypes.object,
persist: PropTypes.bool // presist the popper, even when closed. See #779 for reasoning
persist: PropTypes.bool, // presist the popper, even when closed. See #779 for reasoning
// passed to popper, see https://popper.js.org/popper-documentation.html#Popper.Defaults.positionFixed
positionFixed: PropTypes.bool
};

DropdownItem.propTypes = {
Expand Down
5 changes: 4 additions & 1 deletion src/DropdownMenu.js
View file
Open in desktop
Expand Up @@ -14,6 +14,7 @@ const propTypes = {
className: PropTypes.string,
cssModule: PropTypes.object,
persist: PropTypes.bool,
positionFixed: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -33,7 +34,7 @@ const directionPositionMap = {
class DropdownMenu extends React.Component {

render() {
const { className, cssModule, right, tag, flip, modifiers, persist, ...attrs } = this.props;
const { className, cssModule, right, tag, flip, modifiers, persist, positionFixed, ...attrs } = this.props;
const classes = mapToCssModules(classNames(
className,
'dropdown-menu',
Expand All @@ -54,11 +55,13 @@ class DropdownMenu extends React.Component {
...modifiers,
...noFlipModifier,
} : modifiers;
const popperPositionFixed = !!positionFixed;

return (
<Popper
placement={poperPlacement}
modifiers={poperModifiers}
positionFixed={popperPositionFixed}
>
{({ ref, style, placement }) => (
<Tag
Expand Down
11 changes: 11 additions & 0 deletions src/__tests__/DropdownMenu.spec.js
View file
Open in desktop
Expand Up @@ -160,6 +160,17 @@ describe('DropdownMenu', () => {
expect(wrapper.find(Popper).prop('modifiers')).toEqual({ flip: { enabled: false } });
});

it('should position using fixed mode when positionFixed is true', () => {
isOpen = true;
const wrapper = mount(
<DropdownContext.Provider value={{ isOpen, direction, inNavbar }}>
<DropdownMenu positionFixed>Ello world</DropdownMenu>
</DropdownContext.Provider>
);

expect(wrapper.find(Popper).prop('positionFixed')).toBe(true);
});

it('should not render multiple children when isOpen is false', () => {
const wrapper = mount(
<DropdownContext.Provider value={{ isOpen, direction, inNavbar }}>
Expand Down