Skip to content

Commit 9e1cf88

Browse files
committed
revert unrelated test app changes
1 parent 4054c87 commit 9e1cf88

File tree

3 files changed

+26
-35
lines changed

3 files changed

+26
-35
lines changed

packages/react/test/base/src/pages/overlay-components/KeepContentsMounted.tsx

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
1+
import React, { useState } from 'react';
12
import {
23
IonButton,
34
IonContent,
4-
IonHeader,
55
IonPage,
66
IonModal,
77
IonPopover,
8-
IonToolbar,
9-
IonButtons,
10-
IonBackButton,
11-
IonTitle,
128
} from '@ionic/react';
13-
import React, { useState } from 'react';
149

1510
const KeepContentsMounted: React.FC = () => {
1611
const [showModal, setShowModal] = useState(false);
1712
const [showPopover, setShowPopover] = useState(false);
1813

1914
return (
2015
<IonPage>
21-
<IonHeader>
22-
<IonToolbar>
23-
<IonButtons slot="start">
24-
<IonBackButton></IonBackButton>
25-
</IonButtons>
26-
<IonTitle>Keep Contents Mounted</IonTitle>
27-
</IonToolbar>
28-
</IonHeader>
2916
<IonContent fullscreen>
3017
<IonButton id="open-modal" onClick={() => setShowModal(true)}>Open Modal</IonButton>
3118
<IonButton id="open-popover" onClick={() => setShowPopover(true)}>Open Popover</IonButton>

packages/react/test/base/src/pages/overlay-components/OverlayComponents.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
3-
import { Route, Redirect } from 'react-router-dom';
3+
import { Route, Redirect } from 'react-router';
44
import {
55
addCircleOutline,
66
alarm,
@@ -18,18 +18,20 @@ import PickerComponent from './PickerComponent';
1818
import PopoverComponent from './PopoverComponent';
1919
import ToastComponent from './ToastComponent';
2020

21-
const OverlayComponents: React.FC = () => {
21+
interface OverlayHooksProps {}
22+
23+
const OverlayHooks: React.FC<OverlayHooksProps> = () => {
2224
return (
2325
<IonTabs>
2426
<IonRouterOutlet>
25-
<Route path="/overlay-components" render={() => <Redirect to="/overlay-components/actionsheet" />} exact={true} />
26-
<Route path="/overlay-components/actionsheet" component={ActionSheetComponent} exact={true} />
27-
<Route path="/overlay-components/alert" component={AlertComponent} exact={true} />
28-
<Route path="/overlay-components/loading" component={LoadingComponent} exact={true} />
29-
<Route path="/overlay-components/modal" component={ModalComponent} exact={true} />
30-
<Route path="/overlay-components/picker" component={PickerComponent} exact={true} />
31-
<Route path="/overlay-components/popover" component={PopoverComponent} exact={true} />
32-
<Route path="/overlay-components/toast" component={ToastComponent} exact={true} />
27+
<Redirect from="/overlay-components" to="/overlay-components/actionsheet" exact />
28+
<Route path="/overlay-components/actionsheet" component={ActionSheetComponent} />
29+
<Route path="/overlay-components/alert" component={AlertComponent} />
30+
<Route path="/overlay-components/loading" component={LoadingComponent} />
31+
<Route path="/overlay-components/modal" component={ModalComponent} />
32+
<Route path="/overlay-components/picker" component={PickerComponent} />
33+
<Route path="/overlay-components/popover" component={PopoverComponent} />
34+
<Route path="/overlay-components/toast" component={ToastComponent} />
3335
</IonRouterOutlet>
3436
<IonTabBar slot="bottom">
3537
<IonTabButton tab="actionsheet" href="/overlay-components/actionsheet">
@@ -65,4 +67,4 @@ const OverlayComponents: React.FC = () => {
6567
);
6668
};
6769

68-
export default OverlayComponents;
70+
export default OverlayHooks;

packages/react/test/base/src/pages/overlay-hooks/OverlayHooks.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
3-
import { Route, Redirect } from 'react-router-dom';
3+
import { Route, Redirect } from 'react-router';
44
import ActionSheetHook from './ActionSheetHook';
55
import {
66
addCircleOutline,
@@ -18,18 +18,20 @@ import PickerHook from './PickerHook';
1818
import PopoverHook from './PopoverHook';
1919
import ToastHook from './ToastHook';
2020

21-
const OverlayHooks: React.FC = () => {
21+
interface OverlayHooksProps {}
22+
23+
const OverlayHooks: React.FC<OverlayHooksProps> = () => {
2224
return (
2325
<IonTabs>
2426
<IonRouterOutlet>
25-
<Route path="/overlay-hooks" render={() => <Redirect to="/overlay-hooks/actionsheet" />} exact={true} />
26-
<Route path="/overlay-hooks/actionsheet" component={ActionSheetHook} exact={true} />
27-
<Route path="/overlay-hooks/alert" component={AlertHook} exact={true} />
28-
<Route path="/overlay-hooks/loading" component={LoadingHook} exact={true} />
29-
<Route path="/overlay-hooks/modal" component={ModalHook} exact={true} />
30-
<Route path="/overlay-hooks/picker" component={PickerHook} exact={true} />
31-
<Route path="/overlay-hooks/popover" component={PopoverHook} exact={true} />
32-
<Route path="/overlay-hooks/toast" component={ToastHook} exact={true} />
27+
<Redirect from="/overlay-hooks" to="/overlay-hooks/actionsheet" exact />
28+
<Route path="/overlay-hooks/actionsheet" component={ActionSheetHook} />
29+
<Route path="/overlay-hooks/alert" component={AlertHook} />
30+
<Route path="/overlay-hooks/loading" component={LoadingHook} />
31+
<Route path="/overlay-hooks/modal" component={ModalHook} />
32+
<Route path="/overlay-hooks/picker" component={PickerHook} />
33+
<Route path="/overlay-hooks/popover" component={PopoverHook} />
34+
<Route path="/overlay-hooks/toast" component={ToastHook} />
3335
</IonRouterOutlet>
3436
<IonTabBar slot="bottom">
3537
<IonTabButton tab="actionsheet" href="/overlay-hooks/actionsheet">

0 commit comments

Comments
 (0)