euporie 2.3.2__py3-none-any.whl → 2.4.1__py3-none-any.whl

euporie/core/widgets/forms.py

@@ -8,7 +8,7 @@ from abc import ABCMeta, abstractmethod
 from collections import deque
 from functools import partial
 from math import ceil, floor
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING, Dict, cast
 from weakref import finalize
 
 from prompt_toolkit.buffer import ValidationState
@@ -30,7 +30,7 @@ from prompt_toolkit.key_binding.key_bindings import (
     KeyBindings,
     merge_key_bindings,
 )
-from prompt_toolkit.layout.containers import ConditionalContainer, Float, Window
+from prompt_toolkit.layout.containers import ConditionalContainer, Float, VSplit, Window
 from prompt_toolkit.layout.controls import (
     BufferControl,
     FormattedTextControl,
@@ -46,11 +46,11 @@ from prompt_toolkit.utils import Event
 from prompt_toolkit.validation import Validator
 from prompt_toolkit.widgets.base import Box, TextArea
 
-from euporie.core.border import InnerEigthGrid
+from euporie.core.border import InsetGrid
 from euporie.core.current import get_app
 from euporie.core.data_structures import DiBool
 from euporie.core.formatted_text.utils import FormattedTextAlign, align
-from euporie.core.margins import ScrollbarMargin
+from euporie.core.margins import MarginContainer, ScrollbarMargin
 from euporie.core.widgets.decor import Border, Shadow
 from euporie.core.widgets.layout import ConditionalSplit
 
@@ -95,7 +95,7 @@ class Swatch:
         width: int = 2,
         height: int = 1,
         style: str = "class:swatch",
-        border: GridStyle = InnerEigthGrid,
+        border: GridStyle = InsetGrid,
         show_borders: DiBool | None = None,
     ) -> None:
         """Create a new instance of the color swatch.
@@ -143,7 +143,7 @@ class Button:
         disabled: FilterOrBool = False,
         width: int | None = None,
         style: str | Callable[[], str] = "class:input",
-        border: GridStyle | None = InnerEigthGrid,
+        border: GridStyle | None = InsetGrid,
         show_borders: DiBool | None = None,
         selected: bool = False,
         key_bindings: KeyBindingsBase | None = None,
@@ -259,7 +259,11 @@ class Button:
                 self.on_mouse_down.fire()
 
                 if not self.has_focus():
-                    get_app().layout.focus(self)
+                    app = get_app()
+                    app.layout.focus(self)
+                    # Invalidate the app - we don't do it by returning None so the
+                    # event can bubble
+                    app.invalidate()
                     # We want this event to bubble if unfocused
                     return NotImplemented
                 else:
@@ -305,7 +309,7 @@ class Button:
 
 
 class ToggleableWidget(metaclass=ABCMeta):
-    """Bae class for toggleable widgets."""
+    """Base class for toggleable widgets."""
 
     container: AnyContainer
     on_click: Event
@@ -325,7 +329,9 @@ class ToggleableWidget(metaclass=ABCMeta):
         elif mouse_event.event_type == MouseEventType.MOUSE_DOWN:
             layout = get_app().layout
             if not layout.has_focus(self):
-                get_app().layout.focus(self)
+                app = get_app()
+                app.layout.focus(self)
+                app.invalidate()
                 return NotImplemented
             else:
                 return None
@@ -363,7 +369,7 @@ class ToggleButton(ToggleableWidget):
         on_click: Callable[[ToggleButton], None] | None = None,
         width: int | None = None,
         style: str | Callable[[], str] = "class:input",
-        border: GridStyle | None = InnerEigthGrid,
+        border: GridStyle | None = InsetGrid,
         show_borders: DiBool | None = None,
         selected: bool = False,
         disabled: FilterOrBool = False,
@@ -533,7 +539,7 @@ class Text:
         style: str = "class:input",
         height: int = 1,
         min_height: int = 1,
-        multiline: bool = False,
+        multiline: FilterOrBool = False,
         expand: FilterOrBool = True,
         width: int | None = None,
         completer: Completer | None = None,
@@ -637,18 +643,23 @@ class Text:
         )
         self.text_area.window.content = self.text_area.control
 
-        if multiline:
-            self.text_area.window.right_margins = [
-                *self.text_area.window.right_margins,
-                ScrollbarMargin(),
-            ]
         if on_text_changed:
             self.text_area.buffer.on_text_changed += on_text_changed
         if validation:
             self.text_area.buffer.validate_while_typing = Always()
         self.container = Border(
-            self.text_area,
-            border=InnerEigthGrid,
+            VSplit(
+                [
+                    self.text_area,
+                    ConditionalContainer(
+                        MarginContainer(
+                            ScrollbarMargin(), target=self.text_area.window
+                        ),
+                        filter=to_filter(multiline),
+                    ),
+                ]
+            ),
+            border=InsetGrid,
             style=self.border_style,
             show_borders=show_borders,
         )
@@ -905,7 +916,7 @@ class Progress:
                     height=lambda: None if self.vertical() else 1,
                     width=lambda: 1 if self.vertical() else None,
                 ),
-                border=InnerEigthGrid,
+                border=InsetGrid,
                 style=self.add_style("class:progress,border"),
             ),
             # width=lambda: 1 if self.vertical() else None,
@@ -937,8 +948,8 @@ class Progress:
         return self.container
 
 
-class SizedMask(dict[int, bool]):
-    """Mak with restricted number of True items."""
+class SizedMask(Dict[int, bool]):
+    """Mask with restricted number of True items."""
 
     def __init__(self, size: int | None = None) -> None:
         """Initialize a new sized default dict."""
@@ -974,7 +985,7 @@ class SizedMask(dict[int, bool]):
 
 
 class SelectableWidget(metaclass=ABCMeta):
-    """Bae class for widgets where one or more items can be selected."""
+    """Base class for widgets where one or more items can be selected."""
 
     def __init__(
         self,
@@ -1133,6 +1144,22 @@ class SelectableWidget(metaclass=ABCMeta):
         for i in range(len(self.options)):
             self._selected[i] = i in values
 
+    @property
+    def value(self) -> Any:
+        """Return the selected value."""
+        if self.options:
+            return self.options[self.index or 0]
+        else:
+            return None
+
+    @property
+    def values(self) -> list[Any]:
+        """Return a list of the selected values."""
+        if self.options:
+            return [self.options[i] for i in self.indices]
+        else:
+            return [None for i in self.indices]
+
     def mouse_handler(self, i: int, mouse_event: MouseEvent) -> NotImplementedOrNone:
         """Handle mouse events."""
         if self.disabled():
@@ -1142,7 +1169,9 @@ class SelectableWidget(metaclass=ABCMeta):
             return None
         elif mouse_event.event_type == MouseEventType.MOUSE_DOWN:
             if not self.has_focus():
+                app = get_app()
                 get_app().layout.focus(self)
+                app.invalidate()
                 # We want this event to bubble if unfocused
                 return NotImplemented
             else:
@@ -1201,7 +1230,7 @@ class Select(SelectableWidget):
         style: str | Callable[[], str] = "class:input,select",
         rows: int | None = 3,
         prefix: tuple[str, str] = ("", ""),
-        border: GridStyle | None = InnerEigthGrid,
+        border: GridStyle | None = InsetGrid,
         show_borders: DiBool | None = None,
         disabled: FilterOrBool = False,
         dont_extend_width: FilterOrBool = True,
@@ -1252,7 +1281,12 @@ class Select(SelectableWidget):
     def text_fragments(self) -> StyleAndTextTuples:
         """Create a list of formatted text fragments to display."""
         ft: StyleAndTextTuples = []
-        max_width = max(fragment_list_width(to_formatted_text(x)) for x in self.labels)
+        if self.labels:
+            max_width = max(
+                fragment_list_width(to_formatted_text(x)) for x in self.labels
+            )
+        else:
+            max_width = 1
         for i, label in enumerate(self.labels):
             label = to_formatted_text(label)
             label = align(label, FormattedTextAlign.LEFT, width=max_width)
@@ -1277,26 +1311,31 @@ class Select(SelectableWidget):
                 (f"{fragment_style} {style}", text, handler)
                 for fragment_style, text, *_ in ft_option
             ]
-        ft.pop()
+        if ft:
+            ft.pop()
         return ft
 
     def load_container(self) -> AnyContainer:
         """Load the widget's container."""
         return Box(
             Border(
-                Window(
-                    FormattedTextControl(
-                        self.text_fragments,
-                        focusable=True,
-                        show_cursor=False,
-                        key_bindings=self.key_bindings(),
-                    ),
-                    height=lambda: self.rows,
-                    dont_extend_width=self.dont_extend_width,
-                    dont_extend_height=self.dont_extend_height,
-                    style=f"class:face"
-                    f"{' class:disabled' if self.disabled() else ''}",
-                    right_margins=[ScrollbarMargin(style=self.style)],
+                VSplit(
+                    [
+                        window := Window(
+                            FormattedTextControl(
+                                self.text_fragments,
+                                focusable=True,
+                                show_cursor=False,
+                                key_bindings=self.key_bindings(),
+                            ),
+                            height=lambda: self.rows,
+                            dont_extend_width=self.dont_extend_width,
+                            dont_extend_height=self.dont_extend_height,
+                            style=f"class:face"
+                            f"{' class:disabled' if self.disabled() else ''}",
+                        ),
+                        MarginContainer(ScrollbarMargin(), target=window),
+                    ]
                 ),
                 border=self.border,
                 show_borders=self.show_borders,
@@ -1510,7 +1549,7 @@ class ToggleButtons(SelectableWidget):
         max_count: int | None = None,
         on_change: Callable[[SelectableWidget], None] | None = None,
         style: str | Callable[[], str] = "class:input",
-        border: GridStyle | None = InnerEigthGrid,
+        border: GridStyle | None = InsetGrid,
         disabled: FilterOrBool = False,
         vertical: FilterOrBool = False,
     ) -> None:
@@ -2055,7 +2094,7 @@ class Slider(SelectableWidget):
         max_count: int | None = None,
         on_change: Callable[[SelectableWidget], None] | None = None,
         style: str | Callable[[], str] = "class:input",
-        border: GridStyle = InnerEigthGrid,
+        border: GridStyle = InsetGrid,
         show_borders: DiBool | None = None,
         vertical: FilterOrBool = False,
         show_arrows: FilterOrBool = True,

euporie/core/widgets/inputs.py

@@ -79,7 +79,6 @@ class KernelInput(TextArea):
         tempfile_suffix: str | Callable[[], str] = "",
         key_bindings: KeyBindingsBase | None = None,
         enable_history_search: FilterOrBool | None = False,
-        focusable: FilterOrBool = True,
         wrap_lines: FilterOrBool = False,
         complete_while_typing: FilterOrBool = True,
         autosuggest_while_typing: FilterOrBool = True,
@@ -95,6 +94,7 @@ class KernelInput(TextArea):
         kwargs.setdefault("history", kernel_tab.history)
         kwargs.setdefault("search_field", app.search_bar)
         kwargs.setdefault("focus_on_click", True)
+        kwargs.setdefault("preview_search", True)
         kwargs.setdefault(
             "input_processors",
             [
@@ -168,18 +168,28 @@ class KernelInput(TextArea):
         )
 
         # Add configurable line numbers
-        self.window.left_margins = left_margins or [
-            ConditionalMargin(
-                NumberedDiffMargin(),
-                Condition(lambda: self.kernel_tab.app.config.line_numbers),
-            )
-        ]
-        self.window.right_margins = right_margins or [
-            OverflowMargin(),
-            ConditionalMargin(
-                ScrollbarMargin(display_arrows=False), filter=scrollable(self.window)
-            ),
-        ]
+        self.window.left_margins = (
+            left_margins
+            if left_margins is not None
+            else [
+                ConditionalMargin(
+                    NumberedDiffMargin(),
+                    Condition(lambda: self.kernel_tab.app.config.line_numbers),
+                )
+            ]
+        )
+
+        self.window.right_margins = (
+            right_margins
+            if right_margins is not None
+            else [
+                OverflowMargin(),
+                ConditionalMargin(
+                    ScrollbarMargin(display_arrows=False),
+                    filter=scrollable(self.window),
+                ),
+            ]
+        )
 
         self.window.cursorline = self.has_focus
 

euporie/core/widgets/layout.py

@@ -30,7 +30,7 @@ from prompt_toolkit.mouse_events import MouseButton, MouseEventType
 from prompt_toolkit.utils import Event
 from prompt_toolkit.widgets import Box
 
-from euporie.core.border import OuterEigthGrid
+from euporie.core.border import OutsetGrid
 from euporie.core.data_structures import DiBool
 from euporie.core.widgets.decor import Border
 
@@ -340,7 +340,7 @@ class TabBarControl(UIControl):
 
 
 class StackedSplit(metaclass=ABCMeta):
-    """Bae class for containers with selectable children."""
+    """Base class for containers with selectable children."""
 
     def __init__(
         self,
@@ -454,7 +454,7 @@ class TabbedSplit(StackedSplit):
         on_change: Callable[[StackedSplit], None] | None = None,
         width: AnyDimension = None,
         height: AnyDimension = None,
-        border: GridStyle = OuterEigthGrid,
+        border: GridStyle = OutsetGrid,
         show_borders: DiBool | None = None,
     ) -> None:
         """Initialize a new tabbed container."""
@@ -493,6 +493,7 @@ class TabbedSplit(StackedSplit):
                         padding=0,
                         padding_top=1,
                         padding_bottom=1,
+                        style="class:tabbed-split,page",
                     ),
                     border=self.border,
                     show_borders=self.show_borders,