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

[skwasm] Use text position affinity when calculating word boundaries. #51753

Merged
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
6 changes: 5 additions & 1 deletion lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,11 @@ class SkwasmParagraph extends SkwasmObjectWrapper<RawParagraph> implements ui.Pa
@override
ui.TextRange getWordBoundary(ui.TextPosition position) => withStackScope((StackScope scope) {
final Pointer<Int32> outRange = scope.allocInt32Array(2);
paragraphGetWordBoundary(handle, position.offset, outRange);
final int characterPosition = switch (position.affinity) {
ui.TextAffinity.upstream => position.offset - 1,
ui.TextAffinity.downstream => position.offset,
};
paragraphGetWordBoundary(handle, characterPosition, outRange);
return ui.TextRange(start: outRange[0], end: outRange[1]);
});

Expand Down
19 changes: 19 additions & 0 deletions lib/web_ui/test/ui/paragraph_builder_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,25 @@ Future<void> testMain() async {
expect(() => builder.build(), returnsNormally);
});

test('getWordBoundary respects position affinity', () {
final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
builder.addText('hello world');

final Paragraph paragraph = builder.build();
paragraph.layout(const ParagraphConstraints(width: double.infinity));

final TextRange downstreamWordBoundary = paragraph.getWordBoundary(const TextPosition(
offset: 5,
));
expect(downstreamWordBoundary, const TextRange(start: 5, end: 6));

final TextRange upstreamWordBoundary = paragraph.getWordBoundary(const TextPosition(
offset: 5,
affinity: TextAffinity.upstream,
));
expect(upstreamWordBoundary, const TextRange(start: 0, end: 5));
});

test('build and layout a paragraph with an empty addText', () {
final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle());
builder.addText('');
Expand Down