mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-05 21:58:20 +08:00
revert unrelated test app changes
This commit is contained in:
@ -1,16 +1,11 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
import {
|
import {
|
||||||
IonButton,
|
IonButton,
|
||||||
IonContent,
|
IonContent,
|
||||||
IonHeader,
|
|
||||||
IonPage,
|
IonPage,
|
||||||
IonModal,
|
IonModal,
|
||||||
IonPopover,
|
IonPopover,
|
||||||
IonToolbar,
|
|
||||||
IonButtons,
|
|
||||||
IonBackButton,
|
|
||||||
IonTitle,
|
|
||||||
} from '@ionic/react';
|
} from '@ionic/react';
|
||||||
import React, { useState } from 'react';
|
|
||||||
|
|
||||||
const KeepContentsMounted: React.FC = () => {
|
const KeepContentsMounted: React.FC = () => {
|
||||||
const [showModal, setShowModal] = useState(false);
|
const [showModal, setShowModal] = useState(false);
|
||||||
@ -18,14 +13,6 @@ const KeepContentsMounted: React.FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<IonPage>
|
<IonPage>
|
||||||
<IonHeader>
|
|
||||||
<IonToolbar>
|
|
||||||
<IonButtons slot="start">
|
|
||||||
<IonBackButton></IonBackButton>
|
|
||||||
</IonButtons>
|
|
||||||
<IonTitle>Keep Contents Mounted</IonTitle>
|
|
||||||
</IonToolbar>
|
|
||||||
</IonHeader>
|
|
||||||
<IonContent fullscreen>
|
<IonContent fullscreen>
|
||||||
<IonButton id="open-modal" onClick={() => setShowModal(true)}>Open Modal</IonButton>
|
<IonButton id="open-modal" onClick={() => setShowModal(true)}>Open Modal</IonButton>
|
||||||
<IonButton id="open-popover" onClick={() => setShowPopover(true)}>Open Popover</IonButton>
|
<IonButton id="open-popover" onClick={() => setShowPopover(true)}>Open Popover</IonButton>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
|
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
|
||||||
import { Route, Redirect } from 'react-router-dom';
|
import { Route, Redirect } from 'react-router';
|
||||||
import {
|
import {
|
||||||
addCircleOutline,
|
addCircleOutline,
|
||||||
alarm,
|
alarm,
|
||||||
@ -18,18 +18,20 @@ import PickerComponent from './PickerComponent';
|
|||||||
import PopoverComponent from './PopoverComponent';
|
import PopoverComponent from './PopoverComponent';
|
||||||
import ToastComponent from './ToastComponent';
|
import ToastComponent from './ToastComponent';
|
||||||
|
|
||||||
const OverlayComponents: React.FC = () => {
|
interface OverlayHooksProps {}
|
||||||
|
|
||||||
|
const OverlayHooks: React.FC<OverlayHooksProps> = () => {
|
||||||
return (
|
return (
|
||||||
<IonTabs>
|
<IonTabs>
|
||||||
<IonRouterOutlet>
|
<IonRouterOutlet>
|
||||||
<Route path="/overlay-components" render={() => <Redirect to="/overlay-components/actionsheet" />} exact={true} />
|
<Redirect from="/overlay-components" to="/overlay-components/actionsheet" exact />
|
||||||
<Route path="/overlay-components/actionsheet" component={ActionSheetComponent} exact={true} />
|
<Route path="/overlay-components/actionsheet" component={ActionSheetComponent} />
|
||||||
<Route path="/overlay-components/alert" component={AlertComponent} exact={true} />
|
<Route path="/overlay-components/alert" component={AlertComponent} />
|
||||||
<Route path="/overlay-components/loading" component={LoadingComponent} exact={true} />
|
<Route path="/overlay-components/loading" component={LoadingComponent} />
|
||||||
<Route path="/overlay-components/modal" component={ModalComponent} exact={true} />
|
<Route path="/overlay-components/modal" component={ModalComponent} />
|
||||||
<Route path="/overlay-components/picker" component={PickerComponent} exact={true} />
|
<Route path="/overlay-components/picker" component={PickerComponent} />
|
||||||
<Route path="/overlay-components/popover" component={PopoverComponent} exact={true} />
|
<Route path="/overlay-components/popover" component={PopoverComponent} />
|
||||||
<Route path="/overlay-components/toast" component={ToastComponent} exact={true} />
|
<Route path="/overlay-components/toast" component={ToastComponent} />
|
||||||
</IonRouterOutlet>
|
</IonRouterOutlet>
|
||||||
<IonTabBar slot="bottom">
|
<IonTabBar slot="bottom">
|
||||||
<IonTabButton tab="actionsheet" href="/overlay-components/actionsheet">
|
<IonTabButton tab="actionsheet" href="/overlay-components/actionsheet">
|
||||||
@ -65,4 +67,4 @@ const OverlayComponents: React.FC = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default OverlayComponents;
|
export default OverlayHooks;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
|
import { IonIcon, IonLabel, IonRouterOutlet, IonTabBar, IonTabButton, IonTabs } from '@ionic/react';
|
||||||
import { Route, Redirect } from 'react-router-dom';
|
import { Route, Redirect } from 'react-router';
|
||||||
import ActionSheetHook from './ActionSheetHook';
|
import ActionSheetHook from './ActionSheetHook';
|
||||||
import {
|
import {
|
||||||
addCircleOutline,
|
addCircleOutline,
|
||||||
@ -18,18 +18,20 @@ import PickerHook from './PickerHook';
|
|||||||
import PopoverHook from './PopoverHook';
|
import PopoverHook from './PopoverHook';
|
||||||
import ToastHook from './ToastHook';
|
import ToastHook from './ToastHook';
|
||||||
|
|
||||||
const OverlayHooks: React.FC = () => {
|
interface OverlayHooksProps {}
|
||||||
|
|
||||||
|
const OverlayHooks: React.FC<OverlayHooksProps> = () => {
|
||||||
return (
|
return (
|
||||||
<IonTabs>
|
<IonTabs>
|
||||||
<IonRouterOutlet>
|
<IonRouterOutlet>
|
||||||
<Route path="/overlay-hooks" render={() => <Redirect to="/overlay-hooks/actionsheet" />} exact={true} />
|
<Redirect from="/overlay-hooks" to="/overlay-hooks/actionsheet" exact />
|
||||||
<Route path="/overlay-hooks/actionsheet" component={ActionSheetHook} exact={true} />
|
<Route path="/overlay-hooks/actionsheet" component={ActionSheetHook} />
|
||||||
<Route path="/overlay-hooks/alert" component={AlertHook} exact={true} />
|
<Route path="/overlay-hooks/alert" component={AlertHook} />
|
||||||
<Route path="/overlay-hooks/loading" component={LoadingHook} exact={true} />
|
<Route path="/overlay-hooks/loading" component={LoadingHook} />
|
||||||
<Route path="/overlay-hooks/modal" component={ModalHook} exact={true} />
|
<Route path="/overlay-hooks/modal" component={ModalHook} />
|
||||||
<Route path="/overlay-hooks/picker" component={PickerHook} exact={true} />
|
<Route path="/overlay-hooks/picker" component={PickerHook} />
|
||||||
<Route path="/overlay-hooks/popover" component={PopoverHook} exact={true} />
|
<Route path="/overlay-hooks/popover" component={PopoverHook} />
|
||||||
<Route path="/overlay-hooks/toast" component={ToastHook} exact={true} />
|
<Route path="/overlay-hooks/toast" component={ToastHook} />
|
||||||
</IonRouterOutlet>
|
</IonRouterOutlet>
|
||||||
<IonTabBar slot="bottom">
|
<IonTabBar slot="bottom">
|
||||||
<IonTabButton tab="actionsheet" href="/overlay-hooks/actionsheet">
|
<IonTabButton tab="actionsheet" href="/overlay-hooks/actionsheet">
|
||||||
|
|||||||
Reference in New Issue
Block a user