From 8e5ec954328b386844acad5ec30cfc62855f86e4 Mon Sep 17 00:00:00 2001
From: riqo <hernandeze2@xavier.edu>
Date: Sun, 1 Nov 2020 15:27:25 -0600
Subject: [PATCH] fix TS issues

---
 package.json                                  |  2 +-
 src/components/UI/UIDetails/messageItem.vue   |  2 +-
 src/components/UI/UIDetails/messages.ts       | 10 +--
 src/components/UI/index.vue                   | 13 +---
 src/composables/anims/useMessageItemAnims.ts  |  6 +-
 src/composables/anims/useUIindexAnims.ts      | 74 ++++++++++---------
 .../computed/useMessageItemComp.ts            |  4 +-
 src/shims-vue.d.ts                            | 12 +--
 src/types/animejs/index.ts                    | 13 ++++
 src/types/message/index.ts                    | 18 +++++
 10 files changed, 88 insertions(+), 66 deletions(-)
 create mode 100644 src/types/animejs/index.ts
 create mode 100644 src/types/message/index.ts

diff --git a/package.json b/package.json
index 40f85e2..899e611 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   },
   "main": "background.js",
   "dependencies": {
+    "@types/animejs": "^3.1.2",
     "@types/bindings": "^1.3.0",
     "@types/uuid": "^8.3.0",
     "@types/ws": "^7.2.7",
@@ -28,7 +29,6 @@
     "ws": "^7.3.1"
   },
   "devDependencies": {
-    "@types/animejs": "^3.1.2",
     "@types/jest": "^24.0.19",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
diff --git a/src/components/UI/UIDetails/messageItem.vue b/src/components/UI/UIDetails/messageItem.vue
index 6ca0576..3e9351e 100644
--- a/src/components/UI/UIDetails/messageItem.vue
+++ b/src/components/UI/UIDetails/messageItem.vue
@@ -75,7 +75,7 @@ export default defineComponent({
     const { textWrap } = useTextWrap();
     const { drawMessage, signatureTranslate } = useMessageItemAnims({
       mr: messageRect,
-      tr: messageText
+      tr: messageText,
     })
 
     // wraps message text before render
diff --git a/src/components/UI/UIDetails/messages.ts b/src/components/UI/UIDetails/messages.ts
index 8e1ad41..46724d3 100644
--- a/src/components/UI/UIDetails/messages.ts
+++ b/src/components/UI/UIDetails/messages.ts
@@ -1,11 +1,5 @@
-interface Message {
-  content: string;
-  signature: string;
-  outgoing: boolean;
-  modifier: string;
-  imgURL: string;
-  id: string;
-}
+import { Message } from "@/types/message/index";
+
 const Messages: Message[] = [
   {
     content:
diff --git a/src/components/UI/index.vue b/src/components/UI/index.vue
index 413a07e..7262812 100644
--- a/src/components/UI/index.vue
+++ b/src/components/UI/index.vue
@@ -49,7 +49,6 @@
           appear
           v-on:before-appear="beforeEnter"
           v-on:appear="enter"
-          v-on:appear-cancelled="leave"
         >
           <MessageItem
             :item="item"
@@ -85,25 +84,21 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, inject, onMounted, reactive } from "vue";
+import { defineComponent, ref, reactive } from "vue";
 import MessageItem from './UIDetails/messageItem.vue';
 import InputItem from "./UIDetails/inputItem.vue";
 import Messages from "./UIDetails/messages";
 import useUIindexAnims from "@/composables/anims/useUIindexAnims";
 export default defineComponent({
   name: 'UIindex',
-  components: { MessageItem, InputItem },
+  components: { MessageItem },
   setup() {
     const renderArr: Message[] = reactive([])
     const messages = Messages;
     const count = ref(0);
 
-    const { beforeEnter, enter, msgOffset } = useUIindexAnims();
+    const { beforeEnter, enter } = useUIindexAnims();
 
-    // TODO implemeant Undo animation
-    function leave() {
-
-    }
     const renderMessage = () => {
         if (count.value < messages.length) {
           renderArr.push(messages[count.value])
@@ -115,10 +110,8 @@ export default defineComponent({
     return {
         renderMessage,
         renderArr,
-        msgOffset,
         beforeEnter,
         enter,
-        leave
     }
   },
 });
diff --git a/src/composables/anims/useMessageItemAnims.ts b/src/composables/anims/useMessageItemAnims.ts
index a872fd9..518eab3 100644
--- a/src/composables/anims/useMessageItemAnims.ts
+++ b/src/composables/anims/useMessageItemAnims.ts
@@ -4,7 +4,7 @@ interface Ref<A> {
 }
 export default function useMessageItemAnims({
   mr,
-  tr
+  tr,
 }: {
   mr: Ref<string>;
   tr: Ref<string>;
@@ -13,7 +13,7 @@ export default function useMessageItemAnims({
   let messageRect: SVGSVGElement & SVGRectElement;
   let messageText: SVGSVGElement & SVGTextElement;
 
-  onMounted(() => {
+  onMounted(async () => {
     messageRect = (mr.value as unknown) as SVGSVGElement & SVGRectElement;
     messageText = (tr.value as unknown) as SVGSVGElement & SVGTextElement;
   });
@@ -44,6 +44,6 @@ export default function useMessageItemAnims({
 
   return {
     drawMessage,
-    signatureTranslate
+    signatureTranslate,
   };
 }
diff --git a/src/composables/anims/useUIindexAnims.ts b/src/composables/anims/useUIindexAnims.ts
index eea368f..21eec6a 100644
--- a/src/composables/anims/useUIindexAnims.ts
+++ b/src/composables/anims/useUIindexAnims.ts
@@ -1,6 +1,13 @@
-import { inject, onMounted, ref } from "vue";
+import { inject, onMounted } from "vue";
+import AnimeFunc from "@/types/animejs/index";
+import { MessageAnimeFunc } from '@/types/message/index';
 export default function useUIindexAnims() {
-  const anime: any = inject("animejs");
+
+  // imports animejs safely
+  let anime: AnimeFunc;
+  const animeInject: AnimeFunc | undefined = inject("animejs");
+  if (animeInject) anime = animeInject;
+
   const msgOffset = {
     x: 0,
     y: 0
@@ -17,32 +24,27 @@ export default function useUIindexAnims() {
 
   onMounted(() => {
     messenger = document.getElementById("messenger");
-    if (messenger) {
-      winW = messenger.clientWidth;
-    }
+    if (messenger) winW = messenger.clientWidth;
   });
 
-  const getSVGElHeight = (el: SVGGElement) => el.getBBox().height;
-
-  function calculateAllCardsHeight() {
-    const cards = document.querySelectorAll(".test");
-    if (cards.length) {
-      renderList = cards;
-      for (const card of cards) {
-        const el = card as SVGGElement;
-        const height = getSVGElHeight(el);
-        totalHeight += height;
+  function calculateAllMessageHeight(): void {
+    const messages = document.querySelectorAll(".test");
+    if (messages.length) {
+      renderList = messages;
+      for (const message of messages) {
+        const el = message as SVGGElement;
+        totalHeight += el.getBBox().height;
       }
       scrollAnim = totalHeight > 500 ? true : false;
     }
   }
 
-  async function beforeEnter(el: SVGGElement) {
+  function beforeEnter(el: SVGGElement): void {
     modifier = el.className.baseVal.substring(0, 2);
-    if (!scrollAnim) calculateAllCardsHeight();
+    if (!scrollAnim) calculateAllMessageHeight();
   }
 
-  function scrollOffset(l: NodeList, height: number) {
+  function scrollOffset(l: NodeList, height: number): void {
     for (const card of l) {
       const c = card.parentNode as HTMLElement;
       anime({
@@ -50,14 +52,13 @@ export default function useUIindexAnims() {
         transform: `translate(0 ${height})`,
         easing: "easeInOutQuad",
         duration: 500,
-      })
+      });
     }
   }
 
-  function scrollAnimate(el: SVGGElement) {
+  const scrollAnimate: MessageAnimeFunc = (el, transform) => {
     anime({
-      targets: el,
-      transform: `translate(${msgOffset.x} ${msgOffset.y})`,
+      targets: el, transform: transform.initialTranslate,
       easing: "easeInOutQuad",
       duration: 500,
       begin: function() {
@@ -66,25 +67,23 @@ export default function useUIindexAnims() {
       complete: function() {
         anime({
           targets: el,
-          transform: `translate(${msgOffset.x} ${msgOffset.y + 5})`,
+          transform: transform.finalTranslate,
           offset: 1000
         });
       }
     });
   }
 
-  function stackAnimate(el: SVGGElement) {
-    const translateUp = `translate(${msgOffset.x} ${msgOffset.y})`;
-    const translateDown = `translate(${msgOffset.x} ${msgOffset.y + 5})`;
+  const stackAnimate: MessageAnimeFunc = (el, transform) => {
     anime({
       targets: el,
-      transform: translateUp,
+      transform: transform.initialTranslate,
       easing: "easeInOutQuad",
       duration: 1000,
       complete: function() {
         anime({
           targets: el,
-          transform: translateDown,
+          transform: transform.finalTranslate,
           easing: "easeInOutQuad",
           duration: 500,
           offset: 1000
@@ -93,11 +92,15 @@ export default function useUIindexAnims() {
     });
   }
 
-  function addMessage(el: SVGGElement) {
-    scrollAnim ? scrollAnimate(el) : stackAnimate(el)
+  function addMessage(el: SVGGElement): void {
+    const transform = {
+      initialTranslate: `translate(${msgOffset.x} ${msgOffset.y})`,
+      finalTranslate: `translate(${msgOffset.x} ${msgOffset.y + 5})`
+    }
+    scrollAnim ? scrollAnimate(el, transform) : stackAnimate(el, transform)
   }
 
-  function setXoffset(messageWidth: number) {
+  function setXoffset(messageWidth: number): void {
     const paddingLeft = 40;
     switch (modifier) {
       case "sf":
@@ -111,7 +114,7 @@ export default function useUIindexAnims() {
     }
   }
 
-  function setYoffset(messageHeight: number) {
+  function setYoffset(messageHeight: number): void {
     if (prevCardH === 0) {
       msgOffset.y += messageHeight;
     } else {
@@ -120,7 +123,7 @@ export default function useUIindexAnims() {
     prevCardH = messageHeight;
   }
 
-  function calculateMessageOffsets(msg: any) {
+  function calculateMessageOffsets(msg: HTMLElement): void {
     const msgRect = msg.getBoundingClientRect();
     if (scrollAnim) {
       // update scroll
@@ -130,10 +133,9 @@ export default function useUIindexAnims() {
     setYoffset(msgRect.height)
   }
 
-
-  async function enter(el: SVGGElement) {
+  async function enter(el: SVGGElement): Promise<void> {
     msg = await document.getElementById(el.id);
-    calculateMessageOffsets(msg)
+    if (msg) calculateMessageOffsets(msg);
     addMessage(el);
   }
 
diff --git a/src/composables/computed/useMessageItemComp.ts b/src/composables/computed/useMessageItemComp.ts
index 96a5b8a..ecd15a7 100644
--- a/src/composables/computed/useMessageItemComp.ts
+++ b/src/composables/computed/useMessageItemComp.ts
@@ -24,9 +24,9 @@ export default function useMessageItemComp(m: string) {
   const startingOffset = computed(() => {
     switch (m) {
       case "sf":
-        return "translate(10, 600)";
+        return "translate(115, 600)";
       case "ai":
-        return "translate(135, 600)";
+        return "translate(200, 600)";
       default:
         return "translate(20, 600)";
     }
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index b2f593a..1117654 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -4,11 +4,13 @@ declare module "*.vue" {
   export default component;
 }
 
-// declare module "anime-js" {
-//   import * as anime from "animejs/lib/anime.es.js";
-//   function anime(): void;
-//   export = anime;
-// }
+declare module "anime-js" {
+  namespace anime {
+    import * as anime from "animejs/lib/anime.es.js";
+    function anime(): void;
+    export = anime;
+  }
+}
 
 interface Message {
   content: string;
diff --git a/src/types/animejs/index.ts b/src/types/animejs/index.ts
new file mode 100644
index 0000000..c3c502d
--- /dev/null
+++ b/src/types/animejs/index.ts
@@ -0,0 +1,13 @@
+interface AnimeFuncParams {
+    targets: HTMLElement | SVGGElement | SVGElement;
+    transform: string;
+    easing?: string;
+    duration?: number;
+    offset?: number;
+    begin?: () => void;
+    complete?: () => void;
+}
+
+export default interface AnimeFunc {
+    (params: AnimeFuncParams): void | undefined;
+}
diff --git a/src/types/message/index.ts b/src/types/message/index.ts
new file mode 100644
index 0000000..a736afb
--- /dev/null
+++ b/src/types/message/index.ts
@@ -0,0 +1,18 @@
+export interface Message {
+    content: string;
+    signature: string;
+    outgoing: boolean;
+    modifier: string;
+    imgURL: string;
+    id: string;
+}
+
+interface MessageTransform {
+    initialTranslate: string;
+    finalTranslate: string;
+}
+
+export interface MessageAnimeFunc {
+    (message: SVGElement, transform: MessageTransform): void;
+}
+
-- 
2.43.0