From cdb63eaee89a23652f41cdc9ba3e19a000fec52e Mon Sep 17 00:00:00 2001 From: sahil Date: Tue, 12 Jul 2022 21:35:22 +0530 Subject: [PATCH 1/4] fix the breaking of border --- src/pages/home/report/ReportActionItemMessageEdit.js | 2 +- src/styles/styles.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js index 1aea1278316d..1e260bd9a810 100644 --- a/src/pages/home/report/ReportActionItemMessageEdit.js +++ b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -207,7 +207,7 @@ class ReportActionItemMessageEdit extends React.Component { onKeyPress={this.triggerSaveOrCancel} defaultValue={this.state.draft} maxLines={16} // This is the same that slack has - style={[styles.textInputCompose, styles.flex4]} + style={[styles.textInputCompose, styles.flex4, styles.mv1]} onFocus={() => { ReportScrollManager.scrollToIndex({animated: true, index: this.props.index}, true); toggleReportActionComposeView(false, VirtualKeyboard.shouldAssumeIsOpen()); diff --git a/src/styles/styles.js b/src/styles/styles.js index 482a70f56ca3..7c4773e67805 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1379,7 +1379,7 @@ const styles = { fontFamily: fontFamily.GTA, fontSize: variables.fontSizeNormal, borderWidth: 0, - borderRadius: 0, + borderRadius: 3, height: 'auto', lineHeight: 20, ...overflowXHidden, From 6b38c08594afc776e3f6c3d397c726dddc15c633 Mon Sep 17 00:00:00 2001 From: sahil Date: Tue, 12 Jul 2022 23:28:09 +0530 Subject: [PATCH 2/4] use variable --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 7c4773e67805..8e0e4338a001 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1379,7 +1379,7 @@ const styles = { fontFamily: fontFamily.GTA, fontSize: variables.fontSizeNormal, borderWidth: 0, - borderRadius: 3, + borderRadius: variables.componentBorderRadiusSmall, height: 'auto', lineHeight: 20, ...overflowXHidden, From c2ecea533a3805bbe547b48d61baa8c24a1f89ef Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 14 Jul 2022 01:32:10 +0530 Subject: [PATCH 3/4] increase vertical margin to match the message composer --- src/pages/home/report/ReportActionItemMessageEdit.js | 2 +- src/styles/styles.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js index 1e260bd9a810..c2b270c9085a 100644 --- a/src/pages/home/report/ReportActionItemMessageEdit.js +++ b/src/pages/home/report/ReportActionItemMessageEdit.js @@ -207,7 +207,7 @@ class ReportActionItemMessageEdit extends React.Component { onKeyPress={this.triggerSaveOrCancel} defaultValue={this.state.draft} maxLines={16} // This is the same that slack has - style={[styles.textInputCompose, styles.flex4, styles.mv1]} + style={[styles.textInputCompose, styles.flex4, styles.editInputComposeSpacing]} onFocus={() => { ReportScrollManager.scrollToIndex({animated: true, index: this.props.index}, true); toggleReportActionComposeView(false, VirtualKeyboard.shouldAssumeIsOpen()); diff --git a/src/styles/styles.js b/src/styles/styles.js index 8e0e4338a001..5e879947f9b3 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1399,6 +1399,10 @@ const styles = { maxHeight: '100%', }, + editInputComposeSpacing: { + marginVertical: 6, + }, + textInputComposeSpacing: { paddingVertical: 6, ...flex.flexRow, From b55a99e819b80502432a59310cc1c5381805982d Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 14 Jul 2022 01:32:50 +0530 Subject: [PATCH 4/4] remove border radius --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 5e879947f9b3..dfb6c673ef73 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1379,7 +1379,7 @@ const styles = { fontFamily: fontFamily.GTA, fontSize: variables.fontSizeNormal, borderWidth: 0, - borderRadius: variables.componentBorderRadiusSmall, + borderRadius: 0, height: 'auto', lineHeight: 20, ...overflowXHidden,