From 7b028628941babbad7d50c95909feff9516982ee Mon Sep 17 00:00:00 2001 From: Andrew Errico Date: Wed, 21 Oct 2020 09:52:42 -0400 Subject: [PATCH 1/6] add keyboardShouldPersistTaps prop to ScrollView --- index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.js b/index.js index 5996ff71..6b36a01a 100644 --- a/index.js +++ b/index.js @@ -37,6 +37,7 @@ const ScrollableTabView = createReactClass({ propTypes: { tabBarPosition: PropTypes.oneOf(['top', 'bottom', 'overlayTop', 'overlayBottom', ]), initialPage: PropTypes.number, + keyboardShouldPersistTaps: PropTypes.oneOf(['never', 'always', 'handled', ]), page: PropTypes.number, onChangeTab: PropTypes.func, onScroll: PropTypes.func, @@ -246,6 +247,7 @@ const ScrollableTabView = createReactClass({ directionalLockEnabled alwaysBounceVertical={false} keyboardDismissMode="on-drag" + keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps || 'never'} {...this.props.contentProps} > {scenes} @@ -258,6 +260,7 @@ const ScrollableTabView = createReactClass({ initialPage={this.props.initialPage} onPageSelected={this._updateSelectedPage} keyboardDismissMode="on-drag" + keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps || 'never'} scrollEnabled={!this.props.locked} onPageScroll={Animated.event( [{ From 7c0c9ed6569e3dea6d6dc422a9db7447104a807b Mon Sep 17 00:00:00 2001 From: Ethan Doh Date: Mon, 18 Apr 2022 15:43:31 -0400 Subject: [PATCH 2/6] update @react-native-community/viewpager with view name changed --- package.json | 2 +- yarn.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a6f1a2c2..4ffb207a 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/brentvatne/react-native-scrollable-tab-view#readme", "dependencies": { - "@react-native-community/viewpager": "3.3.0", + "@react-native-community/viewpager": "https://github.com/mmrdigital/react-native-pager-view#change-view-name", "create-react-class": "^15.6.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.3" diff --git a/yarn.lock b/yarn.lock index 6768a385..047fbe84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,9 @@ # yarn lockfile v1 -"@react-native-community/viewpager@^1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-1.1.7.tgz#7d3b1631f1ec91145db92a8e25c80d53027e96ba" - integrity sha512-k9v2KJtAprNPq7IZmedD2VLMePvPW+ohX3uDnkpoKritBji+/RtRmTKrdtPi3Uvp0toq/KtPttAds1dr7AZNpw== +"@react-native-community/viewpager@https://github.com/mmrdigital/react-native-pager-view#change-view-name": + version "3.3.0" + resolved "https://github.com/mmrdigital/react-native-pager-view#edc7c42a0e9aababbca2ad16715002af044b5ce7" acorn-jsx@^3.0.0: version "3.0.1" From aba1864d772fe57b58736168b73ed828d3ce7302 Mon Sep 17 00:00:00 2001 From: Ethan Doh Date: Mon, 18 Apr 2022 15:43:31 -0400 Subject: [PATCH 3/6] Revert "update @react-native-community/viewpager with view name changed" This reverts commit 7c0c9ed6569e3dea6d6dc422a9db7447104a807b. --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4ffb207a..a6f1a2c2 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/brentvatne/react-native-scrollable-tab-view#readme", "dependencies": { - "@react-native-community/viewpager": "https://github.com/mmrdigital/react-native-pager-view#change-view-name", + "@react-native-community/viewpager": "3.3.0", "create-react-class": "^15.6.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.3" diff --git a/yarn.lock b/yarn.lock index 047fbe84..6768a385 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,10 @@ # yarn lockfile v1 -"@react-native-community/viewpager@https://github.com/mmrdigital/react-native-pager-view#change-view-name": - version "3.3.0" - resolved "https://github.com/mmrdigital/react-native-pager-view#edc7c42a0e9aababbca2ad16715002af044b5ce7" +"@react-native-community/viewpager@^1.1.7": + version "1.1.7" + resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-1.1.7.tgz#7d3b1631f1ec91145db92a8e25c80d53027e96ba" + integrity sha512-k9v2KJtAprNPq7IZmedD2VLMePvPW+ohX3uDnkpoKritBji+/RtRmTKrdtPi3Uvp0toq/KtPttAds1dr7AZNpw== acorn-jsx@^3.0.0: version "3.0.1" From 958c68fa15942847160b907ec239507a179c6246 Mon Sep 17 00:00:00 2001 From: Ethan Doh Date: Tue, 19 Apr 2022 09:49:33 -0400 Subject: [PATCH 4/6] update @react-native-community/viewpager to the latest --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a6f1a2c2..bec6c1bc 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/brentvatne/react-native-scrollable-tab-view#readme", "dependencies": { - "@react-native-community/viewpager": "3.3.0", + "@react-native-community/viewpager": "5.0.11", "create-react-class": "^15.6.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.3" diff --git a/yarn.lock b/yarn.lock index 6768a385..20ed6458 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@react-native-community/viewpager@^1.1.7": - version "1.1.7" - resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-1.1.7.tgz#7d3b1631f1ec91145db92a8e25c80d53027e96ba" - integrity sha512-k9v2KJtAprNPq7IZmedD2VLMePvPW+ohX3uDnkpoKritBji+/RtRmTKrdtPi3Uvp0toq/KtPttAds1dr7AZNpw== +"@react-native-community/viewpager@5.0.11": + version "5.0.11" + resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-5.0.11.tgz#dbeb2d1b2452607926407c99e4de59c7db9e3019" + integrity sha512-eboJwbDQjP1qJP3LFzVspgh88IGNF07S2qpU296j+4kL0inVuL+HXs81SuczMGtJmDZ4u19RNEBVq79of/h+jQ== acorn-jsx@^3.0.0: version "3.0.1" From fc7f1e2ab294045a15b69134bd755be0425eed4b Mon Sep 17 00:00:00 2001 From: Ethan Doh Date: Tue, 19 Apr 2022 10:49:14 -0400 Subject: [PATCH 5/6] set @react-native-community/viewpager to the latest v4@4.2.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bec6c1bc..6710eb1d 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/brentvatne/react-native-scrollable-tab-view#readme", "dependencies": { - "@react-native-community/viewpager": "5.0.11", + "@react-native-community/viewpager": "4.2.4", "create-react-class": "^15.6.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.3" diff --git a/yarn.lock b/yarn.lock index 20ed6458..2b4ea141 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@react-native-community/viewpager@5.0.11": - version "5.0.11" - resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-5.0.11.tgz#dbeb2d1b2452607926407c99e4de59c7db9e3019" - integrity sha512-eboJwbDQjP1qJP3LFzVspgh88IGNF07S2qpU296j+4kL0inVuL+HXs81SuczMGtJmDZ4u19RNEBVq79of/h+jQ== +"@react-native-community/viewpager@4.2.4": + version "4.2.4" + resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-4.2.4.tgz#fd17ba88e0cefc7e6c8ebfff6d4afd2b887f1b2c" + integrity sha512-r7iOPPys5MS88VZuqipDadvAAjeW+PE+myhjvboH8rjNHxUUuofJW2uiiRKMSE0/qEyklIpLOCY+S0ZLHHe8Qg== acorn-jsx@^3.0.0: version "3.0.1" From 363e61ccdca7775371423ceabee3b60e3067b60a Mon Sep 17 00:00:00 2001 From: Ethan Doh Date: Tue, 19 Apr 2022 12:49:57 -0400 Subject: [PATCH 6/6] revert @react-native-community/viewpager back to 3.3.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6710eb1d..a6f1a2c2 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/brentvatne/react-native-scrollable-tab-view#readme", "dependencies": { - "@react-native-community/viewpager": "4.2.4", + "@react-native-community/viewpager": "3.3.0", "create-react-class": "^15.6.2", "prop-types": "^15.6.0", "react-timer-mixin": "^0.13.3" diff --git a/yarn.lock b/yarn.lock index 2b4ea141..8802c9cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@react-native-community/viewpager@4.2.4": - version "4.2.4" - resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-4.2.4.tgz#fd17ba88e0cefc7e6c8ebfff6d4afd2b887f1b2c" - integrity sha512-r7iOPPys5MS88VZuqipDadvAAjeW+PE+myhjvboH8rjNHxUUuofJW2uiiRKMSE0/qEyklIpLOCY+S0ZLHHe8Qg== +"@react-native-community/viewpager@3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-3.3.0.tgz#e613747a43a31a6f3278f817ba96fdaaa7941f23" + integrity sha512-tyzh79l4t/hxiyS9QD3LRmWMs8KVkZzjrkQ8U8+8To1wmvVCBtp8BenvNsDLTBO7CpO/YmiThpmIdEZMr1WuVw== acorn-jsx@^3.0.0: version "3.0.1"