Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(button): render with console markup #4331

Merged
merged 5 commits into from
Mar 30, 2024
Merged

fix(button): render with console markup #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ace58d
fix(button): render with console markup
TomJGooding Mar 24, 2024
caca848
Merge branch 'main' into fix-button-render-with-console-markup
TomJGooding Mar 25, 2024
7cca00d
update changelog
TomJGooding Mar 25, 2024
4b0b633
Merge branch 'main' into fix-button-render-with-console-markup
willmcgugan Mar 26, 2024
0d72f05
Merge branch 'main' into fix-button-render-with-console-markup
TomJGooding Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Exceptions inside `Widget.compose` or workers weren't bubbling up in tests https://github.com/Textualize/textual/issues/4282
- Fixed `Button` not rendering correctly with console markup https://github.com/Textualize/textual/issues/4328

### Added

Expand Down
2 changes: 1 addition & 1 deletion src/textual/widgets/_button.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def validate_label(self, label: TextType) -> Text:
def render(self) -> RenderResult:
assert isinstance(self.label, Text)
label = self.label.copy()
label.stylize(self.rich_style)
label.stylize_before(self.rich_style)
return HorizontalPad(
label,
1,
Expand Down
165 changes: 165 additions & 0 deletions tests/snapshot_tests/__snapshots__/test_snapshots.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2321,6 +2321,171 @@

'''
# ---
# name: test_button_with_console_markup
'''
<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-2679207537-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}

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

