Add Missing Fields From Scroll Event (#4022)

* Add onscroll field data

* Add bun 1.2.10 generated file changes

* Improve error messaging when bun is not installed

packages/web/src/events/mod.rs

@@ -21,6 +21,7 @@ mod mounted;
 mod mouse;
 mod pointer;
 mod resize;
+mod scroll;
 mod selection;
 mod toggle;
 mod touch;

packages/web/src/events/scroll.rs

@@ -0,0 +1,104 @@
+use dioxus_html::HasScrollData;
+use wasm_bindgen::JsCast;
+use web_sys::{Document, Element, Event};
+
+use super::{Synthetic, WebEventExt};
+
+impl HasScrollData for Synthetic<Event> {
+    fn as_any(&self) -> &dyn std::any::Any {
+        &self.event
+    }
+
+    fn scroll_top(&self) -> i32 {
+        if let Some(target) = self.event.target().as_ref() {
+            if let Some(element) = target.dyn_ref::<Element>() {
+                return element.scroll_top();
+            } else if let Some(element) = target
+                .dyn_ref::<Document>()
+                .and_then(|document| document.document_element())
+            {
+                return element.scroll_top();
+            }
+        }
+        0
+    }
+
+    fn scroll_left(&self) -> i32 {
+        if let Some(target) = self.event.target().as_ref() {
+            if let Some(element) = target.dyn_ref::<Element>() {
+                return element.scroll_left();
+            } else if let Some(element) = target
+                .dyn_ref::<Document>()
+                .and_then(|document| document.document_element())
+            {
+                return element.scroll_left();
+            }
+        }
+        0
+    }
+
+    fn scroll_width(&self) -> i32 {
+        if let Some(target) = self.event.target().as_ref() {
+            if let Some(element) = target.dyn_ref::<Element>() {
+                return element.scroll_width();
+            } else if let Some(element) = target
+                .dyn_ref::<Document>()
+                .and_then(|document| document.document_element())
+            {
+                return element.scroll_width();
+            }
+        }
+        0
+    }
+
+    fn scroll_height(&self) -> i32 {
+        if let Some(target) = self.event.target().as_ref() {
+            if let Some(element) = target.dyn_ref::<Element>() {
+                return element.scroll_height();
+            } else if let Some(element) = target
+                .dyn_ref::<Document>()
+                .and_then(|document| document.document_element())
+            {
+                return element.scroll_height();
+            }
+        }
+        0
+    }
+
+    fn client_width(&self) -> i32 {
+        if let Some(target) = self.event.target().as_ref() {
+            if let Some(element) = target.dyn_ref::<Element>() {
+                return element.client_width();
+            } else if let Some(element) = target
+                .dyn_ref::<Document>()
+                .and_then(|document| document.document_element())
+            {
+                return element.client_width();
+            }
+        }
+        0
+    }
+
+    fn client_height(&self) -> i32 {
+        if let Some(target) = self.event.target().as_ref() {
+            if let Some(element) = target.dyn_ref::<Element>() {
+                return element.client_height();
+            } else if let Some(element) = target
+                .dyn_ref::<Document>()
+                .and_then(|document| document.document_element())
+            {
+                return element.client_height();
+            }
+        }
+        0
+    }
+}
+
+impl WebEventExt for dioxus_html::ScrollData {
+    type WebEvent = web_sys::Event;
+
+    #[inline(always)]
+    fn try_as_web_event(&self) -> Option<Self::WebEvent> {
+        self.downcast::<web_sys::Event>().cloned()
+    }
+}

packages/web/src/events/wheel.rs

@@ -5,9 +5,9 @@ use dioxus_html::{
         InteractionElementOffset, InteractionLocation, Modifiers, ModifiersInteraction,
         PointerInteraction,
     },
-    HasMouseData, HasScrollData, HasWheelData,
+    HasMouseData, HasWheelData,
 };
-use web_sys::{Event, WheelEvent};
+use web_sys::WheelEvent;
 
 use super::{Synthetic, WebEventExt};
 
@@ -83,21 +83,6 @@ impl PointerInteraction for Synthetic<WheelEvent> {
     }
 }
 
-impl HasScrollData for Synthetic<Event> {
-    fn as_any(&self) -> &dyn std::any::Any {
-        &self.event
-    }
-}
-
-impl WebEventExt for dioxus_html::ScrollData {
-    type WebEvent = web_sys::Event;
-
-    #[inline(always)]
-    fn try_as_web_event(&self) -> Option<Self::WebEvent> {
-        self.downcast::<web_sys::Event>().cloned()
-    }
-}
-
 impl WebEventExt for dioxus_html::WheelData {
     type WebEvent = web_sys::WheelEvent;