itsscb/wordl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mobile): rewrite on_input to use .data() instead converting

Browse Source
This commit is contained in:
itsscb 2024-08-28 16:04:37 +02:00 committed by GitHub
commit 4d55995135
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
frontend/src/pages/home.rs
View File

@ -247,15 +247,11 @@ pub fn Home() -> Html {
}) })
}; };
let on_enter = { let on_enter = {
// if &e.key() == "Enter" {
// if let Ok(m) = MouseEvent::new("click") {
// on_submit.emit(m);
// }
// }
let on_submit = on_submit.clone(); let on_submit = on_submit.clone();
let curr_index = curr_index.clone(); let curr_index = curr_index.clone();
// let input_values = input_values.clone();
let node_refs = node_refs.clone(); let node_refs = node_refs.clone();
let input_values = input_values.clone();
Callback::from(move |e: KeyboardEvent| { Callback::from(move |e: KeyboardEvent| {
match e.key().as_ref() { match e.key().as_ref() {
@ -267,16 +263,16 @@ pub fn Home() -> Html {
"Backspace" => { "Backspace" => {
e.prevent_default(); e.prevent_default();
let index = *curr_index; let index = *curr_index;
// let mut values = (*input_values).clone(); let mut values = (*input_values).clone();
// values[index] = String::new();
// input_values.set(values);
if node_refs[index] if node_refs[index]
.cast::<web_sys::HtmlInputElement>() .cast::<web_sys::HtmlInputElement>()
.is_some() .is_some()
&& index > 0 && index > 0
{ {
values[index] = String::new();
input_values.set(values);
let index = index - 1; let index = index - 1;
curr_index.set(index); curr_index.set(index);
set_focus(index); set_focus(index);
@ -293,37 +289,30 @@ pub fn Home() -> Html {
let input_values = input_values.clone(); let input_values = input_values.clone();
Callback::from(move |e: InputEvent| { Callback::from(move |e: InputEvent| {
if let Some(target) = e.target() { if let Some(value) = e.data() {
if let Ok(input_element) = target.dyn_into::<HtmlInputElement>() { let index = *curr_index;
let value = input_element.value(); let mut values = (*input_values).clone();
let index = *curr_index; if value.len() < values[index].len() && index > 0 {
let mut values = (*input_values).clone(); values[index] = String::new();
input_values.set(values);
if value.is_empty() && !values[index].is_empty() { let new_index = index - 1;
values[index] = String::new(); curr_index.set(new_index);
input_values.set(values); set_focus(new_index);
} }
else if value.len() < values[index].len() && index > 0 { else if value.len() == 1 && value.chars().all(char::is_alphabetic) {
let new_index = index - 1; values[index] = value.to_uppercase();
input_values.set(values);
if index < *length {
let new_index = index + 1;
curr_index.set(new_index); curr_index.set(new_index);
set_focus(new_index); set_focus(new_index);
} }
else if value.len() == 1 && value.chars().all(char::is_alphabetic) { } else {
values[index] = value.to_uppercase(); values[index] = String::new();
input_values.set(values); input_values.set(values);
if index < *length { }
let new_index = index + 1;
curr_index.set(new_index);
set_focus(new_index);
}
} else {
values[index] = String::new();
input_values.set(values);
}
}
} }
}) })
}; };