keys: Made edits on review feedback. To be squashed.

- Assigned ACTIVATE_BUTTON to category "navigation".
- Placed it at the bottom of the UI navigation hotkeys.
- Connected the key binding to urwid's command map.
- Added space hotkey to the key binding.

Added comment explaining the motivation behind NEW_LINE.

Updated tests.
Hotkeys document regenerated.

Author: Niloth-p

docs/hotkeys.md

@@ -5,7 +5,6 @@
 ## General
 |Command|Key Combination|
 | :--- | :---: |
-|Trigger the selected entry|<kbd>Enter</kbd>|
 |Show/hide Help Menu|<kbd>?</kbd>|
 |Show/hide Markdown Help Menu|<kbd>Meta</kbd> + <kbd>m</kbd>|
 |Show/hide About Menu|<kbd>Meta</kbd> + <kbd>?</kbd>|
@@ -25,6 +24,7 @@
 |Scroll up|<kbd>PgUp</kbd> / <kbd>K</kbd>|
 |Scroll down|<kbd>PgDn</kbd> / <kbd>J</kbd>|
 |Go to bottom / Last message|<kbd>End</kbd> / <kbd>G</kbd>|
+|Trigger the selected entry|<kbd>Enter</kbd> / <kbd>Space</kbd>|
 |Narrow to all messages|<kbd>a</kbd> / <kbd>Esc</kbd>|
 |Narrow to all direct messages|<kbd>P</kbd>|
 |Narrow to all starred messages|<kbd>f</kbd>|

tests/ui_tools/test_messages.py

@@ -7,7 +7,7 @@
 from pytest import param as case
 from urwid import Columns, Divider, Padding, Text
 
-from zulipterminal.config.keys import keys_for_command
+from zulipterminal.config.keys import keys_for_command, primary_key_for_command
 from zulipterminal.config.symbols import (
     ALL_MESSAGES_MARKER,
     DIRECT_MESSAGE_MARKER,
@@ -1968,6 +1968,7 @@ def test_footlinks_limit(self, maximum_footlinks, expected_instance):
     def test_mouse_event_left_click(
         self, mocker, msg_box, key, widget_size, compose_box_is_open
     ):
+        expected_keypress = primary_key_for_command("ACTIVATE_BUTTON")
         size = widget_size(msg_box)
         col = 1
         row = 1
@@ -1981,4 +1982,4 @@ def test_mouse_event_left_click(
         if compose_box_is_open:
             msg_box.keypress.assert_not_called()
         else:
-            msg_box.keypress.assert_called_once_with(size, key)
+            msg_box.keypress.assert_called_once_with(size, expected_keypress)

zulipterminal/config/keys.py

@@ -6,6 +6,7 @@
 
 from typing_extensions import NotRequired, TypedDict
 from urwid.command_map import (
+    ACTIVATE,
     CURSOR_DOWN,
     CURSOR_LEFT,
     CURSOR_MAX_RIGHT,
@@ -29,11 +30,6 @@ class KeyBinding(TypedDict):
     # Key that is displayed in the UI is determined by the method
     # primary_key_for_command. (Currently the first key in the list)
 
-    'ACTIVATE_BUTTON': {
-        'keys': ['enter'],
-        'help_text': 'Trigger the selected entry',
-        'key_category': 'general',
-    },
     'HELP': {
         'keys': ['?'],
         'help_text': 'Show/hide Help Menu',
@@ -96,6 +92,11 @@ class KeyBinding(TypedDict):
         'help_text': 'Go to bottom / Last message',
         'key_category': 'navigation',
     },
+    'ACTIVATE_BUTTON': {
+        'keys': ['enter', ' '],
+        'help_text': 'Trigger the selected entry',
+        'key_category': 'navigation',
+    },
     'REPLY_MESSAGE': {
         'keys': ['r', 'enter'],
         'help_text': 'Reply to the current message',
@@ -406,6 +407,9 @@ class KeyBinding(TypedDict):
         'key_category': 'editor_text_manipulation',
     },
     'NEW_LINE': {
+        # urwid_readline's command
+        # This obvious hotkey is added to clarify against 'enter' to send
+        # and to differentiate from other hotkeys using 'enter'.
         'keys': ['enter'],
         'help_text': 'Insert new line',
         'key_category': 'msg_compose',
@@ -442,6 +446,7 @@ class KeyBinding(TypedDict):
     "SCROLL_UP": CURSOR_PAGE_UP,
     "SCROLL_DOWN": CURSOR_PAGE_DOWN,
     "GO_TO_BOTTOM": CURSOR_MAX_RIGHT,
+    "ACTIVATE_BUTTON": ACTIVATE,
 }
 
 
@@ -487,6 +492,9 @@ def display_key_for_urwid_key(urwid_key: str) -> str:
     """
     Returns a displayable user-centric format of the urwid key.
     """
+    if urwid_key == " ":
+        return "Space"
+
     for urwid_map_key, display_map_key in URWID_KEY_TO_DISPLAY_KEY_MAPPING.items():
         if urwid_map_key in urwid_key:
             urwid_key = urwid_key.replace(urwid_map_key, display_map_key)