fix(react): update icon types to be a string as well, fixes #20229 (#…

…20230)
ionic-team · Jan 17, 2020 · 1411d8a · 1411d8a
1 parent 9e35ebe
commit 1411d8a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/packages/react/src/components/IonActionSheet.tsx b/packages/react/src/components/IonActionSheet.tsx
@@ -6,7 +6,7 @@ export interface ActionSheetButton extends Omit<ActionSheetButtonCore, 'icon'> {
   icon?: {
     ios: string;
     md: string;
-  };
+  } | string;
 }
 
 export interface ActionSheetOptions extends Omit<ActionSheetOptionsCore, 'buttons'> {

diff --git a/packages/react/src/components/IonIcon.tsx b/packages/react/src/components/IonIcon.tsx
@@ -11,10 +11,10 @@ interface IonIconProps {
   ariaLabel?: string;
   color?: string;
   flipRtl?: boolean;
-  icon?: { ios: string; md: string; };
-  ios?: { ios: string; md: string; };
+  icon?: { ios: string; md: string; } | string;
+  ios?: { ios: string; md: string; } | string;
   lazy?: boolean;
-  md?: { ios: string; md: string; };
+  md?: { ios: string; md: string; } | string;
   mode?: 'ios' | 'md';
   name?: string;
   size?: string;

diff --git a/packages/react/src/components/IonToast.tsx b/packages/react/src/components/IonToast.tsx
@@ -6,7 +6,7 @@ export interface ToastButton extends Omit<ToastButtonCore, 'icon'> {
   icon?: {
     ios: string;
     md: string;
-  };
+  } | string;
 }
 
 export interface ToastOptions extends Omit<ToastOptionsCore, 'buttons'> {

diff --git a/packages/react/src/components/index.ts b/packages/react/src/components/index.ts
@@ -8,11 +8,11 @@ export * from './proxies';
 // createControllerComponent
 export { IonAlert } from './IonAlert';
 export { IonLoading } from './IonLoading';
-export { IonToast } from './IonToast';
+export * from './IonToast';
 export { IonPicker } from './IonPicker';
 
 // createOverlayComponent
-export { IonActionSheet } from './IonActionSheet';
+export * from './IonActionSheet';
 export { IonModal } from './IonModal';
 export { IonPopover } from './IonPopover';
 

diff --git a/packages/react/src/components/navigation/IonBackButton.tsx b/packages/react/src/components/navigation/IonBackButton.tsx
@@ -9,7 +9,7 @@ type Props = Omit<LocalJSX.IonBackButton, 'icon'> & IonicReactProps & {
   icon?: {
     ios: string;
     md: string;
-  };
+  } | string;
   ref?: React.RefObject<HTMLIonBackButtonElement>;
 };