update to v1.1.4, fix issue #13 and #16

asjqkkkk · May 4, 2020 · dbfe04f · dbfe04f
1 parent bc48cb3
commit dbfe04f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+#### [1.1.4] - fix issue [#13](https://github.com/asjqkkkk/markdown_widget/issues/13) and [#16](https://github.com/asjqkkkk/markdown_widget/issues/16), deprecated `compute` function
+
 #### [1.1.3] - add `loadingWidget` before data is ready, improve performance in the first rendering
 
 #### [1.1.2] - support dark mode now! see issue [#12](https://github.com/asjqkkkk/markdown_widget/issues/12)

diff --git a/lib/markdown_widget.dart b/lib/markdown_widget.dart
@@ -53,11 +53,12 @@ class _MarkdownWidgetState extends State<MarkdownWidget> {
 
   @override
   void initState() {
-    initialState();
+    updateState();
     super.initState();
   }
 
   ///at the first time, we need to use isolate to create data to avoid UI thread stuck
+  @Deprecated('Not working on phone now')
   void initialState() {
     _MarkdownData _markdownData = _MarkdownData(
       data: widget.data,
@@ -68,6 +69,7 @@ class _MarkdownWidgetState extends State<MarkdownWidget> {
 
     ///use a new isolate to create [MarkdownGenerator]
     compute(buildMarkdownGenerator, _markdownData).then((value) {
+      print('value:$value');
       markdownGenerator = value;
       tocList.addAll(markdownGenerator.tocList);
       widgets.addAll(markdownGenerator.widgets);
@@ -91,16 +93,6 @@ class _MarkdownWidgetState extends State<MarkdownWidget> {
       itemPositionsListener.itemPositions.addListener(indexListener);
   }
 
-  Future<MarkdownGenerator> buildMarkdownGenerator(
-      _MarkdownData markdownData) async {
-    return MarkdownGenerator(
-      data: markdownData.data,
-      widgetConfig: markdownData.widgetConfig,
-      styleConfig: markdownData.styleConfig,
-      childMargin: markdownData.childMargin,
-    );
-  }
-
   void clearState() {
     tocList.clear();
     widgets.clear();
@@ -185,3 +177,13 @@ class _MarkdownData {
   _MarkdownData(
       {this.data, this.widgetConfig, this.styleConfig, this.childMargin});
 }
+
+MarkdownGenerator buildMarkdownGenerator(
+    _MarkdownData markdownData) {
+  return MarkdownGenerator(
+    data: markdownData.data,
+    widgetConfig: markdownData.widgetConfig,
+    styleConfig: markdownData.styleConfig,
+    childMargin: markdownData.childMargin,
+  );
+}
diff --git a/lib/tags/table.dart b/lib/tags/table.dart
@@ -64,9 +64,9 @@ class MTable {
   }
 
   void _buildTh(m.Node node, List<m.Element> thList) {
-    if (node != null && node is m.Element && !node.isEmpty) {
+    if (node != null && node is m.Element) {
       if (node.tag == th) thList.add(node);
-      List.generate(node.children.length,
+      List.generate(node?.children?.length ?? 0,
           (index) => _buildTh(node.children[index], thList));
     }
   }
@@ -108,9 +108,9 @@ class MTable {
   }
 
   void _buildTd(m.Node node, List<m.Element> tdList) {
-    if (node != null && node is m.Element && !node.isEmpty) {
+    if (node != null && node is m.Element) {
       if (node.tag == td) tdList.add(node);
-      List.generate(node.children.length,
+      List.generate(node.children?.length ?? 0,
           (index) => _buildTd(node.children[index], tdList));
     }
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: markdown_widget
 description: A new markdown package. It supports TOC function, HTML video and img tag，and it works well on both the web and mobile
-version: 1.1.3
+version: 1.1.4
 verified publisher:
   - agedchen@gmail.com
 homepage: https://github.com/asjqkkkk/markdown_widget