From bdbe452b336fbb12bf3e5ff34e647fdf7c51dfe3 Mon Sep 17 00:00:00 2001
From: Evan Almloff <ealmlof1@stumail.jccc.edu>
Date: Thu, 12 May 2022 20:52:06 -0500
Subject: [PATCH] fix merge

---
 packages/tui/src/hooks.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/tui/src/hooks.rs b/packages/tui/src/hooks.rs
index 4070f865a..921b72ed0 100644
--- a/packages/tui/src/hooks.rs
+++ b/packages/tui/src/hooks.rs
@@ -213,7 +213,7 @@ impl InnerInputState {
     }
 
     fn resolve_mouse_events(
-        &self,
+        &mut self,
         previous_mouse: Option<MouseData>,
         resolved_events: &mut Vec<UserEvent>,
         layout: &Stretch,
@@ -259,8 +259,13 @@ impl InnerInputState {
             let new_client_coordinates = (mouse_data.client_coordinates() - node_origin)
                 .to_point()
                 .cast_unit();
+
+            let coordinates = Coordinates::new(
+                mouse_data.screen_coordinates(),
+                mouse_data.client_coordinates(),
                 new_client_coordinates,
                 mouse_data.page_coordinates(),
+            );
 
             MouseData::new(
                 coordinates,
@@ -517,7 +522,7 @@ impl InnerInputState {
             }
 
             // update focus
-            if released {
+            if was_released {
                 let mut focus_id = None;
                 dom.traverse_depth_first(|node| {
                     let node_layout = layout.layout(node.state.layout.node.unwrap()).unwrap();