euporie 2.8.6__py3-none-any.whl → 2.8.7__py3-none-any.whl

euporie/core/widgets/layout.py

@@ -4,14 +4,15 @@ from __future__ import annotations
 
 import logging
 from abc import ABCMeta, abstractmethod
-from functools import partial
-from typing import TYPE_CHECKING, NamedTuple, cast
+from functools import lru_cache, partial
+from typing import TYPE_CHECKING, ClassVar, NamedTuple, cast
 
 from prompt_toolkit.application.current import get_app
 from prompt_toolkit.cache import SimpleCache
 from prompt_toolkit.filters import Condition, to_filter
 from prompt_toolkit.formatted_text.base import to_formatted_text
 from prompt_toolkit.formatted_text.utils import fragment_list_width
+from prompt_toolkit.key_binding.key_bindings import KeyBindings
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
@@ -25,6 +26,7 @@ from prompt_toolkit.layout.controls import (
 )
 from prompt_toolkit.layout.dimension import Dimension as D
 from prompt_toolkit.layout.dimension import to_dimension
+from prompt_toolkit.layout.utils import explode_text_fragments
 from prompt_toolkit.mouse_events import MouseButton, MouseEventType
 from prompt_toolkit.utils import Event
 
@@ -39,11 +41,16 @@ if TYPE_CHECKING:
     from typing import Any, Callable
 
     from prompt_toolkit.filters import FilterOrBool
-    from prompt_toolkit.formatted_text.base import AnyFormattedText, StyleAndTextTuples
+    from prompt_toolkit.formatted_text.base import (
+        AnyFormattedText,
+        OneStyleAndTextTuple,
+        StyleAndTextTuples,
+    )
     from prompt_toolkit.key_binding.key_bindings import (
         KeyBindingsBase,
         NotImplementedOrNone,
     )
+    from prompt_toolkit.key_binding.key_processor import KeyPressEvent
     from prompt_toolkit.layout.containers import AnyContainer, Container, _Split
     from prompt_toolkit.layout.dimension import AnyDimension
     from prompt_toolkit.mouse_events import MouseEvent
@@ -199,30 +206,35 @@ class ReferencedSplit:
 
 
 class TabBarTab(NamedTuple):
-    """A named tuple represting a tab and it's callbacks."""
+    """A class representing a tab and its callbacks."""
 
     title: AnyFormattedText
-    on_activate: Callable
-    on_deactivate: Callable | None = None
-    on_close: Callable | None = None
+    on_activate: Callable[[], NotImplementedOrNone]
+    on_deactivate: Callable[[], NotImplementedOrNone] | None = None
+    on_close: Callable[[], NotImplementedOrNone] | None = None
+    closeable: bool = False
+
+    def __hash__(self) -> int:
+        """Hash the Tab based on current title value."""
+        return hash(tuple(to_formatted_text(self.title))) * hash(
+            (self.on_activate, self.on_deactivate, self.on_close, self.closeable)
+        )
 
 
 class TabBarControl(UIControl):
     """A control which shows a tab bar."""
 
-    char_bottom = "▁"
-    char_left = "▏"
-    char_right = "▕"
-    char_top = "▁"
-    char_close = "✖"
+    char_scroll_left = "◀"
+    char_scroll_right = "▶"
+    char_close: ClassVar[str] = "✖"
 
     def __init__(
         self,
         tabs: Sequence[TabBarTab] | Callable[[], Sequence[TabBarTab]],
         active: int | Callable[[], int],
         spacing: int = 1,
-        closeable: bool = False,
         max_title_width: int = 30,
+        grid: GridStyle = OutsetGrid,
     ) -> None:
         """Create a new tab bar instance.
 
@@ -231,19 +243,22 @@ class TabBarControl(UIControl):
                 when the tab is activated.
             active: The index of the currently active tab
             spacing: The number of characters between the tabs
-            closeable: Whether to show close buttons the the tabs
             max_title_width: The maximum width of the title to display
+            grid: The grid style to use for drawing borders
 
         """
         self._tabs = tabs
         self.spacing = spacing
-        self.closeable = closeable
         self.max_title_width = max_title_width
         self._active = active
-
-        self.mouse_handlers: dict[int, Callable[..., Any] | None] = {}
-
-        self._title_cache: SimpleCache = SimpleCache(maxsize=1)
+        self._last_active: int | None = None
+        self.scroll = -1
+        self.grid = grid
+
+        self.mouse_handlers: dict[int, Callable[[], NotImplementedOrNone] | None] = {}
+        self.tab_widths: list[int] = []
+        # Caches
+        self.render_tab = lru_cache(self._render_tab)
         self._content_cache: SimpleCache = SimpleCache(maxsize=50)
 
     @property
