Skip to content

Conversation

christophpurrer
Copy link

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

Cherry-pick a react-native@0.69 commit into the current main branch:
facebook@a1594163339

Use std::optional instead of butter::optional

Changelog

changelog: [Internal]

Test Plan

Builds with Fabric (screenshot) and without (CircleCI)

butter_nonFab

Summary: changelog: Use std::optional instead of butter::optional

Reviewed By: fkgozali

Differential Revision: D33352680

fbshipit-source-id: 45a53fec181a6ffb6218909bc23348f7c9f21ec4

# Conflicts:
#	ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
#	ReactCommon/react/renderer/components/view/ViewProps.h
#	ReactCommon/react/renderer/components/view/primitives.h
#	ReactCommon/react/renderer/components/view/propsConversions.h
#	ReactCommon/react/renderer/scheduler/Scheduler.cpp
@christophpurrer christophpurrer marked this pull request as ready for review November 15, 2022 23:43
@christophpurrer christophpurrer requested review from a team as code owners November 15, 2022 23:43
@Saadnajmi Saadnajmi merged commit c53ddac into microsoft:main Nov 16, 2022
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Nov 16, 2022
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Nov 16, 2022
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Nov 16, 2022
Saadnajmi pushed a commit that referenced this pull request Nov 16, 2022
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Jan 12, 2023
Due to an early cherry-pick from a more recent facebook/react-native version > microsoft#1498
this broke.

In microsoft#1498 I must have only build for rn-iOS + Paper.
I think we need a CircleCI job now for rn-iOS + Fabric

Here is the fix.
- std::optional's function signature is has_value()
- where as folly::Optional used hasValue()

In packages/rn-tester I ran:
```
USE_FABRIC=1 pod install
```
And then build and launched the app
Saadnajmi pushed a commit that referenced this pull request Jan 12, 2023
…ic (#1634)

Due to an early cherry-pick from a more recent facebook/react-native version > #1498
this broke.

In #1498 I must have only build for rn-iOS + Paper.
I think we need a CircleCI job now for rn-iOS + Fabric

Here is the fix.
- std::optional's function signature is has_value()
- where as folly::Optional used hasValue()

In packages/rn-tester I ran:
```
USE_FABRIC=1 pod install
```
And then build and launched the app
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Feb 13, 2023
Summary: changelog: Use std::optional instead of butter::optional

Reviewed By: fkgozali

Differential Revision: D33352680

fbshipit-source-id: 45a53fec181a6ffb6218909bc23348f7c9f21ec4

# Conflicts:
#	ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
#	ReactCommon/react/renderer/components/view/ViewProps.h
#	ReactCommon/react/renderer/components/view/primitives.h
#	ReactCommon/react/renderer/components/view/propsConversions.h
#	ReactCommon/react/renderer/scheduler/Scheduler.cpp

Co-authored-by: Samuel Susla <samuelsusla@fb.com>
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Feb 13, 2023
…ic (microsoft#1634)

Due to an early cherry-pick from a more recent facebook/react-native version > microsoft#1498
this broke.

In microsoft#1498 I must have only build for rn-iOS + Paper.
I think we need a CircleCI job now for rn-iOS + Fabric

Here is the fix.
- std::optional's function signature is has_value()
- where as folly::Optional used hasValue()

In packages/rn-tester I ran:
```
USE_FABRIC=1 pod install
```
And then build and launched the app
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Mar 10, 2023
Summary: changelog: Use std::optional instead of butter::optional

Reviewed By: fkgozali

Differential Revision: D33352680

fbshipit-source-id: 45a53fec181a6ffb6218909bc23348f7c9f21ec4

# Conflicts:
#	ReactAndroid/src/main/java/com/facebook/react/fabric/jni/viewPropConversions.h
#	ReactCommon/react/renderer/components/view/ViewProps.h
#	ReactCommon/react/renderer/components/view/primitives.h
#	ReactCommon/react/renderer/components/view/propsConversions.h
#	ReactCommon/react/renderer/scheduler/Scheduler.cpp

Co-authored-by: Samuel Susla <samuelsusla@fb.com>
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Mar 10, 2023
…ic (microsoft#1634)

Due to an early cherry-pick from a more recent facebook/react-native version > microsoft#1498
this broke.

In microsoft#1498 I must have only build for rn-iOS + Paper.
I think we need a CircleCI job now for rn-iOS + Fabric

Here is the fix.
- std::optional's function signature is has_value()
- where as folly::Optional used hasValue()

In packages/rn-tester I ran:
```
USE_FABRIC=1 pod install
```
And then build and launched the app
# Conflicts:
#	ReactCommon/react/renderer/scheduler/Scheduler.cpp
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Mar 10, 2023
…ic (microsoft#1634)

Due to an early cherry-pick from a more recent facebook/react-native version > microsoft#1498
this broke.

In microsoft#1498 I must have only build for rn-iOS + Paper.
I think we need a CircleCI job now for rn-iOS + Fabric

Here is the fix.
- std::optional's function signature is has_value()
- where as folly::Optional used hasValue()

In packages/rn-tester I ran:
```
USE_FABRIC=1 pod install
```
And then build and launched the app
# Conflicts:
#	ReactCommon/react/renderer/scheduler/Scheduler.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Todo

Development

Successfully merging this pull request may close these issues.

4 participants