repaired scroll view

Author: willmcgugan

examples/new.py

@@ -2,23 +2,37 @@
 
 from textual import events
 from textual.app import App
-from textual.widgets.header import Header
-from textual.widgets.placeholder import Placeholder
-from textual.widgets.scroll_view import ScrollView
-
-with open("richreadme.md", "rt") as fh:
-    readme = Markdown(fh.read(), hyperlinks=True, code_theme="fruity")
+from textual.view import DockView
+from textual.widgets import Header, Footer, Placeholder, ScrollView
 
 
 class MyApp(App):
+    """An example of a very simple Textual App"""
 
-    KEYS = {"q": "quit", "ctrl+c": "quit", "b": "view.toggle('left')"}
+    async def on_load(self, event: events.Load) -> None:
+        await self.bind("q,ctrl+c", "quit")
+        await self.bind("b", "view.toggle('sidebar')")
 
     async def on_startup(self, event: events.Startup) -> None:
-        await self.view.mount_all(
-            header=Header(self.title), left=Placeholder(), body=ScrollView(readme)
-        )
+        view = await self.push_view(DockView())
+        header = Header(self.title)
+        footer = Footer()
+        sidebar = Placeholder(name="sidebar")
+
+        with open("richreadme.md", "rt") as fh:
+            readme = Markdown(fh.read(), hyperlinks=True)
+
+        body = ScrollView(readme)
+
+        footer.add_key("b", "Toggle sidebar")
+        footer.add_key("q", "Quit")
+
+        await view.dock(header, edge="top")
+        await view.dock(footer, edge="bottom")
+        await view.dock(sidebar, edge="left", size=30)
+        await view.dock(body, edge="right")
+        self.require_layout()
 
 
-app = MyApp()
+app = MyApp(title="Simple App")
 app.run()

examples/simple.py

