Changing regular expressions to look simpler. Adding more unit tests.

Author: nturgut

lib/web_ui/lib/src/engine/text/font_collection.dart

@@ -99,9 +99,11 @@ class FontCollection {
 class FontManager {
   final List<Future<void>> _fontLoadingFutures = <Future<void>>[];
 
-  // Regular expression to detect punctuations. For example font family
-  // 'Ahem!' falls into this category.
-  static final RegExp punctuations = RegExp(r"[.,:;!`\/#\$\%\^&~\*=\-_(){}]");
+  // Regular expression to detect a string with no punctuations.
+  // For example font family 'Ahem!' does not fall into this category
+  // so the family name will be wrapped in quotes.
+  static final RegExp notPunctuation =
+      RegExp(r"[a-z0-9\s]+", caseSensitive: false);
   // Regular expression to detect tokens starting with a digit.
   // For example font family 'Goudy Bookletter 1911' falls into this
   // category.
@@ -140,8 +142,8 @@ class FontManager {
   ///
   /// In order to avoid all these browser compatibility issues this method:
   /// * Detects the family names that might cause a conflict.
-  /// * Loads it with quotes.
-  /// * Loads it again without quotes.
+  /// * Loads it with the quotes.
+  /// * Loads it again without the quotes.
   /// * For all the other family names [html.FontFace] is loaded only once.
   ///
   /// See also:
@@ -153,16 +155,13 @@ class FontManager {
     String asset,
     Map<String, String> descriptors,
   ) {
-    // Fonts names when a package dependency is added has '/' in the family
-    // names such as 'package/material_design_icons_flutter/...'
-    if (family.contains('/') ||
-        punctuations.hasMatch(family) ||
-        startWithDigit.hasMatch(family)) {
-      // Load a font family name with special chracters once here wrapped in
+    if (startWithDigit.hasMatch(family) ||
+        notPunctuation.stringMatch(family) != family) {
+      // Load a font family name with special characters once here wrapped in
       // quotes.
-      _loadFontFace("'$family'", asset, descriptors);
+      _loadFontFace('\'$family\'', asset, descriptors);
     }
-    // Load all font fonts, without quoted family names.
+    // Load all fonts, without quoted family names.
     _loadFontFace(family, asset, descriptors);
   }
 

lib/web_ui/test/text/font_collection_test.dart

@@ -37,6 +37,38 @@ void main() {
       expect(fontFamilyList.first, 'Ahem');
     });
 
+    test('Register Asset with white space in the family name', () async {
+      final String _testFontFamily = "Ahem ahem ahem";
+      final List<String> fontFamilyList = List<String>();
+
+      fontManager.registerAsset(
+          _testFontFamily, 'url($_testFontUrl)', const <String, String>{});
+      await fontManager.ensureFontsLoaded();
+      html.document.fonts
+          .forEach((html.FontFace f, html.FontFace f2, html.FontFaceSet s) {
+        fontFamilyList.add(f.family);
+      });
+
+      expect(fontFamilyList.length, equals(1));
+      expect(fontFamilyList.first, 'Ahem ahem ahem');
+    });
+
+    test('Register Asset with capital case letters', () async {
+      final String _testFontFamily = "AhEm";
+      final List<String> fontFamilyList = List<String>();
+
+      fontManager.registerAsset(
+          _testFontFamily, 'url($_testFontUrl)', const <String, String>{});
+      await fontManager.ensureFontsLoaded();
+      html.document.fonts
+          .forEach((html.FontFace f, html.FontFace f2, html.FontFaceSet s) {
+        fontFamilyList.add(f.family);
+      });
+
+      expect(fontFamilyList.length, equals(1));
+      expect(fontFamilyList.first, 'AhEm');
+    });
+
     test('Register Asset twice with special character slash', () async {
       final String _testFontFamily = '/Ahem';
       final List<String> fontFamilyList = List<String>();