Skip to content

Commit e19c73e

Browse files
committed
fix ios compile errors
1 parent 3f713f8 commit e19c73e

File tree

5 files changed

+313
-292
lines changed

5 files changed

+313
-292
lines changed

packages/react-native/React/Fabric/RCTScheduler.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ NS_ASSUME_NONNULL_BEGIN
4242
blockNativeResponder:(BOOL)blockNativeResponder
4343
forShadowView:(const facebook::react::ShadowView &)shadowView;
4444

45+
46+
- (void)schedulerMeasure:(const facebook::react::ShadowView &)shadowView
47+
jsCallback:(std::function<void(folly::dynamic)>)jsCallback;
48+
4549
@end
4650

4751
/**

packages/react-native/React/Fabric/RCTScheduler.mm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ void schedulerDidSendAccessibilityEvent(const ShadowView &shadowView, const std:
6767
RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
6868
[scheduler.delegate schedulerDidSendAccessibilityEvent:shadowView eventType:eventType];
6969
}
70+
71+
72+
void schedulerMeasure(const ShadowView& shadowView, std::function<void(folly::dynamic)> jsCallback) override {
73+
RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
74+
[scheduler.delegate schedulerMeasure:shadowView jsCallback:jsCallback];
75+
}
7076

7177
private:
7278
void *scheduler_;

packages/react-native/React/Fabric/RCTSurfacePresenter.mm

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,15 @@ - (void)removeObserver:(id<RCTSurfacePresenterObserver>)observer
342342
}
343343
}
344344

345+
- (void)schedulerMeasure:(const facebook::react::ShadowView &)shadowView jsCallback:(std::function<void (folly::dynamic)>)jsCallback {
346+
// TODO: do we need to implement this on iOS? It seems to _just work_
347+
// dispatch_async(dispatch_get_main_queue(), ^{
348+
// ReactTag tag = shadowView.tag;
349+
// UIView<RCTComponentViewProtocol> *componentView =
350+
// [self->_mountingManager.componentViewRegistry findComponentViewWithTag:tag];
351+
// });
352+
}
353+
345354
#pragma mark - RCTMountingManagerDelegate
346355

347356
- (void)mountingManager:(RCTMountingManager *)mountingManager willMountComponentsWithRootTag:(ReactTag)rootTag

packages/react-native/ReactCommon/React-FabricComponents.podspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ Pod::Spec.new do |s|
113113
sss.dependency folly_dep_name, folly_version
114114
sss.compiler_flags = folly_compiler_flags
115115
sss.source_files = "react/renderer/components/modal/**/*.{m,mm,cpp,h}"
116-
sss.exclude_files = "react/renderer/components/modal/tests"
116+
sss.exclude_files = "react/renderer/components/modal/tests",
117+
"react/renderer/components/modal/platform/android",
118+
"react/renderer/components/modal/platform/cxx"
117119
sss.header_dir = "react/renderer/components/modal"
118120
end
119121

0 commit comments

Comments
 (0)