From 0951986c2a9c5e6c96dfb1df5574f343f0ae8db0 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Thu, 20 Apr 2023 09:31:09 +0100 Subject: [PATCH 01/11] Mirror text layout from EditedRenderer --- src/pages/home/report/ReportActionItemFragment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 98bb819c20a..6b334f80154 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -134,7 +134,8 @@ const ReportActionItemFragment = (props) => { fontSize={variables.fontSizeSmall} color={themeColors.textSupporting} > - {` ${props.translate('reportActionCompose.edited')}`} + {' '} + {props.translate('reportActionCompose.edited')} )} From 861fc7ca661802311861a34501d0bb78d3f81cae Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Thu, 20 Apr 2023 09:31:39 +0100 Subject: [PATCH 02/11] Added dInlineFlex style --- src/styles/utilities/display.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js index a16a62694af..9c7db2c90ad 100644 --- a/src/styles/utilities/display.js +++ b/src/styles/utilities/display.js @@ -20,4 +20,8 @@ export default { dInline: { display: 'inline', }, + + dInlineFlex: { + display: 'inline-flex', + }, }; From 18274bd48df97ffd81f0986315181a2a48338de6 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Thu, 20 Apr 2023 09:33:47 +0100 Subject: [PATCH 03/11] Add alignItemsBaseline,dInlineFlex to edited label --- .../HTMLEngineProvider/HTMLRenderers/EditedRenderer.js | 1 + src/pages/home/report/ReportActionItemFragment.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js index 0b04c3a885b..345f02a2366 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js @@ -20,6 +20,7 @@ const EditedRenderer = (props) => { {...defaultRendererProps} fontSize={variables.fontSizeSmall} color={themeColors.textSupporting} + style={[styles.alignItemsBaseline, styles.dInlineFlex]} > {/* Native devices do not support margin between nested text */} {' '} diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 6b334f80154..793cb0dafda 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -133,6 +133,7 @@ const ReportActionItemFragment = (props) => { {' '} {props.translate('reportActionCompose.edited')} From 93f3662a89858cdc7169e678d36195611aa5b1a1 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Thu, 20 Apr 2023 17:39:22 +0100 Subject: [PATCH 04/11] Moved MiniReportActionContextMenu to top of view --- src/pages/home/report/ReportActionItem.js | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index c4e7d6c5fe6..05124f61dcf 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -252,6 +252,18 @@ class ReportActionItem extends Component { {hovered => ( + {this.props.shouldDisplayNewMarker && ( )} @@ -289,18 +301,6 @@ class ReportActionItem extends Component { )} - )} From 45646d5d28f63ba42e30b1e1a07ccb4eb6c59175 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Thu, 20 Apr 2023 17:40:22 +0100 Subject: [PATCH 05/11] Removed userSelectNone from emoji text --- src/components/Reactions/EmojiReactionBubble.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js index f1b87d48de2..ec45958fa05 100644 --- a/src/components/Reactions/EmojiReactionBubble.js +++ b/src/components/Reactions/EmojiReactionBubble.js @@ -68,7 +68,6 @@ const EmojiReactionBubble = (props) => { > From db83d74ff3c92948510156858fc7688e1595f9d9 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Sat, 22 Apr 2023 09:41:25 +0100 Subject: [PATCH 06/11] Added dInlineFlex index/index.native --- src/styles/utilities/dInlineFlex/index.js | 3 +++ src/styles/utilities/dInlineFlex/index.native.js | 1 + src/styles/utilities/display.js | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 src/styles/utilities/dInlineFlex/index.js create mode 100644 src/styles/utilities/dInlineFlex/index.native.js diff --git a/src/styles/utilities/dInlineFlex/index.js b/src/styles/utilities/dInlineFlex/index.js new file mode 100644 index 00000000000..905b954fabf --- /dev/null +++ b/src/styles/utilities/dInlineFlex/index.js @@ -0,0 +1,3 @@ +export default { + display: 'inline-flex', +}; diff --git a/src/styles/utilities/dInlineFlex/index.native.js b/src/styles/utilities/dInlineFlex/index.native.js new file mode 100644 index 00000000000..ff8b4c56321 --- /dev/null +++ b/src/styles/utilities/dInlineFlex/index.native.js @@ -0,0 +1 @@ +export default {}; diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js index 9c7db2c90ad..604c2809f54 100644 --- a/src/styles/utilities/display.js +++ b/src/styles/utilities/display.js @@ -1,3 +1,5 @@ +import dInlineFlex from './dInlineFlex'; + /** * Display utilities with Bootstrap inspired naming. * @@ -21,7 +23,5 @@ export default { display: 'inline', }, - dInlineFlex: { - display: 'inline-flex', - }, + dInlineFlex, }; From fcf463036bd89801a400d8e5992508a1f360ebd2 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Mon, 1 May 2023 13:29:11 +0100 Subject: [PATCH 07/11] Added editedLabelStyles --- .../HTMLEngineProvider/HTMLRenderers/EditedRenderer.js | 3 ++- src/pages/home/report/ReportActionItemFragment.js | 3 ++- src/styles/editedLabelStyles/index.js | 3 +++ .../dInlineFlex => editedLabelStyles}/index.native.js | 0 src/styles/utilities/dInlineFlex/index.js | 3 --- src/styles/utilities/display.js | 8 ++++---- 6 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 src/styles/editedLabelStyles/index.js rename src/styles/{utilities/dInlineFlex => editedLabelStyles}/index.native.js (100%) delete mode 100644 src/styles/utilities/dInlineFlex/index.js diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js index 345f02a2366..e87a7bec532 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js @@ -6,6 +6,7 @@ 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, @@ -20,7 +21,7 @@ const EditedRenderer = (props) => { {...defaultRendererProps} fontSize={variables.fontSizeSmall} color={themeColors.textSupporting} - style={[styles.alignItemsBaseline, styles.dInlineFlex]} + style={[styles.alignItemsBaseline, editedLabelStyles]} > {/* Native devices do not support margin between nested text */} {' '} diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 793cb0dafda..ed7a00ed1a0 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,7 +134,7 @@ const ReportActionItemFragment = (props) => { {' '} {props.translate('reportActionCompose.edited')} diff --git a/src/styles/editedLabelStyles/index.js b/src/styles/editedLabelStyles/index.js new file mode 100644 index 00000000000..172dcc152b7 --- /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/utilities/dInlineFlex/index.native.js b/src/styles/editedLabelStyles/index.native.js similarity index 100% rename from src/styles/utilities/dInlineFlex/index.native.js rename to src/styles/editedLabelStyles/index.native.js diff --git a/src/styles/utilities/dInlineFlex/index.js b/src/styles/utilities/dInlineFlex/index.js deleted file mode 100644 index 905b954fabf..00000000000 --- a/src/styles/utilities/dInlineFlex/index.js +++ /dev/null @@ -1,3 +0,0 @@ -export default { - display: 'inline-flex', -}; diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js index a44c2c65834..bcef1c6b565 100644 --- a/src/styles/utilities/display.js +++ b/src/styles/utilities/display.js @@ -1,5 +1,3 @@ -import dInlineFlex from './dInlineFlex'; - /** * Display utilities with Bootstrap inspired naming. * @@ -23,9 +21,11 @@ export default { display: 'inline', }, + dInlineFlex: { + display: 'inline-flex', + }, + dBlock: { display: 'block', }, - - dInlineFlex, }; From a994917b738e56bcbe11023fc441ee6512a1acad Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 2 May 2023 09:51:02 +0100 Subject: [PATCH 08/11] Revert remove userSelectNone --- src/components/Reactions/EmojiReactionBubble.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js index ec45958fa05..f1b87d48de2 100644 --- a/src/components/Reactions/EmojiReactionBubble.js +++ b/src/components/Reactions/EmojiReactionBubble.js @@ -68,6 +68,7 @@ const EmojiReactionBubble = (props) => { > From 133d4d5929b258487141f32709c0d558a4e072ba Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 2 May 2023 09:56:28 +0100 Subject: [PATCH 09/11] Revert move MiniReportActionContextMenu --- src/pages/home/report/ReportActionItem.js | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 4f275491ffe..a47ff6d4de4 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -275,18 +275,6 @@ class ReportActionItem extends Component { {hovered => ( - {this.props.shouldDisplayNewMarker && ( )} @@ -348,6 +336,19 @@ class ReportActionItem extends Component { )} + )} From 7633f88b31b75f24ace3b70f03226558f157da84 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 2 May 2023 10:24:32 +0100 Subject: [PATCH 10/11] Move MiniReportActionContextMenu to top of view --- src/pages/home/report/ReportActionItem.js | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index a47ff6d4de4..4f275491ffe 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -275,6 +275,18 @@ class ReportActionItem extends Component { {hovered => ( + {this.props.shouldDisplayNewMarker && ( )} @@ -336,19 +348,6 @@ class ReportActionItem extends Component { )} - )} From 44bbe3c1b119eba657ea11e65677a4b6ca8157a3 Mon Sep 17 00:00:00 2001 From: Oliver Wilks Date: Tue, 2 May 2023 14:01:45 +0100 Subject: [PATCH 11/11] Added userSelectNone to space Text --- .../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 e87a7bec532..1295fc0946b 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 ed7a00ed1a0..66c7561146a 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -136,7 +136,7 @@ const ReportActionItemFragment = (props) => { color={themeColors.textSupporting} style={[styles.alignItemsBaseline, editedLabelStyles]} > - {' '} + {' '} {props.translate('reportActionCompose.edited')} )}