Merge branch 'main' into lg/fix-select-selection

Author: willmcgugan

CHANGELOG.md

@@ -7,16 +7,37 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+
+### Changed
+
+- Breaking change: `App.query` and friends will now always query the default (first) screen, not necessarily the active screen.
+- Content now has a default argument of an empty string, so `Content()` is equivalent to `Content("")`
+- Assigned names to Textual-specific threads: `textual-input`, `textual-output`. These should become visible in monitoring tools (ps, top, htop) as of Python 3.14. https://github.com/Textualize/textual/pull/5654
+- Tabs now accept Content or content markup https://github.com/Textualize/textual/pull/5657
+- Buttons will now use Textual markup rather than console markup
+- tree-sitter languages are now loaded lazily, improving cold-start time https://github.com/Textualize/textual/pull/563
+
 ### Fixed
 
 - Static and Label now accept Content objects, satisfying type checkers https://github.com/Textualize/textual/pull/5618
 - Fixed click selection not being disabled when allow_select was set to false https://github.com/Textualize/textual/issues/5627
 - Fixed crash on clicking line API border https://github.com/Textualize/textual/pull/5641
 - Fixed Select.selection now correctly returns None if Select.BLANK is selected instead of an AssertionError
+- Fixed additional spaces after text-wrapping https://github.com/Textualize/textual/pull/5657
+- Added missing `scroll_end` parameter to the `Log.write_line` method https://github.com/Textualize/textual/pull/5672
+- Restored support for blink https://github.com/Textualize/textual/pull/5675
+- Fixed scrolling breaking on DataTable with `overflow: hidden` https://github.com/Textualize/textual/pull/5681
 
 ### Added
 
 - Added Widget.preflight_checks to perform some debug checks after a widget is instantiated, to catch common errors. https://github.com/Textualize/textual/pull/5588
+- Added text-padding style https://github.com/Textualize/textual/pull/5657
+- Added `Content.first_line` property https://github.com/Textualize/textual/pull/5657
+- Added `Content.from_text` constructor https://github.com/Textualize/textual/pull/5657
+- Added `Content.empty` constructor https://github.com/Textualize/textual/pull/5657
+- Added `Content.pad` method https://github.com/Textualize/textual/pull/5657
+- Added `Style.has_transparent_foreground` property https://github.com/Textualize/textual/pull/5657
+
 
 ## [2.1.2] - 2025-02-26
 

docs/examples/widgets/radio_button.py

@@ -1,3 +1,5 @@
+from rich.text import Text
+
 from textual.app import App, ComposeResult
 from textual.widgets import RadioButton, RadioSet
 
@@ -15,7 +17,9 @@ def compose(self) -> ComposeResult:
             yield RadioButton("Star Wars: A New Hope")
             yield RadioButton("The Last Starfighter")
             yield RadioButton(
-                "Total Recall :backhand_index_pointing_right: :red_circle:"
+                Text.from_markup(
+                    "Total Recall :backhand_index_pointing_right: :red_circle:"
+                )
             )
             yield RadioButton("Wing Commander")
 

docs/examples/widgets/radio_set.py

@@ -1,3 +1,5 @@
+from rich.text import Text
+
 from textual.app import App, ComposeResult
 from textual.containers import Horizontal
 from textual.widgets import RadioButton, RadioSet
@@ -18,7 +20,9 @@ def compose(self) -> ComposeResult:
                 yield RadioButton("Star Wars: A New Hope")
                 yield RadioButton("The Last Starfighter")
                 yield RadioButton(
-                    "Total Recall :backhand_index_pointing_right: :red_circle:"
+                    Text.from_markup(
+                        "Total Recall :backhand_index_pointing_right: :red_circle:"
+                    )
                 )
                 yield RadioButton("Wing Commander")
             # A RadioSet built up from a collection of strings.

docs/examples/widgets/radio_set_changed.py

@@ -1,3 +1,5 @@
+from rich.text import Text
+
 from textual.app import App, ComposeResult
 from textual.containers import Horizontal, VerticalScroll
 from textual.widgets import Label, RadioButton, RadioSet
@@ -18,7 +20,9 @@ def compose(self) -> ComposeResult:
                     yield RadioButton("Star Wars: A New Hope")
                     yield RadioButton("The Last Starfighter")
                     yield RadioButton(
-                        "Total Recall :backhand_index_pointing_right: :red_circle:"
+                        Text.from_markup(
+                            "Total Recall :backhand_index_pointing_right: :red_circle:"
+                        )
                     )
                     yield RadioButton("Wing Commander")
             with Horizontal():

docs/widgets/button.md

@@ -51,7 +51,7 @@ This widget has no component classes.
 
 ## Additional Notes
 
