Skip to content

Commit e4a46bf

Browse files
committed
Merge branch 'master' into feat/rn77-android-newarch
# Conflicts: # lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/RootPresenter.java # lib/ios/RNNStackPresenter.m # package.json
2 parents 23dace4 + 375636d commit e4a46bf

File tree

6 files changed

+23128
-4
lines changed

6 files changed

+23128
-4
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
dist
2-
package-lock.json
3-
yarn.lock
42
.history/
53

64
# Docusaurus

e2e/StaticLifecycleEvents.test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ describe('static lifecycle events', () => {
9393
await elementById(TestIDs.SET_ROOT_BTN).tap();
9494
await elementById(TestIDs.CLEAR_OVERLAY_EVENTS_BTN).tap();
9595
await elementById(TestIDs.SET_ROOT_BTN).tap();
96+
// This sleep is needed in order to synchronize the test rendered with state changes. We can remove it after moving
97+
// our mock to work with act(()=>{}) from react-test-renderer
98+
await sleep(10);
9699
await expect(elementByLabel('setRoot complete - previous root is unmounted')).toBeVisible();
97100
});
98101

lib/ios/RNNStackPresenter.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ - (void)mergeOptions:(RNNNavigationOptions *)mergeOptions
127127
}
128128

129129
if (mergeOptions.topBar.barStyle.hasValue) {
130-
//[stack setBarStyle:[RCTConvert UIBarStyle:mergeOptions.topBar.barStyle.get]];
130+
[stack setBarStyle:[RNNConvert UIBarStyle:mergeOptions.topBar.barStyle.get]];
131131
}
132132

133133
if (mergeOptions.topBar.background.clipToBounds.hasValue) {

0 commit comments

Comments
 (0)