Skip to content

Commit f586cb3

Browse files
committed
Merge branch 'next' into @mbert/docs-remove-enabled-root-view
2 parents 8633c21 + c48d653 commit f586cb3

44 files changed

Lines changed: 1875 additions & 230 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/basic-example/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2919,7 +2919,7 @@ SPEC CHECKSUMS:
29192919
FBLazyVector: a293a88992c4c33f0aee184acab0b64a08ff9458
29202920
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
29212921
glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
2922-
hermes-engine: db854ab6e74b584dc130d3ed0be3425726bac226
2922+
hermes-engine: eec912f8a125ae0d3ad67b2e7b81a227319aa13b
29232923
RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
29242924
RCTDeprecation: 2b70c6e3abe00396cefd8913efbf6a2db01a2b36
29252925
RCTRequired: f3540eee8094231581d40c5c6d41b0f170237a81
@@ -2993,7 +2993,7 @@ SPEC CHECKSUMS:
29932993
RNReanimated: 987d0b9af435441cc2ebc2a32ad06cafe8777d4e
29942994
RNWorklets: 12b2d7cdcb48acbdd0b324d1fa810f849089bd7b
29952995
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2996-
Yoga: 6ca93c8c13f56baeec55eb608577619b17a4d64e
2996+
Yoga: 7a9f26c70daf0b08d82ec2f862e9a8872442129e
29972997

29982998
PODFILE CHECKSUM: ecce038d8e4749ee17b7dea28be0590cdc8b4836
29992999

apps/basic-example/src/App.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Navigator from './Navigator';
77
import Text from './Text';
88
import NativeDetector from './NativeDetector';
99
import RuntimeDecoration from './RuntimeDecoration';
10+
import ContentsButton from './ContentsButton';
1011

1112
const EXAMPLES = [
1213
{
@@ -21,6 +22,10 @@ const EXAMPLES = [
2122
name: 'Native Detector',
2223
component: NativeDetector,
2324
},
25+
{
26+
name: 'Contents Button',
27+
component: ContentsButton,
28+
},
2429
];
2530

2631
const Stack = Navigator.create();

0 commit comments

Comments
 (0)