* MM-62896 Keyboard blocks input (#8646) * WIP * fix keyboard blocking text input for interactive dialog * do not use extra keyboard and windowSoftInputMode:adjustNothing on Android 10 and under --------- Co-authored-by: Devin Binnie <devin.binnie@mattermost.com> (cherry picked from commit1c8770c74d) * Bump the github-actions-updates group across 5 directories with 6 updates (#8613) Bumps the github-actions-updates group with 1 update in the /.github/actions/prepare-android-build directory: [actions/checkout](https://github.com/actions/checkout). Bumps the github-actions-updates group with 1 update in the /.github/actions/prepare-ios-build directory: [actions/cache](https://github.com/actions/cache). Bumps the github-actions-updates group with 2 updates in the /.github/actions/prepare-mobile-build directory: [actions/cache](https://github.com/actions/cache) and [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Bumps the github-actions-updates group with 2 updates in the /.github/actions/prepare-node-deps directory: [actions/cache](https://github.com/actions/cache) and [actions/setup-node](https://github.com/actions/setup-node). Bumps the github-actions-updates group with 4 updates in the /.github/workflows directory: [actions/checkout](https://github.com/actions/checkout), [ruby/setup-ruby](https://github.com/ruby/setup-ruby), [actions/upload-artifact](https://github.com/actions/upload-artifact) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/checkout` from 3.3.0 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](ac59398561...11bd71901b) Updates `actions/cache` from 4.0.2 to 4.2.1 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](0c45773b62...0c907a75c2) Updates `actions/cache` from 4.0.2 to 4.2.1 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](0c45773b62...0c907a75c2) Updates `ruby/setup-ruby` from 1.180.0 to 1.221.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](ff740bc00a...32110d4e31) Updates `actions/cache` from 4.0.2 to 4.2.1 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](0c45773b62...0c907a75c2) Updates `actions/setup-node` from 4.0.2 to 4.2.0 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](60edb5dd54...1d0ff469b7) Updates `actions/checkout` from 3 to 4 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](ac59398561...11bd71901b) Updates `ruby/setup-ruby` from 1.180.0 to 1.221.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](ff740bc00a...32110d4e31) Updates `actions/upload-artifact` from 4.3.1 to 4.6.0 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4.3.1...65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08) Updates `github/codeql-action` from 2 to 3 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions-updates - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: ruby/setup-ruby dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions-updates - dependency-name: ruby/setup-ruby dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-updates - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions-updates ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Elias Nahum <nahumhbl@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
74 lines
3.1 KiB
Diff
74 lines
3.1 KiB
Diff
diff --git a/node_modules/react-native-keyboard-aware-scroll-view/index.d.ts b/node_modules/react-native-keyboard-aware-scroll-view/index.d.ts
|
|
index bf03b26..e11063b 100644
|
|
--- a/node_modules/react-native-keyboard-aware-scroll-view/index.d.ts
|
|
+++ b/node_modules/react-native-keyboard-aware-scroll-view/index.d.ts
|
|
@@ -69,6 +69,7 @@ interface KeyboardAwareProps {
|
|
* @memberof KeyboardAwareProps
|
|
*/
|
|
enableOnAndroid?: boolean
|
|
+ noPaddingBottomOnAndroid?: boolean
|
|
|
|
/**
|
|
* Adds an extra offset when focusing the TextInputs.
|
|
diff --git a/node_modules/react-native-keyboard-aware-scroll-view/lib/KeyboardAwareHOC.js b/node_modules/react-native-keyboard-aware-scroll-view/lib/KeyboardAwareHOC.js
|
|
index 03f46af..f58175f 100644
|
|
--- a/node_modules/react-native-keyboard-aware-scroll-view/lib/KeyboardAwareHOC.js
|
|
+++ b/node_modules/react-native-keyboard-aware-scroll-view/lib/KeyboardAwareHOC.js
|
|
@@ -57,6 +57,7 @@ export type KeyboardAwareHOCProps = {
|
|
update?: Function,
|
|
contentContainerStyle?: any,
|
|
enableOnAndroid?: boolean,
|
|
+ noPaddingBottomOnAndroid?: boolean,
|
|
innerRef?: Function,
|
|
...keyboardAwareHOCTypeEvents
|
|
}
|
|
@@ -92,6 +93,7 @@ export type ScrollIntoViewOptions = ?{
|
|
|
|
export type KeyboardAwareHOCOptions = ?{
|
|
enableOnAndroid: boolean,
|
|
+ noPaddingBottomOnAndroid: boolean,
|
|
contentContainerStyle: ?Object,
|
|
enableAutomaticScroll: boolean,
|
|
extraHeight: number,
|
|
@@ -113,6 +115,7 @@ function getDisplayName(WrappedComponent: React$Component) {
|
|
|
|
const ScrollIntoViewDefaultOptions: KeyboardAwareHOCOptions = {
|
|
enableOnAndroid: false,
|
|
+ noPaddingBottomOnAndroid: false,
|
|
contentContainerStyle: undefined,
|
|
enableAutomaticScroll: true,
|
|
extraHeight: _KAM_EXTRA_HEIGHT,
|
|
@@ -181,6 +184,7 @@ function KeyboardAwareHOC(
|
|
update: PropTypes.func,
|
|
contentContainerStyle: PropTypes.any,
|
|
enableOnAndroid: PropTypes.bool,
|
|
+ noPaddingBottomOnAndroid: PropTypes.bool,
|
|
innerRef: PropTypes.func,
|
|
...keyboardEventPropTypes
|
|
}
|
|
@@ -193,7 +197,8 @@ function KeyboardAwareHOC(
|
|
enableResetScrollToCoords: hocOptions.enableResetScrollToCoords,
|
|
keyboardOpeningTime: hocOptions.keyboardOpeningTime,
|
|
viewIsInsideTabBar: hocOptions.viewIsInsideTabBar,
|
|
- enableOnAndroid: hocOptions.enableOnAndroid
|
|
+ enableOnAndroid: hocOptions.enableOnAndroid,
|
|
+ noPaddingBottomOnAndroid: hocOptions.noPaddingBottomOnAndroid
|
|
}
|
|
|
|
constructor(props: KeyboardAwareHOCProps) {
|
|
@@ -523,13 +528,13 @@ function KeyboardAwareHOC(
|
|
}
|
|
|
|
render() {
|
|
- const { enableOnAndroid, contentContainerStyle, onScroll } = this.props
|
|
+ const { enableOnAndroid, contentContainerStyle, noPaddingBottomOnAndroid, onScroll } = this.props
|
|
let newContentContainerStyle
|
|
if (Platform.OS === 'android' && enableOnAndroid) {
|
|
newContentContainerStyle = [].concat(contentContainerStyle).concat({
|
|
paddingBottom:
|
|
((contentContainerStyle || {}).paddingBottom || 0) +
|
|
- this.state.keyboardSpace
|
|
+ noPaddingBottomOnAndroid ? 0 : this.state.keyboardSpace
|
|
})
|
|
}
|
|
const refProps = { [hocOptions.refPropName]: this._handleRef }
|