Migrated every text input to edtui, added emacs keybindings

Author: Julien-cpsn

Cargo.lock

@@ -3,8 +3,8 @@ name = "atac"
 description = "Arguably a Terminal API Client. Feature-full, free, open-source, offline and account-less."
 version = "0.22.1"
 authors = ["julien-cpsn"]
-edition = "2021"
-rust-version = "1.82"
+edition = "2024"
+rust-version = "1.85"
 license = "MIT"
 readme = "README.md"
 documentation = "https://atac.julien-cpsn.com/"
@@ -37,21 +37,21 @@ cookie_store = "=0.22.0"
 
 # TUI
 ## Terminal UI framework
-ratatui = { version = "=0.29.0", features = ["serde"] }
+ratatui = { version = "=0.30.0", features = ["serde"] }
 ## Used to parse, use key bindings files and some utilities
-crokey = "=1.1.2"
+crokey = "=1.3.0"
 ## Display big texts. Only used for displaying ATAC in the homepage.
-tui-big-text = "=0.7.3"
+tui-big-text = "=0.8.1"
 ## Display tree-like lists. Used for displaying the collections.
-tui-tree-widget = "=0.23.1"
+tui-tree-widget = { version = "=0.24.0" }
 ## Display scrollable panels
-tui-scrollview = "0.5.3"
-## Text area that handle a lot of features. Used for editing request body.
-tui-textarea = { version = "=0.7.0", features = ["ratatui"] }
+tui-scrollview = "0.6.2"
+## Text area that handle a lot of features. Used for editing request URL, body, messages, payloads, scripts.
+edtui = { version = "0.11.1", default-features = false, features = ["syntax-highlighting", "mouse-support", "system-editor"] }
 ## Display loading UI elements. Used when request is pending.
-throbber-widgets-tui = "=0.9.0"
+throbber-widgets-tui = "=0.10.0"
 ## Display response images.
-ratatui-image = { version = "=9.0.0", default-features = false, features = ["crossterm", "image-defaults"] }
+ratatui-image = { version = "=10.0.2", default-features = false, features = ["crossterm", "image-defaults"] }
 ## Decode images.
 image = "=0.25.9"
 

Cargo.toml

@@ -10,38 +10,35 @@ move_request_up = "Ctrl-Up"
 move_request_down = "Ctrl-Down"
 
 next_environment = "e"
-display_env_editor = "ctrl-e"
+display_env_editor = "Ctrl-e"
 display_cookies = "c"
 display_logs = "l"
 
 [keybindings.generic]
 display_help = "Ctrl-h" # Take care to not overlap other inputs, the help can be triggered from anywhere
 
-# Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token
-[keybindings.generic.text_inputs.text_input]
-confirm = "Enter"
-cancel = "Esc"
-
-delete_backward = "Delete"
-delete_forward = "Backspace"
-
-move_cursor_left = "Left"
-move_cursor_right = "Right"
-move_cursor_line_start = "Home"
-move_cursor_line_end = "End"
-
-# Request body
-[keybindings.generic.text_inputs.text_area_mode.Custom]
+# E.g. Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token, Request body
+[keybindings.generic.text_input]
 quit_without_saving = "Esc"
-save_and_quit = "Ctrl-s"
+save_and_quit_single_line = "Enter"
+save_and_quit_area = "Ctrl-s"
 
+# The following line is a shortcut of the next section (modes: vim, emacs, default, custom)
+#mode = "default"
+
+[keybindings.generic.text_input.mode.custom]
 copy = "Ctrl-c"
 paste = "Ctrl-v"
+
+search = "Ctrl-f"
+system_editor = "Ctrl-e"
+
 undo = "Ctrl-z"
 redo = "Ctrl-y"
 
 new_line = "Enter"
 indent = "Tab"
+
 delete_backward = "Delete"
 delete_forward = "Backspace"
 
@@ -52,6 +49,7 @@ move_cursor_up = "Up"
 move_cursor_down = "Down"
 move_cursor_left = "Left"
 move_cursor_right = "Right"
+
 move_cursor_line_start = "Home"
 move_cursor_line_end = "End"
 

example_resources/key_bindings/default_key_bindings.toml

