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

refactor(android-tabview): tab adapter data changed event is called too many times (#5364)

Browse Source
This commit is contained in:
Martin Yankov
2018-02-05 13:52:32 +02:00
committed by GitHub
parent 925c60677f
commit f042417f10
1 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
tns-core-modules/ui/tab-view/tab-view.android.ts
View File

@@ -414,11 +414,6 @@ export class TabView extends TabViewBase {
this._viewPager = viewPager; this._viewPager = viewPager;
this._pagerAdapter = (<any>viewPager).adapter; this._pagerAdapter = (<any>viewPager).adapter;
(<any>this._pagerAdapter).owner = this; (<any>this._pagerAdapter).owner = this;
const items = this.items;
if (items) {
this.setAdapterItems(items)
}
} }
public onLoaded(): void { public onLoaded(): void {
@@ -434,9 +429,7 @@ export class TabView extends TabViewBase {
} }
public disposeNativeView() { public disposeNativeView() {
(<any>this._pagerAdapter).items = null;
this._tabLayout.setItems(null, null); this._tabLayout.setItems(null, null);
this._pagerAdapter.notifyDataSetChanged();
(<any>this._pagerAdapter).owner = null; (<any>this._pagerAdapter).owner = null;
this._pagerAdapter = null; this._pagerAdapter = null;
@@ -454,32 +447,67 @@ export class TabView extends TabViewBase {
return false; return false;
} }
private setAdapterItems(items: Array<TabViewItemDefinition>) { private shouldUpdateAdapter(items: Array<TabViewItemDefinition>) {
(<any>this._pagerAdapter).items = items; const currentPagerAdapterItems = (<any>this._pagerAdapter).items;
const length = items ? items.length : 0; // if both values are null, should not update
if (length === 0) { if (!items && !currentPagerAdapterItems) {
this._tabLayout.setItems(null, null); return false;
this._pagerAdapter.notifyDataSetChanged();
return;
} }
const tabItems = new Array<org.nativescript.widgets.TabItemSpec>(); // if one value is null, should update
items.forEach((item: TabViewItem, i, arr) => { if (!items || !currentPagerAdapterItems) {
const tabItemSpec = createTabItemSpec(item); return true;
item.index = i; }
item.tabItemSpec = tabItemSpec;
tabItems.push(tabItemSpec); // if both are Arrays but length doesn't match, should update
if (items.length !== currentPagerAdapterItems.length) {
return true;
}
const matchingItems = currentPagerAdapterItems.filter((currentItem) => {
return !!items.filter((item) => {
return item._domId === currentItem._domId
})[0];
}); });
const tabLayout = this._tabLayout; // if both are Arrays and length matches, but not all items are the same, should update
tabLayout.setItems(tabItems, this._viewPager); if (matchingItems.length !== items.length) {
items.forEach((item, i, arr) => { return true;
const tv = tabLayout.getTextViewForItemAt(i); }
item.setNativeView(tv);
});
this._pagerAdapter.notifyDataSetChanged(); // if both are Arrays and length matches and all items are the same, should not update
return false;
}
private setAdapterItems(items: Array<TabViewItemDefinition>) {
if (this.shouldUpdateAdapter(items)) {
(<any>this._pagerAdapter).items = items;
const length = items ? items.length : 0;
if (length === 0) {
this._tabLayout.setItems(null, null);
this._pagerAdapter.notifyDataSetChanged();
return;
}
const tabItems = new Array<org.nativescript.widgets.TabItemSpec>();
items.forEach((item: TabViewItem, i, arr) => {
const tabItemSpec = createTabItemSpec(item);
item.index = i;
item.tabItemSpec = tabItemSpec;
tabItems.push(tabItemSpec);
});
const tabLayout = this._tabLayout;
tabLayout.setItems(tabItems, this._viewPager);
items.forEach((item, i, arr) => {
const tv = tabLayout.getTextViewForItemAt(i);
item.setNativeView(tv);
});
this._pagerAdapter.notifyDataSetChanged();
}
} }
public updateAndroidItemAt(index: number, spec: org.nativescript.widgets.TabItemSpec) { public updateAndroidItemAt(index: number, spec: org.nativescript.widgets.TabItemSpec) {