Fix incorrect detection of dropdown title and generally harden code

tneotia · tneotia · commit 25427fde258f · 2021-02-08T10:50:59.000-05:00
diff --git a/lib/src/layout_element.dart b/lib/src/layout_element.dart
@@ -263,36 +263,45 @@ class DetailsContentElement extends LayoutElement {
 
   @override
   Widget toWidget(RenderContext context) {
+    List<InlineSpan> childrenList = children?.map((tree) => context.parser.parseTree(context, tree))?.toList();
+    List<InlineSpan> toRemove = [];
+    if (childrenList != null) {
+      for (InlineSpan child in childrenList) {
+        if (child is TextSpan && child.text != null && child.text.trim().isEmpty) {
+          toRemove.add(child);
+        }
+      }
+      for (InlineSpan child in toRemove) {
+        childrenList.remove(child);
+      }
+    }
+    InlineSpan firstChild = childrenList?.isNotEmpty == true ? childrenList.first : null;
     return ExpansionTile(
-        title: children != null && elementList.first.localName == "summary" ? StyledText(
+        title: elementList?.isNotEmpty == true && elementList?.first?.localName == "summary" ? StyledText(
           textSpan: TextSpan(
             style: style.generateTextStyle(),
-            children: [children
-                .map((tree) => context.parser.parseTree(context, tree))
-                .toList().first] ??
-                [],
+            children: [firstChild] ?? [],
           ),
           style: style,
         ) : Text("Details"),
         children: [
           StyledText(
             textSpan: TextSpan(
               style: style.generateTextStyle(),
-              children: getChildren(children, context)
+              children: getChildren(childrenList, context, elementList?.isNotEmpty == true && elementList?.first?.localName == "summary" ? firstChild : null)
             ),
             style: style,
           ),
         ]
     );
   }
 
-  List<InlineSpan> getChildren(List<StyledElement> children, RenderContext context) {
-    if (children.map((tree) => context.parser.parseTree(context, tree)).toList() == null) {
+  List<InlineSpan> getChildren(List<InlineSpan> children, RenderContext context, InlineSpan firstChild) {
+    if (children == null) {
       return [];
     } else {
-      List<InlineSpan> reducedChildren = children.map((tree) => context.parser.parseTree(context, tree)).toList();
-      reducedChildren.removeAt(0);
-      return reducedChildren;
+      if (firstChild != null) children.removeAt(0);
+      return children;
     }
   }
 }
