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

fix(typeahead): create a new row when typing in the name input field

Browse source
This commit is contained in:
ryan 2025-04-18 15:43:23 +03:00
parent 7d36bac77f
commit 37d157725e
2 changed files with 57 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/components/items_list.rs
View file

@ -804,12 +804,18 @@ pub fn ItemsList(
<tbody>
{properties.into_iter().map(|property| {
let update_item_cloned = Arc::clone(&update_item);
let current_url_for_closure = Rc::clone(&current_url);
log!("Rendering property: {}", property);
view! {
<tr>
<td>{ property }</td>
{move || items.get().iter().enumerate().map(|(index, item)| {
let update_item_clone = Arc::clone(&update_item_cloned);
{{
move || {
let items = items.get();
items.iter().enumerate().map(|(index, item)| {
let update_item_clone = Arc::clone(&update_item_cloned);
let current_url_clone = Rc::clone(&current_url_for_closure);
view! {
<td>
{match property {
@ -855,7 +861,38 @@ pub fn ItemsList(
}
});
})
node_ref=node_ref
is_last_row={index == items.len() - 1}
on_input=Callback::new({
// Clone items.len() before moving into the closure
let items_len = items.len();
let current_url_for_spawn = Rc::clone(&current_url_clone);
move |value: String| {
if index == items_len - 1 && !value.is_empty() {
// Use the cloned current_url
let current_url_for_new_item = Rc::clone(&current_url_for_spawn);
set_items.update(|items| {
let new_item = Item {
id: Uuid::new_v4().to_string(),
name: String::new(),
description: String::new(),
wikidata_id: None,
custom_properties: HashMap::new(),
};
items.push(new_item.clone());
// Save the new item to the database
spawn_local({
let current_url = Rc::clone(&current_url_for_new_item);
let selected_properties = selected_properties;
async move {
save_item_to_db(new_item, selected_properties, current_url.to_string()).await;
}
});
});
}
}
})
node_ref=create_node_ref()
/>
</div>
}.into_view(),
@ -882,7 +919,9 @@ pub fn ItemsList(
}}
</td>
}
}).collect::<Vec<_>>()}
}).collect::<Vec<_>>()
}
}}
</tr>
}
}).collect::<Vec<_>>()}
@ -924,7 +963,8 @@ pub fn ItemsList(
{move || {
let update_item_cell = Arc::clone(&update_item_inner);
let property_clone_for_cells = normalized_property.clone();
items.get().iter().enumerate().map(move |(index, item)| {
let items = items.get();
items.iter().enumerate().map(move |(index, item)| {
let update_item_cell = Arc::clone(&update_item_cell);
let property_clone_for_closure = property_clone_for_cells.clone();
view! {

11
src/components/typeahead_input.rs
View file

@ -1,4 +1,3 @@
use leptos::*;
use wasm_bindgen::prelude::*;
use crate::models::item::WikidataSuggestion;
@ -16,6 +15,8 @@ pub fn TypeaheadInput(
on_select: Callback<WikidataSuggestion>,
fetch_suggestions: Callback<String, Vec<WikidataSuggestion>>,
node_ref: NodeRef<Input>,
#[prop(optional)] is_last_row: bool,
#[prop(optional)] on_input: Option<Callback<String>>,
) -> impl IntoView {
let (is_initialized, set_initialized) = create_signal(false);
@ -111,6 +112,14 @@ pub fn TypeaheadInput(
on:input=move |ev| {
let value = event_target_value(&ev);
log!("[INPUT] Value changed: {}", value);
// If this is the last row and we have an on_input callback, call it
if is_last_row && !value.is_empty() {
if let Some(callback) = &on_input {
callback.call(value.clone());
}
}
let _ = js_sys::eval("console.log('jQuery version:', $.fn.jquery)");
let _ = js_sys::eval("console.log('Typeahead version:', $.fn.typeahead ? 'loaded' : 'missing')");
}