Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] Tests for rich paragraph DOM #23097

Merged
merged 1 commit into from
Dec 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ class CanvasParagraph implements EngineParagraph {
style: span.style,
isSpan: true,
);
domRenderer.appendText(spanElement, span.textOf(this));
domRenderer.append(element, spanElement);
} else if (span is PlaceholderSpan) {
domRenderer.append(
Expand Down
3 changes: 3 additions & 0 deletions lib/web_ui/lib/src/engine/text/paragraph.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,9 @@ void _applyTextStyleToElement({
if (color != null) {
cssStyle.color = colorToCssString(color);
}
if (style._height != null) {
cssStyle.lineHeight = '${style._height}';
}
if (style._fontSize != null) {
cssStyle.fontSize = '${style._fontSize!.floor()}px';
}
Expand Down
49 changes: 46 additions & 3 deletions lib/web_ui/test/text/canvas_paragraph_builder_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import 'package:test/test.dart';
import 'package:ui/src/engine.dart';
import 'package:ui/ui.dart';

const String paragraphStyle = 'style="position: absolute; white-space: pre-wrap; overflow-wrap: break-word; overflow: hidden;"';
const String defaultColor = 'color: rgb(255, 0, 0);';
const String defaultFontFamily = 'font-family: sans-serif;';
const String defaultFontSize = 'font-size: 14px;';

void main() {
internalBootstrapBrowserTest(() => testMain);
}
Expand All @@ -17,9 +22,6 @@ void testMain() {
WebExperiments.ensureInitialized();
});

// TODO(mdebbar): Add checks for the output of `toDomElement()` in all the
// tests below.

test('Builds a text-only canvas paragraph', () {
final EngineParagraphStyle style = EngineParagraphStyle(fontSize: 13.0);
final CanvasParagraphBuilder builder = CanvasParagraphBuilder(style);
Expand All @@ -29,6 +31,10 @@ void testMain() {
final CanvasParagraph paragraph = builder.build();
expect(paragraph.paragraphStyle, style);
expect(paragraph.toPlainText(), 'Hello');
expect(
paragraph.toDomElement().outerHtml,
'<p $paragraphStyle><span style="$defaultColor font-size: 13px; $defaultFontFamily">Hello</span></p>',
);
expect(paragraph.spans, hasLength(1));

final ParagraphSpan span = paragraph.spans.single;
Expand All @@ -47,6 +53,10 @@ void testMain() {
final CanvasParagraph paragraph = builder.build();
expect(paragraph.paragraphStyle, style);
expect(paragraph.toPlainText(), 'Hello');
expect(
paragraph.toDomElement().outerHtml,
'<p $paragraphStyle><span style="$defaultColor $defaultFontSize $defaultFontFamily">Hello</span></p>',
);
expect(paragraph.spans, hasLength(1));

final FlatTextSpan textSpan = paragraph.spans.single as FlatTextSpan;
Expand All @@ -68,6 +78,14 @@ void testMain() {

final CanvasParagraph paragraph = builder.build();
expect(paragraph.toPlainText(), 'Hello');
expect(
paragraph.toDomElement().outerHtml,
'<p $paragraphStyle>'
'<span style="$defaultColor line-height: 1.5; font-size: 9px; font-weight: bold; font-style: italic; $defaultFontFamily letter-spacing: 2px;">'
'Hello'
'</span>'
'</p>',
);
expect(paragraph.spans, hasLength(1));

final FlatTextSpan span = paragraph.spans.single as FlatTextSpan;
Expand Down Expand Up @@ -96,6 +114,17 @@ void testMain() {

final CanvasParagraph paragraph = builder.build();
expect(paragraph.toPlainText(), 'Hello world');
expect(
paragraph.toDomElement().outerHtml,
'<p $paragraphStyle>'
'<span style="$defaultColor font-size: 13px; font-weight: bold; $defaultFontFamily">'
'Hello'
'</span>'
'<span style="$defaultColor font-size: 13px; font-style: italic; $defaultFontFamily">'
' world'
'</span>'
'</p>',
);
expect(paragraph.spans, hasLength(2));

final FlatTextSpan hello = paragraph.spans.first as FlatTextSpan;
Expand Down Expand Up @@ -134,6 +163,20 @@ void testMain() {

final CanvasParagraph paragraph = builder.build();
expect(paragraph.toPlainText(), 'Hello world!');
expect(
paragraph.toDomElement().outerHtml,
'<p $paragraphStyle>'
'<span style="$defaultColor line-height: 2; font-size: 13px; font-weight: bold; $defaultFontFamily">'
'Hello'
'</span>'
'<span style="$defaultColor font-size: 13px; font-weight: bold; font-style: italic; $defaultFontFamily">'
' world'
'</span>'
'<span style="$defaultColor font-size: 13px; font-weight: normal; font-style: italic; $defaultFontFamily">'
'!'
'</span>'
'</p>',
);
expect(paragraph.spans, hasLength(3));

final FlatTextSpan hello = paragraph.spans[0] as FlatTextSpan;
Expand Down