Skip to content

Commit 306d899

Browse files
alpha0010IPWright83Piotr Trockimlecoqnirajniroula
authored
Sync next with master (#371)
* fix(js): handle the component unmounting (#340) * Fixes #339 - Handle the component unmounting If the component unmounts immediately after mounting, then the call to requestAnimationFrame will attempt to operate on the unmounted component. We can prevent this by ensuring we cleanup the callback on unmounting. * Default value to undefined, rather than 0 * chore: update lib folder * Release 5.1.6 * fix(js): add missing `onStartShouldSetResponder` function (#342) * chore: update lib folder * Release 5.1.7 * Update README.md (#346) * Update README.md Added import statement on "Manual Linking on Android" section. * Update README.md Use PagerViewPackage instead of RNCPagerViewPackage while manually linking on android. * chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9 in /example (#350) Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](npm/hosted-git-info@v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(android): Allow pages to be removed (#351) * fix(android): Allow pages to be removed * chore: Address CR comments * chore: update lib folder * Release 5.1.8 * fix(ios): Changing swipe direction flickers (#330) (#356) * Release 5.1.9 * chore: bump an example * chore(deps): bump browserslist from 4.16.3 to 4.16.6 (#361) Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.16.6. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md) - [Commits](browserslist/browserslist@4.16.3...4.16.6) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump browserslist from 4.16.3 to 4.16.6 in /example (#362) Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.16.6. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md) - [Commits](browserslist/browserslist@4.16.3...4.16.6) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(ios): offset is changing while overDrag is disabled (#363) * Release 5.1.10 * chore(android): remove build tools version (#365) * chore: update the lib folder * Release 5.1.11 * feat(ios): BREAKING CHANGE - change default value of overDrag prop to false (#364) * fix(ios): offset is changing while overDrag is disabled * feat: change overDrag to be false by default * chore: lib * Release 5.2.0 Co-authored-by: Ian Wright <[email protected]> Co-authored-by: Piotr Trocki <[email protected]> Co-authored-by: Mickael Lecoq <[email protected]> Co-authored-by: Niraj Niroula <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brent Kelly <[email protected]> Co-authored-by: Piotr Trocki <[email protected]> Co-authored-by: Danijel Bojcic <[email protected]> Co-authored-by: Dulmandakh <[email protected]>
1 parent 7be96f1 commit 306d899

File tree

17 files changed

+108
-61
lines changed

17 files changed

+108
-61
lines changed

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@ dependencies {
8080

8181
On top, where imports are:
8282

83-
Add the `RNCPagerViewPackage` class to your list of exported packages.
83+
Add `import com.reactnativepagerview.PagerViewPackage;`
84+
85+
Add the `PagerViewPackage` class to your list of exported packages.
8486

8587
```java
8688
@Override
8789
protected List<ReactPackage> getPackages() {
8890
return Arrays.<ReactPackage>asList(
8991
new MainReactPackage(),
90-
new RNCPagerViewPackage()
92+
new PagerViewPackage()
9193
);
9294
}
9395
```
@@ -145,7 +147,7 @@ For advanced usage please take a look into our [example project](https://github.
145147
| `showPageIndicator: boolean` | Shows the dots indicator at the bottom of the view | iOS |
146148
| `overScrollMode: OverScollMode` | Used to override default value of overScroll mode. Can be `auto`, `always` or `never`. Defaults to `auto` | Android |
147149
| `offscreenPageLimit: number` | Set the number of pages that should be retained to either side of the currently visible page(s). Pages beyond this limit will be recreated from the adapter when needed. Defaults to RecyclerView's caching strategy. The given value must either be larger than 0. | Android |
148-
| `overdrag: boolean` | Allows for overscrolling after reaching the end or very beginning or pages | iOS |
150+
| `overdrag: boolean` | Allows for overscrolling after reaching the end or very beginning or pages. Defaults to `false` | iOS |
149151

150152
| Method | Description | Platform |
151153
| ------------------------------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------: |

‎android/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def getExtOrIntegerDefault(name) {
2727

2828
android {
2929
compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
30-
buildToolsVersion getExtOrDefault('buildToolsVersion')
3130
defaultConfig {
3231
minSdkVersion getExtOrIntegerDefault('minSdkVersion')
3332
targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')

‎android/src/main/java/com/reactnativepagerview/PagerViewViewManager.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,4 +219,3 @@ class PagerViewViewManager : ViewGroupManager<ViewPager2>() {
219219
private const val COMMAND_SET_SCROLL_ENABLED = 3
220220
}
221221
}
222-

‎example/ios/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ PODS:
185185
- React-cxxreact (= 0.63.4)
186186
- React-jsi (= 0.63.4)
187187
- React-jsinspector (0.63.4)
188-
- react-native-pager-view (5.1.4):
188+
- react-native-pager-view (5.1.11):
189189
- React-Core
190190
- react-native-safe-area-context (3.2.0):
191191
- React-Core
@@ -382,7 +382,7 @@ SPEC CHECKSUMS:
382382
React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
383383
React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
384384
React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
385-
react-native-pager-view: dddddb3c17c4a1e7f85d379e37033c399c7fe1cf
385+
react-native-pager-view: fc7541367fdde379772bc15b7add80cc874295d3
386386
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
387387
React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
388388
React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
@@ -402,4 +402,4 @@ SPEC CHECKSUMS:
402402

403403
PODFILE CHECKSUM: ff595481d97548cf6367f753d945ef2a7fc1f818
404404

405-
COCOAPODS: 1.10.0
405+
COCOAPODS: 1.10.1

‎example/yarn.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,15 +1808,15 @@ browser-process-hrtime@^1.0.0:
18081808
integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
18091809

18101810
browserslist@^4.14.5, browserslist@^4.16.3:
1811-
version "4.16.3"
1812-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
1813-
integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
1811+
version "4.16.6"
1812+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
1813+
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
18141814
dependencies:
1815-
caniuse-lite "^1.0.30001181"
1816-
colorette "^1.2.1"
1817-
electron-to-chromium "^1.3.649"
1815+
caniuse-lite "^1.0.30001219"
1816+
colorette "^1.2.2"
1817+
electron-to-chromium "^1.3.723"
18181818
escalade "^3.1.1"
1819-
node-releases "^1.1.70"
1819+
node-releases "^1.1.71"
18201820

18211821
[email protected]:
18221822
version "0.2.6"
@@ -1922,10 +1922,10 @@ camelcase@^6.0.0:
19221922
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
19231923
integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
19241924

1925-
caniuse-lite@^1.0.30001181:
1926-
version "1.0.30001205"
1927-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz#d79bf6a6fb13196b4bb46e5143a22ca0242e0ef8"
1928-
integrity sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==
1925+
caniuse-lite@^1.0.30001219:
1926+
version "1.0.30001230"
1927+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz#8135c57459854b2240b57a4a6786044bdc5a9f71"
1928+
integrity sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==
19291929

19301930
capture-exit@^2.0.0:
19311931
version "2.0.0"
@@ -2115,7 +2115,7 @@ color@^3.1.3:
21152115
color-convert "^1.9.1"
21162116
color-string "^1.5.4"
21172117

2118-
colorette@^1.0.7, colorette@^1.2.1:
2118+
colorette@^1.0.7, colorette@^1.2.2:
21192119
version "1.2.2"
21202120
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
21212121
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -2549,10 +2549,10 @@ [email protected]:
25492549
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
25502550
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
25512551

2552-
electron-to-chromium@^1.3.649:
2553-
version "1.3.707"
2554-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.707.tgz#71386d0ceca6727835c33ba31f507f6824d18c35"
2555-
integrity sha512-BqddgxNPrcWnbDdJw7SzXVzPmp+oiyjVrc7tkQVaznPGSS9SKZatw6qxoP857M+HbOyyqJQwYQtsuFIMSTNSZA==
2552+
electron-to-chromium@^1.3.723:
2553+
version "1.3.739"
2554+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz#f07756aa92cabd5a6eec6f491525a64fe62f98b9"
2555+
integrity sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==
25562556

25572557
emittery@^0.7.1:
25582558
version "0.7.2"
@@ -3248,9 +3248,9 @@ hoist-non-react-statics@^3.3.0:
32483248
react-is "^16.7.0"
32493249

32503250
hosted-git-info@^2.1.4:
3251-
version "2.8.8"
3252-
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
3253-
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
3251+
version "2.8.9"
3252+
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
3253+
integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
32543254

32553255
html-encoding-sniffer@^2.0.1:
32563256
version "2.0.1"
@@ -4929,10 +4929,10 @@ node-notifier@^8.0.0:
49294929
uuid "^8.3.0"
49304930
which "^2.0.2"
49314931

4932-
node-releases@^1.1.70:
4933-
version "1.1.71"
4934-
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
4935-
integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
4932+
node-releases@^1.1.71:
4933+
version "1.1.72"
4934+
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
4935+
integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
49364936

49374937
node-stream-zip@^1.9.1:
49384938
version "1.13.3"

‎ios/ReactNativePageView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ - (instancetype)init {
2828
_currentPage = 0;
2929
_currentReactTag = nil;
3030
_orientation = UIPageViewControllerNavigationOrientationHorizontal;
31-
_overdrag = YES;
31+
_overdrag = NO;
3232
_pageMargin = 0;
3333
_placeholderPageIndexes = [NSMapTable weakToStrongObjectsMapTable];
3434
_scrollEnabled = YES;

‎lib/commonjs/PagerView.js‎

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)