Commit d91b507
committed
fix(forms): place controlCreate before listeners in signal forms template creation block
Previously, the ControlCreate IR op was inserted after the target element's
create op (ElementStart/Element), but because the ordering phase places
listeners (Listener, TwoWayListener) immediately after element-start ops, the
ControlCreate op ended up being emitted after the ElementEnd instruction.
This caused a behaviour discrepancy between [formField] and [(ngModel)]:
inside an (input) event handler, the field value reported by Signal Forms
still held the old value while ngModel already reflected the new one. The
ControlCreate runtime instruction sets up the two-way sync between the DOM
control and the field signal, so it must be called early during element
creation (before any listeners that may read the updated value).
Two compiler changes fix this:
1. control_directives.ts - findCreateInstruction now returns the *first*
matching create op for a given target xref (ElementStart or Element)
instead of the last one. Previously ElementEnd was in the eligible set which
meant the search returned the ElementEnd op, causing ControlCreate to land
after it. Removing ElementEnd and ContainerEnd from CONTROL_OP_CREATE_KINDS
ensures the op is always inserted immediately after the opening tag.
2. empty_elements.ts - ElementStart+ElementEnd pairs that contain only a
ControlCreate op between them can still be collapsed into a single Element
instruction. Added ir.OpKind.ControlCreate to IGNORED_OP_KINDS so the
collapseEmptyInstructions phase skips over it when looking for a matching
start op.
Compliance test golden files for two-way binding templates updated to reflect
the new (correct) instruction order: controlCreate now appears immediately after
elementStart, before the twoWayListener.
Fixes angular#68182
Related: angular#636081 parent 2896c93 commit d91b507
7 files changed
Lines changed: 33 additions & 11 deletions
File tree
- packages
- compiler-cli/test/compliance/test_cases/r3_view_compiler_listener
- compiler/src/template/pipeline/src/phases
- forms/signals/test/web
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
12 | | - | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
10 | | - | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
11 | | - | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
9 | | - | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
Lines changed: 2 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
47 | 46 | | |
48 | 47 | | |
49 | | - | |
50 | 48 | | |
51 | 49 | | |
52 | 50 | | |
| |||
55 | 53 | | |
56 | 54 | | |
57 | 55 | | |
58 | | - | |
59 | 56 | | |
60 | 57 | | |
61 | 58 | | |
62 | 59 | | |
63 | | - | |
64 | | - | |
| 60 | + | |
65 | 61 | | |
66 | 62 | | |
67 | | - | |
| 63 | + | |
68 | 64 | | |
69 | 65 | | |
70 | 66 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
138 | 164 | | |
139 | 165 | | |
140 | 166 | | |
| |||
0 commit comments