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.

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

Fixed regression Android - Chat - Message gets displayed from right to left #33721

65 changes: 64 additions & 1 deletion src/libs/convertToLTRForComposer/index.android.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,71 @@
import CONST from '@src/CONST';
import type ConvertToLTRForComposer from './types';

/**
* Android only - The composer can be converted to LTR if its content is the LTR character followed by an @ or space
* because to mention sugggestion works the @ character must not have any character at the beginning e.g.: \u2066@ doesn't work
* also to avoid sending empty messages the unicode character with space could enable the send button.
*/
function canComposerBeConvertedToLTR(text: string): boolean {
// This regex handles the case when a user only types spaces into the composer.
const containOnlySpaces = /^\s*$/;
// This regex handles the case where someone has RTL enabled and they began typing an @mention for someone.
const startsWithLTRAndAt = new RegExp(`^${CONST.UNICODE.LTR}@$`);
const containsAt = new RegExp(`@`);
const containSmile = new RegExp(':');
// This regex handles the case where the composer can contain multiple lines of whitespace
const startsWithLTRAndSpace = new RegExp(`${CONST.UNICODE.LTR}\\s*$`);
const emptyExpressions = [containOnlySpaces, startsWithLTRAndAt, containsAt, startsWithLTRAndSpace, containSmile];
return emptyExpressions.some((exp) => exp.test(text));
}

/**
* Android only - We should remove the LTR unicode when the input is empty to prevent:
* Sending an empty message;
* Mention suggestions not works if @ or \s (at or space) is the first character;
* Placeholder is not displayed if the unicode character is the only character remaining;
*
* @param {String} newComment - the comment written by the user
* @param {Boolean} force - always remove the LTR unicode, going to be used when composer is consider as empty
* @return {String}
*/

const resetLTRWhenEmpty = (newComment: string, force?: boolean) => {
const result = newComment.length <= 1 || force ? newComment.replaceAll(CONST.UNICODE.LTR, '') : newComment;
return result;
};

/**
* Android only - Do not convert RTL text to a LTR text for input box using Unicode controls.
* Android does not properly support bidirectional text for mixed content for input box
*/
const convertToLTRForComposer: ConvertToLTRForComposer = (text) => text;
const convertToLTRForComposer: ConvertToLTRForComposer = (text) => {
const shouldComposerMaintainAsLTR = canComposerBeConvertedToLTR(text);
const newText = resetLTRWhenEmpty(text, shouldComposerMaintainAsLTR);
if (shouldComposerMaintainAsLTR) {
return newText;
}
return `${CONST.UNICODE.LTR}${newText}`;
};

/**
* This is necessary to convert the input to LTR, there is a delay that causes the cursor not to go to the end of the input line when pasting text or typing fast. The delay is caused for the time that takes the input to convert from RTL to LTR and viceversa.
*/
const moveCursorToEndOfLine = (
commentLength: number,
setSelection: (
value: React.SetStateAction<{
start: number;
end: number;
}>,
) => void,
) => {
setSelection({
start: commentLength + 1,
end: commentLength + 1,
});
};

export {moveCursorToEndOfLine};

export default convertToLTRForComposer;
4 changes: 4 additions & 0 deletions src/libs/convertToLTRForComposer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ function hasRTLCharacters(text: string): boolean {
return rtlPattern.test(text);
}

const moveCursorToEndOfLine = (commentLength: number) => commentLength;

export {moveCursorToEndOfLine};

// Converts a given text to ensure it starts with the LTR (Left-to-Right) marker.
const convertToLTRForComposer: ConvertToLTRForComposer = (text) => {
// Ensure that the text starts with RTL characters if not we return the same text to avoid concatination with special
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
import compose from '@libs/compose';
import * as ComposerUtils from '@libs/ComposerUtils';
import getDraftComment from '@libs/ComposerUtils/getDraftComment';
import convertToLTRForComposer from '@libs/convertToLTRForComposer';
import convertToLTRForComposer, {moveCursorToEndOfLine} from '@libs/convertToLTRForComposer';
import * as EmojiUtils from '@libs/EmojiUtils';
import focusComposerWithDelay from '@libs/focusComposerWithDelay';
import getPlatform from '@libs/getPlatform';
Expand Down Expand Up @@ -114,6 +114,7 @@ function ComposerWithSuggestions({
const StyleUtils = useStyleUtils();
const {preferredLocale} = useLocalize();
const isFocused = useIsFocused();
const composerIsEmpty = useRef(true);
const navigation = useNavigation();
const emojisPresentBefore = useRef([]);

Expand Down Expand Up @@ -260,16 +261,29 @@ function ComposerWithSuggestions({
debouncedUpdateFrequentlyUsedEmojis();
}
}
const newCommentConverted = convertToLTRForComposer(newComment);
const isNewCommentEmpty = !!newCommentConverted.match(/^(\s)*$/);
const isPrevCommentEmpty = !!commentRef.current.match(/^(\s)*$/);
let newCommentConvertedToLTR = newComment;
const prevComment = commentRef.current;

// This prevent the double execution of setting input value that could affect the place holder and could send an empty message or draft messages in android
if (prevComment !== newComment) {
newCommentConvertedToLTR = convertToLTRForComposer(newCommentConvertedToLTR);
setValue(newCommentConvertedToLTR);
moveCursorToEndOfLine(newComment.length, setSelection);
composerIsEmpty.current = false;
}

const isNewCommentEmpty = !!newCommentConvertedToLTR.match(/^(\s)*$/);
const isPrevCommentEmpty = !!prevComment.match(/^(\s)*$/);

/** Only update isCommentEmpty state if it's different from previous one */
if (isNewCommentEmpty !== isPrevCommentEmpty) {
setIsCommentEmpty(isNewCommentEmpty);
if (isNewCommentEmpty) {
composerIsEmpty.current = true;
}
}
emojisPresentBefore.current = emojis;
setValue(newCommentConverted);

if (commentValue !== newComment) {
const position = Math.max(selection.end + (newComment.length - commentRef.current.length), cursorPosition || 0);

Expand All @@ -284,22 +298,22 @@ function ComposerWithSuggestions({
}

// Indicate that draft has been created.
if (commentRef.current.length === 0 && newCommentConverted.length !== 0) {
if (commentRef.current.length === 0 && newCommentConvertedToLTR.length !== 0) {
Report.setReportWithDraft(reportID, true);
}

// The draft has been deleted.
if (newCommentConverted.length === 0) {
if (newCommentConvertedToLTR.length === 0) {
Report.setReportWithDraft(reportID, false);
}

commentRef.current = newCommentConverted;
commentRef.current = newCommentConvertedToLTR;
if (shouldDebounceSaveComment) {
debouncedSaveReportComment(reportID, newCommentConverted);
debouncedSaveReportComment(reportID, newCommentConvertedToLTR);
} else {
Report.saveReportComment(reportID, newCommentConverted || '');
Report.saveReportComment(reportID, newCommentConvertedToLTR || '');
}
if (newCommentConverted) {
if (newCommentConvertedToLTR) {
debouncedBroadcastUserIsTyping(reportID);
}
},
Expand Down
Loading