javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-16 18:17:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(react): fixing type of icon in ToastOptions, ActionSheetOptions, fixes #20100

Browse Source
This commit is contained in:
Ely Lucas
2019-12-17 10:42:15 -07:00
parent 4bc3dc73c1
commit 432887b410
3 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/components/toast/readme.md
View File

@ -117,6 +117,7 @@ async function presentToastWithOptions() {
```tsx ```tsx
import React, { useState } from 'react'; import React, { useState } from 'react';
import { IonToast, IonContent, IonButton } from '@ionic/react'; import { IonToast, IonContent, IonButton } from '@ionic/react';
import { star } from 'ionicons/icons';
export const ToastExample: React.FC = () => { export const ToastExample: React.FC = () => {
const [showToast1, setShowToast1] = useState(false); const [showToast1, setShowToast1] = useState(false);
@ -141,7 +142,7 @@ export const ToastExample: React.FC = () => {
buttons={[ buttons={[
{ {
side: 'start', side: 'start',
icon: 'star', icon: star,
text: 'Favorite', text: 'Favorite',
handler: () => { handler: () => {
console.log('Favorite clicked'); console.log('Favorite clicked');

19
packages/react/src/components/IonActionSheet.tsx
View File

@ -1,5 +1,22 @@
import { ActionSheetOptions, actionSheetController } from '@ionic/core'; import { ActionSheetButton as ActionSheetButtonCore, ActionSheetOptions as ActionSheetOptionsCore, actionSheetController as actionSheetControllerCore } from '@ionic/core';
import { createOverlayComponent } from './createOverlayComponent'; import { createOverlayComponent } from './createOverlayComponent';
export interface ActionSheetButton extends Omit<ActionSheetButtonCore, 'icon'> {
icon?: {
ios: string;
md: string;
};
}
export interface ActionSheetOptions extends Omit<ActionSheetOptionsCore, 'buttons'> {
buttons?: (ActionSheetButton | string)[];
}
const actionSheetController = {
create: (options: ActionSheetOptions) => actionSheetControllerCore.create(options as any),
dismiss: (data?: any, role?: string | undefined, id?: string | undefined) => actionSheetControllerCore.dismiss(data, role, id),
getTop: () => actionSheetControllerCore.getTop()
};
export const IonActionSheet = /*@__PURE__*/createOverlayComponent<ActionSheetOptions, HTMLIonActionSheetElement>('IonActionSheet', actionSheetController); export const IonActionSheet = /*@__PURE__*/createOverlayComponent<ActionSheetOptions, HTMLIonActionSheetElement>('IonActionSheet', actionSheetController);

19
packages/react/src/components/IonToast.tsx
View File

@ -1,5 +1,22 @@
import { ToastOptions, toastController } from '@ionic/core'; import { ToastButton as ToastButtonCore, ToastOptions as ToastOptionsCore, toastController as toastControllerCore } from '@ionic/core';
import { createControllerComponent } from './createControllerComponent'; import { createControllerComponent } from './createControllerComponent';
export interface ToastButton extends Omit<ToastButtonCore, 'icon'> {
icon?: {
ios: string;
md: string;
};
}
export interface ToastOptions extends Omit<ToastOptionsCore, 'buttons'> {
buttons?: (ToastButton | string)[];
}
const toastController = {
create: (options: ToastOptions) => toastControllerCore.create(options as any),
dismiss: (data?: any, role?: string | undefined, id?: string | undefined) => toastControllerCore.dismiss(data, role, id),
getTop: () => toastControllerCore.getTop()
};
export const IonToast = /*@__PURE__*/createControllerComponent<ToastOptions, HTMLIonToastElement>('IonToast', toastController); export const IonToast = /*@__PURE__*/createControllerComponent<ToastOptions, HTMLIonToastElement>('IonToast', toastController);