Skip to content

Commit bccd97d

Browse files
authored
fix(native): Update legacy codegen setup (#828)
* Update legacy codegen setup * Change macos version * Update iOS imports
1 parent f1eb152 commit bccd97d

File tree

9 files changed

+23
-27
lines changed

9 files changed

+23
-27
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020

2121
jobs:
2222
android-build:
23-
runs-on: macos-latest
23+
runs-on: macos-12
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: ./.github/actions/install-dependencies

common/cpp/react/renderer/components/RNCViewPager/RNCViewPagerShadowNode.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#pragma once
22

3-
#include <react/renderer/components/RNCViewPager/EventEmitters.h>
4-
#include <react/renderer/components/RNCViewPager/Props.h>
3+
//These imports come from the common/cpp directory
4+
#include <react/renderer/components/pagerview/EventEmitters.h>
5+
#include <react/renderer/components/pagerview/Props.h>
6+
//This import comes from the codegen directory
57
#include <react/renderer/components/RNCViewPager/RNCViewPagerState.h>
68
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
79
#include <react/renderer/core/LayoutContext.h>

ios/Fabric/RNCPagerViewComponentView.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#import <Foundation/Foundation.h>
44
#import "RNCPagerViewComponentView.h"
55
#import <RNCViewPager/RNCViewPagerComponentDescriptor.h>
6-
#import <react/renderer/components/RNCViewPager/EventEmitters.h>
7-
#import <react/renderer/components/RNCViewPager/Props.h>
8-
#import <react/renderer/components/RNCViewPager/RCTComponentViewHelpers.h>
6+
#import <react/renderer/components/pagerview/EventEmitters.h>
7+
#import <react/renderer/components/pagerview/Props.h>
8+
#import <react/renderer/components/pagerview/RCTComponentViewHelpers.h>
99

1010
#import "RCTFabricComponentsPlugins.h"
1111
#import "React/RCTConversions.h"

ios/LEGACY/Fabric/LEGACY_RNCPagerViewComponentView.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
#import <Foundation/Foundation.h>
44
#import "LEGACY_RNCPagerViewComponentView.h"
5-
#import <react/renderer/components/LEGACY_RNCViewPager/ComponentDescriptors.h>
6-
#import <react/renderer/components/LEGACY_RNCViewPager/EventEmitters.h>
7-
#import <react/renderer/components/LEGACY_RNCViewPager/Props.h>
8-
#import <react/renderer/components/LEGACY_RNCViewPager/RCTComponentViewHelpers.h>
5+
#import <react/renderer/components/pagerview/ComponentDescriptors.h>
6+
#import <react/renderer/components/pagerview/EventEmitters.h>
7+
#import <react/renderer/components/pagerview/Props.h>
8+
#import <react/renderer/components/pagerview/RCTComponentViewHelpers.h>
99

1010
#import "RCTFabricComponentsPlugins.h"
1111
#import "React/RCTConversions.h"
@@ -438,4 +438,4 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
438438
return LEGACY_RNCPagerViewComponentView.class;
439439
}
440440

441-
#endif
441+
#endif

package.json

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,12 @@
121121
"useTabs": false
122122
},
123123
"codegenConfig": {
124-
"libraries": [
125-
{
126-
"name": "RNCViewPager",
127-
"type": "components",
128-
"jsSrcsDir": "src/PagerViewNativeComponent"
129-
},
130-
{
131-
"name": "LEGACY_RNCViewPager",
132-
"type": "components",
133-
"jsSrcsDir": "src/LEGACY_PagerViewNativeComponent"
134-
}
135-
]
124+
"name": "pagerview",
125+
"type": "all",
126+
"jsSrcsDir": "./src/specs",
127+
"android": {
128+
"javaPackageName": "com.reactnativepagerview"
129+
}
136130
},
137131
"react-native-builder-bob": {
138132
"source": "src",

src/PagerView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import PagerViewNativeComponent, {
1414
OnPageScrollStateChangedEventData,
1515
OnPageSelectedEventData,
1616
NativeProps,
17-
} from './PagerViewNativeComponent/PagerViewNativeComponent';
17+
} from './specs/PagerViewNativeComponent';
1818

1919
import LEGACY_PagerViewNativeComponent, {
2020
Commands as LEGACY_PagerViewNativeCommands,
21-
} from './LEGACY_PagerViewNativeComponent/LEGACY_PagerViewNativeComponent';
21+
} from './specs/LEGACY_PagerViewNativeComponent';
2222

2323
// The Fabric component for PagerView uses a work around present also in ScrollView:
2424
// https://github.com/callstack/react-native-pager-view/blob/master/ios/Fabric/RNCPagerViewComponentView.mm#L362-L368

src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
OnPageSelectedEventData as PagerViewOnPageSelectedEventData,
88
OnPageScrollStateChangedEventData as PageScrollStateChangedNativeEventData,
99
NativeProps,
10-
} from './PagerViewNativeComponent/PagerViewNativeComponent';
10+
} from './specs/PagerViewNativeComponent';
1111

1212
export type {
1313
PagerViewOnPageScrollEventData,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Note: The types below are duplicated between this file and `src/PagerViewNativeComponent/PagerViewNativeComponent.ts`.
2+
Note: The types below are duplicated between this file and `src/specs/PagerViewNativeComponent.ts`.
33
44
This is on purpose. Firstly, we're declaring two native modules with two different iOS implementation flavors, but the same API.
55
Secondly, as these files serve as a reference point for React Native's new architecture Codegen process (which takes care of the
File renamed without changes.

0 commit comments

Comments
 (0)