Skip to content

Commit

Permalink
Merge pull request #1699 from Textualize/auto-width-inputs
Browse files Browse the repository at this point in the history 
Auto width inputs
  • Loading branch information
@willmcgugan
willmcgugan authored Jan 31, 2023
2 parents f1f3e20 + e446695 commit fc22576
Show file tree
Hide file tree
Showing 5 changed files with 190 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Added a workaround for an apparent Windows Terminal paste issue https://github.com/Textualize/textual/issues/1661
- Fixes issue with renderable width calculation https://github.com/Textualize/textual/issues/1685
- Fixed issue with app not processing Paste event https://github.com/Textualize/textual/issues/1666
- Fixed glitch with view position with auto width inputs https://github.com/Textualize/textual/issues/1693

## [0.10.1] - 2023-01-20

Expand Down
1 change: 1 addition & 0 deletions src/textual/widgets/_input.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ def cursor_width(self) -> int:
return self._position_to_cell(len(self.value)) + 1

def render(self) -> RenderableType:
self.view_position = self.view_position
if not self.value:
placeholder = Text(self.placeholder, justify="left")
placeholder.stylize(self.get_component_rich_style("input--placeholder"))
Expand Down
160 changes: 160 additions & 0 deletions tests/snapshot_tests/__snapshots__/test_snapshots.ambr
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,163 @@
# name: test_auto_width_input
'''
<svg class="rich-terminal" viewBox="0 0 994 635.5999999999999" xmlns="http://www.w3.org/2000/svg">
<!-- Generated with Rich https://www.textualize.io -->
<style>

@font-face {
font-family: "Fira Code";
src: local("FiraCode-Regular"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff2/FiraCode-Regular.woff2") format("woff2"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff/FiraCode-Regular.woff") format("woff");
font-style: normal;
font-weight: 400;
}
@font-face {
font-family: "Fira Code";
src: local("FiraCode-Bold"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff2/FiraCode-Bold.woff2") format("woff2"),
url("https://cdnjs.cloudflare.com/ajax/libs/firacode/6.2.0/woff/FiraCode-Bold.woff") format("woff");
font-style: bold;
font-weight: 700;
}

.terminal-1625062503-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}

.terminal-1625062503-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}

.terminal-1625062503-r1 { fill: #c5c8c6 }
.terminal-1625062503-r2 { fill: #e3e3e3 }
.terminal-1625062503-r3 { fill: #1e1e1e }
.terminal-1625062503-r4 { fill: #0178d4 }
.terminal-1625062503-r5 { fill: #e1e1e1 }
.terminal-1625062503-r6 { fill: #e2e2e2 }
.terminal-1625062503-r7 { fill: #ddedf9 }
</style>

<defs>
<clipPath id="terminal-1625062503-clip-terminal">
<rect x="0" y="0" width="975.0" height="584.5999999999999" />
</clipPath>
<clipPath id="terminal-1625062503-line-0">
<rect x="0" y="1.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-1">
<rect x="0" y="25.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-2">
<rect x="0" y="50.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-3">
<rect x="0" y="74.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-4">
<rect x="0" y="99.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-5">
<rect x="0" y="123.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-6">
<rect x="0" y="147.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-7">
<rect x="0" y="172.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-8">
<rect x="0" y="196.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-9">
<rect x="0" y="221.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-10">
<rect x="0" y="245.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-11">
<rect x="0" y="269.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-12">
<rect x="0" y="294.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-13">
<rect x="0" y="318.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-14">
<rect x="0" y="343.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-15">
<rect x="0" y="367.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-16">
<rect x="0" y="391.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-17">
<rect x="0" y="416.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-18">
<rect x="0" y="440.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-19">
<rect x="0" y="465.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-20">
<rect x="0" y="489.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-21">
<rect x="0" y="513.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-1625062503-line-22">
<rect x="0" y="538.3" width="976" height="24.65"/>
</clipPath>
</defs>

<rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="992" height="633.6" rx="8"/><text class="terminal-1625062503-title" fill="#c5c8c6" text-anchor="middle" x="496" y="27">InputWidthAutoApp</text>
<g transform="translate(26,22)">
<circle cx="0" cy="0" r="7" fill="#ff5f57"/>
<circle cx="22" cy="0" r="7" fill="#febc2e"/>
<circle cx="44" cy="0" r="7" fill="#28c840"/>
</g>

<g transform="translate(9, 41)" clip-path="url(#terminal-1625062503-clip-terminal)">
<rect fill="#282828" x="0" y="1.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="12.2" y="1.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="24.4" y="1.5" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="85.4" y="1.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="97.6" y="1.5" width="268.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="366" y="1.5" width="207.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="573.4" y="1.5" width="280.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="854" y="1.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="866.2" y="1.5" width="0" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="866.2" y="1.5" width="97.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#282828" x="963.8" y="1.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#0178d4" x="0" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#262626" x="12.2" y="25.9" width="122" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="134.2" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="146.4" y="25.9" width="829.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#0178d4" x="0" y="50.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#262626" x="12.2" y="50.3" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#262626" x="36.6" y="50.3" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#e1e1e1" x="97.6" y="50.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#262626" x="109.8" y="50.3" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="134.2" y="50.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="146.4" y="50.3" width="829.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#0178d4" x="0" y="74.7" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#262626" x="12.2" y="74.7" width="122" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="134.2" y="74.7" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="146.4" y="74.7" width="829.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="99.1" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="123.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="147.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="172.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="196.7" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="221.1" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="245.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="269.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="294.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="318.7" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="343.1" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="367.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="391.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="416.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="440.7" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="465.1" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="489.5" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="513.9" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="538.3" width="976" height="24.65" shape-rendering="crispEdges"/><rect fill="#0178d4" x="0" y="562.7" width="976" height="24.65" shape-rendering="crispEdges"/>
<g class="terminal-1625062503-matrix">
<text class="terminal-1625062503-r2" x="12.2" y="20" textLength="12.2" clip-path="url(#terminal-1625062503-line-0)">⭘</text><text class="terminal-1625062503-r2" x="366" y="20" textLength="207.4" clip-path="url(#terminal-1625062503-line-0)">InputWidthAutoApp</text><text class="terminal-1625062503-r1" x="976" y="20" textLength="12.2" clip-path="url(#terminal-1625062503-line-0)">
</text><text class="terminal-1625062503-r3" x="0" y="44.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-1)">▊</text><text class="terminal-1625062503-r4" x="12.2" y="44.4" textLength="122" clip-path="url(#terminal-1625062503-line-1)">▔▔▔▔▔▔▔▔▔▔</text><text class="terminal-1625062503-r4" x="134.2" y="44.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-1)">▎</text><text class="terminal-1625062503-r1" x="976" y="44.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-1)">
</text><text class="terminal-1625062503-r3" x="0" y="68.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-2)">▊</text><text class="terminal-1625062503-r6" x="36.6" y="68.8" textLength="61" clip-path="url(#terminal-1625062503-line-2)">Hello</text><text class="terminal-1625062503-r4" x="134.2" y="68.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-2)">▎</text><text class="terminal-1625062503-r1" x="976" y="68.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-2)">
</text><text class="terminal-1625062503-r3" x="0" y="93.2" textLength="12.2" clip-path="url(#terminal-1625062503-line-3)">▊</text><text class="terminal-1625062503-r4" x="12.2" y="93.2" textLength="122" clip-path="url(#terminal-1625062503-line-3)">▁▁▁▁▁▁▁▁▁▁</text><text class="terminal-1625062503-r4" x="134.2" y="93.2" textLength="12.2" clip-path="url(#terminal-1625062503-line-3)">▎</text><text class="terminal-1625062503-r1" x="976" y="93.2" textLength="12.2" clip-path="url(#terminal-1625062503-line-3)">
</text><text class="terminal-1625062503-r1" x="976" y="117.6" textLength="12.2" clip-path="url(#terminal-1625062503-line-4)">
</text><text class="terminal-1625062503-r1" x="976" y="142" textLength="12.2" clip-path="url(#terminal-1625062503-line-5)">
</text><text class="terminal-1625062503-r1" x="976" y="166.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-6)">
</text><text class="terminal-1625062503-r1" x="976" y="190.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-7)">
</text><text class="terminal-1625062503-r1" x="976" y="215.2" textLength="12.2" clip-path="url(#terminal-1625062503-line-8)">
</text><text class="terminal-1625062503-r1" x="976" y="239.6" textLength="12.2" clip-path="url(#terminal-1625062503-line-9)">
</text><text class="terminal-1625062503-r1" x="976" y="264" textLength="12.2" clip-path="url(#terminal-1625062503-line-10)">
</text><text class="terminal-1625062503-r1" x="976" y="288.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-11)">
</text><text class="terminal-1625062503-r1" x="976" y="312.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-12)">
</text><text class="terminal-1625062503-r1" x="976" y="337.2" textLength="12.2" clip-path="url(#terminal-1625062503-line-13)">
</text><text class="terminal-1625062503-r1" x="976" y="361.6" textLength="12.2" clip-path="url(#terminal-1625062503-line-14)">
</text><text class="terminal-1625062503-r1" x="976" y="386" textLength="12.2" clip-path="url(#terminal-1625062503-line-15)">
</text><text class="terminal-1625062503-r1" x="976" y="410.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-16)">
</text><text class="terminal-1625062503-r1" x="976" y="434.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-17)">
</text><text class="terminal-1625062503-r1" x="976" y="459.2" textLength="12.2" clip-path="url(#terminal-1625062503-line-18)">
</text><text class="terminal-1625062503-r1" x="976" y="483.6" textLength="12.2" clip-path="url(#terminal-1625062503-line-19)">
</text><text class="terminal-1625062503-r1" x="976" y="508" textLength="12.2" clip-path="url(#terminal-1625062503-line-20)">
</text><text class="terminal-1625062503-r1" x="976" y="532.4" textLength="12.2" clip-path="url(#terminal-1625062503-line-21)">
</text><text class="terminal-1625062503-r1" x="976" y="556.8" textLength="12.2" clip-path="url(#terminal-1625062503-line-22)">
</text>
</g>
</g>
</svg>

'''
# ---
# name: test_buttons_render
'''
<svg class="rich-terminal" viewBox="0 0 994 635.5999999999999" xmlns="http://www.w3.org/2000/svg">
Expand Down
22 changes: 22 additions & 0 deletions tests/snapshot_tests/snapshot_apps/auto_width_input.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from textual.app import App, ComposeResult
from textual.containers import Vertical
from textual.widgets import Header, Footer, Label, Input


class InputWidthAutoApp(App[None]):

CSS = """
Input.auto {
width: auto;
max-width: 100%;
}
"""

def compose(self) -> ComposeResult:
yield Header()
yield Input(placeholder="This has auto width", classes="auto")
yield Footer()


if __name__ == "__main__":
InputWidthAutoApp().run()
6 changes: 6 additions & 0 deletions tests/snapshot_tests/test_snapshots.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,9 @@ def test_demo(snap_compare):
def test_label_widths(snap_compare):
"""Test renderable widths are calculate correctly."""
assert snap_compare(SNAPSHOT_APPS_DIR / "label_widths.py")


def test_auto_width_input(snap_compare):
assert snap_compare(
SNAPSHOT_APPS_DIR / "auto_width_input.py", press=["tab", *"Hello"]
)

0 comments on commit fc22576

Please sign in to comment.