alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix map invalidation (#2129)

Browse Source 
* Invalidation logic

* comment and docstring

* changelog

* snapshot
This commit is contained in:
Will McGugan
2023-03-23 18:36:46 +00:00
committed by GitHub
parent 3fe04f7b2d
commit 11cf1f1d28
5 changed files with 199 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Issue with parsing action strings whose arguments contained quoted closing parenthesis https://github.com/Textualize/textual/pull/2112
- Issues with parsing action strings with tuple arguments https://github.com/Textualize/textual/pull/2112
- Fix for tabs not invalidating https://github.com/Textualize/textual/issues/2125
### Changed

10
src/textual/_compositor.py
View File

@@ -889,11 +889,15 @@ class Compositor:
"""Update a given widget in the composition.
Args:
console: Console instance.
widget: Widget to update.
widgets: Set of Widgets to update.
"""
self._full_map_invalidated = True
# If there are any *new* widgets we need to invalidate the full map
if not self._full_map_invalidated and not widgets.issubset(
self.visible_widgets.keys()
):
self._full_map_invalidated = True
regions: list[Region] = []
add_region = regions.append
get_widget = self.visible_widgets.__getitem__

160
tests/snapshot_tests/__snapshots__/test_snapshots.ambr
View File

@@ -18713,6 +18713,166 @@
'''
# ---
# name: test_tabs_invalidate
'''
<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-2444717977-matrix {
font-family: Fira Code, monospace;
font-size: 20px;
line-height: 24.4px;
font-variant-east-asian: full-width;
}
.terminal-2444717977-title {
font-size: 18px;
font-weight: bold;
font-family: arial;
}
.terminal-2444717977-r1 { fill: #c5c8c6 }
.terminal-2444717977-r2 { fill: #737373 }
.terminal-2444717977-r3 { fill: #e1e1e1;font-weight: bold }
.terminal-2444717977-r4 { fill: #474747 }
.terminal-2444717977-r5 { fill: #0178d4 }
.terminal-2444717977-r6 { fill: #0000ff }
.terminal-2444717977-r7 { fill: #e1e1e1 }
</style>
<defs>
<clipPath id="terminal-2444717977-clip-terminal">
<rect x="0" y="0" width="975.0" height="584.5999999999999" />
</clipPath>
<clipPath id="terminal-2444717977-line-0">
<rect x="0" y="1.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-1">
<rect x="0" y="25.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-2">
<rect x="0" y="50.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-3">
<rect x="0" y="74.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-4">
<rect x="0" y="99.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-5">
<rect x="0" y="123.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-6">
<rect x="0" y="147.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-7">
<rect x="0" y="172.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-8">
<rect x="0" y="196.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-9">
<rect x="0" y="221.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-10">
<rect x="0" y="245.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-11">
<rect x="0" y="269.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-12">
<rect x="0" y="294.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-13">
<rect x="0" y="318.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-14">
<rect x="0" y="343.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-15">
<rect x="0" y="367.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-16">
<rect x="0" y="391.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-17">
<rect x="0" y="416.3" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-18">
<rect x="0" y="440.7" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-19">
<rect x="0" y="465.1" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-20">
<rect x="0" y="489.5" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-line-21">
<rect x="0" y="513.9" width="976" height="24.65"/>
</clipPath>
<clipPath id="terminal-2444717977-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-2444717977-title" fill="#c5c8c6" text-anchor="middle" x="496" y="27">TabApp</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-2444717977-clip-terminal)">
<rect fill="#1e1e1e" x="0" y="1.5" width="97.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="97.6" y="1.5" width="97.6" 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="#1e1e1e" x="0" y="25.9" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="24.4" y="25.9" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="85.4" y="25.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="97.6" y="25.9" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="122" y="25.9" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" 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="#1e1e1e" x="0" y="50.3" width="109.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="109.8" y="50.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="122" y="50.3" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="183" y="50.3" width="12.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="#1e1e1e" x="0" y="74.7" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="12.2" y="74.7" width="951.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="963.8" y="74.7" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="99.1" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="12.2" y="99.1" width="951.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="963.8" y="99.1" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="123.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="12.2" y="123.5" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="36.6" y="123.5" width="61" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="97.6" y="123.5" width="841.8" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="939.4" y="123.5" width="24.4" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="963.8" y="123.5" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="147.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="12.2" y="147.9" width="951.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="963.8" y="147.9" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="0" y="172.3" width="12.2" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="12.2" y="172.3" width="951.6" height="24.65" shape-rendering="crispEdges"/><rect fill="#1e1e1e" x="963.8" y="172.3" width="12.2" 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="#1e1e1e" x="0" y="562.7" width="976" height="24.65" shape-rendering="crispEdges"/>
<g class="terminal-2444717977-matrix">
<text class="terminal-2444717977-r1" x="976" y="20" textLength="12.2" clip-path="url(#terminal-2444717977-line-0)">
</text><text class="terminal-2444717977-r2" x="24.4" y="44.4" textLength="61" clip-path="url(#terminal-2444717977-line-1)">Tab&#160;1</text><text class="terminal-2444717977-r3" x="122" y="44.4" textLength="61" clip-path="url(#terminal-2444717977-line-1)">Tab&#160;2</text><text class="terminal-2444717977-r1" x="976" y="44.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-1)">
</text><text class="terminal-2444717977-r4" x="0" y="68.8" textLength="109.8" clip-path="url(#terminal-2444717977-line-2)">━━━━━━━━━</text><text class="terminal-2444717977-r4" x="109.8" y="68.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-2)">╸</text><text class="terminal-2444717977-r5" x="122" y="68.8" textLength="61" clip-path="url(#terminal-2444717977-line-2)">━━━━━</text><text class="terminal-2444717977-r4" x="183" y="68.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-2)">╺</text><text class="terminal-2444717977-r4" x="195.2" y="68.8" textLength="780.8" clip-path="url(#terminal-2444717977-line-2)">━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━</text><text class="terminal-2444717977-r1" x="976" y="68.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-2)">
</text><text class="terminal-2444717977-r6" x="0" y="93.2" textLength="12.2" clip-path="url(#terminal-2444717977-line-3)">┌</text><text class="terminal-2444717977-r6" x="12.2" y="93.2" textLength="951.6" clip-path="url(#terminal-2444717977-line-3)">──────────────────────────────────────────────────────────────────────────────</text><text class="terminal-2444717977-r6" x="963.8" y="93.2" textLength="12.2" clip-path="url(#terminal-2444717977-line-3)">┐</text><text class="terminal-2444717977-r1" x="976" y="93.2" textLength="12.2" clip-path="url(#terminal-2444717977-line-3)">
</text><text class="terminal-2444717977-r6" x="0" y="117.6" textLength="12.2" clip-path="url(#terminal-2444717977-line-4)">│</text><text class="terminal-2444717977-r6" x="963.8" y="117.6" textLength="12.2" clip-path="url(#terminal-2444717977-line-4)">│</text><text class="terminal-2444717977-r1" x="976" y="117.6" textLength="12.2" clip-path="url(#terminal-2444717977-line-4)">
</text><text class="terminal-2444717977-r6" x="0" y="142" textLength="12.2" clip-path="url(#terminal-2444717977-line-5)">│</text><text class="terminal-2444717977-r7" x="36.6" y="142" textLength="61" clip-path="url(#terminal-2444717977-line-5)">world</text><text class="terminal-2444717977-r6" x="963.8" y="142" textLength="12.2" clip-path="url(#terminal-2444717977-line-5)">│</text><text class="terminal-2444717977-r1" x="976" y="142" textLength="12.2" clip-path="url(#terminal-2444717977-line-5)">
</text><text class="terminal-2444717977-r6" x="0" y="166.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-6)">│</text><text class="terminal-2444717977-r6" x="963.8" y="166.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-6)">│</text><text class="terminal-2444717977-r1" x="976" y="166.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-6)">
</text><text class="terminal-2444717977-r6" x="0" y="190.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-7)">└</text><text class="terminal-2444717977-r6" x="12.2" y="190.8" textLength="951.6" clip-path="url(#terminal-2444717977-line-7)">──────────────────────────────────────────────────────────────────────────────</text><text class="terminal-2444717977-r6" x="963.8" y="190.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-7)">┘</text><text class="terminal-2444717977-r1" x="976" y="190.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-7)">
</text><text class="terminal-2444717977-r1" x="976" y="215.2" textLength="12.2" clip-path="url(#terminal-2444717977-line-8)">
</text><text class="terminal-2444717977-r1" x="976" y="239.6" textLength="12.2" clip-path="url(#terminal-2444717977-line-9)">
</text><text class="terminal-2444717977-r1" x="976" y="264" textLength="12.2" clip-path="url(#terminal-2444717977-line-10)">
</text><text class="terminal-2444717977-r1" x="976" y="288.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-11)">
</text><text class="terminal-2444717977-r1" x="976" y="312.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-12)">
</text><text class="terminal-2444717977-r1" x="976" y="337.2" textLength="12.2" clip-path="url(#terminal-2444717977-line-13)">
</text><text class="terminal-2444717977-r1" x="976" y="361.6" textLength="12.2" clip-path="url(#terminal-2444717977-line-14)">
</text><text class="terminal-2444717977-r1" x="976" y="386" textLength="12.2" clip-path="url(#terminal-2444717977-line-15)">
</text><text class="terminal-2444717977-r1" x="976" y="410.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-16)">
</text><text class="terminal-2444717977-r1" x="976" y="434.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-17)">
</text><text class="terminal-2444717977-r1" x="976" y="459.2" textLength="12.2" clip-path="url(#terminal-2444717977-line-18)">
</text><text class="terminal-2444717977-r1" x="976" y="483.6" textLength="12.2" clip-path="url(#terminal-2444717977-line-19)">
</text><text class="terminal-2444717977-r1" x="976" y="508" textLength="12.2" clip-path="url(#terminal-2444717977-line-20)">
</text><text class="terminal-2444717977-r1" x="976" y="532.4" textLength="12.2" clip-path="url(#terminal-2444717977-line-21)">
</text><text class="terminal-2444717977-r1" x="976" y="556.8" textLength="12.2" clip-path="url(#terminal-2444717977-line-22)">
</text>
</g>
</g>
</svg>
'''
# ---
# name: test_textlog_max_lines
'''
<svg class="rich-terminal" viewBox="0 0 994 635.5999999999999" xmlns="http://www.w3.org/2000/svg">

24
tests/snapshot_tests/snapshot_apps/tabs_invalidate.py Normal file
View File

@@ -0,0 +1,24 @@
from textual.app import App, ComposeResult
from textual.widgets import Label, TabbedContent, TabPane
class TabApp(App):
CSS = """
TabPane {
border: solid blue;
}
"""
def compose(self) -> ComposeResult:
with TabbedContent():
with TabPane("Tab 1", id="tab-1"):
yield Label("hello")
yield Label("hello")
yield Label("hello")
with TabPane("Tab 2", id="tab-2"):
yield Label("world")
if __name__ == "__main__":
app = TabApp()
app.run()

7
tests/snapshot_tests/test_snapshots.py
View File

@@ -327,3 +327,10 @@ def test_table_markup(snap_compare):
def test_textlog_scroll(snap_compare):
assert snap_compare(SNAPSHOT_APPS_DIR / "textlog_scroll.py")
def test_tabs_invalidate(snap_compare):
assert snap_compare(
SNAPSHOT_APPS_DIR / "tabs_invalidate.py",
press=["tab", "right"],
)