@volverjs/ui-vue 0.0.10-beta.27 → 0.0.10-beta.28

package/src/components/VvAction/VvAction.vue

@@ -11,6 +11,7 @@
 	// props and emit
 	const props = defineProps(VvActionProps)
 	const emit = defineEmits(VvActionEvents)
+	const instance = getCurrentInstance()
 
 	// inject plugin
 	const volver = useVolver()
@@ -104,24 +105,33 @@
 			e.preventDefault()
 			return
 		}
+		if (instance?.vnode.props?.onClick) {
+			emit('click', e)
+			return
+		}
 		dropdownEventBus?.emit('click', e)
-		emit('click', e)
 	}
 
 	/**
 	 * @description Catch mouseover event
 	 */
 	const onMouseover = (e: Event) => {
+		if (instance?.vnode.props?.onMouseover) {
+			emit('mouseover', e)
+			return
+		}
 		dropdownEventBus?.emit('mouseover', e)
-		emit('mouseover', e)
 	}
 
 	/**
 	 * @description Catch mouseleave event
 	 */
 	const onMouseleave = (e: Event) => {
+		if (instance?.vnode.props?.onMouseleave) {
+			emit('mouseleave', e)
+			return
+		}
 		dropdownEventBus?.emit('mouseleave', e)
-		emit('mouseleave', e)
 	}
 </script>
 

package/src/components/VvButton/VvButton.vue

@@ -1,6 +1,7 @@
 <script lang="ts">
 	export default {
 		name: 'VvButton',
+		inheritAttrs: false,
 	}
 </script>
 
@@ -82,6 +83,14 @@
 	const toggleValue = computed(() => {
 		return props.value !== undefined ? props.value : name.value
 	})
+	const hasListeners = computed(() => {
+		if (!toggle.value) {
+			return undefined
+		}
+		return {
+			onClick,
+		}
+	})
 	const onClick = () => {
 		if (toggle.value) {
 			if (Array.isArray(modelValue.value)) {
@@ -108,6 +117,8 @@
 <template>
 	<VvAction
 		v-bind="{
+			...attrs,
+			...hasListeners,
 			disabled,
 			pressed,
 			active,
@@ -121,7 +132,6 @@
 		:id="hasId"
 		ref="element"
 		:class="bemCssClasses"
-		@click="onClick"
 	>
 		<!-- @slot Default slot -->
 		<slot>