Skip to content

Commit ebd3710

Browse files
sxzzsxzz
committed
refactor(runtime-vapor): don't record metadata for on 
1 parent 280b8cb commit ebd3710

File tree

2 files changed

+35
-32
lines changed

2 files changed

+35
-32
lines changed

‎packages/runtime-vapor/__tests__/directives/vModel.spec.ts

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { reactive, ref } from '@vue/reactivity'
22
import {
3+
delegate,
34
on,
45
setClass,
56
setDOMProp,
@@ -34,7 +35,7 @@ describe('directive: v-model', () => {
3435
const t0 = template('<input />')
3536
const n0 = t0() as HTMLInputElement
3637
withDirectives(n0, [[vModelDynamic, () => data.value]])
37-
on(n0, 'update:modelValue', () => val => (data.value = val))
38+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
3839
on(n0, 'input', () => () => spy(data.value))
3940
return n0
4041
}).render()
@@ -66,7 +67,7 @@ describe('directive: v-model', () => {
6667
)
6768
const n0 = t0() as HTMLInputElement
6869
withDirectives(n0, [[vModelSelect, () => data.value]])
69-
on(n0, 'update:modelValue', () => val => (data.value = val))
70+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
7071
on(n0, 'change', () => () => spy(data.value))
7172
return n0
7273
}).render()
@@ -93,7 +94,7 @@ describe('directive: v-model', () => {
9394

9495
setDOMProp(n0, 'type', 'number')
9596
withDirectives(n0, [[vModelDynamic, () => data.value]])
96-
on(n0, 'update:modelValue', () => val => (data.value = val))
97+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
9798
return n0
9899
}).render()
99100

@@ -117,8 +118,8 @@ describe('directive: v-model', () => {
117118
const t0 = template('<input />')
118119
const n0 = t0() as HTMLInputElement
119120
withDirectives(n0, [[vModelDynamic, () => data.value]])
120-
on(n0, 'update:modelValue', () => val => (data.value = val))
121-
on(n0, 'update:modelValue', () => spy)
121+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
122+
delegate(n0, 'update:modelValue', () => spy)
122123
return n0
123124
}).render()
124125

@@ -141,7 +142,7 @@ describe('directive: v-model', () => {
141142
const t0 = template('<input />')
142143
const n0 = t0() as HTMLInputElement
143144
withDirectives(n0, [[vModelDynamic, () => data.value]])
144-
on(n0, 'update:modelValue', () => (toggle.value ? spy1 : spy2))
145+
delegate(n0, 'update:modelValue', () => (toggle.value ? spy1 : spy2))
145146
return n0
146147
}).render()
147148

@@ -168,7 +169,7 @@ describe('directive: v-model', () => {
168169
const t0 = template('<textarea />')
169170
const n0 = t0() as HTMLInputElement
170171
withDirectives(n0, [[vModelDynamic, () => data.value]])
171-
on(n0, 'update:modelValue', () => val => (data.value = val))
172+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
172173
return n0
173174
}).render()
174175

