Merge remote-tracking branch 'upstream/master' into fix-non-str-attributes
This commit is contained in:
commit
73ec4abfdf
33 files changed
+1628
-40
No files matched your search
@@ -287,7 +287,10 @@ impl InnerInputState {
|
||||
|
||||
fn prepare_mouse_data(mouse_data: &MouseData, layout: &Layout) -> MouseData {
|
||||
let Point { x, y } = layout.location;
|
||||
let node_origin = ClientPoint::new(x.into(), y.into());
|
||||
let node_origin = ClientPoint::new(
|
||||
layout_to_screen_space(x).into(),
|
||||
layout_to_screen_space(y).into(),
|
||||
);
|
||||
|
||||
let new_client_coordinates = (mouse_data.client_coordinates() - node_origin)
|
||||
.to_point()
|
||||
|
||||
@@ -7,7 +7,7 @@ use dioxus_native_core::state::ChildDepState;
|
||||
use dioxus_native_core_macro::sorted_str_slice;
|
||||
use taffy::prelude::*;
|
||||
|
||||
use crate::screen_to_layout_space;
|
||||
use crate::{screen_to_layout_space, unit_to_layout_space};
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||
pub(crate) enum PossiblyUninitalized<T> {
|
||||
@@ -105,6 +105,59 @@ impl ChildDepState for TaffyLayout {
|
||||
child_layout.push(l.node.unwrap());
|
||||
}
|
||||
|
||||
fn scale_dimention(d: Dimension) -> Dimension {
|
||||
match d {
|
||||
Dimension::Points(p) => Dimension::Points(unit_to_layout_space(p)),
|
||||
Dimension::Percent(p) => Dimension::Percent(p),
|
||||
Dimension::Auto => Dimension::Auto,
|
||||
Dimension::Undefined => Dimension::Undefined,
|
||||
}
|
||||
}
|
||||
let style = Style {
|
||||
position: Rect {
|
||||
left: scale_dimention(style.position.left),
|
||||
right: scale_dimention(style.position.right),
|
||||
top: scale_dimention(style.position.top),
|
||||
bottom: scale_dimention(style.position.bottom),
|
||||
},
|
||||
margin: Rect {
|
||||
left: scale_dimention(style.margin.left),
|
||||
right: scale_dimention(style.margin.right),
|
||||
top: scale_dimention(style.margin.top),
|
||||
bottom: scale_dimention(style.margin.bottom),
|
||||
},
|
||||
padding: Rect {
|
||||
left: scale_dimention(style.padding.left),
|
||||
right: scale_dimention(style.padding.right),
|
||||
top: scale_dimention(style.padding.top),
|
||||
bottom: scale_dimention(style.padding.bottom),
|
||||
},
|
||||
border: Rect {
|
||||
left: scale_dimention(style.border.left),
|
||||
right: scale_dimention(style.border.right),
|
||||
top: scale_dimention(style.border.top),
|
||||
bottom: scale_dimention(style.border.bottom),
|
||||
},
|
||||
gap: Size {
|
||||
width: scale_dimention(style.gap.width),
|
||||
height: scale_dimention(style.gap.height),
|
||||
},
|
||||
flex_basis: scale_dimention(style.flex_basis),
|
||||
size: Size {
|
||||
width: scale_dimention(style.size.width),
|
||||
height: scale_dimention(style.size.height),
|
||||
},
|
||||
min_size: Size {
|
||||
width: scale_dimention(style.min_size.width),
|
||||
height: scale_dimention(style.min_size.height),
|
||||
},
|
||||
max_size: Size {
|
||||
width: scale_dimention(style.max_size.width),
|
||||
height: scale_dimention(style.max_size.height),
|
||||
},
|
||||
..style
|
||||
};
|
||||
|
||||
if let PossiblyUninitalized::Initialized(n) = self.node {
|
||||
if self.style != style {
|
||||
taffy.set_style(n, style).unwrap();
|
||||
|
||||
+16
-1
@@ -1,5 +1,6 @@
|
||||
use anyhow::Result;
|
||||
use crossterm::{
|
||||
cursor::{MoveTo, RestorePosition, SavePosition, Show},
|
||||
event::{DisableMouseCapture, EnableMouseCapture, Event as TermEvent, KeyCode, KeyModifiers},
|
||||
execute,
|
||||
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
||||
@@ -28,11 +29,13 @@ mod focus;
|
||||
mod hooks;
|
||||
mod layout;
|
||||
mod node;
|
||||
pub mod prelude;
|
||||
pub mod query;
|
||||
mod render;
|
||||
mod style;
|
||||
mod style_attributes;
|
||||
mod widget;
|
||||
mod widgets;
|
||||
|
||||
pub use config::*;
|
||||
pub use hooks::*;
|
||||
@@ -43,6 +46,10 @@ pub(crate) fn screen_to_layout_space(screen: u16) -> f32 {
|
||||
screen as f32 * 10.0
|
||||
}
|
||||
|
||||
pub(crate) fn unit_to_layout_space(screen: f32) -> f32 {
|
||||
screen * 10.0
|
||||
}
|
||||
|
||||
pub(crate) fn layout_to_screen_space(layout: f32) -> f32 {
|
||||
layout / 10.0
|
||||
}
|
||||
@@ -136,7 +143,13 @@ fn render_vdom(
|
||||
let mut terminal = (!cfg.headless).then(|| {
|
||||
enable_raw_mode().unwrap();
|
||||
let mut stdout = std::io::stdout();
|
||||
execute!(stdout, EnterAlternateScreen, EnableMouseCapture).unwrap();
|
||||
execute!(
|
||||
stdout,
|
||||
EnterAlternateScreen,
|
||||
EnableMouseCapture,
|
||||
MoveTo(0, 1000)
|
||||
)
|
||||
.unwrap();
|
||||
let backend = CrosstermBackend::new(io::stdout());
|
||||
Terminal::new(backend).unwrap()
|
||||
});
|
||||
@@ -181,6 +194,7 @@ fn render_vdom(
|
||||
taffy.compute_layout(root_node, size).unwrap();
|
||||
}
|
||||
if let Some(terminal) = &mut terminal {
|
||||
execute!(terminal.backend_mut(), SavePosition).unwrap();
|
||||
terminal.draw(|frame| {
|
||||
let rdom = rdom.borrow();
|
||||
let mut taffy = taffy.lock().expect("taffy lock poisoned");
|
||||
@@ -189,6 +203,7 @@ fn render_vdom(
|
||||
let root = &rdom[NodeId(0)];
|
||||
render::render_vnode(frame, &taffy, &rdom, root, cfg, Point::ZERO);
|
||||
})?;
|
||||
execute!(terminal.backend_mut(), RestorePosition, Show).unwrap();
|
||||
} else {
|
||||
let rdom = rdom.borrow();
|
||||
resize(
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
pub use crate::widgets::*;
|
||||
@@ -41,7 +41,7 @@ pub(crate) fn render_vnode(
|
||||
let x = layout_to_screen_space(fx).round() as u16;
|
||||
let y = layout_to_screen_space(fy).round() as u16;
|
||||
let Size { width, height } = *size;
|
||||
let width = layout_to_screen_space(fx + width).round() as u16 + x;
|
||||
let width = layout_to_screen_space(fx + width).round() as u16 - x;
|
||||
let height = layout_to_screen_space(fy + height).round() as u16 - y;
|
||||
|
||||
match &node.node_data.node_type {
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_elements::input_data::keyboard_types::Key;
|
||||
use dioxus_html as dioxus_elements;
|
||||
use dioxus_html::FormData;
|
||||
|
||||
#[derive(Props)]
|
||||
pub(crate) struct ButtonProps<'a> {
|
||||
#[props(!optional)]
|
||||
raw_onclick: Option<&'a EventHandler<'a, FormData>>,
|
||||
#[props(!optional)]
|
||||
value: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
width: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
height: Option<&'a str>,
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub(crate) fn Button<'a>(cx: Scope<'a, ButtonProps>) -> Element<'a> {
|
||||
let state = use_state(cx, || false);
|
||||
let width = cx.props.width.unwrap_or("1px");
|
||||
let height = cx.props.height.unwrap_or("1px");
|
||||
|
||||
let single_char = width == "1px" || height == "1px";
|
||||
let text = if let Some(v) = cx.props.value { v } else { "" };
|
||||
let border_style = if single_char { "none" } else { "solid" };
|
||||
let update = || {
|
||||
let new_state = !state.get();
|
||||
if let Some(callback) = cx.props.raw_onclick {
|
||||
callback.call(FormData {
|
||||
value: text.to_string(),
|
||||
values: HashMap::new(),
|
||||
files: None,
|
||||
});
|
||||
}
|
||||
state.set(new_state);
|
||||
};
|
||||
cx.render(rsx! {
|
||||
div{
|
||||
width: "{width}",
|
||||
height: "{height}",
|
||||
border_style: "{border_style}",
|
||||
flex_direction: "row",
|
||||
align_items: "center",
|
||||
justify_content: "center",
|
||||
onclick: move |_| {
|
||||
update();
|
||||
},
|
||||
onkeydown: move |evt|{
|
||||
if !evt.is_auto_repeating() && match evt.key(){ Key::Character(c) if c == " " =>true, Key::Enter=>true, _=>false } {
|
||||
update();
|
||||
}
|
||||
},
|
||||
"{text}"
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_elements::input_data::keyboard_types::Key;
|
||||
use dioxus_html as dioxus_elements;
|
||||
use dioxus_html::FormData;
|
||||
|
||||
#[derive(Props)]
|
||||
pub(crate) struct CheckBoxProps<'a> {
|
||||
#[props(!optional)]
|
||||
raw_oninput: Option<&'a EventHandler<'a, FormData>>,
|
||||
#[props(!optional)]
|
||||
value: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
width: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
height: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
checked: Option<&'a str>,
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub(crate) fn CheckBox<'a>(cx: Scope<'a, CheckBoxProps>) -> Element<'a> {
|
||||
let state = use_state(cx, || cx.props.checked.filter(|&c| c == "true").is_some());
|
||||
let width = cx.props.width.unwrap_or("1px");
|
||||
let height = cx.props.height.unwrap_or("1px");
|
||||
|
||||
let single_char = width == "1px" && height == "1px";
|
||||
let text = if single_char {
|
||||
if *state.get() {
|
||||
"☑"
|
||||
} else {
|
||||
"☐"
|
||||
}
|
||||
} else if *state.get() {
|
||||
"✓"
|
||||
} else {
|
||||
" "
|
||||
};
|
||||
let border_style = if width == "1px" || height == "1px" {
|
||||
"none"
|
||||
} else {
|
||||
"solid"
|
||||
};
|
||||
let update = move || {
|
||||
let new_state = !state.get();
|
||||
if let Some(callback) = cx.props.raw_oninput {
|
||||
callback.call(FormData {
|
||||
value: if let Some(value) = &cx.props.value {
|
||||
if new_state {
|
||||
value.to_string()
|
||||
} else {
|
||||
String::new()
|
||||
}
|
||||
} else {
|
||||
"on".to_string()
|
||||
},
|
||||
values: HashMap::new(),
|
||||
files: None,
|
||||
});
|
||||
}
|
||||
state.set(new_state);
|
||||
};
|
||||
cx.render(rsx! {
|
||||
div {
|
||||
width: "{width}",
|
||||
height: "{height}",
|
||||
border_style: "{border_style}",
|
||||
align_items: "center",
|
||||
justify_content: "center",
|
||||
onclick: move |_| {
|
||||
update();
|
||||
},
|
||||
onkeydown: move |evt| {
|
||||
if !evt.is_auto_repeating() && match evt.key(){ Key::Character(c) if c == " " =>true, Key::Enter=>true, _=>false } {
|
||||
update();
|
||||
}
|
||||
},
|
||||
"{text}"
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_core::prelude::fc_to_builder;
|
||||
use dioxus_html::FormData;
|
||||
|
||||
use crate::widgets::button::Button;
|
||||
use crate::widgets::checkbox::CheckBox;
|
||||
use crate::widgets::number::NumbericInput;
|
||||
use crate::widgets::password::Password;
|
||||
use crate::widgets::slider::Slider;
|
||||
use crate::widgets::textbox::TextBox;
|
||||
|
||||
#[derive(Props)]
|
||||
pub struct InputProps<'a> {
|
||||
r#type: Option<&'static str>,
|
||||
oninput: Option<EventHandler<'a, FormData>>,
|
||||
onclick: Option<EventHandler<'a, FormData>>,
|
||||
value: Option<&'a str>,
|
||||
size: Option<&'a str>,
|
||||
maxlength: Option<&'a str>,
|
||||
width: Option<&'a str>,
|
||||
height: Option<&'a str>,
|
||||
min: Option<&'a str>,
|
||||
max: Option<&'a str>,
|
||||
step: Option<&'a str>,
|
||||
checked: Option<&'a str>,
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub fn Input<'a>(cx: Scope<'a, InputProps<'a>>) -> Element<'a> {
|
||||
cx.render(match cx.props.r#type {
|
||||
Some("checkbox") => {
|
||||
rsx! {
|
||||
CheckBox{
|
||||
raw_oninput: cx.props.oninput.as_ref(),
|
||||
value: cx.props.value,
|
||||
width: cx.props.width,
|
||||
height: cx.props.height,
|
||||
checked: cx.props.checked,
|
||||
}
|
||||
}
|
||||
}
|
||||
Some("range") => {
|
||||
rsx! {
|
||||
Slider{
|
||||
raw_oninput: cx.props.oninput.as_ref(),
|
||||
value: cx.props.value,
|
||||
width: cx.props.width,
|
||||
height: cx.props.height,
|
||||
max: cx.props.max,
|
||||
min: cx.props.min,
|
||||
step: cx.props.step,
|
||||
}
|
||||
}
|
||||
}
|
||||
Some("button") => {
|
||||
rsx! {
|
||||
Button{
|
||||
raw_onclick: cx.props.onclick.as_ref(),
|
||||
value: cx.props.value,
|
||||
width: cx.props.width,
|
||||
height: cx.props.height,
|
||||
}
|
||||
}
|
||||
}
|
||||
Some("number") => {
|
||||
rsx! {
|
||||
NumbericInput{
|
||||
raw_oninput: cx.props.oninput.as_ref(),
|
||||
value: cx.props.value,
|
||||
size: cx.props.size,
|
||||
max_length: cx.props.maxlength,
|
||||
width: cx.props.width,
|
||||
height: cx.props.height,
|
||||
}
|
||||
}
|
||||
}
|
||||
Some("password") => {
|
||||
rsx! {
|
||||
Password{
|
||||
raw_oninput: cx.props.oninput.as_ref(),
|
||||
value: cx.props.value,
|
||||
size: cx.props.size,
|
||||
max_length: cx.props.maxlength,
|
||||
width: cx.props.width,
|
||||
height: cx.props.height,
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
rsx! {
|
||||
TextBox{
|
||||
raw_oninput: cx.props.oninput.as_ref(),
|
||||
value: cx.props.value,
|
||||
size: cx.props.size,
|
||||
max_length: cx.props.maxlength,
|
||||
width: cx.props.width,
|
||||
height: cx.props.height,
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
mod button;
|
||||
mod checkbox;
|
||||
mod input;
|
||||
mod number;
|
||||
mod password;
|
||||
mod slider;
|
||||
mod textbox;
|
||||
|
||||
use dioxus_core::{ElementId, RenderReturn, Scope};
|
||||
pub use input::*;
|
||||
|
||||
pub(crate) fn get_root_id<T>(cx: Scope<T>) -> Option<ElementId> {
|
||||
if let RenderReturn::Sync(Ok(sync)) = cx.root_node() {
|
||||
sync.root_ids.get(0).map(|id| id.get())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,209 @@
|
||||
use crate::widgets::get_root_id;
|
||||
use crate::Query;
|
||||
use crossterm::{cursor::MoveTo, execute};
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_elements::input_data::keyboard_types::Key;
|
||||
use dioxus_html as dioxus_elements;
|
||||
use dioxus_html::FormData;
|
||||
use dioxus_native_core::utils::cursor::{Cursor, Pos};
|
||||
use std::{collections::HashMap, io::stdout};
|
||||
use taffy::geometry::Point;
|
||||
|
||||
#[derive(Props)]
|
||||
pub(crate) struct NumbericInputProps<'a> {
|
||||
#[props(!optional)]
|
||||
raw_oninput: Option<&'a EventHandler<'a, FormData>>,
|
||||
#[props(!optional)]
|
||||
value: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
size: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
max_length: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
width: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
height: Option<&'a str>,
|
||||
}
|
||||
#[allow(non_snake_case)]
|
||||
pub(crate) fn NumbericInput<'a>(cx: Scope<'a, NumbericInputProps>) -> Element<'a> {
|
||||
let tui_query: Query = cx.consume_context().unwrap();
|
||||
let tui_query_clone = tui_query.clone();
|
||||
|
||||
let text_ref = use_ref(cx, || {
|
||||
if let Some(intial_text) = cx.props.value {
|
||||
intial_text.to_string()
|
||||
} else {
|
||||
String::new()
|
||||
}
|
||||
});
|
||||
let cursor = use_ref(cx, Cursor::default);
|
||||
let dragging = use_state(cx, || false);
|
||||
|
||||
let text = text_ref.read().clone();
|
||||
let start_highlight = cursor.read().first().idx(&text);
|
||||
let end_highlight = cursor.read().last().idx(&text);
|
||||
let (text_before_first_cursor, text_after_first_cursor) = text.split_at(start_highlight);
|
||||
let (text_highlighted, text_after_second_cursor) =
|
||||
text_after_first_cursor.split_at(end_highlight - start_highlight);
|
||||
|
||||
let max_len = cx
|
||||
.props
|
||||
.max_length
|
||||
.as_ref()
|
||||
.and_then(|s| s.parse().ok())
|
||||
.unwrap_or(usize::MAX);
|
||||
|
||||
let width = cx
|
||||
.props
|
||||
.width
|
||||
.map(|s| s.to_string())
|
||||
// px is the same as em in tui
|
||||
.or_else(|| cx.props.size.map(|s| s.to_string() + "px"))
|
||||
.unwrap_or_else(|| "10px".to_string());
|
||||
let height = cx.props.height.unwrap_or("3px");
|
||||
|
||||
// don't draw a border unless there is enough space
|
||||
let border = if width
|
||||
.strip_suffix("px")
|
||||
.and_then(|w| w.parse::<i32>().ok())
|
||||
.filter(|w| *w < 3)
|
||||
.is_some()
|
||||
|| height
|
||||
.strip_suffix("px")
|
||||
.and_then(|h| h.parse::<i32>().ok())
|
||||
.filter(|h| *h < 3)
|
||||
.is_some()
|
||||
{
|
||||
"none"
|
||||
} else {
|
||||
"solid"
|
||||
};
|
||||
|
||||
let update = |text: String| {
|
||||
if let Some(input_handler) = &cx.props.raw_oninput {
|
||||
input_handler.call(FormData {
|
||||
value: text,
|
||||
values: HashMap::new(),
|
||||
files: None,
|
||||
});
|
||||
}
|
||||
};
|
||||
let increase = move || {
|
||||
let mut text = text_ref.write();
|
||||
*text = (text.parse::<f64>().unwrap_or(0.0) + 1.0).to_string();
|
||||
update(text.clone());
|
||||
};
|
||||
let decrease = move || {
|
||||
let mut text = text_ref.write();
|
||||
*text = (text.parse::<f64>().unwrap_or(0.0) - 1.0).to_string();
|
||||
update(text.clone());
|
||||
};
|
||||
|
||||
render! {
|
||||
div{
|
||||
width: "{width}",
|
||||
height: "{height}",
|
||||
border_style: "{border}",
|
||||
|
||||
onkeydown: move |k| {
|
||||
let is_text = match k.key(){
|
||||
Key::ArrowLeft | Key::ArrowRight | Key::Backspace => true,
|
||||
Key::Character(c) if c=="." || c== "-" || c.chars().all(|c|c.is_numeric())=> true,
|
||||
_ => false,
|
||||
};
|
||||
if is_text{
|
||||
let mut text = text_ref.write();
|
||||
cursor.write().handle_input(&k, &mut text, max_len);
|
||||
update(text.clone());
|
||||
|
||||
let node = tui_query.get(get_root_id(cx).unwrap());
|
||||
let Point{ x, y } = node.pos().unwrap();
|
||||
|
||||
let Pos { col, row } = cursor.read().start;
|
||||
let (x, y) = (col as u16 + x as u16 + if border == "none" {0} else {1}, row as u16 + y as u16 + if border == "none" {0} else {1});
|
||||
if let Ok(pos) = crossterm::cursor::position() {
|
||||
if pos != (x, y){
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
match k.key() {
|
||||
Key::ArrowUp =>{
|
||||
increase();
|
||||
}
|
||||
Key::ArrowDown =>{
|
||||
decrease();
|
||||
}
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
},
|
||||
onmousemove: move |evt| {
|
||||
if *dragging.get() {
|
||||
let offset = evt.data.element_coordinates();
|
||||
let mut new = Pos::new(offset.x as usize, offset.y as usize);
|
||||
if border != "none" {
|
||||
new.col = new.col.saturating_sub(1);
|
||||
}
|
||||
// textboxs are only one line tall
|
||||
new.row = 0;
|
||||
|
||||
if new != cursor.read().start {
|
||||
cursor.write().end = Some(new);
|
||||
}
|
||||
}
|
||||
},
|
||||
onmousedown: move |evt| {
|
||||
let offset = evt.data.element_coordinates();
|
||||
let mut new = Pos::new(offset.x as usize, offset.y as usize);
|
||||
if border != "none" {
|
||||
new.col = new.col.saturating_sub(1);
|
||||
}
|
||||
new.row = 0;
|
||||
|
||||
new.realize_col(&text_ref.read());
|
||||
cursor.set(Cursor::from_start(new));
|
||||
dragging.set(true);
|
||||
let node = tui_query_clone.get(get_root_id(cx).unwrap());
|
||||
let Point{ x, y } = node.pos().unwrap();
|
||||
|
||||
let Pos { col, row } = cursor.read().start;
|
||||
let (x, y) = (col as u16 + x as u16 + if border == "none" {0} else {1}, row as u16 + y as u16 + if border == "none" {0} else {1});
|
||||
if let Ok(pos) = crossterm::cursor::position() {
|
||||
if pos != (x, y){
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
},
|
||||
onmouseup: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onmouseleave: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onmouseenter: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onfocusout: |_| {
|
||||
execute!(stdout(), MoveTo(0, 1000)).unwrap();
|
||||
},
|
||||
|
||||
"{text_before_first_cursor}"
|
||||
|
||||
span{
|
||||
background_color: "rgba(255, 255, 255, 50%)",
|
||||
|
||||
"{text_highlighted}"
|
||||
}
|
||||
|
||||
"{text_after_second_cursor}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,186 @@
|
||||
use crate::widgets::get_root_id;
|
||||
use crate::Query;
|
||||
use crossterm::{cursor::*, execute};
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_elements::input_data::keyboard_types::Key;
|
||||
use dioxus_html as dioxus_elements;
|
||||
use dioxus_html::FormData;
|
||||
use dioxus_native_core::utils::cursor::{Cursor, Pos};
|
||||
use std::{collections::HashMap, io::stdout};
|
||||
use taffy::geometry::Point;
|
||||
|
||||
#[derive(Props)]
|
||||
pub(crate) struct PasswordProps<'a> {
|
||||
#[props(!optional)]
|
||||
raw_oninput: Option<&'a EventHandler<'a, FormData>>,
|
||||
#[props(!optional)]
|
||||
value: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
size: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
max_length: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
width: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
height: Option<&'a str>,
|
||||
}
|
||||
#[allow(non_snake_case)]
|
||||
pub(crate) fn Password<'a>(cx: Scope<'a, PasswordProps>) -> Element<'a> {
|
||||
let tui_query: Query = cx.consume_context().unwrap();
|
||||
let tui_query_clone = tui_query.clone();
|
||||
|
||||
let text_ref = use_ref(cx, || {
|
||||
if let Some(intial_text) = cx.props.value {
|
||||
intial_text.to_string()
|
||||
} else {
|
||||
String::new()
|
||||
}
|
||||
});
|
||||
let cursor = use_ref(cx, Cursor::default);
|
||||
let dragging = use_state(cx, || false);
|
||||
|
||||
let text = text_ref.read().clone();
|
||||
let start_highlight = cursor.read().first().idx(&text);
|
||||
let end_highlight = cursor.read().last().idx(&text);
|
||||
let (text_before_first_cursor, text_after_first_cursor) = text.split_at(start_highlight);
|
||||
let (text_highlighted, text_after_second_cursor) =
|
||||
text_after_first_cursor.split_at(end_highlight - start_highlight);
|
||||
|
||||
let text_before_first_cursor = ".".repeat(text_before_first_cursor.len());
|
||||
let text_highlighted = ".".repeat(text_highlighted.len());
|
||||
let text_after_second_cursor = ".".repeat(text_after_second_cursor.len());
|
||||
|
||||
let max_len = cx
|
||||
.props
|
||||
.max_length
|
||||
.as_ref()
|
||||
.and_then(|s| s.parse().ok())
|
||||
.unwrap_or(usize::MAX);
|
||||
|
||||
let width = cx
|
||||
.props
|
||||
.width
|
||||
.map(|s| s.to_string())
|
||||
// px is the same as em in tui
|
||||
.or_else(|| cx.props.size.map(|s| s.to_string() + "px"))
|
||||
.unwrap_or_else(|| "10px".to_string());
|
||||
let height = cx.props.height.unwrap_or("3px");
|
||||
|
||||
// don't draw a border unless there is enough space
|
||||
let border = if width
|
||||
.strip_suffix("px")
|
||||
.and_then(|w| w.parse::<i32>().ok())
|
||||
.filter(|w| *w < 3)
|
||||
.is_some()
|
||||
|| height
|
||||
.strip_suffix("px")
|
||||
.and_then(|h| h.parse::<i32>().ok())
|
||||
.filter(|h| *h < 3)
|
||||
.is_some()
|
||||
{
|
||||
"none"
|
||||
} else {
|
||||
"solid"
|
||||
};
|
||||
|
||||
render! {
|
||||
div{
|
||||
width: "{width}",
|
||||
height: "{height}",
|
||||
border_style: "{border}",
|
||||
|
||||
onkeydown: move |k| {
|
||||
if k.key()== Key::Enter {
|
||||
return;
|
||||
}
|
||||
let mut text = text_ref.write();
|
||||
cursor.write().handle_input(&k, &mut text, max_len);
|
||||
if let Some(input_handler) = &cx.props.raw_oninput{
|
||||
input_handler.call(FormData{
|
||||
value: text.clone(),
|
||||
values: HashMap::new(),
|
||||
files: None
|
||||
});
|
||||
}
|
||||
|
||||
let node = tui_query.get(get_root_id(cx).unwrap());
|
||||
let Point{ x, y } = node.pos().unwrap();
|
||||
|
||||
let Pos { col, row } = cursor.read().start;
|
||||
let (x, y) = (col as u16 + x as u16 + if border == "none" {0} else {1}, row as u16 + y as u16 + if border == "none" {0} else {1});
|
||||
if let Ok(pos) = crossterm::cursor::position() {
|
||||
if pos != (x, y){
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
},
|
||||
|
||||
onmousemove: move |evt| {
|
||||
if *dragging.get() {
|
||||
let offset = evt.data.element_coordinates();
|
||||
let mut new = Pos::new(offset.x as usize, offset.y as usize);
|
||||
if border != "none" {
|
||||
new.col = new.col.saturating_sub(1);
|
||||
}
|
||||
// textboxs are only one line tall
|
||||
new.row = 0;
|
||||
|
||||
if new != cursor.read().start {
|
||||
cursor.write().end = Some(new);
|
||||
}
|
||||
}
|
||||
},
|
||||
onmousedown: move |evt| {
|
||||
let offset = evt.data.element_coordinates();
|
||||
let mut new = Pos::new(offset.x as usize, offset.y as usize);
|
||||
if border != "none" {
|
||||
new.col = new.col.saturating_sub(1);
|
||||
}
|
||||
// textboxs are only one line tall
|
||||
new.row = 0;
|
||||
|
||||
new.realize_col(&text_ref.read());
|
||||
cursor.set(Cursor::from_start(new));
|
||||
dragging.set(true);
|
||||
let node = tui_query_clone.get(get_root_id(cx).unwrap());
|
||||
let Point{ x, y } = node.pos().unwrap();
|
||||
|
||||
let Pos { col, row } = cursor.read().start;
|
||||
let (x, y) = (col as u16 + x as u16 + if border == "none" {0} else {1}, row as u16 + y as u16 + if border == "none" {0} else {1});
|
||||
if let Ok(pos) = crossterm::cursor::position() {
|
||||
if pos != (x, y){
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
},
|
||||
onmouseup: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onmouseleave: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onmouseenter: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onfocusout: |_| {
|
||||
execute!(stdout(), MoveTo(0, 1000)).unwrap();
|
||||
},
|
||||
|
||||
"{text_before_first_cursor}"
|
||||
|
||||
span{
|
||||
background_color: "rgba(255, 255, 255, 50%)",
|
||||
|
||||
"{text_highlighted}"
|
||||
}
|
||||
|
||||
"{text_after_second_cursor}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::widgets::get_root_id;
|
||||
use crate::Query;
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_elements::input_data::keyboard_types::Key;
|
||||
use dioxus_html as dioxus_elements;
|
||||
use dioxus_html::FormData;
|
||||
|
||||
#[derive(Props)]
|
||||
pub(crate) struct SliderProps<'a> {
|
||||
#[props(!optional)]
|
||||
raw_oninput: Option<&'a EventHandler<'a, FormData>>,
|
||||
#[props(!optional)]
|
||||
value: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
width: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
height: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
min: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
max: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
step: Option<&'a str>,
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub(crate) fn Slider<'a>(cx: Scope<'a, SliderProps>) -> Element<'a> {
|
||||
let tui_query: Query = cx.consume_context().unwrap();
|
||||
|
||||
let value_state = use_state(cx, || 0.0);
|
||||
let value: Option<f32> = cx.props.value.and_then(|v| v.parse().ok());
|
||||
let width = cx.props.width.unwrap_or("20px");
|
||||
let height = cx.props.height.unwrap_or("1px");
|
||||
let min = cx.props.min.and_then(|v| v.parse().ok()).unwrap_or(0.0);
|
||||
let max = cx.props.max.and_then(|v| v.parse().ok()).unwrap_or(100.0);
|
||||
let size = max - min;
|
||||
let step = cx
|
||||
.props
|
||||
.step
|
||||
.and_then(|v| v.parse().ok())
|
||||
.unwrap_or(size / 10.0);
|
||||
|
||||
let current_value = if let Some(value) = value {
|
||||
value
|
||||
} else {
|
||||
*value_state.get()
|
||||
}
|
||||
.max(min)
|
||||
.min(max);
|
||||
let fst_width = 100.0 * (current_value - min) / size;
|
||||
let snd_width = 100.0 * (max - current_value) / size;
|
||||
assert!(fst_width + snd_width > 99.0 && fst_width + snd_width < 101.0);
|
||||
|
||||
let update = |value: String| {
|
||||
if let Some(oninput) = cx.props.raw_oninput {
|
||||
oninput.call(FormData {
|
||||
value,
|
||||
values: HashMap::new(),
|
||||
files: None,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
render! {
|
||||
div{
|
||||
width: "{width}",
|
||||
height: "{height}",
|
||||
display: "flex",
|
||||
flex_direction: "row",
|
||||
onkeydown: move |event| {
|
||||
match event.key() {
|
||||
Key::ArrowLeft => {
|
||||
value_state.set((current_value - step).max(min).min(max));
|
||||
update(value_state.current().to_string());
|
||||
}
|
||||
Key::ArrowRight => {
|
||||
value_state.set((current_value + step).max(min).min(max));
|
||||
update(value_state.current().to_string());
|
||||
}
|
||||
_ => ()
|
||||
}
|
||||
},
|
||||
onmousemove: move |evt| {
|
||||
let mouse = evt.data;
|
||||
if !mouse.held_buttons().is_empty(){
|
||||
let node = tui_query.get(get_root_id(cx).unwrap());
|
||||
let width = node.size().unwrap().width;
|
||||
let offset = mouse.element_coordinates();
|
||||
value_state.set(min + size*(offset.x as f32) / width as f32);
|
||||
update(value_state.current().to_string());
|
||||
}
|
||||
},
|
||||
div{
|
||||
width: "{fst_width}%",
|
||||
background_color: "rgba(10,10,10,0.5)",
|
||||
}
|
||||
div{
|
||||
"|"
|
||||
}
|
||||
div{
|
||||
width: "{snd_width}%",
|
||||
background_color: "rgba(10,10,10,0.5)",
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,182 @@
|
||||
use crate::widgets::get_root_id;
|
||||
use crate::Query;
|
||||
use crossterm::{cursor::*, execute};
|
||||
use dioxus::prelude::*;
|
||||
use dioxus_elements::input_data::keyboard_types::Key;
|
||||
use dioxus_html as dioxus_elements;
|
||||
use dioxus_html::FormData;
|
||||
use dioxus_native_core::utils::cursor::{Cursor, Pos};
|
||||
use std::{collections::HashMap, io::stdout};
|
||||
use taffy::geometry::Point;
|
||||
|
||||
#[derive(Props)]
|
||||
pub(crate) struct TextBoxProps<'a> {
|
||||
#[props(!optional)]
|
||||
raw_oninput: Option<&'a EventHandler<'a, FormData>>,
|
||||
#[props(!optional)]
|
||||
value: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
size: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
max_length: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
width: Option<&'a str>,
|
||||
#[props(!optional)]
|
||||
height: Option<&'a str>,
|
||||
}
|
||||
#[allow(non_snake_case)]
|
||||
pub(crate) fn TextBox<'a>(cx: Scope<'a, TextBoxProps>) -> Element<'a> {
|
||||
let tui_query: Query = cx.consume_context().unwrap();
|
||||
let tui_query_clone = tui_query.clone();
|
||||
|
||||
let text_ref = use_ref(cx, || {
|
||||
if let Some(intial_text) = cx.props.value {
|
||||
intial_text.to_string()
|
||||
} else {
|
||||
String::new()
|
||||
}
|
||||
});
|
||||
let cursor = use_ref(cx, Cursor::default);
|
||||
let dragging = use_state(cx, || false);
|
||||
|
||||
let text = text_ref.read().clone();
|
||||
let start_highlight = cursor.read().first().idx(&text);
|
||||
let end_highlight = cursor.read().last().idx(&text);
|
||||
let (text_before_first_cursor, text_after_first_cursor) = text.split_at(start_highlight);
|
||||
let (text_highlighted, text_after_second_cursor) =
|
||||
text_after_first_cursor.split_at(end_highlight - start_highlight);
|
||||
|
||||
let max_len = cx
|
||||
.props
|
||||
.max_length
|
||||
.as_ref()
|
||||
.and_then(|s| s.parse().ok())
|
||||
.unwrap_or(usize::MAX);
|
||||
|
||||
let width = cx
|
||||
.props
|
||||
.width
|
||||
.map(|s| s.to_string())
|
||||
// px is the same as em in tui
|
||||
.or_else(|| cx.props.size.map(|s| s.to_string() + "px"))
|
||||
.unwrap_or_else(|| "10px".to_string());
|
||||
let height = cx.props.height.unwrap_or("3px");
|
||||
|
||||
// don't draw a border unless there is enough space
|
||||
let border = if width
|
||||
.strip_suffix("px")
|
||||
.and_then(|w| w.parse::<i32>().ok())
|
||||
.filter(|w| *w < 3)
|
||||
.is_some()
|
||||
|| height
|
||||
.strip_suffix("px")
|
||||
.and_then(|h| h.parse::<i32>().ok())
|
||||
.filter(|h| *h < 3)
|
||||
.is_some()
|
||||
{
|
||||
"none"
|
||||
} else {
|
||||
"solid"
|
||||
};
|
||||
|
||||
render! {
|
||||
div{
|
||||
width: "{width}",
|
||||
height: "{height}",
|
||||
border_style: "{border}",
|
||||
|
||||
onkeydown: move |k| {
|
||||
if k.key() == Key::Enter {
|
||||
return;
|
||||
}
|
||||
let mut text = text_ref.write();
|
||||
cursor.write().handle_input(&k, &mut text, max_len);
|
||||
if let Some(input_handler) = &cx.props.raw_oninput{
|
||||
input_handler.call(FormData{
|
||||
value: text.clone(),
|
||||
values: HashMap::new(),
|
||||
files: None
|
||||
});
|
||||
}
|
||||
|
||||
let node = tui_query.get(get_root_id(cx).unwrap());
|
||||
let Point{ x, y } = node.pos().unwrap();
|
||||
|
||||
let Pos { col, row } = cursor.read().start;
|
||||
let (x, y) = (col as u16 + x as u16 + if border == "none" {0} else {1}, row as u16 + y as u16 + if border == "none" {0} else {1});
|
||||
if let Ok(pos) = crossterm::cursor::position() {
|
||||
if pos != (x, y){
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
},
|
||||
|
||||
onmousemove: move |evt| {
|
||||
if *dragging.get() {
|
||||
let offset = evt.data.element_coordinates();
|
||||
let mut new = Pos::new(offset.x as usize, offset.y as usize);
|
||||
if border != "none" {
|
||||
new.col = new.col.saturating_sub(1);
|
||||
}
|
||||
// textboxs are only one line tall
|
||||
new.row = 0;
|
||||
|
||||
if new != cursor.read().start {
|
||||
cursor.write().end = Some(new);
|
||||
}
|
||||
}
|
||||
},
|
||||
onmousedown: move |evt| {
|
||||
let offset = evt.data.element_coordinates();
|
||||
let mut new = Pos::new(offset.x as usize, offset.y as usize);
|
||||
if border != "none" {
|
||||
new.col = new.col.saturating_sub(1);
|
||||
}
|
||||
// textboxs are only one line tall
|
||||
new.row = 0;
|
||||
|
||||
new.realize_col(&text_ref.read());
|
||||
cursor.set(Cursor::from_start(new));
|
||||
dragging.set(true);
|
||||
let node = tui_query_clone.get(get_root_id(cx).unwrap());
|
||||
let Point{ x, y } = node.pos().unwrap();
|
||||
|
||||
let Pos { col, row } = cursor.read().start;
|
||||
let (x, y) = (col as u16 + x as u16 + if border == "none" {0} else {1}, row as u16 + y as u16 + if border == "none" {0} else {1});
|
||||
if let Ok(pos) = crossterm::cursor::position() {
|
||||
if pos != (x, y){
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
}
|
||||
else{
|
||||
execute!(stdout(), MoveTo(x, y)).unwrap();
|
||||
}
|
||||
},
|
||||
onmouseup: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onmouseleave: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onmouseenter: move |_| {
|
||||
dragging.set(false);
|
||||
},
|
||||
onfocusout: |_| {
|
||||
execute!(stdout(), MoveTo(0, 1000)).unwrap();
|
||||
},
|
||||
|
||||
"{text_before_first_cursor}"
|
||||
|
||||
span{
|
||||
background_color: "rgba(255, 255, 255, 50%)",
|
||||
|
||||
"{text_highlighted}"
|
||||
}
|
||||
|
||||
"{text_after_second_cursor}"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user