From 3a117e49bf612bf64d18bfff4b5842a846998548 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 23 Dec 2020 12:53:43 +0100 Subject: [PATCH] MOBILE-3320 tabs: Fix navigation --- src/core/components/tabs/tabs.ts | 2 +- src/types/angular.d.ts | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/types/angular.d.ts diff --git a/src/core/components/tabs/tabs.ts b/src/core/components/tabs/tabs.ts index 8746fb366..760e93b54 100644 --- a/src/core/components/tabs/tabs.ts +++ b/src/core/components/tabs/tabs.ts @@ -588,7 +588,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe } const ok = await this.navCtrl.navigateForward(selectedTab.page, pageParams); - if (ok) { + if (ok !== false) { this.selectHistory.push(tabId); this.selected = tabId; this.selectedIndex = index; diff --git a/src/types/angular.d.ts b/src/types/angular.d.ts new file mode 100644 index 000000000..ab158dc8c --- /dev/null +++ b/src/types/angular.d.ts @@ -0,0 +1,26 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { UrlTree } from '@angular/router'; +import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; + +declare module '@ionic/angular' { + + export class NavController { + + navigateForward(url: string | UrlTree | any[], options?: NavigationOptions): Promise; + + } + +}