fix(react): icons with MD set should work in browser (#20463)

ionic-team · Feb 14, 2020 · 82670fe · 82670fe
1 parent c0aadd6
commit 82670fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/packages/react/src/components/IonIcon.tsx b/packages/react/src/components/IonIcon.tsx
@@ -34,25 +34,6 @@ class IonIconContainer extends React.PureComponent<InternalProps> {
     }
   }
 
-  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;
 
@@ -61,7 +42,7 @@ class IonIconContainer extends React.PureComponent<InternalProps> {
     if (ios || md) {
       if (isPlatform('ios')) {
         iconToUse = ios ?? md ?? icon;
-      } else if (isPlatform('android')) {
+      } else {
         iconToUse = md ?? ios ?? icon;
       }
     } else {

diff --git a/packages/react/tslint.json b/packages/react/tslint.json
@@ -28,6 +28,7 @@
     "jsx-no-multiline-js": false,
     "jsx-wrap-multiline": false,
     "no-empty-interface": false,
-    "no-unbound-method": false
+    "no-unbound-method": false,
+    "prefer-conditional-expression": false
   }
 }