Skip to content

add force push next toast functional #410

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.

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 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ export type ToastOptions = {
* Default value: `success`
*/
type?: ToastType;
/**
* Use it when need to force hide current toaster and show next with animation.
* Use for overshow toast
* Default value: '250' ms
*/
showNextToastAfter?: number;
/**
* Use it when need to force hide current toaster and show next with animation.
* When `true`, the visible Toast force hides and shows a next after showNextToastAfter ms Toast with next props.
* Default value: 'false'
*/
forceOverride?: boolean;
/**
* Toast position.
* Default value: `top`
Expand Down
98 changes: 64 additions & 34 deletions src/useToast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ export const DEFAULT_DATA: ToastData = {

export const DEFAULT_OPTIONS: Required<ToastOptions> = {
type: 'success',
showNextToastAfter: 250,
forceOverride: false,
position: 'top',
autoHide: true,
visibilityTime: 4000,
Expand Down Expand Up @@ -59,49 +61,77 @@ export function useToast({ defaultOptions }: UseToastParams) {
options.onHide();
}, [clearTimer, log, options]);

const show = React.useCallback(
(params: ToastShowParams) => {
log(`Showing with params: ${JSON.stringify(params)}`);
const showNextToaster = React.useCallback((params: ToastShowParams) => {
const {
text1 = DEFAULT_DATA.text1,
text2 = DEFAULT_DATA.text2,
type = initialOptions.type,
position = initialOptions.position,
autoHide = initialOptions.autoHide,
visibilityTime = initialOptions.visibilityTime,
topOffset = initialOptions.topOffset,
bottomOffset = initialOptions.bottomOffset,
keyboardOffset = initialOptions.keyboardOffset,
onShow = initialOptions.onShow,
onHide = initialOptions.onHide,
onPress = initialOptions.onPress,
props = initialOptions.props
text1 = DEFAULT_DATA.text1,
text2 = DEFAULT_DATA.text2,
type = initialOptions.type,
position = initialOptions.position,
autoHide = initialOptions.autoHide,
visibilityTime = initialOptions.visibilityTime,
topOffset = initialOptions.topOffset,
bottomOffset = initialOptions.bottomOffset,
keyboardOffset = initialOptions.keyboardOffset,
onShow = initialOptions.onShow,
onHide = initialOptions.onHide,
onPress = initialOptions.onPress,
props = initialOptions.props
} = params;

setData({
text1,
text2
text1,
text2
});
setOptions(
mergeIfDefined(initialOptions, {
type,
position,
autoHide,
visibilityTime,
topOffset,
bottomOffset,
keyboardOffset,
onShow,
onHide,
onPress,
props
}) as Required<ToastOptions>
mergeIfDefined(initialOptions, {
type,
position,
autoHide,
visibilityTime,
topOffset,
bottomOffset,
keyboardOffset,
onShow,
onHide,
onPress,
props
}) as Required<ToastOptions>
);

}, [initialOptions])

const show = React.useCallback(
(params: ToastShowParams) => {
log(`Showing with params: ${JSON.stringify(params)}`);
const {
forceOverride = initialOptions.forceOverride,
showNextToastAfter = initialOptions.showNextToastAfter,
onShow = initialOptions.onShow,
} = params;

// TODO: validate input
// TODO: use a queue when Toast is already visible
setIsVisible(true);
onShow();

if (forceOverride) {
if (isVisible) {
hide();
setTimeout(() => {
showNextToaster(params);
setIsVisible(true);
onShow();
}, showNextToastAfter)
} else {
showNextToaster(params);
setIsVisible(true);
onShow();
}
} else {
showNextToaster(params);
setIsVisible(true);
onShow();
}
},
[initialOptions, log]
[hide, initialOptions.forceOverride, initialOptions.onShow, initialOptions.showNextToastAfter, isVisible, log, showNextToaster]
);

React.useEffect(() => {
Expand Down