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

Spread modifier styles inside _getPopperStyle and update example #6

Merged
merged 3 commits into from Mar 16, 2017
Merged

Spread modifier styles inside _getPopperStyle and update example #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9429995
Spread modifier styles inside _getPopperStyle and update example
Mar 9, 2017
20f8899
Merge branch 'master' into spread-modifiers-styles
souporserious Mar 16, 2017
9dc712e
clean up getPopperStyle state data
souporserious Mar 16, 2017
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
15 changes: 14 additions & 1 deletion example/index.jsx
View file
Open in desktop
Expand Up @@ -6,6 +6,19 @@ import Portal from 'react-travel'

import './main.scss'

const modifiers = {
customStyle: {
enabled: true,
'function': data => {
data.styles = {
...data.styles,
background: 'red',
}
return data
}
}
}

class App extends Component {
state = {
placement: 'bottom'
Expand Down Expand Up @@ -44,7 +57,7 @@ class App extends Component {
<Arrow/>
</Popper>
<Portal>
<Popper placement={placement}>
<Popper placement={placement} modifiers={modifiers}>
Dynamic Content in a Portal!
<Arrow/>
</Popper>
Expand Down
4 changes: 4 additions & 0 deletions example/main.scss
View file
Open in desktop
Expand Up @@ -10,6 +10,10 @@ html {
font-family: 'Lato', sans-serif;
}

select {
margin-bottom: 3rem;
}

.popper {
background: #222;
color: white;
Expand Down
11 changes: 8 additions & 3 deletions src/Popper.jsx
View file
Open in desktop
Expand Up @@ -68,7 +68,9 @@ class Popper extends Component {
enabled: true,
order: 900,
function: (data) => {
if ((this.state.data && !isEqual(data.offsets, this.state.data.offsets)) || !this.state.data) {
if (this.state.data && !isEqual(data.offsets, this.state.data.offsets) ||
!this.state.data
) {
this.setState({ data })
}
}
Expand Down Expand Up @@ -115,9 +117,11 @@ class Popper extends Component {
}

_getPopperStyle = () => {
const { data } = this.state

// If Popper isn't instantiated, hide the popperElement
// to avoid flash of unstyled content
if (!this._popper || !this.state.data) {
if (!this._popper || !data) {
return {
position: 'absolute',
pointerEvents: 'none',
Expand All @@ -129,14 +133,15 @@ class Popper extends Component {
top,
left,
position,
} = this.state.data.offsets.popper
} = data.offsets.popper

return {
position,
top: 0,
left: 0,
transform: `translate3d(${left}px, ${top}px, 0px)`,
willChange: 'transform',
...data.styles
}
}

Expand Down