@@ -41,7 +41,7 @@ def parse_mouse_code(self, code: str, sender: MessageTarget) -> events.Event | N
             event: events.Event
             if buttons & 64:
                 event = (
-                    events.MouseScrollUp if button == 1 else events.MouseScrollDown
+                    events.MouseScrollDown if button == 1 else events.MouseScrollUp
                 )(sender, x, y)
             else:
                 event = (

src/textual/_xterm_parser.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from argparse import Action
+import os
 
 import asyncio
 
@@ -18,7 +18,7 @@
 from . import events
 from . import actions
 from ._animator import Animator
-from .geometry import Point, Region
+from .geometry import Region
 from ._context import active_app
 from .keys import Binding
 from .driver import Driver
@@ -239,13 +239,16 @@ async def shutdown(self):
         await self.close_messages()
 
     def refresh(self) -> None:
+        sync_available = os.environ.get("TERM_PROGRAM", "") != "Apple_Terminal"
         if not self._closed:
             console = self.console
             try:
-                console.file.write("\x1bP=1s\x1b\\")
+                if sync_available:
+                    console.file.write("\x1bP=1s\x1b\\")
                 with console:
                     console.print(Screen(Control.home(), self.view, Control.home()))
-                console.file.write("\x1bP=2s\x1b\\")
+                if sync_available:
+                    console.file.write("\x1bP=2s\x1b\\")
             except Exception:
                 log.exception("refresh failed")
 
@@ -345,10 +348,10 @@ async def action_bell(self) -> None:
 
     from rich.panel import Panel
 
-    from .widgets.header import Header
-    from .widgets.footer import Footer
+    from .widgets import Header
+    from .widgets import Footer
 
-    from .widgets.placeholder import Placeholder
+    from .widgets import Placeholder
     from .scrollbar import ScrollBar
 
     from rich.markdown import Markdown

src/textual/app.py

@@ -123,7 +123,7 @@ def get_offset(self, widget: Widget) -> Point:
     def get_widget_at(self, x: int, y: int) -> tuple[Widget, Region]:
         """Get the widget under the given point or None."""
         for widget, region in self:
-            if region.contains(x, y):
+            if widget.is_visual and region.contains(x, y):
                 return widget, region
         raise NoWidget(f"No widget under screen coordinate ({x}, {y})")
 
@@ -181,6 +181,9 @@ def render(widget: Widget, width: int, height: int) -> Lines:
             return lines
 
         for widget, region, _order in widget_regions:
+
+            if not widget.is_visual:
+                continue
             region_lines = self.renders.get(widget)
             if region_lines is not None:
                 yield region_lines
@@ -279,7 +282,6 @@ def __rich_console__(
 
     def update_widget(self, console: Console, widget: Widget) -> LayoutUpdate | None:
         if widget not in self.renders:
-            log.debug("WIDGET %r", self.renders)
             return None
         region, lines = self.renders[widget]
         new_lines = console.render_lines(

src/textual/layout.py

@@ -61,14 +61,13 @@ def generate_map(
         layers: dict[int, Region] = defaultdict(lambda: layout_region)
 
         def add_widget(widget: Widget, region: Region, order: tuple[int, int]):
-            region = region + offset + widget.layout_offset            
+            region = region + offset + widget.layout_offset
+            map[widget] = MapRegion(region, order)
             if isinstance(widget, View):
                 sub_map = widget.layout.generate_map(
                     region.width, region.height, offset=region.origin
                 )
                 map.update(sub_map)
-            else:
-                map[widget] = MapRegion(region, order)
 
         for index, dock in enumerate(self.docks):
             dock_options = [

src/textual/layouts/dock.py

@@ -96,7 +96,6 @@ def watch_y(self, new: int) -> None:
         self._page.offset = Point(x, new)
 
     def update(self, renderable: RenderableType | None = None) -> None:
-
         if renderable:
             self._page.update(renderable)
         else:

src/textual/page.py

@@ -166,8 +166,6 @@ def __rich_repr__(self) -> RichReprResult:
         yield "window_size", self.window_size
         yield "position", self.position
 
-    __rich_repr__.angular = True
-
     def render(self) -> RenderableType:
         return ScrollBarRender(
             virtual_size=self.virtual_size,

src/textual/scrollbar.py

@@ -7,20 +7,17 @@
 from typing import cast, Iterable, Optional, Tuple, TYPE_CHECKING
 
 from rich.console import Console, ConsoleOptions, RenderResult, RenderableType
-from rich.region import Region as LayoutRegion
 import rich.repr
-from rich.segment import Segments
 from rich.style import Style
 
 from . import events
-from ._context import active_app
 from .layout import Layout, NoWidget
 from .layouts.dock import DockEdge, DockLayout, Dock
 from .geometry import Dimensions, Point, Region
 from .messages import UpdateMessage, LayoutMessage
 
-from .widget import StaticWidget, Widget, WidgetID, Widget
-from .widgets.header import Header
+from .widget import Widget, Widget
+
 
 if TYPE_CHECKING:
     from .app import App
@@ -48,6 +45,10 @@ def __rich_console__(
     def __rich_repr__(self) -> rich.repr.RichReprResult:
         yield "name", self.name
 
+    @property
+    def is_visual(self) -> bool:
+        return False
+
     @property
     def is_root_view(self) -> bool:
         return self.parent is self.app
@@ -69,12 +70,8 @@ async def message_update(self, message: UpdateMessage) -> None:
             self.app.display(display_update)
 
     async def message_layout(self, message: LayoutMessage) -> None:
-
         await self.root_view.refresh_layout()
 
-    # async def on_create(self, event: events.Created) -> None:
-    #     await self.mount(Header(self.title))
-
     async def mount(self, *anon_widgets: Widget, **widgets: Widget) -> None:
 
         name_widgets: Iterable[tuple[str | None, Widget]]
@@ -101,13 +98,13 @@ async def refresh_layout(self) -> None:
         self.layout.reflow(width, height)
         self.app.refresh()
 
-        # for widget, region in self.layout:
-        #     if isinstance(widget, Widget):
-        #         await widget.post_message(
-        #             events.Resize(self, region.width, region.height)
-        #         )
+        for widget, region in self.layout:
+            if isinstance(widget, Widget):
+                await widget.post_message(
+                    events.Resize(self, region.width, region.height)
+                )
 
-    async def on_resize(self, event: events.Resize) -> None:        
+    async def on_resize(self, event: events.Resize) -> None:
         self.size = Dimensions(event.width, event.height)
         await self.refresh_layout()
 
@@ -171,10 +168,10 @@ async def forward_event(self, event: events.Event) -> None:
                 await self.focused.forward_event(event)
 
     async def action_toggle(self, name: str) -> None:
-        log.debug("%r", self.named_widgets)
         widget = self.named_widgets[name]
         widget.visible = not widget.visible
-        await self.refresh_layout()
+        await self.post_message(LayoutMessage(self))
+        # await self.refresh_layout()
 
 
 class DoNotSet:
@@ -194,6 +191,7 @@ async def dock(
         edge: DockEdge = "top",
         z: int = 0,
         size: int | None | DoNotSet = do_not_set,
+        name: str | None = None
     ) -> Widget | tuple[Widget, ...]:
 
         dock = Dock(edge, widgets, z)

src/textual/view.py

@@ -67,12 +67,12 @@ def __init__(self, name: str | None = None) -> None:
 
         super().__init__()
 
-    visible: Reactive[bool] = Reactive(True)
+    visible: Reactive[bool] = Reactive(True, layout=True)
     layout_size: Reactive[int | None] = Reactive(None)
     layout_fraction: Reactive[int] = Reactive(1)
     layout_minimim_size: Reactive[int] = Reactive(1)
     layout_offset_x: Reactive[float] = Reactive(0, layout=True)
-    layout_offset_y: Reactive[float] = Reactive(0)
+    layout_offset_y: Reactive[float] = Reactive(0, layout=True)
 
     def __init_subclass__(cls, can_focus: bool = True) -> None:
         super().__init_subclass__()
@@ -84,6 +84,10 @@ def __rich_repr__(self) -> rich.repr.RichReprResult:
     def __rich__(self) -> RenderableType:
         return self.render()
 
+    @property
+    def is_visual(self) -> bool:
+        return True
+
     @property
     def app(self) -> "App":
         """Get the current app."""
@@ -200,17 +204,8 @@ async def on_mouse_move(self, event: events.MouseMove) -> None:
         style_under_cursor = self.get_style_at(event.x, event.y)
         log.debug("%r", style_under_cursor)
 
-    # async def on_mouse_up(self, event: events.MouseUp) -> None:
-    #     style = self.get_style_at(event.x, event.y)
-    #     if "@click" in style.meta:
-    #         log.debug(style._link_id)
-    #         await self.app.action(style.meta["@click"], default_namespace=self)
-
-
-class StaticWidget(Widget):
-    def __init__(self, renderable: RenderableType, name: str | None = None) -> None:
-        super().__init__(name)
-        self.renderable = renderable
-
-    def render(self) -> RenderableType:
-        return self.renderable
+    async def on_mouse_up(self, event: events.MouseUp) -> None:
+        style = self.get_style_at(event.x, event.y)
+        if "@click" in style.meta:
+            log.debug(style._link_id)
+            await self.app.action(style.meta["@click"], default_namespace=self)