Merge branch 'master' into feat/native-core-optional-deps

packages/rink/Cargo.toml

@@ -13,20 +13,20 @@ license = "MIT/Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus-html = { path = "../html", version = "^0.3.0" }
-dioxus-native-core = { path = "../native-core", version = "^0.2.0", features = ["layout-attributes"] }
-dioxus-native-core-macro = { path = "../native-core-macro", version = "^0.3.0" }
+dioxus-html = { workspace = true }
+dioxus-native-core = { workspace = true, features = ["layout-attributes"] }
+dioxus-native-core-macro = { workspace = true }
 
 tui = "0.17.0"
-crossterm = "0.23.0"
+crossterm = "0.26.1"
 anyhow = "1.0.42"
-tokio = { version = "1.15.0", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 futures = "0.3.19"
 taffy = "0.3.12"
 smallvec = "1.6"
-rustc-hash = "1.1.0"
+rustc-hash = { workspace = true }
 anymap = "1.0.0-beta.2"
-futures-channel = "0.3.25"
+futures-channel = { workspace = true }
 shipyard = { version = "0.6.2", features = ["proc", "std"], default-features = false }
 once_cell = "1.17.1"
 

packages/rink/src/hooks.rs

@@ -1,5 +1,6 @@
 use crossterm::event::{
-    Event as TermEvent, KeyCode as TermKeyCode, KeyModifiers, MouseButton, MouseEventKind,
+    Event as TermEvent, KeyCode as TermKeyCode, KeyModifiers, ModifierKeyCode, MouseButton,
+    MouseEventKind,
 };
 use dioxus_native_core::prelude::*;
 use dioxus_native_core::real_dom::NodeImmutable;
@@ -800,6 +801,34 @@ fn key_from_crossterm_key_code(key_code: TermKeyCode) -> Key {
         TermKeyCode::Char(c) => Key::Character(c.to_string()),
         TermKeyCode::Null => Key::Unidentified,
         TermKeyCode::Esc => Key::Escape,
+        TermKeyCode::CapsLock => Key::CapsLock,
+        TermKeyCode::ScrollLock => Key::ScrollLock,
+        TermKeyCode::NumLock => Key::NumLock,
+        TermKeyCode::PrintScreen => Key::PrintScreen,
+        TermKeyCode::Pause => Key::Pause,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::FastForward) => Key::MediaFastForward,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::PlayPause) => Key::MediaPlayPause,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::TrackPrevious) => {
+            Key::MediaTrackPrevious
+        }
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::TrackNext) => Key::MediaTrackNext,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Stop) => Key::MediaStop,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Play) => Key::MediaPlay,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Pause) => Key::MediaPause,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Record) => Key::MediaRecord,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Rewind) => Key::MediaRewind,
+        TermKeyCode::Modifier(modifier) => match modifier {
+            ModifierKeyCode::IsoLevel3Shift
+            | ModifierKeyCode::IsoLevel5Shift
+            | ModifierKeyCode::RightShift
+            | ModifierKeyCode::LeftShift => Key::Shift,
+            ModifierKeyCode::RightControl | ModifierKeyCode::LeftControl => Key::Control,
+            ModifierKeyCode::RightAlt | ModifierKeyCode::LeftAlt => Key::Alt,
+            ModifierKeyCode::RightSuper | ModifierKeyCode::LeftSuper => Key::Super,
+            ModifierKeyCode::RightHyper | ModifierKeyCode::LeftHyper => Key::Hyper,
+            ModifierKeyCode::LeftMeta | ModifierKeyCode::RightMeta => Key::Meta,
+        },
+        _ => Key::Unidentified,
     }
 }
 
@@ -929,8 +958,39 @@ fn guess_code_from_crossterm_key_code(key_code: TermKeyCode) -> Option<Code> {
             '~' => Code::Backquote,
             _ => return None,
         },
-        TermKeyCode::Null => return None,
         TermKeyCode::Esc => Code::Escape,
+        TermKeyCode::CapsLock => Code::CapsLock,
+        TermKeyCode::ScrollLock => Code::ScrollLock,
+        TermKeyCode::NumLock => Code::NumLock,
+        TermKeyCode::PrintScreen => Code::PrintScreen,
+        TermKeyCode::Pause => Code::Pause,
+        TermKeyCode::Menu => Code::ContextMenu,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::FastForward) => Code::MediaFastForward,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::PlayPause) => Code::MediaPlayPause,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::TrackPrevious) => {
+            Code::MediaTrackPrevious
+        }
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::TrackNext) => Code::MediaTrackNext,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Stop) => Code::MediaStop,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Play) => Code::MediaPlay,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Pause) => Code::MediaPause,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Record) => Code::MediaRecord,
+        TermKeyCode::Media(crossterm::event::MediaKeyCode::Rewind) => Code::MediaRewind,
+        TermKeyCode::Modifier(modifier) => match modifier {
+            ModifierKeyCode::IsoLevel3Shift
+            | ModifierKeyCode::IsoLevel5Shift
+            | ModifierKeyCode::LeftShift => Code::ShiftLeft,
+            ModifierKeyCode::RightShift => Code::ShiftRight,
+            ModifierKeyCode::RightControl => Code::ControlRight,
+            ModifierKeyCode::LeftControl => Code::ControlLeft,
+            ModifierKeyCode::RightAlt => Code::AltRight,
+            ModifierKeyCode::LeftAlt => Code::AltLeft,
+            ModifierKeyCode::RightSuper | ModifierKeyCode::LeftSuper => Code::Super,
+            ModifierKeyCode::RightHyper | ModifierKeyCode::LeftHyper => Code::Hyper,
+            ModifierKeyCode::LeftMeta => Code::MetaLeft,
+            ModifierKeyCode::RightMeta => Code::MetaRight,
+        },
+        _ => return None,
     };
 
     Some(code)

packages/rink/src/lib.rs

@@ -235,7 +235,7 @@ pub fn render<R: Driver>(
                                         }
                                     }
                                     TermEvent::Resize(_, _) => updated = true,
-                                    TermEvent::Mouse(_) => {}
+                                    _ => {}
                                 },
                                 InputEvent::Close => break,
                             };