[pdm-devel] [PATCH datacenter-manager 1/3] ui: improve keyboard navigation for search box

[Dominik Csapak <d.csapak@proxmox.com>]

instead of triggering a navigation on selection change, trigger it only
on click and on pressing enter. With this, navigation in the tree is
possible without changing the current route.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 ui/src/widget/resource_tree.rs | 76 ++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 26 deletions(-)

diff --git a/ui/src/widget/resource_tree.rs b/ui/src/widget/resource_tree.rs
index 1b764f7..feff308 100644
--- a/ui/src/widget/resource_tree.rs
+++ b/ui/src/widget/resource_tree.rs
@@ -12,7 +12,10 @@ use pwt::{
     props::ExtractPrimaryKey,
     state::{Selection, TreeStore},
     widget::{
-        data_table::{DataTable, DataTableColumn, DataTableHeader},
+        data_table::{
+            DataTable, DataTableColumn, DataTableHeader, DataTableKeyboardEvent,
+            DataTableMouseEvent,
+        },
         ActionIcon, Column, Container, Fa, Panel, Progress, Row, Tooltip,
     },
 };
@@ -118,28 +121,8 @@ impl Component for PdmResourceTree {
         }
 
         let store = TreeStore::new().view_root(false);
-        let selection = Selection::new().on_select({
-            let store = store.clone();
-            let link = ctx.link().clone();
-            move |selection: Selection| {
-                let store = store.read();
-                let root = store.root().unwrap();
-
-                if let Some(key) = selection.selected_key() {
-                    if let Some(node) = root.find_node_by_key(&key) {
-                        match node.record() {
-                            PdmTreeEntry::Resource(remote, resource) => {
-                                crate::navigate_to(&link, remote, Some(resource));
-                            }
-                            PdmTreeEntry::Remote(remote, _) => {
-                                crate::navigate_to(&link, remote, None);
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-            }
-        });
+        let selection = Selection::new();
+
         Self {
             loading: false,
             last_error: None,
@@ -231,8 +214,36 @@ impl Component for PdmResourceTree {
 
     fn view(&self, ctx: &yew::Context<Self>) -> yew::Html {
         let props = ctx.props();
-        let table = DataTable::new(columns(&ctx.link(), self.store.clone()), self.store.clone())
+        let table = DataTable::new(columns(ctx.link(), self.store.clone()), self.store.clone())
             .selection(self.selection.clone())
+            .on_row_click({
+                let store = self.store.clone();
+                let link = ctx.link().clone();
+                move |event: &mut DataTableMouseEvent| {
+                    let store = store.read();
+                    let root = store.root().unwrap();
+
+                    if let Some(node) = root.find_node_by_key(&event.record_key) {
+                        navigate_to_entry(&link, node.record());
+                    }
+                }
+            })
+            .on_row_keydown({
+                let store = self.store.clone();
+                let link = ctx.link().clone();
+                move |event: &mut DataTableKeyboardEvent| {
+                    let store = store.read();
+                    let root = store.root().unwrap();
+
+                    if event.key().as_str() != "Enter" {
+                        return;
+                    }
+
+                    if let Some(node) = root.find_node_by_key(&event.record_key) {
+                        navigate_to_entry(&link, node.record());
+                    }
+                }
+            })
             .class(FlexFit)
             .hover(true)
             .borderless(true);
@@ -275,6 +286,18 @@ impl Component for PdmResourceTree {
     }
 }
 
+fn navigate_to_entry(link: &html::Scope<PdmResourceTree>, record: &PdmTreeEntry) {
+    match record {
+        PdmTreeEntry::Root => {}
+        PdmTreeEntry::Resource(remote, resource) => {
+            crate::navigate_to(link, remote, Some(resource));
+        }
+        PdmTreeEntry::Remote(remote, _) => {
+            crate::navigate_to(link, remote, None);
+        }
+    }
+}
+
 fn columns(
     link: &html::Scope<PdmResourceTree>,
     store: TreeStore<PdmTreeEntry>,
@@ -316,14 +339,15 @@ fn columns(
                     .into()
             })
             .into(),
-        DataTableColumn::new(tr!("Node"))
+        DataTableColumn::new(tr!("Node/Error"))
             .flex(2)
             .render(|item: &PdmTreeEntry| {
                 match item {
                     PdmTreeEntry::Root => "",
                     PdmTreeEntry::Resource(_, resource) => {
-                        get_resource_node(&resource).unwrap_or("")
+                        get_resource_node(resource).unwrap_or("")
                     }
+                    PdmTreeEntry::Remote(_, Some(err)) => err,
                     PdmTreeEntry::Remote(_, _) => "",
                 }
                 .into()
-- 
2.39.5



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel