Remove BuildTree.apply, restore optional second param for HtmlStyleBuilder.enqueue

Author: daohoangson

packages/core/lib/src/core_widget_factory.dart

@@ -609,7 +609,7 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
       case kTagA:
         if (attrs.containsKey(kAttributeAHref)) {
           tree
-            ..apply<BuildContext?>(TagA.defaultColor, null)
+            ..styleBuilder.enqueue<BuildContext?>(TagA.defaultColor)
             ..register(_tagA ??= TagA(this).buildOp);
         }
 
@@ -672,14 +672,16 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
 
       case 'b':
       case 'strong':
-        tree.apply(TextStyleOps.fontWeight, FontWeight.bold);
+        tree.styleBuilder.enqueue(TextStyleOps.fontWeight, FontWeight.bold);
         break;
 
       case 'big':
-        tree.apply(TextStyleOps.fontSizeTerm, kCssFontSizeLarger);
+        tree.styleBuilder
+            .enqueue(TextStyleOps.fontSizeTerm, kCssFontSizeLarger);
         break;
       case 'small':
-        tree.apply(TextStyleOps.fontSizeTerm, kCssFontSizeSmaller);
+        tree.styleBuilder
+            .enqueue(TextStyleOps.fontSizeTerm, kCssFontSizeSmaller);
         break;
 
       case kTagBr:
@@ -701,14 +703,14 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
       case 'em':
       case 'i':
       case 'var':
-        tree.apply(TextStyleOps.fontStyle, FontStyle.italic);
+        tree.styleBuilder.enqueue(TextStyleOps.fontStyle, FontStyle.italic);
         break;
 
       case kTagCode:
       case kTagKbd:
       case kTagSamp:
       case kTagTt:
