Skip to content

Lightpanda: the headless browser designed for AI and automation

owner form only for connected elements

Karl Seguinaadeef344bcd
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index 5efacccfb..6e3b34e4a 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -2955,6 +2955,8 @@ const RemoveNodeOpts = struct {
reconnect_to: ?*Node,
// Set to false when the caller queues its own combined mutation record
notify_observers: bool = true,
+ // The node will be re-inserted right away, the detached must not be observed
+ move: bool = false,
};
pub fn removeNode(self: *Frame, parent: *Node, child: *Node, opts: RemoveNodeOpts) void {
@@ -2986,7 +2988,7 @@ pub fn removeNode(self: *Frame, parent: *Node, child: *Node, opts: RemoveNodeOpt
child._parent = null;
// deferred: the id maps are only updated further down
- defer if (self._form_associated.items.len != 0) {
+ defer if (opts.move == false and self._form_associated.items.len != 0) {
Element.Html.Custom.formTreeChanged(parent, child, self);
};
diff --git a/src/browser/tests/custom_elements/form_callbacks.html b/src/browser/tests/custom_elements/form_callbacks.html
index 94c647224..315e0c7aa 100644
--- a/src/browser/tests/custom_elements/form_callbacks.html
+++ b/src/browser/tests/custom_elements/form_callbacks.html
@@ -99,6 +99,52 @@ customElements.define('fc-control', FcControl);
}
</script>
+<script id="move_before">
+{
+ // an atomic move never exposes the detached state
+ const container = document.getElementById('container');
+ container.innerHTML = '<form id="mb_f1"><div></div><div></div><fc-control form="mb_f1"></fc-control></form><form id="mb_f2"><fc-control></fc-control></form>';
+ const [f1, f2] = container.querySelectorAll('form');
+ const [div1, div2] = f1.querySelectorAll('div');
+ const [with_attr, control] = container.querySelectorAll('fc-control');
+ testing.expectEqual([f2], control.forms);
+ testing.expectEqual([f1], with_attr.forms);
+
+ div1.moveBefore(with_attr, null);
+ testing.expectEqual([f1], with_attr.forms);
+
+ f1.moveBefore(control, null);
+ testing.expectEqual([f2, f1], control.forms);
+
+ div2.moveBefore(control, null);
+ testing.expectEqual([f2, f1], control.forms);
+ container.innerHTML = '';
+}
+
+{
+ const container = document.getElementById('container');
+ container.innerHTML = '<fieldset disabled><legend></legend><legend><fc-control></fc-control></legend></fieldset><div></div>';
+ const fieldset = container.querySelector('fieldset');
+ const div = container.querySelector('div');
+ const [first, second] = fieldset.querySelectorAll('legend');
+ const control = container.querySelector('fc-control');
+ testing.expectEqual([true], control.disabled);
+
+ // moved out of the fieldset: the control's legend becomes the first one
+ div.moveBefore(first, null);
+ testing.expectEqual([true, false], control.disabled);
+
+ // moved back in front
+ fieldset.moveBefore(first, second);
+ testing.expectEqual([true, false, true], control.disabled);
+
+ // reordered within the same fieldset
+ fieldset.moveBefore(second, first);
+ testing.expectEqual([true, false, true, false], control.disabled);
+ container.innerHTML = '';
+}
+</script>
+
<script id="disabled">
{
const control = new FcControl();
diff --git a/src/browser/tests/element/html/form.html b/src/browser/tests/element/html/form.html
index 5815a8638..a8df7c3de 100644
--- a/src/browser/tests/element/html/form.html
+++ b/src/browser/tests/element/html/form.html
@@ -859,3 +859,19 @@
form.removeEventListener('reset', reenter)
}
</script>
+
+<script id="form_attribute_ignored_when_disconnected">
+{
+ // a disconnected control falls back to its ancestor form
+ const form = document.createElement('form')
+ const input = document.createElement('input')
+ input.setAttribute('form', 'nope')
+ form.appendChild(input)
+ testing.expectEqual(form, input.form)
+
+ // connected, the form attribute is authoritative again
+ document.body.appendChild(form)
+ testing.expectEqual(null, input.form)
+ form.remove()
+}
+</script>
diff --git a/src/browser/webapi/Node.zig b/src/browser/webapi/Node.zig
index c447ea44c..d87bb4959 100644
--- a/src/browser/webapi/Node.zig
+++ b/src/browser/webapi/Node.zig
@@ -1007,8 +1007,9 @@ pub fn moveBefore(self: *Node, node_val: js.Value, child_val: js.Value, frame: *
const connected = node.isConnected();
const previous_root = node.getRootNode(.{});
- if (node._parent) |old_parent| {
- frame.removeNode(old_parent, node, .{ .reconnect_to = self });
+ const old_parent = node._parent;
+ if (old_parent) |op| {
+ frame.removeNode(op, node, .{ .reconnect_to = self, .move = true });
}
if (ref) |r| {
@@ -1017,6 +1018,13 @@ pub fn moveBefore(self: *Node, node_val: js.Value, child_val: js.Value, frame: *
try frame.appendNode(self, node, .{ .previous_root = previous_root });
}
+ if (old_parent) |op| {
+ // the removal skipped this to not expose the intermediate state
+ if (op != self and frame._form_associated.items.len != 0) {
+ Element.Html.Custom.formLegendMoved(op, node, frame);
+ }
+ }
+
if (connected) {
// Enqueue on a move callback (if we're connected) for any nested
// custom element
diff --git a/src/browser/webapi/element/html/Custom.zig b/src/browser/webapi/element/html/Custom.zig
index 67c740116..6c08b44f6 100644
--- a/src/browser/webapi/element/html/Custom.zig
+++ b/src/browser/webapi/element/html/Custom.zig
@@ -143,12 +143,19 @@ pub fn formTreeChanged(parent: *Node, child: *Node, frame: *Frame) void {
formAttributeTargetsChanged(frame);
}
- if (el.getTag() == .legend) {
- const fieldset = parent.is(Element) orelse return;
- if (fieldset.getTag() == .fieldset) {
- // legends moving around in a fieldset can alter the state of the form
- formStateChangedInSubtree(fieldset.asNode(), frame);
- }
+ formLegendMoved(parent, child, frame);
+}
+
+// `child` was inserted into or removed from `parent`. Legends moving around in
+// a fieldset can alter the disabled state of its other descendants.
+pub fn formLegendMoved(parent: *Node, child: *Node, frame: *Frame) void {
+ const el = child.is(Element) orelse return;
+ if (el.getTag() != .legend) {
+ return;
+ }
+ const fieldset = parent.is(Element) orelse return;
+ if (fieldset.getTag() == .fieldset) {
+ formStateChangedInSubtree(fieldset.asNode(), frame);
}
}
diff --git a/src/browser/webapi/element/html/Form.zig b/src/browser/webapi/element/html/Form.zig
index 2d4a2fbb8..51603eda1 100644
--- a/src/browser/webapi/element/html/Form.zig
+++ b/src/browser/webapi/element/html/Form.zig
@@ -268,12 +268,15 @@ pub fn ownerOf(element: *Element, frame: *Frame) ?*Form {
// A form attribute is authoritative, even when it names nothing. It
// resolves in the control's own tree (shadow root or document), not the
// calling realm's.
- if (element.getAttributeSafe(comptime .wrap("form"))) |form_id| {
- const form_element = frame.getElementByIdFromNode(element.asNode(), form_id) orelse return null;
- return form_element.is(Form);
+ const element_node = element.asNode();
+ if (element_node.isConnected()) {
+ if (element.getAttributeSafe(comptime .wrap("form"))) |form_id| {
+ const form_element = frame.getElementByIdFromNode(element_node, form_id) orelse return null;
+ return form_element.is(Form);
+ }
}
- var node = element.asNode()._parent;
+ var node = element_node._parent;
while (node) |n| : (node = n._parent) {
if (n.is(Element.Html.Form)) |form| {
return form;