From 8170f240c8e4fdf41729de59490fe08b854378a0 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 13 Mar 2022 11:00:44 -0500
Subject: [PATCH] Fix clickables not obeying mergeAdjacent

---
 src/features/clickables/Clickable.vue | 49 +++++++++++++--------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/features/clickables/Clickable.vue b/src/features/clickables/Clickable.vue
index 18976a0..0581e96 100644
--- a/src/features/clickables/Clickable.vue
+++ b/src/features/clickables/Clickable.vue
@@ -1,31 +1,30 @@
 <template>
-    <div
+    <button
         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
-            :style="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)
-            }"
-        >
-            <component v-if="unref(comp)" :is="unref(comp)" />
-            <MarkNode :mark="unref(mark)" />
-            <LinkNode :id="id" />
-        </button>
-    </div>
+        <component v-if="unref(comp)" :is="unref(comp)" />
+        <MarkNode :mark="unref(mark)" />
+        <LinkNode :id="id" />
+    </button>
 </template>
 
 <script lang="tsx">