From 9cc8a56e91acca56eadcb446181a33c6daa13fc5 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 26 Nov 2021 10:01:38 +0100
Subject: [PATCH 1/2] Prevent crash on empty <table> tags; fixes #893

---
 lib/src/layout_element.dart | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/src/layout_element.dart b/lib/src/layout_element.dart
index b677e9d872..fce0362952 100644
--- a/lib/src/layout_element.dart
+++ b/lib/src/layout_element.dart
@@ -155,6 +155,11 @@ class TableLayoutElement extends LayoutElement {
         max(0, columnMax - finalColumnSizes.length),
         (_) => IntrinsicContentTrackSize());
 
+    if (finalColumnSizes.isEmpty || rowSizes.isEmpty) {
+      // No actual cells to show
+      return SizedBox();
+    }
+
     return LayoutGrid(
       gridFit: GridFit.loose,
       columnSizes: finalColumnSizes,

From a81ba3141791bea138993b3eb53f578a764216db Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 26 Nov 2021 10:31:36 +0100
Subject: [PATCH 2/2] Fix merge conflict in list markers

---
 lib/html_parser.dart    |  1 -
 lib/src/css_parser.dart |  1 +
 lib/style.dart          | 15 +--------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/html_parser.dart b/lib/html_parser.dart
index 64852e348f..72e125014e 100644
--- a/lib/html_parser.dart
+++ b/lib/html_parser.dart
@@ -734,7 +734,6 @@ class HtmlParser extends StatelessWidget {
       String marker = "";
       switch (tree.style.listStyleType!) {
         case ListStyleType.NONE:
-          tree.style.markerContent = '';
           break;
         case ListStyleType.CIRCLE:
           marker = '○';
diff --git a/lib/src/css_parser.dart b/lib/src/css_parser.dart
index 1370621b51..3107ec8526 100644
--- a/lib/src/css_parser.dart
+++ b/lib/src/css_parser.dart
@@ -230,6 +230,7 @@ Style declarationsToStyle(Map<String, List<css.Expression>> declarations) {
                 break;
             }
           }
+          break;
         case 'height':
           style.height = ExpressionMapping.expressionToPaddingLength(value.first) ?? style.height;
           break;
diff --git a/lib/style.dart b/lib/style.dart
index 503c6b5de6..50931d532e 100644
--- a/lib/style.dart
+++ b/lib/style.dart
@@ -540,20 +540,7 @@ class ListStyleType {
   static const LOWER_ROMAN = ListStyleType("LOWER_ROMAN");
   static const UPPER_ROMAN = ListStyleType("UPPER_ROMAN");
   static const SQUARE = ListStyleType("SQUARE");
-}
-
-enum ListStyleType {
-  LOWER_ALPHA,
-  UPPER_ALPHA,
-  LOWER_LATIN,
-  UPPER_LATIN,
-  CIRCLE,
-  DISC,
-  DECIMAL,
-  LOWER_ROMAN,
-  UPPER_ROMAN,
-  SQUARE,
-  NONE,
+  static const NONE = ListStyleType("NONE");
 }
 
 enum ListStylePosition {