huypanha
/
flutter-quill
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Retain the attributes when converting delta to/from html (#1609)" (#1612)

Browse Source 
This reverts commit 3e97fa2c81.
pull/1621/head
Ellet Hnewa 1 year ago committed by GitHub
parent 3e97fa2c81
commit 32b698e6ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 81 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      example/lib/presentation/quill/quill_screen.dart
  2. 96
      lib/src/models/documents/document.dart
  3. 57
      lib/src/packages/quill_markdown/delta_to_markdown.dart
  4. 2
      lib/src/packages/quill_markdown/markdown_to_delta.dart
  5. 2
      lib/src/widgets/raw_editor/raw_editor_state.dart
  6. 32
      quill_html_converter/lib/quill_html_converter.dart

2
example/lib/presentation/quill/quill_screen.dart
Unescape View File

@ -76,7 +76,7 @@ class _QuillScreenState extends State<QuillScreen> {
onPressed: () {
final html = _controller.document.toDelta().toHtml();
_controller.document =
Document.fromDelta(DeltaX.fromHtml(html));
Document.fromDelta(Document.fromHtml(html));
},
icon: const Icon(Icons.html),
),

96
lib/src/models/documents/document.dart
Unescape View File

@ -4,6 +4,7 @@ import 'package:html2md/html2md.dart' as html2md;
import 'package:markdown/markdown.dart' as md;
import '../../../markdown_quill.dart';
import '../../../quill_delta.dart';
import '../../widgets/quill/embeds.dart';
import '../rules/rule.dart';
@ -57,7 +58,8 @@ class Document {
_rules.setCustomRules(customRules);
}
final StreamController<DocChange> documentChangeObserver = StreamController.broadcast();
final StreamController<DocChange> documentChangeObserver =
StreamController.broadcast();
final History history = History();
@ -82,7 +84,8 @@ class Document {
return Delta();
}
final delta = _rules.apply(RuleType.insert, this, index, data: data, len: replaceLength);
final delta = _rules.apply(RuleType.insert, this, index,
data: data, len: replaceLength);
compose(delta, ChangeSource.local);
return delta;
}
@ -145,7 +148,8 @@ class Document {
var delta = Delta();
final formatDelta = _rules.apply(RuleType.format, this, index, len: len, attribute: attribute);
final formatDelta = _rules.apply(RuleType.format, this, index,
len: len, attribute: attribute);
if (formatDelta.isNotEmpty) {
compose(formatDelta, ChangeSource.local);
delta = delta.compose(formatDelta);
@ -185,7 +189,8 @@ class Document {
/// Returns all styles and Embed for each node within selection
List<OffsetValue> collectAllIndividualStyleAndEmbed(int index, int len) {
final res = queryChild(index);
return (res.node as Line).collectAllIndividualStylesAndEmbed(res.offset, len);
return (res.node as Line)
.collectAllIndividualStylesAndEmbed(res.offset, len);
}
/// Returns all styles for any character within the specified text range.
@ -294,7 +299,8 @@ class Document {
delta = _transform(delta);
final originalDelta = toDelta();
for (final op in delta.toList()) {
final style = op.attributes != null ? Style.fromJson(op.attributes) : null;
final style =
op.attributes != null ? Style.fromJson(op.attributes) : null;
if (op.isInsert) {
// Must normalize data before inserting into the document, makes sure
@ -360,7 +366,8 @@ class Document {
res.push(Operation.insert('\n'));
}
// embed could be image or video
final opInsertEmbed = op.isInsert && op.data is Map && (op.data as Map).containsKey(type);
final opInsertEmbed =
op.isInsert && op.data is Map && (op.data as Map).containsKey(type);
final nextOpIsLineBreak = i + 1 < ops.length &&
ops[i + 1].isInsert &&
ops[i + 1].data is String &&
@ -392,7 +399,9 @@ class Document {
Iterable<EmbedBuilder>? embedBuilders,
EmbedBuilder? unknownEmbedBuilder,
]) =>
_root.children.map((e) => e.toPlainText(embedBuilders, unknownEmbedBuilder)).join();
_root.children
.map((e) => e.toPlainText(embedBuilders, unknownEmbedBuilder))
.join();
void _loadDocument(Delta doc) {
if (doc.isEmpty) {
@ -405,16 +414,20 @@ class Document {
var offset = 0;
for (final op in doc.toList()) {
if (!op.isInsert) {
throw ArgumentError.value(
doc, 'Document can only contain insert operations but ${op.key} found.');
throw ArgumentError.value(doc,
'Document can only contain insert operations but ${op.key} found.');
}
final style = op.attributes != null ? Style.fromJson(op.attributes) : null;
final style =
op.attributes != null ? Style.fromJson(op.attributes) : null;
final data = _normalize(op.data);
_root.insert(offset, data, style);
offset += op.length!;
}
final node = _root.last;
if (node is Line && node.parent is! Block && node.style.isEmpty && _root.childCount > 1) {
if (node is Line &&
node.parent is! Block &&
node.style.isEmpty &&
_root.childCount > 1) {
_root.remove(node);
}
}
@ -430,11 +443,11 @@ class Document {
}
final delta = node.toDelta();
return delta.length == 1 && delta.first.data == '\n' && delta.first.key == 'insert';
}
return delta.length == 1 &&
delta.first.data == '\n' &&
delta.first.key == 'insert';
}
class DeltaX {
/// Convert the HTML Raw string to [Delta]
///
/// It will run using the following steps:
@ -445,26 +458,28 @@ class DeltaX {
///
/// for more [info](https://github.com/singerdmx/flutter-quill/issues/1100)
static Delta fromHtml(String html) {
var rules = [
html2md.Rule('image', filters: ['img'], replacement: (content, node) {
node.asElement()?.attributes.remove('class');
//Later we can convert this to delta along with the attributes by GoodInlineHtmlSyntax
return node.outerHTML;
}),
];
final markdown = html2md.convert(html, rules: rules).replaceAll('unsafe:', '');
final mdDocument = md.Document(
encodeHtml: false,
inlineSyntaxes: [
GoodInlineHtmlSyntax(),
],
);
final markdown = html2md
.convert(
html,
)
.replaceAll('unsafe:', '');
final mdDocument = md.Document(encodeHtml: false);
final mdToDelta = MarkdownToDelta(markdownDocument: mdDocument);
return mdToDelta.convert(markdown);
// final deltaJsonString = markdownToDelta(markdown);
// final deltaJson = jsonDecode(deltaJsonString);
// if (deltaJson is! List) {
// throw ArgumentError(
// 'The delta json string should be of type list when jsonDecode() it',
// );
// }
// return Delta.fromJson(
// deltaJson,
// );
}
}
@ -479,24 +494,3 @@ enum ChangeSource {
/// Silent change.
silent;
}
/// Convert the html to Element, not Text
class GoodInlineHtmlSyntax extends md.InlineHtmlSyntax {
@override
onMatch(parser, match) {
if (super.onMatch(parser, match)) {
return true;
}
var root = html2md.Node.root(match.group(0)!);
root = root.childNodes().last.firstChild!;
var node = md.Element.empty(root.nodeName);
var attrs = root.asElement()?.attributes.map((key, value) => MapEntry(key.toString(), value));
if (attrs != null) node.attributes.addAll(attrs);
parser.addNode(node);
parser.start = parser.pos;
return false;
}
}

57
lib/src/packages/quill_markdown/delta_to_markdown.dart
Unescape View File

@ -2,7 +2,6 @@ import 'dart:convert';
import 'dart:ui';
import 'package:collection/collection.dart';
import '../../../flutter_quill.dart';
import '../../../quill_delta.dart';
import './custom_quill_attributes.dart';
@ -38,7 +37,8 @@ extension on Object? {
}
/// Convertor from [Delta] to quill Markdown string.
class DeltaToMarkdown extends Converter<Delta, String> implements _NodeVisitor<StringSink> {
class DeltaToMarkdown extends Converter<Delta, String>
implements _NodeVisitor<StringSink> {
///
DeltaToMarkdown({
Map<String, EmbedToMarkdown>? customEmbedHandlers,
@ -70,9 +70,8 @@ class DeltaToMarkdown extends Converter<Delta, String> implements _NodeVisitor<S
);
}
if (infoString.isEmpty) {
final linesWithLang = (node as Block)
.children
.where((child) => child.containsAttr(CodeBlockLanguageAttribute.attrKey));
final linesWithLang = (node as Block).children.where((child) =>
child.containsAttr(CodeBlockLanguageAttribute.attrKey));
if (linesWithLang.isNotEmpty) {
infoString = linesWithLang.first.getAttrValueOr(
CodeBlockLanguageAttribute.attrKey,
@ -160,7 +159,8 @@ class DeltaToMarkdown extends Converter<Delta, String> implements _NodeVisitor<S
),
Attribute.link.key: _AttributeHandler(
beforeContent: (attribute, node, output) {
if (node.previous?.containsAttr(attribute.key, attribute.value) != true) {
if (node.previous?.containsAttr(attribute.key, attribute.value) !=
true) {
output.write('[');
}
},
@ -210,7 +210,8 @@ class DeltaToMarkdown extends Converter<Delta, String> implements _NodeVisitor<S
leaf.accept(this, out);
}
});
if (style.isEmpty || style.values.every((item) => item.scope != AttributeScope.block)) {
if (style.isEmpty ||
style.values.every((item) => item.scope != AttributeScope.block)) {
out.writeln();
}
if (style.containsKey(Attribute.list.key) &&
@ -233,9 +234,10 @@ class DeltaToMarkdown extends Converter<Delta, String> implements _NodeVisitor<S
var content = text.value;
if (!(style.containsKey(Attribute.codeBlock.key) ||
style.containsKey(Attribute.inlineCode.key) ||
(text.parent?.style.containsKey(Attribute.codeBlock.key) ?? false))) {
content =
content.replaceAllMapped(RegExp(r'[\\\`\*\_\{\}\[\]\(\)\#\+\-\.\!\>\<]'), (match) {
(text.parent?.style.containsKey(Attribute.codeBlock.key) ??
false))) {
content = content.replaceAllMapped(
RegExp(r'[\\\`\*\_\{\}\[\]\(\)\#\+\-\.\!\>\<]'), (match) {
return '\\${match[0]}';
});
}
@ -264,8 +266,9 @@ class DeltaToMarkdown extends Converter<Delta, String> implements _NodeVisitor<S
VoidCallback contentHandler, {
bool sortedAttrsBySpan = false,
}) {
final attrs =
sortedAttrsBySpan ? node.attrsSortedByLongestSpan() : node.style.attributes.values.toList();
final attrs = sortedAttrsBySpan
? node.attrsSortedByLongestSpan()
: node.style.attributes.values.toList();
final handlersToUse = attrs
.where((attr) => handlers.containsKey(attr.key))
.map((attr) => MapEntry(attr.key, handlers[attr.key]!))
@ -306,21 +309,17 @@ abstract class _NodeVisitor<T> {
extension _NodeX on Node {
T accept<T>(_NodeVisitor<T> visitor, [T? context]) {
final node = this;
if (node is Root) {
return visitor.visitRoot(node, context);
}
if (node is Block) {
return visitor.visitBlock(node, context);
}
if (node is Line) {
return visitor.visitLine(node, context);
}
if (node is QuillText) {
return visitor.visitText(node, context);
}
if (node is Embed) {
return visitor.visitEmbed(node, context);
switch (runtimeType) {
case const (Root):
return visitor.visitRoot(this as Root, context);
case const (Block):
return visitor.visitBlock(this as Block, context);
case const (Line):
return visitor.visitLine(this as Line, context);
case const (QuillText):
return visitor.visitText(this as QuillText, context);
case const (Embed):
return visitor.visitEmbed(this as Embed, context);
}
throw Exception('Container of type $runtimeType cannot be visited');
}
@ -353,8 +352,8 @@ extension _NodeX on Node {
node = node.next!;
}
final attrs = style.attributes.values
.sorted((attr1, attr2) => attrCount[attr2]!.compareTo(attrCount[attr1]!));
final attrs = style.attributes.values.sorted(
(attr1, attr2) => attrCount[attr2]!.compareTo(attrCount[attr1]!));
return attrs;
}

2
lib/src/packages/quill_markdown/markdown_to_delta.dart
Unescape View File

@ -208,7 +208,7 @@ class MarkdownToDelta extends Converter<String, Delta>
final tag = element.tag;
if (_isEmbedElement(element)) {
_delta.insert(_toEmbeddable(element).toJson(), element.attributes);
_delta.insert(_toEmbeddable(element).toJson());
}
if (tag == 'br') {

2
lib/src/widgets/raw_editor/raw_editor_state.dart
Unescape View File

@ -213,7 +213,7 @@ class QuillRawEditorState extends EditorState
if (html == null) {
return;
}
final deltaFromCliboard = DeltaX.fromHtml(html);
final deltaFromCliboard = Document.fromHtml(html);
final delta = deltaFromCliboard.compose(controller.document.toDelta());
controller

32
quill_html_converter/lib/quill_html_converter.dart
Unescape View File

@ -1,9 +1,10 @@
library quill_html_converter;
import 'package:dart_quill_delta/dart_quill_delta.dart';
import 'package:vsc_quill_delta_to_html/vsc_quill_delta_to_html.dart';
import 'package:vsc_quill_delta_to_html/vsc_quill_delta_to_html.dart'
as conventer show ConverterOptions, QuillDeltaToHtmlConverter;
export 'package:vsc_quill_delta_to_html/vsc_quill_delta_to_html.dart';
typedef ConverterOptions = conventer.ConverterOptions;
/// A extension for [Delta] which comes from `flutter_quill` to extends
/// the functionality of it to support converting the [Delta] to/from HTML
@ -18,33 +19,10 @@ extension DeltaHtmlExt on Delta {
/// that designed specifically for converting the quill delta to html
String toHtml({ConverterOptions? options}) {
final json = toJson();
final html = QuillDeltaToHtmlConverter(
final html = conventer.QuillDeltaToHtmlConverter(
List.castFrom(json),
options ?? defaultConverterOptions,
options,
).convert();
return html;
}
}
ConverterOptions get defaultConverterOptions {
return ConverterOptions(
converterOptions: OpConverterOptions(
customTagAttributes: (op) => parseStyle(op.attributes['style']),
),
);
}
Map<String, String>? parseStyle(String? style, [Map<String, String>? attrs]) {
if (style == null || style.isEmpty) return attrs;
attrs ??= <String, String>{};
for (var e in style.split(';')) {
if ((e = e.trim()).isEmpty) break;
var kv = e.split(':');
if (kv.length < 2) break;
var key = kv[0].trim();
attrs[key] = kv[1].trim();
}
return attrs;
}

Write Preview
Loading…
Cancel
Save