fix(native): Update legacy codegen setup (#828)

* Update legacy codegen setup * Change macos version * Update iOS imports
callstack · Jun 19, 2024 · bccd97d · bccd97d
1 parent f1eb152
commit bccd97d
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   android-build:
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install-dependencies

diff --git a/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.h b/common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include <react/renderer/components/RNCViewPager/EventEmitters.h>
-#include <react/renderer/components/RNCViewPager/Props.h>
+//These imports come from the common/cpp directory 
+#include <react/renderer/components/pagerview/EventEmitters.h>
+#include <react/renderer/components/pagerview/Props.h>
+//This import comes from the codegen directory 
 #include <react/renderer/components/RNCViewPager/RNCViewPagerState.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>

diff --git a/ios/Fabric/RNCPagerViewComponentView.mm b/ios/Fabric/RNCPagerViewComponentView.mm
@@ -3,9 +3,9 @@
 #import <Foundation/Foundation.h>
 #import "RNCPagerViewComponentView.h"
 #import <RNCViewPager/RNCViewPagerComponentDescriptor.h>
-#import <react/renderer/components/RNCViewPager/EventEmitters.h>
-#import <react/renderer/components/RNCViewPager/Props.h>
-#import <react/renderer/components/RNCViewPager/RCTComponentViewHelpers.h>
+#import <react/renderer/components/pagerview/EventEmitters.h>
+#import <react/renderer/components/pagerview/Props.h>
+#import <react/renderer/components/pagerview/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
 #import "React/RCTConversions.h"

diff --git a/ios/LEGACY/Fabric/LEGACY_RNCPagerViewComponentView.mm b/ios/LEGACY/Fabric/LEGACY_RNCPagerViewComponentView.mm
@@ -2,10 +2,10 @@
 
 #import <Foundation/Foundation.h>
 #import "LEGACY_RNCPagerViewComponentView.h"
-#import <react/renderer/components/LEGACY_RNCViewPager/ComponentDescriptors.h>
-#import <react/renderer/components/LEGACY_RNCViewPager/EventEmitters.h>
-#import <react/renderer/components/LEGACY_RNCViewPager/Props.h>
-#import <react/renderer/components/LEGACY_RNCViewPager/RCTComponentViewHelpers.h>
+#import <react/renderer/components/pagerview/ComponentDescriptors.h>
+#import <react/renderer/components/pagerview/EventEmitters.h>
+#import <react/renderer/components/pagerview/Props.h>
+#import <react/renderer/components/pagerview/RCTComponentViewHelpers.h>
 
 #import "RCTFabricComponentsPlugins.h"
 #import "React/RCTConversions.h"
@@ -438,4 +438,4 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return LEGACY_RNCPagerViewComponentView.class;
 }
 
-#endif
+#endif
diff --git a/package.json b/package.json
@@ -121,18 +121,12 @@
     "useTabs": false
   },
   "codegenConfig": {
-    "libraries": [
-      {
-        "name": "RNCViewPager",
-        "type": "components",
-        "jsSrcsDir": "src/PagerViewNativeComponent"
-      },
-      {
-        "name": "LEGACY_RNCViewPager",
-        "type": "components",
-        "jsSrcsDir": "src/LEGACY_PagerViewNativeComponent"
-      }
-    ]
+    "name": "pagerview",
+    "type": "all",
+    "jsSrcsDir": "./src/specs",
+    "android": {
+      "javaPackageName": "com.reactnativepagerview"
+    }
   },
   "react-native-builder-bob": {
     "source": "src",

diff --git a/src/PagerView.tsx b/src/PagerView.tsx
@@ -14,11 +14,11 @@ import PagerViewNativeComponent, {
   OnPageScrollStateChangedEventData,
   OnPageSelectedEventData,
   NativeProps,
-} from './PagerViewNativeComponent/PagerViewNativeComponent';
+} from './specs/PagerViewNativeComponent';
 
 import LEGACY_PagerViewNativeComponent, {
   Commands as LEGACY_PagerViewNativeCommands,
-} from './LEGACY_PagerViewNativeComponent/LEGACY_PagerViewNativeComponent';
+} from './specs/LEGACY_PagerViewNativeComponent';
 
 // The Fabric component for PagerView uses a work around present also in ScrollView:
 // https://github.com/callstack/react-native-pager-view/blob/master/ios/Fabric/RNCPagerViewComponentView.mm#L362-L368

diff --git a/src/index.tsx b/src/index.tsx
@@ -7,7 +7,7 @@ import type {
   OnPageSelectedEventData as PagerViewOnPageSelectedEventData,
   OnPageScrollStateChangedEventData as PageScrollStateChangedNativeEventData,
   NativeProps,
-} from './PagerViewNativeComponent/PagerViewNativeComponent';
+} from './specs/PagerViewNativeComponent';
 
 export type {
   PagerViewOnPageScrollEventData,

diff --git a/...ponent/LEGACY_PagerViewNativeComponent.ts → src/specs/LEGACY_PagerViewNativeComponent.ts b/...ponent/LEGACY_PagerViewNativeComponent.ts → src/specs/LEGACY_PagerViewNativeComponent.ts
@@ -1,5 +1,5 @@
 /*
-  Note: The types below are duplicated between this file and `src/PagerViewNativeComponent/PagerViewNativeComponent.ts`.
+  Note: The types below are duplicated between this file and `src/specs/PagerViewNativeComponent.ts`.
 
   This is on purpose. Firstly, we're declaring two native modules with two different iOS implementation flavors, but the same API.
   Secondly, as these files serve as a reference point for React Native's new architecture Codegen process (which takes care of the

diff --git a/...tiveComponent/PagerViewNativeComponent.ts → src/specs/PagerViewNativeComponent.ts b/...tiveComponent/PagerViewNativeComponent.ts → src/specs/PagerViewNativeComponent.ts