-
-
Notifications
You must be signed in to change notification settings - Fork 494
feat: Add methods to store & restore UI component state #3208
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
Open
tobezdev
wants to merge
13
commits into
Pycord-Development:master
Choose a base branch
from
tobezdev:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+200
−1
Open
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
aa511db
feat(ui): add component instance APIs
tobezdev 658a63d
fix(ui): preserve row indexes in View.from_components
tobezdev 9157baa
test(ui): add component-instance roundtrip coverage
tobezdev 2b8b101
chore: add pycord MIT license text
tobezdev f25a326
Remove copyright line from MIT license
tobezdev 36eea75
docs(changelog): add this PR to changelog under unreleased > added
tobezdev 18d63e5
style(pre-commit): auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 1a19581
feat(core): add to_component_instances method
tobezdev 0186380
fix(ui views): update to_component_instances() to support
tobezdev 9d6c4b4
feat: update _generate_underlying()
tobezdev a5a7255
chore(tests): add new test for InputTextComponent
tobezdev 99a71ae
style(pre-commit): auto fixes from pre-commit.com hooks
pre-commit-ci[bot] a2ce3fd
Merge branch 'Pycord-Development:master' into master
tobezdev 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| """ | ||
| The MIT License (MIT) | ||
|
|
||
| Copyright (c) 2015-2021 Rapptz | ||
|
tobezdev marked this conversation as resolved.
Outdated
|
||
| Copyright (c) 2021-present Pycord Development | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a | ||
| copy of this software and associated documentation files (the "Software"), | ||
| to deal in the Software without restriction, including without limitation | ||
| the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| and/or sell copies of the Software, and to permit persons to whom the | ||
| Software is furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| DEALINGS IN THE SOFTWARE. | ||
| """ | ||
|
|
||
| import pytest | ||
|
|
||
| import discord | ||
| from discord.components import ActionRow as ActionRowComponent | ||
| from discord.components import Container as ContainerComponent | ||
|
|
||
|
|
||
| @pytest.mark.asyncio | ||
| async def test_view_component_instances_roundtrip(): | ||
| view = discord.ui.View(timeout=90.0) | ||
| view.add_item(discord.ui.Button(label="Primary", custom_id="primary")) | ||
| view.add_item(discord.ui.Button(label="Secondary", custom_id="secondary", row=1)) | ||
|
tobezdev marked this conversation as resolved.
|
||
|
|
||
| components = view.to_component_instances() | ||
|
|
||
| assert all(isinstance(component, ActionRowComponent) for component in components) | ||
|
|
||
| restored = discord.ui.View.from_components(components, timeout=30.0) | ||
|
|
||
| assert restored.timeout == 30.0 | ||
| assert restored.to_components() == view.to_components() | ||
|
|
||
|
|
||
| @pytest.mark.asyncio | ||
| async def test_designerview_component_instances_roundtrip(): | ||
| view = discord.ui.DesignerView(timeout=120.0) | ||
| view.add_item(discord.ui.TextDisplay("Top level text")) | ||
| view.add_item( | ||
| discord.ui.ActionRow( | ||
| discord.ui.Button(label="Inside row", custom_id="inside-row"), | ||
| ) | ||
| ) | ||
| view.add_item(discord.ui.Container(discord.ui.TextDisplay("Nested text"))) | ||
|
|
||
| components = view.to_component_instances() | ||
|
|
||
| assert any(isinstance(component, ContainerComponent) for component in components) | ||
|
|
||
| restored = discord.ui.DesignerView.from_components(components, timeout=None) | ||
|
|
||
| assert restored.timeout is None | ||
| assert restored.to_components() == view.to_components() | ||
|
|
||
|
|
||
| @pytest.mark.asyncio | ||
| async def test_existing_dict_roundtrip_unchanged(): | ||
| view = discord.ui.View(timeout=45.0) | ||
| view.add_item(discord.ui.Button(label="Dict path", custom_id="dict-path")) | ||
|
|
||
| payload = view.to_components() | ||
| restored = discord.ui.View.from_dict(payload, timeout=None) | ||
|
|
||
| assert restored.timeout is None | ||
| assert restored.to_components() == payload | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.