Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/EmojiPicker/EmojiPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function EmojiPicker({viewportOffsetTop, ref}: EmojiPickerProps) {

// It's possible that the anchor is inside an active modal (e.g., add emoji reaction in report context menu).
// So, we need to get the anchor position first before closing the active modal which will also destroy the anchor.
KeyboardUtils.dismiss().then(() =>
KeyboardUtils.dismiss(true).then(() =>
calculateAnchorPosition(emojiPopoverAnchor?.current, anchorOriginValue).then((value) => {
close(() => {
onWillShow?.();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import willBlurTextInputOnTapOutsideFunc from '@libs/willBlurTextInputOnTapOutsi
import AgentZeroProcessingRequestIndicator from '@pages/home/report/AgentZeroProcessingRequestIndicator';
import ParticipantLocalTime from '@pages/home/report/ParticipantLocalTime';
import ReportTypingIndicator from '@pages/home/report/ReportTypingIndicator';
import {hideEmojiPicker, isActive as isActiveEmojiPickerAction} from '@userActions/EmojiPickerAction';
import {hideEmojiPicker, isActive as isActiveEmojiPickerAction, isEmojiPickerVisible} from '@userActions/EmojiPickerAction';
import {addAttachmentWithComment, setIsComposerFullSize} from '@userActions/Report';
import Timing from '@userActions/Timing';
import {isBlockedFromConcierge as isBlockedFromConciergeUserAction} from '@userActions/User';
Expand Down Expand Up @@ -579,7 +579,7 @@ function ReportActionCompose({
setIsFullComposerAvailable={setIsFullComposerAvailable}
onPasteFile={(files) => validateAttachments({files})}
onCleared={submitForm}
disabled={isBlockedFromConcierge}
disabled={isBlockedFromConcierge || isEmojiPickerVisible()}
setIsCommentEmpty={setIsCommentEmpty}
handleSendMessage={handleSendMessage}
shouldShowComposeInput={shouldShowComposeInput}
Expand Down
3 changes: 2 additions & 1 deletion src/utils/keyboard/index.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ const subscribeKeyboardVisibilityChange = (cb: (isVisible: boolean) => void) =>
return () => {};
};

const dismiss = (): Promise<void> => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const dismiss = (shouldSkipSafari?: boolean): Promise<void> => {
return new Promise((resolve) => {
if (!isVisible) {
resolve();
Expand Down
3 changes: 2 additions & 1 deletion src/utils/keyboard/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ const subscribeKeyboardVisibilityChange = (cb: (isVisible: boolean) => void) =>
return () => {};
};

const dismiss = (): Promise<void> => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const dismiss = (shouldSkipSafari?: boolean): Promise<void> => {
return new Promise((resolve) => {
if (!isVisible) {
resolve();
Expand Down
8 changes: 6 additions & 2 deletions src/utils/keyboard/index.website.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Keyboard} from 'react-native';
import {isMobile} from '@libs/Browser';
import {isMobile, isMobileSafari} from '@libs/Browser';
import CONST from '@src/CONST';

let isVisible = false;
Expand Down Expand Up @@ -34,8 +34,12 @@ const handleResize = () => {

window.visualViewport?.addEventListener('resize', handleResize);

const dismiss = (): Promise<void> => {
const dismiss = (shouldSkipSafari = false): Promise<void> => {
return new Promise((resolve) => {
if (shouldSkipSafari && isMobileSafari()) {
resolve();
return;
}
if (!isVisible || !isMobile()) {
resolve();
return;
Expand Down
Loading