From ba1c4834ab23726c065aff31ef09e3578210ff01 Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Fri, 19 Apr 2024 03:42:26 +0100 Subject: Add GIF select to composer (#3600) * create dialog with flatlist in it * use alf for composer photos/camera/gif buttons * add gif icons * focus textinput on gif dialog close * add giphy API + gif grid * web support * add consent confirmation * track gif select * desktop web consent styles * use InlineLinkText instead of Link * add error/loading state * hide sideborders on web * disable composer buttons where necessary * skip cardyb and set thumbnail directly * switch legacy analytics to statsig * remove autoplay prop * disable photo/gif buttons if external media is present * memoize listmaybeplaceholder * fix pagination * don't set `value` of TextInput, clear via ref * remove console.log * close modal if press escape * pass alt text in the description * Fix typo * Rm dialog --------- Co-authored-by: Dan Abramov --- src/components/Error.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/components/Error.tsx') diff --git a/src/components/Error.tsx b/src/components/Error.tsx index 91b33f48e..bf689fc07 100644 --- a/src/components/Error.tsx +++ b/src/components/Error.tsx @@ -16,10 +16,14 @@ export function Error({ title, message, onRetry, + onGoBack: onGoBackProp, + sideBorders = true, }: { title?: string message?: string onRetry?: () => unknown + onGoBack?: () => unknown + sideBorders?: boolean }) { const navigation = useNavigation() const {_} = useLingui() @@ -28,6 +32,10 @@ export function Error({ const canGoBack = navigation.canGoBack() const onGoBack = React.useCallback(() => { + if (onGoBackProp) { + onGoBackProp() + return + } if (canGoBack) { navigation.goBack() } else { @@ -41,18 +49,19 @@ export function Error({ navigation.dispatch(StackActions.popToTop()) } } - }, [navigation, canGoBack]) + }, [navigation, canGoBack, onGoBackProp]) return ( + sideBorders={sideBorders}> {title}