Skip to content

decompose-composer 2: Activity for EmojiPicker and PopoverMenu #87394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristipaval merged 4 commits into from
Apr 10, 2026
Merged

decompose-composer 2: Activity for EmojiPicker and PopoverMenu #87394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcb8aac
Wrap PopoverMenu and EmojiPicker in Activity to skip hidden subtree r…
adhorodyski Apr 8, 2026
1a81549
Merge branch 'Expensify:main' into decompose/composer-pr2-activity-wr…
adhorodyski Apr 9, 2026
29a112c
Merge remote-tracking branch 'exfy/main' into decompose/composer-pr2-…
adhorodyski Apr 9, 2026
868cc84
Move Activity inside popover to preserve onModalHide lifecycle
adhorodyski Apr 9, 2026
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
22 changes: 12 additions & 10 deletions src/components/EmojiPicker/EmojiPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
import React, {Activity, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
import type {ForwardedRef, RefObject} from 'react';
import {Dimensions, View} from 'react-native';
import type {Emoji} from '@assets/emojis/types';
Expand Down Expand Up @@ -265,15 +265,17 @@ function EmojiPicker({viewportOffsetTop, ref}: EmojiPickerProps) {
shouldWrapModalChildrenInScrollViewIfBottomDockedInLandscapeMode={false}
>
<FocusTrapForModal active={isEmojiPickerVisible}>
<View>
<EmojiPickerMenu
onEmojiSelected={selectEmoji}
activeEmoji={activeEmoji.current}
ref={(el) => {
emojiSearchInput.current = el;
}}
/>
</View>
<Activity mode={isEmojiPickerVisible ? 'visible' : 'hidden'}>
<View>
<EmojiPickerMenu
onEmojiSelected={selectEmoji}
activeEmoji={activeEmoji.current}
ref={(el) => {
emojiSearchInput.current = el;
}}
/>
</View>
</Activity>
</FocusTrapForModal>
</PopoverWithMeasuredContent>
);
Expand Down
64 changes: 33 additions & 31 deletions src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {useIsFocused} from '@react-navigation/native';
import {accountIDSelector} from '@selectors/Session';
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import React, {Activity, useCallback, useEffect, useMemo, useState} from 'react';
import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import AttachmentPicker from '@components/AttachmentPicker';
Expand Down Expand Up @@ -531,37 +531,39 @@ function AttachmentPickerWithMenuItems({
)}
</View>
</View>
<PopoverMenu
animationInTiming={menuItems.length * 50}
// The menu should close 2/3 of the time it took to open
animationOutTiming={menuItems.length * 50 * 0.66}
isVisible={isMenuVisible && isFocused}
onClose={onPopoverMenuClose}
onItemSelected={(item, index) => {
setMenuVisibility(false);
onItemSelected();

// In order for the file picker to open dynamically, the click
// function must be called from within a event handler that was initiated
// by the user on Safari.
if (index === menuItems.length - 1) {
if (isSafari()) {
triggerAttachmentPicker();
return;
<Activity mode={isMenuVisible && isFocused ? 'visible' : 'hidden'}>

@mkhutornyi mkhutornyi Apr 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This caused regression. Composer menu gets reopened.

regression

@mkhutornyi mkhutornyi Apr 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also caused another regression on iOS. Infinite loading on Add attachment > Choose from gallery

bug.mov

<PopoverMenu
animationInTiming={menuItems.length * 50}
// The menu should close 2/3 of the time it took to open
animationOutTiming={menuItems.length * 50 * 0.66}
isVisible={isMenuVisible && isFocused}
onClose={onPopoverMenuClose}
onItemSelected={(item, index) => {
setMenuVisibility(false);
onItemSelected();

// In order for the file picker to open dynamically, the click
// function must be called from within a event handler that was initiated
// by the user on Safari.
if (index === menuItems.length - 1) {
if (isSafari()) {
triggerAttachmentPicker();
return;
}
close(() => {
triggerAttachmentPicker();
});
}
close(() => {
triggerAttachmentPicker();
});
}
}}
anchorPosition={popoverAnchorPosition ?? {horizontal: 0, vertical: 0}}
anchorAlignment={{
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
}}
menuItems={menuItems}
anchorRef={actionButtonRef}
/>
}}
anchorPosition={popoverAnchorPosition ?? {horizontal: 0, vertical: 0}}
anchorAlignment={{
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
}}
menuItems={menuItems}
anchorRef={actionButtonRef}
/>
</Activity>
</>
);
}}
Expand Down
Loading