react-native-navigation 7.25.2 → 7.25.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -177,14 +177,16 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
177
177
  controllerCreator: (ButtonOptions) -> ButtonController,
178
178
  buttonBar: ButtonBar
179
179
  ) {
180
+ buttonBar.clearButtons()
180
181
  if (buttonBar.shouldAnimate)
181
182
  TransitionManager.beginDelayedTransition(buttonBar, buttonsTransition)
182
183
 
183
- buttonBar.clearButtons()
184
184
  buttons.forEachIndexed { index, it ->
185
185
  val order = index * 10
186
186
  val newController = if (btnControllers.containsKey(it.id)) {
187
- btnControllers.remove(it.id)
187
+ btnControllers.remove(it.id)?.apply {
188
+ this.mergeButtonOptions(it,buttonBar)
189
+ }
188
190
  } else {
189
191
  controllerCreator(it)
190
192
  }!!
@@ -866,7 +866,7 @@ export interface OptionsBottomTab {
866
866
  /**
867
867
  * Set the background color of the badge that is overlayed over the component
868
868
  */
869
- badgeColor?: string;
869
+ badgeColor?: Color;
870
870
  /**
871
871
  * Show the badge with the animation.
872
872
  * #### (Android specific)
@@ -950,7 +950,7 @@ export interface OptionsBottomTab {
950
950
  /**
951
951
  * Set the background color of the badge that is overlayed over the component
952
952
  */
953
- badgeColor?: string;
953
+ badgeColor?: Color;
954
954
  /**
955
955
  * Show the badge with the animation.
956
956
  * #### (Android specific)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-navigation",
3
- "version": "7.25.2",
3
+ "version": "7.25.3",
4
4
  "description": "React Native Navigation - truly native navigation for iOS and Android",
5
5
  "license": "MIT",
6
6
  "nativePackage": true,