Fix clickables not obeying mergeAdjacent
This commit is contained in:
parent
56d3a21440
commit
8170f240c8
1 changed files with 24 additions and 25 deletions
|
@ -1,31 +1,30 @@
|
||||||
<template>
|
<template>
|
||||||
<div
|
<button
|
||||||
v-if="unref(visibility) !== Visibility.None"
|
v-if="unref(visibility) !== Visibility.None"
|
||||||
:style="{ visibility: unref(visibility) === Visibility.Hidden ? 'hidden' : undefined }"
|
:style="[
|
||||||
|
{ visibility: unref(visibility) === Visibility.Hidden ? 'hidden' : undefined },
|
||||||
|
unref(style) ?? []
|
||||||
|
]"
|
||||||
|
@click="onClick"
|
||||||
|
@mousedown="start"
|
||||||
|
@mouseleave="stop"
|
||||||
|
@mouseup="stop"
|
||||||
|
@touchstart="start"
|
||||||
|
@touchend="stop"
|
||||||
|
@touchcancel="stop"
|
||||||
|
:class="{
|
||||||
|
feature: true,
|
||||||
|
clickable: true,
|
||||||
|
can: unref(canClick),
|
||||||
|
locked: !unref(canClick),
|
||||||
|
small,
|
||||||
|
...unref(classes)
|
||||||
|
}"
|
||||||
>
|
>
|
||||||
<button
|
<component v-if="unref(comp)" :is="unref(comp)" />
|
||||||
:style="unref(style)"
|
<MarkNode :mark="unref(mark)" />
|
||||||
@click="onClick"
|
<LinkNode :id="id" />
|
||||||
@mousedown="start"
|
</button>
|
||||||
@mouseleave="stop"
|
|
||||||
@mouseup="stop"
|
|
||||||
@touchstart="start"
|
|
||||||
@touchend="stop"
|
|
||||||
@touchcancel="stop"
|
|
||||||
:class="{
|
|
||||||
feature: true,
|
|
||||||
clickable: true,
|
|
||||||
can: unref(canClick),
|
|
||||||
locked: !unref(canClick),
|
|
||||||
small,
|
|
||||||
...unref(classes)
|
|
||||||
}"
|
|
||||||
>
|
|
||||||
<component v-if="unref(comp)" :is="unref(comp)" />
|
|
||||||
<MarkNode :mark="unref(mark)" />
|
|
||||||
<LinkNode :id="id" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="tsx">
|
<script lang="tsx">
|
||||||
|
|
Loading…
Reference in a new issue