Skip to content

Commit

Permalink
chore: add patch to support xcode 14.3 (#1023)
Browse files Browse the repository at this point in the history
Signed-off-by: Jason C. Leach <[email protected]>
  • Loading branch information
jleach authored Apr 5, 2023
1 parent dd67953 commit 3bf6574
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Select Xcode version
run: sudo xcode-select -s '/Applications/Xcode_14.2.app/Contents/Developer'

- name: Pull & update submodules recursively
run: |
git submodule update --init --recursive
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ aries-bifold/
app/ios/Pods/*
!app/ios/Pods/Frameworks

# ?
app/patches/*.patch
!app/patches/@aries-framework*.patch
# This patch must be dynamically generated by something
# so its excluded.
app/patches/react-native-gifted-chat*.patch

# xcode
xcuserdata/
Expand Down
13 changes: 13 additions & 0 deletions app/patches/react-native+0.66.5.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp b/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp
index 2c68674..ea95e40 100644
--- a/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp
@@ -2229,7 +2229,7 @@ static float YGDistributeFreeSpaceSecondPass(
depth,
generationCount);
node->setLayoutHadOverflow(
- node->getLayout().hadOverflow() |
+ node->getLayout().hadOverflow() ||
currentRelativeChild->getLayout().hadOverflow());
}
return deltaFreeSpace;

0 comments on commit 3bf6574

Please sign in to comment.