File tree 3 files changed +6
-1
lines changed
3 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -446,6 +446,10 @@ describe('vnode', () => {
446
446
onClick : [ clickHandler1 , clickHandler2 ] ,
447
447
onFocus : focusHandler2
448
448
} )
449
+ let props3 : Data = { onClick : undefined }
450
+ expect ( mergeProps ( props1 , props3 ) ) . toMatchObject ( {
451
+ onClick : clickHandler1
452
+ } )
449
453
} )
450
454
451
455
test ( 'default' , ( ) => {
Original file line number Diff line number Diff line change @@ -798,6 +798,7 @@ export function mergeProps(...args: (Data & VNodeProps)[]) {
798
798
const existing = ret [ key ]
799
799
const incoming = toMerge [ key ]
800
800
if (
801
+ incoming &&
801
802
existing !== incoming &&
802
803
! ( isArray ( existing ) && existing . includes ( incoming ) )
803
804
) {
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ function patchStopImmediatePropagation(
141
141
originalStop . call ( e )
142
142
; ( e as any ) . _stopped = true
143
143
}
144
- return value . map ( fn => ( e : Event ) => ! ( e as any ) . _stopped && fn ( e ) )
144
+ return value . map ( fn => ( e : Event ) => ! ( e as any ) . _stopped && fn && fn ( e ) )
145
145
} else {
146
146
return value
147
147
}
You can’t perform that action at this time.
0 commit comments