ryanmwangi
/
Compware
1
0
Fork 0
Code Issues Pull Requests Releases Activity

feat(maintain focus on cells): maintain focus while typing in cells; in progress

This commit is contained in:
ryan 2024-12-24 14:27:32 +03:00
parent 8b89b635a8
commit 9da8b03de2
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/editable_cell.rs
View File

@ -4,8 +4,10 @@ use leptos::*;
pub fn EditableCell( pub fn EditableCell(
value: String, value: String,
on_input: impl Fn(String) + 'static, on_input: impl Fn(String) + 'static,
#[prop(optional)] key: Option<String>, // Optional `key` prop
) -> impl IntoView { ) -> impl IntoView {
let (input_value, set_input_value) = create_signal(value.clone()); let (input_value, set_input_value) = create_signal(value.clone());
let (has_focus, set_has_focus) = create_signal(false); // Track focus state locally
let handle_input = move |e: web_sys::Event| { let handle_input = move |e: web_sys::Event| {
let new_value = event_target_value(&e); let new_value = event_target_value(&e);
@ -13,11 +15,25 @@ pub fn EditableCell(
on_input(new_value); on_input(new_value);
}; };
let handle_focus = move |_: web_sys::FocusEvent| {
set_has_focus.set(true);
};
let handle_blur = move |_: web_sys::FocusEvent| {
set_has_focus.set(false);
};
// Use key to force updates only when necessary
let _key = key.unwrap_or_default();
view! { view! {
<input <input
type="text" type="text"
value={input_value.get()} value={input_value.get()}
on:input=handle_input on:input=handle_input
on:focus=handle_focus
on:blur=handle_blur
class={if has_focus.get() { "focused" } else { "not-focused" }}
/> />
} }
} }

16
src/components/items_list.rs
View File

@ -89,7 +89,7 @@ pub fn ItemsList(
name: String::new(), name: String::new(),
description: String::new(), description: String::new(),
tags: vec![], tags: vec![],
reviews:vec![], reviews: vec![],
wikidata_id: None, wikidata_id: None,
}); });
}); });
@ -124,12 +124,12 @@ pub fn ItemsList(
<EditableCell <EditableCell
value=item.name.clone() value=item.name.clone()
on_input=move |value| update_item(index, "name", value) on_input=move |value| update_item(index, "name", value)
key=format!("name-{}", index) // Unique key per cell
/> />
<ul> <ul>
{move || { {move || {
let suggestions = wikidata_suggestions.get().to_vec(); let suggestions = wikidata_suggestions.get().to_vec();
suggestions.into_iter().map(|suggestion| { suggestions.into_iter().map(|suggestion| {
// Clone all necessary fields upfront
let label_for_click = suggestion.label.clone(); let label_for_click = suggestion.label.clone();
let label_for_display = suggestion.label.clone(); let label_for_display = suggestion.label.clone();
let description_for_click = suggestion.description.clone().unwrap_or_default(); let description_for_click = suggestion.description.clone().unwrap_or_default();
@ -146,17 +146,16 @@ pub fn ItemsList(
<li on:click=move |_| { <li on:click=move |_| {
set_items.update(|items| { set_items.update(|items| {
if let Some(item) = items.get_mut(index) { if let Some(item) = items.get_mut(index) {
item.description = description_for_click.clone(); // Update description item.description = description_for_click.clone();
item.tags.extend(tags.clone()); // Add tags item.tags.extend(tags.clone());
item.wikidata_id = Some(id.clone()); item.wikidata_id = Some(id.clone());
item.name = label_for_click.clone(); // Use the cloned version for updating item.name = label_for_click.clone();
} }
}); });
}> }>
{ format!("{} - {}", label_for_display, description_for_display) } // Use the cloned version for display { format!("{} - {}", label_for_display, description_for_display) }
</li> </li>
} }
}).collect::<Vec<_>>() }).collect::<Vec<_>>()
}} }}
</ul> </ul>
@ -166,6 +165,7 @@ pub fn ItemsList(
<EditableCell <EditableCell
value=item.description.clone() value=item.description.clone()
on_input=move |value| update_item(index, "description", value) on_input=move |value| update_item(index, "description", value)
key=format!("description-{}", index)
/> />
</td> </td>
// Tag Editor // Tag Editor
@ -173,7 +173,7 @@ pub fn ItemsList(
<TagEditor <TagEditor
tags=item.tags.clone() tags=item.tags.clone()
on_add=move |key, value| add_tag(index, key, value) on_add=move |key, value| add_tag(index, key, value)
on_remove=Arc::new (Mutex:: new (move |tag_index:usize| remove_tag(index, tag_index))) on_remove=Arc::new(Mutex::new(move |tag_index: usize| remove_tag(index, tag_index)))
/> />
</td> </td>
// Actions // Actions