@@ -262,16 +277,43 @@ class TabBarControl(UIControl):
     @property
     def active(self) -> int:
         """Return the index of the active tab."""
-        if callable(self._active):
-            return self._active()
-        else:
-            return self._active
+        current_active = self._active() if callable(self._active) else self._active
+
+        # Check if active tab has changed
+        if self._last_active != current_active:
+            # Handle tab switching
+            if self._last_active is not None and 0 <= self._last_active < len(
+                self.tabs
+            ):
+                old_tab = self.tabs[self._last_active]
+                if callable(on_deactivate := old_tab.on_deactivate):
+                    on_deactivate()
+
+            # Call on_activate for new tab
+            if current_active is not None and 0 <= current_active < len(self.tabs):
+                new_tab = self.tabs[current_active]
+                if callable(on_activate := new_tab.on_activate):
+                    on_activate()
+
+            # Ensure active tab is visible
+            self.scroll_to(current_active)
+
+            # Update last known active value
+            self._last_active = current_active
+
+        return current_active
 
     @active.setter
     def active(self, active: int | Callable[[], int]) -> None:
         """Set the currently active tab."""
+        # Store new active value
         self._active = active
 
+        # If it's a direct value (not callable), handle tab switching immediately
+        if not callable(active):
+            # Force property getter to handle the change
+            _ = self.active
+
     def preferred_width(self, max_available_width: int) -> int | None:
         """Return the preferred width of the tab-bar control, the maximum available."""
         return max_available_width
@@ -292,87 +334,221 @@ class TabBarControl(UIControl):
 
     def create_content(self, width: int, height: int) -> UIContent:
         """Generate the formatted text fragments which make the controls output."""
+        self.available_width = width
 
-        def get_content() -> UIContent:
-            fragment_lines = self.render(width)
+        def get_content() -> tuple[
+            UIContent, dict[int, Callable[[], NotImplementedOrNone] | None]
+        ]:
+            *fragment_lines, mouse_handlers = self.render(width)
 
             return UIContent(
                 get_line=lambda i: fragment_lines[i],
                 line_count=len(fragment_lines),
                 show_cursor=False,
-            )
+            ), mouse_handlers
+
+        key = (hash(tuple(self.tabs)), width, self.active, self.scroll)
+        ui_content, self.mouse_handlers = self._content_cache.get(key, get_content)
+        return ui_content
+
+    def scroll_to(self, active: int) -> None:
+        """Adjust scroll position to ensure the active tab is visible."""
+        # Calculate position of active tab
+        pos = self.spacing  # Initial spacing
+        for i in range(len(self.tabs)):
+            if i == active:
+                # Found active tab - check if it's visible
+                tab_width = self.tab_widths[i] if i < len(self.tab_widths) else 0
+                # Scroll left if tab start is before visible area
+                if pos < self.scroll:
+                    self.scroll = pos - self.spacing - 1
+                # Scroll right if tab end is after visible area
+                elif pos + tab_width > self.scroll + self.available_width:
+                    self.scroll = pos + tab_width - self.available_width + 2
+                break
+
+            # Add tab width and spacing
+            pos += (
+                self.tab_widths[i] if i < len(self.tab_widths) else 0
+            ) + self.spacing
+
+    def _render_tab(
+        self,
+        title: tuple[OneStyleAndTextTuple, ...],
+        on_activate: Callable[[], NotImplementedOrNone],
+        on_deactivate: Callable[[], NotImplementedOrNone] | None,
+        on_close: Callable[[], NotImplementedOrNone] | None,
+        closeable: bool,
+        active: bool,
+        max_title_width: int,
+        grid: GridStyle,
+    ) -> tuple[
+        StyleAndTextTuples,
+        StyleAndTextTuples,
+        list[Callable[[], NotImplementedOrNone] | None],
+    ]:
+        """Render the tab as formatted text.
 
-        key = (hash(tuple(self.tabs)), width, self.closeable, self.active)
-        return self._content_cache.get(key, get_content)
+        Args:
+            title: The formatted text fragments making up the tab's title
+            on_activate: Callback function to run when the tab is activated
+            on_deactivate: Optional callback function to run when the tab is deactivated
+            on_close: Optional callback function to run when the tab is closed
+            closeable: Whether the tab can be closed
+            active: Whether this tab is currently active
+            max_title_width: Maximum width to display the tab title
+            grid: The grid style to use for drawing borders
 
-    def render(self, width: int) -> list[StyleAndTextTuples]:
-        """Render the tab-bar as linest of formatted text."""
-        top_line: StyleAndTextTuples = []
-        tab_line: StyleAndTextTuples = []
-        i = 0
+        Returns:
+            Tuple containing:
+            - Top line formatted text fragments
+            - Bottom line formatted text fragments
+            - List of mouse handler callbacks for each character position
+        """
+        title_ft = truncate(list(title), max_title_width)
+        title_width = fragment_list_width(title_ft)
+        style = "class:active" if active else "class:inactive"
 
