-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Add title and sub-title to screens. #3199
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e48e014
Add title and sub-title to screens.
rodrigogiraoserrao 26e81c9
Test screen (sub-)title.
rodrigogiraoserrao c63072f
Link App (sub-)title to Screen respectives.
rodrigogiraoserrao 4ed93d4
Add screen_(sub_)title properties to header.
rodrigogiraoserrao 5ec3fea
Type Screen.(SUB_)TITLE as class var.
rodrigogiraoserrao 53125ec
Merge branch 'main' into screen-title-sub-title
rodrigogiraoserrao 5a15e9c
Add docstrings to properties.
rodrigogiraoserrao File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| from textual.app import App | ||
| from textual.screen import Screen | ||
| from textual.widgets import Header | ||
|
|
||
|
|
||
| async def test_screen_title_none_is_ignored(): | ||
| class MyScreen(Screen): | ||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| TITLE = "app title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test(): | ||
| assert app.query_one("HeaderTitle").text == "app title" | ||
|
|
||
|
|
||
| async def test_screen_title_overrides_app_title(): | ||
| class MyScreen(Screen): | ||
| TITLE = "screen title" | ||
|
|
||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| TITLE = "app title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test(): | ||
| assert app.query_one("HeaderTitle").text == "screen title" | ||
|
|
||
|
|
||
| async def test_screen_title_reactive_updates_title(): | ||
| class MyScreen(Screen): | ||
| TITLE = "screen title" | ||
|
|
||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| TITLE = "app title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test() as pilot: | ||
| app.screen.title = "new screen title" | ||
| await pilot.pause() | ||
| assert app.query_one("HeaderTitle").text == "new screen title" | ||
|
|
||
|
|
||
| async def test_app_title_reactive_does_not_update_title_when_screen_title_is_set(): | ||
| class MyScreen(Screen): | ||
| TITLE = "screen title" | ||
|
|
||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| TITLE = "app title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test() as pilot: | ||
| app.title = "new app title" | ||
| await pilot.pause() | ||
| assert app.query_one("HeaderTitle").text == "screen title" | ||
|
|
||
|
|
||
| async def test_screen_sub_title_none_is_ignored(): | ||
| class MyScreen(Screen): | ||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| SUB_TITLE = "app sub-title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test(): | ||
| assert app.query_one("HeaderTitle").sub_text == "app sub-title" | ||
|
|
||
|
|
||
| async def test_screen_sub_title_overrides_app_sub_title(): | ||
| class MyScreen(Screen): | ||
| SUB_TITLE = "screen sub-title" | ||
|
|
||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| SUB_TITLE = "app sub-title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test(): | ||
| assert app.query_one("HeaderTitle").sub_text == "screen sub-title" | ||
|
|
||
|
|
||
| async def test_screen_sub_title_reactive_updates_sub_title(): | ||
| class MyScreen(Screen): | ||
| SUB_TITLE = "screen sub-title" | ||
|
|
||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| SUB_TITLE = "app sub-title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test() as pilot: | ||
| app.screen.sub_title = "new screen sub-title" | ||
| await pilot.pause() | ||
| assert app.query_one("HeaderTitle").sub_text == "new screen sub-title" | ||
|
|
||
|
|
||
| async def test_app_sub_title_reactive_does_not_update_sub_title_when_screen_sub_title_is_set(): | ||
| class MyScreen(Screen): | ||
| SUB_TITLE = "screen sub-title" | ||
|
|
||
| def compose(self): | ||
| yield Header() | ||
|
|
||
| class MyApp(App): | ||
| SUB_TITLE = "app sub-title" | ||
|
|
||
| def on_mount(self): | ||
| self.push_screen(MyScreen()) | ||
|
|
||
| app = MyApp() | ||
| async with app.run_test() as pilot: | ||
| app.sub_title = "new app sub-title" | ||
| await pilot.pause() | ||
| assert app.query_one("HeaderTitle").sub_text == "screen sub-title" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Docstrings pls.
Could we make these computed reactives? That way you could watch
self.screen_titleThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See 5a15e9c for docstrings.
As per our conversation, we can't make them computed reactives because we can't trigger the compute method when the reactives on
ScreenorAppchange.