@subiz/widget-v4 4.0.58 → 4.0.59

package/compiled_src/popup/popup.js

@@ -32,7 +32,8 @@ class Popup extends _common.Com {
       cssready: false,
       closeAnimation: true,
       pressedSubmit: false,
-      imageReady: false
+      imageReady: false,
+      fontReady: false
     });
 
     this._formRef = (0, _preact.createRef)();
@@ -61,6 +62,9 @@ class Popup extends _common.Com {
         });
       });
 
+      delete fonts.undefined;
+      delete fonts.null;
+      delete fonts[''];
       if (_index.default.size(images) == 0) this.setState({
         imageReady: true
       });
@@ -70,9 +74,34 @@ class Popup extends _common.Com {
       })));
 
       _index.default.preloadWebfonts(Object.keys(fonts));
+
+      setTimeout(async () => {
+        await this.waitForFont(Object.keys(fonts));
+        this.setState({
+          fontReady: true
+        });
+      });
     });
   }
 
+  async waitForFont(fonts) {
+    if (_index.default.size(fonts) == 0) return;
+    let ready = {};
+
+    for (var t = 0; t < 10; t++) {
+      for (var i = 0; i < fonts.length; i++) {
+        try {
+          if (document.fonts.check('normal 16px ' + fonts[i])) ready[fonts[i]] = true;
+          if (Object.keys(readycount) == fonts.length) return;
+        } catch (e) {}
+      }
+
+      await _index.default.sleep(200);
+    }
+
+    return;
+  }
+
   openPopup() {
     this.setState({
       close: false
@@ -917,6 +946,7 @@ class Popup extends _common.Com {
     if (!this.props.t) return null;
     if (!this.state.cssready) return null;
     if (!this.state.imageReady) return null;
+    if (!this.state.fontReady) return null;
     if (this.state.close) return null;
 
     let popup = _index.default.get(this.props.plugin, 'popup', {});

package/compiled_src/util/common.js

@@ -981,7 +981,7 @@ function getDayName(dayOfWeek) {
 
 let loadedFonts = {};
 
-function preloadWebfonts(fonts) {
+function preloadWebfonts(fonts, done) {
   for (var i = 0; i < fonts.length; i++) {
     let font = fonts[i];
     if (!font) continue;
@@ -994,7 +994,9 @@ function preloadWebfonts(fonts) {
       node.innerHTML = '@!-/#Chào mỪng1';
       node.style.position = 'absolute';
       node.style.display = 'block';
-      node.style.fontSize = '1px';
+      node.style.opacity = '0.1';
+      node.style.color = 'transparent';
+      node.style.fontSize = '20px';
       node.style.height = '0px';
       node.style.width = '0px';
       node.style.fontWeight = weight;