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

Add new vertical line separator instead of borderRight #18022

Merged
merged 7 commits into from
May 1, 2023
Merged

Add new vertical line separator instead of borderRight #18022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f83b18
Add new vertical line separator instead of borderRight
narefyev91 Apr 26, 2023
6f14712
add box sizing for correct calculation of border line
narefyev91 Apr 27, 2023
c27bac0
change logic for border inside view with input
narefyev91 Apr 28, 2023
4028871
Renaming - and creating a new style variable
narefyev91 Apr 28, 2023
5ea1af4
renaming
narefyev91 Apr 28, 2023
7468a8e
change position
narefyev91 Apr 28, 2023
8a5557e
Merge branch 'main' into add-new-separator-for-action-composer
narefyev91 Apr 28, 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
3 changes: 1 addition & 2 deletions src/pages/home/report/ReportActionCompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,6 @@ class ReportActionCompose extends React.Component {
<View style={[
styles.dFlex, styles.flexColumn,
(this.state.isFullComposerAvailable || this.props.isComposerFullSize) ? styles.justifyContentBetween : styles.justifyContentEnd,
styles.chatItemAttachBorder,
]}
>
{this.props.isComposerFullSize && (
Expand Down Expand Up @@ -862,7 +861,7 @@ class ReportActionCompose extends React.Component {
</>
)}
</AttachmentPicker>
<View style={[styles.textInputComposeSpacing]}>
<View style={[styles.textInputComposeSpacing, styles.textInputComposeBorder]}>
<DragAndDrop
dropZoneId={CONST.REPORT.DROP_NATIVE_ID}
activeDropZoneId={CONST.REPORT.ACTIVE_DROP_NATIVE_ID}
Expand Down
10 changes: 5 additions & 5 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,6 +1533,11 @@ const styles = {
flex: 1,
},

textInputComposeBorder: {
borderLeftWidth: 1,
borderColor: themeColors.border,
},

chatItemSubmitButton: {
alignSelf: 'flex-end',
borderRadius: variables.componentBorderRadiusRounded,
Expand Down Expand Up @@ -1631,11 +1636,6 @@ const styles = {
backgroundColor: themeColors.buttonHoveredBG,
},

chatItemAttachBorder: {
borderRightColor: themeColors.border,
borderRightWidth: 1,
},

composerSizeButton: {
alignSelf: 'center',
height: 32,
Expand Down