From 5dc12f277f3d9a2fb6949544ccfe22aa8d132462 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 3 Nov 2022 12:50:48 -0700 Subject: [PATCH 01/47] started changing text input styles --- src/styles/styles.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index f2d7cff023da9..e716339d15298 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -689,24 +689,22 @@ const styles = { textInputContainer: { flex: 1, - borderRadius: variables.componentBorderRadiusNormal, justifyContent: 'center', height: '100%', backgroundColor: themeColors.componentBG, - borderWidth: 1, + borderWidth: 2, borderColor: themeColors.border, overflow: 'hidden', }, textInputLabel: { position: 'absolute', - left: 11, + left: 0, top: 0, fontSize: variables.fontSizeNormal, color: themeColors.textSupporting, fontFamily: fontFamily.GTA, width: '100%', - textAlign: 'left', }, textInputLabelBackground: { @@ -715,8 +713,6 @@ const styles = { width: '100%', height: 25, backgroundColor: themeColors.componentBG, - borderTopRightRadius: variables.componentBorderRadiusNormal, - borderTopLeftRadius: variables.componentBorderRadiusNormal, }, textInputLabelDesktop: { @@ -738,7 +734,6 @@ const styles = { color: themeColors.text, paddingTop: 23, paddingBottom: 8, - paddingHorizontal: 11, borderWidth: 0, }, From 6ee9c6200659913e832c4f51d9103d0773bff172 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 3 Nov 2022 12:54:50 -0700 Subject: [PATCH 02/47] text inputs are done (except for colors) --- src/styles/styles.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index e716339d15298..2e1721d2432ab 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -692,8 +692,8 @@ const styles = { justifyContent: 'center', height: '100%', backgroundColor: themeColors.componentBG, - borderWidth: 2, - borderColor: themeColors.border, + borderBottomWidth: 2, + borderBottomColor: themeColors.border, overflow: 'hidden', }, From 48f1916154c6a61d9077707617d9bb57c614c80b Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 3 Nov 2022 13:17:44 -0700 Subject: [PATCH 03/47] picker stuff --- src/styles/styles.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 2e1721d2432ab..2985a3eb91a0b 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -27,15 +27,12 @@ const picker = { fontFamily: fontFamily.GTA, fontSize: variables.fontSizeNormal, lineHeight: variables.fontSizeNormalHeight, - paddingHorizontal: 11, paddingBottom: 8, paddingTop: 23, height: 52, - borderWidth: 1, - borderStyle: 'solid', - borderColor: themeColors.border, - borderRadius: variables.componentBorderRadiusNormal, - textAlign: 'left', + borderBottomWidth: 1, + borderBottomStyle: 'solid', + borderBottomColor: themeColors.border, }; const link = { @@ -795,7 +792,6 @@ const styles = { pickerContainer: { borderWidth: 0, - borderRadius: variables.componentBorderRadiusNormal, justifyContent: 'center', backgroundColor: themeColors.componentBG, }, @@ -814,7 +810,7 @@ const styles = { appearance: 'none', cursor: disabled ? 'not-allowed' : 'pointer', ...picker, - ...(focused && {borderColor: themeColors.borderFocus}), + ...(focused && {borderBottomColor: themeColors.borderFocus}), ...(error && {borderColor: themeColors.badgeDangerBG}), }, inputNative: { @@ -835,7 +831,7 @@ const styles = { textInputReversed: addOutlineWidth({ backgroundColor: themeColors.heading, - borderColor: themeColors.text, + borderBottomColor: themeColors.text, color: themeColors.textReversed, }, 0), From e695c5d0fc77b3a21aec7da54545180ae33fd1a3 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 3 Nov 2022 13:55:57 -0700 Subject: [PATCH 04/47] medium pickers --- src/styles/styles.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 2985a3eb91a0b..cf7fde46265a1 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -30,6 +30,9 @@ const picker = { paddingBottom: 8, paddingTop: 23, height: 52, + borderTopWidth: 0, + borderLeftWidth: 0, + borderRightWidth: 0, borderBottomWidth: 1, borderBottomStyle: 'solid', borderBottomColor: themeColors.border, @@ -797,7 +800,7 @@ const styles = { }, pickerLabel: { position: 'absolute', - left: 12, + left: 0, top: 7, }, picker: (disabled = false, error = false, focused = false) => ({ @@ -811,12 +814,12 @@ const styles = { cursor: disabled ? 'not-allowed' : 'pointer', ...picker, ...(focused && {borderBottomColor: themeColors.borderFocus}), - ...(error && {borderColor: themeColors.badgeDangerBG}), + ...(error && {borderBottomColor: themeColors.badgeDangerBG}), }, inputNative: { ...picker, - ...(focused && {borderColor: themeColors.borderFocus}), - ...(error && {borderColor: themeColors.badgeDangerBG}), + ...(focused && {borderBottomColor: themeColors.borderFocus}), + ...(error && {borderBottomColor: themeColors.badgeDangerBG}), }, }), From d1b5304dd3333f4bde1f16ef1c41c010b53a1110 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 3 Nov 2022 15:45:50 -0700 Subject: [PATCH 05/47] increase border width --- 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 cf7fde46265a1..85aa193ccfe44 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -33,7 +33,7 @@ const picker = { borderTopWidth: 0, borderLeftWidth: 0, borderRightWidth: 0, - borderBottomWidth: 1, + borderBottomWidth: 2, borderBottomStyle: 'solid', borderBottomColor: themeColors.border, }; From 544750a83c6506f6bd5964f7b79490ebd65cb177 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 5 Dec 2022 18:07:55 -0800 Subject: [PATCH 06/47] bad merge --- src/styles/styles.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 1d800c41f2c3b..4e87cafcb43de 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -818,13 +818,9 @@ const styles = { appearance: 'none', cursor: disabled ? 'not-allowed' : 'pointer', ...picker, - ...(focused && {borderBottomColor: themeColors.borderFocus}), - ...(error && {borderBottomColor: themeColors.badgeDangerBG}), }, inputNative: { ...picker, - ...(focused && {borderBottomColor: themeColors.borderFocus}), - ...(error && {borderBottomColor: themeColors.badgeDangerBG}), }, }), From 999525c77c0ce5c229732ee840413c2457050ba7 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 5 Dec 2022 18:45:04 -0800 Subject: [PATCH 07/47] fixed focus problem --- 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 4e87cafcb43de..b7b1d83acdb0d 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -695,7 +695,7 @@ const styles = { height: '100%', backgroundColor: themeColors.componentBG, borderBottomWidth: 2, - borderBottomColor: themeColors.border, + borderColor: themeColors.border, overflow: 'hidden', }, From 54b5430a630502c9b80e837b1c30ea4c76782df6 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 5 Dec 2022 18:47:45 -0800 Subject: [PATCH 08/47] on to the picker --- src/styles/styles.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index b7b1d83acdb0d..d0589f8c1e415 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -796,29 +796,32 @@ const styles = { }, pickerContainer: { - borderWidth: 1, + borderWidth: 0, borderStyle: 'solid', borderColor: themeColors.border, - borderRadius: variables.componentBorderRadiusNormal, justifyContent: 'center', backgroundColor: themeColors.componentBG, }, + pickerLabel: { position: 'absolute', left: 11, top: 6, }, + picker: (disabled = false) => ({ iconContainer: { top: Math.round(variables.inputHeight * 0.5) - 11, right: 10, zIndex: -1, }, + inputWeb: { appearance: 'none', cursor: disabled ? 'not-allowed' : 'pointer', ...picker, }, + inputNative: { ...picker, }, From c4a3f7af758308260c7ee3af7c220c1aba1ddb7c Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 5 Dec 2022 18:53:09 -0800 Subject: [PATCH 09/47] got picker lookin good on web --- src/styles/styles.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index d0589f8c1e415..f3090b66ce183 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -29,12 +29,7 @@ const picker = { paddingBottom: 8, paddingTop: 23, height: variables.inputHeight, - borderTopWidth: 0, - borderLeftWidth: 0, - borderRightWidth: 0, - borderBottomWidth: 2, - borderBottomStyle: 'solid', - borderBottomColor: themeColors.border, + borderWidth: 0, }; const link = { @@ -796,7 +791,7 @@ const styles = { }, pickerContainer: { - borderWidth: 0, + borderBottomWidth: 2, borderStyle: 'solid', borderColor: themeColors.border, justifyContent: 'center', @@ -805,7 +800,7 @@ const styles = { pickerLabel: { position: 'absolute', - left: 11, + left: 0, top: 6, }, From 7c8a096c4907c6a80acfc60095798aea7857ad4f Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 5 Dec 2022 18:56:13 -0800 Subject: [PATCH 10/47] background colors need to be transparent --- src/styles/styles.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index f3090b66ce183..dce8ab4e54772 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -688,7 +688,7 @@ const styles = { flex: 1, justifyContent: 'center', height: '100%', - backgroundColor: themeColors.componentBG, + backgroundColor: 'transparent', borderBottomWidth: 2, borderColor: themeColors.border, overflow: 'hidden', @@ -761,7 +761,7 @@ const styles = { }, textInput: { - backgroundColor: themeColors.componentBG, + backgroundColor: 'transparent', borderRadius: variables.componentBorderRadiusNormal, height: variables.inputComponentSizeNormal, borderColor: themeColors.border, @@ -795,7 +795,7 @@ const styles = { borderStyle: 'solid', borderColor: themeColors.border, justifyContent: 'center', - backgroundColor: themeColors.componentBG, + backgroundColor: 'transparent', }, pickerLabel: { From a37c048eff26ea6f8794cb76f91655d8eb0fc320 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 6 Dec 2022 14:38:57 -0800 Subject: [PATCH 11/47] padding left for andoid --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index dce8ab4e54772..bd04ee0cd16d5 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -731,6 +731,7 @@ const styles = { color: themeColors.text, paddingTop: 23, paddingBottom: 8, + paddingLeft: 0, borderWidth: 0, }, From 67279949b04513e776d58b1a1682b893935aa880 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 6 Dec 2022 14:45:43 -0800 Subject: [PATCH 12/47] picker padding left --- src/styles/styles.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index bd04ee0cd16d5..56b0832033513 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -28,6 +28,7 @@ const picker = { lineHeight: variables.fontSizeNormalHeight, paddingBottom: 8, paddingTop: 23, + paddingLeft: 0, height: variables.inputHeight, borderWidth: 0, }; @@ -528,7 +529,7 @@ const styles = { inputIOS: { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeSmall, - paddingLeft: 9, + paddingLeft: 0, paddingRight: 25, paddingTop: 6, paddingBottom: 6, @@ -542,7 +543,7 @@ const styles = { inputWeb: { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeSmall, - paddingLeft: 9, + paddingLeft: 0, paddingRight: 25, paddingTop: 6, paddingBottom: 6, @@ -558,7 +559,7 @@ const styles = { inputAndroid: { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeSmall, - paddingLeft: 9, + paddingLeft: 0, paddingRight: 25, paddingTop: 6, paddingBottom: 6, @@ -793,6 +794,7 @@ const styles = { pickerContainer: { borderBottomWidth: 2, + paddingLeft: 0, borderStyle: 'solid', borderColor: themeColors.border, justifyContent: 'center', From a548e9ac4fae0ed4e461950ccf1979dadd243734 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 6 Dec 2022 14:45:49 -0800 Subject: [PATCH 13/47] padding left for android --- src/components/Picker/pickerStyles/index.android.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Picker/pickerStyles/index.android.js b/src/components/Picker/pickerStyles/index.android.js index d688481c0d72a..1224c302623f9 100644 --- a/src/components/Picker/pickerStyles/index.android.js +++ b/src/components/Picker/pickerStyles/index.android.js @@ -5,7 +5,7 @@ const pickerStyles = isDisabled => ({ ...styles.picker(isDisabled), inputAndroid: { ...styles.picker(isDisabled).inputNative, - paddingLeft: 12, + paddingLeft: 0, }, }); From 81afaefefc5e4283b95b8cb2c7fac4eb080a0b03 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 6 Dec 2022 15:50:30 -0800 Subject: [PATCH 14/47] on focus lineHeight issue --- src/styles/styles.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 56b0832033513..4a456b0966297 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -728,7 +728,6 @@ const styles = { baseTextInput: { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeNormal, - lineHeight: variables.fontSizeNormalHeight, color: themeColors.text, paddingTop: 23, paddingBottom: 8, From bfd3865cd0895ab8a1f4579d7bb247aabcb1e330 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 6 Dec 2022 16:50:19 -0800 Subject: [PATCH 15/47] took out unused styles --- src/styles/styles.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 4a456b0966297..3b97ea2388db6 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -833,16 +833,6 @@ const styles = { color: themeColors.icon, }, - textInputReversed: addOutlineWidth({ - backgroundColor: themeColors.heading, - borderBottomColor: themeColors.text, - color: themeColors.textReversed, - }, 0), - - textInputReversedFocus: { - borderColor: themeColors.icon, - }, - noOutline: addOutlineWidth({}, 0), errorOutline: { From fb74a32a491820fc8ae8c1a3a19d0301511fca5c Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 6 Dec 2022 16:50:38 -0800 Subject: [PATCH 16/47] use paddingHorizontal instead --- 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 3b97ea2388db6..2d86e0ac57af7 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -28,7 +28,7 @@ const picker = { lineHeight: variables.fontSizeNormalHeight, paddingBottom: 8, paddingTop: 23, - paddingLeft: 0, + paddingHorizontal: 0, height: variables.inputHeight, borderWidth: 0, }; From 52bb267ae98262e59c730c2199f9c262c420a6b4 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 14:21:56 -0800 Subject: [PATCH 17/47] took out show password button border radius --- src/styles/styles.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 44988953c1a42..a0f275639feb3 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -749,8 +749,6 @@ const styles = { textInputDesktop: addOutlineWidth({}, 0), secureInputShowPasswordButton: { - borderTopRightRadius: 6, - borderBottomRightRadius: 6, paddingHorizontal: 11, justifyContent: 'center', margin: 1, From 2e885c864d9e9730f6ce58ffc6598e3d722699cf Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:11:08 -0800 Subject: [PATCH 18/47] generalized styles.picker --- src/styles/styles.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index a0f275639feb3..d1e5f6768d286 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -817,9 +817,19 @@ const styles = { ...picker, }, - inputNative: { + inputIOS: { ...picker, }, + + inputAndroid: { + ...picker, + } + }), + + pickerStyles: (disabled = false) => ({ + appearance: 'none', + cursor: disabled ? 'not-allowed' : 'pointer', + ...picker, }), disabledText: { From a3415b26f6c5a7059498aa93f55cec4da9ac4241 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:11:30 -0800 Subject: [PATCH 19/47] use new styles.picker function --- src/components/Picker/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Picker/index.js b/src/components/Picker/index.js index 62cb9c2b427e1..873b3f750e8b6 100644 --- a/src/components/Picker/index.js +++ b/src/components/Picker/index.js @@ -168,7 +168,7 @@ class Picker extends PureComponent { // We add a text color to prevent white text on white background dropdown items on Windows items={_.map(this.props.items, item => ({...item, color: themeColors.pickerOptionsTextColor}))} - style={this.props.size === 'normal' ? pickerStyles(this.props.isDisabled) : styles.pickerSmall} + style={this.props.size === 'normal' ? styles.picker(this.props.isDisabled) : styles.pickerSmall} useNativeAndroidPickerStyle={false} placeholder={this.placeholder} value={this.props.value} From bf2d4d326e05bf7968a7f0fb4cccc36eb4434c1d Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:11:53 -0800 Subject: [PATCH 20/47] removed picker style files --- .../Picker/pickerStyles/index.android.js | 12 ---------- .../Picker/pickerStyles/index.ios.js | 9 -------- src/components/Picker/pickerStyles/index.js | 23 ------------------- 3 files changed, 44 deletions(-) delete mode 100644 src/components/Picker/pickerStyles/index.android.js delete mode 100644 src/components/Picker/pickerStyles/index.ios.js delete mode 100644 src/components/Picker/pickerStyles/index.js diff --git a/src/components/Picker/pickerStyles/index.android.js b/src/components/Picker/pickerStyles/index.android.js deleted file mode 100644 index 1224c302623f9..0000000000000 --- a/src/components/Picker/pickerStyles/index.android.js +++ /dev/null @@ -1,12 +0,0 @@ -// eslint-disable-next-line rulesdir/display-name-property -import styles from '../../../styles/styles'; - -const pickerStyles = isDisabled => ({ - ...styles.picker(isDisabled), - inputAndroid: { - ...styles.picker(isDisabled).inputNative, - paddingLeft: 0, - }, -}); - -export default pickerStyles; diff --git a/src/components/Picker/pickerStyles/index.ios.js b/src/components/Picker/pickerStyles/index.ios.js deleted file mode 100644 index 00a28d997b489..0000000000000 --- a/src/components/Picker/pickerStyles/index.ios.js +++ /dev/null @@ -1,9 +0,0 @@ -// eslint-disable-next-line rulesdir/display-name-property -import styles from '../../../styles/styles'; - -const pickerStyles = isDisabled => ({ - ...styles.picker(isDisabled), - inputIOS: styles.picker(isDisabled).inputNative, -}); - -export default pickerStyles; diff --git a/src/components/Picker/pickerStyles/index.js b/src/components/Picker/pickerStyles/index.js deleted file mode 100644 index 7ac87419630de..0000000000000 --- a/src/components/Picker/pickerStyles/index.js +++ /dev/null @@ -1,23 +0,0 @@ -// eslint-disable-next-line rulesdir/display-name-property -import CONST from '../../../CONST'; -import * as Browser from '../../../libs/Browser'; -import styles from '../../../styles/styles'; - -const pickerStylesWeb = () => { - if (CONST.BROWSER.FIREFOX === Browser.getBrowser()) { - return { - textIndent: -2, - }; - } - return {}; -}; - -const pickerStyles = isDisabled => ({ - ...styles.picker(isDisabled), - inputWeb: { - ...styles.picker(isDisabled).inputWeb, - ...pickerStylesWeb(), - }, -}); - -export default pickerStyles; From 266dfe04acbcc0628c9639e8de56e121d7330295 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:12:24 -0800 Subject: [PATCH 21/47] removed import --- src/components/Picker/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Picker/index.js b/src/components/Picker/index.js index 873b3f750e8b6..6829e4abac584 100644 --- a/src/components/Picker/index.js +++ b/src/components/Picker/index.js @@ -9,7 +9,6 @@ import FormHelpMessage from '../FormHelpMessage'; import Text from '../Text'; import styles from '../../styles/styles'; import themeColors from '../../styles/themes/default'; -import pickerStyles from './pickerStyles'; const propTypes = { /** Picker label */ From 51b1a758dc14228d6d3b83fdc68b9fc41c5823eb Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:16:07 -0800 Subject: [PATCH 22/47] moved picker into parent folder --- src/components/{Picker/index.js => Picker.js} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename src/components/{Picker/index.js => Picker.js} (96%) diff --git a/src/components/Picker/index.js b/src/components/Picker.js similarity index 96% rename from src/components/Picker/index.js rename to src/components/Picker.js index 6829e4abac584..59adbe08340c5 100644 --- a/src/components/Picker/index.js +++ b/src/components/Picker.js @@ -3,12 +3,12 @@ import React, {PureComponent} from 'react'; import {View} from 'react-native'; import PropTypes from 'prop-types'; import RNPickerSelect from 'react-native-picker-select'; -import Icon from '../Icon'; -import * as Expensicons from '../Icon/Expensicons'; -import FormHelpMessage from '../FormHelpMessage'; -import Text from '../Text'; -import styles from '../../styles/styles'; -import themeColors from '../../styles/themes/default'; +import Icon from './Icon'; +import * as Expensicons from './Icon/Expensicons'; +import FormHelpMessage from './FormHelpMessage'; +import Text from './Text'; +import styles from '../styles/styles'; +import themeColors from '../styles/themes/default'; const propTypes = { /** Picker label */ From b57c985398c767db3473289e7b7627cdc5d23efe Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:36:27 -0800 Subject: [PATCH 23/47] put textAlign: left back --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index d1e5f6768d286..b616f448083ff 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -31,6 +31,7 @@ const picker = { paddingHorizontal: 0, height: variables.inputHeight, borderWidth: 0, + textAlign: 'left', }; const link = { From 243e830ec41385da7367538cb1b3c3371dd15362 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 17:50:22 -0800 Subject: [PATCH 24/47] took out right padding for dropdowns --- src/styles/styles.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index b616f448083ff..276a8f0440589 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -572,7 +572,6 @@ const styles = { }, iconContainer: { top: 7, - right: 8, ...pointerEventsNone, }, icon: { @@ -808,7 +807,7 @@ const styles = { picker: (disabled = false) => ({ iconContainer: { top: Math.round(variables.inputHeight * 0.5) - 11, - right: 10, + right: 0, zIndex: -1, }, From 81530b964c96019a66ed2ae428e679e2a51193bf Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 18:01:06 -0800 Subject: [PATCH 25/47] change input height variable --- src/styles/variables.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/variables.js b/src/styles/variables.js index 663729823701b..9aeaae5c3fa97 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -74,7 +74,7 @@ export default { lineHeightNormal: getValueUsingPixelRatio(16, 21), lineHeightLarge: getValueUsingPixelRatio(18, 24), lineHeightXLarge: getValueUsingPixelRatio(20, 24), - inputHeight: getValueUsingPixelRatio(50, 72), + inputHeight: getValueUsingPixelRatio(52, 72), formErrorLineHeight: getValueUsingPixelRatio(18, 23), communicationsLinkHeight: getValueUsingPixelRatio(20, 30), alternateTextHeight: getValueUsingPixelRatio(20, 24), From 5bb34e3bdd4f386b357831f6f407c94013919dea Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 12 Dec 2022 18:01:32 -0800 Subject: [PATCH 26/47] dangling comma --- 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 276a8f0440589..2a9a1dcf711f4 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -823,7 +823,7 @@ const styles = { inputAndroid: { ...picker, - } + }, }), pickerStyles: (disabled = false) => ({ From e7a1f561301d857cd695af909d5ea451ebbb0e55 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 13 Dec 2022 13:06:08 -0800 Subject: [PATCH 27/47] remove compose box border radius --- src/styles/styles.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 2a9a1dcf711f4..e6f0a5ee60835 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1370,7 +1370,6 @@ const styles = { fontFamily: fontFamily.EMOJI_TEXT_FONT, fontSize: variables.fontSizeNormal, borderWidth: 0, - borderRadius: variables.componentBorderRadiusRounded, height: 'auto', lineHeight: variables.lineHeightXLarge, ...overflowXHidden, From 94925f74b3e3a4abc3855d3e3451b944f0540eb8 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Wed, 14 Dec 2022 15:13:54 -0800 Subject: [PATCH 28/47] slight adjustment to dropdown height --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index e6f0a5ee60835..0338e758053fe 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -796,6 +796,7 @@ const styles = { borderColor: themeColors.border, justifyContent: 'center', backgroundColor: 'transparent', + height: variables.inputHeight }, pickerLabel: { From 96c8fca01d37410103b93e927e558bf166278e19 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Wed, 14 Dec 2022 15:21:09 -0800 Subject: [PATCH 29/47] dang ole dangling comma got me again --- 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 0338e758053fe..712046c0d5075 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -796,7 +796,7 @@ const styles = { borderColor: themeColors.border, justifyContent: 'center', backgroundColor: 'transparent', - height: variables.inputHeight + height: variables.inputHeight, }, pickerLabel: { From 1d3ac1989e750181816e923224c338cc3171bbb9 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 3 Jan 2023 13:44:15 -0800 Subject: [PATCH 30/47] paths were broken from bad merge --- src/components/Picker.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Picker.js b/src/components/Picker.js index c3faa8c79e9db..3350e5cc92160 100644 --- a/src/components/Picker.js +++ b/src/components/Picker.js @@ -3,13 +3,13 @@ import React, {PureComponent} from 'react'; import {View} from 'react-native'; import PropTypes from 'prop-types'; import RNPickerSelect from 'react-native-picker-select'; -import Icon from '../Icon'; -import * as Expensicons from '../Icon/Expensicons'; -import FormHelpMessage from '../FormHelpMessage'; -import Text from '../Text'; -import styles from '../../styles/styles'; -import themeColors from '../../styles/themes/default'; -import {ScrollContext} from '../ScrollViewWithContext'; +import Icon from './Icon'; +import * as Expensicons from './Icon/Expensicons'; +import FormHelpMessage from './FormHelpMessage'; +import Text from './Text'; +import styles from '../styles/styles'; +import themeColors from '../styles/themes/default'; +import {ScrollContext} from './ScrollViewWithContext'; const propTypes = { /** Picker label */ From 98b31fc5ad5f5bb227869ab6cb99b48b58ea6f5f Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 3 Jan 2023 14:26:23 -0800 Subject: [PATCH 31/47] fixed front page locale picker height --- src/components/LocalePicker.js | 2 ++ src/styles/styles.js | 5 +++++ src/styles/variables.js | 1 + 3 files changed, 8 insertions(+) diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js index aafb06ea6fd2a..7a3e0cb8e0c1f 100644 --- a/src/components/LocalePicker.js +++ b/src/components/LocalePicker.js @@ -10,6 +10,7 @@ import CONST from '../CONST'; import Permissions from '../libs/Permissions'; import * as Localize from '../libs/Localize'; import Picker from './Picker'; +import styles from '../styles/styles'; const propTypes = { /** Indicates which locale the user currently has selected */ @@ -59,6 +60,7 @@ const LocalePicker = (props) => { items={_.values(localesToLanguages)} size={props.size} value={props.preferredLocale} + containerStyles={props.size === 'small' && [styles.pickerContainerSmall]} /> ); }; diff --git a/src/styles/styles.js b/src/styles/styles.js index fe8bbdadd74f8..0d057df71313e 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -814,6 +814,10 @@ const styles = { height: variables.inputHeight, }, + pickerContainerSmall: { + height: variables.inputHeightSmall, + }, + pickerLabel: { position: 'absolute', left: 0, @@ -1414,6 +1418,7 @@ const styles = { }, editInputComposeSpacing: { + marginVertical: 6, }, diff --git a/src/styles/variables.js b/src/styles/variables.js index ad33e95e6c71c..e55c0c0264201 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -76,6 +76,7 @@ export default { lineHeightLarge: getValueUsingPixelRatio(18, 24), lineHeightXLarge: getValueUsingPixelRatio(20, 24), inputHeight: getValueUsingPixelRatio(52, 72), + inputHeightSmall: 26, formErrorLineHeight: getValueUsingPixelRatio(18, 23), communicationsLinkHeight: getValueUsingPixelRatio(20, 30), alternateTextHeight: getValueUsingPixelRatio(20, 24), From ff0590dc58ad242a6b94790b40947fd964d2c0c5 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 3 Jan 2023 14:27:52 -0800 Subject: [PATCH 32/47] used margin for edit message issue --- 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 0d057df71313e..f1fbe08b99520 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1418,7 +1418,7 @@ const styles = { }, editInputComposeSpacing: { - + marginHorizontal: 8, marginVertical: 6, }, From 2ac024503dc390720d8f3014d8be3c0e232752a1 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 5 Jan 2023 16:31:27 -0800 Subject: [PATCH 33/47] horizontal overlap issue --- 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 94c2b58199f29..d1ebb0269eb1c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1429,7 +1429,7 @@ const styles = { }, editInputComposeSpacing: { - marginHorizontal: 8, + backgroundColor: themeColors.transparent, marginVertical: 6, }, From 7935ce7d045d4ca3d76f8d2cb94a2e8f7dc6fed3 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Fri, 6 Jan 2023 13:58:09 -0800 Subject: [PATCH 34/47] padding left to padding horizontal --- 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 d1ebb0269eb1c..752ce23aeea14 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -753,7 +753,7 @@ const styles = { color: themeColors.text, paddingTop: 23, paddingBottom: 8, - paddingLeft: 0, + paddingHorizontal: 0, borderWidth: 0, }, From 7ed732bb2bdf87f12bab3f112cf6a2f09fbbcaa6 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Fri, 6 Jan 2023 13:59:06 -0800 Subject: [PATCH 35/47] containerStyles fix --- src/components/LocalePicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js index 7a3e0cb8e0c1f..92238e245dd07 100644 --- a/src/components/LocalePicker.js +++ b/src/components/LocalePicker.js @@ -60,7 +60,7 @@ const LocalePicker = (props) => { items={_.values(localesToLanguages)} size={props.size} value={props.preferredLocale} - containerStyles={props.size === 'small' && [styles.pickerContainerSmall]} + containerStyles={[props.size === 'small' && styles.pickerContainerSmall]} /> ); }; From af7f53ab45287cc40f78e87b8402374feacc83ee Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Fri, 6 Jan 2023 14:01:53 -0800 Subject: [PATCH 36/47] right padding for small picker --- src/styles/styles.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 752ce23aeea14..ee57464cc1c6c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -553,7 +553,7 @@ const styles = { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeSmall, paddingLeft: 0, - paddingRight: 25, + paddingRight: 17, paddingTop: 6, paddingBottom: 6, borderRadius: variables.componentBorderRadius, @@ -567,7 +567,7 @@ const styles = { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeSmall, paddingLeft: 0, - paddingRight: 25, + paddingRight: 17, paddingTop: 6, paddingBottom: 6, borderWidth: 0, @@ -583,7 +583,7 @@ const styles = { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeSmall, paddingLeft: 0, - paddingRight: 25, + paddingRight: 17, paddingTop: 6, paddingBottom: 6, borderWidth: 0, From 725ae0163255c8439a30758fb93ec707bd460e92 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Fri, 6 Jan 2023 14:02:35 -0800 Subject: [PATCH 37/47] delete picker styles --- src/styles/styles.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index ee57464cc1c6c..55ce929076954 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -857,12 +857,6 @@ const styles = { }, }), - pickerStyles: (disabled = false) => ({ - appearance: 'none', - cursor: disabled ? 'not-allowed' : 'pointer', - ...picker, - }), - disabledText: { color: themeColors.icon, }, From a05191d236929a20d43b4786d449d0f67ea90085 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Fri, 6 Jan 2023 14:03:40 -0800 Subject: [PATCH 38/47] padding right on picker --- src/styles/styles.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 55ce929076954..aa2adaf6c5dfd 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -28,7 +28,8 @@ const picker = { lineHeight: variables.fontSizeNormalHeight, paddingBottom: 8, paddingTop: 23, - paddingHorizontal: 0, + paddingLeft: 0, + paddingRight: 25, height: variables.inputHeight, borderWidth: 0, textAlign: 'left', From 3bc3aa9889be633c622c39562071d0a052b12357 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 9 Jan 2023 12:16:26 -0800 Subject: [PATCH 39/47] fixed border bottom on IOU --- src/styles/styles.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index aa2adaf6c5dfd..b70343b77b283 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1806,6 +1806,7 @@ const styles = { borderNone: { borderWidth: 0, + borderBottomWidth: 0, }, borderRight: { @@ -2179,14 +2180,14 @@ const styles = { lineHeight: variables.inputHeight, }, - iouAmountTextInput: addOutlineWidth({ + iouAmountTextInput: { fontFamily: fontFamily.EXP_NEUE_BOLD, fontWeight: fontWeightBold, fontSize: variables.iouAmountTextSize, color: themeColors.heading, padding: 0, lineHeight: undefined, - }, 0), + }, iouPreviewBox: { backgroundColor: themeColors.cardBG, From 933a08c0a27e4f7ddd59522f38420fcc775751ce Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Mon, 9 Jan 2023 12:23:27 -0800 Subject: [PATCH 40/47] typo in merge resolution --- 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 8b73ac7bde749..0193886879efb 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2184,7 +2184,7 @@ const styles = { color: themeColors.heading, padding: 0, lineHeight: undefined, - }, + }), iouPreviewBox: { backgroundColor: themeColors.cardBG, From ed95537235d979b1383266ca01567eddf503bb24 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Wed, 11 Jan 2023 13:05:25 -0800 Subject: [PATCH 41/47] line height change --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index 3c0a98961e65d..c58d05a50acf6 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -757,6 +757,7 @@ const styles = { baseTextInput: { fontFamily: fontFamily.EXP_NEUE, fontSize: variables.fontSizeNormal, + lineHeight: variables.lineHeightNormal, color: themeColors.text, paddingTop: 23, paddingBottom: 8, From 866f2c04f09d6fbad36d05c53062b2a3b3d80e3b Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Thu, 12 Jan 2023 11:03:48 -0800 Subject: [PATCH 42/47] outline width --- 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 c58d05a50acf6..3eba48aae980b 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2181,7 +2181,7 @@ const styles = { color: themeColors.heading, padding: 0, lineHeight: undefined, - }), + }, 0), iouPreviewBox: { backgroundColor: themeColors.cardBG, From 266902b192c0125050cdd772c72ebd873b7ff60b Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 17 Jan 2023 14:05:28 -0800 Subject: [PATCH 43/47] set horizontal padding differently --- src/styles/styles.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 1cd444c74b04f..8b02698fcf52e 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -762,7 +762,8 @@ const styles = { color: themeColors.text, paddingTop: 23, paddingBottom: 8, - paddingHorizontal: 0, + paddingLeft: 0, + paddingRight: 0, borderWidth: 0, }, From d9acaf05428fcedac01bc721017d9b4473910ce1 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 17 Jan 2023 15:41:44 -0800 Subject: [PATCH 44/47] don't set padding zero --- src/styles/styles.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index 8b02698fcf52e..a570ba237c02e 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -762,8 +762,6 @@ const styles = { color: themeColors.text, paddingTop: 23, paddingBottom: 8, - paddingLeft: 0, - paddingRight: 0, borderWidth: 0, }, From 4471cb7db3b53dccfc4a67f73dbfbd3d5445df23 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Fri, 20 Jan 2023 13:31:27 -0800 Subject: [PATCH 45/47] add padding left --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index a570ba237c02e..f8b15caf9b6b8 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -762,6 +762,7 @@ const styles = { color: themeColors.text, paddingTop: 23, paddingBottom: 8, + paddingLeft: 0, borderWidth: 0, }, From e93f98face78c1fbf092d93c3b3c27185d9f62c2 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 24 Jan 2023 11:52:18 -0800 Subject: [PATCH 46/47] input height small should be 28 --- src/styles/variables.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/variables.js b/src/styles/variables.js index d4fbda79dfb04..0b794ada41a98 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -78,7 +78,7 @@ export default { lineHeightLarge: getValueUsingPixelRatio(18, 24), lineHeightXLarge: getValueUsingPixelRatio(20, 24), inputHeight: getValueUsingPixelRatio(52, 72), - inputHeightSmall: 26, + inputHeightSmall: 28, formErrorLineHeight: getValueUsingPixelRatio(18, 23), communicationsLinkHeight: getValueUsingPixelRatio(20, 30), alternateTextHeight: getValueUsingPixelRatio(20, 24), From 508c9fd96ec0752238fbb4d3a618fd3c5e680297 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Tue, 24 Jan 2023 11:56:32 -0800 Subject: [PATCH 47/47] fix small picker --- src/components/LocalePicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js index 92238e245dd07..ebd471ca96f8a 100644 --- a/src/components/LocalePicker.js +++ b/src/components/LocalePicker.js @@ -60,7 +60,7 @@ const LocalePicker = (props) => { items={_.values(localesToLanguages)} size={props.size} value={props.preferredLocale} - containerStyles={[props.size === 'small' && styles.pickerContainerSmall]} + containerStyles={[props.size === 'small' && [styles.pickerContainerSmall]]} /> ); };