Skip to content

Commit 280c3a3

Browse files
troZeekrozniataPiotr Trockiokwasniewskiintergalacticspacehighway
authored
merge next to master (#817)
* feat(iOS): change Fabric implementation to UIScrollView (#672) * feat(iOS): change Fabric implementation to UIScrollView * fix: fix offset values in vertical orientation * feat: add initialPage props support * feat: add RTL language support * feat: add pageMargin prop support * fix: fix typescript error * feat: remove React.cloneElement * feat(ios): add getPageOffset method * fix: fix styles in old example * fix: behavior on page remove * chore: add GH actions (#680) Co-authored-by: Piotr Trocki <piotr.trocki@callstack.com> * feat(iOS): rewrite old arch to use UIScrollView (#681) * feat: rewrite old arch to use UIScrollView * feat: update example styles * fix: sending event on scrollViewDidEndDecelerating * feat: properly calculate width using orientation * fix: change way of disabing scroll * feat: rename to RNCPagerView * fix: removing last page * fix: remove unused properties, set animated * chore: update release script * Release 7.0.0-rc.0 * wip * wip * fabric example * nit: comment * make init consistent * fix: multiple updates of frame and contentSize * feat: add button to quickly switch layout direction * sync with master (#756) Co-authored-by: Piotr Trocki <piotr.trocki@callstack.com> * chore: upgrade RN (paper example) * chore: upgrade rn & fix issues (fabric example) * chore: bump versions in package.json * chore: fix eslint issue * chore: exclude example from tsc * feat(next): remove fabric example * chore: update README * fix broken overdrag on notch (#787) Co-authored-by: Kuba Juszczyk <jakub.juszczyk@flipfit.com> * feat(iOS): Add a `useLegacy` flag to switch between the old/new iOS implementation (#783) * wip: unsuspicious changes * wip: unsuspicious changes v2 * FABRIC NEW IMPL -> OLD IMPL * wip: bring back useLegacy on the RN side * wip: bring back duplicate types to fix codegen issues * wip: remove #705 related code for now * wip: old/new impl division first draft * wip: old/new impl division continued * wip: old/new impl v3 * wip: add a `LEGACY_` prefix to all legacy implementation-related symbols * wip: fix styles for new implementation on Fabric * wip: move old/new impl into separate folders * wip: fix old impl fabric symbol names * wip: xcode changes * wip: clean up & unify the naming convention * wip: fix linter issues * wip: fix styles for new implementation on Paper * wip: make Fabric example run on another port by default to make it possible to run both examples in parallel * wip: implement an abstraction over native commands invocations to reduce branching * refactor: remove the unnecessary value for boolean props * fix: bump react-native-safe-area-context to a Fabric-enabled version * feat: bring back & adjust the `bootstrap-fabric` script * feat: adjust the home screen title depending on the used architecture * chore: update example/Podfile.lock * chore: update an Xcode project file after building * ci: make next branch events trigger ios/android build workflows * chore: remove commented-out code related to #705 for now * chore: add legacy implementation explanation comment * wip: Android fixes * fix: unnecessary comma in MainActivity.java * feat: readme makeover * chore: bump react-native-screens & react-native-gesture-handler in example * refactor(android): extract module name to shared variable, add comment for context * chore: remove unnecessary yarn.lock deps * chore(ios): bring back removed build flags * chore(ios): remove unnecessary concurrentRootEnabled method According to React Native Upgrade Helper, this method is to be removed when updating to RN 0.72: https://react-native-community.github.io/upgrade-helper/?from=0.71.14&to=0.72.0#RnDiffApp-ios-RnDiffApp-AppDelegate.mm * fix(android): adjust incorrect param type on Fabric * chore: remove unnecessary tsconfig.json comment * chore(ios): bring back (currently unused) code related to #712 and #705 * Release 7.0.0-rc.1 * fix(ios): fix freezing when navigating to same index (#804) * Release 7.0.0-rc.2 * fix iOS issue * Change Legacy basic example into the next basic example * revert documentatation --------- Co-authored-by: Kacper Rożniata <56474758+krozniata@users.noreply.github.com> Co-authored-by: Piotr Trocki <piotr.trocki@callstack.com> Co-authored-by: Oskar Kwaśniewski <oskarkwasniewski@icloud.com> Co-authored-by: Nishan <nishanbende@gmail.com> Co-authored-by: Kuba Juszczyk <juszczyk.jakub@gmail.com> Co-authored-by: Kuba Juszczyk <jakub.juszczyk@flipfit.com> Co-authored-by: Igor Bejnarowicz <igor.bejnarowicz@callstack.com>
1 parent 0662c31 commit 280c3a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1943
-1774
lines changed

‎.github/workflows/android.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
pull_request:
55
branches:
66
- master
7+
- next
78
paths:
89
- '.github/workflows/android.yml'
910
- 'android/**'
1011
- 'example/android/**'
1112
push:
1213
branches:
1314
- master
15+
- next
1416

1517
concurrency:
1618
group: ${{ github.ref }}-android

‎.github/workflows/ios.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
pull_request:
55
branches:
66
- master
7+
- next
78
paths:
89
- '.github/workflows/ios.yml'
910
- 'ios/**'
1011
- 'example/ios/**'
1112
push:
1213
branches:
1314
- master
15+
- next
1416

1517
concurrency:
1618
group: ${{ github.ref }}-ios

‎.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
pull_request:
55
branches:
66
- master
7+
- next
78
push:
89
branches:
910
- master
11+
- next
1012

1113
concurrency:
1214
group: ${{ github.ref }}-js

‎.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ npm-debug.log
4747
yarn-debug.log
4848
yarn-error.log
4949

50-
# BUCK
51-
buck-out/
52-
\.buckd/
53-
android/app/libs
54-
android/keystores/debug.keystore
55-
5650
# Expo
5751
.expo/*
5852

@@ -76,3 +70,4 @@ lefthook.yml
7670
# testing
7771
/coverage
7872
.cxx
73+
example/ios/PagerViewExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ For advanced usage please take a look into our [example project](https://github.
147147
| `pageMargin: number` | Blank space to be shown between pages | both |
148148
| `keyboardDismissMode: ('none' / 'on-drag')` | Determines whether the keyboard gets dismissed in response to a drag | both |
149149
| `orientation: Orientation` | Set `horizontal` or `vertical` scrolling orientation (it does **not** work dynamically) | both |
150-
| `overScrollMode: OverScrollMode` | Used to override default value of overScroll mode. Can be `auto`, `always` or `never`. Defaults to `auto` | Android |
150+
| `overScrollMode: OverScrollMode` | Used to override default value of overScroll mode. Can be `auto`, `always` or `never`. Defaults to `auto` | Android |
151151
| `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 |
152152
| `overdrag: boolean` | Allows for overscrolling after reaching the end or very beginning or pages. Defaults to `false` | iOS |
153153
| `layoutDirection: ('ltr' / 'rtl' / 'locale')` | Specifies layout direction. Use `ltr` or `rtl` to set explicitly or `locale` to deduce from the default language script of a locale. Defaults to `locale` | both |

‎android/src/fabric/java/com/reactnativepagerview/LEGACY_PagerViewViewManager.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.reactnativepagerview
2+
3+
import com.facebook.react.uimanager.ViewGroupManager
4+
import android.widget.FrameLayout
5+
import com.facebook.react.module.annotations.ReactModule
6+
import com.facebook.react.uimanager.ThemedReactContext
7+
8+
// Note: The LEGACY_ variant is an iOS-only feature and the related Android files
9+
// are only included because of and relevant to auxiliary processes, like Codegen.
10+
@ReactModule(name = LEGACY_PagerViewViewManagerImpl.NAME)
11+
class LEGACY_PagerViewViewManager : ViewGroupManager<FrameLayout>() {
12+
override fun getName() = LEGACY_PagerViewViewManagerImpl.NAME
13+
14+
override fun createViewInstance(context: ThemedReactContext): FrameLayout {
15+
throw Error("LEGACY_RNCViewPager is an iOS-only feature")
16+
}
17+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,11 @@ class PagerViewViewManager : ViewGroupManager<NestedScrollableHost>(), RNCViewPa
173173
return
174174
}
175175

176+
@ReactProp(name = "useLegacy")
177+
override fun setUseLegacy(view: NestedScrollableHost?, value: Boolean) {
178+
return
179+
}
180+
176181
fun goTo(root: NestedScrollableHost?, selectedPage: Int, scrollWithAnimation: Boolean) {
177182
if (root == null) {
178183
return

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.reactnativepagerview
2+
3+
// Note: The LEGACY_ variant is an iOS-only feature and the related Android files
4+
// are only included because of and relevant to auxiliary processes, like Codegen.
5+
object LEGACY_PagerViewViewManagerImpl {
6+
const val NAME = "LEGACY_RNCViewPager"
7+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class PagerViewPackage : ReactPackage {
1212
}
1313

1414
override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
15-
return listOf(PagerViewViewManager())
15+
return listOf(PagerViewViewManager(), LEGACY_PagerViewViewManager())
1616
}
1717
}

‎android/src/paper/java/com/reactnativepagerview/LEGACY_PagerViewViewManager.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.reactnativepagerview
2+
3+
import com.facebook.react.uimanager.ViewGroupManager
4+
import android.widget.FrameLayout
5+
import com.facebook.react.module.annotations.ReactModule
6+
import com.facebook.react.uimanager.ThemedReactContext
7+
8+
// Note: The LEGACY_ variant is an iOS-only feature and the related Android files
9+
// are only included because of and relevant to auxiliary processes, like Codegen.
10+
@ReactModule(name = LEGACY_PagerViewViewManagerImpl.NAME)
11+
class LEGACY_PagerViewViewManager : ViewGroupManager<FrameLayout>() {
12+
override fun getName() = LEGACY_PagerViewViewManagerImpl.NAME
13+
14+
override fun createViewInstance(context: ThemedReactContext): FrameLayout {
15+
throw Error("LEGACY_RNCViewPager is an iOS-only feature")
16+
}
17+
}

0 commit comments

Comments
 (0)