Merge pull request raxjs#184 from junmer/master

fix(rax-icon): multi codePoints
junmer · May 1, 2020 · c640483 · c640483
2 parents a933417 + da07001
commit c640483
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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.0",
+  "version": "1.3.1-beta.1",
   "description": "icon component for Rax.",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",

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
@@ -50,12 +50,12 @@ Component({
             family: fontFamily,
             source: "url('" + uri + "')"
           });
-          this.setData({
-            styleSheet: {...style, fontFamily}
-          });
         } else if (fontFile !== uri) {
           console.error(`font-family ${fontFamily} should be unique!`);
         }
+        this.setData({
+          styleSheet: {...style, fontFamily}
+        });
       }
     },
     onTap(e) {