-- The spacing between the text and the edges of a button are _not_ due to padding. The default styling for a `Button` has the `height` set to 3 lines and a `min-width` of 16 columns. To create a button with zero visible padding, you will need to change these values and also remove the border with `border: none;`.
+- The spacing between the text and the edges of a button are _not_ due to padding. The default styling for a `Button` includes borders and a `min-width` of 16 columns. To remove the spacing, set `border: none;` in your CSS and adjust the minimum width as needed.
 
 ---
 

src/textual/_tree_sitter.py

@@ -1,49 +1,44 @@
 from __future__ import annotations
+from importlib import import_module
+
+from textual import log
+
 
 try:
-    import tree_sitter_bash
-    import tree_sitter_css
-    import tree_sitter_go
-    import tree_sitter_html
-    import tree_sitter_java
-    import tree_sitter_javascript
-    import tree_sitter_json
-    import tree_sitter_markdown
-    import tree_sitter_python
-    import tree_sitter_regex
-    import tree_sitter_rust
-    import tree_sitter_sql
-    import tree_sitter_toml
-    import tree_sitter_xml
-    import tree_sitter_yaml
     from tree_sitter import Language
 
-    _tree_sitter = True
+    _LANGUAGE_CACHE: dict[str, Language] = {}
 
-    _languages = {
-        "python": Language(tree_sitter_python.language()),
-        "json": Language(tree_sitter_json.language()),
-        "markdown": Language(tree_sitter_markdown.language()),
-        "yaml": Language(tree_sitter_yaml.language()),
-        "toml": Language(tree_sitter_toml.language()),
-        "rust": Language(tree_sitter_rust.language()),
-        "html": Language(tree_sitter_html.language()),
-        "css": Language(tree_sitter_css.language()),
-        "xml": Language(tree_sitter_xml.language_xml()),
-        "regex": Language(tree_sitter_regex.language()),
-        "sql": Language(tree_sitter_sql.language()),
-        "javascript": Language(tree_sitter_javascript.language()),
-        "java": Language(tree_sitter_java.language()),
-        "bash": Language(tree_sitter_bash.language()),
-        "go": Language(tree_sitter_go.language()),
-    }
+    _tree_sitter = True
 
     def get_language(language_name: str) -> Language | None:
-        return _languages.get(language_name)
+        if language_name in _LANGUAGE_CACHE:
+            return _LANGUAGE_CACHE[language_name]
+
+        try:
+            module = import_module(f"tree_sitter_{language_name}")
+        except ImportError:
+            return None
+        else:
+            try:
+                if language_name == "xml":
+                    # xml uses language_xml() instead of language()
+                    # it's the only outlier amongst the languages in the `textual[syntax]` extra
+                    language = Language(module.language_xml(), name=language_name)
+                else:
+                    language = Language(module.language(), name=language_name)
+            except (OSError, AttributeError):
+                log.warning(f"Could not load language {language_name!r}.")
+                return None
+            else:
+                _LANGUAGE_CACHE[language_name] = language
+                return language
 
 except ImportError:
     _tree_sitter = False
-    _languages = {}
+
+    def get_language(language_name: str) -> Language | None:
+        return None
+
 
 TREE_SITTER = _tree_sitter
-BUILTIN_LANGUAGES: dict[str, "Language"] = _languages

src/textual/app.py

@@ -798,6 +798,9 @@ def __init__(
         self.supports_smooth_scrolling: bool = False
         """Does the terminal support smooth scrolling?"""
 
+        self._compose_screen: Screen | None = None
+        """The screen composed by App.compose."""
+
         if self.ENABLE_COMMAND_PALETTE:
             for _key, binding in self._bindings:
                 if binding.action in {"command_palette", "app.command_palette"}:
@@ -833,6 +836,10 @@ def __init_subclass__(cls, *args, **kwargs) -> None:
 
         return super().__init_subclass__(*args, **kwargs)
 
+    def _get_dom_base(self) -> DOMNode:
+        """When querying from the app, we want to query the default screen."""
+        return self.default_screen
+
     def validate_title(self, title: Any) -> str:
         """Make sure the title is set to a string."""
         return str(title)
@@ -841,6 +848,11 @@ def validate_sub_title(self, sub_title: Any) -> str:
         """Make sure the subtitle is set to a string."""
         return str(sub_title)
 
+    @property
+    def default_screen(self) -> Screen:
+        """The default screen instance."""
+        return self.screen if self._compose_screen is None else self._compose_screen
+
     @property
     def workers(self) -> WorkerManager:
         """The [worker](/guide/workers/) manager.
@@ -3244,6 +3256,7 @@ async def take_screenshot() -> None:
 
     async def _on_compose(self) -> None:
         _rich_traceback_omit = True
+        self._compose_screen = self.screen
         try:
             widgets = [*self.screen._nodes, *compose(self)]
         except TypeError as error: