Page MenuHomePhabricator
Files F3258638

D6445.id21720.diff
No OneTemporary
Actions

D6445.id21720.diff
View Options

diff --git a/native/navigation/tooltip.react.js b/native/navigation/tooltip.react.js
--- a/native/navigation/tooltip.react.js
+++ b/native/navigation/tooltip.react.js
@@ -29,6 +29,7 @@
serverCallStateSelector,
} from 'lib/selectors/server-calls';
import { localIDPrefix } from 'lib/shared/message-utils';
+import type { SetState } from 'lib/types/hook-types';
import type { Dispatch } from 'lib/types/redux-types';
import {
createBoundServerCallsSelector,
@@ -129,7 +130,8 @@
+showActionSheetWithOptions: ShowActionSheetWithOptions,
+actionSheetShown: SharedValue<boolean>,
+hideTooltip: boolean,
- +setHideTooltip: (hideTooltip: boolean) => void,
+ +setHideTooltip: SetState<boolean>,
+ +showEmojiKeyboard: SharedValue<boolean>,
+exitAnimationWorklet: (finished: boolean) => void,
+styles: typeof unboundStyles,
};
@@ -419,6 +421,7 @@
actionSheetShown,
hideTooltip,
setHideTooltip,
+ showEmojiKeyboard,
exitAnimationWorklet,
styles,
...navAndRouteForFlow
@@ -529,7 +532,11 @@
{triangleDown}
</AnimatedView>
);
- } else if (this.location === 'fixed' && !this.props.hideTooltip) {
+ } else if (
+ this.location === 'fixed' &&
+ !hideTooltip &&
+ !showEmojiKeyboard.value
+ ) {
tooltip = (
<AnimatedView
style={this.tooltipContainerStyle}
@@ -736,11 +743,13 @@
const actionSheetShown = useSharedValue(false);
const [hideTooltip, setHideTooltip] = React.useState<boolean>(false);
+ const showEmojiKeyboard = useSharedValue(false);
+
const goBackCallback = React.useCallback(() => {
- if (!actionSheetShown.value) {
+ if (!actionSheetShown.value && !showEmojiKeyboard.value) {
props.navigation.goBackOnce();
}
- }, [actionSheetShown.value, props.navigation]);
+ }, [actionSheetShown.value, props.navigation, showEmojiKeyboard.value]);
const exitAnimationWorklet = React.useCallback(
finished => {
@@ -770,6 +779,7 @@
actionSheetShown={actionSheetShown}
hideTooltip={hideTooltip}
setHideTooltip={setHideTooltip}
+ showEmojiKeyboard={showEmojiKeyboard}
exitAnimationWorklet={exitAnimationWorklet}
styles={styles}
/>

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 9:45 PM (19 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2504518
Default Alt Text
D6445.id21720.diff (2 KB)

Event Timeline