diff options
author | Samuel Newman <mozzius@protonmail.com> | 2024-05-31 14:55:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-31 12:55:51 +0100 |
commit | 05b55c1966b12f4849235dc794455bc60c5753c1 (patch) | |
tree | e156e1347aad58693f9c245002f21300e033817a /src/view/com/modals/Modal.tsx | |
parent | d614f6cb71bf2751834dbd800b5f43257d5c074a (diff) | |
download | voidsky-05b55c1966b12f4849235dc794455bc60c5753c1.tar.zst |
Composer - fix modals, and other tweaks (#4298)
* fix depreciated import * add animations to old dropdown * wrap modals in fullwindowoverlay * move errors inside header * add background to bottom bar and stop overlap * nest dialogs on android * fix android (wrap in gesturehandlerrootview) * make borders all the same color * revert threadgate button back to solid
Diffstat (limited to 'src/view/com/modals/Modal.tsx')
-rw-r--r-- | src/view/com/modals/Modal.tsx | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/src/view/com/modals/Modal.tsx b/src/view/com/modals/Modal.tsx index 3491b94e3..eb9666405 100644 --- a/src/view/com/modals/Modal.tsx +++ b/src/view/com/modals/Modal.tsx @@ -1,10 +1,11 @@ -import React, {useEffect, useRef} from 'react' +import React, {Fragment, useEffect, useRef} from 'react' import {StyleSheet} from 'react-native' import {SafeAreaView} from 'react-native-safe-area-context' import BottomSheet from '@discord/bottom-sheet/src' import {useModalControls, useModals} from '#/state/modals' import {usePalette} from 'lib/hooks/usePalette' +import {FullWindowOverlay} from '#/components/FullWindowOverlay' import {KeyboardPadding} from '#/components/KeyboardPadding' import {createCustomBackdrop} from '../util/BottomSheetCustomBackdrop' import * as AddAppPassword from './AddAppPasswords' @@ -127,24 +128,28 @@ export function ModalsContainer() { ) } + const Container = activeModal ? FullWindowOverlay : Fragment + return ( - <BottomSheet - ref={bottomSheetRef} - snapPoints={snapPoints} - handleHeight={HANDLE_HEIGHT} - index={isModalActive ? 0 : -1} - enablePanDownToClose - android_keyboardInputMode="adjustResize" - keyboardBlurBehavior="restore" - backdropComponent={ - isModalActive ? createCustomBackdrop(onClose) : undefined - } - handleIndicatorStyle={{backgroundColor: pal.text.color}} - handleStyle={[styles.handle, pal.view]} - onChange={onBottomSheetChange}> - {element} - <KeyboardPadding /> - </BottomSheet> + <Container> + <BottomSheet + ref={bottomSheetRef} + snapPoints={snapPoints} + handleHeight={HANDLE_HEIGHT} + index={isModalActive ? 0 : -1} + enablePanDownToClose + android_keyboardInputMode="adjustResize" + keyboardBlurBehavior="restore" + backdropComponent={ + isModalActive ? createCustomBackdrop(onClose) : undefined + } + handleIndicatorStyle={{backgroundColor: pal.text.color}} + handleStyle={[styles.handle, pal.view]} + onChange={onBottomSheetChange}> + {element} + <KeyboardPadding /> + </BottomSheet> + </Container> ) } |