mirror of
https://github.com/Textualize/textual.git
synced 2025-10-17 02:38:12 +03:00
6d24244b6a
* Fix cursor position when clicking double-width char #2968 The cursor moved to the correct position only when clicking the first index of the character. We now check if the click happened inside a range of indices. * Update changelog #2968
79 lines
2.6 KiB
Python
79 lines
2.6 KiB
Python
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from textual.app import App, ComposeResult
|
|
from textual.geometry import Offset
|
|
from textual.widgets import Input
|
|
|
|
# A string containing only single-width characters
|
|
TEXT_SINGLE = "That gum you like is going to come back in style"
|
|
|
|
# A string containing only double-width characters
|
|
TEXT_DOUBLE = "こんにちは"
|
|
|
|
# A string containing both single and double-width characters
|
|
TEXT_MIXED = "aこんbcにdちeは"
|
|
|
|
|
|
class InputApp(App[None]):
|
|
def __init__(self, text):
|
|
super().__init__()
|
|
self._text = text
|
|
|
|
def compose(self) -> ComposeResult:
|
|
yield Input(self._text)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"text, click_at, should_land",
|
|
(
|
|
# Single-width characters
|
|
(TEXT_SINGLE, 0, 0),
|
|
(TEXT_SINGLE, 1, 1),
|
|
(TEXT_SINGLE, 10, 10),
|
|
(TEXT_SINGLE, len(TEXT_SINGLE) - 1, len(TEXT_SINGLE) - 1),
|
|
(TEXT_SINGLE, len(TEXT_SINGLE), len(TEXT_SINGLE)),
|
|
(TEXT_SINGLE, len(TEXT_SINGLE) * 2, len(TEXT_SINGLE)),
|
|
# Double-width characters
|
|
(TEXT_DOUBLE, 0, 0),
|
|
(TEXT_DOUBLE, 1, 0),
|
|
(TEXT_DOUBLE, 2, 1),
|
|
(TEXT_DOUBLE, 3, 1),
|
|
(TEXT_DOUBLE, 4, 2),
|
|
(TEXT_DOUBLE, 5, 2),
|
|
(TEXT_DOUBLE, (len(TEXT_DOUBLE) * 2) - 1, len(TEXT_DOUBLE) - 1),
|
|
(TEXT_DOUBLE, len(TEXT_DOUBLE) * 2, len(TEXT_DOUBLE)),
|
|
(TEXT_DOUBLE, len(TEXT_DOUBLE) * 10, len(TEXT_DOUBLE)),
|
|
# Mixed-width characters
|
|
(TEXT_MIXED, 0, 0),
|
|
(TEXT_MIXED, 1, 1),
|
|
(TEXT_MIXED, 2, 1),
|
|
(TEXT_MIXED, 3, 2),
|
|
(TEXT_MIXED, 4, 2),
|
|
(TEXT_MIXED, 5, 3),
|
|
(TEXT_MIXED, 13, 9),
|
|
(TEXT_MIXED, 14, 9),
|
|
(TEXT_MIXED, 15, 10),
|
|
(TEXT_MIXED, 1000, 10),
|
|
),
|
|
)
|
|
async def test_mouse_clicks_within(text, click_at, should_land):
|
|
"""Mouse clicks should result in the cursor going to the right place."""
|
|
async with InputApp(text).run_test() as pilot:
|
|
# Note the offsets to take into account the decoration around an
|
|
# Input.
|
|
await pilot.click(Input, Offset(click_at + 3, 1))
|
|
await pilot.pause()
|
|
assert pilot.app.query_one(Input).cursor_position == should_land
|
|
|
|
|
|
async def test_mouse_click_outwith():
|
|
"""Mouse clicks outside the input should not affect cursor position."""
|
|
async with InputApp(TEXT_SINGLE).run_test() as pilot:
|
|
pilot.app.query_one(Input).cursor_position = 3
|
|
assert pilot.app.query_one(Input).cursor_position == 3
|
|
await pilot.click(Input, Offset(0, 0))
|
|
await pilot.pause()
|
|
assert pilot.app.query_one(Input).cursor_position == 3
|