From 3bf83210186e6aa771a6ad090dcbe63cf01bb7a0 Mon Sep 17 00:00:00 2001 From: karim <108357004+Karim-30@users.noreply.github.com> Date: Mon, 11 Jul 2022 23:08:52 +0200 Subject: [PATCH 1/6] fix RTL (edited) text --- .../home/report/ReportActionItemFragment.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index afab5787fb75..3662a69ad713 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -104,20 +104,22 @@ const ReportActionItemFragment = (props) => { html={`${props.fragment.html + (props.fragment.isEdited ? '' : '')}`} /> ) : ( - - {Str.htmlDecode(props.fragment.text)} + + + {Str.htmlDecode(props.fragment.text)} + {props.fragment.isEdited && ( - - {` ${props.translate('reportActionCompose.edited')}`} - + + {` ${props.translate('reportActionCompose.edited')}`} + )} - + ); } case 'TEXT': From c30e992489dcc5c72ea0119eb29f453cf74f8e00 Mon Sep 17 00:00:00 2001 From: karim <108357004+Karim-30@users.noreply.github.com> Date: Mon, 11 Jul 2022 23:08:52 +0200 Subject: [PATCH 2/6] fix RTL (edited) text --- .../home/report/ReportActionItemFragment.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index afab5787fb75..3662a69ad713 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -104,20 +104,22 @@ const ReportActionItemFragment = (props) => { html={`${props.fragment.html + (props.fragment.isEdited ? '' : '')}`} /> ) : ( - - {Str.htmlDecode(props.fragment.text)} + + + {Str.htmlDecode(props.fragment.text)} + {props.fragment.isEdited && ( - - {` ${props.translate('reportActionCompose.edited')}`} - + + {` ${props.translate('reportActionCompose.edited')}`} + )} - + ); } case 'TEXT': From 71bb61a408f9b61212676df673638b46a5a1a0a2 Mon Sep 17 00:00:00 2001 From: karim <108357004+Karim-30@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:08:11 +0200 Subject: [PATCH 3/6] create writing Direction utility --- src/pages/home/report/ReportActionItemFragment.js | 2 +- src/styles/styles.js | 2 ++ src/styles/utilities/writingDirection.js | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/styles/utilities/writingDirection.js diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 2d4f95043bd0..4b12c4983198 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -106,7 +106,7 @@ const ReportActionItemFragment = (props) => { ) : ( {`\u2066${Str.htmlDecode(props.fragment.text)}`} {props.fragment.isEdited && ( diff --git a/src/styles/styles.js b/src/styles/styles.js index 482a70f56ca3..e0b6abb969fc 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -15,6 +15,7 @@ import textInputAlignSelf from './utilities/textInputAlignSelf'; import positioning from './utilities/positioning'; import codeStyles from './codeStyles'; import visibility from './utilities/visibility'; +import writingDirection from './utilities/writingDirection'; import optionAlternateTextPlatformStyles from './optionAlternateTextPlatformStyles'; import pointerEventsNone from './pointerEventsNone'; import overflowXHidden from './overflowXHidden'; @@ -149,6 +150,7 @@ const styles = { ...positioning, ...wordBreak, ...whiteSpace, + ...writingDirection, rateCol: { margin: 0, diff --git a/src/styles/utilities/writingDirection.js b/src/styles/utilities/writingDirection.js new file mode 100644 index 000000000000..df1e420dc48c --- /dev/null +++ b/src/styles/utilities/writingDirection.js @@ -0,0 +1,14 @@ +/** + * Writing direction utility styles. + * note: writingDirection not available for Android, for Android you can use the Unicode. + * + * https://www.w3.org/International/questions/qa-bidi-unicode-controls + */ +export default { + rtl: { + writingDirection: 'ltr', + }, + ltr: { + writingDirection: 'ltr', + }, +}; From d1fda9f0b2da4db98e1e0d2c2b2f74f86d09e869 Mon Sep 17 00:00:00 2001 From: karim <108357004+Karim-30@users.noreply.github.com> Date: Wed, 20 Jul 2022 00:10:58 +0200 Subject: [PATCH 4/6] Add LTR unicode function --- src/pages/home/report/ReportActionItemFragment.js | 3 ++- src/styles/StyleUtils.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 48e56d8b1be2..4111de6a1dca 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -14,6 +14,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../../componen import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; import canUseTouchScreen from '../../../libs/canUseTouchscreen'; import compose from '../../../libs/compose'; +import * as StyleUtils from '../../../styles/StyleUtils'; const propTypes = { /** The message fragment needing to be displayed */ @@ -119,7 +120,7 @@ const ReportActionItemFragment = (props) => { selectable={!canUseTouchScreen() || !props.isSmallScreenWidth} style={[EmojiUtils.containsOnlyEmojis(props.fragment.text) ? styles.onlyEmojisText : undefined, styles.ltr]} > - {`\u2066${Str.htmlDecode(props.fragment.text)}`} + {StyleUtils.convertToLTR(Str.htmlDecode(props.fragment.text))} {props.fragment.isEdited && ( Date: Fri, 22 Jul 2022 16:24:16 +0200 Subject: [PATCH 5/6] fix rtl typo --- src/styles/utilities/writingDirection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/utilities/writingDirection.js b/src/styles/utilities/writingDirection.js index df1e420dc48c..2995dd5c1e41 100644 --- a/src/styles/utilities/writingDirection.js +++ b/src/styles/utilities/writingDirection.js @@ -6,7 +6,7 @@ */ export default { rtl: { - writingDirection: 'ltr', + writingDirection: 'rtl', }, ltr: { writingDirection: 'ltr', From 7800d79cd1c492207e1a2a10367522ae5d5936c6 Mon Sep 17 00:00:00 2001 From: karim <108357004+Karim-30@users.noreply.github.com> Date: Sat, 23 Jul 2022 17:25:55 +0200 Subject: [PATCH 6/6] fix comments typo --- src/styles/StyleUtils.js | 3 ++- src/styles/utilities/writingDirection.js | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js index 8cb80c28c380..94bfb1188d90 100644 --- a/src/styles/StyleUtils.js +++ b/src/styles/StyleUtils.js @@ -449,7 +449,8 @@ function getPaddingLeft(paddingLeft) { } /** - * Convert RTL text to a LTR text on Android devices useing the Unicode controls, see : https://www.w3.org/International/questions/qa-bidi-unicode-controls + * Android only - convert RTL text to a LTR text using Unicode controls. + * https://www.w3.org/International/questions/qa-bidi-unicode-controls * @param {String} text * @returns {String} */ diff --git a/src/styles/utilities/writingDirection.js b/src/styles/utilities/writingDirection.js index 2995dd5c1e41..d9c630c86912 100644 --- a/src/styles/utilities/writingDirection.js +++ b/src/styles/utilities/writingDirection.js @@ -1,7 +1,6 @@ /** * Writing direction utility styles. - * note: writingDirection not available for Android, for Android you can use the Unicode. - * + * Note: writingDirection isn't supported on Android. Unicode controls are being used for Android * https://www.w3.org/International/questions/qa-bidi-unicode-controls */ export default {