Merge remote-tracking branch 'origin/master' into next

daohoangson · daohoangson · commit 2b48b5de9d54 · 2023-10-12T21:39:37.000+07:00
diff --git a/.github/workflows/backward_compatibility.yml b/.github/workflows/backward_compatibility.yml
@@ -34,7 +34,7 @@ jobs:
     env:
       GOLDEN_SKIP: "yes"
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Update pubspec.yaml
         run: |
           set -e
@@ -76,7 +76,7 @@ jobs:
           cat pubspec.yaml
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
       - run: flutter test
@@ -99,7 +99,7 @@ jobs:
     env:
       GOLDEN_SKIP: "yes"
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Update pubspec.yaml
         run: |
           set -e
@@ -112,7 +112,7 @@ jobs:
           # output for debugging
           cat pubspec.yaml
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           channel: ${{ matrix.channel }}
       - run: flutter test
diff --git a/.github/workflows/demo_app.yml b/.github/workflows/demo_app.yml
@@ -11,13 +11,13 @@ jobs:
       name: vercel
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           cache: true
       - name: Gradle cache
-        uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
+        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
 
       - name: Run flutter build apk --debug
         run: |
diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
@@ -16,11 +16,11 @@ jobs:
     name: Unit test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0
         if: github.base_ref
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           cache: true
       - run: dart format --set-exit-if-changed --output none .
@@ -43,13 +43,13 @@ jobs:
     name: Integration test (Android)
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           cache: true
       - name: Gradle cache
-        uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
+        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
         with:
           # only update gradle cache from demo_app.yml jobs
           cache-read-only: false
@@ -90,9 +90,9 @@ jobs:
     name: Integration test (iOS)
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           cache: true
 
diff --git a/.github/workflows/flutter_beta.yml b/.github/workflows/flutter_beta.yml
@@ -17,9 +17,9 @@ jobs:
     env:
       GOLDEN_SKIP: "yes"
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           channel: beta
       - run: ./tool/test.sh --coverage
diff --git a/.github/workflows/flutter_master.yml b/.github/workflows/flutter_master.yml
@@ -17,9 +17,9 @@ jobs:
     env:
       GOLDEN_SKIP: "yes"
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - name: Setup Flutter
-        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
+        uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
         with:
           channel: master
       - run: ./tool/test.sh
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -16,15 +16,15 @@ jobs:
       id-token: write
       security-events: write
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-      - uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
         with:
           results_file: results.sarif
           results_format: sarif
           publish_results: true
       - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           path: results.sarif
-      - uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+      - uses: github/codeql-action/upload-sarif@d90b8d79de6dc1f58e83a1499aa58d6c93dc28de # v2.22.2
         with:
           sarif_file: results.sarif
diff --git a/demo_app/android/build.gradle b/demo_app/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -55,6 +55,10 @@ Major breaking changes if you have custom rendering:
 - Removed: BuildMetadata, RebuildTriggers
 - Changed: BuildBit, WidgetPlaceholder
 
