From cae0c1409d9ea12a280171c4a7fc1da1721f46a4 Mon Sep 17 00:00:00 2001
From: Reinis Mazeiks <reinis.mazeiks@gmail.com>
Date: Wed, 29 Jun 2022 02:13:01 +0300
Subject: [PATCH] Fix some warnings: avoid deprecated fields

---
 examples/all_events.rs              | 1 -
 examples/tui_buttons.rs             | 5 +++--
 packages/router/tests/web_router.rs | 1 +
 packages/tui/tests/events.rs        | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/all_events.rs b/examples/all_events.rs
index 540d87500..5430bdbf5 100644
--- a/examples/all_events.rs
+++ b/examples/all_events.rs
@@ -1,5 +1,4 @@
 use dioxus::prelude::*;
-use dioxus_core::UiEvent;
 use dioxus_html::on::{FocusData, KeyboardData, MouseData, WheelData};
 use std::sync::Arc;
 
diff --git a/examples/tui_buttons.rs b/examples/tui_buttons.rs
index 31d2e1ce0..f0c4b3948 100644
--- a/examples/tui_buttons.rs
+++ b/examples/tui_buttons.rs
@@ -1,4 +1,5 @@
-use dioxus::{events::KeyCode, prelude::*};
+use dioxus::prelude::*;
+use dioxus_html::input_data::keyboard_types::Code;
 
 fn main() {
     dioxus::tui::launch(app);
@@ -27,7 +28,7 @@ fn Button(cx: Scope<ButtonProps>) -> Element {
             background_color: "{color}",
             tabindex: "{cx.props.layer}",
             onkeydown: |e| {
-                if let KeyCode::Space = e.data.key_code{
+                if let Code::Space = e.data.code() {
                     toggle.modify(|f| !f);
                 }
             },
diff --git a/packages/router/tests/web_router.rs b/packages/router/tests/web_router.rs
index 40b3a764f..cddc542c1 100644
--- a/packages/router/tests/web_router.rs
+++ b/packages/router/tests/web_router.rs
@@ -1,4 +1,5 @@
 #![cfg(target_arch = "wasm32")]
+#![allow(non_snake_case)]
 
 use dioxus_core::prelude::*;
 use dioxus_core_macro::*;
diff --git a/packages/tui/tests/events.rs b/packages/tui/tests/events.rs
index ab6b70b2e..fe31f4c5e 100644
--- a/packages/tui/tests/events.rs
+++ b/packages/tui/tests/events.rs
@@ -4,6 +4,7 @@ use dioxus_core::*;
 use dioxus_core_macro::*;
 use dioxus_hooks::*;
 use dioxus_html as dioxus_elements;
+use dioxus_html::input_data::keyboard_types::Code;
 use dioxus_tui::TuiContext;
 use std::future::Future;
 use std::pin::Pin;
@@ -60,7 +61,7 @@ fn key_down() {
                 width: "100%",
                 height: "100%",
                 onkeydown: move |evt| {
-                    assert_eq!(evt.data.key_code, dioxus_html::KeyCode::A);
+                    assert_eq!(evt.data.code(), Code::KeyA);
                     tui_ctx.quit();
                 },
             }
@@ -290,7 +291,7 @@ fn wheel() {
                 width: "100%",
                 height: "100%",
                 onwheel: move |evt| {
-                    assert!(evt.data.delta_y > 0.0);
+                    assert!(evt.data.delta().strip_units().y > 0.0);
                     tui_ctx.quit();
                 },
             }