Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow reset topBar.title.color when color isn't provided #5910

Merged
merged 6 commits into from
Feb 9, 2020

Conversation

yogevbd
Copy link
Collaborator

@yogevbd yogevbd commented Feb 6, 2020

Closes #5900

@yogevbd yogevbd changed the title Allow topBar.title.color reset when color isn't provided Allow reset topBar.title.color when color isn't provided Feb 6, 2020
guyca
guyca previously approved these changes Feb 9, 2020
@guyca guyca changed the base branch from master to v5 February 9, 2020 09:38
@guyca guyca dismissed their stale review February 9, 2020 09:39

The base branch was changed.

@guyca guyca changed the base branch from v5 to master February 9, 2020 09:39
@yogevbd yogevbd merged commit 115d5b8 into master Feb 9, 2020
yogevbd added a commit that referenced this pull request Feb 9, 2020
* Allow topBar.title.color reset when color isn't provided

* Reset to nil color

* Merge topBar options with default

* Fix topBar options merging

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>
jinshin1013 pushed a commit to jinshin1013/react-native-navigation that referenced this pull request Feb 24, 2020
* Allow topBar.title.color reset when color isn't provided

* Reset to nil color

* Merge topBar options with default

* Fix topBar options merging

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>
yogevbd added a commit that referenced this pull request Feb 24, 2020
* [iOS] Added componentName to be passed to modalDismissedEvent

* Added componentName to the ModalDismissedEvent type.

* Updated the JS test.

* Updated the Playground Podfile.lock.

* Updated the doc.

* Fixed dismissedMultipleModals not having a name.

* Made componentName optional for ModalDismissedEvent.

* Initial Android implementation

* Revert Android e2e emulator name

* Revert iOS Podfile

* Podfile

* Setting OCMock to 3.4.3

* Fixed the documentation.

* Fixed requested changes

* Updated the doc.

* Now emitting componentName for dismissAllModals event.

* Retriggering build

* Revert

