make requested changes

JacobWrenn · JacobWrenn · commit 3e33f722f410 · 2020-06-20T12:04:11.000+01:00
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -253,57 +253,40 @@ class HtmlParser extends StatelessWidget {
         ),
       );
     } else if (tree.style?.display == Display.LIST_ITEM) {
-      List<Widget> children;
-      if (tree.style?.listStylePosition == ListStylePosition.OUTSIDE) {
-        children = [
-          PositionedDirectional(
-            width: 30, //TODO derive this from list padding.
-            start: 0,
-            child: Text('${newContext.style.markerContent}\t',
-                textAlign: TextAlign.right,
-                style: newContext.style.generateTextStyle()),
-          ),
-          Padding(
-            padding:
-                EdgeInsets.only(left: 30), //TODO derive this from list padding.
-            child: StyledText(
-              textSpan: TextSpan(
-                children: tree.children
-                        ?.map((tree) => parseTree(newContext, tree))
-                        ?.toList() ??
-                    [],
-                style: newContext.style.generateTextStyle(),
-              ),
-              style: newContext.style,
-            ),
-          )
-        ];
-      } else if (tree.style?.listStylePosition == ListStylePosition.INSIDE) {
-        children = [
-          Padding(
-            padding:
-                EdgeInsets.only(left: 30), //TODO derive this from list padding.
-            child: StyledText(
-              textSpan: TextSpan(
-                text: '${newContext.style.markerContent}\t',
-                children: tree.children
-                        ?.map((tree) => parseTree(newContext, tree))
-                        ?.toList() ??
-                    [],
-                style: newContext.style.generateTextStyle(),
-              ),
-              style: newContext.style,
-            ),
-          )
-        ];
-      }
       return WidgetSpan(
         child: ContainerSpan(
           newContext: newContext,
           style: tree.style,
           shrinkWrap: context.parser.shrinkWrap,
           child: Stack(
-            children: children,
+            children: [
+              if (tree.style?.listStylePosition == ListStylePosition.OUTSIDE || tree.style?.listStylePosition == null)
+                PositionedDirectional(
+                  width: 30, //TODO derive this from list padding.
+                  start: 0,
+                  child: Text('${newContext.style.markerContent}\t',
+                      textAlign: TextAlign.right,
+                      style: newContext.style.generateTextStyle()),
+                ),
+              Padding(
+                padding: EdgeInsets.only(
+                    left: 30), //TODO derive this from list padding.
+                child: StyledText(
+                  textSpan: TextSpan(
+                    text: (tree.style?.listStylePosition ==
+                            ListStylePosition.INSIDE)
+                        ? '${newContext.style.markerContent}\t'
+                        : null,
+                    children: tree.children
+                            ?.map((tree) => parseTree(newContext, tree))
+                            ?.toList() ??
+                        [],
+                    style: newContext.style.generateTextStyle(),
+                  ),
+                  style: newContext.style,
+                ),
+              )
+            ],
           ),
         ),
       );
diff --git a/lib/style.dart b/lib/style.dart
@@ -201,9 +201,6 @@ class Style {
         (display == Display.BLOCK || display == Display.LIST_ITEM)) {
       this.alignment = Alignment.centerLeft;
     }
-    if (this.listStylePosition == null && display == Display.LIST_ITEM) {
-      this.listStylePosition = ListStylePosition.OUTSIDE;
-    }
   }
 
   TextStyle generateTextStyle() {

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,6 @@ class Style {`
`201`	`201`	`(display == Display.BLOCK \|\| display == Display.LIST_ITEM)) {`
`202`	`202`	`this.alignment = Alignment.centerLeft;`
`203`	`203`	`}`
`204`		`- if (this.listStylePosition == null && display == Display.LIST_ITEM) {`
`205`		`- this.listStylePosition = ListStylePosition.OUTSIDE;`
`206`		`- }`
`207`	`204`	`}`
`208`	`205`
`209`	`206`	`TextStyle generateTextStyle() {`