feat: Rename mouseover to mousemove (#865)

marc2332 · Sep 11, 2024 · 1b43333 · 1b43333
1 parent d76e12a
commit 1b43333
Show file tree

Hide file tree

Showing 26 changed files with 94 additions and 94 deletions.
diff --git a/crates/components/src/cursor_area.rs b/crates/components/src/cursor_area.rs
@@ -37,7 +37,7 @@ pub fn CursorArea(CursorAreaProps { children, icon }: CursorAreaProps) -> Elemen
     let platform = use_platform();
     let mut is_hovering = use_signal(|| false);
 
-    let onmouseover = move |_| {
+    let onmousemove = move |_| {
         *is_hovering.write() = true;
         platform.set_cursor(icon);
     };
@@ -55,7 +55,7 @@ pub fn CursorArea(CursorAreaProps { children, icon }: CursorAreaProps) -> Elemen
 
     rsx!(
         rect {
-            onmouseover,
+            onmousemove,
             onmouseleave,
             {children}
         }

diff --git a/crates/components/src/drag_drop.rs b/crates/components/src/drag_drop.rs
@@ -45,7 +45,7 @@ pub fn DragZone<T: 'static + Clone + PartialEq>(
     let mut pos = use_signal(CursorPoint::default);
     let (node_reference, size) = use_node_signal();
 
-    let onglobalmouseover = move |e: MouseEvent| {
+    let onglobalmousemove = move |e: MouseEvent| {
         if *dragging.read() {
             let size = size.read();
             let coord = e.get_screen_coordinates();
@@ -94,7 +94,7 @@ pub fn DragZone<T: 'static + Clone + PartialEq>(
         rect {
             reference: node_reference,
             onglobalclick,
-            onglobalmouseover: onglobalmouseover,
+            onglobalmousemove: onglobalmousemove,
             onmousedown,
             {children}
         }

diff --git a/crates/components/src/input.rs b/crates/components/src/input.rs
@@ -140,8 +140,8 @@ pub fn Input(
         focus.focus();
     };
 
-    let onmouseover = move |e: MouseEvent| {
-        editable.process_event(&EditableEvent::MouseOver(e.data, 0));
+    let onmousemove = move |e: MouseEvent| {
+        editable.process_event(&EditableEvent::MouseMove(e.data, 0));
     };
 
     let onmouseenter = move |_| {
@@ -223,7 +223,7 @@ pub fn Input(
                 onmouseenter,
                 onmouseleave,
                 onmousedown,
-                onmouseover,
+                onmousemove,
                 width: "100%",
                 cursor_id: "0",
                 cursor_index: "{cursor_char}",

diff --git a/crates/components/src/scroll_views/scroll_view.rs b/crates/components/src/scroll_views/scroll_view.rs
@@ -239,7 +239,7 @@ pub fn ScrollView(
     };
 
     // Drag the scrollbars
-    let onmouseover = move |e: MouseEvent| {
+    let onmousemove = move |e: MouseEvent| {
         let clicking_scrollbar = clicking_scrollbar.peek();
 
         if let Some((Axis::Y, y)) = *clicking_scrollbar {
@@ -373,7 +373,7 @@ pub fn ScrollView(
             width,
             height,
             onglobalclick: onclick,
-            onglobalmouseover: onmouseover,
+            onglobalmousemove: onmousemove,
             onkeydown,
             onkeyup,
             focus_id,
@@ -524,7 +524,7 @@ mod test {
 
         // Simulate the user dragging the scrollbar
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
+            name: EventName::MouseMove,
             cursor: (490., 20.).into(),
             button: Some(MouseButton::Left),
         });
@@ -534,7 +534,7 @@ mod test {
             button: Some(MouseButton::Left),
         });
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
+            name: EventName::MouseMove,
             cursor: (490., 320.).into(),
             button: Some(MouseButton::Left),
         });

diff --git a/crates/components/src/scroll_views/virtual_scroll_view.rs b/crates/components/src/scroll_views/virtual_scroll_view.rs
@@ -289,7 +289,7 @@ pub fn VirtualScrollView<
     };
 
     // Drag the scrollbars
-    let onmouseover = move |e: MouseEvent| {
+    let onmousemove = move |e: MouseEvent| {
         let clicking_scrollbar = clicking_scrollbar.peek();
 
         if let Some((Axis::Y, y)) = *clicking_scrollbar {
@@ -447,7 +447,7 @@ pub fn VirtualScrollView<
             width: "{width}",
             height: "{height}",
             onglobalclick: onclick,
-            onglobalmouseover: onmouseover,
+            onglobalmousemove: onmousemove,
             onkeydown,
             onkeyup,
             focus_id,
@@ -610,7 +610,7 @@ mod test {
 
         // Simulate the user dragging the scrollbar
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
+            name: EventName::MouseMove,
             cursor: (490., 20.).into(),
             button: Some(MouseButton::Left),
         });
@@ -620,7 +620,7 @@ mod test {
             button: Some(MouseButton::Left),
         });
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
+            name: EventName::MouseMove,
             cursor: (490., 320.).into(),
             button: Some(MouseButton::Left),
         });

diff --git a/crates/components/src/slider.rs b/crates/components/src/slider.rs
@@ -119,7 +119,7 @@ pub fn Slider(
         platform.set_cursor(CursorIcon::Pointer);
     };
 
-    let onmouseover = {
+    let onmousemove = {
         to_owned![onmoved];
         move |e: MouseEvent| {
             e.stop_propagation();
@@ -178,7 +178,7 @@ pub fn Slider(
             onglobalclick: onclick,
             focus_id,
             onmouseenter,
-            onglobalmouseover: onmouseover,
+            onglobalmousemove: onmousemove,
             onmouseleave,
             onwheel: onwheel,
             main_align: "center",
@@ -253,7 +253,7 @@ mod test {
         assert_eq!(label.get(0).text(), Some("50"));
 
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
+            name: EventName::MouseMove,
             cursor: (250.0, 7.0).into(),
             button: Some(MouseButton::Left),
         });
@@ -263,7 +263,7 @@ mod test {
             button: Some(MouseButton::Left),
         });
         utils.push_event(PlatformEvent::Mouse {
-            name: EventName::MouseOver,
+            name: EventName::MouseMove,
             cursor: (500.0, 7.0).into(),
             button: Some(MouseButton::Left),
         });

diff --git a/crates/core/src/events/events_measurer.rs b/crates/core/src/events/events_measurer.rs
@@ -38,7 +38,7 @@ pub fn process_events(
     // 3. Get what events can be actually emitted based on what elements are listening
     let mut dom_events = measure_dom_events(&potential_events, dom, nodes_state, scale_factor);
 
-    // 4. Get potential collateral events, e.g. mouseover -> mouseenter
+    // 4. Get potential collateral events, e.g. mousemove -> mouseenter
     let potential_collateral_events =
         nodes_state.process_collateral(&potential_events, &dom_events, events);
 

diff --git a/crates/core/tests/pointer_events.rs b/crates/core/tests/pointer_events.rs
@@ -48,7 +48,7 @@ pub async fn pointer_events_from_mouse() {
 
     assert_eq!(label.get(0).text(), Some("[]"));
 
-    // Moving the mouse for the first time will cause `mouseenter` and `mouseover` events
+    // Moving the mouse for the first time will cause `mouseenter` and `mousemove` events
     utils.move_cursor((100., 100.)).await;
     assert_eq!(
         label.get(0).text(),

diff --git a/...ments/src/_docs/events/globalmouseover.md → ...ments/src/_docs/events/globalmousemove.md b/...ments/src/_docs/events/globalmouseover.md → ...ments/src/_docs/events/globalmousemove.md
@@ -1,4 +1,4 @@
-The `globalmouseover` event fires when the user moves the mouse anywhere in the app.
+The `globalmousemove` event fires when the user moves the mouse anywhere in the app.
 
 Event Data: [`MouseData`](crate::events::MouseData)
 
@@ -9,13 +9,13 @@ Event Data: [`MouseData`](crate::events::MouseData)
 fn app() -> Element {
     rsx!(
         rect {
-            onglobalmouseover: |_| println!("Moving the mouse somewhere!")
+            onglobalmousemove: |_| println!("Moving the mouse anywhere!")
         }
         rect {
             width: "100",
             height: "100",
             background: "red",
-            onmousedown: |_| println!("Moving the mouse here!")
+            onmousemove: |_| println!("Moving the mouse here!")
         }
     )
 }

diff --git a/...es/elements/src/_docs/events/mouseover.md → ...es/elements/src/_docs/events/mousemove.md b/...es/elements/src/_docs/events/mouseover.md → ...es/elements/src/_docs/events/mousemove.md
@@ -1,5 +1,5 @@
-The `mouseover` event fires when the user moves the mouse over an element.
-Unlike [`onmouseover`](crate::elements::onmouseover), this fires even if the user was already hovering over
+The `mousemove` event fires when the user moves the mouse over an element.
+Unlike [`onmouseenter`](crate::elements::onmouseenter), this fires even if the user was already hovering over
 the element. For that reason, it's less efficient.
 
 Event Data: [`MouseData`](crate::events::MouseData)
@@ -14,7 +14,7 @@ fn app() -> Element {
             width: "100",
             height: "100",
             background: "red",
-            onmouseover: |_| println!("Hovering!")
+            onmousemove: |_| println!("Hovering!")
         }
     )
 }

diff --git a/crates/elements/src/definitions.rs b/crates/elements/src/definitions.rs
@@ -591,10 +591,10 @@ pub mod events {
         onmousedown
         #[doc = include_str!("_docs/events/globalmousedown.md")]
         onglobalmousedown
-        #[doc = include_str!("_docs/events/mouseover.md")]
-        onmouseover
-        #[doc = include_str!("_docs/events/globalmouseover.md")]
-        onglobalmouseover
+        #[doc = include_str!("_docs/events/mousemove.md")]
+        onmousemove
+        #[doc = include_str!("_docs/events/globalmousemove.md")]
+        onglobalmousemove
         #[doc = include_str!("_docs/events/mouseleave.md")]
         onmouseleave
         #[doc = include_str!("_docs/events/mouseenter.md")]

diff --git a/crates/hooks/src/use_editable.rs b/crates/hooks/src/use_editable.rs
@@ -42,7 +42,7 @@ use crate::{
 /// Events emitted to the [`UseEditable`].
 pub enum EditableEvent {
     Click,
-    MouseOver(Rc<MouseData>, usize),
+    MouseMove(Rc<MouseData>, usize),
     MouseDown(Rc<MouseData>, usize),
     KeyDown(Rc<KeyboardData>),
     KeyUp(Rc<KeyboardData>),
@@ -166,7 +166,7 @@ impl UseEditable {
 
                 Some((*id, Some(coords), None))
             }
-            EditableEvent::MouseOver(e, id) => {
+            EditableEvent::MouseMove(e, id) => {
                 if let Some(src) = self.dragging.peek().get_cursor_coords() {
                     let new_dist = e.get_element_coordinates();
 

diff --git a/crates/hooks/tests/use_editable.rs b/crates/hooks/tests/use_editable.rs
@@ -302,8 +302,8 @@ pub async fn highlight_multiple_lines_single_editor() {
             editable.process_event(&EditableEvent::MouseDown(e.data, 0));
         };
 
-        let onmouseover = move |e: MouseEvent| {
-            editable.process_event(&EditableEvent::MouseOver(e.data, 0));
+        let onmousemove = move |e: MouseEvent| {
+            editable.process_event(&EditableEvent::MouseMove(e.data, 0));
         };
 
         let onkeydown = move |e: Event<KeyboardData>| {
@@ -326,7 +326,7 @@ pub async fn highlight_multiple_lines_single_editor() {
                     highlights,
                     onkeydown,
                     onmousedown,
-                    onmouseover,
+                    onmousemove,
                     text {
                         color: "black",
                         "{editor}"
@@ -402,8 +402,8 @@ pub async fn highlights_single_line_multiple_editors() {
                         "none".to_string()
                     };
 
-                    let onmouseover = move |e: MouseEvent| {
-                        editable.process_event(&EditableEvent::MouseOver(e.data, i));
+                    let onmousemove = move |e: MouseEvent| {
+                        editable.process_event(&EditableEvent::MouseMove(e.data, i));
                     };
 
                     let onmousedown = move |e: MouseEvent| {
@@ -419,7 +419,7 @@ pub async fn highlights_single_line_multiple_editors() {
                             cursor_index: "{character_index}",
                             cursor_color: "black",
                             cursor_mode: "editable",
-                            onmouseover,
+                            onmousemove,
                             onmousedown,
                             highlights,
                             text {
@@ -788,8 +788,8 @@ pub async fn highlight_shift_click_multiple_lines_single_editor() {
             editable.process_event(&EditableEvent::MouseDown(e.data, 0));
         };
 
-        let onmouseover = move |e: MouseEvent| {
-            editable.process_event(&EditableEvent::MouseOver(e.data, 0));
+        let onmousemove = move |e: MouseEvent| {
+            editable.process_event(&EditableEvent::MouseMove(e.data, 0));
         };
 
         let onkeydown = move |e: Event<KeyboardData>| {
@@ -817,7 +817,7 @@ pub async fn highlight_shift_click_multiple_lines_single_editor() {
                     onkeydown,
                     onclick,
                     onmousedown,
-                    onmouseover,
+                    onmousemove,
                     text {
                         color: "black",
                         "{editor}"
@@ -896,8 +896,8 @@ pub async fn highlights_shift_click_single_line_multiple_editors() {
                         "none".to_string()
                     };
 
-                    let onmouseover = move |e: MouseEvent| {
-                        editable.process_event(&EditableEvent::MouseOver(e.data, i));
+                    let onmousemove = move |e: MouseEvent| {
+                        editable.process_event(&EditableEvent::MouseMove(e.data, i));
                     };
 
                     let onmousedown = move |e: MouseEvent| {
@@ -918,7 +918,7 @@ pub async fn highlights_shift_click_single_line_multiple_editors() {
                             cursor_color: "black",
                             cursor_mode: "editable",
                             onclick,
-                            onmouseover,
+                            onmousemove,
                             onmousedown,
                             highlights,
                             text {
@@ -987,8 +987,8 @@ pub async fn highlight_all_text() {
             editable.process_event(&EditableEvent::MouseDown(e.data, 0));
         };
 
-        let onmouseover = move |e: MouseEvent| {
-            editable.process_event(&EditableEvent::MouseOver(e.data, 0));
+        let onmousemove = move |e: MouseEvent| {
+            editable.process_event(&EditableEvent::MouseMove(e.data, 0));
         };
 
         let onkeydown = move |e: Event<KeyboardData>| {
@@ -1016,7 +1016,7 @@ pub async fn highlight_all_text() {
                     onkeydown,
                     onclick,
                     onmousedown,
-                    onmouseover,
+                    onmousemove,
                     text {
                         color: "black",
                         "{editor}"