Skip to content

feat: Toasts queue | fix #208 #216

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: main
Choose a base branch
from
Open

feat: Toasts queue | fix #208 #216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bdd514
feat: Toast queue implemented
r1skz3ro Jul 7, 2021
eb41ba5
chore: clean code
r1skz3ro Jul 7, 2021
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
25 changes: 22 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class Toast extends Component {
this.startTimer = this.startTimer.bind(this);
this.animate = this.animate.bind(this);
this.show = this.show.bind(this);
this.displayToast = this.displayToast.bind(this);
this.hide = this.hide.bind(this);
this.onLayout = this.onLayout.bind(this);

Expand All @@ -109,7 +110,8 @@ class Toast extends Component {
keyboardHeight: 0,
keyboardVisible: false,

customProps: {}
customProps: {},
toastQueue: []
};

this.panResponder = PanResponder.create({
Expand All @@ -125,6 +127,18 @@ class Toast extends Component {
}
});
}

componentDidUpdate(_, prevState) {
const { inProgress, isVisible, toastQueue } = this.state;
const { inProgress: prevInProgress, isVisible: prevIsVisible } = prevState;

if (!inProgress && !isVisible && prevInProgress && prevIsVisible && toastQueue.length > 0) {
const toastQueueUpdated = [...toastQueue].slice(0,-1);

toastQueue[toastQueue.length - 1]();
this.setState({toastQueue: toastQueueUpdated})
}
}

componentDidMount() {
const noop = {
Expand Down Expand Up @@ -212,10 +226,15 @@ class Toast extends Component {

async show(options = {}) {
const { inProgress, isVisible } = this.state;

if (inProgress || isVisible) {
await this.hide();
this.setState({toastQueue: [...this.state.toastQueue, () => this.displayToast(options)]})
} else {
this.displayToast(options)
}
}

async displayToast(options = {}) {
await this._setState((prevState) => ({
...prevState,
...getInitialState(this.props), // Reset layout
Expand Down Expand Up @@ -310,7 +329,7 @@ class Toast extends Component {
...config
};

const { type, customProps } = this.state;
const { type, customProps} = this.state;
const toastComponent = componentsConfig[type];

if (!toastComponent) {
Expand Down