Change focused cell when tab is pressed while editing

nmeylan · Dec 19, 2024 · fecfa1e · fecfa1e
1 parent 1061d60
commit fecfa1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/array_table.rs b/src/array_table.rs
@@ -884,7 +884,6 @@ impl<'array> ArrayTable<'array> {
                                 row_index: table_row_index,
                                 is_pinned_column_table: pinned_column_table,
                             });
-                            ui.ctx().memory_mut(|m| m.request_focus(self.table_id));
 
                         } else {
                             textedit_response.request_focus();
@@ -1086,6 +1085,9 @@ impl<'array> ArrayTable<'array> {
                     if response.hovered() {
                         ui.ctx().set_cursor_icon(CursorIcon::Cell);
                     }
+                    if updated_value.is_some() {
+                        ui.ctx().memory_mut(|m| m.request_focus(self.table_id));
+                    }
                     Some(response)
                 });
             }

diff --git a/src/object_table.rs b/src/object_table.rs
@@ -105,11 +105,11 @@ impl ObjectTable {
                                         row_index: table_row_index,
                                         is_pinned_column_table: false,
                                     });
-                                    ui.ctx().memory_mut(|m| m.request_focus(self.table_id));
 
                                 } else {
                                     textedit_response.request_focus();
                                 }
+
                                 None
                             } else {
                                 let rect = ui.available_rect_before_wrap();
@@ -175,6 +175,9 @@ impl ObjectTable {
                     self.was_editing = true;
                 }
             });
+        if self.was_editing {
+            ui.ctx().memory_mut(|m| m.request_focus(self.table_id));
+        }
         array_response
     }