@formulaxjs/kity-runtime 0.3.0 → 0.4.0

package/dist/{install-TIZBWEFU.js → install-WDCVVIMM.js}

@@ -796,11 +796,9 @@ var ExpressionModule = class {
 var createExpressionClass = ExpressionModule.create;
 
 // src/vendor/kity-formula/font-installer.ts
-var MAIN_FONT_FAMILY = "KF AMS MAIN";
 var FontInstallerModule = class {
   static create(kity, FontManager, fontConfig, checkerTemplate) {
     let nodeList = [];
-    let checkerNode = null;
     return kity.createClass("FontInstaller", {
       constructor: function(doc, resource) {
         const normalized = typeof resource === "string" ? { path: resource } : resource ?? {};
@@ -810,26 +808,22 @@ var FontInstallerModule = class {
       },
       mount: function(callback) {
         const fontList = FontManager.getFontList();
+        let count = 0;
         kity.Utils.each(fontList, (fontInfo) => {
+          count += 1;
           fontInfo.meta.src = resolveFontSource(this.fonts, this.resource, fontInfo.meta.src);
           this.createFontStyle(fontInfo);
-          if (fontInfo.meta.fontFamily === MAIN_FONT_FAMILY) {
-            checkerNode = createFontCheckerNode(this.doc);
-            return;
-          }
           applyFonts(this.doc, fontInfo);
+          count -= 1;
+          if (count === 0) {
+            complete(this.doc, callback);
+          }
         });
-        complete(this.doc, callback);
       },
       createFontStyle: function(fontInfo) {
-        const styleId = createFontStyleId(fontInfo);
-        if (this.doc.getElementById(styleId)) {
-          return;
-        }
         const stylesheet = this.doc.createElement("style");
         const tpl = '@font-face{\nfont-family: "${fontFamily}";\nsrc: url("${src}");\n}';
         stylesheet.setAttribute("type", "text/css");
-        stylesheet.id = styleId;
         stylesheet.innerHTML = tpl.replace("${fontFamily}", fontInfo.meta.fontFamily).replace("${src}", fontInfo.meta.src);
         this.doc.head.appendChild(stylesheet);
       }
@@ -846,29 +840,34 @@ var FontInstallerModule = class {
       }
       return resourceBase + originalSrc;
     }
-    function createFontStyleId(fontInfo) {
-      const raw = `${fontInfo.meta.fontFamily}::${fontInfo.meta.src}`;
-      let hash = 0;
-      for (let index = 0; index < raw.length; index += 1) {
-        hash = (hash << 5) - hash + raw.charCodeAt(index) | 0;
-      }
-      return `formulax-kity-font-${Math.abs(hash).toString(36)}`;
-    }
-    function waitForFontsReady(doc) {
+    function waitForFontsReady(doc, fontList) {
       const view = doc.defaultView ?? window;
       if (view.document.fonts) {
-        return view.document.fonts.ready.then(() => void 0);
+        const fontLoadPromises = fontList.map((fontInfo) => {
+          return view.document.fonts.load(`50px "${fontInfo.meta.fontFamily}"`);
+        });
+        return Promise.all(fontLoadPromises).then(() => view.document.fonts.ready).then(() => {
+          return new Promise((resolve) => {
+            requestAnimationFrame(() => {
+              requestAnimationFrame(() => {
+                resolve();
+              });
+            });
+          });
+        });
       }
       return Promise.resolve();
     }
     function complete(doc, callback) {
       const view = doc.defaultView ?? window;
-      waitForFontsReady(doc).then(() => {
-        return waitForNextFrames(view, 2);
-      }).then(() => {
-        initFontSystemInfo(doc);
-        removeTmpNode();
-        callback();
+      const fontList = FontManager.getFontList();
+      const fontArray = Object.values(fontList);
+      waitForFontsReady(doc, fontArray).then(() => {
+        view.setTimeout(() => {
+          initFontSystemInfo(doc);
+          removeTmpNode();
+          callback();
+        }, 100);
       }).catch(() => {
         view.setTimeout(() => {
           initFontSystemInfo(doc);
@@ -889,37 +888,12 @@ var FontInstallerModule = class {
       doc.body.appendChild(node);
       nodeList.push(node);
     }
-    function createFontCheckerNode(doc) {
-      if (checkerNode) {
-        return checkerNode;
-      }
-      const node = doc.createElement("div");
-      node.style.cssText = "position: absolute; top: 0; left: -100000px;";
-      node.innerHTML = checkerTemplate.join("");
-      doc.body.appendChild(node);
-      checkerNode = node;
-      return node;
-    }
-    function waitForNextFrames(view, frameCount) {
-      if (typeof view.requestAnimationFrame !== "function") {
-        return Promise.resolve();
-      }
-      return new Promise((resolve) => {
-        const step = (remaining) => {
-          if (remaining <= 0) {
-            resolve();
-            return;
-          }
-          view.requestAnimationFrame(() => {
-            step(remaining - 1);
-          });
-        };
-        step(frameCount);
-      });
-    }
     function initFontSystemInfo(doc) {
-      const activeCheckerNode = checkerNode ?? createFontCheckerNode(doc);
-      const rectBox = activeCheckerNode.getElementsByTagName("text")[0].getBBox();
+      const tmpNode = doc.createElement("div");
+      tmpNode.style.cssText = "position: absolute; top: 0; left: -100000px;";
+      tmpNode.innerHTML = checkerTemplate.join("");
+      doc.body.appendChild(tmpNode);
+      const rectBox = tmpNode.getElementsByTagName("text")[0].getBBox();
       fontConfig.spaceHeight = rectBox.height;
       fontConfig.topSpace = -rectBox.y - fontConfig.baseline;
       fontConfig.bottomSpace = fontConfig.spaceHeight - fontConfig.topSpace - fontConfig.baseHeight;
@@ -928,8 +902,7 @@ var FontInstallerModule = class {
       fontConfig.meanlinePosition = (fontConfig.topSpace + fontConfig.meanline) / fontConfig.spaceHeight;
       fontConfig.ascenderPosition = fontConfig.topSpace / fontConfig.spaceHeight;
       fontConfig.descenderPosition = (fontConfig.topSpace + fontConfig.baseHeight) / fontConfig.spaceHeight;
-      activeCheckerNode.parentNode?.removeChild(activeCheckerNode);
-      checkerNode = null;
+      doc.body.removeChild(tmpNode);
     }
     function removeTmpNode() {
       kity.Utils.each(nodeList, (node) => {
@@ -5488,4 +5461,4 @@ export {
   install_default as default,
   installLegacyKityFormulaRuntime
 };
-//# sourceMappingURL=install-TIZBWEFU.js.map
+//# sourceMappingURL=install-WDCVVIMM.js.map