From 8f36a4b412bf86028bf7beeb3bdc9b91b34174c7 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Sat, 6 May 2023 12:16:14 +0100 Subject: [PATCH 1/7] Add dInlineFlex to display --- src/styles/utilities/display.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js index 9e7e4107a937..bcef1c6b565f 100644 --- a/src/styles/utilities/display.js +++ b/src/styles/utilities/display.js @@ -20,6 +20,11 @@ export default { dInline: { display: 'inline', }, + + dInlineFlex: { + display: 'inline-flex', + }, + dBlock: { display: 'block', }, From 15b4bf67dd1185e30ab3594f626ef013261aaf98 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Sat, 6 May 2023 12:16:52 +0100 Subject: [PATCH 2/7] Created editedLabelStyles --- src/styles/editedLabelStyles/index.js | 3 +++ src/styles/editedLabelStyles/index.native.js | 1 + 2 files changed, 4 insertions(+) create mode 100644 src/styles/editedLabelStyles/index.js create mode 100644 src/styles/editedLabelStyles/index.native.js diff --git a/src/styles/editedLabelStyles/index.js b/src/styles/editedLabelStyles/index.js new file mode 100644 index 000000000000..172dcc152b74 --- /dev/null +++ b/src/styles/editedLabelStyles/index.js @@ -0,0 +1,3 @@ +import display from '../utilities/display'; + +export default {...display.dInlineFlex}; diff --git a/src/styles/editedLabelStyles/index.native.js b/src/styles/editedLabelStyles/index.native.js new file mode 100644 index 000000000000..ff8b4c56321a --- /dev/null +++ b/src/styles/editedLabelStyles/index.native.js @@ -0,0 +1 @@ +export default {}; From 16d5cf17d44760e6516963096d4eb380fde8180c Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Sat, 6 May 2023 12:18:18 +0100 Subject: [PATCH 3/7] Added styles to edited label --- .../HTMLEngineProvider/HTMLRenderers/EditedRenderer.js | 7 ++++++- src/pages/home/report/ReportActionItemFragment.js | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js index a7783449a473..1295fc0946b0 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js @@ -5,6 +5,8 @@ import withLocalize, {withLocalizePropTypes} from '../../withLocalize'; import Text from '../../Text'; import variables from '../../../styles/variables'; import themeColors from '../../../styles/themes/default'; +import styles from '../../../styles/styles'; +import editedLabelStyles from '../../../styles/editedLabelStyles'; const propTypes = { ...htmlRendererPropTypes, @@ -19,8 +21,11 @@ const EditedRenderer = (props) => { {...defaultRendererProps} fontSize={variables.fontSizeSmall} color={themeColors.textSupporting} + style={[styles.alignItemsBaseline, editedLabelStyles]} > - {` ${props.translate('reportActionCompose.edited')}`} + {/* Native devices do not support margin between nested text */} + {' '} + {props.translate('reportActionCompose.edited')} ); }; diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 29b6907b9d95..9eb6b0900f34 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -18,6 +18,7 @@ import * as StyleUtils from '../../../styles/StyleUtils'; import {withNetwork} from '../../../components/OnyxProvider'; import CONST from '../../../CONST'; import applyStrikethrough from '../../../components/HTMLEngineProvider/applyStrikethrough'; +import editedLabelStyles from '../../../styles/editedLabelStyles'; const propTypes = { /** The message fragment needing to be displayed */ @@ -133,8 +134,10 @@ const ReportActionItemFragment = (props) => { - {` ${props.translate('reportActionCompose.edited')}`} + {' '} + {props.translate('reportActionCompose.edited')} )} From 3928939a0879bdc156c6fd73016e699452179468 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 16 May 2023 12:08:57 +0100 Subject: [PATCH 4/7] Run prettier --- .../HTMLRenderers/EditedRenderer.js | 2 +- .../home/report/ReportActionItemFragment.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js index 1295fc0946b0..b39d81173065 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js @@ -24,7 +24,7 @@ const EditedRenderer = (props) => { style={[styles.alignItemsBaseline, editedLabelStyles]} > {/* Native devices do not support margin between nested text */} - {' '} + {props.translate('reportActionCompose.edited')} ); diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 9c7bdc5bb00c..c43d5c99f2c4 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -118,14 +118,14 @@ const ReportActionItemFragment = (props) => { > {StyleUtils.convertToLTR(Str.htmlDecode(text))} {Boolean(props.fragment.isEdited) && ( - - {' '} - {props.translate('reportActionCompose.edited')} - + + + {props.translate('reportActionCompose.edited')} + )} ); From 0ffaa221b56d293d204ef28d0f3232781b0cd25c Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 16 May 2023 12:11:36 +0100 Subject: [PATCH 5/7] Added selectable prop --- .../HTMLEngineProvider/HTMLRenderers/EditedRenderer.js | 2 +- src/pages/home/report/ReportActionItemFragment.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js index b39d81173065..c8a78812a07d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js @@ -24,7 +24,7 @@ const EditedRenderer = (props) => { style={[styles.alignItemsBaseline, editedLabelStyles]} > {/* Native devices do not support margin between nested text */} - + {props.translate('reportActionCompose.edited')} ); diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index c43d5c99f2c4..8171271d7556 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -123,7 +123,7 @@ const ReportActionItemFragment = (props) => { color={themeColors.textSupporting} style={[styles.alignItemsBaseline, editedLabelStyles]} > - + {props.translate('reportActionCompose.edited')} )} From fe67d69c9043734486c6a639a0d3ba66d5440a04 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 16 May 2023 12:18:10 +0100 Subject: [PATCH 6/7] Re-run prettier --- .../HTMLEngineProvider/HTMLRenderers/EditedRenderer.js | 7 ++++++- src/pages/home/report/ReportActionItemFragment.js | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js index c8a78812a07d..478b03b40f0d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js @@ -24,7 +24,12 @@ const EditedRenderer = (props) => { style={[styles.alignItemsBaseline, editedLabelStyles]} > {/* Native devices do not support margin between nested text */} - + + {' '} + {props.translate('reportActionCompose.edited')} ); diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 8171271d7556..ade161e3b357 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -123,7 +123,12 @@ const ReportActionItemFragment = (props) => { color={themeColors.textSupporting} style={[styles.alignItemsBaseline, editedLabelStyles]} > - + + {' '} + {props.translate('reportActionCompose.edited')} )} From e56c452337434dc2e4f6afb0a5106117972bbb20 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 16 May 2023 16:17:52 +0100 Subject: [PATCH 7/7] Moved MiniReportActionContextMenu to top of View --- src/pages/home/report/ReportActionItem.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index b2c86d55204e..4fd2966feb3c 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -324,6 +324,15 @@ class ReportActionItem extends Component { {(hovered) => ( {this.props.shouldDisplayNewMarker && } + - )}