Skip to content

Commit

Permalink
Fix Yoga issue (facebook/react-native#36758)
Browse files Browse the repository at this point in the history
  • Loading branch information
yangyansong-adbe committed Jun 13, 2023
1 parent e81aa0e commit afdb1bd
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ jobs:
name: Install pods
command: yarn sampleapp:ios:pod:install

- run:
name: Yoga fix
command: |
cd apps/AEPSampleApp
sed -i.bo 's/ node->getLayout()\.hadOverflow() |$/\0|/' ./node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp
cd ../../
- run:
name: Building iOS Sample App
command: yarn sampleapp:ios:build
Expand Down
1 change: 1 addition & 0 deletions apps/AEPSampleApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@react-navigation/native": "^6.0.10",
"@react-navigation/routers": "^6.1.0",
"@react-navigation/stack": "^6.2.1",
"lodash.isequal": "^4.5.0",
"react": "18.1.0",
"react-native": "0.68.5",
"react-native-gesture-handler": "^2.4.2",
Expand Down
14 changes: 11 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4345,6 +4345,7 @@ __metadata:
"@react-navigation/native": "npm:^6.0.10"
"@react-navigation/routers": "npm:^6.1.0"
"@react-navigation/stack": "npm:^6.2.1"
lodash.isequal: "npm:^4.5.0"
react: "npm:18.1.0"
react-native: "npm:0.68.5"
react-native-gesture-handler: "npm:^2.4.2"
Expand Down Expand Up @@ -6357,9 +6358,9 @@ __metadata:
linkType: hard

"electron-to-chromium@npm:^1.4.428":
version: 1.4.428
resolution: "electron-to-chromium@npm:1.4.428"
checksum: afcb4da7a31a5193e4a9cc84817644e322b8bd06ea03e7e1dff0e25b50d27207c89e00b5091430300590be9134baeab17f69f7bc7ddd31f92a4086bb50a78c9f
version: 1.4.429
resolution: "electron-to-chromium@npm:1.4.429"
checksum: 06775bec31d91c63279819693130e254c586b0d048c578f6c74d7fd1a48d8bd4374f7b463064d0be19af60516f29056b9e3822d3032f927b0238c67ed440eda6
languageName: node
linkType: hard

Expand Down Expand Up @@ -9454,6 +9455,13 @@ __metadata:
languageName: node
linkType: hard

"lodash.isequal@npm:^4.5.0":
version: 4.5.0
resolution: "lodash.isequal@npm:4.5.0"
checksum: d413585fd1dbcb6ebed6d9d98a7fe5e10cc6f653b6676a61a69185aa1f6ae5b4aac1367a632db0ee46197ee1ab6aa5b7428c1721f9b5459a3623e0cc930b9b77
languageName: node
linkType: hard

"lodash.ismatch@npm:^4.4.0":
version: 4.4.0
resolution: "lodash.ismatch@npm:4.4.0"
Expand Down

0 comments on commit afdb1bd

Please sign in to comment.