diff options
| author | Samuel Newman <mozzius@protonmail.com> | 2024-11-25 20:30:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-25 20:30:15 +0000 |
| commit | b0c36383a9a7304f94c2bb19f7cc4b37e0b4f637 (patch) | |
| tree | 4001655a33bb300b99dbc81096ccc27fe4f712bd /src/App.web.tsx | |
| parent | 6c81090021222263dbf1d546216ea0da95029738 (diff) | |
| download | voidsky-b0c36383a9a7304f94c2bb19f7cc4b37e0b4f637.tar.zst | |
Ensure react-native-keyboard-controller enabled state doesn't get overwritten (#6727)
* revert to prev state instead of false * add dep array * use ref counting approach * patch keyboard controller to allow changing the enabled prop * remove state from patch * change patched prop name * remove Math.max check, log if < 0 * use noop provider * rm patch, use `useRef` * Style nits * Rm on web --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
Diffstat (limited to 'src/App.web.tsx')
| -rw-r--r-- | src/App.web.tsx | 95 |
1 files changed, 46 insertions, 49 deletions
diff --git a/src/App.web.tsx b/src/App.web.tsx index 53ca41873..808b0fc27 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -3,7 +3,6 @@ import '#/view/icons' import './style.css' import React, {useEffect, useState} from 'react' -import {KeyboardProvider} from 'react-native-keyboard-controller' import {RootSiblingParent} from 'react-native-root-siblings' import {SafeAreaProvider} from 'react-native-safe-area-context' import {msg} from '@lingui/macro' @@ -102,54 +101,52 @@ function InnerApp() { if (!isReady || !hasCheckedReferrer) return null return ( - <KeyboardProvider enabled={false}> - <Alf theme={theme}> - <ThemeProvider theme={theme}> - <RootSiblingParent> - <VideoVolumeProvider> - <ActiveVideoProvider> - <React.Fragment - // Resets the entire tree below when it changes: - key={currentAccount?.did}> - <QueryProvider currentDid={currentAccount?.did}> - <ComposerProvider> - <StatsigProvider> - <MessagesProvider> - {/* LabelDefsProvider MUST come before ModerationOptsProvider */} - <LabelDefsProvider> - <ModerationOptsProvider> - <LoggedOutViewProvider> - <SelectedFeedProvider> - <HiddenRepliesProvider> - <UnreadNotifsProvider> - <BackgroundNotificationPreferencesProvider> - <MutedThreadsProvider> - <SafeAreaProvider> - <ProgressGuideProvider> - <Shell /> - <NuxDialogs /> - </ProgressGuideProvider> - </SafeAreaProvider> - </MutedThreadsProvider> - </BackgroundNotificationPreferencesProvider> - </UnreadNotifsProvider> - </HiddenRepliesProvider> - </SelectedFeedProvider> - </LoggedOutViewProvider> - </ModerationOptsProvider> - </LabelDefsProvider> - </MessagesProvider> - </StatsigProvider> - </ComposerProvider> - </QueryProvider> - <ToastContainer /> - </React.Fragment> - </ActiveVideoProvider> - </VideoVolumeProvider> - </RootSiblingParent> - </ThemeProvider> - </Alf> - </KeyboardProvider> + <Alf theme={theme}> + <ThemeProvider theme={theme}> + <RootSiblingParent> + <VideoVolumeProvider> + <ActiveVideoProvider> + <React.Fragment + // Resets the entire tree below when it changes: + key={currentAccount?.did}> + <QueryProvider currentDid={currentAccount?.did}> + <ComposerProvider> + <StatsigProvider> + <MessagesProvider> + {/* LabelDefsProvider MUST come before ModerationOptsProvider */} + <LabelDefsProvider> + <ModerationOptsProvider> + <LoggedOutViewProvider> + <SelectedFeedProvider> + <HiddenRepliesProvider> + <UnreadNotifsProvider> + <BackgroundNotificationPreferencesProvider> + <MutedThreadsProvider> + <SafeAreaProvider> + <ProgressGuideProvider> + <Shell /> + <NuxDialogs /> + </ProgressGuideProvider> + </SafeAreaProvider> + </MutedThreadsProvider> + </BackgroundNotificationPreferencesProvider> + </UnreadNotifsProvider> + </HiddenRepliesProvider> + </SelectedFeedProvider> + </LoggedOutViewProvider> + </ModerationOptsProvider> + </LabelDefsProvider> + </MessagesProvider> + </StatsigProvider> + </ComposerProvider> + </QueryProvider> + <ToastContainer /> + </React.Fragment> + </ActiveVideoProvider> + </VideoVolumeProvider> + </RootSiblingParent> + </ThemeProvider> + </Alf> ) } |