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

chore(): sync with main

Browse Source
This commit is contained in:
Liam DeBeasi
2023-03-15 10:03:38 -04:00
parent f829672a6a cf2dff4692
commit 92c1da571d
38 changed files with 584 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/react/src/components/IonIcon.tsx
View File

@ -4,7 +4,7 @@ import { NavContext } from '../contexts/NavContext';
import type { IonicReactProps } from './IonicReactProps';
import { IonIconInner } from './inner-proxies';
import { createForwardRef, isPlatform } from './utils';
import { createForwardRef, getConfig } from './utils';
interface IonIconProps {
color?: string;
@ -34,12 +34,15 @@ class IonIconContainer extends React.PureComponent<InternalProps> {
}
render() {
const { icon, ios, md, ...rest } = this.props;
const { icon, ios, md, mode, ...rest } = this.props;
let iconToUse: typeof icon;
const config = getConfig();
const iconMode = mode || config?.get('mode');
if (ios || md) {
if (isPlatform('ios')) {
if (iconMode === 'ios') {
iconToUse = ios ?? md ?? icon;
} else {
iconToUse = md ?? ios ?? icon;