Merge branch 'main' into tomnewton/avoid_circular_dependency

Author: willmcgugan

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Fixed type hint aliasing for App under TYPE_CHECKING https://github.com/Textualize/textual/pull/6152
 - Fixed circular dependency effecting `bazel` users https://github.com/Textualize/textual/pull/6163
+- Fixed for text selection with double width characters https://github.com/Textualize/textual/pull/6186
+
+### Changed
+
+- Simplified system commands (command palette) to a single word https://github.com/Textualize/textual/pull/6183
 
 ## [6.3.0] - 2025-10-11
 

src/textual/_compositor.py

@@ -927,8 +927,10 @@ def get_widget_and_offset_at(
         offset_x = 0
         offset_x2 = 0
 
+        from rich.cells import get_character_cell_size
+
         for segment in line:
-            end += len(segment.text)
+            end += segment.cell_length
             style = segment.style
             if style is not None and style._meta is not None:
                 meta = style.meta
@@ -937,11 +939,14 @@ def get_widget_and_offset_at(
                     offset_x2 = offset_x + len(segment.text)
 
                     if x < end and x >= start:
-                        if x == end - 1:
-                            segment_offset = len(segment.text)
-                        else:
-                            first, _ = segment.split_cells(x - start)
-                            segment_offset = len(first.text)
+                        segment_cell_length = 0
+                        cell_cut = x - start
+                        segment_offset = 0
+                        for character in segment.text:
+                            if segment_cell_length >= cell_cut:
+                                break
+                            segment_cell_length += get_character_cell_size(character)
+                            segment_offset += 1
                         return widget, (
                             None
                             if offset_y is None

src/textual/app.py

@@ -518,7 +518,7 @@ class MyApp(App[None]):
         "inline": lambda app: app.is_inline,
         "ansi": lambda app: app.ansi_color,
         "nocolor": lambda app: app.no_color,
-    }  # type: ignore[assignment]
+    }
 
     title: Reactive[str] = Reactive("", compute=False)
     """The title of the app, displayed in the header."""
@@ -1256,25 +1256,25 @@ def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
         """
         if not self.ansi_color:
             yield SystemCommand(
-                "Change theme",
+                "Theme",
                 "Change the current theme",
                 self.action_change_theme,
             )
         yield SystemCommand(
-            "Quit the application",
+            "Quit",
             "Quit the application as soon as possible",
             self.action_quit,
         )
 
         if screen.query("HelpPanel"):
             yield SystemCommand(
-                "Hide keys and help panel",
+                "Keys",
                 "Hide the keys and widget help panel",
                 self.action_hide_help_panel,
             )
         else:
             yield SystemCommand(
-                "Show keys and help panel",
+                "Keys",
                 "Show help for the focused widget and a summary of available keys",
                 self.action_show_help_panel,
             )
@@ -1291,7 +1291,7 @@ def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
             )
 
         yield SystemCommand(
-            "Save screenshot",
+            "Screenshot",
             "Save an SVG 'screenshot' of the current screen",
             lambda: self.set_timer(0.1, self.deliver_screenshot),
         )

src/textual/dom.py

@@ -179,7 +179,7 @@ class DOMNode(MessagePump):
     # Names of potential computed reactives
     _computes: ClassVar[frozenset[str]]
 
-    _PSEUDO_CLASSES: ClassVar[dict[str, Callable[[object], bool]]] = {}
+    _PSEUDO_CLASSES: ClassVar[dict[str, Callable[[App[Any]], bool]]] = {}
     """Pseudo class checks."""
 
     def __init__(

src/textual/screen.py

@@ -1652,14 +1652,22 @@ def _forward_event(self, event: events.Event) -> None:
                 ):
                     end_widget = self._select_end[0]
                     select_offset = end_widget.content_region.bottom_right_inclusive
-                    self._select_end = (end_widget, event.offset, select_offset)
+                    self._select_end = (
+                        end_widget,
+                        event.screen_offset,
+                        select_offset,
+                    )
 
                 elif (
                     select_widget is not None
                     and select_widget.allow_select
                     and select_offset is not None
                 ):
-                    self._select_end = (select_widget, event.offset, select_offset)
+                    self._select_end = (
+                        select_widget,
+                        event.screen_offset,
+                        select_offset,
+                    )
 
         elif isinstance(event, events.MouseEvent):
             if isinstance(event, events.MouseUp):
@@ -1730,7 +1738,6 @@ def _watch__select_end(
         Args:
             select_end: The end selection.
         """
-
         if select_end is None or self._select_start is None:
             # Nothing to select
             return

src/textual/selection.py

@@ -56,12 +56,12 @@ def extract(self, text: str) -> str:
             return lines[start_line][start_offset:end_offset]
 
         selection: list[str] = []
-        selected_lines = lines[start_line:end_line]
+        selected_lines = lines[start_line : end_line + 1]
         if len(selected_lines) >= 2:
             first_line, *mid_lines, last_line = selected_lines
             selection.append(first_line[start_offset:])
             selection.extend(mid_lines)
-            selection.append(last_line[: end_offset + 1])
+            selection.append(last_line[:end_offset])
         else:
             return lines[start_line][start_offset:end_offset]
         return "\n".join(selection)

src/textual/widgets/_markdown.py

@@ -38,7 +38,7 @@
 
 
 class MarkdownStream:
-    """An object to manager streaming markdown.
+    """An object to manage streaming markdown.
 
     This will accumulate markdown fragments if they can't be rendered fast enough.
 

src/textual/worker_manager.py

@@ -22,7 +22,7 @@
 
 @rich.repr.auto(angular=True)
 class WorkerManager:
-    """An object to manager a number of workers.
+    """An object to manage a number of workers.
 
     You will not have to construct this class manually, as widgets, screens, and apps
     have a worker manager accessibly via a `workers` attribute.