From a18e9b3b189ef3f76dd42027195e6fba0cce69bb Mon Sep 17 00:00:00 2001
From: lucubro <88whacko@gmail.com>
Date: Sun, 9 Sep 2018 05:59:50 -0400
Subject: [PATCH] Fix initial position item info when selecting one item after
 another (fixes #10077) (#10661)

* Update lastMouseMoveEvent even when dragging an egg or potion.

* Update lastMouseMoveEvent even when dragging a food item.
---
 website/client/components/inventory/items/index.vue  | 11 +++++++++--
 website/client/components/inventory/stable/index.vue |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/website/client/components/inventory/items/index.vue b/website/client/components/inventory/items/index.vue
index f4158bba11..9314b7b232 100644
--- a/website/client/components/inventory/items/index.vue
+++ b/website/client/components/inventory/items/index.vue
@@ -405,6 +405,8 @@ export default {
         this.currentDraggingEgg = egg;
         this.eggClickMode = true;
 
+        // Wait for the div.eggInfo.mouse node to be added to the DOM before
+        // changing its position.
         this.$nextTick(() => {
           this.mouseMoved(lastMouseMoveEvent);
         });
@@ -427,6 +429,8 @@ export default {
         this.currentDraggingPotion = potion;
         this.potionClickMode = true;
 
+        // Wait for the div.hatchingPotionInfo.mouse node to be added to the
+        // DOM before changing its position.
         this.$nextTick(() => {
           this.mouseMoved(lastMouseMoveEvent);
         });
@@ -471,6 +475,11 @@ export default {
     },
 
     mouseMoved ($event) {
+      // Keep track of the last mouse position even in click mode so that we
+      // know where to position the dragged potion/egg info on item click.
+      lastMouseMoveEvent = $event;
+
+      // Update the potion/egg popover if we are already dragging it.
       if (this.potionClickMode) {
         // dragging potioninfo is 180px wide (90 would be centered)
         this.$refs.clickPotionInfo.style.left = `${$event.x - 60}px`;
@@ -479,8 +488,6 @@ export default {
         // dragging eggInfo is 180px wide (90 would be centered)
         this.$refs.clickEggInfo.style.left = `${$event.x - 60}px`;
         this.$refs.clickEggInfo.style.top = `${$event.y + 10}px`;
-      } else {
-        lastMouseMoveEvent = $event;
       }
     },
   },
diff --git a/website/client/components/inventory/stable/index.vue b/website/client/components/inventory/stable/index.vue
index e659d2ef99..a308d5908b 100644
--- a/website/client/components/inventory/stable/index.vue
+++ b/website/client/components/inventory/stable/index.vue
@@ -858,11 +858,12 @@
         }
       },
       mouseMoved ($event) {
+        // Keep track of the last mouse position even in click mode so that we
+        // know where to position the dragged food icon on click.
+        lastMouseMoveEvent = $event;
         if (this.foodClickMode) {
           this.$refs.clickFoodInfo.style.left = `${$event.x - 70}px`;
           this.$refs.clickFoodInfo.style.top = `${$event.y}px`;
-        } else {
-          lastMouseMoveEvent = $event;
         }
       },
     },