Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate RN Nightly 10/31 #14152

Merged
merged 16 commits into from
Dec 5, 2024
Merged

Conversation

@@ -53,7 +52,7 @@ FabicUIManagerProperty() noexcept {
}

FabricUIManager::FabricUIManager() {
facebook::react::CoreFeatures::enablePropIteratorSetter = true;
facebook::react::ReactNativeFeatureFlags::enableCppPropsIteratorSetter();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this line, it is no longer going anything.
But we do need to override the value of this flag in our feature flags - in ReactNativeWindowsFeatureFlags in ReactHost.cpp

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed - will we need to call the new override ReactNativeWindowsFeatureFlags::enableCppPropsIteratorSetter() in the constructor, in place of ReactNativeFeatureFlags::enableCppPropsIteratorSetter()?

@Yajur-Grover Yajur-Grover marked this pull request as ready for review December 5, 2024 00:12
@Yajur-Grover Yajur-Grover requested review from a team as code owners December 5, 2024 00:12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need some // [Windows comments and an integration bugs about getting these changes upstreamed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Yajur-Grover Correct me if I'm wrong but I think these changes are upstream code!

The issue for the file is here: #13172, there's no specific windows changes, we just used an older version of this file with the hope we can remove these forks when Hermes gets caught up to upstream

Copy link
Contributor Author

@Yajur-Grover Yajur-Grover Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes these changes are all from upstream - the only forked change is line 152, which already has the mentioned issue created.

@Yajur-Grover Yajur-Grover merged commit 40c1c59 into microsoft:main Dec 5, 2024
59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants