Skip to content

Lightpanda: the headless browser designed for AI and automation

count offsets in UTF16

Karl Seguin9a50459f52f5
diff --git a/src/browser/tests/element/html/input.html b/src/browser/tests/element/html/input.html
index 9f50ed84e..f4ecd7a51 100644
--- a/src/browser/tests/element/html/input.html
+++ b/src/browser/tests/element/html/input.html
@@ -1,4 +1,5 @@
<!DOCTYPE html>
+<meta charset="utf-8">
<script src="../../testing.js"></script>
<input id="text1" type="text" value="initial">
@@ -692,9 +693,24 @@
testing.expectError('IndexSizeError', () => input.setRangeText('!', 5, 2));
testing.expectError('TypeError', () => input.setRangeText('!', 1, 2, 'bogus'));
testing.expectError('TypeError', () => input.setRangeText('!', 1));
+ // argument errors win over the range and type checks
+ testing.expectError('TypeError', () => input.setRangeText('!', 5, 2, 'bogus'));
const checkbox = document.createElement('input');
checkbox.type = 'checkbox';
testing.expectError('InvalidStateError', () => checkbox.setRangeText('x'));
+ testing.expectError('TypeError', () => checkbox.setRangeText('x', 1));
+
+ // offsets count UTF-16 code units
+ input.value = '😀a';
+ input.setRangeText('b', 2, 3, 'select');
+ testing.expectEqual('😀b|2|3', state());
+
+ // the stripped newline doesn't push the caret into the 'é'
+ input.value = 'é';
+ input.setRangeText('\n', 0, 0, 'end');
+ testing.expectEqual('é|1|1', state());
+ input.setRangeText('X');
+ testing.expectEqual('éX|1|1', state());
}
</script>
diff --git a/src/browser/tests/element/html/textarea.html b/src/browser/tests/element/html/textarea.html
index 0d53f9d2d..a785e3a62 100644
--- a/src/browser/tests/element/html/textarea.html
+++ b/src/browser/tests/element/html/textarea.html
@@ -1,4 +1,5 @@
<!DOCTYPE html>
+<meta charset="utf-8">
<script src="../../testing.js"></script>
<!-- TextArea elements -->
@@ -450,5 +451,13 @@
testing.expectEqual('X\n1\nline2', el.value);
testing.expectEqual(2, el.selectionStart);
testing.expectEqual(2, el.selectionEnd);
+
+ // CRLF → LF shortens the value; the caret stays on a character boundary
+ el.value = 'éa';
+ el.setRangeText('\r\n', 0, 0, 'end');
+ testing.expectEqual(2, el.selectionStart);
+ el.setRangeText('X');
+ testing.expectEqual('\néXa', el.value);
+ testing.expectEqual(2, el.selectionStart);
}
</script>
diff --git a/src/browser/webapi/element/text_entry.zig b/src/browser/webapi/element/text_entry.zig
index bc46045d6..6d635a83a 100644
--- a/src/browser/webapi/element/text_entry.zig
+++ b/src/browser/webapi/element/text_entry.zig
@@ -333,40 +333,50 @@ pub fn TextEntry(comptime T: type) type {
selection_mode: ?[]const u8,
frame: *Frame,
) !void {
+ // Argument errors come first: Chrome throws them while converting
+ // the arguments. A start needs an end.
+ const mode: SelectionMode = if (selection_mode) |m|
+ std.meta.stringToEnum(SelectionMode, m) orelse return error.TypeError
+ else
+ .preserve;
+ if (range_start != null and range_end == null) {
+ return error.TypeError;
+ }
+
if (self.selectionAvailable() == false) {
return error.InvalidStateError;
}
+ // Offsets are in UTF-16 code units, like the spec, and only become
+ // byte offsets against a given value: setValue can sanitize the new
+ // one (newlines, CRLF), so its byte offsets differ from the concat's.
const value = self.getValue();
- const value_len: u32 = @intCast(value.len);
- const sel_start = @min(self._selection_start, value_len);
- const sel_end = @min(self._selection_end, value_len);
+ const value_len: u32 = @intCast(CData.utf16Len(value));
+ const sel_start = selectionOffsetToJs(self, self._selection_start);
+ const sel_end = selectionOffsetToJs(self, self._selection_end);
- // setRangeText(replacement) replaces the selection; a start needs an end
+ // setRangeText(replacement) replaces the selection
var start = sel_start;
var end = sel_end;
if (range_start) |js_start| {
- const js_end = range_end orelse return error.TypeError;
+ const js_end = range_end.?;
if (js_start > js_end) {
return error.IndexSizeError;
}
- start = selectionOffsetFromJs(self, js_start);
- end = selectionOffsetFromJs(self, js_end);
+ start = @min(js_start, value_len);
+ end = @min(js_end, value_len);
}
- const mode: SelectionMode = if (selection_mode) |m|
- std.meta.stringToEnum(SelectionMode, m) orelse return error.TypeError
- else
- .preserve;
-
{
+ const byte_start = selectionOffsetFromJs(self, start);
+ const byte_end = selectionOffsetFromJs(self, end);
const scratch = try frame.getArena(value.len + replacement.len, "TextEntry.setRangeText");
defer scratch.release();
- const new_value = try std.mem.concat(scratch.allocator(), u8, &.{ value[0..start], replacement, value[end..] });
+ const new_value = try std.mem.concat(scratch.allocator(), u8, &.{ value[0..byte_start], replacement, value[byte_end..] });
try self.setValue(new_value, frame);
}
- const new_end: u32 = @intCast(start + replacement.len);
+ const new_end: u32 = start + @as(u32, @intCast(CData.utf16Len(replacement)));
var new_start = sel_start;
var new_sel_end = sel_end;
switch (mode) {
@@ -398,7 +408,7 @@ pub fn TextEntry(comptime T: type) type {
}
},
}
- return applySelectionRange(self, new_start, new_sel_end, .none, frame);
+ return applySelectionRange(self, selectionOffsetFromJs(self, new_start), selectionOffsetFromJs(self, new_sel_end), .none, frame);
}
fn applySelectionRange(