Merge pull request Sub6Resources#587 from vrtdev/feature/584-custom-render-tree-proposal

erickok · web-flow · commit df53f43b29e2 · 2021-03-26T23:11:38.000+01:00
Pass element (tree) to custom render
diff --git a/.gitignore b/.gitignore
@@ -149,3 +149,5 @@ modules.xml
 **/.flutter-plugins-dependencies
 
 **/flutter_export_environment.sh
+
+/example/ios/Flutter/Flutter.podspec
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_html/image_render.dart';
+import 'package:flutter_html/src/layout_element.dart';
+import 'package:flutter_html/style.dart';
 
 void main() => runApp(new MyApp());
 
@@ -245,7 +247,30 @@ class _MyHomePageState extends State<MyHomePage> {
       body: SingleChildScrollView(
         child: Html(
           data: htmlData,
-          //Optional parameters:
+          style: {
+            "table": Style(
+              backgroundColor: Color.fromARGB(0x50, 0xee, 0xee, 0xee),
+            ),
+            "tr": Style(
+              border: Border(bottom: BorderSide(color: Colors.grey)),
+            ),
+            "th": Style(
+              padding: EdgeInsets.all(6),
+              backgroundColor: Colors.grey,
+            ),
+            "td": Style(
+              padding: EdgeInsets.all(6),
+              alignment: Alignment.topLeft,
+            ),
+          },
+          customRender: {
+            "table": (context, child) {
+              return SingleChildScrollView(
+                scrollDirection: Axis.horizontal,
+                child: (context.tree as TableLayoutElement).toWidget(context),
+              );
+            }
+          },
           customImageRenders: {
             networkSourceMatcher(domains: ["flutter.dev"]): (context, attributes, element) {
               return FlutterLogo(size: 36);
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -30,8 +30,6 @@ typedef OnMathError = Widget Function(
 typedef CustomRender = dynamic Function(
   RenderContext context,
   Widget parsedChild,
-  Map<String, String> attributes,
-  dom.Element? element,
 );
 
 class HtmlParser extends StatelessWidget {
@@ -78,6 +76,7 @@ class HtmlParser extends StatelessWidget {
       RenderContext(
         buildContext: context,
         parser: this,
+        tree: cleanedTree,
         style: Style.fromTextStyle(Theme.of(context).textTheme.bodyText2!),
       ),
       cleanedTree,
@@ -94,6 +93,7 @@ class HtmlParser extends StatelessWidget {
       renderContext: RenderContext(
         buildContext: context,
         parser: this,
+        tree: cleanedTree,
         style: Style.fromTextStyle(Theme.of(context).textTheme.bodyText2!),
       ),
     );
@@ -242,6 +242,7 @@ class HtmlParser extends StatelessWidget {
     RenderContext newContext = RenderContext(
       buildContext: context.buildContext,
       parser: this,
+      tree: tree,
       style: context.style.copyOnlyInherited(tree.style),
     );
 
@@ -254,8 +255,6 @@ class HtmlParser extends StatelessWidget {
           shrinkWrap: context.parser.shrinkWrap,
           children: tree.children.map((tree) => parseTree(newContext, tree)).toList(),
         ),
-        tree.attributes,
-        tree.element,
       );
       if (render != null) {
         assert(render is InlineSpan || render is Widget);
@@ -723,11 +722,13 @@ class HtmlParser extends StatelessWidget {
 class RenderContext {
   final BuildContext buildContext;
   final HtmlParser parser;
+  final StyledElement tree;
   final Style style;
 
   RenderContext({
     required this.buildContext,
     required this.parser,
+    required this.tree,
     required this.style,
   });
 }
diff --git a/lib/src/layout_element.dart b/lib/src/layout_element.dart
@@ -38,11 +38,11 @@ class TableLayoutElement extends LayoutElement {
       ),
       width: style.width,
       height: style.height,
-      child: _layoutCells(context),
+      child: LayoutBuilder(builder: (_, constraints) => _layoutCells(context, constraints)),
     );
   }
 
-  Widget _layoutCells(RenderContext context) {
+  Widget _layoutCells(RenderContext context, BoxConstraints constraints) {
     final rows = <TableRowLayoutElement>[];
     List<TrackSize> columnSizes = <TrackSize>[];
     for (var child in children) {
@@ -55,6 +55,10 @@ class TableLayoutElement extends LayoutElement {
               final colWidth = c.attributes["width"];
               return List.generate(span, (index) {
                 if (colWidth != null && colWidth.endsWith("%")) {
+                  if (!constraints.hasBoundedWidth) {
+                    // In a horizontally unbounded container; always wrap content instead of applying flex
+                    return IntrinsicContentTrackSize();
+                  }
                   final percentageSize = double.tryParse(
                       colWidth.substring(0, colWidth.length - 1));
                   return percentageSize != null && !percentageSize.isNaN
