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(android): tap-trip-item title disappearing

Browse Source
This commit is contained in:
vakrilov
2020-02-05 15:51:22 +02:00
parent 9d5bddb56b
commit cb8cea820d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
View File

@@ -705,7 +705,10 @@ export class BottomNavigation extends TabNavigationBase {
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize); if (value.fontSize) {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize);
}
tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface()); tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());
} }

6
nativescript-core/ui/tab-navigation-base/tab-strip-item/tab-strip-item.ts
View File

@@ -127,7 +127,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
const parent = <TabStrip>this.parent; const parent = <TabStrip>this.parent;
const tabStripParent = parent && <TabNavigationBase>parent.parent; const tabStripParent = parent && <TabNavigationBase>parent.parent;
return tabStripParent && (<any>tabStripParent).setTabBarIconColor(this, args.value); return tabStripParent && tabStripParent.setTabBarIconColor(this, args.value);
}); });
this.image.style.on("colorChange", this._imageColorHandler); this.image.style.on("colorChange", this._imageColorHandler);
@@ -135,7 +135,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
const parent = <TabStrip>this.parent; const parent = <TabStrip>this.parent;
const tabStripParent = parent && <TabNavigationBase>parent.parent; const tabStripParent = parent && <TabNavigationBase>parent.parent;
return tabStripParent && (<any>tabStripParent).setTabBarIconColor(this, args.value); return tabStripParent && tabStripParent.setTabBarIconColor(this, args.value);
}); });
this.image.style.on("fontInternalChange", this._imageFontHandler); this.image.style.on("fontInternalChange", this._imageFontHandler);
@@ -143,7 +143,7 @@ export class TabStripItem extends View implements TabStripItemDefinition, AddChi
const parent = <TabStrip>this.parent; const parent = <TabStrip>this.parent;
const tabStripParent = parent && <TabNavigationBase>parent.parent; const tabStripParent = parent && <TabNavigationBase>parent.parent;
return tabStripParent && (<any>tabStripParent).setTabBarIconColor(this, args.value); return tabStripParent && tabStripParent.setTabBarIconColor(this, args.value);
}); });
this.image.on("srcChange", this._imageSrcHandler); this.image.on("srcChange", this._imageSrcHandler);
} }

4
nativescript-core/ui/tabs/tabs.android.ts
View File

@@ -819,7 +819,9 @@ export class Tabs extends TabsBase {
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize); if (value.fontSize) {
tabStripItem.nativeViewProtected.setTextSize(value.fontSize);
}
tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface()); tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());
} }