From 991cc2ab47a604e0e93e8a4787143b31935f1c76 Mon Sep 17 00:00:00 2001
From: riqo <hernandeze2@xavier.edu>
Date: Sat, 5 Dec 2020 12:32:59 -0600
Subject: [PATCH] [bug] fix renderer get message by id functinality

---
 src/background.ts                             |  4 +-
 .../UI/UIDetails/messageRenderer.vue          |  1 -
 src/components/UI/UIDetails/messages.ts       | 46 ++++++++++---------
 .../messageItem/useMessageItemComp.ts         |  3 +-
 .../messageRenderer/useOffsetCalculator.ts    |  4 +-
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/background.ts b/src/background.ts
index c937b1b..c7a5e33 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -33,8 +33,8 @@ protocol.registerSchemesAsPrivileged([
 function createWindow() {
   // Create the browser window.
   win = new BrowserWindow({
-    width: 450,
-    height: 1025,
+    width: 350,
+    height: 525,
     resizable: true,
     webPreferences: {
       // Use pluginOptions.nodeIntegration, leave this alone
diff --git a/src/components/UI/UIDetails/messageRenderer.vue b/src/components/UI/UIDetails/messageRenderer.vue
index aeac5cc..a07459e 100644
--- a/src/components/UI/UIDetails/messageRenderer.vue
+++ b/src/components/UI/UIDetails/messageRenderer.vue
@@ -9,7 +9,6 @@
       <g
         v-for="(item, index) in renderArr"
         :key="index"
-        :id="index"
         class="messageList"
         transform="translate(0, 0)"
       >
diff --git a/src/components/UI/UIDetails/messages.ts b/src/components/UI/UIDetails/messages.ts
index 39593c2..f470bb6 100644
--- a/src/components/UI/UIDetails/messages.ts
+++ b/src/components/UI/UIDetails/messages.ts
@@ -1,15 +1,6 @@
 import { Message } from "@/types/message/index";
 
 const Messages: Message[] = [
-    {
-        content:
-            "I can be there at 5 pm tomorrow to greet you at a Chick file with my almond and chive salad.",
-        context: "You to Josie Wright",
-        subContext: "josie@gmail.com",
-        modifier: "sf",
-        id: "1",
-        time: ""
-    },
     {
         content: "Sounds good, see you Thursday.",
         context: "Message from Josie Wright",
@@ -19,19 +10,12 @@ const Messages: Message[] = [
         time: ""
     },
     {
-        content: "Hey Anna, did you get the paper done?",
-        context: "Mesage from Tommy McConville",
-        subContext: "New Conversation",
-        modifier: "ai",
-        id: "3",
-        time: ""
-    },
-    {
-        content: "Yes posting it online soon.",
-        context: "You to Tommy McConville",
-        subContext: "",
-        modifier: "ai",
-        id: "4",
+        content:
+            "I can be there at 5 pm tomorrow to greet you at a Chick file with my almond and chive salad.",
+        context: "You to Josie Wright",
+        subContext: "josie@gmail.com",
+        modifier: "sf",
+        id: "1",
         time: ""
     },
     {
@@ -50,6 +34,15 @@ const Messages: Message[] = [
         id: "6",
         time: ""
     },
+
+    {
+        content: "Hey Anna, did you get the paper done?",
+        context: "Mesage from Tommy McConville",
+        subContext: "New Conversation",
+        modifier: "ai",
+        id: "3",
+        time: ""
+    },
     {
         content: "Hey do you know Enrique Hernandez?",
         context: "Message from Crimata",
@@ -58,6 +51,15 @@ const Messages: Message[] = [
         id: "7",
         time: ""
     },
+
+    {
+        content: "Yes posting it online soon.",
+        context: "You to Tommy McConville",
+        subContext: "",
+        modifier: "sf",
+        id: "4",
+        time: ""
+    },
     {
         content: "Hey do you know Enrique Hernandez?",
         context: "Message from Crimata",
diff --git a/src/composables/messageItem/useMessageItemComp.ts b/src/composables/messageItem/useMessageItemComp.ts
index afb216d..94efbb6 100644
--- a/src/composables/messageItem/useMessageItemComp.ts
+++ b/src/composables/messageItem/useMessageItemComp.ts
@@ -31,10 +31,11 @@ export default function useMessageItemComp(m: string, id: string) {
       }
   }
 
+  const selfMessageMarginRight = 2.5;
   const calculateXoffset = async () => {
     switch (m) {
         case "sf":
-            x.value = winW - messageWidth.value;
+            x.value = winW - messageWidth.value - selfMessageMarginRight;
             break;
         default:
             x.value = paddingLeft;
diff --git a/src/composables/messageRenderer/useOffsetCalculator.ts b/src/composables/messageRenderer/useOffsetCalculator.ts
index dcbbe20..5efad53 100644
--- a/src/composables/messageRenderer/useOffsetCalculator.ts
+++ b/src/composables/messageRenderer/useOffsetCalculator.ts
@@ -2,10 +2,10 @@ import { ref } from "vue";
 export default function useOffsetCalculator() {
     const xOffset = ref(0);
     const yOffset = ref(0);
+    const firstChildMarginTop = 40;
     let previousMessageHeight = 0;
     const messagePadding = 10;
 
-
     function setXoffset(message: HTMLElement): void {
         const computedQuery = window.getComputedStyle(message)
         const matrix = new WebKitCSSMatrix(computedQuery.webkitTransform);
@@ -14,7 +14,7 @@ export default function useOffsetCalculator() {
 
     function setYoffset(messageHeight: number): void {
         if (previousMessageHeight === 0) {
-            yOffset.value = 40;
+            yOffset.value = firstChildMarginTop;
         } else {
             yOffset.value += previousMessageHeight + messagePadding;
         }
-- 
2.43.0