Skip to content
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

Jump to bottom

Fix - Room - Rooms mention list does not appear in message edit mode #47949

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Fix - Room - Rooms mention list does not appear in message edit mode #47949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5059985
fix room mention in edit message
FitseTLT Aug 23, 2024
ee167c0
Merge branch 'main' into fix-mention-list-on-message-edit
FitseTLT Sep 4, 2024
8ce3dbc
Merge branch 'main' into fix-mention-list-on-message-edit
FitseTLT Sep 4, 2024
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
1 change: 1 addition & 0 deletions src/pages/home/report/ReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@ function ReportActionItem({
action={action}
draftMessage={draftMessage}
reportID={report.reportID}
policyID={report.policyID}
index={index}
ref={textInputRef}
shouldDisableEmojiPicker={
Expand Down
10 changes: 7 additions & 3 deletions src/pages/home/report/ReportActionItemMessageEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,17 @@ type ReportActionItemMessageEditProps = {
/** ReportID that holds the comment we're editing */
reportID: string;

/** PolicyID of the policy the report belongs to */
policyID?: string;

/** Position index of the report action in the overall report FlatList view */
index: number;

/** Whether or not the emoji picker is disabled */
shouldDisableEmojiPicker?: boolean;

/** Whether report is from group policy */
isGroupPolicyReport?: boolean;
isGroupPolicyReport: boolean;
};

// native ids
Expand All @@ -81,7 +84,7 @@ const shouldUseForcedSelectionRange = shouldUseEmojiPickerSelection();
const draftMessageVideoAttributeCache = new Map<string, string>();

function ReportActionItemMessageEdit(
{action, draftMessage, reportID, index, isGroupPolicyReport, shouldDisableEmojiPicker = false}: ReportActionItemMessageEditProps,
{action, draftMessage, reportID, policyID, index, isGroupPolicyReport, shouldDisableEmojiPicker = false}: ReportActionItemMessageEditProps,
forwardedRef: ForwardedRef<TextInput | HTMLTextAreaElement | undefined>,
) {
const [preferredSkinTone] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE});
Expand Down Expand Up @@ -532,7 +535,8 @@ function ReportActionItemMessageEdit(
isComposerFocused={textInputRef.current?.isFocused()}
updateComment={updateDraft}
measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
isGroupPolicyReport={false}
isGroupPolicyReport={isGroupPolicyReport}
policyID={policyID}
value={draft}
selection={selection}
setSelection={setSelection}
Expand Down
Loading