* Move all topBar.title options to topBarTitlePresenter (#5883)

Fix TopBar title animation. This commit changes how RNN handles title and subtitle.
Until now, RNN created a custom view for title and subtitle which interfered with the way the system animated the TopBar title.
With this commit the custom view is created only when both subtitle and title are declared, otherwise RNN uses the system behavior.

* make dotIndicator to respect visible value (#5884)

In Android dotIndicator with initial value of visible: false is not respected and the dot appears in any case.

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>

* Update default value for fontsize in navigation title and subtitle (#5868)

Co-authored-by: Yogev Ben David <yogevbd@wix.com>

* v0.62 Support (#5795)

react native 0.62 Support

* Fix bottomTab merging options with default (#5885)

When updating bottomTab options with mergeOptions - default options were not taken into account and therefore were not applied to the newly created tabBarItem

* Update package.json version to 4.6.1 [ci skip]

* Update package.json version to 4.7.0 [ci skip]

* Fix external components layout

* Move selectTabOnPress prop to correct interface (#5894)

* Update changelog

* External components fixes (#5896)

* Fix external components layout

* Fix external component navigationItem options resolving

* f

* Update package.json version to 4.7.1 [ci skip]

* Official Gradle Wrapper Validation Action (#5901)

See: https://github.com/gradle/wrapper-validation-action

* temporarily disable workflows

* Support react-native-youtube (#5903)

react-native-youtubte is a popular library which wraps the native youtube library. The native lib attempts to detect if the player is hidden behind other views in order to prevent developers from playing videos in the background.
Since the overlay container was always attached to hierarchy, the library stopped playback as it mistakingly detected the player was used in the background.

This commit simply attaches the overlay container only when needed so as long as no overlays are displayed, the lib can be used.

* apply extendedLayoutIncludesOpaqueBars true on all viewControllers (#5906)

* Update package.json version to 4.8.0 [ci skip]

* Fix overlays touch interception on new iPads (#5908)

* Fix NPE when showing Overlay (#5909)

Co-authored-by: Yogev Ben David <yogevbd@wix.com>

* Update package.json version to 4.8.1 [ci skip]

* Update changelog

* Allow reset topBar.title.color when color isn't provided (#5910)

* Allow topBar.title.color reset when color isn't provided

* Reset to nil color

* Merge topBar options with default

* Fix topBar options merging

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>

* Update package.json version to 4.8.2 [ci skip]

* Update package.json version to 4.8.3 [ci skip]

* Fix wallaby (#5917)

* Fix wallaby

* Add coverage on tsx files

* Update lib/src/commands/OptionsProcessor.test.ts

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>

* Fix topBar options merging with default (#5918)

* Add missing function

* Update package.json version to 4.8.4 [ci skip]

* Update changelog

* v5 (#5931)

Merge v5 into master

Highlights of this release
* Easier installation
* autolink and reac-native link support
* Shared Element Transition - reimplemented from scratch and new API
* [iOS] showModal animation api parity
* [Android] Animation values are now declared in dp
* [iOS] deprecate topBar.drawBehind
* [Android] RNN is migrating to Kotlin

closes #5904

* Update package.json version to 5.0.0 [ci skip]

* Adapt installation guide to v5

* Update installation guide

Forgot to add Kotlin plugin

* Fix compilation issue when using react native 0.62

Fixes #5933

* Update package.json version to 5.0.1 [ci skip]

* Add deprecateDrawBehind option (#5934)

* Add deprecateDrawBehind option

* Apply draw behind options when deprecateDrawBehind equals false

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>

* [v5][docs][showcases] starter kit (#5936)

Hey! I have updated RNN version to the latest one (5.0.1 by the time)
Hope someone will find it useful 🤩

* Add window.backgroundColor option (#5942)

* Update package.json version to 5.1.0 [ci skip]

* Fix crash when mergeOptions were called before stack view was created (#5945)

Co-authored-by: Yogev Ben David <yogevbd@wix.com>

* Apply extendedLayoutIncludesOpaqueBars true on all viewControllers

* Update package.json version to 5.1.1 [ci skip]

* Update Android alert

* Fix custom push animations (#5947)

Custom push animations broke after refactoring Shared Element Transition.
Fixes #5943

* Layout background color (#5946)

* Apply layout.backgroundColor on parent view controllers

* Add layout.componentBackgroundColor

* Remove drawBehind deprecation

* Update package.json version to 6.0.0 [ci skip]

* Update changelog

* Fix applying drawBehind through mergeOptions (#5951)

mergeOptions did not handle bottomTabs.drawBehind options properly - the ReactRootView wasn't remeasured.

* Update package.json version to 6.0.1 [ci skip]

* Add slide animation to playground app

* [iOS] Added componentName to be passed to modalDismissedEvent

* Added componentName to the ModalDismissedEvent type.

* Updated the JS test.

* Updated the Playground Podfile.lock.

* Updated the doc.

* Fixed dismissedMultipleModals not having a name.

* Made componentName optional for ModalDismissedEvent.

* Initial Android implementation

* Revert Android e2e emulator name

* Revert iOS Podfile

* Podfile

* Setting OCMock to 3.4.3

* Fixed the documentation.

* Fixed requested changes

* Updated the doc.

* Now emitting componentName for dismissAllModals event.

* Retriggering build

* Revert

* Fix dismissedMultipleModals componentName

* Undo OCMock hard version

* Updated Podfile

Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>
Co-authored-by: Yogev Ben David <yogevbd@wix.com>
Co-authored-by: Ioannis Tsampoulatidis <tsampoulatidis@gmail.com>
Co-authored-by: Mary Jenel <myersjenel@gmail.com>
Co-authored-by: Jason Safaiyeh <safaiyeh@protonmail.com>
Co-authored-by: wixmobile <41264282+wixmobile@users.noreply.github.com>
Co-authored-by: Roberto Tatasciore <tatasciorecont@gmail.com>
Co-authored-by: Jonathan Leitschuh <jonathan.leitschuh@gmail.com>
Co-authored-by: ʙ ᴀ ᴛ ʀ <kanzitdinov@gmail.com>
anushnair pushed a commit to anushnair/react-native-navigation that referenced this pull request Mar 26, 2020
…nto feature/rnnav-crash-fix-v5

* 'v5' of https://github.com/wix/react-native-navigation: (681 commits)
  f
  Update package.json version to 5.0.0-alpha.14 [ci skip]
  Fix status bar style on iOS 13
  Detach Component view from Component root view
  Update package.json version to 5.0.0-alpha.13 [ci skip]
  Fix unit tests
  Use CATransform3D
  Support anchor transition
  shared text animation fix
  Refactor sharedElement animator
  Fix status bar styles, Closes wix#5446
  Fix topBar options merging with default (wix#5918)
  Update package.json version to 5.0.0-alpha.11 [ci skip]
  Show warning when passing drawBehind false in default options
  Fix import syntax
  Allow reset topBar.title.color when color isn't provided (wix#5910)
  FIx e2e
  Fix e2e
  Fix e2e
  Add Platform prop to Button in Playground app
  ...

# 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/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/RNNTabBarPresenterTest.m
#	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/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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

V4: top bar title color is not reverting back when pop screen
2 participants