-        # Initial spacing
-        for _ in range(self.spacing):
-            top_line += [("", " ")]
-            tab_line += [("class:border,bottom", self.char_bottom)]
-        i += self.spacing
-
-        for j, tab in enumerate(self.tabs):
-            title_ft = truncate(to_formatted_text(tab.title), self.max_title_width)
-            title_width = fragment_list_width(title_ft)
-            style = "class:active" if self.active == j else "class:inactive"
-
-            # Add top edge over title
-            top_line += [
-                (f"{style} class:tab,border,top", self.char_top * (title_width + 2))
-            ]
+        top_line: StyleAndTextTuples = explode_text_fragments([])
+        tab_line: StyleAndTextTuples = explode_text_fragments([])
+        mouse_handlers: list[Callable[[], NotImplementedOrNone] | None] = []
+
+        # Add top edge over title
+        top_line.append(
+            (f"{style} class:tab,border,top", grid.TOP_MID * (title_width + 2))
+        )
 
-            # Left edge
-            tab_line += [(f"{style} class:tab,border,left", self.char_left)]
-            self.mouse_handlers[i] = tab.on_activate
-            i += 1
+        # Left edge
+        tab_line.append((f"{style} class:tab,border,left", grid.MID_LEFT))
+        mouse_handlers.append(on_activate)
 