.terminal-2679207537-r1 { fill: #454a50 }
.terminal-2679207537-r2 { fill: #e1e1e1 }
.terminal-2679207537-r3 { fill: #c5c8c6 }
.terminal-2679207537-r4 { fill: #24292f;font-weight: bold }
.terminal-2679207537-r5 { fill: #24292f;font-weight: bold;font-style: italic; }
.terminal-2679207537-r6 { fill: #000000 }
.terminal-2679207537-r7 { fill: #e2e3e3;font-weight: bold }
.terminal-2679207537-r8 { fill: #f4005f;font-weight: bold;font-style: italic; }
.terminal-2679207537-r9 { fill: #303336 }
.terminal-2679207537-r10 { fill: #a7a7a7;font-weight: bold }
.terminal-2679207537-r11 { fill: #620909;font-weight: bold;font-style: italic; }
.terminal-2679207537-r12 { fill: #0f0f0f }
</style>

<defs>
<clipPath id="terminal-2679207537-clip-terminal">
<rect x="0" y="0" width="975.0" height="584.5999999999999" />
</clipPath>
<clipPath id="terminal-2679207537-line-0">
<rect x="0" y="1.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-1">
<rect x="0" y="25.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-2">
<rect x="0" y="50.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-3">
<rect x="0" y="74.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-4">
<rect x="0" y="99.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-5">
<rect x="0" y="123.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-6">
<rect x="0" y="147.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-7">
<rect x="0" y="172.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-8">
<rect x="0" y="196.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-9">
<rect x="0" y="221.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-10">
<rect x="0" y="245.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-11">
<rect x="0" y="269.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-12">
<rect x="0" y="294.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-13">
<rect x="0" y="318.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-14">
<rect x="0" y="343.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-15">
<rect x="0" y="367.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-16">
<rect x="0" y="391.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-17">
<rect x="0" y="416.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-18">
<rect x="0" y="440.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-19">
<rect x="0" y="465.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-20">
<rect x="0" y="489.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-line-21">
<rect x="0" y="513.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2679207537-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-2679207537-title" fill="#c5c8c6" text-anchor="middle" x="496" y="27">ButtonsWithMarkupApp</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-2679207537-clip-terminal)">
<rect fill="#24292f" x="0" y="1.5" width="195.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="195.2" y="1.5" width="780.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#e2e3e3" x="0" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#f4005f" x="12.2" y="25.9" width="85.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#e2e3e3" x="97.6" y="25.9" width="85.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#e2e3e3" x="183" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="195.2" y="25.9" width="780.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="0" y="50.3" width="195.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="195.2" y="50.3" width="780.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="0" y="74.7" width="195.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="195.2" y="74.7" width="780.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="0" y="99.1" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="12.2" y="99.1" width="85.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="97.6" y="99.1" width="85.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="183" y="99.1" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="195.2" y="99.1" width="780.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#24292f" x="0" y="123.5" width="195.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="195.2" y="123.5" width="780.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#202225" x="0" y="147.9" width="207.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="207.4" y="147.9" width="768.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#202225" x="0" y="172.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#202225" x="12.2" y="172.3" width="97.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#202225" x="109.8" y="172.3" width="85.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#202225" x="195.2" y="172.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="207.4" y="172.3" width="768.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#202225" x="0" y="196.7" width="207.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="207.4" y="196.7" width="768.6" 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="#1e1e1e" x="0" y="562.7" width="976" height="24.65" shape-rendering="crispEdges"/>
<g class="terminal-2679207537-matrix">
<text class="terminal-2679207537-r1" x="0" y="20" textLength="195.2" clip-path="url(#terminal-2679207537-line-0)">▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔</text><text class="terminal-2679207537-r3" x="976" y="20" textLength="12.2" clip-path="url(#terminal-2679207537-line-0)">
</text><text class="terminal-2679207537-r5" x="12.2" y="44.4" textLength="85.4" clip-path="url(#terminal-2679207537-line-1)">Focused</text><text class="terminal-2679207537-r4" x="97.6" y="44.4" textLength="85.4" clip-path="url(#terminal-2679207537-line-1)">&#160;Button</text><text class="terminal-2679207537-r3" x="976" y="44.4" textLength="12.2" clip-path="url(#terminal-2679207537-line-1)">
</text><text class="terminal-2679207537-r6" x="0" y="68.8" textLength="195.2" clip-path="url(#terminal-2679207537-line-2)">▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁</text><text class="terminal-2679207537-r3" x="976" y="68.8" textLength="12.2" clip-path="url(#terminal-2679207537-line-2)">
</text><text class="terminal-2679207537-r1" x="0" y="93.2" textLength="195.2" clip-path="url(#terminal-2679207537-line-3)">▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔</text><text class="terminal-2679207537-r3" x="976" y="93.2" textLength="12.2" clip-path="url(#terminal-2679207537-line-3)">
</text><text class="terminal-2679207537-r8" x="12.2" y="117.6" textLength="85.4" clip-path="url(#terminal-2679207537-line-4)">Blurred</text><text class="terminal-2679207537-r7" x="97.6" y="117.6" textLength="85.4" clip-path="url(#terminal-2679207537-line-4)">&#160;Button</text><text class="terminal-2679207537-r3" x="976" y="117.6" textLength="12.2" clip-path="url(#terminal-2679207537-line-4)">
</text><text class="terminal-2679207537-r6" x="0" y="142" textLength="195.2" clip-path="url(#terminal-2679207537-line-5)">▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁</text><text class="terminal-2679207537-r3" x="976" y="142" textLength="12.2" clip-path="url(#terminal-2679207537-line-5)">
</text><text class="terminal-2679207537-r9" x="0" y="166.4" textLength="207.4" clip-path="url(#terminal-2679207537-line-6)">▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔</text><text class="terminal-2679207537-r3" x="976" y="166.4" textLength="12.2" clip-path="url(#terminal-2679207537-line-6)">
</text><text class="terminal-2679207537-r11" x="12.2" y="190.8" textLength="97.6" clip-path="url(#terminal-2679207537-line-7)">Disabled</text><text class="terminal-2679207537-r10" x="109.8" y="190.8" textLength="85.4" clip-path="url(#terminal-2679207537-line-7)">&#160;Button</text><text class="terminal-2679207537-r3" x="976" y="190.8" textLength="12.2" clip-path="url(#terminal-2679207537-line-7)">
</text><text class="terminal-2679207537-r12" x="0" y="215.2" textLength="207.4" clip-path="url(#terminal-2679207537-line-8)">▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁</text><text class="terminal-2679207537-r3" x="976" y="215.2" textLength="12.2" clip-path="url(#terminal-2679207537-line-8)">
</text><text class="terminal-2679207537-r3" x="976" y="239.6" textLength="12.2" clip-path="url(#terminal-2679207537-line-9)">
</text><text class="terminal-2679207537-r3" x="976" y="264" textLength="12.2" clip-path="url(#terminal-2679207537-line-10)">
</text><text class="terminal-2679207537-r3" x="976" y="288.4" textLength="12.2" clip-path="url(#terminal-2679207537-line-11)">
</text><text class="terminal-2679207537-r3" x="976" y="312.8" textLength="12.2" clip-path="url(#terminal-2679207537-line-12)">
</text><text class="terminal-2679207537-r3" x="976" y="337.2" textLength="12.2" clip-path="url(#terminal-2679207537-line-13)">
</text><text class="terminal-2679207537-r3" x="976" y="361.6" textLength="12.2" clip-path="url(#terminal-2679207537-line-14)">
</text><text class="terminal-2679207537-r3" x="976" y="386" textLength="12.2" clip-path="url(#terminal-2679207537-line-15)">
</text><text class="terminal-2679207537-r3" x="976" y="410.4" textLength="12.2" clip-path="url(#terminal-2679207537-line-16)">
</text><text class="terminal-2679207537-r3" x="976" y="434.8" textLength="12.2" clip-path="url(#terminal-2679207537-line-17)">
</text><text class="terminal-2679207537-r3" x="976" y="459.2" textLength="12.2" clip-path="url(#terminal-2679207537-line-18)">
</text><text class="terminal-2679207537-r3" x="976" y="483.6" textLength="12.2" clip-path="url(#terminal-2679207537-line-19)">
</text><text class="terminal-2679207537-r3" x="976" y="508" textLength="12.2" clip-path="url(#terminal-2679207537-line-20)">
</text><text class="terminal-2679207537-r3" x="976" y="532.4" textLength="12.2" clip-path="url(#terminal-2679207537-line-21)">
</text><text class="terminal-2679207537-r3" x="976" y="556.8" textLength="12.2" clip-path="url(#terminal-2679207537-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
14 changes: 14 additions & 0 deletions tests/snapshot_tests/snapshot_apps/button_markup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from textual.app import App, ComposeResult
from textual.widgets import Button


class ButtonsWithMarkupApp(App):
def compose(self) -> ComposeResult:
yield Button("[italic red]Focused[/] Button")
yield Button("[italic red]Blurred[/] Button")
yield Button("[italic red]Disabled[/] Button", disabled=True)


if __name__ == "__main__":
app = ButtonsWithMarkupApp()
app.run()
4 changes: 4 additions & 0 deletions tests/snapshot_tests/test_snapshots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,3 +1170,7 @@ def test_button_widths(snap_compare):
def test_welcome(snap_compare):
assert snap_compare(SNAPSHOT_APPS_DIR / "welcome_widget.py")


def test_button_with_console_markup(snap_compare):
"""Regression test for https://github.com/Textualize/textual/issues/4328"""
assert snap_compare(SNAPSHOT_APPS_DIR / "button_markup.py")
Loading