@@ -3,8 +3,6 @@ package com.rcttabview
33import android.content.Context
44import android.view.Choreographer
55import android.view.MenuItem
6- import android.view.View
7- import android.view.ViewGroup
86import androidx.appcompat.content.res.AppCompatResources
97import com.facebook.react.bridge.Arguments
108import com.facebook.react.bridge.WritableMap
@@ -40,16 +38,13 @@ class ReactBottomNavigationView(context: Context) : BottomNavigationView(context
4038
4139 private fun onTabSelected (item : MenuItem ) {
4240 val selectedItem = items?.first { it.title == item.title }
43- if (selectedItem == null ) {
44- return
45- }
46-
47- startAnimation()
48-
49- val event = Arguments .createMap().apply {
50- putString(" key" , selectedItem.key)
41+ selectedItem?.let {
42+ val event = Arguments .createMap().apply {
43+ putString(" key" , selectedItem.key)
44+ }
45+ onTabSelectedListener?.invoke(event)
46+ startAnimation()
5147 }
52- onTabSelectedListener?.invoke(event)
5348 }
5449
5550 // Refresh TabView children to fix issue with animations.
@@ -91,7 +86,6 @@ class ReactBottomNavigationView(context: Context) : BottomNavigationView(context
9186
9287 // Fixes issues with BottomNavigationView children layouting.
9388 private fun measureAndLayout () {
94- viewTreeObserver.dispatchOnGlobalLayout();
9589 measure(
9690 MeasureSpec .makeMeasureSpec(width, MeasureSpec .EXACTLY ),
9791 MeasureSpec .makeMeasureSpec(height, MeasureSpec .EXACTLY ))
0 commit comments