fix(bottom-navigation): crash when tab selected with no item (#7527)

ADjenkov · ADjenkov · commit 2e2589829d31 · 2019-07-24T16:30:41.000+03:00
diff --git a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/BottomNavigationBar.java b/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/BottomNavigationBar.java
@@ -216,8 +216,9 @@ private void setupItem(LinearLayout ll, TextView textView,ImageView imgView, Tab
         lp.weight = 1;
     }
 
-    public void onTap(int position) {
+    public boolean onTap(int position) {
         // to be overridden in JS
+        return true;
     }
 
     public void onSelectedPositionChange(int position, int prevPosition) {
@@ -269,8 +270,9 @@ private class TabClickListener implements OnClickListener {
         public void onClick(View v) {
              for (int i = 0; i < mTabStrip.getChildCount(); i++) {
                  if (v == mTabStrip.getChildAt(i)) {
-                     onTap(i);
-                     setSelectedPosition(i);
+                     if (onTap(i)) {
+                         setSelectedPosition(i);
+                     }
                      return;
                  }
              }
diff --git a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabLayout.java b/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabLayout.java
@@ -301,8 +301,9 @@ private void setupItem(LinearLayout ll, TextView textView,ImageView imgView, Tab
         }
     }
 
-    public void onTap(int position) {
+    public boolean onTap(int position) {
         // to be overridden in JS
+        return true;
     }
 
     public void onSelectedPositionChange(int position, int prevPosition) {
@@ -429,8 +430,9 @@ private class TabClickListener implements OnClickListener {
         public void onClick(View v) {
             for (int i = 0; i < mTabStrip.getChildCount(); i++) {
                 if (v == mTabStrip.getChildAt(i)) {
-                    onTap(i);
-                    mViewPager.setCurrentItem(i);
+                    if (onTap(i)) {
+                        mViewPager.setCurrentItem(i);
+                    }
                     return;
                 }
             }
diff --git a/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts b/tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
@@ -118,17 +118,23 @@ function initializeNativeClasses() {
             owner.selectedIndex = position;
         }
 
-        public onTap(position: number): void {
+        public onTap(position: number): boolean {
             const owner = this.owner;
             if (!owner) {
-                return;
+                return false;
             }
 
             const tabStripItems = owner.tabStrip && owner.tabStrip.items;
 
             if (position >= 0 && tabStripItems[position]) {
                 tabStripItems[position]._emit(TabStripItem.tapEvent);
             }
+
+            if (!owner.items[position]) {
+                return false;
+            }
+
+            return true;
         }
     }
 
diff --git a/tns-core-modules/ui/tabs/tabs.android.ts b/tns-core-modules/ui/tabs/tabs.android.ts
@@ -259,17 +259,23 @@ function initializeNativeClasses() {
             }
         }
 
-        public onTap(position: number): void {
+        public onTap(position: number): boolean {
             const owner = this.owner;
             if (!owner) {
-                return;
+                return false;
             }
 
             const tabStripItems = owner.tabStrip && owner.tabStrip.items;
 
             if (position >= 0 && tabStripItems[position]) {
                 tabStripItems[position]._emit(TabStripItem.tapEvent);
             }
+
+            if (!owner.items[position]) {
+                return false;
+            }
+
+            return true;
         }
     }
 
diff --git a/tns-platform-declarations/android/org.nativescript.widgets.d.ts b/tns-platform-declarations/android/org.nativescript.widgets.d.ts
@@ -410,7 +410,7 @@
                 setTabTextFontSize(fontSize: number): void;
                 getTabTextFontSize(): number;
 
-                onTap(position: number): void;
+                onTap(position: number): boolean;
                 onSelectedPositionChange(position: number, prevPosition: number): void ;
                 setSelectedPosition(position: number): void;
                 setItems(items: Array<TabItemSpec>): void;

Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,9 @@ private void setupItem(LinearLayout ll, TextView textView,ImageView imgView, Tab`
`216`	`216`	`lp.weight = 1;`
`217`	`217`	`}`
`218`	`218`
`219`		`- public void onTap(int position) {`
	`219`	`+ public boolean onTap(int position) {`
`220`	`220`	`// to be overridden in JS`
	`221`	`+ return true;`
`221`	`222`	`}`
`222`	`223`
`223`	`224`	`public void onSelectedPositionChange(int position, int prevPosition) {`
`@@ -269,8 +270,9 @@ private class TabClickListener implements OnClickListener {`
`269`	`270`	`public void onClick(View v) {`
`270`	`271`	`for (int i = 0; i < mTabStrip.getChildCount(); i++) {`
`271`	`272`	`if (v == mTabStrip.getChildAt(i)) {`
`272`		`- onTap(i);`
`273`		`- setSelectedPosition(i);`
	`273`	`+ if (onTap(i)) {`
	`274`	`+ setSelectedPosition(i);`
	`275`	`+ }`
`274`	`276`	`return;`
`275`	`277`	`}`
`276`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,9 @@ private void setupItem(LinearLayout ll, TextView textView,ImageView imgView, Tab`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`
`304`		`- public void onTap(int position) {`
	`304`	`+ public boolean onTap(int position) {`
`305`	`305`	`// to be overridden in JS`
	`306`	`+ return true;`
`306`	`307`	`}`
`307`	`308`
`308`	`309`	`public void onSelectedPositionChange(int position, int prevPosition) {`
`@@ -429,8 +430,9 @@ private class TabClickListener implements OnClickListener {`
`429`	`430`	`public void onClick(View v) {`
`430`	`431`	`for (int i = 0; i < mTabStrip.getChildCount(); i++) {`
`431`	`432`	`if (v == mTabStrip.getChildAt(i)) {`
`432`		`- onTap(i);`
`433`		`- mViewPager.setCurrentItem(i);`
	`433`	`+ if (onTap(i)) {`
	`434`	`+ mViewPager.setCurrentItem(i);`
	`435`	`+ }`
`434`	`436`	`return;`
`435`	`437`	`}`
`436`	`438`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,17 +118,23 @@ function initializeNativeClasses() {`
`118`	`118`	`owner.selectedIndex = position;`
`119`	`119`	`}`
`120`	`120`
`121`		`- public onTap(position: number): void {`
	`121`	`+ public onTap(position: number): boolean {`
`122`	`122`	`const owner = this.owner;`
`123`	`123`	`if (!owner) {`
`124`		`- return;`
	`124`	`+ return false;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`const tabStripItems = owner.tabStrip && owner.tabStrip.items;`
`128`	`128`
`129`	`129`	`if (position >= 0 && tabStripItems[position]) {`
`130`	`130`	`tabStripItems[position]._emit(TabStripItem.tapEvent);`
`131`	`131`	`}`
	`132`	`+`
	`133`	`+ if (!owner.items[position]) {`
	`134`	`+ return false;`
	`135`	`+ }`
	`136`	`+`
	`137`	`+ return true;`
`132`	`138`	`}`
`133`	`139`	`}`
`134`	`140`
Original file line number	Diff line number	Diff line change
`@@ -259,17 +259,23 @@ function initializeNativeClasses() {`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`
`262`		`- public onTap(position: number): void {`
	`262`	`+ public onTap(position: number): boolean {`
`263`	`263`	`const owner = this.owner;`
`264`	`264`	`if (!owner) {`
`265`		`- return;`
	`265`	`+ return false;`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`const tabStripItems = owner.tabStrip && owner.tabStrip.items;`
`269`	`269`
`270`	`270`	`if (position >= 0 && tabStripItems[position]) {`
`271`	`271`	`tabStripItems[position]._emit(TabStripItem.tapEvent);`
`272`	`272`	`}`
	`273`	`+`
	`274`	`+ if (!owner.items[position]) {`
	`275`	`+ return false;`
	`276`	`+ }`
	`277`	`+`
	`278`	`+ return true;`
`273`	`279`	`}`
`274`	`280`	`}`
`275`	`281`