Skip to content

Don't crash when trying to hide or press a message already auto-hiding #23

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't crash when trying to hide or press a message already auto-hiding #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a456ef
Don't crash when trying to hide or press a message already auto-hiding
brkastner Sep 20, 2018
97a89f9
Use getDerivedStateFromProps & componentDidUpdate instead of deprecia…
brkastner Dec 12, 2019
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
7 changes: 3 additions & 4 deletions src/Toast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ class Toast extends Component {
clearTimeout(timeoutId)
}

componentWillReceiveProps (nextProps) {
if (this.props.id !== nextProps.id) {
this.showToast()
}
componentDidUpdate(prevProps) {
if (prevProps.id !== this.props.id)
this.showToast();
}

showToast () {
Expand Down
18 changes: 9 additions & 9 deletions src/Toaster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ class Toaster extends Component {
let messages = []

if (props.message) {
messages = this.cloneWithId(props.message)
messages = Toaster.cloneWithId(props.message)
messages = Array.isArray(messages) ? messages : [messages]
}

this.state = { messages }
}

cloneWithId (obj) {
static cloneWithId (obj) {
if (Array.isArray(obj)) {
return obj.map(this.cloneWithId)
return obj.map(Toaster.cloneWithId)
}

return Object.assign({ id: Math.random().toString(36) }, obj)
}

componentWillReceiveProps (nextProps) {
if (!nextProps.message) return
const message = this.cloneWithId(nextProps.message)
this.setState({ messages: this.state.messages.concat(message) })
static getDerivedStateFromProps(nextProps, prevState) {
if (!nextProps.message) return null;
const message = Toaster.cloneWithId(nextProps.message);
return {messages: prevState.messages.concat(message)}
}

onShow = () => {
Expand All @@ -67,7 +67,7 @@ class Toaster extends Component {
const message = this.state.messages[0]

this.setState({ messages: this.state.messages.slice(1) }, () => {
if (message.onHide) {
if (message && message.onHide) {
message.onHide()
}

Expand All @@ -78,7 +78,7 @@ class Toaster extends Component {
onPress = () => {
const message = this.state.messages[0]

if (message.onPress) {
if (message && message.onPress) {
message.onPress()
}

Expand Down