Dismissable toasts (#6345)
* dismissable toast * adjust top offset * improve a11y * stretchy pull-down * Dismiss web on tap * Simplify code --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
This commit is contained in:
+159
-44
@@ -1,6 +1,20 @@
|
|||||||
import {useEffect, useState} from 'react'
|
import {useEffect, useMemo, useRef, useState} from 'react'
|
||||||
import {View} from 'react-native'
|
import {AccessibilityInfo, View} from 'react-native'
|
||||||
import Animated, {FadeInUp, FadeOutUp} from 'react-native-reanimated'
|
import {
|
||||||
|
Gesture,
|
||||||
|
GestureDetector,
|
||||||
|
GestureHandlerRootView,
|
||||||
|
} from 'react-native-gesture-handler'
|
||||||
|
import Animated, {
|
||||||
|
FadeInUp,
|
||||||
|
FadeOutUp,
|
||||||
|
runOnJS,
|
||||||
|
useAnimatedReaction,
|
||||||
|
useAnimatedStyle,
|
||||||
|
useSharedValue,
|
||||||
|
withDecay,
|
||||||
|
withSpring,
|
||||||
|
} from 'react-native-reanimated'
|
||||||
import RootSiblings from 'react-native-root-siblings'
|
import RootSiblings from 'react-native-root-siblings'
|
||||||
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
||||||
import {
|
import {
|
||||||
@@ -8,6 +22,7 @@ import {
|
|||||||
Props as FontAwesomeProps,
|
Props as FontAwesomeProps,
|
||||||
} from '@fortawesome/react-native-fontawesome'
|
} from '@fortawesome/react-native-fontawesome'
|
||||||
|
|
||||||
|
import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
import {IS_TEST} from '#/env'
|
import {IS_TEST} from '#/env'
|
||||||
@@ -19,74 +34,174 @@ export function show(
|
|||||||
icon: FontAwesomeProps['icon'] = 'check',
|
icon: FontAwesomeProps['icon'] = 'check',
|
||||||
) {
|
) {
|
||||||
if (IS_TEST) return
|
if (IS_TEST) return
|
||||||
const item = new RootSiblings(<Toast message={message} icon={icon} />)
|
AccessibilityInfo.announceForAccessibility(message)
|
||||||
// timeout has some leeway to account for the animation
|
const item = new RootSiblings(
|
||||||
setTimeout(() => {
|
<Toast message={message} icon={icon} destroy={() => item.destroy()} />,
|
||||||
item.destroy()
|
)
|
||||||
}, TIMEOUT + 1e3)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function Toast({
|
function Toast({
|
||||||
message,
|
message,
|
||||||
icon,
|
icon,
|
||||||
|
destroy,
|
||||||
}: {
|
}: {
|
||||||
message: string
|
message: string
|
||||||
icon: FontAwesomeProps['icon']
|
icon: FontAwesomeProps['icon']
|
||||||
|
destroy: () => void
|
||||||
}) {
|
}) {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
const {top} = useSafeAreaInsets()
|
const {top} = useSafeAreaInsets()
|
||||||
|
const isPanning = useSharedValue(false)
|
||||||
|
const dismissSwipeTranslateY = useSharedValue(0)
|
||||||
|
const [cardHeight, setCardHeight] = useState(0)
|
||||||
|
|
||||||
// for the exit animation to work on iOS the animated component
|
// for the exit animation to work on iOS the animated component
|
||||||
// must not be the root component
|
// must not be the root component
|
||||||
// so we need to wrap it in a view and unmount the toast ahead of time
|
// so we need to wrap it in a view and unmount the toast ahead of time
|
||||||
const [alive, setAlive] = useState(true)
|
const [alive, setAlive] = useState(true)
|
||||||
|
|
||||||
useEffect(() => {
|
const hideAndDestroyImmediately = () => {
|
||||||
|
setAlive(false)
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setAlive(false)
|
destroy()
|
||||||
}, TIMEOUT)
|
}, 1e3)
|
||||||
}, [])
|
}
|
||||||
|
|
||||||
|
const destroyTimeoutRef = useRef<ReturnType<typeof setTimeout>>()
|
||||||
|
const hideAndDestroyAfterTimeout = useNonReactiveCallback(() => {
|
||||||
|
clearTimeout(destroyTimeoutRef.current)
|
||||||
|
destroyTimeoutRef.current = setTimeout(hideAndDestroyImmediately, TIMEOUT)
|
||||||
|
})
|
||||||
|
const pauseDestroy = useNonReactiveCallback(() => {
|
||||||
|
clearTimeout(destroyTimeoutRef.current)
|
||||||
|
})
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
hideAndDestroyAfterTimeout()
|
||||||
|
}, [hideAndDestroyAfterTimeout])
|
||||||
|
|
||||||
|
const panGesture = useMemo(() => {
|
||||||
|
return Gesture.Pan()
|
||||||
|
.activeOffsetY([-10, 10])
|
||||||
|
.failOffsetX([-10, 10])
|
||||||
|
.maxPointers(1)
|
||||||
|
.onStart(() => {
|
||||||
|
'worklet'
|
||||||
|
if (!alive) return
|
||||||
|
isPanning.set(true)
|
||||||
|
runOnJS(pauseDestroy)()
|
||||||
|
})
|
||||||
|
.onUpdate(e => {
|
||||||
|
'worklet'
|
||||||
|
if (!alive) return
|
||||||
|
dismissSwipeTranslateY.value = e.translationY
|
||||||
|
})
|
||||||
|
.onEnd(e => {
|
||||||
|
'worklet'
|
||||||
|
if (!alive) return
|
||||||
|
runOnJS(hideAndDestroyAfterTimeout)()
|
||||||
|
isPanning.set(false)
|
||||||
|
if (e.velocityY < -100) {
|
||||||
|
if (dismissSwipeTranslateY.value === 0) {
|
||||||
|
// HACK: If the initial value is 0, withDecay() animation doesn't start.
|
||||||
|
// This is a bug in Reanimated, but for now we'll work around it like this.
|
||||||
|
dismissSwipeTranslateY.value = 1
|
||||||
|
}
|
||||||
|
dismissSwipeTranslateY.value = withDecay({
|
||||||
|
velocity: e.velocityY,
|
||||||
|
velocityFactor: Math.max(3500 / Math.abs(e.velocityY), 1),
|
||||||
|
deceleration: 1,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
dismissSwipeTranslateY.value = withSpring(0, {
|
||||||
|
stiffness: 500,
|
||||||
|
damping: 50,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}, [
|
||||||
|
dismissSwipeTranslateY,
|
||||||
|
isPanning,
|
||||||
|
alive,
|
||||||
|
hideAndDestroyAfterTimeout,
|
||||||
|
pauseDestroy,
|
||||||
|
])
|
||||||
|
|
||||||
|
const topOffset = top + 10
|
||||||
|
|
||||||
|
useAnimatedReaction(
|
||||||
|
() =>
|
||||||
|
!isPanning.get() &&
|
||||||
|
dismissSwipeTranslateY.get() < -topOffset - cardHeight,
|
||||||
|
(isSwipedAway, prevIsSwipedAway) => {
|
||||||
|
'worklet'
|
||||||
|
if (isSwipedAway && !prevIsSwipedAway) {
|
||||||
|
runOnJS(destroy)()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
const animatedStyle = useAnimatedStyle(() => {
|
||||||
|
const translation = dismissSwipeTranslateY.get()
|
||||||
|
return {
|
||||||
|
transform: [
|
||||||
|
{
|
||||||
|
translateY: translation > 0 ? translation ** 0.7 : translation,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<GestureHandlerRootView
|
||||||
style={[a.absolute, {top: top + 15, left: 16, right: 16}]}
|
style={[a.absolute, {top: topOffset, left: 16, right: 16}]}
|
||||||
pointerEvents="none">
|
pointerEvents="box-none">
|
||||||
{alive && (
|
{alive && (
|
||||||
<Animated.View
|
<Animated.View
|
||||||
entering={FadeInUp}
|
entering={FadeInUp}
|
||||||
exiting={FadeOutUp}
|
exiting={FadeOutUp}
|
||||||
style={[
|
style={[a.flex_1]}>
|
||||||
a.flex_1,
|
<Animated.View
|
||||||
t.atoms.bg,
|
onLayout={evt => setCardHeight(evt.nativeEvent.layout.height)}
|
||||||
a.shadow_lg,
|
accessibilityRole="alert"
|
||||||
t.atoms.border_contrast_medium,
|
accessible={true}
|
||||||
a.rounded_sm,
|
accessibilityLabel={message}
|
||||||
a.px_md,
|
accessibilityHint=""
|
||||||
a.py_lg,
|
onAccessibilityEscape={hideAndDestroyImmediately}
|
||||||
a.border,
|
|
||||||
a.flex_row,
|
|
||||||
a.gap_md,
|
|
||||||
]}>
|
|
||||||
<View
|
|
||||||
style={[
|
style={[
|
||||||
a.flex_shrink_0,
|
a.flex_1,
|
||||||
a.rounded_full,
|
t.atoms.bg,
|
||||||
{width: 32, height: 32},
|
a.shadow_lg,
|
||||||
t.atoms.bg_contrast_25,
|
t.atoms.border_contrast_medium,
|
||||||
a.align_center,
|
a.rounded_sm,
|
||||||
a.justify_center,
|
a.border,
|
||||||
|
animatedStyle,
|
||||||
]}>
|
]}>
|
||||||
<FontAwesomeIcon
|
<GestureDetector gesture={panGesture}>
|
||||||
icon={icon}
|
<View style={[a.flex_1, a.px_md, a.py_lg, a.flex_row, a.gap_md]}>
|
||||||
size={16}
|
<View
|
||||||
style={t.atoms.text_contrast_low}
|
style={[
|
||||||
/>
|
a.flex_shrink_0,
|
||||||
</View>
|
a.rounded_full,
|
||||||
<View style={[a.h_full, a.justify_center, a.flex_1]}>
|
{width: 32, height: 32},
|
||||||
<Text style={a.text_md}>{message}</Text>
|
{backgroundColor: t.palette.primary_50},
|
||||||
</View>
|
a.align_center,
|
||||||
|
a.justify_center,
|
||||||
|
]}>
|
||||||
|
<FontAwesomeIcon
|
||||||
|
icon={icon}
|
||||||
|
size={16}
|
||||||
|
style={t.atoms.text_contrast_medium}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View style={[a.h_full, a.justify_center, a.flex_1]}>
|
||||||
|
<Text style={a.text_md}>{message}</Text>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</GestureDetector>
|
||||||
|
</Animated.View>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
)}
|
)}
|
||||||
</View>
|
</GestureHandlerRootView>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import React, {useEffect, useState} from 'react'
|
import React, {useEffect, useState} from 'react'
|
||||||
import {StyleSheet, Text, View} from 'react-native'
|
import {Pressable, StyleSheet, Text, View} from 'react-native'
|
||||||
import {
|
import {
|
||||||
FontAwesomeIcon,
|
FontAwesomeIcon,
|
||||||
FontAwesomeIconStyle,
|
FontAwesomeIconStyle,
|
||||||
@@ -43,6 +43,14 @@ export const ToastContainer: React.FC<ToastContainerProps> = ({}) => {
|
|||||||
style={styles.icon as FontAwesomeIconStyle}
|
style={styles.icon as FontAwesomeIconStyle}
|
||||||
/>
|
/>
|
||||||
<Text style={styles.text}>{activeToast.text}</Text>
|
<Text style={styles.text}>{activeToast.text}</Text>
|
||||||
|
<Pressable
|
||||||
|
style={styles.dismissBackdrop}
|
||||||
|
accessibilityLabel="Dismiss"
|
||||||
|
accessibilityHint=""
|
||||||
|
onPress={() => {
|
||||||
|
setActiveToast(undefined)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
@@ -77,6 +85,13 @@ const styles = StyleSheet.create({
|
|||||||
backgroundColor: '#000c',
|
backgroundColor: '#000c',
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
},
|
},
|
||||||
|
dismissBackdrop: {
|
||||||
|
position: 'absolute',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
bottom: 0,
|
||||||
|
right: 0,
|
||||||
|
},
|
||||||
icon: {
|
icon: {
|
||||||
color: '#fff',
|
color: '#fff',
|
||||||
flexShrink: 0,
|
flexShrink: 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user