euporie 2.6.2__py3-none-any.whl → 2.7.0__py3-none-any.whl

euporie/core/widgets/inputs.py

@@ -6,6 +6,10 @@ import contextlib
 import logging
 from typing import TYPE_CHECKING
 
+from prompt_toolkit.auto_suggest import AutoSuggest, DynamicAutoSuggest
+from prompt_toolkit.buffer import Buffer
+from prompt_toolkit.completion import Completer, DynamicCompleter
+from prompt_toolkit.document import Document
 from prompt_toolkit.filters import (
     Condition,
     buffer_has_focus,
@@ -13,21 +17,36 @@ from prompt_toolkit.filters import (
     has_selection,
     is_done,
     is_searching,
+    is_true,
     to_filter,
 )
 from prompt_toolkit.key_binding.key_bindings import merge_key_bindings
-from prompt_toolkit.layout.containers import ConditionalContainer
+from prompt_toolkit.layout.containers import (
+    ConditionalContainer,
+    ScrollOffsets,
+)
+from prompt_toolkit.layout.controls import (
+    BufferControl,
+    GetLinePrefixCallable,
+)
+from prompt_toolkit.layout.dimension import AnyDimension
+from prompt_toolkit.layout.dimension import Dimension as D
 from prompt_toolkit.layout.margins import ConditionalMargin
 from prompt_toolkit.layout.processors import (  # HighlightSearchProcessor,
+    BeforeInput,
     ConditionalProcessor,
     DisplayMultipleCursors,
     HighlightIncrementalSearchProcessor,
     HighlightMatchingBracketProcessor,
     HighlightSelectionProcessor,
+    PasswordProcessor,
+    Processor,
     TabsProcessor,
 )
 from prompt_toolkit.lexers import DynamicLexer, PygmentsLexer, SimpleLexer
+from prompt_toolkit.validation import DynamicValidator, Validator
 from prompt_toolkit.widgets import TextArea
+from prompt_toolkit.widgets.toolbars import SearchToolbar
 from pygments.lexers import ClassNotFound, get_lexer_by_name
 
 from euporie.core.commands import add_cmd
@@ -38,6 +57,7 @@ from euporie.core.key_binding.registry import (
     load_registered_bindings,
     register_bindings,
 )
+from euporie.core.layout.containers import Window
 from euporie.core.margins import NumberedDiffMargin, OverflowMargin, ScrollbarMargin
 from euporie.core.processors import (
     AppendLineAutoSuggestion,
@@ -47,10 +67,14 @@ from euporie.core.suggest import ConditionalAutoSuggestAsync
 from euporie.core.widgets.pager import PagerState
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Sequence
+    from typing import Callable, Sequence
 
-    from prompt_toolkit.buffer import Buffer
-    from prompt_toolkit.filters import FilterOrBool
+    from prompt_toolkit.buffer import BufferAcceptHandler
+    from prompt_toolkit.filters import Filter, FilterOrBool
+    from prompt_toolkit.formatted_text import (
+        AnyFormattedText,
+    )
+    from prompt_toolkit.history import History
     from prompt_toolkit.key_binding.key_bindings import KeyBindingsBase
     from prompt_toolkit.layout.containers import AnyContainer
     from prompt_toolkit.layout.layout import FocusableElement
@@ -72,46 +96,60 @@ class KernelInput(TextArea):
     def __init__(
         self,
         kernel_tab: KernelTab,
-        *args: Any,
+        text: str = "",
+        multiline: FilterOrBool = True,
+        password: FilterOrBool = False,
+        lexer: Lexer | None = None,
+        auto_suggest: AutoSuggest | None = None,
+        completer: Completer | None = None,
+        complete_while_typing: FilterOrBool = True,
+        validator: Validator | None = None,
+        accept_handler: BufferAcceptHandler | None = None,
+        history: History | None = None,
+        focusable: FilterOrBool = True,
+        focus_on_click: FilterOrBool = True,
+        wrap_lines: FilterOrBool = False,
+        read_only: FilterOrBool = False,
+        width: AnyDimension = None,
+        height: AnyDimension = None,
+        dont_extend_height: FilterOrBool = False,
+        dont_extend_width: FilterOrBool = False,
+        line_numbers: bool = False,
+        get_line_prefix: GetLinePrefixCallable | None = None,
+        scrollbar: FilterOrBool = True,
+        style: str = "class:kernel-input",
+        search_field: SearchToolbar | None = None,
+        preview_search: FilterOrBool = True,
+        prompt: AnyFormattedText = "",
+        input_processors: list[Processor] | None = None,
+        name: str = "",
         left_margins: Sequence[Margin] | None = None,
         right_margins: Sequence[Margin] | None = None,
         on_text_changed: Callable[[Buffer], None] | None = None,
         on_cursor_position_changed: Callable[[Buffer], None] | None = None,
         tempfile_suffix: str | Callable[[], str] = "",
         key_bindings: KeyBindingsBase | None = None,
-        enable_history_search: FilterOrBool | None = False,
-        wrap_lines: FilterOrBool = False,
-        complete_while_typing: FilterOrBool = True,
+        enable_history_search: FilterOrBool = False,
         autosuggest_while_typing: FilterOrBool = True,
-        validate_while_typing: FilterOrBool | None = None,
-        **kwargs: Any,
+        validate_while_typing: FilterOrBool = False,
+        scroll_offsets: ScrollOffsets | None = None,
     ) -> None:
         """Initiate the cell input box."""
         self.kernel_tab = kernel_tab
         app = kernel_tab.app
 
-        kwargs.setdefault("wrap_lines", wrap_lines)
-        kwargs.setdefault("style", "class:kernel-input")
-        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",
-            [
-                ConditionalProcessor(
-                    HighlightIncrementalSearchProcessor(),
-                    filter=is_searching,
-                ),
-                # HighlightSearchProcessor(),
-                HighlightSelectionProcessor(),
-                DisplayMultipleCursors(),
-                HighlightMatchingBracketProcessor(),
-                TabsProcessor(char1="⇥", char2="┈"),
-                ShowTrailingWhiteSpaceProcessor(),
-            ],
-        )
-        kwargs.setdefault("completer", kernel_tab.completer)
+        if history is None:
+            history = kernel_tab.history
+
+        if search_field is None:
+            search_field = app.search_bar
+        if isinstance(search_field, SearchToolbar):
+            search_control = search_field.control
+        else:
+            search_control = None
+
+        if input_processors is None:
+            input_processors = []
 
         def _get_lexer() -> Lexer:
             try:
@@ -123,77 +161,41 @@ class KernelInput(TextArea):
             else:
                 return PygmentsLexer(pygments_lexer_class, sync_from_start=False)
 
-        kwargs.setdefault("lexer", DynamicLexer(_get_lexer))
-        kwargs.setdefault(
-            "auto_suggest",
-            ConditionalAutoSuggestAsync(
-                self.kernel_tab.suggester,
-                filter=to_filter(autosuggest_while_typing)
-                & Condition(lambda: app.config.autosuggest),
-            ),
-        )
-        kwargs["complete_while_typing"] = Condition(
+        # Writeable attributes.
+        self.completer = completer or kernel_tab.completer
+        self.complete_while_typing = Condition(
             lambda: app.config.autocomplete
         ) & to_filter(complete_while_typing)
-
-        super().__init__(*args, **kwargs)
-
-        if validate_while_typing:
-            self.buffer.validate_while_typing = to_filter(validate_while_typing)
-
-        self.control.include_default_input_processors = False
-        if on_text_changed:
-            self.buffer.on_text_changed += on_text_changed
-        if on_cursor_position_changed:
-            self.buffer.on_cursor_position_changed += on_cursor_position_changed
-        self.buffer.tempfile_suffix = tempfile_suffix or kernel_tab.kernel_lang_file_ext
-
-        if enable_history_search is not None:
-            self.buffer.enable_history_search = to_filter(enable_history_search)
-
-        self.has_focus = has_focus(self)
-
-        # Replace the autosuggest processor
-        # Skip type checking as PT should use "("Optional[Sequence[Processor]]"
-        # instead of "Optional[list[Processor]]"
-        # TODO make a PR for this
-        self.control.input_processors[0] = ConditionalProcessor(  # type: ignore
-            AppendLineAutoSuggestion(),
-            has_focus(self.buffer) & ~is_done,
-        )
-
-        # Set style
-        style = kwargs.get("style", "")
-        self.window.style = lambda: (
-            "class:text-area " + ("class:focused " if self.has_focus() else "") + style
-        )
-
-        # Add configurable line numbers
-        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.auto_suggest = auto_suggest or ConditionalAutoSuggestAsync(
+            self.kernel_tab.suggester,
+            filter=to_filter(autosuggest_while_typing)
+            & Condition(lambda: app.config.autosuggest),
         )
-
-        self.window.right_margins = (
-            right_margins
-            if right_margins is not None
-            else [
-                OverflowMargin(),
-                ConditionalMargin(
-                    ScrollbarMargin(display_arrows=False),
-                    filter=scrollable(self.window),
-                ),
-            ]
+        self.read_only = read_only
+        self.wrap_lines = wrap_lines
+        self.validator = validator
+        self.lexer = lexer
+
+        self.buffer = Buffer(
+            document=Document(text, 0),
+            multiline=multiline,
+            read_only=Condition(lambda: is_true(self.read_only)),
+            completer=DynamicCompleter(lambda: self.completer),
+            complete_while_typing=Condition(
+                lambda: is_true(self.complete_while_typing)
+            ),
+            validator=DynamicValidator(lambda: self.validator),
+            auto_suggest=DynamicAutoSuggest(lambda: self.auto_suggest),
+            accept_handler=accept_handler,
+            history=history,
+            name=name,
+            validate_while_typing=validate_while_typing,
+            on_text_changed=on_text_changed,
+            on_cursor_position_changed=on_cursor_position_changed,
+            tempfile_suffix=tempfile_suffix or kernel_tab.kernel_lang_file_ext,
+            enable_history_search=to_filter(enable_history_search),
         )
 
-        self.window.cursorline = self.has_focus
-
         # Set extra key-bindings
         widgets_key_bindings = load_registered_bindings(
             "euporie.core.widgets.inputs.KernelInput"
@@ -202,7 +204,77 @@ class KernelInput(TextArea):
             widgets_key_bindings = merge_key_bindings(
                 [key_bindings, widgets_key_bindings]
             )
-        self.control.key_bindings = widgets_key_bindings
+
+        self.control = BufferControl(
+            buffer=self.buffer,
+            lexer=DynamicLexer(lambda: self.lexer or _get_lexer()),
+            input_processors=[
+                ConditionalProcessor(  # type: ignore
+                    AppendLineAutoSuggestion(),
+                    has_focus(self.buffer) & ~is_done,
+                ),
+                ConditionalProcessor(
+                    processor=PasswordProcessor(), filter=to_filter(password)
+                ),
+                BeforeInput(prompt, style="class:text-area.prompt"),
+                ConditionalProcessor(
+                    HighlightIncrementalSearchProcessor(),
+                    filter=is_searching,
+                ),
+                # HighlightSearchProcessor(),
+                HighlightSelectionProcessor(),
+                DisplayMultipleCursors(),
+                ConditionalProcessor(  # type: ignore
+                    HighlightMatchingBracketProcessor(),
+                    has_focus(self.buffer) & ~is_done,
+                ),
+                TabsProcessor(char1="⇥", char2="┈"),
+                ShowTrailingWhiteSpaceProcessor(),
+                *input_processors,
+            ],
+            search_buffer_control=search_control,
+            preview_search=preview_search,
+            focusable=focusable,
+            focus_on_click=focus_on_click,
+            include_default_input_processors=False,
+            key_bindings=widgets_key_bindings,
+        )
+
+        left_margins = [
+            ConditionalMargin(
+                NumberedDiffMargin(),
+                app.config.filter("line_numbers") & self.buffer.multiline,
+                # & Condition(lambda: len(self.buffer.text.split("\n")) > 1),
+            )
+        ]
+        scrollbar_margin = ConditionalMargin(
+            ScrollbarMargin(), filter=to_filter(scrollbar)
+        )
+        right_margins = [OverflowMargin(), scrollbar_margin]
+        self.window = Window(
+            height=lambda: height or D(min=1)
+            if self.buffer.multiline()
+            else D.exact(1),
+            width=width,
+            dont_extend_height=dont_extend_height,
+            dont_extend_width=dont_extend_width,
+            content=self.control,
+            wrap_lines=Condition(lambda: is_true(self.wrap_lines)),
+            left_margins=left_margins,
+            right_margins=right_margins,
+            get_line_prefix=get_line_prefix,
+            style=lambda: (
+                "class:text-area "
+                + ("class:focused " if self.has_focus() else "")
+                + style
+            ),
+            cursorline=has_focus(self.buffer),
+            scroll_offsets=scroll_offsets
+            or ScrollOffsets(top=1, right=1, bottom=1, left=1),
+        )
+        scrollbar_margin.filter &= scrollable(self.window)
+
+        self.has_focus: Filter = has_focus(self.buffer)
 
     def inspect(self) -> None:
         """Get contextual help for the current cursor position in the current cell."""

euporie/core/widgets/layout.py

@@ -16,9 +16,6 @@ from prompt_toolkit.formatted_text.utils import fragment_list_width
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
-    HSplit,
-    VSplit,
-    Window,
     to_container,
 )
 from prompt_toolkit.layout.controls import (
@@ -27,13 +24,15 @@ from prompt_toolkit.layout.controls import (
     UIContent,
     UIControl,
 )
+from prompt_toolkit.layout.dimension import Dimension as D
+from prompt_toolkit.layout.dimension import to_dimension
 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 OutsetGrid
 from euporie.core.data_structures import DiBool
 from euporie.core.ft.utils import truncate
+from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.widgets.decor import Border
 
 if TYPE_CHECKING:
@@ -41,7 +40,10 @@ if TYPE_CHECKING:
 
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text.base import AnyFormattedText, StyleAndTextTuples
-    from prompt_toolkit.key_binding.key_bindings import NotImplementedOrNone
+    from prompt_toolkit.key_binding.key_bindings import (
+        KeyBindings,
+        NotImplementedOrNone,
+    )
     from prompt_toolkit.layout.containers import AnyContainer, Container, _Split
     from prompt_toolkit.layout.dimension import AnyDimension
     from prompt_toolkit.mouse_events import MouseEvent
@@ -51,6 +53,79 @@ if TYPE_CHECKING:
 log = logging.getLogger(__name__)
 
 
+class Box:
+    """Add padding around a container.
+
+    This also makes sure that the parent can provide more space than required by
+    the child. This is very useful when wrapping a small element with a fixed
+    size into a ``VSplit`` or ``HSplit`` object. The ``HSplit`` and ``VSplit``
+    try to make sure to adapt respectively the width and height, possibly
+    shrinking other elements. Wrapping something in a ``Box`` makes it flexible.
+
+    Args:
+        body: Another container object.
+        padding: The margin to be used around the body. This can be
+        overridden by `padding_left`, padding_right`, `padding_top` and
+            `padding_bottom`.
+        style: A style string.
+        char: Character to be used for filling the space around the body.
+            (This is supposed to be a character with a terminal width of 1.)
+    """
+
+    def __init__(
+        self,
+        body: AnyContainer,
+        padding: AnyDimension = None,
+        padding_left: AnyDimension = None,
+        padding_right: AnyDimension = None,
+        padding_top: AnyDimension = None,
+        padding_bottom: AnyDimension = None,
+        width: AnyDimension = None,
+        height: AnyDimension = None,
+        style: str = "",
+        char: None | str | Callable[[], str] = None,
+        modal: bool = False,
+        key_bindings: KeyBindings | None = None,
+    ) -> None:
+        """Initialize this widget."""
+        if padding is None:
+            padding = D(preferred=0)
+
+        def get(value: AnyDimension) -> D:
+            if value is None:
+                value = padding
+            return to_dimension(value)
+
+        self.padding_left = get(padding_left)
+        self.padding_right = get(padding_right)
+        self.padding_top = get(padding_top)
+        self.padding_bottom = get(padding_bottom)
+        self.body = body
+
+        self.container = HSplit(
+            [
+                Window(height=self.padding_top, char=char),
+                VSplit(
+                    [
+                        Window(width=self.padding_left, char=char),
+                        body,
+                        Window(width=self.padding_right, char=char),
+                    ]
+                ),
+                Window(height=self.padding_bottom, char=char),
+            ],
+            width=width,
+            height=height,
+            style=style,
+            modal=modal,
+            key_bindings=None,
+        )
+
+    def __pt_container__(self) -> Container:
+        """Return the main container for this widget."""
+        return self.container
+
+
 class ConditionalSplit:
     """A split container where the orientation depends on a filter."""
 

euporie/core/widgets/menu.py

@@ -19,10 +19,7 @@ from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     Container,
     Float,
-    HSplit,
     ScrollOffsets,
-    VSplit,
-    Window,
 )
 from prompt_toolkit.layout.controls import FormattedTextControl, UIContent
 from prompt_toolkit.layout.dimension import Dimension
@@ -35,6 +32,7 @@ from prompt_toolkit.utils import get_cwidth
 
 from euporie.core.border import OuterHalfGrid
 from euporie.core.current import get_app
+from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.widgets.decor import Shadow
 
 if TYPE_CHECKING:

euporie/core/widgets/pager.py

@@ -10,9 +10,7 @@ from prompt_toolkit.filters import Condition
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
-    HSplit,
 )
-from prompt_toolkit.widgets import Box
 
 from euporie.core.commands import add_cmd
 from euporie.core.convert.datum import Datum
@@ -25,9 +23,11 @@ from euporie.core.key_binding.registry import (
     load_registered_bindings,
     register_bindings,
 )
+from euporie.core.layout.containers import HSplit
+from euporie.core.layout.decor import Line
 from euporie.core.widgets.cell_outputs import CellOutput, CellOutputDataElement
-from euporie.core.widgets.decor import Line
 from euporie.core.widgets.display import Display
+from euporie.core.widgets.layout import Box
 
 if TYPE_CHECKING:
     from typing import Any

euporie/core/widgets/palette.py

@@ -10,15 +10,16 @@ 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.layout.containers import HSplit, ScrollOffsets, VSplit, Window
+from prompt_toolkit.layout.containers import ScrollOffsets
 from prompt_toolkit.layout.controls import UIContent, UIControl
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 
 from euporie.core.commands import Command, add_cmd, commands
 from euporie.core.current import get_app
 from euporie.core.key_binding.registry import register_bindings
+from euporie.core.layout.containers import HSplit, VSplit, Window
+from euporie.core.layout.decor import FocusedStyle
 from euporie.core.margins import MarginContainer, ScrollbarMargin
-from euporie.core.widgets.decor import FocusedStyle
 from euporie.core.widgets.dialog import Dialog
 from euporie.core.widgets.forms import Text
 from euporie.core.widgets.status_bar import StatusContainer

euporie/core/widgets/status_bar.py

@@ -10,12 +10,7 @@ from prompt_toolkit.cache import FastDictCache
 from prompt_toolkit.filters.utils import to_filter
 from prompt_toolkit.formatted_text import to_formatted_text
 from prompt_toolkit.layout import containers
-from prompt_toolkit.layout.containers import (
-    ConditionalContainer,
-    VSplit,
-    Window,
-    WindowAlign,
-)
+from prompt_toolkit.layout.containers import ConditionalContainer, WindowAlign
 from prompt_toolkit.layout.containers import (
     to_container as ptk_to_container,
 )
@@ -24,6 +19,7 @@ from prompt_toolkit.layout.controls import FormattedTextControl
 from euporie.core.config import add_setting
 from euporie.core.current import get_app
 from euporie.core.filters import is_searching
+from euporie.core.layout.containers import VSplit, Window
 
 if TYPE_CHECKING:
     from typing import Callable, Sequence

euporie/core/widgets/tree.py

@@ -5,15 +5,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, cast
 
 from prompt_toolkit.filters import Condition
-from prompt_toolkit.layout.containers import (
-    ConditionalContainer,
-    HSplit,
-    VSplit,
-    Window,
-)
+from prompt_toolkit.layout.containers import ConditionalContainer
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.mouse_events import MouseButton, MouseEvent, MouseEventType
 
+from euporie.core.layout.containers import HSplit, VSplit, Window
+
 if TYPE_CHECKING:
     from typing import Any
 

euporie/notebook/app.py

@@ -13,9 +13,6 @@ from prompt_toolkit.layout.containers import (
     ConditionalContainer,
     DynamicContainer,
     FloatContainer,
-    HSplit,
-    VSplit,
-    Window,
     WindowAlign,
 )
 from prompt_toolkit.layout.controls import FormattedTextControl
@@ -28,7 +25,8 @@ from euporie.core.commands import add_cmd, get_cmd
 from euporie.core.config import add_setting
 from euporie.core.ft.utils import truncate
 from euporie.core.key_binding.registry import register_bindings
-from euporie.core.widgets.decor import Pattern
+from euporie.core.layout.containers import HSplit, VSplit, Window
+from euporie.core.layout.decor import Pattern
 from euporie.core.widgets.dialog import (
     AboutDialog,
     ConfirmDialog,
@@ -196,6 +194,7 @@ class NotebookApp(BaseApp):
                 self.tab_bar_control,
                 height=2,
                 style="class:app-tab-bar",
+                dont_extend_height=True,
             ),
             filter=Condition(
                 lambda: (len(self.tabs) > 1 or self.config.always_show_tab_bar)
@@ -432,7 +431,7 @@ class NotebookApp(BaseApp):
                     self.config.get_item("syntax_theme").menu,
                     get_cmd("toggle-background-pattern").menu,
                     get_cmd("toggle-show-cell-borders").menu,
-                    get_cmd("toggle-tmux-graphics").menu,
+                    get_cmd("toggle-multiplexer-passthrough").menu,
                     separator,
                     get_cmd("toggle-expand").menu,
                     get_cmd("toggle-line-numbers").menu,
@@ -451,9 +450,10 @@ class NotebookApp(BaseApp):
                         children=[
                             get_cmd("toggle-autoformat").menu,
                             separator,
-                            get_cmd("toggle-format-black").menu,
-                            get_cmd("toggle-format-isort").menu,
-                            get_cmd("toggle-format-ssort").menu,
+                            get_cmd("toggle-formatters-ruff").menu,
+                            get_cmd("toggle-formatters-black").menu,
+                            get_cmd("toggle-formatters-isort").menu,
+                            get_cmd("toggle-formatters-ssort").menu,
                         ],
                     ),
                     get_cmd("toggle-autocomplete").menu,

euporie/notebook/tabs/notebook.py

@@ -39,13 +39,13 @@ from euporie.core.key_binding.registry import (
     load_registered_bindings,
     register_bindings,
 )
+from euporie.core.layout.decor import Line, Pattern
+from euporie.core.layout.scroll import ScrollingContainer
 from euporie.core.margins import MarginContainer, ScrollbarMargin
 from euporie.core.style import KERNEL_STATUS_REPR
 from euporie.core.tabs.base import KernelTab
 from euporie.core.tabs.notebook import BaseNotebook
 from euporie.core.widgets.cell import Cell
-from euporie.core.widgets.decor import Line, Pattern
-from euporie.core.widgets.page import ScrollingContainer
 from euporie.notebook.filters import (
     cell_has_focus,
     code_cell_selected,

euporie/notebook/widgets/side_bar.py

@@ -19,7 +19,7 @@ from prompt_toolkit.layout.controls import FormattedTextControl
 from euporie.core.commands import add_cmd
 from euporie.core.config import add_setting
 from euporie.core.key_binding.registry import register_bindings
-from euporie.core.widgets.decor import Line
+from euporie.core.layout.decor import Line
 from euporie.core.widgets.forms import ToggleButton, ToggleButtons
 
 if TYPE_CHECKING:

euporie/preview/tabs/notebook.py

@@ -13,12 +13,12 @@ from prompt_toolkit.layout.containers import (
     Window,
 )
 from prompt_toolkit.layout.dimension import Dimension
-from prompt_toolkit.widgets import Box
 
 from euporie.core.config import add_setting
+from euporie.core.layout.print import PrintingContainer
 from euporie.core.tabs.notebook import BaseNotebook
 from euporie.core.widgets.cell import Cell
-from euporie.core.widgets.page import PrintingContainer
+from euporie.core.widgets.layout import Box
 
 if TYPE_CHECKING:
     from pathlib import Path