Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/wix/react-native-navigation…
… into feature/rnnav-crash-fixes * 'master' of https://github.com/wix/react-native-navigation: (627 commits) Fix title component not being replaced via mergeOptions (wix#6066) Remove Shared Element Screen from Options screen (wix#6065) Configure scrollEdgeAppearance with opaque background (wix#6038) Update package.json version to 6.3.1 [ci skip] Always resolve dismissAllModals promise (wix#6054) Custom component reference id OptionsTopBarButton typing (wix#6053) Some work on animation config in the playground app Update changelog Update package.json version to 6.3.0 [ci skip] Resolve options from bottomTabs direct child in mergeChildOptions (wix#6050) Fix build warnings on iOS (wix#6047) Reject pop command when viewController not found in the hierarchy (wix#6048) Merge options with correct child (wix#6041) Removes unable to find UIManager module warning (wix#6043) Fix overlays touch interception on new iPads (wix#6042) Update Stack Overflow tag in readme Update changelog Added two icons to playground app Added Toast component to playground Update slow animations in playground ... # Conflicts: # CHANGELOG.md # babel.config.js # docs/docs/Installing.md # docs/docs/events.md # docs/docs/showcases.md # docs/docs/styling.md # docs/docs/topBar-buttons.md # lib/android/app/build.gradle # lib/android/app/src/main/java/com/reactnativenavigation/NavigationActivity.java # lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java # lib/android/app/src/main/java/com/reactnativenavigation/parse/TitleOptions.java # lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabPresenter.java # lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabsPresenter.java # lib/android/app/src/main/java/com/reactnativenavigation/presentation/ComponentPresenter.java # lib/android/app/src/main/java/com/reactnativenavigation/presentation/Presenter.java # lib/android/app/src/main/java/com/reactnativenavigation/presentation/SideMenuPresenter.java # lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackPresenter.java # lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java # lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java # lib/android/app/src/main/java/com/reactnativenavigation/utils/CollectionUtils.java # lib/android/app/src/main/java/com/reactnativenavigation/utils/Functions.java # lib/android/app/src/main/java/com/reactnativenavigation/utils/ImageLoader.java # lib/android/app/src/main/java/com/reactnativenavigation/utils/NoOpPromise.java # lib/android/app/src/main/java/com/reactnativenavigation/utils/ObjectUtils.java # lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ComponentViewController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/IdStack.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/TitleBarButtonController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/TitleBarReactViewController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/button/IconResolver.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/RootPresenter.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerBuilder.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/topbar/TopBarBackgroundViewController.java # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/topbar/TopBarController.java # lib/android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java # lib/android/app/src/main/java/com/reactnativenavigation/views/Component.java # lib/android/app/src/main/java/com/reactnativenavigation/views/Fab.java # lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java # lib/android/app/src/main/java/com/reactnativenavigation/views/topbar/TopBar.java # lib/android/app/src/reactNative57_5/java/com/reactnativenavigation/react/NavigationReactNativeHost.java # lib/android/app/src/reactNative57_5/java/com/reactnativenavigation/react/SyncUiImplementation.java # lib/android/app/src/test/java/com/reactnativenavigation/TestUtils.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ComponentViewControllerTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackPresenterTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/TopBarControllerTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/RootPresenterTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java # lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java # lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java # lib/ios/RNNBridgeManager.m # lib/ios/RNNBridgeModule.m # lib/ios/RNNCommandsHandler.h # lib/ios/RNNCommandsHandler.m # lib/ios/RNNControllerFactory.m # lib/ios/RNNLeafProtocol.h # lib/ios/RNNNavigationButtons.m # lib/ios/RNNNavigationController.m # lib/ios/RNNNavigationControllerPresenter.m # lib/ios/RNNNavigationStackManager.m # lib/ios/RNNRootViewController.m # lib/ios/RNNScreenTransition.h # lib/ios/RNNScreenTransition.m # lib/ios/RNNSideMenuChildVC.m # lib/ios/RNNSideMenuController.m # lib/ios/RNNTabBarController.m # lib/ios/RNNTabBarPresenter.m # lib/ios/RNNTransitionsOptions.h # lib/ios/RNNUIBarButtonItem.h # lib/ios/RNNUIBarButtonItem.m # lib/ios/RNNViewControllerPresenter.m # lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj # lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m # lib/ios/ReactNativeNavigationTests/RNNSideMenuPresenterTest.m # lib/ios/ReactNativeNavigationTests/RNNTabBarPresenterTest.m # lib/ios/UINavigationController+RNNCommands.h # lib/ios/UIViewController+RNNOptions.h # lib/ios/UIViewController+RNNOptions.m # lib/src/Navigation.ts # lib/src/adapters/Constants.ts # lib/src/adapters/NativeEventsReceiver.ts # lib/src/adapters/TouchablePreview.tsx # lib/src/adapters/UniqueIdProvider.ts # lib/src/commands/Commands.test.ts # lib/src/commands/Commands.ts # lib/src/commands/LayoutTreeCrawler.test.ts # lib/src/commands/LayoutTreeCrawler.ts # lib/src/commands/LayoutTreeParser.test.ts # lib/src/commands/LayoutTreeParser.ts # lib/src/commands/OptionsProcessor.test.ts # lib/src/commands/OptionsProcessor.ts # lib/src/components/ComponentRegistry.test.tsx # lib/src/components/ComponentWrapper.test.tsx # lib/src/components/ComponentWrapper.tsx # lib/src/components/Store.test.ts # lib/src/components/Store.ts # lib/src/events/ComponentEventsObserver.test.tsx # lib/src/events/ComponentEventsObserver.ts # lib/src/events/EventsRegistry.ts # lib/src/interfaces/Layout.ts # lib/src/interfaces/Options.ts # metro.config.js # package.json # playground/android/app/build.gradle # playground/android/app/src/main/AndroidManifest.xml # playground/android/build.gradle # playground/android/gradle.properties # playground/android/gradle/wrapper/gradle-wrapper.properties # playground/ios/NavigationTests/RNNNavigationStackManagerTest.m # playground/ios/playground.xcodeproj/project.pbxproj # playground/src/app.js # playground/src/context/index.js # playground/src/screens/BackHandlerModalScreen.js # playground/src/screens/BackHandlerScreen.js # playground/src/screens/ComplexLayout.js # playground/src/screens/ContextScreen.js # playground/src/screens/CustomDialog.js # playground/src/screens/CustomTransitionDestination.js # playground/src/screens/CustomTransitionOrigin.js # playground/src/screens/ModalScreen.js # playground/src/screens/OptionsScreen.js # playground/src/screens/PushedScreen.js # playground/src/screens/SearchScreen.js # playground/src/screens/SideMenuScreen.js # playground/src/screens/TextScreen.js # playground/src/screens/WelcomeScreen.js # playground/src/screens/complexlayouts/CustomDialogWithScroll.js # playground/src/screens/index.js # playground/src/testIDs.js # scripts/release.js # scripts/test-unit.js
- Loading branch information