Skip to content
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

Feature/carousel #6724

Merged
merged 30 commits into from
Nov 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f26e34d
Merge prototype branch (#6643)
almedina-ms Oct 26, 2021
5112e6a
Initial design (#6644)
jwoo-msft Oct 26, 2021
27f835c
Prototype clean up (#6651)
almedina-ms Oct 26, 2021
49f2c8d
removed cns css from header.ejs and removed css from prototype 0 (#6653)
jwoo-msft Oct 27, 2021
bb1f6b7
Fix support for unsupported elements (#6654)
almedina-ms Oct 27, 2021
441b151
Add support for autoplay (#6665)
almedina-ms Oct 29, 2021
29cce6b
Jwoo/feature/carousel 2 (#6673)
jwoo-msft Nov 2, 2021
69c0336
[Carousel] Added Host Config options (#6675)
jwoo-msft Nov 2, 2021
5c26477
fixed a11y tab index issue not being able to use space on pagination …
jwoo-msft Nov 2, 2021
d4c3446
Fix pause autoplay on hover (#6671)
almedina-ms Nov 4, 2021
90396f7
Fix package.json files (#6678)
almedina-ms Nov 5, 2021
7254eb0
Added carousel page id (#6690)
jwoo-msft Nov 5, 2021
e44fb81
[JS] Carousel schema changes (#6667)
paulcam206 Nov 5, 2021
cf6711f
[Styling] Update swiper style (#6664)
almedina-ms Nov 6, 2021
5f577c6
Fix addeventlisteners and focus not firing (#6704)
almedina-ms Nov 9, 2021
a87dd6d
[JS] Pin newer jest dependency for `adaptivecards` (#6702)
paulcam206 Nov 9, 2021
3a8b775
Jwoo/feature/remove properties (#6706)
jwoo-msft Nov 9, 2021
4734b5a
Updated package-lock.json after rebase
paulcam206 Nov 9, 2021
bb0c9d0
Fix CSS story for now
paulcam206 Nov 10, 2021
db63bea
UI Tests for carousel (#6707)
almedina-ms Nov 10, 2021
7aca4ca
Add timeout (#6718)
almedina-ms Nov 11, 2021
60e897c
Merge branch 'main' into feature/carousel
paulcam206 Nov 11, 2021
b696847
Carousel spec (#6698)
JeanRoca Nov 11, 2021
3c214c5
Fix minor Css changes for carousel (#6722)
almedina-ms Nov 11, 2021
b3d7da8
[JS][Carousel] Fixed sudden jump of carousel page when focused (#6720)
jwoo-msft Nov 11, 2021
20f673b
Updated RTL support for Carousel (#6723)
jwoo-msft Nov 11, 2021
69cb7b7
[JS][Carousel] Updated SubmitAction (#6728)
jwoo-msft Nov 12, 2021
a2c6b6e
Fix PR comments (#6727)
almedina-ms Nov 12, 2021
2a47457
[JS] Change how we produce/consume CSS (#6732)
paulcam206 Nov 13, 2021
0b35c8f
Merge branch 'main' into feature/carousel
paulcam206 Nov 13, 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
464 changes: 464 additions & 0 deletions samples/v1.6/Elements/Carousel.ScenarioCards.Timer.json

Large diffs are not rendered by default.

463 changes: 463 additions & 0 deletions samples/v1.6/Elements/Carousel.ScenarioCards.json

Large diffs are not rendered by default.

62 changes: 62 additions & 0 deletions samples/v1.6/Elements/Carousel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"$schema": "https://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.6",
"body": {
"type": "Carousel",
"timer": 5000,
"pages": [
{
"type": "CarouselPage",
"id": "firstCarouselPage",
"selectAction": {
"type": "Action.OpenUrl",
"title": "Click for more information about the first carousel page!",
"url": "https://adaptivecards.io/"
},
"items": [
{
"type": "Image",
"url": "https://adaptivecards.io/content/cats/1.png",
"size": "medium"
}
]
},
{
"type": "CarouselPage",
"id": "theSecondCarouselPage",
"items": [
{
"type": "Image",
"url": "https://adaptivecards.io/content/cats/2.png",
"size": "medium"
}
]
},
{
"type": "CarouselPage",
"id": "last-carousel-page",
"items": [
{
"type": "Image",
"url": "https://adaptivecards.io/content/cats/3.png",
"altText": "That's a cool cat!",
"size": "medium"
}
]
}
]
},
"actions": [
{
"type": "Action.OpenUrl",
"title": "See more",
"url": "https://adaptivecards.io"
},
{
"type": "Action.OpenUrl",
"title": "Another action",
"url": "https://adaptivecards.io"
}
]
}
202 changes: 202 additions & 0 deletions samples/v1.6/Tests/Carousel.ForbiddenActions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"$schema": "https://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.6",
"body": {
"type": "Carousel",
"pages": [
{
"type": "CarouselPage",
"id": "firstCarouselPage",
"items": [
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"text": "There should be no actions rendered below",
"wrap": true,
"id": "id1"
}
]
}
]
},
{
"type": "CarouselPage",
"id": "secondCarouselPage",
"items": [
{
"type": "RichTextBlock",
"inlines": [
"No action should be rendered here ",
{
"type": "TextRun",
"text": "this is a showcard action,",
"selectAction": {
"type": "Action.ShowCard",
"title": "Action.ShowCard",
"card": {
"type": "AdaptiveCard",
"body": [
{
"type": "TextBlock",
"text": "What do you think?"
}
],
"actions": [
{
"type": "Action.Submit",
"title": "Neat!"
}
]
}
}
},
{
"type": "TextRun",
"text": " and this is a toggle visibility action. ",
"selectAction": {
"type": "Action.ToggleVisibility",
"title": "Show!",
"targetElements": [
"id1"
]
}
}
]
}
]
},
{
"type": "CarouselPage",
"id": "thirdCarouselPage",
"items": [
{
"type": "TextBlock",
"wrap": true,
"text": "This card has Containers & Columns with SelectActions that should not be honoured"
},
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"wrap": true,
"text": "This is a container with ShowCard action"
}
],
"selectAction": {
"type": "Action.ShowCard",
"title": "Action.ShowCard",
"card": {
"type": "AdaptiveCard",
"body": [
{
"type": "TextBlock",
"text": "What do you think?"
}
]
}
}
},
{
"type": "Container",
"items": [
{
"type": "TextBlock",
"wrap": true,
"text": "This is a container with ToggleVisibility action"
}
],
"selectAction": {
"type": "Action.ToggleVisibility",
"title": "Show!",
"targetElements": [
"id1"
]
}
},
{
"type": "ColumnSet",
"columns": [
{
"type": "Column",
"items": [
{
"type": "TextBlock",
"wrap": true,
"text": "This is a container with ShowCard action"
}
],
"selectAction": {
"type": "Action.ShowCard",
"title": "Action.ShowCard",
"card": {
"type": "AdaptiveCard",
"body": [
{
"type": "TextBlock",
"text": "What do you think?"
}
]
}
}
}
]
},
{
"type": "ColumnSet",
"columns": [
{
"type": "Column",
"items": [
{
"type": "TextBlock",
"wrap": true,
"text": "This is a container with ToggleVisibility action"
}
],
"selectAction": {
"type": "Action.ToggleVisibility",
"title": "Show!",
"targetElements": [
"id1"
]
}
}
]
}
]
}
]
},
"actions": [
{
"type": "Action.ShowCard",
"title": "Action.ShowCard",
"card": {
"type": "AdaptiveCard",
"body": [
{
"type": "TextBlock",
"text": "What do you think?"
}
],
"actions": [
{
"type": "Action.Submit",
"title": "Neat!"
}
]
}
},
{
"type": "Action.ToggleVisibility",
"title": "Action.ToggleVisibility",
"targetElements": [
"id1"
]
}
]
}
95 changes: 95 additions & 0 deletions samples/v1.6/Tests/Carousel.ForbiddenElements.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{
"$schema": "https://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.6",
"body": {
"type": "Carousel",
"pages": [
{
"type": "CarouselPage",
"id": "firstCarouselPage",
"items": [
{
"type": "TextBlock",
"text": "List of forbidden items, no elements should be shown below besides TextBlock",
"wrap": true
},
{
"type": "TextBlock",
"text": "Input.Text"
},
{
"type": "Input.Text",
"id": "id1"
},
{
"type": "TextBlock",
"text": "Input.Number"
},
{
"type": "Input.Number",
"id": "id2"
},
{
"type": "TextBlock",
"text": "Input.ChoiceSet"
},
{
"type": "Input.ChoiceSet",
"id": "id3",
"choices": [
{
"title": "Red",
"value": "1"
},
{
"title": "Green",
"value": "2"
}
]
},
{
"type": "TextBlock",
"text": "Input.Date"
},
{
"type": "Input.Date",
"id": "id4"
},
{
"type": "TextBlock",
"text": "Input.Toggle"
},
{
"type": "Input.Toggle",
"id": "id5",
"title": "I accept the terms and agreements"
},
{
"type": "TextBlock",
"text": "Input.Time"
},
{
"type": "Input.Time",
"id": "id6"
},
{
"type": "TextBlock",
"text": "Media"
},
{
"type": "Media",
"poster": "https://adaptivecards.io/content/poster-video.png",
"id": "id7",
"sources": [
{
"mimeType": "video/mp4",
"url": "https://adaptivecardsblob.blob.core.windows.net/assets/AdaptiveCardsOverviewVideo.mp4"
}
]
}
]
}
]
}
}
Loading