[core] Restore support for [email protected]

Author: daohoangson

packages/core/lib/src/core_helpers.dart

@@ -15,7 +15,6 @@ export 'widgets/css_sizing.dart';
 export 'widgets/horizontal_margin.dart';
 export 'widgets/html_details.dart';
 export 'widgets/html_flex.dart';
-export 'widgets/html_layout_builder.dart';
 export 'widgets/html_list_item.dart';
 export 'widgets/html_list_marker.dart';
 export 'widgets/html_ruby.dart';

packages/core/lib/src/core_widget_factory.dart

@@ -233,7 +233,7 @@ class WidgetFactory extends WidgetFactoryResetter with AnchorWidgetFactory {
     TextBaseline textBaseline = TextBaseline.alphabetic,
     TextDirection textDirection = TextDirection.ltr,
   }) {
-    return HtmlLayoutBuilder(
+    return LayoutBuilder(
       builder: (_, bc) {
         Widget built = HtmlFlex(
           crossAxisAlignment: crossAxisAlignment,

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

@@ -83,7 +83,7 @@ class TagTable {
         ? tryParseCssLength(borderSpacingExpression)
         : null;
 
-    final layoutBuilder = HtmlLayoutBuilder(
+    final layoutBuilder = LayoutBuilder(
       builder: (context, bc) {
         final resolved = tableTree.inheritanceResolvers.resolve(context);
         Widget built = ValignBaselineContainer(

packages/core/lib/src/widgets/html_flex.dart

@@ -327,6 +327,26 @@ extension on MainAxisAlignment {
   }
 }
 
+double? _getChildBaseline(
+  RenderBox child,
+  BoxConstraints constraints,
+  TextBaseline baseline,
+) {
+  // TODO: use ChildLayoutHelper.getBaseline when minimum Flutter version >= 3.24
+  assert(!child.debugNeedsLayout);
+  assert(child.constraints == constraints);
+  return child.getDistanceToBaseline(baseline, onlyReal: true);
+}
+
+double? _getChildBaselineDry(
+  RenderBox child,
+  BoxConstraints constraints,
+  TextBaseline baseline,
+) {
+  // TODO: use ChildLayoutHelper.getDryBaseline when minimum Flutter version >= 3.24
+  return child.getDryBaseline(constraints, baseline);
+}
+
 class RenderHtmlFlex extends RenderBox
     with
         ContainerRenderObjectMixin<RenderBox, FlexParentData>,
@@ -544,7 +564,7 @@ class RenderHtmlFlex extends RenderBox
             ? BoxConstraints(maxWidth: extent)
             : BoxConstraints(maxHeight: extent),
         layoutChild: layoutChild,
-        getBaseline: ChildLayoutHelper.getDryBaseline,
+        getBaseline: _getChildBaselineDry,
       ).axisSize.crossAxisExtent;
     }
   }
@@ -728,7 +748,7 @@ class RenderHtmlFlex extends RenderBox
     final _LayoutSizes sizes = _computeSizes(
       constraints: constraints,
       layoutChild: ChildLayoutHelper.dryLayoutChild,
-      getBaseline: ChildLayoutHelper.getDryBaseline,
+      getBaseline: _getChildBaselineDry,
     );
 
     if (_isBaselineAligned) {
@@ -816,7 +836,7 @@ class RenderHtmlFlex extends RenderBox
     return _computeSizes(
       constraints: constraints,
       layoutChild: ChildLayoutHelper.dryLayoutChild,
-      getBaseline: ChildLayoutHelper.getDryBaseline,
+      getBaseline: _getChildBaselineDry,
     ).axisSize.toSize(direction);
   }
 
@@ -1081,7 +1101,7 @@ class RenderHtmlFlex extends RenderBox
     final _LayoutSizes sizes = _computeSizes(
       constraints: constraints,
       layoutChild: ChildLayoutHelper.layoutChild,
-      getBaseline: ChildLayoutHelper.getBaseline,
+      getBaseline: _getChildBaseline,
     );
 
     final double crossAxisExtent = sizes.axisSize.crossAxisExtent;

packages/core/lib/src/widgets/html_layout_builder.dart

@@ -1,3 +1,7 @@
+// TODO: remove lint ignore when our minimum Flutter version >= 3.19
+// ignore: unnecessary_import
+import 'dart:ui';
+
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 

packages/core/lib/src/widgets/html_list_marker.dart

@@ -1,10 +1,10 @@
 name: flutter_widget_from_html_core
-version: 0.17.0
+version: 0.16.1
 description: Flutter package to render html as widgets that focuses on correctness and extensibility.
 homepage: https://github.com/daohoangson/flutter_widget_from_html/tree/master/packages/core
 
 environment:
-  flutter: ">=3.32.0"
+  flutter: ">=3.22.0"
   sdk: ">=3.4.0 <4.0.0"
 
 dependencies:

packages/core/pubspec.yaml

@@ -1001,17 +1001,17 @@ Future<void> main() async {
         useExplainer: false,
       );
 
-      expect(disc,
-          contains('alpha: 1.0000, red: 1.0000, green: 0.0000, blue: 0.0000'));
+      const red = Color(0xffff0000);
+      expect(disc, contains(red.toString().replaceAll('ColorSpace.', '')));
 
       final circle = await explain(
         tester,
         '<ul style="color: #0f0"><li>Foo</li></ul>',
         useExplainer: false,
       );
 
-      expect(circle,
-          contains('alpha: 1.0000, red: 0.0000, green: 1.0000, blue: 0.0000'));
+      const green = Color(0xff00ff00);
+      expect(circle, contains(green.toString().replaceAll('ColorSpace.', '')));
     });
   });
 }