-        tree.apply(
+        tree.styleBuilder.enqueue(
           TextStyleOps.fontFamily,
           const [kTagCodeFont1, kTagCodeFont2],
         );
@@ -985,26 +987,26 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
       case kCssColor:
         final color = tryParseColor(style.value);
         if (color != null) {
-          tree.apply(TextStyleOps.color, color);
+          tree.styleBuilder.enqueue(TextStyleOps.color, color);
         }
         break;
 
       case kCssDirection:
         final term = style.term;
         if (term != null) {
-          tree.apply(TextStyleOps.textDirection, term);
+          tree.styleBuilder.enqueue(TextStyleOps.textDirection, term);
         }
         break;
 
       case kCssFontFamily:
         final list = TextStyleOps.fontFamilyTryParse(style.values);
-        tree.apply(TextStyleOps.fontFamily, list);
+        tree.styleBuilder.enqueue(TextStyleOps.fontFamily, list);
         break;
 
       case kCssFontSize:
         final value = style.value;
         if (value != null) {
-          tree.apply(TextStyleOps.fontSize, value);
+          tree.styleBuilder.enqueue(TextStyleOps.fontSize, value);
         }
         break;
 
@@ -1013,7 +1015,7 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
         final fontStyle =
             term != null ? TextStyleOps.fontStyleTryParse(term) : null;
         if (fontStyle != null) {
-          tree.apply(TextStyleOps.fontStyle, fontStyle);
+          tree.styleBuilder.enqueue(TextStyleOps.fontStyle, fontStyle);
         }
         break;
 
@@ -1022,7 +1024,7 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
         final fontWeight =
             value != null ? TextStyleOps.fontWeightTryParse(value) : null;
         if (fontWeight != null) {
-          tree.apply(TextStyleOps.fontWeight, fontWeight);
+          tree.styleBuilder.enqueue(TextStyleOps.fontWeight, fontWeight);
         }
         break;
 
@@ -1038,7 +1040,7 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
       case kCssLineHeight:
         final value = style.value;
         if (value != null) {
-          tree.apply(
+          tree.styleBuilder.enqueue(
             _styleBuilderLineHeight ??= TextStyleOps.lineHeight(this),
             value,
           );
@@ -1082,7 +1084,7 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
         final whitespace =
             term != null ? TextStyleOps.whitespaceTryParse(term) : null;
         if (whitespace != null) {
-          tree.apply(TextStyleOps.whitespace, whitespace);
+          tree.styleBuilder.enqueue(TextStyleOps.whitespace, whitespace);
         }
         break;
     }

packages/core/lib/src/data/build_bits.dart

@@ -200,13 +200,6 @@ abstract class BuildTree extends BuildBit {
   @Deprecated('Use .getStyle instead.')
   css.Declaration? operator [](String key) => getStyle(key);
 
-  /// {@macro flutter_widget_from_html.enqueue}
-  void apply<T>(
-    HtmlStyle Function(HtmlStyle style, T input) callback,
-    T input,
-  ) =>
-      styleBuilder.enqueue(callback, input);
-
   /// Appends [bit].
   ///
   /// See also: [prepend].

packages/core/lib/src/data/html_style.dart

@@ -89,17 +89,15 @@ class HtmlStyleBuilder {
 
   HtmlStyleBuilder([this.parent, this._queue]);
 
-  /// {@template flutter_widget_from_html.enqueue}
   /// Enqueues an HTML styling callback.
   ///
   /// The callback will receive the current [HtmlStyle] being built.
   /// As a special case, declare `T=BuildContext?` to receive the [BuildContext].
-  /// {@endtemplate}
   void enqueue<T>(
-    HtmlStyle Function(HtmlStyle style, T input) callback,
-    T input,
-  ) {
-    final item = _HtmlStyleCallback(callback, input);
+    HtmlStyle Function(HtmlStyle style, T input) callback, [
+    T? input,
+  ]) {
+    final item = _HtmlStyleCallback(callback, input as T);
     final queue = _queue ??= [];
     queue.add(item);
   }

packages/core/lib/src/internal/ops/style_background.dart

@@ -27,7 +27,7 @@ class StyleBackground {
             return;
           }
 
-          tree.apply(_color, color);
+          tree.styleBuilder.enqueue(_color, color);
         },
         priority: BoxModel.background,
       );

packages/core/lib/src/internal/ops/style_text_align.dart

@@ -29,7 +29,7 @@ extension StyleTextAlign on WidgetFactory {
   static BuildTree _onParsed(BuildTree tree) {
     final textAlign = tree.textAlignData.textAlign;
     if (textAlign != null) {
-      tree.apply(_textAlign, textAlign);
+      tree.styleBuilder.enqueue(_textAlign, textAlign);
     }
     return tree;
   }

packages/core/lib/src/internal/ops/style_text_decoration.dart

@@ -17,7 +17,7 @@ void textDecorationApply(BuildTree tree, css.Declaration style) {
         style.property == kCssTextDecorationLine) {
       final line = TextDecorationLine.tryParse(value);
       if (line != null) {
-        tree.apply(textDecorationLine, line);
+        tree.styleBuilder.enqueue(textDecorationLine, line);
         continue;
       }
     }
@@ -26,7 +26,7 @@ void textDecorationApply(BuildTree tree, css.Declaration style) {
         style.property == kCssTextDecorationStyle) {
       final tds = tryParseTextDecorationStyle(value);
       if (tds != null) {
-        tree.apply(textDecorationStyle, tds);
+        tree.styleBuilder.enqueue(textDecorationStyle, tds);
         continue;
       }
     }
@@ -35,7 +35,7 @@ void textDecorationApply(BuildTree tree, css.Declaration style) {
         style.property == kCssTextDecorationColor) {
       final color = tryParseColor(value);
       if (color != null) {
-        tree.apply(textDecorationColor, color);
+        tree.styleBuilder.enqueue(textDecorationColor, color);
         continue;
       }
     }
@@ -45,7 +45,8 @@ void textDecorationApply(BuildTree tree, css.Declaration style) {
         style.property == kCssTextDecorationWidth) {
       final length = tryParseCssLength(value);
       if (length != null && length.unit == CssLengthUnit.percentage) {
-        tree.apply(textDecorationThickness, length.number / 100.0);
+        tree.styleBuilder
+            .enqueue(textDecorationThickness, length.number / 100.0);
         continue;
       }
     }

packages/core/lib/src/internal/ops/tag_a.dart

@@ -27,7 +27,7 @@ class TagA {
             return tree;
           }
 
-          return tree..apply(_builder, recognizer);
+          return tree..styleBuilder.enqueue(_builder, recognizer);
         },
         priority: Priority.tagA,
       );

packages/core/lib/src/internal/ops/tag_li.dart

@@ -71,7 +71,7 @@ class TagLi {
   ) {
     final tree = itemTree.sub()
       ..maxLines = 1
-      ..apply(TextStyleOps.whitespace, CssWhitespace.nowrap);
+      ..styleBuilder.enqueue(TextStyleOps.whitespace, CssWhitespace.nowrap);
     final listData = listTree.listData;
     final listStyleType = itemTree.itemStyleType ?? listTree.listStyleType;
     final index = listData.markerReversed

packages/core/lib/src/internal/ops/tag_ruby.dart

@@ -32,7 +32,7 @@ extension TagRuby on WidgetFactory {
         );
         break;
       case kTagRt:
-        subTree.apply(TextStyleOps.fontSizeEm, .5);
+        subTree.styleBuilder.enqueue(TextStyleOps.fontSizeEm, .5);
         break;
     }
   }

packages/core/test/src/data/build_bits_test.dart

@@ -316,7 +316,7 @@ class _BuildBitWidgetFactory extends WidgetFactory {
     }
 
     if (classes.contains('custom')) {
-      tree.apply((style, _) => style.copyWith(), null);
+      tree.styleBuilder.enqueue((style, _) => style.copyWith(), null);
     }
 
     super.parse(tree);