Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(react): supporting ios and md props on icons (#20170)
- Loading branch information
Showing
4 changed files
with
88 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
import React from 'react'; | ||
|
||
import { NavContext } from '../contexts/NavContext'; | ||
|
||
import { IonicReactProps } from './IonicReactProps'; | ||
import { IonIconInner } from './inner-proxies'; | ||
import { createForwardRef, isPlatform } from './utils'; | ||
import { deprecationWarning } from './utils/dev'; | ||
|
||
interface IonIconProps { | ||
ariaLabel?: string; | ||
color?: string; | ||
flipRtl?: boolean; | ||
icon?: { ios: string; md: string; }; | ||
ios?: { ios: string; md: string; }; | ||
lazy?: boolean; | ||
md?: { ios: string; md: string; }; | ||
mode?: 'ios' | 'md'; | ||
name?: string; | ||
size?: string; | ||
src?: string; | ||
} | ||
|
||
type InternalProps = IonIconProps & { | ||
forwardedRef?: React.RefObject<HTMLIonIconElement>; | ||
}; | ||
|
||
class IonIconContainer extends React.PureComponent<InternalProps> { | ||
|
||
constructor(props: InternalProps) { | ||
super(props); | ||
if (this.props.name) { | ||
deprecationWarning('icon-name', 'In Ionic React, you import icons from "ionicons/icons" and set the icon you imported to the "icon" property. Setting the "name" property has no effect.'); | ||
} | ||
} | ||
|
||
setIcon() { | ||
const { icon, ios, md } = this.props; | ||
if (ios || md) { | ||
if (isPlatform('ios')) { | ||
this.setState({ | ||
icon: ios ?? md ?? icon | ||
}); | ||
} else if (isPlatform('android')) { | ||
this.setState({ | ||
icon: md ?? ios ?? icon | ||
}); | ||
} | ||
} else { | ||
this.setState({ | ||
icon | ||
}); | ||
} | ||
} | ||
|
||
render() { | ||
const { icon, ios, md, ...rest } = this.props; | ||
|
||
let iconToUse: typeof icon; | ||
|
||
if (ios || md) { | ||
if (isPlatform('ios')) { | ||
iconToUse = ios ?? md ?? icon; | ||
} else if (isPlatform('android')) { | ||
iconToUse = md ?? ios ?? icon; | ||
} | ||
} else { | ||
iconToUse = icon; | ||
} | ||
|
||
return ( | ||
<IonIconInner ref={this.props.forwardedRef} icon={iconToUse} {...rest}> | ||
{this.props.children} | ||
</IonIconInner> | ||
); | ||
} | ||
|
||
static get contextType() { | ||
return NavContext; | ||
} | ||
} | ||
|
||
export const IonIcon = createForwardRef<IonIconProps & IonicReactProps, HTMLIonIconElement>(IonIconContainer, 'IonIcon'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,11 @@ | ||
import { JSX } from '@ionic/core'; | ||
import { JSX as IoniconsJSX } from 'ionicons'; | ||
|
||
import { /*@__PURE__*/ createReactComponent } from './createComponent'; | ||
|
||
export const IonTabBarInner = /*@__PURE__*/createReactComponent<JSX.IonTabBar, HTMLIonTabBarElement>('ion-tab-bar'); | ||
export const IonBackButtonInner = /*@__PURE__*/createReactComponent<Omit<JSX.IonBackButton, 'icon'>, HTMLIonBackButtonElement>('ion-back-button'); | ||
export const IonRouterOutletInner = /*@__PURE__*/createReactComponent<JSX.IonRouterOutlet, HTMLIonRouterOutletElement>('ion-router-outlet'); | ||
|
||
// ionicons | ||
export const IonIconInner = /*@__PURE__*/createReactComponent<IoniconsJSX.IonIcon, HTMLIonIconElement>('ion-icon'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters