diff --git a/packages/vue-primitives/src/shared/composeEventHandlers.ts b/packages/vue-primitives/src/shared/composeEventHandlers.ts index 08b05df15..24cc184d6 100644 --- a/packages/vue-primitives/src/shared/composeEventHandlers.ts +++ b/packages/vue-primitives/src/shared/composeEventHandlers.ts @@ -4,13 +4,13 @@ export function composeEventHandlers( { checkForDefaultPrevented = true } = {}, ) { return function handleEvent(event: E) { - const currentTarget = event.currentTarget as HTMLButtonElement - if (currentTarget.disabled || currentTarget.hasAttribute('data-disabled')) { + const currentTarget = event.currentTarget as HTMLButtonElement | null + if (currentTarget && (currentTarget.disabled || currentTarget.hasAttribute('data-disabled'))) { return } - const target = event.target as HTMLButtonElement - if (target.disabled || target.hasAttribute('data-disabled')) { + const target = event.target as HTMLButtonElement | null + if (target && (target.disabled || target.hasAttribute('data-disabled'))) { return }