@@ -204,14 +205,14 @@ describe('directive: v-model', () => {
204205
withDirectives(input1, [
205206
[vModelDynamic, () => data.number, '', { number: true }],
206207
])
207-
on(input1, 'update:modelValue', () => val => (data.number = val))
208+
delegate(input1, 'update:modelValue', () => val => (data.number = val))
208209

209210
// trim
210211
setClass(input2, 'trim')
211212
withDirectives(input2, [
212213
[vModelDynamic, () => data.trim, '', { trim: true }],
213214
])
214-
on(input2, 'update:modelValue', () => val => (data.trim = val))
215+
delegate(input2, 'update:modelValue', () => val => (data.trim = val))
215216

216217
// trim & number
217218
setClass(input3, 'trim-number')
@@ -223,14 +224,18 @@ describe('directive: v-model', () => {
223224
{ trim: true, number: true },
224225
],
225226
])
226-
on(input3, 'update:modelValue', () => val => (data.trimNumber = val))
227+
delegate(
228+
input3,
229+
'update:modelValue',
230+
() => val => (data.trimNumber = val),
231+
)
227232

228233
// lazy
229234
setClass(input4, 'lazy')
230235
withDirectives(input4, [
231236
[vModelDynamic, () => data.lazy, '', { lazy: true }],
232237
])
233-
on(input4, 'update:modelValue', () => val => (data.lazy = val))
238+
delegate(input4, 'update:modelValue', () => val => (data.lazy = val))
234239

235240
return n0
236241
}).render()
@@ -282,7 +287,7 @@ describe('directive: v-model', () => {
282287
withDirectives(n1, [
283288
[vModelDynamic, () => data.value, '', { number: true }],
284289
])
285-
on(n1, 'update:modelValue', () => val => (data.value = val))
290+
delegate(n1, 'update:modelValue', () => val => (data.value = val))
286291

287292
setDOMProps(n2, [
288293
['class', 'bar'],
@@ -294,7 +299,7 @@ describe('directive: v-model', () => {
294299
withDirectives(n2, [
295300
[vModelDynamic, () => data.value, '', { lazy: true }],
296301
])
297-
on(n2, 'update:modelValue', () => val => (data.value = val))
302+
delegate(n2, 'update:modelValue', () => val => (data.value = val))
298303
return n0
299304
}).render()
300305

@@ -360,7 +365,7 @@ describe('directive: v-model', () => {
360365
const n0 = t0() as HTMLInputElement
361366
setDOMProp(n0, 'type', 'checkbox')
362367
withDirectives(n0, [[vModelDynamic, () => data.value]])
363-
on(n0, 'update:modelValue', () => val => (data.value = val))
368+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
364369
return n0
365370
}).render()
366371

@@ -396,7 +401,7 @@ describe('directive: v-model', () => {
396401
['false-value', 'no'],
397402
])
398403
withDirectives(n0, [[vModelDynamic, () => data.value]])
399-
on(n0, 'update:modelValue', () => val => (data.value = val))
404+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
400405
return n0
401406
}).render()
402407

@@ -434,7 +439,7 @@ describe('directive: v-model', () => {
434439
['false-value', { no: 'no' }],
435440
])
436441
withDirectives(n0, [[vModelDynamic, () => data.value]])
437-
on(n0, 'update:modelValue', () => val => (data.value = val))
442+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
438443
return n0
439444
}).render()
440445

@@ -470,15 +475,15 @@ describe('directive: v-model', () => {
470475
['value', 'foo'],
471476
])
472477
withDirectives(n1, [[vModelDynamic, () => data.value]])
473-
on(n1, 'update:modelValue', () => val => (data.value = val))
478+
delegate(n1, 'update:modelValue', () => val => (data.value = val))
474479

475480
setDOMProps(n2, [
476481
['class', 'bar'],
477482
['type', 'checkbox'],
478483
['value', 'bar'],
479484
])
480485
withDirectives(n2, [[vModelDynamic, () => data.value]])
481-
on(n2, 'update:modelValue', () => val => (data.value = val))
486+
delegate(n2, 'update:modelValue', () => val => (data.value = val))
482487

483488
return n0
484489
}).render()
@@ -534,15 +539,15 @@ describe('directive: v-model', () => {
534539
['value', 'foo'],
535540
])
536541
withDirectives(n1, [[vModelDynamic, () => data.value]])
537-
on(n1, 'update:modelValue', () => val => (data.value = val))
542+
delegate(n1, 'update:modelValue', () => val => (data.value = val))
538543

539544
setDOMProps(n2, [
540545
['class', 'bar'],
541546
['type', 'checkbox'],
542547
['value', 'bar'],
543548
])
544549
withDirectives(n2, [[vModelDynamic, () => data.value]])
545-
on(n2, 'update:modelValue', () => val => (data.value = val))
550+
delegate(n2, 'update:modelValue', () => val => (data.value = val))
546551

