diff options
author | hailey <me@haileyok.com> | 2025-05-02 13:23:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-05-02 13:23:39 -0700 |
commit | 544f7befe0f7d3e61fb03365ec588a2ab3c5a17a (patch) | |
tree | 9d6276058aeeb44e77cba2b11bcc9e95cb8b7521 /src/components/dms | |
parent | 46ea3fdbeeab4e31657638955401145683738fbf (diff) | |
download | voidsky-544f7befe0f7d3e61fb03365ec588a2ab3c5a17a.tar.zst |
bump it bop it upgrade it (rn 79/expo 53) (#8281)
* basic bumps * more tweaking * fix rn patch * fix crop picker patch * fix media library patch * rm unnecessary patch * fix notifications patch * update bottomsheet * Update withAppDelegateReferrer.js * Delete withNoBundleCompression.js * rm withNoBundleCompression plugin * rm findLast shim * metro package exports is enabled by default * update react/react-dom/react-compiler * fix reanimated issue * vendor expo-ized emoji popup * fix types * hackfix view full thread * Update EmojiPickerModule.podspec * more upgrades * fix multiformats package version * add baseurl * bump mmkv * bumps * update react-keyed-flatten-children * bump locale packages * fix emoji picker dark mode * rn upgrades * Revert "bump locale packages" This reverts commit fc82f0f173032127dd7c18ed0316ae26f53db51d. * upgrade testing-library * rm test renderer * update patch name minors * rm findNodeHandle from tabbar * only do scrollview tag thing on ios * disable package exports * update expo notifications handler * memoize emoji picker styles * fix tests, mock multiformats * bump some dev deps with RC versions * completely rearchitect toasts * rm logs * layout animation config for composer footer * disable autolinking for patched libs * undo lingui changes * version bump from release candidate to 0.1 * update atproto deps * rm @did-plc/server * fix key issue (maybe) * move URL polyfill to the polyfill file * fix yarn lock * upgrade to 53.0.3 * reanimated layout anim bug patch * workletize a function that wasn't getting autoworkletized anymore (#8309) * bump to expo 53.0.4 * bump RN to 0.79.2 * fix yarn lock ci * Revert "completely rearchitect toasts" This reverts commit 2e2fcaeeed527580a6c485718544b85e8b4f52b9. * final upgrades * chore: cleanup yarn lock * prettier --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Diffstat (limited to 'src/components/dms')
-rw-r--r-- | src/components/dms/EmojiPopup.android.tsx | 29 | ||||
-rw-r--r-- | src/components/dms/EmojiPopup.tsx | 2 |
2 files changed, 13 insertions, 18 deletions
diff --git a/src/components/dms/EmojiPopup.android.tsx b/src/components/dms/EmojiPopup.android.tsx index 4b646608b..2205dcdea 100644 --- a/src/components/dms/EmojiPopup.android.tsx +++ b/src/components/dms/EmojiPopup.android.tsx @@ -1,15 +1,14 @@ import {useState} from 'react' import {Modal, Pressable, View} from 'react-native' -// @ts-expect-error internal component, not supposed to be used directly -// waiting on more customisability: https://github.com/okwasniewski/react-native-emoji-popup/issues/1#issuecomment-2737463753 -import EmojiPopupView from 'react-native-emoji-popup/src/EmojiPopupViewNativeComponent' +import {SafeAreaView} from 'react-native-safe-area-context' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {atoms as a, useTheme} from '#/alf' import {Button, ButtonIcon} from '#/components/Button' -import {TimesLarge_Stroke2_Corner0_Rounded} from '#/components/icons/Times' +import {TimesLarge_Stroke2_Corner0_Rounded as CloseIcon} from '#/components/icons/Times' import {Text} from '#/components/Typography' +import {EmojiPicker} from '../../../modules/expo-emoji-picker' export function EmojiPopup({ children, @@ -34,13 +33,14 @@ export function EmojiPopup({ <Modal animationType="slide" - transparent={true} visible={modalVisible} - onRequestClose={() => setModalVisible(false)}> - <View style={[a.flex_1, {backgroundColor: t.palette.white}]}> + onRequestClose={() => setModalVisible(false)} + transparent + statusBarTranslucent + navigationBarTranslucent> + <SafeAreaView style={[a.flex_1, t.atoms.bg]}> <View style={[ - t.atoms.bg, a.pl_lg, a.pr_md, a.py_sm, @@ -61,21 +61,16 @@ export function EmojiPopup({ variant="ghost" color="secondary" shape="round"> - <ButtonIcon icon={TimesLarge_Stroke2_Corner0_Rounded} /> + <ButtonIcon icon={CloseIcon} /> </Button> </View> - <EmojiPopupView - onEmojiSelected={({ - nativeEvent: {emoji}, - }: { - nativeEvent: {emoji: string} - }) => { + <EmojiPicker + onEmojiSelected={emoji => { setModalVisible(false) onEmojiSelected(emoji) }} - style={[a.flex_1, a.w_full]} /> - </View> + </SafeAreaView> </Modal> </> ) diff --git a/src/components/dms/EmojiPopup.tsx b/src/components/dms/EmojiPopup.tsx index a8f2f83e7..a988d00b5 100644 --- a/src/components/dms/EmojiPopup.tsx +++ b/src/components/dms/EmojiPopup.tsx @@ -1 +1 @@ -export {EmojiPopup} from 'react-native-emoji-popup' +export {EmojiPicker as EmojiPopup} from '../../../modules/expo-emoji-picker' |