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

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

Merged
merged 16 commits into from
Dec 26, 2023
Merged

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

Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a10688
Fixed Android - Chat - Message gets displayed from right to left
samilabud Oct 30, 2023
7c11e93
Removed ignore lint rule and doing the early return
samilabud Dec 4, 2023
fbd37e8
Fixed early return when useEffect bug
samilabud Dec 4, 2023
5ffd754
Fixed bugs: when mention, sending empty messages, no placeholder
samilabud Dec 5, 2023
59f4466
Added comments and refactoring code to better understanding
samilabud Dec 6, 2023
431d7e2
Fixed prettier errors
samilabud Dec 6, 2023
33b5733
Fixed observations, added suggestions and added extra comments
samilabud Dec 6, 2023
89d738e
Moving functions from convertToLTR to convertToLTRForComposer lib, re…
samilabud Dec 8, 2023
2a9f636
Added space to the list of characters to consider as empty for the co…
samilabud Dec 11, 2023
3740949
Added method to determinate if we should convert the composer to LTR …
samilabud Dec 12, 2023
04c95e0
Fixed suggestions: variable names, comments, misspelling
samilabud Dec 13, 2023
1735f5a
Fixed comments and variables to better understanding
samilabud Dec 13, 2023
e737dcb
Comments and variables changed to better understanding
samilabud Dec 13, 2023
be6ee76
Fixed grammar in comments
samilabud Dec 14, 2023
5be5dc0
Fixed comments grammar and using @param doc
samilabud Dec 14, 2023
8a75507
Using jsdoc format for comments
samilabud Dec 15, 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
33 changes: 31 additions & 2 deletions src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
import compose from '@libs/compose';
import * as ComposerUtils from '@libs/ComposerUtils';
import getDraftComment from '@libs/ComposerUtils/getDraftComment';
import convertToLTR from '@libs/convertToLTR';
import convertToLTRForComposer from '@libs/convertToLTRForComposer';
import * as EmojiUtils from '@libs/EmojiUtils';
import focusComposerWithDelay from '@libs/focusComposerWithDelay';
Expand Down Expand Up @@ -105,6 +106,7 @@ function ComposerWithSuggestions({
const styles = useThemeStyles();
const {preferredLocale} = useLocalize();
const isFocused = useIsFocused();
const [firstChange, setFirstChange] = useState(true);
samilabud marked this conversation as resolved.
Show resolved Hide resolved
const navigation = useNavigation();
const emojisPresentBefore = useRef([]);
const [value, setValue] = useState(() => {
Expand Down Expand Up @@ -220,16 +222,42 @@ function ComposerWithSuggestions({
debouncedUpdateFrequentlyUsedEmojis();
}
}
const newCommentConverted = convertToLTRForComposer(newComment);

let newCommentConverted = convertToLTRForComposer(newComment);

const moveCursorToEndOfLine = (commentLength) => {
setSelection({
start: commentLength + 1,
end: commentLength + 1,
});
};

if (firstChange && commentRef.current === '' && !['@'].includes(newComment)) {
samilabud marked this conversation as resolved.
Show resolved Hide resolved
if (commentRef.current !== newComment) {
setValue(convertToLTR(newComment));
moveCursorToEndOfLine(newComment.length);
}
setFirstChange(false);
} else if (commentRef.current !== newComment) {
newCommentConverted = newComment.length <= 1 ? newCommentConverted.replace(/\u2066/g, '') : newCommentConverted;
setValue(newCommentConverted);
moveCursorToEndOfLine(newComment.length);
setFirstChange(false);
}

const isNewCommentEmpty = !!newCommentConverted.match(/^(\s)*$/);
const isPrevCommentEmpty = !!commentRef.current.match(/^(\s)*$/);

/** Only update isCommentEmpty state if it's different from previous one */
if (isNewCommentEmpty !== isPrevCommentEmpty) {
setIsCommentEmpty(isNewCommentEmpty);
if (isNewCommentEmpty) {
setFirstChange(true);
samilabud marked this conversation as resolved.
Show resolved Hide resolved
}
}

emojisPresentBefore.current = emojis;
setValue(newCommentConverted);

if (commentValue !== newComment) {
const position = Math.max(selection.end + (newComment.length - commentRef.current.length), cursorPosition || 0);
setSelection({
Expand Down Expand Up @@ -268,6 +296,7 @@ function ComposerWithSuggestions({
raiseIsScrollLikelyLayoutTriggered,
debouncedSaveReportComment,
selection.end,
firstChange,
],
);

Expand Down
Loading