Merge pull request raxjs#185 from raxjs/icon-beta

fix: rax-icon multi code points
junmer · May 18, 2020 · fa000b0 · fa000b0
2 parents 2f0bf3e + 41440d1
commit fa000b0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/packages/rax-icon/package.json b/packages/rax-icon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rax-icon",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "icon component for Rax.",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",

diff --git a/packages/rax-icon/src/index.tsx b/packages/rax-icon/src/index.tsx
@@ -38,7 +38,7 @@ if (isWeex) {
 const fontCache = new Map();
 const Icon = forwardRef<HTMLSpanElement | HTMLImageElement, IconProps>(
   ({ source: { uri, codePoint }, fontFamily, style = {}, ...rest }, ref) => {
-    if (uri && !codePoint) {
+    if (uri && !codePoint && !fontFamily) {
       return <Image {...rest} source={{ uri }} style={style} />;
     }
     const fontFile = fontCache.get(fontFamily);

diff --git a/packages/rax-icon/src/miniapp-wechat/index.ts b/packages/rax-icon/src/miniapp-wechat/index.ts
@@ -65,12 +65,12 @@ Component({
               family: fontFamily,
               source: "url('" + uri + "')"
             });
-            this.setData({
-              style: `font-family: ${fontFamily};${style}`
-            });
           } else if (fontFile !== uri) {
             console.error(`font-family ${fontFamily} should be unique!`);
           }
+          this.setData({
+            style: `font-family: ${fontFamily};${style}`
+          });
         }
       }
     },

diff --git a/packages/rax-icon/src/miniapp/index.ts b/packages/rax-icon/src/miniapp/index.ts
@@ -5,8 +5,7 @@ const noop = () => {};
 Component({
   data: {
     styleSheet: '',
-    isImage: false,
-    fontCache: new Map()
+    isImage: false
   },
   // @ts-ignore
   props: {
@@ -43,19 +42,14 @@ Component({
           styleSheet: style
         });
       } else {
-        const fontFile = this.data.fontCache.get(fontFamily);
-        if (!fontFile) {
-          this.data.fontCache.set(fontFamily, uri);
-          my.loadFontFace({
-            family: fontFamily,
-            source: "url('" + uri + "')"
-          });
-          this.setData({
-            styleSheet: {...style, fontFamily}
-          });
-        } else if (fontFile !== uri) {
-          console.error(`font-family ${fontFamily} should be unique!`);
-        }
+        // loadFontFace only work for current page
+        my.loadFontFace({
+          family: fontFamily,
+          source: "url('" + uri + "')"
+        });
+        this.setData({
+          styleSheet: {...style, fontFamily}
+        });
       }
     },
     onTap(e) {