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

feat(tabs): add iOSAnimationEnabled property

Browse Source 
fixes #8553
This commit is contained in:
rigor789
2020-07-10 18:10:32 +02:00
parent 9834c4f887
commit 8eb98cec4e
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nativescript-core/ui/tabs/tabs-common.ts
View File

@@ -43,4 +43,7 @@ tabsPositionProperty.register(TabsBase);
export type IOSTabBarItemsAlignment = "leading" | "justified" | "center" | "centerSelected";
export const iOSTabBarItemsAlignmentProperty = new Property<TabsBase, IOSTabBarItemsAlignment>({ name: "iOSTabBarItemsAlignment", defaultValue: "justified" });
iOSTabBarItemsAlignmentProperty.register(TabsBase);
iOSTabBarItemsAlignmentProperty.register(TabsBase);
export const iOSAnimationEnabledProperty = new Property<TabsBase, boolean>({ name: "iOSAnimationEnabled", defaultValue: true, valueConverter: booleanConverter });
iOSAnimationEnabledProperty.register(TabsBase);

12
nativescript-core/ui/tabs/tabs.ios.ts
View File

@@ -463,6 +463,7 @@ export class Tabs extends TabsBase {
public _defaultItemBackgroundColor: UIColor;
private _selectedItemColor: Color;
private _unSelectedItemColor: Color;
public iOSAnimationEnabled: boolean;
constructor() {
super();
@@ -1102,7 +1103,7 @@ export class Tabs extends TabsBase {
// do not make layout changes while the animation is in progress https://stackoverflow.com/a/47031524/613113
this.visitFrames(item, frame => frame._animationInProgress = true);
this.viewController.setViewControllersDirectionAnimatedCompletion(controllers, navigationDirection, true, (finished: boolean) => {
invokeOnRunLoop( () => this.viewController.setViewControllersDirectionAnimatedCompletion(controllers, navigationDirection, this.iOSAnimationEnabled, (finished: boolean) => {
this.visitFrames(item, frame => frame._animationInProgress = false);
if (finished) {
// HACK: UIPageViewController fix; see https://stackoverflow.com/a/17330606
@@ -1112,10 +1113,10 @@ export class Tabs extends TabsBase {
this._setCanBeLoaded(value);
this._loadUnloadTabItems(value);
}
});
}));
if (this.tabBarItems && this.tabBarItems.length && this.viewController && this.viewController.tabBar) {
this.viewController.tabBar.setSelectedItemAnimated(this.tabBarItems[value], true);
this.viewController.tabBar.setSelectedItemAnimated(this.tabBarItems[value], this.iOSAnimationEnabled);
}
// TODO:
// (<any>this._ios)._willSelectViewController = this._ios.viewControllers[value];
@@ -1140,7 +1141,6 @@ export class Tabs extends TabsBase {
[tabStripProperty.getDefault](): TabStrip {
return null;
}
[tabStripProperty.setNative](value: TabStrip) {
this.setViewControllers(this.items);
selectedIndexProperty.coerce(this);
@@ -1149,7 +1149,6 @@ export class Tabs extends TabsBase {
[swipeEnabledProperty.getDefault](): boolean {
return true;
}
[swipeEnabledProperty.setNative](value: boolean) {
if (this.viewController && this.viewController.scrollView) {
this.viewController.scrollView.scrollEnabled = value;
@@ -1165,7 +1164,6 @@ export class Tabs extends TabsBase {
return <any>(alignment.charAt(0).toLowerCase() + alignment.substring(1));
}
[iOSTabBarItemsAlignmentProperty.setNative](value: IOSTabBarItemsAlignment) {
if (!this.viewController || !this.viewController.tabBar) {
return;
@@ -1219,4 +1217,4 @@ export class Tabs extends TabsBase {
this.viewController.tabBar.unselectedItemTintColor = this._unSelectedItemColor.ios;
}
}
}
}