-            # Title
-            tab_line += [
+        # Title
+        tab_line.extend(
+            [
                 (f"{style} class:tab,title {frag_style}", text)
                 for frag_style, text, *_ in title_ft
             ]
-            for _ in range(title_width):
-                self.mouse_handlers[i] = tab.on_activate
-                i += 1
-
-            # Close button
-            if self.closeable:
-                top_line += [(f"{style} class:tab,border,top", self.char_top * 2)]
-                self.mouse_handlers[i] = tab.on_activate
-                i += 1
-                tab_line += [
+        )
+        for _ in range(title_width):
+            mouse_handlers.append(on_activate)
+
+        # Close button
+        if closeable:
+            top_line.append((f"{style} class:tab,border,top", grid.TOP_MID * 2))
+            mouse_handlers.append(on_activate)
+            tab_line.extend(
+                [
                     (f"{style} class:tab", " "),
                     (f"{style} class:tab,close", self.char_close),
                 ]
-                self.mouse_handlers[i] = tab.on_close
-                i += 1
-
-            # Right edge
-            tab_line += [(f"{style} class:tab,border,right", self.char_right)]
-            self.mouse_handlers[i] = tab.on_activate
-            i += 1
-
-            # Spacing
-            for _ in range(self.spacing):
-                top_line += [("", " ")]
-                tab_line += [("class:border,bottom", self.char_bottom)]
-                i += 1
-
-        # Add border to fill width
-        tab_line += [
-            (
-                "class:border,bottom",
-                self.char_bottom * (width - fragment_list_width(tab_line)),
             )
+            mouse_handlers.append(on_close)
+
+        # Right edge
+        tab_line.append((f"{style} class:tab,border,right", grid.MID_RIGHT))
+        mouse_handlers.append(on_activate)
+
+        return (top_line, tab_line, mouse_handlers)
+
+    def render(
+        self, width: int
+    ) -> tuple[
+        StyleAndTextTuples,
+        StyleAndTextTuples,
+        dict[int, Callable[[], NotImplementedOrNone] | None],
+    ]:
+        """Render the tab-bar as lines of formatted text."""
+        top_line: StyleAndTextTuples = []
+        tab_line: StyleAndTextTuples = []
+        mouse_handlers: dict[int, Callable[[], NotImplementedOrNone] | None] = {}
+        pos = 0
+        full = 0
+
+        renderings = [
+            self.render_tab(
+                title=tuple(to_formatted_text(tab.title)),
+                max_title_width=self.max_title_width,
+                on_activate=tab.on_activate,
+                on_deactivate=tab.on_deactivate,
+                on_close=tab.on_close,
+                closeable=tab.closeable,
+                active=(self.active == j),
+                grid=self.grid,
+            )
+            for j, tab in enumerate(self.tabs)
         ]
+        self.tab_widths = [len(x[0]) for x in renderings]
+
+        # Do initial scroll if first render
+        if self.scroll == -1:
+            self.scroll_to(self._active() if callable(self._active) else self._active)
+
+        # Apply scroll limits
+        self.scroll = max(
+            0,
+            min(
+                self.scroll,
+                self.spacing * (len(self.tabs) + 1)
+                + sum(len(x[1]) for x in renderings)
+                - width,
+            ),
+        )
+        scroll = self.scroll
 
-        return [top_line, tab_line]
+        # Initial spacing
+        for _ in range(self.spacing):
+            if full >= scroll:
+                top_line += [("", " ")]
+                tab_line += [("class:border,bottom", self.grid.TOP_MID)]
+                pos += 1
+            full += 1
+
+        for rendering in renderings:
+            # Add the rendered tab content
+            for tab_top, tab_bottom, handler in zip(*rendering):
+                if full >= scroll:
+                    top_line.append(tab_top)
+                    tab_line.append(tab_bottom)
+                    mouse_handlers[pos] = handler
+                    pos += 1
+                full += 1
+                if pos == width:
+                    break
+
+            if pos == width:
+                break
+
+            # Inter-tab spacing
+            if rendering is not renderings[-1]:
+                if full >= scroll:
+                    for _ in range(self.spacing):
+                        top_line += [("", " ")]
+                        tab_line += [("class:border,bottom", self.grid.TOP_MID)]
+                        if pos == width:
+                            break
+                        pos += 1
+                full += 1
+
+            if pos == width:
+                break
+
+        # Add scroll indicators
+        if scroll > 0:
+            top_line[0] = ("", " ")
+            tab_line[0] = ("class:overflow", self.char_scroll_left)
+        if pos >= width:
+            top_line[-1] = ("", " ")
+            tab_line[-1] = ("class:overflow", self.char_scroll_right)
+        else:
+            # Otherwise add border to fill width
+            tab_line += [
+                (
+                    "class:border,bottom",
+                    self.grid.TOP_MID * (width - pos + 1),
+                )
+            ]
+
+        return top_line, tab_line, mouse_handlers
 
     def mouse_handler(self, mouse_event: MouseEvent) -> NotImplementedOrNone:
         """Handle mouse events."""
@@ -386,31 +562,27 @@ class TabBarControl(UIControl):
                 # Activate the tab
                 handler()
                 return None
-            elif mouse_event.button == MouseButton.MIDDLE and self.closeable:
+            elif mouse_event.button == MouseButton.MIDDLE:
                 if callable(handler := self.mouse_handlers.get(col)):
                     # Activate tab
                     handler()
                     # Close the now active tab
                     tabs = self.tabs
-                    on_close = tabs[self.active]
-                    if callable(on_close):
-                        on_close()
+                    tab = tabs[self.active]
+                    if tab.closeable and callable(tab.on_close):
+                        tab.on_close()
                 return None
 
         tabs = self.tabs
         if mouse_event.event_type == MouseEventType.SCROLL_UP:
             index = max(self.active - 1, 0)
             if index != self.active:
-                if callable(deactivate := tabs[self.active].on_deactivate):
-                    deactivate()
                 if callable(activate := tabs[index].on_activate):
                     activate()
                 return None
         elif mouse_event.event_type == MouseEventType.SCROLL_DOWN:
             index = min(self.active + 1, len(tabs) - 1)
             if index != self.active:
-                if callable(deactivate := tabs[self.active].on_deactivate):
-                    deactivate()
                 if callable(activate := tabs[index].on_activate):
                     activate()
                 return None
@@ -474,7 +646,7 @@ class StackedSplit(metaclass=ABCMeta):
             value: The index of the tab to make active
         """
         if value is not None:
-            value = max(0, min(value, len(self.children)))
+            value = max(0, min(value, len(self.children) - 1))
         if value != self._active:
             self._active = value
             self.refresh()
@@ -537,6 +709,21 @@ class TabbedSplit(StackedSplit):
         """Initialize a new tabbed container."""
         self.border = border
         self.show_borders = show_borders or DiBool(False, True, True, True)
+
+        kb = KeyBindings()
+
+        @kb.add("left")
+        def _prev(event: KeyPressEvent) -> None:
+            """Previous tab."""
+            self.active = (self.active or 0) - 1
+
+        @kb.add("right")
+        def _next(event: KeyPressEvent) -> None:
+            """Next tab."""
+            self.active = (self.active or 0) + 1
+
+        self.key_bindings = kb
+
         super().__init__(
             children=children,
             titles=titles,
@@ -579,6 +766,7 @@ class TabbedSplit(StackedSplit):
             style="class:tabbed-split",
             width=self.width,
             height=self.height,
+            key_bindings=self.key_bindings,
         )
 
     def refresh(self) -> None:

euporie/core/widgets/menu.py

@@ -365,14 +365,16 @@ class MenuBar:
             menu = self._get_menu(len(self.selected_menu) - 2)
             index = self.selected_menu[-1]
 
-            previous_indexes = [
-                i
-                for i, item in enumerate(menu.children)
-                if i < index and not item.disabled and not item.hidden()
-            ]
-
-            if previous_indexes:
-                self.selected_menu[-1] = previous_indexes[-1]
+            previous_index = next(
+                (
+                    i
+                    for i, item in reversed(list(enumerate(menu.children)))
+                    if i < index and not item.disabled and not item.hidden()
+                ),
+                None,
+            )
+            if previous_index is not None:
+                self.selected_menu[-1] = previous_index
             elif len(self.selected_menu) == 2:
                 # Return to main menu.
                 self.selected_menu.pop()
@@ -384,14 +386,17 @@ class MenuBar:
             menu = self._get_menu(len(self.selected_menu) - 2)
             index = self.selected_menu[-1]
 
-            next_indexes = [
-                i
-                for i, item in enumerate(menu.children)
-                if i > index and not item.disabled and not item.hidden()
-            ]
+            next_index = next(
+                (
+                    i
+                    for i, item in enumerate(menu.children)
+                    if i > index and not item.disabled and not item.hidden()
+                ),
+                None,
+            )
 
-            if next_indexes:
-                self.selected_menu[-1] = next_indexes[0]
+            if next_index is not None:
+                self.selected_menu[-1] = next_index
                 self.refocus()
 
         @kb.add("enter")
@@ -621,6 +626,41 @@ class MenuBar:
                                             len(self.selected_menu) - 1
                                         ]
                                     )
+                            elif mouse_event.event_type == MouseEventType.SCROLL_UP:
+                                menu = self._get_menu(len(self.selected_menu) - 2)
+                                index = self.selected_menu[-1]
+
+                                previous_index = next(
+                                    (
+                                        i
+                                        for i, item in reversed(
+                                            list(enumerate(menu.children))
+                                        )
+                                        if i < index
+                                        and not item.disabled
+                                        and not item.hidden()
+                                    ),
+                                    None,
+                                )
+
+                                if previous_index is not None:
+                                    self.selected_menu[-1] = previous_index
+                            elif mouse_event.event_type == MouseEventType.SCROLL_DOWN:
+                                menu = self._get_menu(len(self.selected_menu) - 2)
+                                index = self.selected_menu[-1]
+
+                                next_index = next(
+                                    (
+                                        i
+                                        for i, item in enumerate(menu.children)
+                                        if i > index
+                                        and not item.disabled
+                                        and not item.hidden()
+                                    ),
+                                    None,
+                                )
+                                if next_index is not None:
+                                    self.selected_menu[-1] = next_index
 
                         if item.separator:
                             # Show a connected line with no mouse handler

euporie/core/widgets/palette.py

@@ -10,6 +10,7 @@ from typing import TYPE_CHECKING, NamedTuple
 from prompt_toolkit.data_structures import Point
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.key_binding.bindings.focus import focus_next, focus_previous
+from prompt_toolkit.key_binding.vi_state import InputMode
 from prompt_toolkit.layout.containers import ScrollOffsets
 from prompt_toolkit.layout.controls import UIContent, UIControl
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
@@ -167,7 +168,6 @@ class CommandPalette(Dialog):
         # self.kb = KeyBindings()
         self.kb.add("s-tab")(focus_previous)
         self.kb.add("tab")(focus_next)
-        self.kb.add("escape")(self.hide)
         self.kb.add("up", filter=Condition(lambda: bool(self.matches)))(
             partial(self.select, -1)
         )
@@ -222,6 +222,8 @@ class CommandPalette(Dialog):
         """Reset the dialog ready for display."""
         self.text_area.buffer.text = ""
         self.to_focus = self.text_area
+        app = get_app()
+        app.vi_state.input_mode = InputMode.INSERT
 
     def select(self, n: int, event: KeyPressEvent | None = None) -> None:
         """Change the index of the selected command.