Skip to content

test(react): general navigation improvement #30602

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Aug 5, 2025
Merged

test(react): general navigation improvement #30602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4490ce5
test(react): general navigation improvement
ShaneK Aug 5, 2025
c094bbc
Update packages/react/test/base/src/pages/TabsDirectNavigation.tsx
ShaneK Aug 5, 2025
2c57e0a
test(react): fix icon page
ShaneK Aug 5, 2025
b3c3dab
test(react): add slot to IonButtons
brandyscarney Aug 5, 2025
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
2 changes: 1 addition & 1 deletion packages/react/test/base/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const App: React.FC = () => (
<IonApp>
<IonReactRouter>
<IonRouterOutlet>
<Route path="/" component={Main} />
<Route exact path="/" component={Main} />
<Route path="/overlay-hooks" component={OverlayHooks} />
<Route path="/overlay-components" component={OverlayComponents} />
<Route path="/overlay-components/nested-popover" component={IonPopoverNested} />
Expand Down
8 changes: 4 additions & 4 deletions packages/react/test/base/src/pages/Icons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { IonBackButton, IonButton, IonButtons, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonList, IonTitle, IonToolbar } from '@ionic/react';
import { IonBackButton, IonButton, IonButtons, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonList, IonTitle, IonToolbar, IonPage } from '@ionic/react';
import { heart, heartCircleOutline, logoApple, logoTwitter, personCircleOutline, star, starOutline, trash } from 'ionicons/icons';

interface IconsProps {}
Expand All @@ -14,10 +14,10 @@ const Icons: React.FC<IconsProps> = () => {
}

return (
<>
<IonPage>
<IonHeader translucent={true}>
<IonToolbar>
<IonButtons>
<IonButtons slot="start">
<IonBackButton></IonBackButton>
</IonButtons>
<IonTitle>Icons</IonTitle>
Expand Down Expand Up @@ -88,7 +88,7 @@ const Icons: React.FC<IconsProps> = () => {
</IonItem>
</IonList>
</IonContent>
</>
</IonPage>
);
};

Expand Down
2 changes: 1 addition & 1 deletion packages/react/test/base/src/pages/Inputs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const Inputs: React.FC<InputsProps> = () => {
<IonPage data-pageid="inputs">
<IonHeader translucent={true}>
<IonToolbar>
<IonButtons>
<IonButtons slot="start">
<IonBackButton></IonBackButton>
</IonButtons>
<IonTitle>Inputs</IonTitle>
Expand Down
3 changes: 3 additions & 0 deletions packages/react/test/base/src/pages/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ const Main: React.FC<MainProps> = () => {
<IonItem routerLink="/tabs-basic">
<IonLabel>Tabs with Basic Navigation</IonLabel>
</IonItem>
<IonItem routerLink="/tabs-direct-navigation">
<IonLabel>Tabs with Direct Navigation</IonLabel>
</IonItem>
<IonItem routerLink="/icons">
<IonLabel>Icons</IonLabel>
</IonItem>
Expand Down
26 changes: 14 additions & 12 deletions packages/react/test/base/src/pages/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
import React from 'react';
import { IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
import { IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs, IonPage } from '@ionic/react';
import { Route, Redirect } from 'react-router';

interface TabsProps {}

const Tabs: React.FC<TabsProps> = () => {
return (
<IonTabs>
<IonRouterOutlet>
<Redirect from="/tabs" to="/tabs/tab1" exact />
<Route path="/tabs/tab1" render={() => <IonLabel>Tab 1</IonLabel>} />
</IonRouterOutlet>
<IonTabBar slot="bottom">
<IonTabButton tab="tab1" onClick={() => window.alert('Tab was clicked')}>
<IonLabel>Click Handler</IonLabel>
</IonTabButton>
</IonTabBar>
</IonTabs>
<IonPage>
<IonTabs>
<IonRouterOutlet>
<Redirect from="/tabs" to="/tabs/tab1" exact />
<Route path="/tabs/tab1" render={() => <IonLabel>Tab 1</IonLabel>} />
</IonRouterOutlet>
<IonTabBar slot="bottom">
<IonTabButton tab="tab1" onClick={() => window.alert('Tab was clicked')}>
<IonLabel>Click Handler</IonLabel>
</IonTabButton>
</IonTabBar>
</IonTabs>
</IonPage>
);
};

Expand Down
36 changes: 19 additions & 17 deletions packages/react/test/base/src/pages/TabsBasic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { IonLabel, IonTabBar, IonTabButton, IonTabs, IonTab } from '@ionic/react';
import { IonLabel, IonTabBar, IonTabButton, IonTabs, IonTab, IonPage } from '@ionic/react';

interface TabsProps {}

Expand All @@ -13,22 +13,24 @@ const TabsBasic: React.FC<TabsProps> = () => {
};

return (
<IonTabs onIonTabsWillChange={onTabWillChange} onIonTabsDidChange={onTabDidChange}>
<IonTab tab="tab1">
<IonLabel>Tab 1 Content</IonLabel>
</IonTab>
<IonTab tab="tab2">
<IonLabel>Tab 2 Content</IonLabel>
</IonTab>
<IonTabBar slot="bottom">
<IonTabButton tab="tab1">
<IonLabel>Tab 1</IonLabel>
</IonTabButton>
<IonTabButton tab="tab2">
<IonLabel>Tab 2</IonLabel>
</IonTabButton>
</IonTabBar>
</IonTabs>
<IonPage>
<IonTabs onIonTabsWillChange={onTabWillChange} onIonTabsDidChange={onTabDidChange}>
<IonTab tab="tab1">
<IonLabel>Tab 1 Content</IonLabel>
</IonTab>
<IonTab tab="tab2">
<IonLabel>Tab 2 Content</IonLabel>
</IonTab>
<IonTabBar slot="bottom">
<IonTabButton tab="tab1">
<IonLabel>Tab 1</IonLabel>
</IonTabButton>
<IonTabButton tab="tab2">
<IonLabel>Tab 2</IonLabel>
</IonTabButton>
</IonTabBar>
</IonTabs>
</IonPage>
);
};

Expand Down
4 changes: 2 additions & 2 deletions packages/react/test/base/src/pages/TabsDirectNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const TabsDirectNavigation: React.FC = () => {
</IonTabButton>

<IonTabButton tab="library" href="/tabs-direct-navigation/library" data-testid="library-tab">
<IonIcon icon={libraryOutline}></IonIcon>
<IonIcon icon={libraryOutline}></IonIcon>
<IonLabel>Library</IonLabel>
</IonTabButton>

Expand All @@ -91,4 +91,4 @@ const TabsDirectNavigation: React.FC = () => {
);
};

export default TabsDirectNavigation;
export default TabsDirectNavigation;
6 changes: 3 additions & 3 deletions packages/react/test/base/src/pages/navigation/NavComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const PageOne = ({
<IonHeader>
<IonToolbar>
<IonTitle>Page One</IonTitle>
<IonButtons>
<IonButtons slot="start">
<IonBackButton />
</IonButtons>
</IonToolbar>
Expand Down Expand Up @@ -57,7 +57,7 @@ const PageTwo = ({ nav, ...rest }: { someValue: string; nav: React.MutableRefObj
<IonHeader>
<IonToolbar>
<IonTitle>Page Two</IonTitle>
<IonButtons>
<IonButtons slot="start">
<IonBackButton />
</IonButtons>
</IonToolbar>
Expand All @@ -84,7 +84,7 @@ const PageThree = ({ nav }: { nav: React.MutableRefObject<HTMLIonNavElement> })
<IonHeader>
<IonToolbar>
<IonTitle>Page Three</IonTitle>
<IonButtons>
<IonButtons slot="start">
<IonBackButton />
</IonButtons>
</IonToolbar>
Expand Down
3 changes: 1 addition & 2 deletions packages/react/test/base/tests/e2e/specs/components/tabs-direct-navigation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ describe('Tabs Direct Navigation', () => {
it('should update tab selection when navigating between tabs', () => {
cy.visit('/tabs-direct-navigation/home');
cy.get('[data-testid="home-tab"]').should('have.class', 'tab-selected');

cy.get('[data-testid="radio-tab"]').click();
cy.get('[data-testid="radio-tab"]').should('have.class', 'tab-selected');
cy.get('[data-testid="home-tab"]').should('not.have.class', 'tab-selected');
cy.get('[data-testid="radio-content"]').should('be.visible');
});
});
});
Loading