547552
return n0
548553
}).render()
@@ -598,15 +603,15 @@ describe('directive: v-model', () => {
598603
['value', 'foo'],
599604
])
600605
withDirectives(n1, [[vModelDynamic, () => data.value]])
601-
on(n1, 'update:modelValue', () => val => (data.value = val))
606+
delegate(n1, 'update:modelValue', () => val => (data.value = val))
602607

603608
setDOMProps(n2, [
604609
['class', 'bar'],
605610
['type', 'radio'],
606611
['value', 'bar'],
607612
])
608613
withDirectives(n2, [[vModelDynamic, () => data.value]])
609-
on(n2, 'update:modelValue', () => val => (data.value = val))
614+
delegate(n2, 'update:modelValue', () => val => (data.value = val))
610615

611616
return n0
612617
}).render()
@@ -651,7 +656,7 @@ describe('directive: v-model', () => {
651656

652657
setDOMProp(n0, 'value', null)
653658
withDirectives(n0, [[vModelDynamic, () => data.value]])
654-
on(n0, 'update:modelValue', () => val => (data.value = val))
659+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
655660
return n0
656661
}).render()
657662

@@ -701,7 +706,7 @@ describe('directive: v-model', () => {
701706
['multiple', true],
702707
])
703708
withDirectives(n0, [[vModelDynamic, () => data.value]])
704-
on(n0, 'update:modelValue', () => val => (data.value = val))
709+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
705710
return n0
706711
}).render()
707712

@@ -755,7 +760,7 @@ describe('directive: v-model', () => {
755760
withDirectives(n0, [
756761
[vModelDynamic, () => data.value, '', { number: true }],
757762
])
758-
on(n0, 'update:modelValue', () => val => (data.value = val))
763+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
759764
return n0
760765
}).render()
761766

@@ -785,7 +790,7 @@ describe('directive: v-model', () => {
785790
withDirectives(n0, [
786791
[vModelDynamic, () => data.value, '', { number: true }],
787792
])
788-
on(n0, 'update:modelValue', () => val => (data.value = val))
793+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
789794
return n0
790795
}).render()
791796

@@ -845,7 +850,7 @@ describe('directive: v-model', () => {
845850
withDirectives(n0, [
846851
[vModelDynamic, () => data.value, '', { number: true }],
847852
])
848-
on(n0, 'update:modelValue', () => val => (data.value = val))
853+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
849854
return n0
850855
}).render()
851856

@@ -913,7 +918,7 @@ describe('directive: v-model', () => {
913918
['multiple', true],
914919
])
915920
withDirectives(n0, [[vModelDynamic, () => data.value]])
916-
on(n0, 'update:modelValue', () => val => (data.value = val))
921+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
917922
return n0
918923
}).render()
919924

@@ -976,7 +981,7 @@ describe('directive: v-model', () => {
976981
withDirectives(n0, [
977982
[vModelDynamic, () => data.value, '', { number: true }],
978983
])
979-
on(n0, 'update:modelValue', () => val => (data.value = val))
984+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
980985
return n0
981986
}).render()
982987

@@ -1026,7 +1031,7 @@ describe('directive: v-model', () => {
10261031
const t0 = template('<input />')
10271032
const n0 = t0() as HTMLInputElement
10281033
withDirectives(n0, [[vModelDynamic, () => data.value]])
1029-
on(n0, 'update:modelValue', () => val => (data.value = val))
1034+
delegate(n0, 'update:modelValue', () => val => (data.value = val))
10301035
return n0
10311036
}).render()
10321037

‎packages/runtime-vapor/src/dom/event.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export function on(
3030
ModifierOptions & { effect?: boolean } = {},
3131
) {
3232
const handler: DelegatedHandler = eventHandler(handlerGetter, options)
33-
const cleanupMetadata = recordEventMetadata(el, event, handler)
3433
let cleanupEvent: (() => void) | undefined
3534
queuePostRenderEffect(() => {
3635
cleanupEvent = addEventListener(el, event, handler, options)
@@ -43,7 +42,6 @@ export function on(
4342
}
4443

4544
function cleanup() {
46-
cleanupMetadata()
4745
cleanupEvent && cleanupEvent()
4846
}
4947
}

0 commit comments

Comments
 (0)