Skip to content

Commit

Permalink
Merge pull request #1229 from Skyscanner/BPK-2106-fix-text-input
Browse files Browse the repository at this point in the history 
[BPK-2106] Remove line height from BpkTextInput
  • Loading branch information
@shaundon
shaundon authored Dec 13, 2018
2 parents da2a155 + b3c99d8 commit a0c4c8e
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 50 deletions.
4 changes: 4 additions & 0 deletions UNRELEASED.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@

- react-native-bpk-component-text:
- Remove warning about invalid prop type usage.

- react-native-bpk-component-text-input:
- react-native-bpk-component-phone-number-input:
- Removed line height to fix an issue where overflowing content didn't scroll correctly.
2 changes: 0 additions & 2 deletions ...tive-bpk-component-phone-input/src/__snapshots__/BpkPhoneNumberInput-test.android.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ exports[`Android BpkPhoneNumberInput should render correctly 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -352,7 +351,6 @@ exports[`Android BpkPhoneNumberInput should render correctly with \`editable\` f
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down
2 changes: 0 additions & 2 deletions ...t-native-bpk-component-phone-input/src/__snapshots__/BpkPhoneNumberInput-test.ios.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ exports[`iOS BpkPhoneNumberInput should render correctly 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -386,7 +385,6 @@ exports[`iOS BpkPhoneNumberInput should render correctly with \`editable\` false
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down
15 changes: 0 additions & 15 deletions ...ges/react-native-bpk-component-text-input/src/__snapshots__/BpkTextInput-RTL-test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ exports[`RTL BpkTextInput should ignore when placeholder is provided, as element
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -141,7 +140,6 @@ exports[`RTL BpkTextInput should render correctly 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -221,7 +219,6 @@ exports[`RTL BpkTextInput should render correctly with \`accessoryView\` 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -299,7 +296,6 @@ exports[`RTL BpkTextInput should render correctly with arbitrary props 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -380,7 +376,6 @@ exports[`RTL BpkTextInput should render correctly with custom style 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -458,7 +453,6 @@ exports[`RTL BpkTextInput should render correctly with description 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -559,7 +553,6 @@ exports[`RTL BpkTextInput should render correctly with description, valid=false
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -689,7 +682,6 @@ exports[`RTL BpkTextInput should render correctly with editable=false 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -767,7 +759,6 @@ exports[`RTL BpkTextInput should render correctly with inputRef set 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -845,7 +836,6 @@ exports[`RTL BpkTextInput should render correctly with mask="99/99" 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -923,7 +913,6 @@ exports[`RTL BpkTextInput should render correctly with mask="9999-9999-9999-9999
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1001,7 +990,6 @@ exports[`RTL BpkTextInput should render correctly with valid 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1108,7 +1096,6 @@ exports[`RTL BpkTextInput should render correctly with valid false 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1215,7 +1202,6 @@ exports[`RTL BpkTextInput should render correctly with valid false and a validat
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1345,7 +1331,6 @@ exports[`RTL BpkTextInput should render correctly with value 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down
15 changes: 0 additions & 15 deletions ...react-native-bpk-component-text-input/src/__snapshots__/BpkTextInput-test.android.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ exports[`Android BpkTextInput should ignore when placeholder is provided, as ele
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -141,7 +140,6 @@ exports[`Android BpkTextInput should render correctly 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -221,7 +219,6 @@ exports[`Android BpkTextInput should render correctly with \`accessoryView\` 1`]
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -299,7 +296,6 @@ exports[`Android BpkTextInput should render correctly with arbitrary props 1`] =
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -380,7 +376,6 @@ exports[`Android BpkTextInput should render correctly with custom style 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -458,7 +453,6 @@ exports[`Android BpkTextInput should render correctly with description 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -559,7 +553,6 @@ exports[`Android BpkTextInput should render correctly with description, valid=fa
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -689,7 +682,6 @@ exports[`Android BpkTextInput should render correctly with editable=false 1`] =
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -767,7 +759,6 @@ exports[`Android BpkTextInput should render correctly with inputRef set 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -845,7 +836,6 @@ exports[`Android BpkTextInput should render correctly with mask="99/99" 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -923,7 +913,6 @@ exports[`Android BpkTextInput should render correctly with mask="9999-9999-9999-
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1001,7 +990,6 @@ exports[`Android BpkTextInput should render correctly with valid 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1108,7 +1096,6 @@ exports[`Android BpkTextInput should render correctly with valid false 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1215,7 +1202,6 @@ exports[`Android BpkTextInput should render correctly with valid false and a val
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1345,7 +1331,6 @@ exports[`Android BpkTextInput should render correctly with value 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down
15 changes: 0 additions & 15 deletions ...ges/react-native-bpk-component-text-input/src/__snapshots__/BpkTextInput-test.ios.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ exports[`iOS BpkTextInput should ignore when placeholder is provided, as element
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -141,7 +140,6 @@ exports[`iOS BpkTextInput should render correctly 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -221,7 +219,6 @@ exports[`iOS BpkTextInput should render correctly with \`accessoryView\` 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -299,7 +296,6 @@ exports[`iOS BpkTextInput should render correctly with arbitrary props 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -380,7 +376,6 @@ exports[`iOS BpkTextInput should render correctly with custom style 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -458,7 +453,6 @@ exports[`iOS BpkTextInput should render correctly with description 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -559,7 +553,6 @@ exports[`iOS BpkTextInput should render correctly with description, valid=false
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -689,7 +682,6 @@ exports[`iOS BpkTextInput should render correctly with editable=false 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -767,7 +759,6 @@ exports[`iOS BpkTextInput should render correctly with inputRef set 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -845,7 +836,6 @@ exports[`iOS BpkTextInput should render correctly with mask="99/99" 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -923,7 +913,6 @@ exports[`iOS BpkTextInput should render correctly with mask="9999-9999-9999-9999
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1001,7 +990,6 @@ exports[`iOS BpkTextInput should render correctly with valid 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1108,7 +1096,6 @@ exports[`iOS BpkTextInput should render correctly with valid false 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1215,7 +1202,6 @@ exports[`iOS BpkTextInput should render correctly with valid false and a validat
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down Expand Up @@ -1345,7 +1331,6 @@ exports[`iOS BpkTextInput should render correctly with value 1`] = `
"flex": 1,
"fontSize": 16,
"fontWeight": "400",
"lineHeight": 19,
"minHeight": 27,
"paddingHorizontal": 0,
"paddingVertical": 4,
Expand Down
Loading

0 comments on commit a0c4c8e

Please sign in to comment.