javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(bottom-navigation): current TabContentItem index not set (#7453)

Browse Source
This commit is contained in:
Alexander Djenkov
2019-07-04 10:02:17 +03:00
committed by Manol Donev
parent 97a2af27f9
commit e0fad4133b
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tns-core-modules/ui/bottom-navigation/bottom-navigation.android.ts
View File

@@ -99,7 +99,7 @@ function initializeNativeClasses() {
BottomNavigationBar = BottomNavigationBarImplementation;
}
function createTabItemSpec(item: TabContentItem, tabStripItem: TabStripItem): org.nativescript.widgets.TabItemSpec {
function createTabItemSpec(tabStripItem: TabStripItem): org.nativescript.widgets.TabItemSpec {
const result = new org.nativescript.widgets.TabItemSpec();
result.title = tabStripItem.title;
@@ -202,7 +202,7 @@ export class BottomNavigation extends TabNavigationBase {
(<any>nativeView).bottomNavigationBar = bottomNavigationBar;
setElevation(nativeView, bottomNavigationBar);
const primaryColor = ad.resources.getPaletteColor(PRIMARY_COLOR, context);
if (primaryColor) {
bottomNavigationBar.setBackgroundColor(primaryColor);
@@ -265,13 +265,13 @@ export class BottomNavigation extends TabNavigationBase {
public onLoaded(): void {
super.onLoaded();
this.setAdapterItems(this.items);
this.setTabStripItems();
}
public onUnloaded(): void {
super.onUnloaded();
this.setAdapterItems(null);
this.setTabStripItems();
}
public disposeNativeView() {
@@ -341,12 +341,12 @@ export class BottomNavigation extends TabNavigationBase {
transaction.commitNowAllowingStateLoss();
}
private setAdapterItems(items: Array<TabContentItem>) {
private setTabStripItems() {
if (this.tabStrip && this.tabStrip.items) {
const tabItems = new Array<org.nativescript.widgets.TabItemSpec>();
this.tabStrip.items.forEach((item, i, arr) => {
if (this.tabStrip.items[i]) {
const tabItemSpec = createTabItemSpec(null, this.tabStrip.items[i]);
const tabItemSpec = createTabItemSpec(this.tabStrip.items[i]);
tabItems.push(tabItemSpec);
}
});
@@ -357,6 +357,8 @@ export class BottomNavigation extends TabNavigationBase {
const tv = this._bottomNavigationBar.getTextViewForItemAt(i);
item.setNativeView(tv);
});
} else {
this._bottomNavigationBar.setItems(null);
}
}
@@ -390,6 +392,12 @@ export class BottomNavigation extends TabNavigationBase {
return null;
}
[itemsProperty.setNative](value: TabContentItem[]) {
if (value) {
value.forEach((item: TabContentItem, i) => {
(<any>item).index = i;
});
}
selectedIndexProperty.coerce(this);
}
@@ -397,7 +405,7 @@ export class BottomNavigation extends TabNavigationBase {
return null;
}
[tabStripProperty.setNative](value: TabStrip) {
this.setAdapterItems([]);
this.setTabStripItems();
}
}