+## 0.10.6
+
+- Fix border 0 is still being rendered (#1045)
+
 ## 0.10.5
 
 - Replace the deprecated `DecoderCallback` in tests (#1014)
diff --git a/packages/core/lib/src/data/css.dart b/packages/core/lib/src/data/css.dart
@@ -42,13 +42,13 @@ class CssBorder {
 
   /// Returns `true` if all sides are unset, all radius are zero.
   bool get isNoOp =>
-      (_all == null || _all == CssBorderSide.none) &&
-      (_bottom == null || _bottom == CssBorderSide.none) &&
-      (_inlineEnd == null || _inlineEnd == CssBorderSide.none) &&
-      (_inlineStart == null || _inlineStart == CssBorderSide.none) &&
-      (_left == null || _left == CssBorderSide.none) &&
-      (_right == null || _right == CssBorderSide.none) &&
-      (_top == null || _top == CssBorderSide.none) &&
+      (_all?.isNoOp != false) &&
+      (_bottom?.isNoOp != false) &&
+      (_inlineEnd?.isNoOp != false) &&
+      (_inlineStart?.isNoOp != false) &&
+      (_left?.isNoOp != false) &&
+      (_right?.isNoOp != false) &&
+      (_top?.isNoOp != false) &&
       radiusBottomLeft == CssRadius.zero &&
       radiusBottomRight == CssRadius.zero &&
       radiusTopLeft == CssRadius.zero &&
@@ -193,27 +193,51 @@ class CssBorderSide {
   /// A border that is not rendered.
   static const none = CssBorderSide();
 
-  BorderSide? _getValue(HtmlStyle style) => identical(this, none)
-      ? null
-      : BorderSide(
-          color: color ?? style.textStyle.color ?? const BorderSide().color,
-          // TODO: add proper support for other border styles
-          style: this.style != null ? BorderStyle.solid : BorderStyle.none,
-          // TODO: look for official document regarding this default value
-          // WebKit & Blink seem to follow the same (hidden?) specs
-          width: width?.getValue(style) ?? 1.0,
-        );
+  /// Returns `true` if either [style] or [width] is invalid.
+  ///
+  /// Border will use the default text color so [color] is not required.
+  bool get isNoOp => style == null || width?.isPositive != true;
+
+  BorderSide? _getValue(HtmlStyle style) {
+    if (identical(this, none)) {
+      return null;
+    }
 
-  static CssBorderSide? _copyWith(CssBorderSide? base, CssBorderSide? value) =>
-      base == null || value == none
-          ? value
-          : value == null
-              ? base
-              : CssBorderSide(
-                  color: value.color ?? base.color,
-                  style: value.style ?? base.style,
-                  width: value.width ?? base.width,
-                );
+    final scopedColor = color ?? style.textStyle.color;
+    if (scopedColor == null) {
+      return null;
+    }
+
+    final scopedWidth = width?.getValue(style);
+    if (scopedWidth == null) {
+      return null;
+    }
+
+    return BorderSide(
+      color: scopedColor,
+      // TODO: add proper support for other border styles
+      style: this.style != null ? BorderStyle.solid : BorderStyle.none,
+      width: scopedWidth,
+    );
+  }
+
+  static CssBorderSide? _copyWith(CssBorderSide? base, CssBorderSide? value) {
+    final copied = base == null || value == none
+        ? value
+        : value == null
+            ? base
+            : CssBorderSide(
+                color: value.color ?? base.color,
+                style: value.style ?? base.style,
+                width: value.width ?? base.width,
+              );
+
+    if (copied?.isNoOp == true) {
+      return none;
+    }
+
+    return copied;
+  }
 }
 
 /// A length measurement.
diff --git a/packages/core/lib/src/internal/parser/border.dart b/packages/core/lib/src/internal/parser/border.dart
@@ -2,6 +2,7 @@ part of '../core_parser.dart';
 
 const kCssBorder = 'border';
 const kCssBorderInherit = 'inherit';
+const kCssBorderNone = 'none';
 
 const kCssBorderRadius = 'border-radius';
 const kCssBorderRadiusSuffix = 'radius';
@@ -42,9 +43,20 @@ CssBorder _tryParseBorderSide(CssBorder border, css.Declaration style) {
   }
 
   TextDecorationStyle? borderStyle;
-  CssLength? width;
   Color? color;
+  // TODO: look for official document regarding this default value
+  // WebKit & Blink seem to follow the same (hidden?) specs
+  var width = const CssLength(1);
   for (final expression in style.values) {
+    final value =
+        expression is css.LiteralTerm ? expression.valueAsString : null;
+    if (value == kCssBorderNone) {
+      borderStyle = null;
+      color = null;
+      width = CssLength.zero;
+      break;
+    }
+
     final parsedStyle = tryParseTextDecorationStyle(expression);
     if (parsedStyle != null) {
       borderStyle = parsedStyle;
@@ -64,13 +76,11 @@ CssBorder _tryParseBorderSide(CssBorder border, css.Declaration style) {
     }
   }
 
-  final borderSide = borderStyle == null
-      ? CssBorderSide.none
-      : CssBorderSide(
-          color: color,
-          style: borderStyle,
-          width: width,
-        );
+  final borderSide = CssBorderSide(
+    color: color,
+    style: borderStyle,
+    width: width,
+  );
 
   if (suffix.isEmpty) {
     return border.copyWith(all: borderSide);
diff --git a/packages/core/test/style_border_test.dart b/packages/core/test/style_border_test.dart
@@ -1193,6 +1193,12 @@ void main() {
       expect(explained, equals('[RichText:(:Foo)]'));
     });
 
+    testWidgets('#1044: border zero', (WidgetTester tester) async {
+      const html = '<span style="border: 0 solid red">Foo</span>';
+      final explained = await explain(tester, html);
+      expect(explained, equals('[RichText:(:Foo)]'));
+    });
+
     testWidgets('negative value', (WidgetTester tester) async {
       const html = '<span style="border: -1px">Foo</span>';
       final explained = await explain(tester, html);
diff --git a/packages/enhanced/CHANGELOG.md b/packages/enhanced/CHANGELOG.md
@@ -51,6 +51,10 @@ Major breaking changes if you have custom rendering:
 - Removed: BuildMetadata, RebuildTriggers
 - Changed: BuildBit, WidgetPlaceholder
 
+# 0.10.6
+
+- Fix border 0 is still being rendered (#1045)
+
 ## 0.10.5+3
 
 - Add support for fullscreen webview in Android (#1022)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:8.1.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.1.2'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`