Skip to content

[Samples] More tooltip updates for samples #6499

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

Merged
RebeccaAnne merged 5 commits into from
Oct 6, 2021
Merged

[Samples] More tooltip updates for samples #6499

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
6bc7c6e
[Samples] More tooltip updates for samples
Oct 4, 2021
56efdb6
Merge branch 'main' into rebecch/tooltipsamples
Oct 4, 2021
1b30506
Add another tooltip
Oct 4, 2021
5ac23e1
Fix spacing issues
Oct 5, 2021
2531bff
Merge branch 'rebecch/tooltipsamples' of https://github.com/microsoft…
Oct 5, 2021
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
51 changes: 1 addition & 50 deletions samples/v1.0/Elements/Container.SelectAction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
"body": [
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"text": "Cool link"
}
],
"selectAction": {
"type": "Action.OpenUrl",
"url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
}
},
{
"type": "Container",
"style": "emphasis",
"items": [
{
"type": "TextBlock",
"text": "Emphasis link"
}
],
"selectAction": {
"type": "Action.OpenUrl",
"url": "https://msn.com"
}
},
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"text": "Submit action"
}
],
"selectAction": {
"type": "Action.Submit",
"title": "Submit action",
"data": {
"info": "My submit action data"
}
}
}
]
}
{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.0", "body": [ { "type": "Container", "items": [ { "type": "TextBlock", "text": "Cool link" } ], "selectAction": { "type": "Action.OpenUrl", "tooltip": "Go to a url", "url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ" } }, { "type": "Container", "style": "emphasis", "items": [ { "type": "TextBlock", "text": "Emphasis link" } ], "selectAction": { "type": "Action.OpenUrl", "tooltip": "Go to a different url", "url": "https://msn.com" } }, { "type": "Container", "items": [ { "type": "TextBlock", "text": "Submit action" } ], "selectAction": { "type": "Action.Submit", "tooltip": "Submit action", "data": { "info": "My submit action data" } } } ]}
Expand Down
1 change: 1 addition & 0 deletions samples/v1.2/Elements/Input.Text.InlineAction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"inlineAction": {
"type": "Action.OpenUrl",
"title": "Reply",
"tooltip": "Reply to this message",
"url": "https://adaptivecards.io"
}
}
Expand Down
6 changes: 3 additions & 3 deletions samples/v1.2/Tests/RichTextBlock.TextRun.SelectActions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"selectAction": {
"type": "Action.OpenUrl",
"url": "https://adaptivecards.io",
"title": "Default"
"tooltip": "Default"
}
},
{
Expand All @@ -62,7 +62,7 @@
"color": "warning",
"selectAction": {
"type": "Action.Submit",
"title": "Action.Submit",
"tooltip": "Action.Submit",
"data": {
"x": "hello world!"
}
Expand All @@ -79,7 +79,7 @@
"color": "accent",
"selectAction": {
"type": "Action.ToggleVisibility",
"title": "Toggle!",
"tooltip": "Toggle!",
"targetElements": [ "textToToggle", "imageToToggle", "imageToToggle2" ]
}
}
Expand Down
103 changes: 102 additions & 1 deletion samples/v1.5/Test/TooltipTestCard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,107 @@
"tooltip": "Tooltip",
"title": "Title"
}
},
{
"type": "RichTextBlock",
"inlines": [
{
"type": "TextRun",
"text": "RichTextBlock with SelectAction, Action has title and tooltip (tooltip should be used as tooltip).",
"color": "good",
"selectAction": {
"type": "Action.Submit",
"tooltip": "Tooltip",
"title": "Title"
}
},
{
"type": "TextRun",
"text": " -Should not trigger any actions- ",
"weight": "bolder"
},
{
"type": "TextRun",
"text": "RichTextBlock with SelectAction, Action has title and no tooltip (title should be used as tooltip).",
"color": "warning",
"selectAction": {
"type": "Action.Submit",
"title": "title",
"data": {
"x": "hello world!"
}
}
},
{
"type": "TextRun",
"text": " -Should not trigger any actions- ",
"weight": "bolder"
}
]
},
{
"type": "TextBlock",
"text": "Image has SelectAction. No title or tooltip (no tooltip)",
"weight": "bolder",
"wrap": true
},
{
"type": "Image",
"url": "https://adaptivecards.io/content/cats/1.png",
"size": "Large",
"altText": "Image Alt Text.",
"tooltip": "tooltip",
"selectAction": {
"type": "Action.Submit"
}
},
{
"type": "TextBlock",
"text": "Image has SelectAction. Action has title and tooltip. (tooltip should be used as tooltip)",
"weight": "bolder",
"wrap": true
},
{
"type": "Image",
"url": "https://adaptivecards.io/content/cats/1.png",
"size": "Large",
"altText": "Image Alt Text.",
"tooltip": "tooltip",
"selectAction": {
"type": "Action.Submit",
"title": "title",
"tooltip": "tooltip"
}
},
{
"type": "TextBlock",
"text": "Image has SelectAction. Action has title. (title should be used as tooltip)",
"weight": "bolder",
"wrap": true
},
{
"type": "Image",
"url": "https://adaptivecards.io/content/cats/1.png",
"size": "Large",
"altText": "Image Alt Text.",
"selectAction": {
"type": "Action.Submit",
"title": "title"
}
},
{
"type": "TextBlock",
"text": "Adaptive Card has SelectAction Action has tooltip. (tooltip should appear)",
"weight": "bolder",
"wrap": true
}
]
],
"selectAction": {
"type": "Action.Submit",
"title": "title",
"data": {
"Card Level Action?": "Yes"
},
"tooltip": "Card Level Tooltip"
}
}