@galacean/effects-threejs 1.4.2 → 1.4.4

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.4.2
+ * Version: v1.4.4
  */
 
 'use strict';
@@ -704,6 +704,18 @@ function asserts(condition, msg) {
     }
 }
 
+/**
+ * 判断是否为可解析的字体
+ * - 首字母不能为数字或 `.`
+ * - 不能包含特殊字符，`_-` 是被允许的
+ * @param fontFamily - 字体名称
+ * @returns
+ */
+function isValidFontFamily(fontFamily) {
+    // iOS 11/12 不支持自定义字体开头为数字的名称，特殊字符也有风险
+    return /^[^\d.][\w-]*$/.test(fontFamily);
+}
+
 /*!
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
@@ -20398,7 +20410,8 @@ var TextItem = /** @class */ (function (_super) {
      * @returns
      */
     TextItem.prototype.setFontFamily = function (value) {
-        if (this.textStyle.fontFamily === value) {
+        if (this.textStyle.fontFamily === value && !isValidFontFamily(value)) {
+            console.warn('The font is either the current font or an risky font family.');
             return;
         }
         this.textStyle.fontFamily = value;
@@ -24228,11 +24241,15 @@ var AssetManager = /** @class */ (function () {
                         switch (_b.label) {
                             case 0:
                                 if (!(font.fontURL && !AssetManager.fonts.has(font.fontFamily))) return [3 /*break*/, 4];
-                                url = new URL(font.fontURL, this.baseUrl).href;
-                                fontFace = new FontFace((_a = font.fontFamily) !== null && _a !== void 0 ? _a : '', 'url(' + url + ')');
+                                if (!isValidFontFamily(font.fontFamily)) {
+                                    // 在所有设备上提醒开发者
+                                    console.warn("Risky font family: ".concat(font.fontFamily));
+                                }
                                 _b.label = 1;
                             case 1:
                                 _b.trys.push([1, 3, , 4]);
+                                url = new URL(font.fontURL, this.baseUrl).href;
+                                fontFace = new FontFace((_a = font.fontFamily) !== null && _a !== void 0 ? _a : '', 'url(' + url + ')');
                                 return [4 /*yield*/, fontFace.load()];
                             case 2:
                                 _b.sent();
@@ -24242,7 +24259,7 @@ var AssetManager = /** @class */ (function () {
                                 return [3 /*break*/, 4];
                             case 3:
                                 _b.sent();
-                                logger.warn("Invalid fonts source: ".concat(JSON.stringify(url)));
+                                logger.warn("Invalid font family or font source: ".concat(JSON.stringify(font.fontURL)));
                                 return [3 /*break*/, 4];
                             case 4: return [2 /*return*/];
                         }
@@ -27401,7 +27418,7 @@ Geometry.create = function (engine, options) {
 Mesh.create = function (engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "1.4.2";
+var version = "1.4.4";
 logger.info('THREEJS plugin version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -27599,6 +27616,7 @@ exports.isSimulatorCellPhone = isSimulatorCellPhone;
 exports.isString = isString;
 exports.isUniformStruct = isUniformStruct;
 exports.isUniformStructArray = isUniformStructArray;
+exports.isValidFontFamily = isValidFontFamily;
 exports.isWebGL2 = isWebGL2;
 exports.itemFrag = itemFrag;
 exports.itemFrameFrag = itemFrameFrag;