From 0229c0130f7bfd1491c90635cdf03e9339153f8f Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Wed, 6 Jul 2022 22:52:03 -0500
Subject: [PATCH] Cleaned up tooltips

---
 src/features/tooltips/Tooltip.vue | 28 ++++++++++++++--------------
 src/features/tooltips/tooltip.ts  |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/features/tooltips/Tooltip.vue b/src/features/tooltips/Tooltip.vue
index a8bf6ae..1911186 100644
--- a/src/features/tooltips/Tooltip.vue
+++ b/src/features/tooltips/Tooltip.vue
@@ -34,10 +34,10 @@
     </div>
 </template>
 
-<script lang="ts">
+<script lang="tsx">
 import themes from "data/themes";
-import type { CoercableComponent, StyleValue } from "features/feature";
-import { jsx } from "features/feature";
+import type { CoercableComponent } from "features/feature";
+import { jsx, StyleValue } from "features/feature";
 import type { Persistent } from "game/persistence";
 import settings from "game/settings";
 import { Direction } from "util/common";
@@ -46,15 +46,15 @@ import {
     coerceComponent,
     computeOptionalComponent,
     processedPropType,
-    render,
+    renderJSX,
     unwrapRef
 } from "util/vue";
 import type { Component, PropType } from "vue";
-import { computed, defineComponent, ref, shallowRef, toRefs, unref, watchEffect } from "vue";
+import { computed, defineComponent, ref, shallowRef, toRefs, unref } from "vue";
 
 export default defineComponent({
     props: {
-        element: processedPropType<VueFeature>(Object),
+        element: Object as PropType<VueFeature>,
         display: {
             type: processedPropType<CoercableComponent>(Object, String, Function),
             required: true
@@ -73,14 +73,14 @@ export default defineComponent({
         const isShown = computed(() => (unwrapRef(pinned) || isHovered.value) && comp.value);
         const comp = computeOptionalComponent(display);
 
-        const elementComp = shallowRef<Component | "" | null>(null);
-        watchEffect(() => {
-            const currComponent = unwrapRef(element);
-            elementComp.value =
-                currComponent == null
-                    ? null
-                    : coerceComponent(jsx(() => render(currComponent) as JSX.Element));
-        });
+        const elementComp = shallowRef<Component | "" | null>(
+            coerceComponent(
+                jsx(() => {
+                    const currComponent = unwrapRef(element);
+                    return currComponent == null ? "" : renderJSX(currComponent);
+                })
+            )
+        );
 
         function togglePinned(e: MouseEvent) {
             const isPinned = pinned as unknown as Persistent<boolean> | undefined; // Vue typing :/
diff --git a/src/features/tooltips/tooltip.ts b/src/features/tooltips/tooltip.ts
index 54088a4..19ab705 100644
--- a/src/features/tooltips/tooltip.ts
+++ b/src/features/tooltips/tooltip.ts
@@ -85,13 +85,13 @@ export function addTooltip<T extends TooltipOptions>(
 
         const elementComponent = element[Component];
         element[Component] = TooltipComponent;
-        const elementGratherProps = element[GatherProps].bind(element);
+        const elementGatherProps = element[GatherProps].bind(element);
         element[GatherProps] = function gatherTooltipProps(this: GenericTooltip) {
             const { display, classes, style, direction, xoffset, yoffset, pinned } = this;
             return {
                 element: {
                     [Component]: elementComponent,
-                    [GatherProps]: elementGratherProps
+                    [GatherProps]: elementGatherProps
                 },
                 display,
                 classes,