diff --git a/samples/v1.0/Elements/Container.SelectAction.json b/samples/v1.0/Elements/Container.SelectAction.json index 630acbf58d..9975aa7d24 100644 --- a/samples/v1.0/Elements/Container.SelectAction.json +++ b/samples/v1.0/Elements/Container.SelectAction.json @@ -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" } } } ] } \ No newline at end of file diff --git a/samples/v1.2/Elements/Input.Text.InlineAction.json b/samples/v1.2/Elements/Input.Text.InlineAction.json index 8d9d28ed50..2ad2a63d74 100644 --- a/samples/v1.2/Elements/Input.Text.InlineAction.json +++ b/samples/v1.2/Elements/Input.Text.InlineAction.json @@ -20,6 +20,7 @@ "inlineAction": { "type": "Action.OpenUrl", "title": "Reply", + "tooltip": "Reply to this message", "url": "https://adaptivecards.io" } } diff --git a/samples/v1.2/Tests/RichTextBlock.TextRun.SelectActions.json b/samples/v1.2/Tests/RichTextBlock.TextRun.SelectActions.json index 471349da6b..9ea978a095 100644 --- a/samples/v1.2/Tests/RichTextBlock.TextRun.SelectActions.json +++ b/samples/v1.2/Tests/RichTextBlock.TextRun.SelectActions.json @@ -48,7 +48,7 @@ "selectAction": { "type": "Action.OpenUrl", "url": "https://adaptivecards.io", - "title": "Default" + "tooltip": "Default" } }, { @@ -62,7 +62,7 @@ "color": "warning", "selectAction": { "type": "Action.Submit", - "title": "Action.Submit", + "tooltip": "Action.Submit", "data": { "x": "hello world!" } @@ -79,7 +79,7 @@ "color": "accent", "selectAction": { "type": "Action.ToggleVisibility", - "title": "Toggle!", + "tooltip": "Toggle!", "targetElements": [ "textToToggle", "imageToToggle", "imageToToggle2" ] } } diff --git a/samples/v1.5/Test/TooltipTestCard.json b/samples/v1.5/Test/TooltipTestCard.json index 4941f684e8..7c79a33432 100644 --- a/samples/v1.5/Test/TooltipTestCard.json +++ b/samples/v1.5/Test/TooltipTestCard.json @@ -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" + } }