From 5ae8cf2aab0f75bcaeee0d42cf61d890177f291d Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 10 Aug 2020 15:44:06 -0700 Subject: [PATCH 1/5] Fix Android --- src/page/HomePage/Report/ReportHistoryCompose.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page/HomePage/Report/ReportHistoryCompose.js b/src/page/HomePage/Report/ReportHistoryCompose.js index 8233b357744..df49aa34637 100644 --- a/src/page/HomePage/Report/ReportHistoryCompose.js +++ b/src/page/HomePage/Report/ReportHistoryCompose.js @@ -81,7 +81,7 @@ class ReportHistoryCompose extends React.Component { this.textInput = el} multiline - textAlignVertical + textAlignVertical="auto" numberOfLines={3} minHeight={60} maxHeight={60} From 20a2873fc102a283d38b8df631bf7ac5e5034832 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 10 Aug 2020 17:44:16 -0700 Subject: [PATCH 2/5] Add iOS specific keyboard handling --- src/page/HomePage/Report/ReportView.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/page/HomePage/Report/ReportView.js b/src/page/HomePage/Report/ReportView.js index 326e8a1127f..fbecb8e52a7 100644 --- a/src/page/HomePage/Report/ReportView.js +++ b/src/page/HomePage/Report/ReportView.js @@ -1,6 +1,7 @@ import React from 'react'; -import {View} from 'react-native'; +import {View, Platform} from 'react-native'; import PropTypes from 'prop-types'; +import KeyboardSpacer from 'react-native-keyboard-spacer'; import * as Store from '../../../store/Store'; import {withRouter, Route} from '../../../lib/Router'; import WithStore from '../../../components/WithStore'; @@ -61,6 +62,7 @@ class ReportView extends React.Component { addHistoryItem(this.props.match.params.reportID, text)} /> + {Platform.OS === 'ios' && ()} ); From 8f67f9e7622e8bde563e2e5d215feea1a0b58886 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 10 Aug 2020 17:46:02 -0700 Subject: [PATCH 3/5] Align iOS/Android text --- package-lock.json | 5 +++++ package.json | 1 + src/page/HomePage/Report/ReportHistoryCompose.js | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 1ccdc93d07b..3e6ab9c390f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12096,6 +12096,11 @@ } } }, + "react-native-keyboard-spacer": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/react-native-keyboard-spacer/-/react-native-keyboard-spacer-0.4.1.tgz", + "integrity": "sha1-RvGKMgQyCYol6p+on1FD3SVNMy0=" + }, "react-native-web": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.13.5.tgz", diff --git a/package.json b/package.json index f3337de3a47..efe2ef66403 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "react-beforeunload": "^2.2.2", "react-dom": "^16.13.1", "react-native": "0.63.2", + "react-native-keyboard-spacer": "^0.4.1", "react-native-web": "^0.13.5", "react-router-dom": "^5.2.0", "react-router-native": "^5.2.0", diff --git a/src/page/HomePage/Report/ReportHistoryCompose.js b/src/page/HomePage/Report/ReportHistoryCompose.js index df49aa34637..143936745a4 100644 --- a/src/page/HomePage/Report/ReportHistoryCompose.js +++ b/src/page/HomePage/Report/ReportHistoryCompose.js @@ -81,7 +81,7 @@ class ReportHistoryCompose extends React.Component { this.textInput = el} multiline - textAlignVertical="auto" + textAlignVertical="top" numberOfLines={3} minHeight={60} maxHeight={60} From 8eba8ddfd4937f7a4ffb9ba3adde407cbbb73f35 Mon Sep 17 00:00:00 2001 From: andrew Date: Tue, 11 Aug 2020 10:19:16 -0700 Subject: [PATCH 4/5] Update keyboard spacer to use platform extension --- src/components/KeyboardSpacer/index.ios.js | 8 ++++++++ src/components/KeyboardSpacer/index.js | 3 +++ src/page/HomePage/Report/ReportView.js | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/components/KeyboardSpacer/index.ios.js create mode 100644 src/components/KeyboardSpacer/index.js diff --git a/src/components/KeyboardSpacer/index.ios.js b/src/components/KeyboardSpacer/index.ios.js new file mode 100644 index 00000000000..82938000436 --- /dev/null +++ b/src/components/KeyboardSpacer/index.ios.js @@ -0,0 +1,8 @@ +import ReactNativeKeyboardSpacer from 'react-native-keyboard-spacer'; +import React from 'react'; + +const KeyboardSpacer = () => ( + +); + +export default KeyboardSpacer; diff --git a/src/components/KeyboardSpacer/index.js b/src/components/KeyboardSpacer/index.js new file mode 100644 index 00000000000..e73cda6f162 --- /dev/null +++ b/src/components/KeyboardSpacer/index.js @@ -0,0 +1,3 @@ +const KeyboardSpacer = () => null; + +export default KeyboardSpacer; diff --git a/src/page/HomePage/Report/ReportView.js b/src/page/HomePage/Report/ReportView.js index fbecb8e52a7..a6ed93efd2b 100644 --- a/src/page/HomePage/Report/ReportView.js +++ b/src/page/HomePage/Report/ReportView.js @@ -1,7 +1,6 @@ import React from 'react'; -import {View, Platform} from 'react-native'; +import {View} from 'react-native'; import PropTypes from 'prop-types'; -import KeyboardSpacer from 'react-native-keyboard-spacer'; import * as Store from '../../../store/Store'; import {withRouter, Route} from '../../../lib/Router'; import WithStore from '../../../components/WithStore'; @@ -10,6 +9,7 @@ import styles from '../../../style/StyleSheet'; import ReportHistoryView from './ReportHistoryView'; import ReportHistoryCompose from './ReportHistoryCompose'; import {addHistoryItem} from '../../../store/actions/ReportActions'; +import KeyboardSpacer from '../../../components/KeyboardSpacer'; const propTypes = { // These are from WithStore @@ -62,7 +62,7 @@ class ReportView extends React.Component { addHistoryItem(this.props.match.params.reportID, text)} /> - {Platform.OS === 'ios' && ()} + ); From 07a0e8253b1326ca3328fe68223f04b88d34ed02 Mon Sep 17 00:00:00 2001 From: andrew Date: Tue, 11 Aug 2020 10:21:29 -0700 Subject: [PATCH 5/5] Lint --- src/page/HomePage/Report/ReportView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/page/HomePage/Report/ReportView.js b/src/page/HomePage/Report/ReportView.js index 6fbf4fa5296..9a4bb85d4d4 100644 --- a/src/page/HomePage/Report/ReportView.js +++ b/src/page/HomePage/Report/ReportView.js @@ -19,8 +19,8 @@ const ReportView = props => ( addHistoryItem(props.match.params.reportID, text)} /> - - + + ); ReportView.propTypes = propTypes;