refactor(lib): Remove experimental useNext implementation (#918)

* refactor(lib): Remove experimental Next implementation * chore(lib): Fix lint * Rev fixes
callstack · Nov 27, 2024 · 48730f4 · 48730f4
1 parent 1e03beb
commit 48730f4
Show file tree

Hide file tree

Showing 28 changed files with 750 additions and 1,685 deletions.
diff --git a/android/src/fabric/java/com/reactnativepagerview/LEGACY_PagerViewViewManager.kt b/android/src/fabric/java/com/reactnativepagerview/LEGACY_PagerViewViewManager.kt
diff --git a/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt b/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt
@@ -173,11 +173,6 @@ class PagerViewViewManager : ViewGroupManager<NestedScrollableHost>(), RNCViewPa
         return
     }
 
-    @ReactProp(name = "useLegacy")
-    override fun setUseLegacy(view: NestedScrollableHost?, value: Boolean) {
-        return
-    }
-
     fun goTo(root: NestedScrollableHost?, selectedPage: Int, scrollWithAnimation: Boolean) {
         if (root == null) {
             return

diff --git a/android/src/main/java/com/reactnativepagerview/LEGACY_PagerViewViewManagerImpl.kt b/android/src/main/java/com/reactnativepagerview/LEGACY_PagerViewViewManagerImpl.kt
diff --git a/android/src/main/java/com/reactnativepagerview/PagerViewViewPackage.kt b/android/src/main/java/com/reactnativepagerview/PagerViewViewPackage.kt
@@ -12,6 +12,6 @@ class PagerViewPackage : ReactPackage {
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(PagerViewViewManager(), LEGACY_PagerViewViewManager())
+        return listOf(PagerViewViewManager())
     }
 }
diff --git a/android/src/paper/java/com/reactnativepagerview/LEGACY_PagerViewViewManager.kt b/android/src/paper/java/com/reactnativepagerview/LEGACY_PagerViewViewManager.kt
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -11,8 +11,7 @@ import {
   Button,
   Alert,
   I18nManager,
-  DevSettings,
-  Platform,
+  DevSettings
 } from 'react-native';
 import { NavigationContainer, useNavigation } from '@react-navigation/native';
 import { createStackNavigator } from '@react-navigation/stack';
@@ -34,7 +33,6 @@ import CoverflowExample from './tabView/CoverflowExample';
 import ReanimatedOnPageScrollExample from './ReanimatedOnPageScrollExample';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
-import { NextBasicPagerViewExample } from './NextBasicPagerViewExample';
 import { PagerHookExample } from './PagerHookExample';
 
 const examples = [
@@ -69,13 +67,6 @@ const examples = [
   { component: CoverflowExample, name: 'CoverflowExample' },
 ];
 
-if (Platform.OS === 'ios') {
-  examples.unshift({
-    component: NextBasicPagerViewExample,
-    name: '🔜 Next Basic Example',
-  });
-}
-
 function App() {
   const navigation = useNavigation();
   return (

diff --git a/example/src/NextBasicPagerViewExample.tsx b/example/src/NextBasicPagerViewExample.tsx
diff --git a/example/src/ScrollablePagerViewExample.tsx b/example/src/ScrollablePagerViewExample.tsx
@@ -28,8 +28,6 @@ export function ScrollablePagerViewExample() {
           {...navigationPanel}
           testID={'pager-view'}
           ref={ref}
-          // todo fix it
-          useLegacy
           style={{ height: HEIGHT }}
         >
           {navigationPanel.pages.map((page) => (

diff --git a/ios/Fabric/RNCPagerViewComponentView.h b/ios/Fabric/RNCPagerViewComponentView.h
@@ -4,10 +4,19 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTViewComponentView.h>
 #import "UIViewController+CreateExtension.h"
+#import "UIView+isHorizontalRtlLayout.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNCPagerViewComponentView : RCTViewComponentView <UIScrollViewDelegate>
+@interface RNCPagerViewComponentView : RCTViewComponentView <UIPageViewControllerDataSource, UIPageViewControllerDelegate, UIScrollViewDelegate, RtlLayoutProtocol>
+
+@property(strong, nonatomic, readonly) UIPageViewController *nativePageViewController;
+@property(nonatomic, strong) NSMutableArray<UIViewController *> *nativeChildrenViewControllers;
+@property(nonatomic) NSInteger initialPage;
+@property(nonatomic) NSInteger currentIndex;
+@property(nonatomic) NSInteger destinationIndex;
+@property(nonatomic) NSString* layoutDirection;
+@property(nonatomic) BOOL overdrag;
 
 - (void)setPage:(NSInteger)number;
 - (void)setPageWithoutAnimation:(NSInteger)number;