From 159cc3332a195144a6acf458d56038091c2fb1a7 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Wed, 10 Jan 2018 12:08:08 -0600 Subject: [PATCH] refactor(tabs): don't deselect previous tab if it's the same as current tab --- packages/core/src/components/tabs/tabs.tsx | 9 +-------- .../src/components/tabs/test/vanilla/index.html | 17 ++++------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/core/src/components/tabs/tabs.tsx b/packages/core/src/components/tabs/tabs.tsx index d1821efc0d..fcbd53b157 100644 --- a/packages/core/src/components/tabs/tabs.tsx +++ b/packages/core/src/components/tabs/tabs.tsx @@ -98,18 +98,11 @@ export class Tabs { } selectedTab.selected = true; - // The same selected was selected - // we need to set root in the nested ion-nav if it exist - /*if (this.selectedTab === selectedTab) { - return selectedTab.goToRoot(); - } - */ - const leavingTab = this.selectedTab; this.selectedTab = selectedTab; let promise = selectedTab.setActive(true); - if (leavingTab) { + if (leavingTab && leavingTab !== selectedTab) { promise = promise.then(() => leavingTab.setActive(false)); } diff --git a/packages/core/src/components/tabs/test/vanilla/index.html b/packages/core/src/components/tabs/test/vanilla/index.html index ff653cf6a5..92321b7643 100644 --- a/packages/core/src/components/tabs/test/vanilla/index.html +++ b/packages/core/src/components/tabs/test/vanilla/index.html @@ -11,16 +11,13 @@ - -
Div One
+ +
Div One
 - -
Div Two
+ +
Div Two
 - - -
Div Three