chore(): sync with main

This commit is contained in:
Liam DeBeasi
2021-12-07 14:57:29 -05:00
31 changed files with 2487 additions and 2056 deletions

View File

@ -115,9 +115,10 @@ export const IonTabBar = defineComponent({
* land on /tabs/tab1/child instead of /tabs/tab1.
*/
if (activeTab !== prevActiveTab || (prevHref !== currentRoute.pathname)) {
const search = (currentRoute.search !== undefined) ? `?${currentRoute.search}` : '';
tabs[activeTab] = {
...tabs[activeTab],
currentHref: currentRoute.pathname + (currentRoute.search || '')
currentHref: currentRoute.pathname + search
}
}