Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(react, vue): add default value for navManager on tabs #29865

Merged
merged 7 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/react/src/components/navigation/IonTabBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,10 @@ class IonTabBarUnwrapped extends React.PureComponent<InternalProps, IonTabBarSta
if (this.props.onIonTabsDidChange) {
this.props.onIonTabsDidChange(new CustomEvent('ionTabDidChange', { detail: { tab: e.detail.tab } }));
}
this.setActiveTabOnContext(e.detail.tab);
this.context.changeTab(e.detail.tab, currentHref, e.detail.routeOptions);
if (this.props.routerOutletRef?.current) {
this.setActiveTabOnContext(e.detail.tab);
this.context.changeTab(e.detail.tab, currentHref, e.detail.routeOptions);
}
}
}

Expand Down
23 changes: 13 additions & 10 deletions packages/vue/src/components/IonTabBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const IonTabBar = defineComponent({
};
},
updated() {
this.setupTabState(inject("navManager"));
this.setupTabState(inject("navManager", null));
},
methods: {
setupTabState(ionRouter: any) {
Expand Down Expand Up @@ -127,13 +127,13 @@ export const IonTabBar = defineComponent({
*/
checkActiveTab(ionRouter: any) {
const hasRouterOutlet = this.$props._hasRouterOutlet;
const currentRoute = ionRouter.getCurrentRouteInfo();
const currentRoute = ionRouter?.getCurrentRouteInfo();
const childNodes = this.$data.tabVnodes;
const { tabs, activeTab: prevActiveTab } = this.$data.tabState;
const tabKeys = Object.keys(tabs);
let activeTab = tabKeys.find((key) => {
const href = tabs[key].originalHref;
return currentRoute.pathname.startsWith(href);
return currentRoute?.pathname.startsWith(href);
});

/**
Expand Down Expand Up @@ -170,17 +170,20 @@ export const IonTabBar = defineComponent({
* If we went to tab2 then back to tab1, we should
* land on /tabs/tab1/child instead of /tabs/tab1.
*/
if (activeTab !== prevActiveTab || prevHref !== currentRoute.pathname) {
if (
activeTab !== prevActiveTab ||
prevHref !== currentRoute?.pathname
) {
/**
* By default the search is `undefined` in Ionic Vue,
* but Vue Router can set the search to the empty string.
* We check for truthy here because empty string is falsy
* and currentRoute.search cannot ever be a boolean.
*/
const search = currentRoute.search ? `?${currentRoute.search}` : "";
const search = currentRoute?.search ? `?${currentRoute.search}` : "";
tabs[activeTab] = {
...tabs[activeTab],
currentHref: currentRoute.pathname + search,
currentHref: currentRoute?.pathname + search,
};
}

Expand All @@ -189,7 +192,7 @@ export const IonTabBar = defineComponent({
* set the previous tab back to its original href.
*/
if (
currentRoute.routerAction === "pop" &&
currentRoute?.routerAction === "pop" &&
activeTab !== prevActiveTab
) {
tabs[prevActiveTab] = {
Expand Down Expand Up @@ -226,7 +229,7 @@ export const IonTabBar = defineComponent({
if (activeChild) {
tabDidChange && this.$props._tabsWillChange(activeTab);

if (hasRouterOutlet && ionRouter) {
if (hasRouterOutlet && ionRouter !== null) {
ionRouter.handleSetCurrentTab(activeTab);
}

Expand All @@ -246,11 +249,11 @@ export const IonTabBar = defineComponent({
},
},
mounted() {
const ionRouter: any = inject("navManager");
const ionRouter: any = inject("navManager", null);

this.setupTabState(ionRouter);

ionRouter.registerHistoryChangeListener(() =>
ionRouter?.registerHistoryChangeListener(() =>
this.checkActiveTab(ionRouter)
);
},
Expand Down
14 changes: 8 additions & 6 deletions packages/vue/src/components/IonTabButton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const IonTabButton = /*@__PURE__*/ defineComponent({
defineCustomElement();

// TODO(FW-2969): type
const ionRouter: any = inject("navManager");
const ionRouter: any = inject("navManager", null);
const onClick = (ev: Event) => {
if (ev.cancelable) {
ev.preventDefault();
Expand Down Expand Up @@ -72,12 +72,14 @@ export const IonTabButton = /*@__PURE__*/ defineComponent({
* should direct users back to the root
* of the tab.
*/
if (prevActiveTab === tab) {
if (originalHref !== currentHref) {
ionRouter.resetTab(tab);
if (ionRouter !== null) {
if (prevActiveTab === tab) {
if (originalHref !== currentHref) {
ionRouter.resetTab(tab);
}
} else {
ionRouter.changeTab(tab, currentHref);
}
} else {
ionRouter.changeTab(tab, currentHref);
}
};
return () => {
Expand Down
Loading