diff --git a/src/components/items_list.rs b/src/components/items_list.rs index 2a8532e..ce47667 100644 --- a/src/components/items_list.rs +++ b/src/components/items_list.rs @@ -143,6 +143,11 @@ pub fn ItemsList( let (property_cache, set_property_cache) = create_signal(HashMap::>::new()); let (suggestions, set_suggestions) = create_signal(Vec::::new()); + + // Add a state to track which input field should be focused after re-render + let (focus_index, set_focus_index) = create_signal(None::); + let (adding_new_row, set_adding_new_row) = create_signal(false); + #[cfg(feature = "ssr")] fn get_current_url() -> String { use leptos::use_context; @@ -755,68 +760,81 @@ pub fn ItemsList( let update_item = { let set_items = set_items.clone(); let current_url = Rc::clone(¤t_url); - Arc::new(move |index: usize, field: &str, value: String| { - let set_items = set_items.clone(); - let current_url = Rc::clone(¤t_url); - set_items.update(move|items| { - if let Some(item) = items.get_mut(index) { - match field { - "name" => { - item.name = value.clone(); - fetch_wikidata_suggestions(format!("name-{}", index), value.clone()); + let set_focus_index = set_focus_index.clone(); + let set_adding_new_row = set_adding_new_row.clone(); - // Fetch Wikidata properties if the field is "name" and the item has a valid Wikidata ID - if !value.is_empty() { - if let Some(wikidata_id) = &item.wikidata_id { - let wikidata_id = wikidata_id.clone(); - spawn_local(async move { - let properties = fetch_item_properties(&wikidata_id, set_property_labels.clone(), property_cache.clone(), set_property_cache.clone(), property_labels.clone()).await; - log!("Fetched properties for index {}: {:?}", index, properties); - }); + Arc::new(move |index: usize, field: &str, value: String| { + let set_items = set_items.clone(); + let current_url = Rc::clone(¤t_url); + let set_focus_index = set_focus_index.clone(); + let set_adding_new_row = set_adding_new_row.clone(); + + set_items.update(move|items| { + if let Some(item) = items.get_mut(index) { + match field { + "name" => { + item.name = value.clone(); + fetch_wikidata_suggestions(format!("name-{}", index), value.clone()); + + // Fetch Wikidata properties if the field is "name" and the item has a valid Wikidata ID + if !value.is_empty() { + if let Some(wikidata_id) = &item.wikidata_id { + let wikidata_id = wikidata_id.clone(); + spawn_local(async move { + let properties = fetch_item_properties(&wikidata_id, set_property_labels.clone(), property_cache.clone(), set_property_cache.clone(), property_labels.clone()).await; + log!("Fetched properties for index {}: {:?}", index, properties); + }); + } } } + "description" => { + item.description = value.clone(); + } + _ => { + // Update custom property + item.custom_properties.insert(field.to_string(), value.clone()); + } } - "description" => { - item.description = value.clone(); - } - _ => { - // Update custom property - item.custom_properties.insert(field.to_string(), value.clone()); - } + + // Save the updated item to the database + let item_clone = item.clone(); + spawn_local({ + let current_url = Rc::clone(¤t_url); + async move { + save_item_to_db(item_clone, selected_properties, current_url.to_string()).await; + } + }); } + // Automatically add a new row when editing the last row + if index == items.len() - 1 && !value.is_empty() { + // Set flag that we're adding a new row and need to maintain focus + set_adding_new_row.set(true); + + // Remember which index we were editing + set_focus_index.set(Some(index)); - // Save the updated item to the database - let item_clone = item.clone(); - spawn_local({ - let current_url = Rc::clone(¤t_url); - async move { - save_item_to_db(item_clone, selected_properties, current_url.to_string()).await; - } - }); - } - // Automatically add a new row when editing the last row - if index == items.len() - 1 && !value.is_empty() { - let new_item = Item { - id: Uuid::new_v4().to_string(), - name: String::new(), - description: String::new(), - // reviews: vec![], - wikidata_id: None, - custom_properties: HashMap::new(), - }; - items.push(new_item.clone()); + let new_item = Item { + id: Uuid::new_v4().to_string(), + name: String::new(), + description: String::new(), + // reviews: vec![], + 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(¤t_url); - async move { - save_item_to_db(new_item, selected_properties, current_url.to_string()).await; - } - }); - } - log!("Items updated: {:?}", items); - }); - })}; + // Save the new item to the database + spawn_local({ + let current_url = Rc::clone(¤t_url); + async move { + save_item_to_db(new_item, selected_properties, current_url.to_string()).await; + } + }); + } + log!("Items updated: {:?}", items); + }); + }) + }; // List of properties to display as rows let properties = vec!["Name", "Description"]; @@ -860,102 +878,102 @@ pub fn ItemsList( view! { {match property { - "Name" => view! { -
- Vec { - // Fetch suggestions in a separate function to avoid capturing too much - fetch_wikidata_suggestions(key.clone(), query.clone()); - - // Return current suggestions from the signal - let suggestions = wikidata_suggestions_clone.get(); - suggestions.get(&key).cloned().unwrap_or_default() + "Name" => { + let node_ref = create_node_ref::(); + + // Determine if this input should be focused + let should_focus = move || { + if adding_new_row.get() { + if let Some(focus_idx) = focus_index.get() { + // Focus the input that was being edited before adding a new row + focus_idx == index + } else { + false } - }) - on_select=Callback::new({ - let set_items_clone = set_items.clone(); - let set_property_labels_clone = set_property_labels.clone(); - let property_cache_clone = property_cache.clone(); - let set_property_cache_clone = set_property_cache.clone(); - let property_labels_clone = property_labels.clone(); - - move |suggestion: WikidataSuggestion| { - let wikidata_id = suggestion.id.clone(); + } else { + false + } + }; + + // Create an effect to reset the adding_new_row flag after rendering + create_effect(move |_| { + if adding_new_row.get() && should_focus() { + // Reset the flags after focus is applied + set_timeout(move || { + set_adding_new_row.set(false); + set_focus_index.set(None); + }, std::time::Duration::from_millis(50)); + } + }); + + view! { +
+ Vec { + // Fetch suggestions in a separate function to avoid capturing too much + fetch_wikidata_suggestions(key.clone(), query.clone()); + + // Return current suggestions from the signal + let suggestions = wikidata_suggestions_clone.get(); + suggestions.get(&key).cloned().unwrap_or_default() + } + }) + on_select=Callback::new({ + let set_items_clone = set_items.clone(); + let set_property_labels_clone = set_property_labels.clone(); + let property_cache_clone = property_cache.clone(); + let set_property_cache_clone = set_property_cache.clone(); + let property_labels_clone = property_labels.clone(); - // Fetch properties in a separate task - let set_property_labels_for_task = set_property_labels_clone.clone(); - let property_cache_for_task = property_cache_clone.clone(); - let set_property_cache_for_task = set_property_cache_clone.clone(); - let property_labels_for_task = property_labels_clone.clone(); - let wikidata_id_for_task = wikidata_id.clone(); - - spawn_local(async move { - fetch_item_properties( - &wikidata_id_for_task, - set_property_labels_for_task, - property_cache_for_task, - set_property_cache_for_task, - property_labels_for_task - ).await; - }); - } - }) - 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 set_items_clone = set_items.clone(); - let current_url_clone = Rc::clone(¤t_url_clone); - let selected_properties_clone = selected_properties.clone(); - - move |value: String| { - if index == items_len - 1 && !value.is_empty() { - let current_url_for_new_item = Rc::clone(¤t_url_clone); - let selected_properties_for_new_item = selected_properties_clone.clone(); + move |suggestion: WikidataSuggestion| { + let wikidata_id = suggestion.id.clone(); set_items_clone.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()); + if let Some(item) = items.get_mut(index) { + item.name = suggestion.display.label.value.clone(); + item.description = suggestion.display.description.value.clone(); + item.wikidata_id = Some(wikidata_id.clone()); + } + }); - // Save the new item to the database in a separate task - let new_item_clone = new_item.clone(); - let current_url_for_task = Rc::clone(¤t_url_for_new_item); - let selected_properties_for_task = selected_properties_for_new_item; - - spawn_local(async move { - save_item_to_db( - new_item_clone, - selected_properties_for_task, - current_url_for_task.to_string() - ).await; - }); + // Fetch properties in a separate task + let set_property_labels_for_task = set_property_labels_clone.clone(); + let property_cache_for_task = property_cache_clone.clone(); + let set_property_cache_for_task = set_property_cache_clone.clone(); + let property_labels_for_task = property_labels_clone.clone(); + let wikidata_id_for_task = wikidata_id.clone(); + + spawn_local(async move { + fetch_item_properties( + &wikidata_id_for_task, + set_property_labels_for_task, + property_cache_for_task, + set_property_cache_for_task, + property_labels_for_task + ).await; }); } - } - }) - node_ref=create_node_ref() - /> -
- }.into_view(), + }) + is_last_row={index == items.len() - 1} + on_input=Callback::new({ + let update_item_clone = Arc::clone(&update_item_clone); + + move |value: String| { + // Update the item with the new value + update_item_clone(index, "name", value); + } + }) + node_ref=node_ref + should_focus=should_focus() + /> +
+ }.into_view() + }, "Description" => view! { , #[prop(optional)] is_last_row: bool, #[prop(optional)] on_input: Option>, + #[prop(optional)] should_focus: bool, ) -> impl IntoView { let (is_initialized, set_initialized) = create_signal(false); // Create a unique ID for this component instance let component_id = format!("typeahead-{}", uuid::Uuid::new_v4()); + // Clone component_id before moving it into the closure + let component_id_for_effect = component_id.clone(); + // Effect to handle focus when should_focus is true + create_effect(move |_| { + if should_focus { + if let Some(input) = node_ref.get() { + let _ = input.focus(); + log!("[FOCUS] Auto-focusing input: {}", component_id_for_effect); + } + } + }); + // WASM-specific initialization #[cfg(target_arch = "wasm32")] {