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

[Tooltip] Revert update react-popper #11920

Merged
merged 1 commit into from
Jun 19, 2018
Merged

[Tooltip] Revert update react-popper #11920

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .size-limit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = [
name: 'The size of all the modules of material-ui.',
webpack: true,
path: 'packages/material-ui/build/index.js',
limit: '96.3 KB',
limit: '95.0 KB',
},
{
name: 'The main bundle of the docs',
Expand Down
120 changes: 51 additions & 69 deletions docs/src/pages/demos/menus/MenuListComposition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { Manager, Reference, Popper } from 'react-popper';
import { Manager, Target, Popper } from 'react-popper';
import Button from '@material-ui/core/Button';
import ClickAwayListener from '@material-ui/core/ClickAwayListener';
import Collapse from '@material-ui/core/Collapse';
Expand Down Expand Up @@ -55,90 +55,72 @@ class MenuListComposition extends React.Component {
</MenuList>
</Paper>
<Manager>
<Reference>
{({ ref }) => (
<div
ref={node => {
this.target1 = node;
}}
<Target>
<div
ref={node => {
this.target1 = node;
}}
>
<Button
aria-owns={open ? 'menu-list-grow' : null}
aria-haspopup="true"
onClick={this.handleToggle}
>
<Button
buttonRef={ref}
aria-owns={open ? 'menu-list-grow' : null}
aria-haspopup="true"
onClick={this.handleToggle}
>
Toggle Menu Grow
</Button>
</div>
)}
</Reference>
Toggle Menu Grow
</Button>
</div>
</Target>
<Popper
placement="bottom-start"
eventsEnabled={open}
className={classNames({ [classes.popperClose]: !open })}
>
{({ ref, style }) => (
<div ref={ref} style={style}>
<ClickAwayListener onClickAway={this.handleClose}>
<Grow in={open} id="menu-list-grow" style={{ transformOrigin: '0 0 0' }}>
<Paper>
<MenuList role="menu">
<MenuItem onClick={this.handleClose}>Profile</MenuItem>
<MenuItem onClick={this.handleClose}>My account</MenuItem>
<MenuItem onClick={this.handleClose}>Logout</MenuItem>
</MenuList>
</Paper>
</Grow>
</ClickAwayListener>
</div>
)}
<ClickAwayListener onClickAway={this.handleClose}>
<Grow in={open} id="menu-list-grow" style={{ transformOrigin: '0 0 0' }}>
<Paper>
<MenuList role="menu">
<MenuItem onClick={this.handleClose}>Profile</MenuItem>
<MenuItem onClick={this.handleClose}>My account</MenuItem>
<MenuItem onClick={this.handleClose}>Logout</MenuItem>
</MenuList>
</Paper>
</Grow>
</ClickAwayListener>
</Popper>
</Manager>
<Manager>
<Reference>
{({ ref }) => (
<div
ref={node => {
this.target2 = node;
}}
<Target>
<div
ref={node => {
this.target2 = node;
}}
>
<Button
aria-owns={open ? 'menu-list-collapse' : null}
aria-haspopup="true"
onClick={this.handleToggle}
>
<Button
buttonRef={ref}
aria-owns={open ? 'menu-list-collapse' : null}
aria-haspopup="true"
onClick={this.handleToggle}
>
Toggle Menu Collapse
</Button>
</div>
)}
</Reference>
Toggle Menu Collapse
</Button>
</div>
</Target>
<Portal>
<Popper
placement="bottom"
eventsEnabled={open}
className={classNames({ [classes.popperClose]: !open })}
>
{({ ref, style }) => (
<div ref={ref} style={style}>
<ClickAwayListener onClickAway={this.handleClose}>
<Collapse
in={open}
id="menu-list-collapse"
style={{ transformOrigin: '0 0 0' }}
>
<Paper style={{ margin: 3 }}>
<MenuList role="menu">
<MenuItem onClick={this.handleClose}>Profile</MenuItem>
<MenuItem onClick={this.handleClose}>My account</MenuItem>
<MenuItem onClick={this.handleClose}>Logout</MenuItem>
</MenuList>
</Paper>
</Collapse>
</ClickAwayListener>
</div>
)}
<ClickAwayListener onClickAway={this.handleClose}>
<Collapse in={open} id="menu-list-collapse" style={{ transformOrigin: '0 0 0' }}>
<Paper style={{ margin: 3 }}>
<MenuList role="menu">
<MenuItem onClick={this.handleClose}>Profile</MenuItem>
<MenuItem onClick={this.handleClose}>My account</MenuItem>
<MenuItem onClick={this.handleClose}>Logout</MenuItem>
</MenuList>
</Paper>
</Collapse>
</ClickAwayListener>
</Popper>
</Portal>
</Manager>
Expand Down
50 changes: 21 additions & 29 deletions docs/src/pages/utils/popovers/MouseOverPopover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Typography from '@material-ui/core/Typography';
import { withStyles } from '@material-ui/core/styles';
import Grow from '@material-ui/core/Grow';
import Paper from '@material-ui/core/Paper';
import { Manager, Reference, Popper } from 'react-popper';
import { Manager, Target, Popper } from 'react-popper';

const styles = theme => ({
paper: {
Expand Down Expand Up @@ -74,39 +74,31 @@ class MouseOverPopover extends React.Component {
<Typography>I use Popover.</Typography>
</Popover>
<Manager>
<Reference>
{({ ref }) => (
<div ref={ref}>
<Typography
aria-describedby="react-popper-tooltip"
onMouseOver={this.handlePopperOpen}
onMouseOut={this.handlePopperClose}
>
Hover with react-popper.
</Typography>
</div>
)}
</Reference>
<Target>
<Typography
aria-describedby="react-popper-tooltip"
onMouseOver={this.handlePopperOpen}
onMouseOut={this.handlePopperClose}
>
Hover with react-popper.
</Typography>
</Target>
<Popper
placement="bottom-start"
eventsEnabled={popperOpen}
className={!popperOpen ? classes.popperClose : ''}
>
{({ ref, style }) => (
<div ref={ref} style={style}>
<Grow in={popperOpen} style={{ transformOrigin: '0 0 0' }}>
<Paper
id="react-popper-tooltip"
className={classes.paper}
role="tooltip"
aria-hidden={!popperOpen}
elevation={8}
>
<Typography>I use react-popper.</Typography>
</Paper>
</Grow>
</div>
)}
<Grow in={popperOpen} style={{ transformOrigin: '0 0 0' }}>
<Paper
id="react-popper-tooltip"
className={classes.paper}
role="tooltip"
aria-hidden={!popperOpen}
elevation={8}
>
<Typography>I use react-popper.</Typography>
</Paper>
</Grow>
</Popper>
</Manager>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"doctrine": "^2.0.0",
"downshift": "^1.22.1",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "npm:enzyme-react-adapter-future",
"enzyme-adapter-react-16": "^1.1.0",
"eslint": "^4.11.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-import-resolver-webpack": "^0.10.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"prop-types": "^15.6.0",
"react-event-listener": "^0.6.0",
"react-jss": "^8.1.0",
"react-popper": "^1.0.0",
"react-popper": "^0.10.0",
"react-transition-group": "^2.2.1",
"recompose": "^0.27.0",
"recompose": "^0.26.0 || ^0.27.0",
"scroll": "^2.0.3",
"warning": "^4.0.1"
},
Expand Down
6 changes: 5 additions & 1 deletion packages/material-ui/src/Tooltip/Tooltip.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { PopperProps } from 'react-popper';
import { IPopperProps } from 'react-popper';
import { StandardProps } from '..';

export interface TooltipProps
Expand Down Expand Up @@ -43,6 +43,10 @@ export type TooltipClassKey =
| 'tooltipPlacementTop'
| 'tooltipPlacementBottom';

interface PopperProps extends IPopperProps {
PopperClassName: string;
}

declare const Tooltip: React.ComponentType<TooltipProps>;

export default Tooltip;
42 changes: 20 additions & 22 deletions packages/material-ui/src/Tooltip/Tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import EventListener from 'react-event-listener';
import debounce from 'debounce';
import warning from 'warning';
import classNames from 'classnames';
import { Manager, Popper, Reference } from 'react-popper';
import { Manager, Popper, Target } from 'react-popper';
import { capitalize } from '../utils/helpers';
import RootRef from '../RootRef';
import Portal from '../Portal';
Expand Down Expand Up @@ -137,13 +137,13 @@ class Tooltip extends React.Component {
touchTimer = null;
closeTimer = null;
isControlled = null;
scheduleUpdate = null;
popper = null;
children = null;
ignoreNonTouchEvents = false;

handleResize = debounce(() => {
if (this.scheduleUpdate) {
this.scheduleUpdate();
if (this.popper) {
this.popper._popper.scheduleUpdate();
}
}, 166); // Corresponds to 10 frames at 60 Hz.

Expand Down Expand Up @@ -314,39 +314,41 @@ class Tooltip extends React.Component {
);

return (
<Manager {...other}>
<Manager tag={false} {...other}>
<EventListener target="window" onResize={this.handleResize} />
<Reference>
{({ ref }) => (
<Target>
{({ targetProps }) => (
<RootRef
rootRef={node => {
this.children = node;
ref(this.children);
targetProps.ref(this.children);
}}
>
{React.cloneElement(children, childrenProps)}
</RootRef>
)}
</Reference>
</Target>
<Portal>
<Popper
placement={placement}
eventsEnabled={open}
className={classNames(classes.popper, { [classes.open]: open }, PopperClassName)}
ref={node => {
this.popper = node;
}}
{...PopperProps}
>
{popperProps => {
this.scheduleUpdate = popperProps.scheduleUpdate;
const actualPlacement = popperProps.placement
? popperProps.placement.split('-')[0]
: null;
{({ popperProps, restProps }) => {
const actualPlacement = (popperProps['data-placement'] || placement).split('-')[0];
return (
<div
ref={popperProps.ref}
{...popperProps}
{...restProps}
style={{
...popperProps.style,
top: popperProps.style.top || 0,
left: popperProps.style.left || 0,
...restProps.style,
}}
>
<div
Expand All @@ -355,13 +357,9 @@ class Tooltip extends React.Component {
aria-hidden={!open}
className={classNames(
classes.tooltip,
{
[classes.open]: open,
[classes.touch]: this.ignoreNonTouchEvents,
},
popperProps.placement
? classes[`tooltipPlacement${capitalize(actualPlacement)}`]
: null,
{ [classes.open]: open },
{ [classes.touch]: this.ignoreNonTouchEvents },
classes[`tooltipPlacement${capitalize(actualPlacement)}`],
)}
>
{title}
Expand Down
Loading