Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for rendering as RichText Widgets #37

Merged
merged 6 commits into from
Feb 1, 2019
Merged

Added support for rendering as RichText Widgets #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8f09fd
Added support for rendering as RichText Widgets
jeffmikels Nov 6, 2018
8fcdd43
fixing the test to keep using the old parser
jeffmikels Nov 6, 2018
98b713e
fixed ordered list numbering
jeffmikels Nov 6, 2018
7136a59
check for null before calling isEmpty
jeffmikels Jan 19, 2019
dc92077
plain text nodes inside blockquote, ol, and ul, are now properly inde…
jeffmikels Jan 31, 2019
5a26bc7
Merge branch 'master' into jeffmikels
Sub6Resources Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions lib/flutter_html.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ class Html extends StatelessWidget {
@required this.data,
this.padding,
this.backgroundColor,
this.defaultTextStyle = const TextStyle(color: Colors.black),
this.defaultTextStyle,
this.onLinkTap,
this.renderNewlines = false,
this.customRender,
this.useRichText = false,
}) : super(key: key);

final String data;
Expand All @@ -21,6 +22,7 @@ class Html extends StatelessWidget {
final TextStyle defaultTextStyle;
final OnLinkTap onLinkTap;
final bool renderNewlines;
final bool useRichText;

/// Either return a custom widget for specific node types or return null to
/// fallback to the default rendering.
Expand All @@ -35,15 +37,20 @@ class Html extends StatelessWidget {
color: backgroundColor,
width: width,
child: DefaultTextStyle.merge(
style: defaultTextStyle,
child: Wrap(
alignment: WrapAlignment.start,
children: HtmlParser(
width: width,
onLinkTap: onLinkTap,
renderNewlines: renderNewlines,
customRender: customRender,
).parse(data),
style: defaultTextStyle ?? DefaultTextStyle.of(context).style,
child: (useRichText)
? HtmlRichTextParser(
width: width,
onLinkTap: onLinkTap,
renderNewlines: renderNewlines,
html: data,
)
: HtmlOldParser(
width: width,
onLinkTap: onLinkTap,
renderNewlines: renderNewlines,
customRender: customRender,
html: data,
),
),
);
Expand Down
Loading