feat: allow free input in AutoComplete

Author: qrilka

thaw/src/auto_complete/mod.rs

@@ -57,13 +57,12 @@ pub fn AutoComplete(
         css_vars
     });
 
-    let select_option_index = create_rw_signal::<usize>(0);
+    let select_option_index = create_rw_signal::<Option<usize>>(None);
     let menu_ref = create_node_ref::<html::Div>();
     let is_show_menu = create_rw_signal(false);
     let auto_complete_ref = create_node_ref::<html::Div>();
     let options = StoredMaybeSignal::from(options);
     let open_menu = move || {
-        select_option_index.set(0);
         is_show_menu.set(true);
     };
     let allow_value = move |_| {
@@ -82,39 +81,53 @@ pub fn AutoComplete(
         if let Some(on_select) = on_select {
             on_select.call(option_value);
         }
+        select_option_index.set(None);
         is_show_menu.set(false);
     };
 
+    // we unset selection index whenever options get changed
+    // otherwise e.g. selection could move from one item to
+    // another staying on the same index
+    create_effect(move |_ | {
+        options.get();
+        select_option_index.update(|index| *index = None);
+    });
+
     let on_keydown = move |event: ev::KeyboardEvent| {
         if !is_show_menu.get_untracked() {
             return;
         }
         let key = event.key();
         if key == *"ArrowDown" {
             select_option_index.update(|index| {
-                if *index == options.with_untracked(|options| options.len()) - 1 {
-                    *index = 0
+                if *index == Some(options.with_untracked(|options| options.len()) - 1) {
+                    *index = None
                 } else {
-                    *index += 1
+                    *index = Some(index.map_or(0, |index| index + 1))
                 }
             });
         } else if key == *"ArrowUp" {
             select_option_index.update(|index| {
-                if *index == 0 {
-                    *index = options.with_untracked(|options| options.len()) - 1;
+                if *index == Some(0) {
+                    *index = None//options.with_untracked(|options| options.len()) - 1;
                 } else {
-                    *index -= 1
+                    *index = index.map(|index| index - 1)
                 }
             });
         } else if key == *"Enter" {
             event.prevent_default();
             let option_value = options.with_untracked(|options| {
                 let index = select_option_index.get_untracked();
-                if options.len() > index {
-                    let option = &options[index];
-                    Some(option.value.clone())
-                } else {
-                    None
+                match index {
+                    None => {
+                        let value = value.get_untracked();
+                        (!value.is_empty()).then_some(value)
+                    }
+                    Some(index) if options.len() > index => {
+                        let option = &options[index];
+                        Some(option.value.clone())
+                    }
+                    _ => None
                 }
             });
             if let Some(option_value) = option_value {
@@ -189,13 +202,13 @@ pub fn AutoComplete(
                                     select_value(option_value.clone());
                                 };
                                 let on_mouseenter = move |_| {
-                                    select_option_index.set(index);
+                                    select_option_index.set(Some(index));
                                 };
                                 let on_mousedown = move |ev: ev::MouseEvent| {
                                     ev.prevent_default();
                                 };
                                 create_effect(move |_| {
-                                    if index == select_option_index.get() {
+                                    if Some(index) == select_option_index.get() {
                                         if !is_show_menu.get() {
                                             return;
                                         }
@@ -218,7 +231,7 @@ pub fn AutoComplete(
                                         class="thaw-auto-complete__menu-item"
                                         class=(
                                             "thaw-auto-complete__menu-item--selected",
-                                            move || index == select_option_index.get(),
+                                            move || Some(index) == select_option_index.get(),
                                         )
 
                                         on:click=on_click