@@ -0,0 +1,82 @@
+# Please avoid using Ctrl-v, it will paste your clipboard and trigger many unwanted event
+
+[keybindings.main_menu]
+exit = "Ctrl-x" # ctrl-c is implemented by default
+
+unselect_request = "Left"
+expand_collection = "Right"
+
+move_request_up = "Ctrl-Up"
+move_request_down = "Ctrl-Down"
+
+next_environment = "Ctrl-e"
+display_env_editor = "Shift-e"
+display_cookies = "Ctrl-c"
+display_logs = "Ctrl-l"
+
+[keybindings.generic]
+display_help = "Ctrl-h" # Take care to not overlap other inputs, the help can be triggered from anywhere
+
+# E.g. Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token, Request body
+[keybindings.generic.text_input]
+quit_without_saving = "Esc"
+save_and_quit_single_line = "Enter"
+save_and_quit_area = "Ctrl-x"
+
+# Will simulate most of the emcas key bindings in the text areas (e.g. Request body)
+mode = "emacs"
+
+# Navigation in tables, popups, up and down in the collections list
+[keybindings.generic.navigation]
+move_cursor_up = "Up"
+move_cursor_down = "Down"
+move_cursor_left = "Left"
+move_cursor_right = "Right"
+
+# Avoids overlapping when in text input (e.g. selecting a collection while creating a new request)
+# Might not happen when using the default config
+alt_move_cursor_up = "Up"
+alt_move_cursor_down = "Down"
+alt_move_cursor_left = "Left"
+alt_move_cursor_right = "Right"
+
+go_back = "Esc"
+select = "Enter"
+
+# Collections list, query params, headers, cookies
+[keybindings.generic.list_and_table_actions]
+create_element = "Ctrl-n"
+delete_element = "Ctrl-d"
+edit_element = "Enter" # Edit query param, header, basic auth, bearer token
+rename_element = "Ctrl-r" # Only used in the collections list (main menu)
+toggle_element = "Ctrl-t" # Only used in tables (Query params, headers, cookies)
+duplicate_element = "Shift-d"
+
+[keybindings.request_selected]
+param_next_tab = "Tab"
+
+change_url = "Ctrl-u"
+change_method = "Ctrl-m"
+request_settings = "Ctrl-s"
+
+next_view = "Ctrl-v"
+
+send_request = "Space"
+alt_send_request = "Ctrl-Enter"
+
+export_request = "Shift-E"
+
+[keybindings.request_selected.param_tabs]
+change_auth_method = "Ctrl-a"
+change_body_content_type = "Ctrl-b"
+change_message_type = "Ctrl-m"
+
+[keybindings.request_selected.result_tabs]
+scroll_up = "Ctrl-Up"
+scroll_down = "Ctrl-Down"
+scroll_left = "Ctrl-Left"
+scroll_right = "Ctrl-Right"
+
+yank_response_part = "Ctrl-y" # Used to yank the current result tab (e.g. body, headers, cookies)
+
+result_next_tab = "Shift-BackTab" # Will use param_next_tab depending on the selected view

example_resources/key_bindings/emacs_key_bindings.toml

@@ -17,31 +17,25 @@ display_logs = "l"
 [keybindings.generic]
 display_help = "Ctrl-h" # Take care to not overlap other inputs, the help can be triggered from anywhere
 
-# Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token
-[keybindings.generic.text_inputs.text_input]
-confirm = "Enter"
-cancel = "Esc"
-
-delete_backward = "Delete"
-delete_forward = "Backspace"
-
-move_cursor_left = "Left"
-move_cursor_right = "Right"
-move_cursor_line_start = "Home"
-move_cursor_line_end = "End"
-
-# Request body
-[keybindings.generic.text_inputs.text_area_mode.Custom]
+# E.g. Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token, Request body
+[keybindings.generic.text_input]
 quit_without_saving = "Esc"
-save_and_quit = "Ctrl-s"
+save_and_quit_single_line = "Enter"
+save_and_quit_area = "Ctrl-s"
 
+[keybindings.generic.text_input.mode.custom]
 copy = "Ctrl-c"
 paste = "Ctrl-v"
+
 undo = "Ctrl-z"
 redo = "Ctrl-y"
 
+search = "Ctrl-f"
+system_editor = "Ctrl-e"
+
 new_line = "Enter"
 indent = "Tab"
+
 delete_backward = "Delete"
 delete_forward = "Backspace"
 
@@ -52,6 +46,7 @@ move_cursor_up = "Up"
 move_cursor_down = "Down"
 move_cursor_left = "Left"
 move_cursor_right = "Right"
+
 move_cursor_line_start = "Home"
 move_cursor_line_end = "End"
 

example_resources/key_bindings/mac_key_bindings.toml

@@ -17,24 +17,14 @@ display_logs = "Shift-L"
 [keybindings.generic]
 display_help = "Shift-h" # Take care to not overlap other inputs, the help can be triggered from anywhere
 
-# Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token
-[keybindings.generic.text_inputs.text_input]
-confirm = "Enter"
-cancel = "Esc"
-
-delete_backward = "Delete"
-delete_forward = "Backspace"
-
-move_cursor_left = "Ctrl-h"
-move_cursor_right = "Ctrl-l"
-move_cursor_line_start = "Home"
-move_cursor_line_end = "End"
-
-# Request body
-[keybindings.generic.text_inputs]
-
-# Will simulate most of the Vim key bindings in the text areas (Request body)
-text_area_mode = "VimEmulation"
+# E.g. Collection name, request name, URL, Header, Query param, Basic Auth, Bearer Token, Request body
+[keybindings.generic.text_input]
+quit_without_saving = "Esc"
+save_and_quit_single_line = "Enter"
+save_and_quit_area = "Ctrl-s"
+
+# Will simulate most of the Vim key bindings in the text areas (e.g. Request body)
+mode = "vim"
 
 # Navigation in tables, popups, up and down in the collections list
 [keybindings.generic.navigation]