Skip to content

Commit 611fcdd

Browse files
committed
1 parent 580e7ff commit 611fcdd

File tree

6 files changed

+33
-38
lines changed

6 files changed

+33
-38
lines changed

lib/src/widgets/html.dart

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: avoid_renaming_method_parameters, deprecated_member_use
2+
13
import 'dart:convert';
24

35
import 'package:flutter/material.dart';
@@ -140,19 +142,14 @@ class TinhteWidgetFactory extends WidgetFactory {
140142
}
141143

142144
BuildOp get smilieOp {
143-
return _smilieOp ??= BuildOp(
144-
onTree: (meta, tree) {
145-
final a = meta.element.attributes;
145+
return _smilieOp ??= BuildOp.v1(
146+
onParsed: (tree) {
147+
final a = tree.element.attributes;
146148
final title = a['data-title'];
147-
if (title == null) return;
149+
if (title == null) return tree;
148150
final smilie = _kSmilies[title];
149-
if (smilie == null) return;
150-
final parentTree = tree.parent;
151-
if (parentTree == null) return;
152-
153-
// TODO: use `replaceWith` when it comes back in v0.9
154-
TextBit(parentTree, smilie).insertBefore(tree);
155-
tree.detach();
151+
if (smilie == null) return tree;
152+
return tree.parent.sub()..addText(smilie);
156153
},
157154
);
158155
}

lib/src/widgets/html/chr.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: deprecated_member_use
2+
13
part of '../html.dart';
24

35
class Chr {

lib/src/widgets/html/galleria.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: deprecated_member_use
2+
13
part of '../html.dart';
24

35
const kColumns = 3;

lib/src/widgets/html/lb_trigger.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: deprecated_member_use
2+
13
part of '../html.dart';
24

35
const kCaptionColor = Colors.white70;

pubspec.lock

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -441,18 +441,18 @@ packages:
441441
dependency: "direct main"
442442
description:
443443
name: flutter_widget_from_html
444-
sha256: "6c2e29e9b44a1afe3a21bf4feb47ed67e9aef43c303e7888131842fbcbb7fd37"
444+
sha256: "29c9e1723f7f2b5c152de6dbd3483edc5324cba25c1e28ae6cf874aff8717ef9"
445445
url: "https://pub.dev"
446446
source: hosted
447-
version: "0.10.3"
447+
version: "0.13.0-alpha.4"
448448
flutter_widget_from_html_core:
449449
dependency: transitive
450450
description:
451451
name: flutter_widget_from_html_core
452-
sha256: b733a240388736fcf40692920033dc3a749155dc49c840f6c0e4a732f553908b
452+
sha256: b713cc7c37ee2db449d733b33ec97197e860f16a74232bb6eb06a8d9b0a2218a
453453
url: "https://pub.dev"
454454
source: hosted
455-
version: "0.10.3"
455+
version: "0.13.0-alpha.4"
456456
font_awesome_flutter:
457457
dependency: "direct main"
458458
description:
@@ -481,58 +481,50 @@ packages:
481481
dependency: transitive
482482
description:
483483
name: fwfh_cached_network_image
484-
sha256: "396ebb3a01978aa75cad416656abef6ffa31e12de71cf2ccf5ff4173bd35a3eb"
484+
sha256: "5ef697aa59ab5c5343ade651ae503fe920ad9fc5a08f42ed11b77b0bf8064664"
485485
url: "https://pub.dev"
486486
source: hosted
487-
version: "0.7.0+5"
487+
version: "0.13.0-alpha.1"
488488
fwfh_chewie:
489489
dependency: transitive
490490
description:
491491
name: fwfh_chewie
492-
sha256: "6474630c084cc90fbd348cea007d3cb41d62478460f75364e591f2baf26abccd"
492+
sha256: "8f9c2a837d8593145b01f3e5bc73ebbc5ee1d4e380b15118364e5d71acf1ef7c"
493493
url: "https://pub.dev"
494494
source: hosted
495-
version: "0.7.1+2"
495+
version: "0.13.0-alpha.1"
496496
fwfh_just_audio:
497497
dependency: transitive
498498
description:
499499
name: fwfh_just_audio
500-
sha256: "7b97696c264f36f7921c2f94e95c1d4186021699d85ca19aaa280f6b9700fb35"
500+
sha256: "6cc20733a1e141eaced606ec8ea9c13670a8d9acee0202d76092fd842b29c1b6"
501501
url: "https://pub.dev"
502502
source: hosted
503-
version: "0.9.0+2"
503+
version: "0.13.0-alpha.1"
504504
fwfh_svg:
505505
dependency: transitive
506506
description:
507507
name: fwfh_svg
508-
sha256: "398e8eec980e7b2868481489fd423634f7e337bc04c37508db6f84868b982120"
508+
sha256: c3e3cd8b8bd543573ebbb815b118e16e4c417638e92fb4cf5984faf8eabd54da
509509
url: "https://pub.dev"
510510
source: hosted
511-
version: "0.8.0+2"
512-
fwfh_text_style:
513-
dependency: transitive
514-
description:
515-
name: fwfh_text_style
516-
sha256: f0883ccb64b7bb3f2a7a091542c2e834fc3e2a6aa54158f46b3c43b55675d8f7
517-
url: "https://pub.dev"
518-
source: hosted
519-
version: "2.22.8+3"
511+
version: "0.13.0-alpha.1"
520512
fwfh_url_launcher:
521513
dependency: transitive
522514
description:
523515
name: fwfh_url_launcher
524-
sha256: ff7f7a877c20fdbea24b453a0cd846a03ef1ea6b933943a7d37082388c27e849
516+
sha256: "5d30a71e01d9a2eb1f4b971588665d3af00f49b7b7aa307451e3e6d758995729"
525517
url: "https://pub.dev"
526518
source: hosted
527-
version: "0.9.0+2"
519+
version: "0.13.0-alpha.1"
528520
fwfh_webview:
529521
dependency: "direct main"
530522
description:
531523
name: fwfh_webview
532-
sha256: "7ebd3dff551d7281dd3fbb9f5523a8455592665ff75459ca84871ebbebe864a8"
524+
sha256: a17d980d84c123c61bf357b0c8341558a3e1da9d1fdb9988aa444d609c9efeb2
533525
url: "https://pub.dev"
534526
source: hosted
535-
version: "0.7.0+2"
527+
version: "0.13.0-alpha.2"
536528
get_it:
537529
dependency: transitive
538530
description:
@@ -1524,10 +1516,10 @@ packages:
15241516
dependency: transitive
15251517
description:
15261518
name: webview_flutter_android
1527-
sha256: bca797abba472868655b5f1a6029c1132385685ee9db4713cb0e7f33076210c6
1519+
sha256: "9427774649fd3c8b7ff53523051395d13aed2ca355822b822e6493d79f5fc05a"
15281520
url: "https://pub.dev"
15291521
source: hosted
1530-
version: "3.9.3"
1522+
version: "3.10.0"
15311523
webview_flutter_platform_interface:
15321524
dependency: transitive
15331525
description:

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
firebase_messaging: ^14.6.5
1616

1717
# ours
18-
flutter_widget_from_html: ^0.10.0
18+
flutter_widget_from_html: ^0.13.0-alpha.4
1919
fwfh_webview: any
2020
the_api:
2121
path: ./packages/api

0 commit comments

Comments
 (0)