Merge branch 'main' into main

Author: willmcgugan

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fixed `Input` cursor color display in ANSI mode (`ansi_color=True`) https://github.com/Textualize/textual/issues/6234
+- Fixed alt modifier on systems without extended Key Protocol https://github.com/Textualize/textual/pull/6267
+- Fixed an issue where alpha keys with modifiers weren't lower cased. If you have bound to something like `ctrl+A`, then change to `ctrl+shift+a` https://github.com/Textualize/textual/pull/6267
+- Fixed exception when setting `loading` attribute before mount https://github.com/Textualize/textual/pull/6268
+- Fixed issue with dim filter not using background (may cause snapshot failures) https://github.com/Textualize/textual/pull/6269
 
 ## [6.7.1] - 2025-12-1
 

src/textual/_xterm_parser.py

@@ -163,20 +163,29 @@ def on_key_token(event: events.Key) -> None:
             else:
                 on_token(event)
 
-        def reissue_sequence_as_keys(reissue_sequence: str) -> None:
+        def reissue_sequence_as_keys(
+            reissue_sequence: str, process_alt: bool = False
+        ) -> None:
             """Called when an escape sequence hasn't been understood.
 
             Args:
                 reissue_sequence: Key sequence to report to the app.
             """
+
+            alt = False
+
             if reissue_sequence:
                 self.debug_log("REISSUE", repr(reissue_sequence))
                 for character in reissue_sequence:
-                    key_events = sequence_to_key_events(character)
+                    if process_alt and character == ESC:
+                        alt = True
+                        continue
+                    key_events = sequence_to_key_events(character, alt=alt)
                     for event in key_events:
-                        if event.key == "escape":
+                        if event.key == "escape" and not process_alt:
                             event = events.Key("circumflex_accent", "^")
                         on_token(event)
+                    alt = False
 
         while not self.is_eof:
             if not bracketed_paste and paste_buffer:
@@ -211,23 +220,25 @@ def reissue_sequence_as_keys(reissue_sequence: str) -> None:
             # # Could be the escape key was pressed OR the start of an escape sequence
             sequence: str = ESC
 
-            def send_escape() -> None:
+            def send_sequence(process_alt: bool = True) -> None:
                 """Send escape key and reissue sequence."""
-                on_token(events.Key("escape", "\x1b"))
-                reissue_sequence_as_keys(sequence[1:])
+                if sequence == ESC:
+                    on_token(events.Key("escape", "\x1b"))
+                else:
+                    reissue_sequence_as_keys(sequence, process_alt=process_alt)
 
             while True:
                 try:
                     new_character = yield read1(constants.ESCAPE_DELAY)
                 except ParseTimeout:
-                    send_escape()
+                    send_sequence()
                     break
                 except ParseEOF:
-                    send_escape()
+                    send_sequence()
                     return
 
                 if new_character == ESC:
-                    send_escape()
+                    send_sequence(process_alt=False)
                     sequence = character
                     continue
                 else:
@@ -313,7 +324,9 @@ def send_escape() -> None:
             self._debug_log_file.close()
             self._debug_log_file = None
 
-    def _sequence_to_key_events(self, sequence: str) -> Iterable[events.Key]:
+    def _sequence_to_key_events(
+        self, sequence: str, alt: bool = False
+    ) -> Iterable[events.Key]:
         """Map a sequence of code points on to a sequence of keys.
 
         Args:
@@ -342,7 +355,7 @@ def _sequence_to_key_events(self, sequence: str) -> Iterable[events.Key]:
                         key_tokens.append(modifier)
 
             key_tokens.sort()
-            key_tokens.append(key)
+            key_tokens.append(key.lower())
             yield events.Key(
                 "+".join(key_tokens), sequence if len(sequence) == 1 else None
             )
@@ -376,7 +389,12 @@ def _sequence_to_key_events(self, sequence: str) -> Iterable[events.Key]:
                     name = _character_to_key(sequence)
                 else:
                     name = sequence
+
                 name = KEY_NAME_REPLACEMENTS.get(name, name)
+                if len(name) == 1 and alt:
+                    if name.isupper():
+                        name = f"shift+{name.lower()}"
+                    name = f"alt+{name}"
                 yield events.Key(name, sequence)
             except Exception:
                 yield events.Key(sequence, sequence)

src/textual/dom.py

@@ -1623,7 +1623,7 @@ def query_ancestor(
         self,
         selector: str | type[QueryType],
         expect_type: type[QueryType] | None = None,
-    ) -> DOMNode | None:
+    ) -> DOMNode:
         """Get an ancestor which matches a query.
 
         Args:

src/textual/filter.py

@@ -248,17 +248,18 @@ def truecolor_style(self, style: Style, background: RichColor) -> Style:
                     color.get_truecolor(terminal_theme, foreground=True)
                 )
                 changed = True
-            if style.dim:
-                color = dim_color(background, color)
-                style += NO_DIM
-                changed = True
 
         if (bgcolor := style.bgcolor) is not None and bgcolor.triplet is None:
             bgcolor = RichColor.from_triplet(
                 bgcolor.get_truecolor(terminal_theme, foreground=False)
             )
             changed = True
 
+        if style.dim and color is not None:
+            color = dim_color(background if bgcolor is None else bgcolor, color)
+            style += NO_DIM
+            changed = True
+
         return style + Style.from_color(color, bgcolor) if changed else style
 
     def apply(self, segments: list[Segment], background: Color) -> list[Segment]:

src/textual/widget.py

@@ -1035,7 +1035,10 @@ def set_loading(self, loading: bool) -> None:
 
     def _watch_loading(self, loading: bool) -> None:
         """Called when the 'loading' reactive is changed."""
-        self.set_loading(loading)
+        if not self.is_mounted:
+            self.call_later(self.set_loading, loading)
+        else:
+            self.set_loading(loading)
 
     ExpectType = TypeVar("ExpectType", bound="Widget")
 

src/textual/widgets/__init__.py

@@ -12,7 +12,7 @@
     from textual.widget import Widget
     from textual.widgets._button import Button
     from textual.widgets._checkbox import Checkbox
-    from textual.widgets._collapsible import Collapsible, CollapsibleTitle
+    from textual.widgets._collapsible import Collapsible
     from textual.widgets._content_switcher import ContentSwitcher
     from textual.widgets._data_table import DataTable
     from textual.widgets._digits import Digits
@@ -54,7 +54,6 @@
     "Button",
     "Checkbox",
     "Collapsible",
-    "CollapsibleTitle",
     "ContentSwitcher",
     "DataTable",
     "Digits",

src/textual/widgets/__init__.pyi

@@ -2,7 +2,6 @@
 from ._button import Button as Button
 from ._checkbox import Checkbox as Checkbox
 from ._collapsible import Collapsible as Collapsible
-from ._collapsible import CollapsibleTitle as CollapsibleTitle
 from ._content_switcher import ContentSwitcher as ContentSwitcher
 from ._data_table import DataTable as DataTable
 from ._digits import Digits as Digits