Merge branch 'main' into markdown-number-list

Author: davep

CHANGELOG.md

@@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.18.0] - Unreleased
+## Unreleased
 
 ### Fixed
 
+- Fixed bindings persistance https://github.com/Textualize/textual/issues/1613
 - The `Markdown` widget now auto-increments ordered lists https://github.com/Textualize/textual/issues/2002
 
 ## [0.17.1] - 2023-03-30

docs/images/stopwatch_widgets.excalidraw.svg

@@ -25,7 +25,7 @@ This will be a simple yet **fully featured** app — you could distribute th
 Here's what the finished app will look like:
 
 
-```{.textual path="docs/examples/tutorial/stopwatch.py" press="tab,enter,tab,enter,tab,enter,tab,enter"}
+```{.textual path="docs/examples/tutorial/stopwatch.py" title="stopwatch.py" press="tab,enter,tab,enter,tab,enter,tab,enter"}
 ```
 
 ### Get the code
@@ -90,12 +90,12 @@ The first step in building a Textual app is to import and extend the `App` class
 If you run this code, you should see something like the following:
 
 
-```{.textual path="docs/examples/tutorial/stopwatch01.py"}
+```{.textual path="docs/examples/tutorial/stopwatch01.py" title="stopwatch01.py"}
 ```
 
 Hit the ++d++ key to toggle between light and dark mode.
 
-```{.textual path="docs/examples/tutorial/stopwatch01.py" press="d" title="StopwatchApp + dark"}
+```{.textual path="docs/examples/tutorial/stopwatch01.py" press="d" title="stopwatch01.py"}
 ```
 
 Hit ++ctrl+c++ to exit the app and return to the command prompt.
@@ -449,7 +449,7 @@ The `action_remove_stopwatch` function calls [query()][textual.dom.DOMNode.query
 
 If you run `stopwatch.py` now you can add a new stopwatch with the ++a++ key and remove a stopwatch with ++r++.
 
-```{.textual path="docs/examples/tutorial/stopwatch.py" press="d,a,a,a,a,a,a,a,tab,enter,tab"}
+```{.textual path="docs/examples/tutorial/stopwatch.py" title="stopwatch.py" press="d,a,a,a,a,a,a,a,tab,enter,tab"}
 ```
 
 ## What next?

docs/tutorial.md

@@ -112,10 +112,11 @@ def import_app(import_name: str) -> App:
         except ImportError as error:
             raise AppFail(str(error))
 
+        find_app = name or "app"
         try:
-            app = getattr(module, name or "app")
+            app = getattr(module, find_app or "app")
         except AttributeError:
-            raise AppFail(f"Unable to find {name!r} in {module!r}")
+            raise AppFail(f"Unable to find {find_app!r} in {module!r}")
 
         sys.argv[:] = [import_name, *argv]
 

src/textual/_import_app.py

@@ -25,4 +25,11 @@ def post_message(self, message: "Message") -> bool:
 
 SegmentLines = List[List["Segment"]]
 CallbackType = Union[Callable[[], Awaitable[None]], Callable[[], None]]
-WatchCallbackType = Union[Callable[[Any], Awaitable[None]], Callable[[Any], None]]
+WatchCallbackType = Union[
+    Callable[[], Awaitable[None]],
+    Callable[[Any], Awaitable[None]],
+    Callable[[Any, Any], Awaitable[None]],
+    Callable[[], None],
+    Callable[[Any], None],
+    Callable[[Any, Any], None],
+]

src/textual/_types.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Iterable, MutableMapping
+from typing import TYPE_CHECKING, Iterable
 
 import rich.repr
 
@@ -92,12 +92,22 @@ def make_bindings(bindings: Iterable[BindingType]) -> Iterable[Binding]:
                         priority=binding.priority,
                     )
 
-        self.keys: MutableMapping[str, Binding] = (
+        self.keys: dict[str, Binding] = (
             {binding.key: binding for binding in make_bindings(bindings)}
             if bindings
             else {}
         )
 
+    def copy(self) -> Bindings:
+        """Return a copy of this instance.
+
+        Return:
+            New bindings object.
+        """
+        copy = Bindings()
+        copy.keys = self.keys.copy()
+        return copy
+
     def __rich_repr__(self) -> rich.repr.Result:
         yield self.keys
 

src/textual/binding.py

@@ -165,7 +165,11 @@ def __init__(
         self._auto_refresh: float | None = None
         self._auto_refresh_timer: Timer | None = None
         self._css_types = {cls.__name__ for cls in self._css_bases(self.__class__)}
-        self._bindings = self._merged_bindings or Bindings()
+        self._bindings = (
+            Bindings()
+            if self._merged_bindings is None
+            else self._merged_bindings.copy()
+        )
         self._has_hover_style: bool = False
         self._has_focus_within: bool = False