TUI: restore cursor after text is changed

Author: stsewd

lira/tui/__init__.py

@@ -8,7 +8,6 @@
 from lira.app import LiraApp
 from lira.tui.themes import style, theme
 from lira.tui.utils import exit_app, set_title
-from lira.tui.widgets import BooksList
 from lira.tui.windows import ContentArea, SidebarMenu, StatusBar
 
 
@@ -19,9 +18,7 @@ def __init__(self):
 
         self.content = ContentArea(self)
         self.status = StatusBar(self)
-
         self.menu = SidebarMenu(self)
-        self.menu.reset(BooksList(self))
 
         self.container = HSplit(
             [

lira/tui/render.py

@@ -189,12 +189,12 @@ def _render_test_block(self, node):
     def _reset_action(self, node, mouse_event):
         if mouse_event.event_type == MouseEventType.MOUSE_UP:
             node.reset()
-            self.tui.content.render_section(self.section)
+            self.tui.content.update_section(self.section)
 
     def _edit_action(self, node, mouse_event):
         if mouse_event.event_type == MouseEventType.MOUSE_UP:
             self._open_editor(node)
-            self.tui.content.render_section(self.section)
+            self.tui.content.update_section(self.section)
 
     def _open_editor(self, node):
         """

lira/tui/widgets.py

@@ -122,7 +122,7 @@ def mouse_handler(self, mouse_event):
     def select(self, mouse_event):
         fragments = self.formatted_lines[mouse_event.position.y]
         # Find position in the fragment list.
-        xpos = mouse_event.position.x
+        xpos = mouse_event.position.x + 1
 
         # Find mouse handler for this character.
         count = 0
@@ -150,12 +150,13 @@ def __init__(
         dont_extend_height=True,
         dont_extend_width=False,
         read_only=True,
+        initial_position=0,
     ):
         self.read_only = read_only
         formatted_text = to_formatted_text(text)
         plain_text = fragment_list_to_text(formatted_text)
         self.buffer = Buffer(
-            document=Document(plain_text, 0),
+            document=Document(plain_text, initial_position),
             read_only=Condition(lambda: self.read_only),
         )
         self.control = FormattedBufferControl(
@@ -201,7 +202,8 @@ def text(self, text):
         formatted_text = to_formatted_text(text)
         self.control.update_formatted_text(formatted_text)
         plain_text = fragment_list_to_text(formatted_text)
-        self.document = Document(plain_text, 0)
+        current_position = min(self.document.cursor_position, len(plain_text))
+        self.document = Document(plain_text, current_position)
 
     def get_key_bindings(self):
         keys = KeyBindings()

lira/tui/windows.py

@@ -18,7 +18,7 @@
 from lira import __version__
 from lira.tui.render import Renderer
 from lira.tui.utils import exit_app, set_title
-from lira.tui.widgets import Button, FormattedTextArea
+from lira.tui.widgets import BooksList, Button, FormattedTextArea
 
 
 class WindowContainer:
@@ -28,7 +28,7 @@ class WindowContainer:
     def __init__(self, tui):
         self.tui = tui
         self.lira = self.tui.lira
-        self.pages = []
+        self.pages = [self._get_default_container()]
         self.container = DynamicContainer(self.get_container)
 
     def _get_default_container(self):
@@ -103,6 +103,15 @@ def _get_default_container(self):
         return text_area
 
     def render_section(self, section):
+        renderer = Renderer(tui=self.tui, section=section)
+        self.text_area = FormattedTextArea(
+            merge_formatted_text(renderer.render()),
+            scrollbar=True,
+            focusable=True,
+        )
+        self.reset(self.text_area)
+
+    def update_section(self, section):
         renderer = Renderer(tui=self.tui, section=section)
         self.text_area.text = merge_formatted_text(renderer.render())
         self.reset(self.text_area)
@@ -131,6 +140,9 @@ def __init__(self, tui):
             key_bindings=self.get_key_bindings(),
         )
 
+    def _get_default_container(self):
+        return BooksList(tui=self.tui)
+
     def get_key_bindings(self):
         keys = KeyBindings()
 

noxfile.py

@@ -19,7 +19,7 @@ def tests(session):
 @nox.session
 def coverage(session):
     session.install("coverage")
-    session.run("coverage", "report", "--fail-under", "93")
+    session.run("coverage", "report", "--fail-under", "92")
     session.run("coverage", "html")
 
 

tests/tui/test_windows.py

@@ -4,6 +4,7 @@
 from prompt_toolkit.layout.containers import to_container
 from prompt_toolkit.widgets import Button, Label
 
+from lira.tui.widgets import BooksList
 from lira.tui.windows import SidebarMenu, StatusBar
 
 from .utils import to_widget
@@ -15,15 +16,15 @@ def setup_method(self):
         self.window = SidebarMenu(tui=tui)
 
     def test_default_menu(self):
-        """The default menu has 2 buttons and a label."""
+        """The default menu has 2 buttons and a BooksList."""
         children = to_container(self.window).get_children()
         assert len(children) == 3
 
-        empty_label = children[0].get_container().content
+        books_list = children[0].get_container()
         back_button = children[1]
         exit_button = to_widget(children[2])
 
-        assert empty_label.text() == "Empty container"
+        assert isinstance(books_list, BooksList)
 
         # Back button is not visible
         assert to_widget(back_button.content).text == "Back"
@@ -38,7 +39,7 @@ def test_toggle_back_button(self):
         first_label = Label("First")
         second_label = Label("Second")
 
-        self.window.push(first_label)
+        self.window.reset(first_label)
         self.window.push(second_label)
 
         children = to_container(self.window).get_children()
@@ -65,7 +66,7 @@ def test_toggle_back_button(self):
 
     def test_pop_all_pages(self):
         first_label = Label("First")
-        self.window.push(first_label)
+        self.window.reset(first_label)
         assert len(self.window.pages) == 1
 
         # We can't pop the last page.
@@ -81,8 +82,8 @@ def test_pop_all_pages(self):
         self.window.reset()
         assert len(self.window.pages) == 1
         children = to_container(self.window).get_children()
-        label = children[0].get_container()
-        assert label.content.text() == "Empty container"
+        books_list = children[0].get_container()
+        assert isinstance(books_list, BooksList)
 
 
 class TestStatusBar: