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(core): type collisions with namespace (#8809)

Browse Source
This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/ui/bottom-navigation/index.android.ts
View File

@@ -2,7 +2,7 @@
import { TabContentItem } from '../tab-navigation-base/tab-content-item';
import { TabStrip } from '../tab-navigation-base/tab-strip';
import { TabStripItem } from '../tab-navigation-base/tab-strip-item';
import { TextTransform } from '../text-base';
import { Enums } from '../enums';
// Requires
import * as application from '../../application';
@@ -256,7 +256,7 @@ export class BottomNavigation extends TabNavigationBase {
private _currentTransaction: androidx.fragment.app.FragmentTransaction;
private _attachedToWindow = false;
public _originalBackground: any;
private _textTransform: TextTransform = 'none';
private _textTransform: Enums.TextTransformType = 'none';
private _selectedItemColor: Color;
private _unSelectedItemColor: Color;
@@ -623,9 +623,9 @@ export class BottomNavigation extends TabNavigationBase {
});
}
private getItemLabelTextTransform(tabStripItem: TabStripItem): TextTransform {
private getItemLabelTextTransform(tabStripItem: TabStripItem): Enums.TextTransformType {
const nestedLabel = tabStripItem.label;
let textTransform: TextTransform = null;
let textTransform: Enums.TextTransformType = null;
if (nestedLabel && nestedLabel.style.textTransform !== 'initial') {
textTransform = nestedLabel.style.textTransform;
} else if (tabStripItem.style.textTransform !== 'initial') {
@@ -872,17 +872,17 @@ export class BottomNavigation extends TabNavigationBase {
tabStripItem.nativeViewProtected.setTypeface(value.getAndroidTypeface());
}
public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: TextTransform): void {
public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: Enums.TextTransformType): void {
const titleLabel = tabStripItem.label;
const title = getTransformedText(titleLabel.text, value);
tabStripItem.nativeViewProtected.setText(title);
}
public getTabBarTextTransform(): TextTransform {
public getTabBarTextTransform(): Enums.TextTransformType {
return this._textTransform;
}
public setTabBarTextTransform(value: TextTransform): void {
public setTabBarTextTransform(value: Enums.TextTransformType): void {
const items = this.tabStrip && this.tabStrip.items;
if (items) {
items.forEach((tabStripItem) => {

6
packages/core/ui/bottom-navigation/index.ios.ts
View File

@@ -2,8 +2,8 @@
import { TabContentItem } from '../tab-navigation-base/tab-content-item';
import { TabStrip } from '../tab-navigation-base/tab-strip';
import { TabStripItem } from '../tab-navigation-base/tab-strip-item';
import { getTransformedText, TextTransform } from '../text-base';
import { getTransformedText } from '../text-base';
import { Enums } from '../enums';
// Requires
import { Color } from '../../color';
import { ImageSource } from '../../image-source';
@@ -424,7 +424,7 @@ export class BottomNavigation extends TabNavigationBase {
this.setViewAttributes(tabStripItem.nativeView, tabStripItem.label);
}
public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: TextTransform): void {
public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: Enums.TextTransformType): void {
tabStripItem.nativeView.title = getTransformedText(tabStripItem.label.text, value);
}