swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port widgets to the new system

Browse Source
This commit is contained in:
Evan Almloff committed 2023-04-13 10:29:38 -05:00
1 parent c2b873c650
commit efa7305794
18 files changed
+286 -240
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/rink/src/widgets/button.rs
+22 -20
View File
@@ -2,14 +2,14 @@ use std::collections::HashMap;
use dioxus_html::input_data::keyboard_types::Key;
use dioxus_native_core::{
custom_element::CustomElement,
node::OwnedAttributeDiscription,
node_ref::AttributeMask,
prelude::NodeType,
real_dom::{ElementNodeMut, NodeImmutable, NodeTypeMut, RealDom},
utils::widget_watcher::Widget,
real_dom::{ElementNodeMut, NodeImmutable, NodeMut, NodeTypeMut, RealDom},
NodeId,
};
use shipyard::UniqueViewMut;
use shipyard::UniqueView;
use crate::FormData;
@@ -17,7 +17,6 @@ use super::{RinkWidget, WidgetContext};
#[derive(Debug, Default)]
pub(crate) struct Button {
div_id: NodeId,
text_id: NodeId,
value: String,
}
@@ -88,14 +87,14 @@ impl Button {
}
}
fn switch(&mut self, ctx: &mut WidgetContext) {
fn switch(&mut self, ctx: &mut WidgetContext, node: NodeMut) {
let data = FormData {
value: self.value.to_string(),
values: HashMap::new(),
files: None,
};
ctx.send(crate::Event {
id: self.div_id,
id: node.id(),
name: "input",
data: crate::EventData::Form(data),
bubbles: true,
@@ -103,10 +102,14 @@ impl Button {
}
}
impl Widget for Button {
impl CustomElement for Button {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<NodeId> {
vec![self.text_id]
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
let node_type = root.node_type();
let NodeType::Element(el) = &*node_type else { panic!("input must be an element") };
@@ -127,11 +130,8 @@ impl Widget for Button {
root.add_event_listener("keydown");
root.add_event_listener("click");
let div_id = root.id();
root.add_child(text_id);
Self {
div_id,
text_id,
value: value.unwrap_or_default(),
}
@@ -139,7 +139,7 @@ impl Widget for Button {
fn attributes_changed(
&mut self,
mut root: dioxus_native_core::real_dom::NodeMut<()>,
mut root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match attributes {
@@ -175,16 +175,18 @@ impl RinkWidget for Button {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
mut node: dioxus_native_core::real_dom::NodeMut,
) {
let mut ctx: UniqueViewMut<WidgetContext> = node
.real_dom_mut()
.raw_world_mut()
.borrow()
.expect("expected widget context");
let mut ctx: WidgetContext = {
node.real_dom_mut()
.raw_world_mut()
.borrow::<UniqueView<WidgetContext>>()
.expect("expected widget context")
.clone()
};
match event.name {
"click" => self.switch(&mut ctx),
"click" => self.switch(&mut ctx, node),
"keydown" => {
if let crate::EventData::Keyboard(data) = &event.data {
if !data.is_auto_repeating()
@@ -194,7 +196,7 @@ impl RinkWidget for Button {
_ => false,
}
{
self.switch(&mut ctx);
self.switch(&mut ctx, node);
}
}
}
packages/rink/src/widgets/checkbox.rs
+13 -14
View File
@@ -2,11 +2,11 @@ use std::collections::HashMap;
use dioxus_html::input_data::keyboard_types::Key;
use dioxus_native_core::{
custom_element::CustomElement,
node::OwnedAttributeDiscription,
node_ref::AttributeMask,
prelude::NodeType,
real_dom::{ElementNodeMut, NodeImmutable, NodeMut, NodeTypeMut},
utils::widget_watcher::Widget,
NodeId,
};
use shipyard::UniqueView;
@@ -91,7 +91,7 @@ impl CheckBox {
== "true";
}
fn write_value(&self, root: &mut NodeMut) {
fn write_value(&self, mut root: NodeMut) {
let single_char = {
let node_type = root.node_type_mut();
let NodeTypeMut::Element( el) = node_type else { panic!("input must be an element") };
@@ -117,7 +117,7 @@ impl CheckBox {
}
}
fn switch(&mut self, node: &mut NodeMut) {
fn switch(&mut self, mut node: NodeMut) {
let new_state = !self.checked;
let data = FormData {
@@ -147,10 +147,14 @@ impl CheckBox {
}
}
impl Widget for CheckBox {
impl CustomElement for CheckBox {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<NodeId> {
vec![self.text_id]
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
let node_type = root.node_type();
let NodeType::Element(el) = &*node_type else { panic!("input must be an element") };
@@ -172,7 +176,6 @@ impl Widget for CheckBox {
root.add_event_listener("click");
root.add_event_listener("keydown");
let div_id = root.id();
root.add_child(text_id);
let myself = Self {
div_id,
@@ -187,7 +190,7 @@ impl Widget for CheckBox {
fn attributes_changed(
&mut self,
mut root: dioxus_native_core::real_dom::NodeMut<()>,
mut root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match attributes {
@@ -199,7 +202,7 @@ impl Widget for CheckBox {
self.update_size_attr(&mut el);
self.update_checked_attr(&el);
}
self.write_value(&mut root);
self.write_value(root);
}
AttributeMask::Some(attrs) => {
{
@@ -216,7 +219,7 @@ impl Widget for CheckBox {
}
}
if attrs.contains("checked") {
self.write_value(&mut root);
self.write_value(root);
}
}
}
@@ -224,11 +227,7 @@ impl Widget for CheckBox {
}
impl RinkWidget for CheckBox {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
) {
fn handle_event(&mut self, event: &crate::Event, node: dioxus_native_core::real_dom::NodeMut) {
match event.name {
"click" => self.switch(node),
"keydown" => {
packages/rink/src/widgets/input.rs
+32 -11
View File
@@ -1,6 +1,6 @@
use dioxus_native_core::{
node::OwnedAttributeDiscription, prelude::NodeType, real_dom::NodeImmutable,
utils::widget_watcher::Widget,
custom_element::CustomElement, node::OwnedAttributeDiscription, prelude::NodeType,
real_dom::NodeImmutable,
};
use super::{
@@ -18,10 +18,32 @@ pub(crate) enum Input {
Slider(Slider),
}
impl Widget for Input {
impl CustomElement for Input {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<dioxus_native_core::NodeId> {
match self {
Input::Button(button) => button.roots(),
Input::CheckBox(checkbox) => checkbox.roots(),
Input::TextBox(textbox) => textbox.roots(),
Input::Password(password) => password.roots(),
Input::Number(number) => number.roots(),
Input::Slider(slider) => slider.roots(),
}
}
fn slot(&self) -> Option<dioxus_native_core::NodeId> {
match self {
Input::Button(button) => button.slot(),
Input::CheckBox(checkbox) => checkbox.slot(),
Input::TextBox(textbox) => textbox.slot(),
Input::Password(password) => password.slot(),
Input::Number(number) => number.slot(),
Input::Slider(slider) => slider.slot(),
}
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
{
// currently widgets are not allowed to have children
let children = root.child_ids();
@@ -42,7 +64,10 @@ impl Widget for Input {
namespace: None,
})
.and_then(|value| value.as_text());
match input_type {
match input_type
.map(|type_| type_.trim().to_lowercase())
.as_deref()
{
Some("button") => {
drop(node_type);
Input::Button(Button::create(root))
@@ -76,7 +101,7 @@ impl Widget for Input {
fn attributes_changed(
&mut self,
root: dioxus_native_core::real_dom::NodeMut<()>,
root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match self {
@@ -103,11 +128,7 @@ impl Widget for Input {
}
impl RinkWidget for Input {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
) {
fn handle_event(&mut self, event: &crate::Event, node: dioxus_native_core::real_dom::NodeMut) {
match self {
Input::Button(button) => {
button.handle_event(event, node);
packages/rink/src/widgets/mod.rs
+56 -24
View File
@@ -9,8 +9,8 @@ mod textbox;
use std::sync::{Arc, RwLock};
use dioxus_native_core::{
real_dom::RealDom,
utils::widget_watcher::{Widget, WidgetFactory, WidgetUpdater, WidgetWatcher},
custom_element::{CustomElement, CustomElementUpdater},
real_dom::{NodeMut, RealDom},
};
use futures_channel::mpsc::UnboundedSender;
use shipyard::{Component, Unique};
@@ -21,42 +21,64 @@ pub(crate) fn register_widgets(rdom: &mut RealDom, sender: UnboundedSender<Event
// inject the widget context
rdom.raw_world().add_unique(WidgetContext { sender });
// create the widget watcher
let mut widget_watcher = WidgetWatcher::default();
widget_watcher
.register_widget::<RinkWidgetTraitObjectFactory<input::Input>, RinkWidgetTraitObject>();
widget_watcher.attach(rdom);
rdom.register_custom_element::<RinkWidgetWrapper<input::Input>>();
}
trait RinkWidget: Sync + Send + Widget + 'static {
fn handle_event(&mut self, event: &Event, node: &mut dioxus_native_core::real_dom::NodeMut);
trait RinkWidget: Sync + Send + CustomElement + 'static {
fn handle_event(&mut self, event: &Event, node: dioxus_native_core::real_dom::NodeMut);
}
pub trait RinkWidgetResponder: WidgetUpdater {
fn handle_event(&mut self, event: &Event, node: &mut dioxus_native_core::real_dom::NodeMut);
pub trait RinkWidgetResponder: CustomElementUpdater {
fn handle_event(&mut self, event: &Event, node: dioxus_native_core::real_dom::NodeMut);
}
impl<W: RinkWidget> RinkWidgetResponder for W {
fn handle_event(&mut self, event: &Event, node: &mut dioxus_native_core::real_dom::NodeMut) {
fn handle_event(&mut self, event: &Event, node: dioxus_native_core::real_dom::NodeMut) {
RinkWidget::handle_event(self, event, node)
}
}
struct RinkWidgetTraitObjectFactory<W: RinkWidget> {
struct RinkWidgetWrapper<W: RinkWidget> {
inner: RinkWidgetTraitObject,
_marker: std::marker::PhantomData<W>,
}
impl<W: RinkWidget> WidgetFactory<RinkWidgetTraitObject> for RinkWidgetTraitObjectFactory<W> {
impl<W: RinkWidget> CustomElement for RinkWidgetWrapper<W> {
const NAME: &'static str = W::NAME;
fn create(node: &mut dioxus_native_core::real_dom::NodeMut) -> RinkWidgetTraitObject {
const NAMESPACE: Option<&'static str> = W::NAMESPACE;
fn create(mut node: NodeMut) -> Self {
let myself = RinkWidgetTraitObject {
widget: Arc::new(RwLock::new(W::create(node))),
widget: Arc::new(RwLock::new(W::create(node.reborrow()))),
};
// Insert the widget as an arbitrary data node so that it can be recognized when bubbling events
node.insert(myself.clone());
myself
RinkWidgetWrapper {
inner: myself,
_marker: std::marker::PhantomData,
}
}
fn attributes_changed(
&mut self,
root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
let mut widget = self.inner.widget.write().unwrap();
widget.attributes_changed(root, attributes);
}
fn roots(&self) -> Vec<dioxus_native_core::NodeId> {
let widget = self.inner.widget.read().unwrap();
widget.roots()
}
fn slot(&self) -> Option<dioxus_native_core::NodeId> {
let widget = self.inner.widget.read().unwrap();
widget.slot()
}
}
@@ -65,25 +87,35 @@ pub(crate) struct RinkWidgetTraitObject {
widget: Arc<RwLock<dyn RinkWidgetResponder + Send + Sync>>,
}
impl WidgetUpdater for RinkWidgetTraitObject {
impl CustomElementUpdater for RinkWidgetTraitObject {
fn attributes_changed(
&mut self,
root: dioxus_native_core::real_dom::NodeMut,
light_root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
let mut widget = self.widget.write().unwrap();
widget.attributes_changed(root, attributes);
widget.attributes_changed(light_root, attributes);
}
fn roots(&self) -> Vec<dioxus_native_core::NodeId> {
let widget = self.widget.read().unwrap();
widget.roots()
}
fn slot(&self) -> Option<dioxus_native_core::NodeId> {
let widget = self.widget.read().unwrap();
widget.slot()
}
}
impl RinkWidgetResponder for RinkWidgetTraitObject {
fn handle_event(&mut self, event: &Event, node: &mut dioxus_native_core::real_dom::NodeMut) {
fn handle_event(&mut self, event: &Event, node: dioxus_native_core::real_dom::NodeMut) {
let mut widget = self.widget.write().unwrap();
widget.handle_event(event, node);
}
}
#[derive(Unique)]
#[derive(Unique, Clone)]
pub(crate) struct WidgetContext {
sender: UnboundedSender<Event>,
}
packages/rink/src/widgets/number.rs
+13 -23
View File
@@ -3,14 +3,12 @@ use std::{collections::HashMap, io::stdout};
use crossterm::{cursor::MoveTo, execute};
use dioxus_html::{input_data::keyboard_types::Key, KeyboardData, MouseData};
use dioxus_native_core::{
custom_element::CustomElement,
node::OwnedAttributeDiscription,
node_ref::AttributeMask,
prelude::{ElementNode, NodeType},
real_dom::{ElementNodeMut, NodeImmutable, NodeMut, NodeTypeMut, RealDom},
utils::{
cursor::{Cursor, Pos},
widget_watcher::Widget,
},
utils::cursor::{Cursor, Pos},
NodeId,
};
use shipyard::UniqueView;
@@ -169,7 +167,7 @@ impl Number {
self.text = (num - 1.0).to_string();
}
fn handle_keydown(&mut self, root: &mut NodeMut, data: &KeyboardData) {
fn handle_keydown(&mut self, mut root: NodeMut, data: &KeyboardData) {
let key = data.key();
let is_text = match key.clone() {
Key::ArrowLeft | Key::ArrowRight | Key::Backspace => true,
@@ -235,14 +233,11 @@ impl Number {
}
}
fn handle_mousemove(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousemove(&mut self, mut root: NodeMut, data: &MouseData) {
if self.dragging {
let id = root.id();
let offset = data.element_coordinates();
let mut new = Pos::new(offset.x as usize, offset.y as usize);
if self.border {
new.col = new.col.saturating_sub(1);
}
// textboxs are only one line tall
new.row = 0;
@@ -254,12 +249,9 @@ impl Number {
}
}
fn handle_mousedown(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousedown(&mut self, mut root: NodeMut, data: &MouseData) {
let offset = data.element_coordinates();
let mut new = Pos::new(offset.x as usize, offset.y as usize);
if self.border {
new.col = new.col.saturating_sub(1);
}
// textboxs are only one line tall
new.row = 0;
@@ -297,10 +289,14 @@ impl Number {
}
}
impl Widget for Number {
impl CustomElement for Number {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<NodeId> {
vec![self.div_wrapper]
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
let node_type = root.node_type();
let NodeType::Element(el) = &*node_type else { panic!("input must be an element") };
@@ -364,8 +360,6 @@ impl Widget for Number {
root.add_event_listener("keydown");
root.add_event_listener("focusout");
root.add_child(div_wrapper_id);
Self {
pre_cursor_text: pre_text_id,
highlighted_text: highlighted_text_id,
@@ -379,7 +373,7 @@ impl Widget for Number {
fn attributes_changed(
&mut self,
mut root: dioxus_native_core::real_dom::NodeMut<()>,
mut root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match attributes {
@@ -418,11 +412,7 @@ impl Widget for Number {
}
impl RinkWidget for Number {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
) {
fn handle_event(&mut self, event: &crate::Event, node: dioxus_native_core::real_dom::NodeMut) {
match event.name {
"keydown" => {
if let EventData::Keyboard(data) = &event.data {
packages/rink/src/widgets/password.rs
+13 -23
View File
@@ -3,14 +3,12 @@ use std::{collections::HashMap, io::stdout};
use crossterm::{cursor::MoveTo, execute};
use dioxus_html::{input_data::keyboard_types::Key, KeyboardData, MouseData};
use dioxus_native_core::{
custom_element::CustomElement,
node::OwnedAttributeDiscription,
node_ref::AttributeMask,
prelude::{ElementNode, NodeType},
real_dom::{ElementNodeMut, NodeImmutable, NodeMut, NodeTypeMut, RealDom},
utils::{
cursor::{Cursor, Pos},
widget_watcher::Widget,
},
utils::cursor::{Cursor, Pos},
NodeId,
};
use shipyard::UniqueView;
@@ -159,7 +157,7 @@ impl Password {
}
}
fn handle_keydown(&mut self, root: &mut NodeMut, data: &KeyboardData) {
fn handle_keydown(&mut self, mut root: NodeMut, data: &KeyboardData) {
let key = data.key();
let modifiers = data.modifiers();
let code = data.code();
@@ -203,14 +201,11 @@ impl Password {
}
}
fn handle_mousemove(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousemove(&mut self, mut root: NodeMut, data: &MouseData) {
if self.dragging {
let id = root.id();
let offset = data.element_coordinates();
let mut new = Pos::new(offset.x as usize, offset.y as usize);
if self.border {
new.col = new.col.saturating_sub(1);
}
// textboxs are only one line tall
new.row = 0;
@@ -222,12 +217,9 @@ impl Password {
}
}
fn handle_mousedown(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousedown(&mut self, mut root: NodeMut, data: &MouseData) {
let offset = data.element_coordinates();
let mut new = Pos::new(offset.x as usize, offset.y as usize);
if self.border {
new.col = new.col.saturating_sub(1);
}
// textboxs are only one line tall
new.row = 0;
@@ -265,10 +257,14 @@ impl Password {
}
}
impl Widget for Password {
impl CustomElement for Password {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<NodeId> {
vec![self.div_wrapper]
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
let node_type = root.node_type();
let NodeType::Element(el) = &*node_type else { panic!("input must be an element") };
@@ -332,8 +328,6 @@ impl Widget for Password {
root.add_event_listener("keydown");
root.add_event_listener("focusout");
root.add_child(div_wrapper_id);
Self {
pre_cursor_text: pre_text_id,
highlighted_text: highlighted_text_id,
@@ -347,7 +341,7 @@ impl Widget for Password {
fn attributes_changed(
&mut self,
mut root: dioxus_native_core::real_dom::NodeMut<()>,
mut root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match attributes {
@@ -386,11 +380,7 @@ impl Widget for Password {
}
impl RinkWidget for Password {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
) {
fn handle_event(&mut self, event: &crate::Event, node: dioxus_native_core::real_dom::NodeMut) {
match event.name {
"keydown" => {
if let EventData::Keyboard(data) = &event.data {
packages/rink/src/widgets/slider.rs
+13 -15
View File
@@ -2,11 +2,11 @@ use std::collections::HashMap;
use dioxus_html::{input_data::keyboard_types::Key, KeyboardData, MouseData};
use dioxus_native_core::{
custom_element::CustomElement,
node::{OwnedAttributeDiscription, OwnedAttributeValue},
node_ref::AttributeMask,
prelude::{ElementNode, NodeType},
real_dom::{ElementNodeMut, NodeImmutable, NodeMut, NodeTypeMut, RealDom},
utils::widget_watcher::Widget,
NodeId,
};
use shipyard::UniqueView;
@@ -205,7 +205,7 @@ impl Slider {
}
}
fn handle_keydown(&mut self, root: &mut NodeMut, data: &KeyboardData) {
fn handle_keydown(&mut self, mut root: NodeMut, data: &KeyboardData) {
let key = data.key();
let step = self.step();
@@ -227,7 +227,7 @@ impl Slider {
self.write_value(rdom, id);
}
fn handle_mousemove(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousemove(&mut self, mut root: NodeMut, data: &MouseData) {
if !data.held_buttons().is_empty() {
let id = root.id();
let rdom = root.real_dom_mut();
@@ -250,10 +250,14 @@ impl Slider {
}
}
impl Widget for Slider {
impl CustomElement for Slider {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<NodeId> {
vec![self.div_wrapper]
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
let node_type = root.node_type();
let NodeType::Element(el) = &*node_type else { panic!("input must be an element") };
@@ -364,12 +368,10 @@ impl Widget for Slider {
div_wrapper.add_child(cursor_span_id);
div_wrapper.add_child(post_cursor_div_id);
div_wrapper.add_event_listener("mousemove");
div_wrapper.add_event_listener("mousedown");
root.add_event_listener("mousemove");
root.add_event_listener("mousedown");
root.add_event_listener("keydown");
root.add_child(div_wrapper_id);
Self {
pre_cursor_div: pre_cursor_div_id,
post_cursor_div: post_cursor_div_id,
@@ -381,7 +383,7 @@ impl Widget for Slider {
fn attributes_changed(
&mut self,
mut root: dioxus_native_core::real_dom::NodeMut<()>,
mut root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match attributes {
@@ -428,11 +430,7 @@ impl Widget for Slider {
}
impl RinkWidget for Slider {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
) {
fn handle_event(&mut self, event: &crate::Event, node: dioxus_native_core::real_dom::NodeMut) {
match event.name {
"keydown" => {
if let EventData::Keyboard(data) = &event.data {
packages/rink/src/widgets/textbox.rs
+14 -23
View File
@@ -3,14 +3,12 @@ use std::{collections::HashMap, io::stdout};
use crossterm::{cursor::MoveTo, execute};
use dioxus_html::{input_data::keyboard_types::Key, KeyboardData, MouseData};
use dioxus_native_core::{
custom_element::CustomElement,
node::OwnedAttributeDiscription,
node_ref::AttributeMask,
prelude::{ElementNode, NodeType},
real_dom::{ElementNodeMut, NodeImmutable, NodeMut, NodeTypeMut, RealDom},
utils::{
cursor::{Cursor, Pos},
widget_watcher::Widget,
},
utils::cursor::{Cursor, Pos},
NodeId,
};
use shipyard::UniqueView;
@@ -159,7 +157,7 @@ impl TextBox {
}
}
fn handle_keydown(&mut self, root: &mut NodeMut, data: &KeyboardData) {
fn handle_keydown(&mut self, mut root: NodeMut, data: &KeyboardData) {
let key = data.key();
let modifiers = data.modifiers();
let code = data.code();
@@ -203,14 +201,12 @@ impl TextBox {
}
}
fn handle_mousemove(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousemove(&mut self, mut root: NodeMut, data: &MouseData) {
if self.dragging {
let id = root.id();
let offset = data.element_coordinates();
let mut new = Pos::new(offset.x as usize, offset.y as usize);
if self.border {
new.col = new.col.saturating_sub(1);
}
// textboxs are only one line tall
new.row = 0;
@@ -222,12 +218,9 @@ impl TextBox {
}
}
fn handle_mousedown(&mut self, root: &mut NodeMut, data: &MouseData) {
fn handle_mousedown(&mut self, mut root: NodeMut, data: &MouseData) {
let offset = data.element_coordinates();
let mut new = Pos::new(offset.x as usize, offset.y as usize);
if self.border {
new.col = new.col.saturating_sub(1);
}
// textboxs are only one line tall
new.row = 0;
@@ -265,10 +258,14 @@ impl TextBox {
}
}
impl Widget for TextBox {
impl CustomElement for TextBox {
const NAME: &'static str = "input";
fn create(root: &mut dioxus_native_core::real_dom::NodeMut<()>) -> Self {
fn roots(&self) -> Vec<NodeId> {
vec![self.div_wrapper]
}
fn create(mut root: dioxus_native_core::real_dom::NodeMut) -> Self {
let node_type = root.node_type();
let NodeType::Element(el) = &*node_type else { panic!("input must be an element") };
@@ -332,8 +329,6 @@ impl Widget for TextBox {
root.add_event_listener("keydown");
root.add_event_listener("focusout");
root.add_child(div_wrapper_id);
Self {
pre_cursor_text: pre_text_id,
highlighted_text: highlighted_text_id,
@@ -347,7 +342,7 @@ impl Widget for TextBox {
fn attributes_changed(
&mut self,
mut root: dioxus_native_core::real_dom::NodeMut<()>,
mut root: dioxus_native_core::real_dom::NodeMut,
attributes: &dioxus_native_core::node_ref::AttributeMask,
) {
match attributes {
@@ -386,11 +381,7 @@ impl Widget for TextBox {
}
impl RinkWidget for TextBox {
fn handle_event(
&mut self,
event: &crate::Event,
node: &mut dioxus_native_core::real_dom::NodeMut,
) {
fn handle_event(&mut self, event: &crate::Event, node: NodeMut) {
match event.name {
"keydown" => {
if let EventData::Keyboard(data) = &event.data {