Remove package fwfh_text_style (#1009)

Author: daohoangson

.github/workflows/backward_compatibility.yml

@@ -90,8 +90,6 @@ jobs:
           - stable
 
     # In case one of these fails, create a new PR against the `release/*` branch
-    # and publish a new version to make sure there is a compatible version
-    # of `fwfh_text_style` for all active Flutter versions.
     name: core@${{ matrix.channel }}
     runs-on: ubuntu-latest
     continue-on-error: true

demo_app/.gitignore

@@ -32,7 +32,6 @@
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols

demo_app/pubspec.lock

@@ -316,13 +316,6 @@ packages:
       relative: true
     source: path
     version: "0.8.0+2"
-  fwfh_text_style:
-    dependency: "direct overridden"
-    description:
-      path: "../packages/fwfh_text_style"
-      relative: true
-    source: path
-    version: "2.22.8+2"
   fwfh_url_launcher:
     dependency: "direct overridden"
     description:

demo_app/pubspec.yaml

@@ -34,8 +34,6 @@ dependency_overrides:
     path: ../packages/fwfh_just_audio
   fwfh_svg:
     path: ../packages/fwfh_svg
-  fwfh_text_style:
-    path: ../packages/fwfh_text_style
   fwfh_url_launcher:
     path: ../packages/fwfh_url_launcher
   fwfh_webview:

packages/core/lib/src/core_data.dart

@@ -1,13 +1,13 @@
 import 'package:csslib/visitor.dart' as css;
 import 'package:flutter/widgets.dart';
-import 'package:fwfh_text_style/fwfh_text_style.dart';
 import 'package:html/dom.dart' as dom;
 
 import 'core_helpers.dart';
 
 part 'data/build_bits.dart';
 part 'data/css.dart';
 part 'data/image.dart';
+part 'data/normal_line_height.dart';
 part 'data/text_style.dart';
 
 /// A building element metadata.

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

@@ -0,0 +1,7 @@
+part of '../core_data.dart';
+
+class NormalLineHeight {
+  final double? value;
+
+  const NormalLineHeight(this.value);
+}

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

@@ -32,7 +32,6 @@ class TextStyleHtml {
   /// Creates the root text style.
   factory TextStyleHtml.root(Iterable<dynamic> deps, TextStyle? widgetStyle) {
     var style = _getDependency<TextStyle>(deps).merge(widgetStyle);
-    style = FwfhTextStyle.from(style);
 
     final mqd = _getDependency<MediaQueryData>(deps);
     final tsf = mqd.textScaleFactor;
@@ -42,7 +41,10 @@ class TextStyleHtml {
     }
 
     return TextStyleHtml._(
-      deps: deps,
+      deps: [
+        ...deps,
+        NormalLineHeight(style.height),
+      ],
       style: style,
       textDirection: _getDependency<TextDirection>(deps),
       whitespace: CssWhitespace.normal,

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

@@ -80,8 +80,8 @@ class TextStyleOps {
         }
 
         if (height == -1) {
-          // ignore: avoid_redundant_argument_values
-          return p.copyWith(style: p.style.copyWith(height: null));
+          final normal = p.getDependency<NormalLineHeight>();
+          return p.copyWith(style: p.style.copyWith(height: normal.value));
         }
 
         return p.copyWith(style: p.style.copyWith(height: height));

packages/core/pubspec.yaml

@@ -11,13 +11,8 @@ dependencies:
   csslib: ">=0.17.0 <2.0.0"
   flutter:
     sdk: flutter
-  fwfh_text_style: ^2.22.08+1
   html: ^0.15.0
 
-dependency_overrides:
-  fwfh_text_style:
-    path: ../fwfh_text_style
-
 dev_dependencies:
   flutter_test:
     sdk: flutter

packages/core/test/_.dart

@@ -29,6 +29,7 @@ Future<String> explain(
   WidgetTester tester,
   String? html, {
   String? Function(Explainer, Widget)? explainer,
+  double? height,
   Widget? hw,
   GlobalKey? key,
   bool rtl = false,
@@ -61,6 +62,7 @@ Future<String> explain(
                     color: kColor,
                     fontSize: 10.0,
                     fontWeight: FontWeight.normal,
+                    height: height,
                   ),
               child: Directionality(
                 textDirection: rtl ? TextDirection.rtl : TextDirection.ltr,