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: android app - expand icon doesn't disappear immediately after sending the message #27015

Merged
merged 6 commits into from
Sep 11, 2023
Merged

fix: android app - expand icon doesn't disappear immediately after sending the message #27015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa9c074
use isCommentEmpty flag to hide expand Icon of composer
HezekielT Sep 8, 2023
a501d5e
remove indentation
HezekielT Sep 8, 2023
d8adf78
reset isComposerFullSize to false in SendButton
HezekielT Sep 8, 2023
1116ace
added extra check and renamed the function to make it more descriptive
HezekielT Sep 9, 2023
a17dec6
remove redundant code
HezekielT Sep 9, 2023
6232d7e
revert change
HezekielT Sep 9, 2023
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
12 changes: 11 additions & 1 deletion src/pages/home/report/ReportActionCompose/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,15 @@ function ReportActionCompose({
setIsFocused(true);
}, []);

// resets the composer to normal size when
// the send button is pressed.
const resetFullComposerSize = useCallback(() => {
if (isComposerFullSize) {
Report.setIsComposerFullSize(reportID, false);
}
setIsFullComposerAvailable(false);
}, [isComposerFullSize, reportID]);

// We are returning a callback here as we want to incoke the method on unmount only
useEffect(
() => () => {
Expand Down Expand Up @@ -338,7 +347,7 @@ function ReportActionCompose({
reportID={reportID}
report={report}
reportParticipantIDs={reportParticipantIDs}
isFullComposerAvailable={isFullComposerAvailable}
isFullComposerAvailable={isFullComposerAvailable && !isCommentEmpty}
Copy link
Contributor

Choose a reason for hiding this comment

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

This caused regression of not showing compose button on multiple new lines - #28093 (comment)

isComposerFullSize={isComposerFullSize}
updateShouldShowSuggestionMenuToFalse={updateShouldShowSuggestionMenuToFalse}
isBlockedFromConcierge={isBlockedFromConcierge}
Expand Down Expand Up @@ -400,6 +409,7 @@ function ReportActionCompose({
<SendButton
isDisabled={isSendDisabled}
setIsCommentEmpty={setIsCommentEmpty}
resetFullComposerSize={resetFullComposerSize}
submitForm={submitForm}
animatedRef={animatedRef}
/>
Expand Down
6 changes: 5 additions & 1 deletion src/pages/home/report/ReportActionCompose/SendButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@ const propTypes = {
/** Sets the isCommentEmpty flag to true */
setIsCommentEmpty: PropTypes.func.isRequired,

/** resets the composer to normal size */
resetFullComposerSize: PropTypes.func.isRequired,

/** Submits the form */
submitForm: PropTypes.func.isRequired,
};

function SendButton({isDisabled: isDisabledProp, animatedRef, setIsCommentEmpty, submitForm}) {
function SendButton({isDisabled: isDisabledProp, animatedRef, setIsCommentEmpty, resetFullComposerSize, submitForm}) {
const {translate} = useLocalize();

const Tap = Gesture.Tap()
Expand All @@ -40,6 +43,7 @@ function SendButton({isDisabled: isDisabledProp, animatedRef, setIsCommentEmpty,
const updates = {text: ''};
// We are setting the isCommentEmpty flag to true so the status of it will be in sync of the native text input state
runOnJS(setIsCommentEmpty)(true);
runOnJS(resetFullComposerSize)();
updatePropsPaperWorklet(viewTag, viewName, updates); // clears native text input on the UI thread
runOnJS(submitForm)();
});
Expand Down
Loading