Skip to content

[iOS/Android/UWP/Shared] Fix handling of orphaned table child elements #6408

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
merged 7 commits into from
Sep 29, 2021
Merged

[iOS/Android/UWP/Shared] Fix handling of orphaned table child elements #6408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ba49df
[Shared] Fix parsing of `TableRow` and `TableCell` outside of `Table`
paulcam206 Sep 21, 2021
2c6f246
SWIG updates
paulcam206 Sep 24, 2021
11eb7f8
Fix up Android rendering
paulcam206 Sep 24, 2021
f46cb75
Fix up iOS
Sep 25, 2021
02dd4e3
Fix up UWP
paulcam206 Sep 25, 2021
acd1ccd
Merge branch 'main' into paulcam/orphaned-table-elements
paulcam206 Sep 27, 2021
5ca9706
Merge branch 'main' into paulcam/orphaned-table-elements
paulcam206 Sep 28, 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
282 changes: 141 additions & 141 deletions samples/v1.5/Elements/Table.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"cells": [
{
"type": "TableCell",
"style": "good",
"style": "good",
"items": [
{
"type": "TextBlock",
Expand All @@ -74,7 +74,7 @@
},
{
"type": "TableCell",
"style": "warning",
"style": "warning",
"items": [
{
"type": "TextBlock",
Expand All @@ -85,7 +85,7 @@
},
{
"type": "TableCell",
"style": "accent",
"style": "accent",
"items": [
{
"type": "TextBlock",
Expand All @@ -101,7 +101,7 @@
"cells": [
{
"type": "TableCell",
"style": "good",
"style": "good",
"items": [
{
"type": "TextBlock",
Expand All @@ -112,7 +112,7 @@
},
{
"type": "TableCell",
"style": "accent",
"style": "accent",
"items": [
{
"type": "TextBlock",
Expand All @@ -123,7 +123,7 @@
},
{
"type": "TableCell",
"style": "attention",
"style": "attention",
"items": [
{
"type": "TextBlock",
Expand All @@ -135,140 +135,140 @@
]
}
]
},
{
"type": "Table",
"gridStyle": "accent",
"firstRowAsHeaders": true,
"showGridLines" : false,
"columns": [
{
"width": 1
},
{
"width": 1
},
{
"width": 3
}
],
"rows": [
{
"type": "TableRow",
"cells": [
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Name",
"wrap": true,
"weight": "Bolder"
}
]
},
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Type",
"wrap": true,
"weight": "Bolder"
}
]
},
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Description",
"wrap": true,
"weight": "Bolder"
}
]
}
],
"style": "accent"
},
{
"type": "TableRow",
"cells": [
{
"type": "TableCell",
"style": "good",
"items": [
{
"type": "TextBlock",
"text": "columns",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "warning",
"items": [
{
"type": "TextBlock",
"text": "ColumnDefinition[]",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "accent",
"items": [
{
"type": "TextBlock",
"text": "Defines the table's columns (number of columns, and column sizes).",
"wrap": true
}
]
}
]
},
{
"type": "TableRow",
"cells": [
{
"type": "TableCell",
"style": "good",
"items": [
{
"type": "TextBlock",
"text": "rows",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "accent",
"items": [
{
"type": "TextBlock",
"text": "TableRow[]",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "attention",
"items": [
{
"type": "TextBlock",
"text": "Defines the rows of the Table, each being a collection of cells. Rows are not required, which allows empty Tables to be generated via templating without breaking the rendering of the whole card.",
"wrap": true
}
]
}
]
}
]
}
},
{
"type": "Table",
"gridStyle": "accent",
"firstRowAsHeaders": true,
"showGridLines" : false,
"columns": [
{
"width": 1
},
{
"width": 1
},
{
"width": 3
}
],
"rows": [
{
"type": "TableRow",
"cells": [
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Name",
"wrap": true,
"weight": "Bolder"
}
]
},
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Type",
"wrap": true,
"weight": "Bolder"
}
]
},
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Description",
"wrap": true,
"weight": "Bolder"
}
]
}
],
"style": "accent"
},
{
"type": "TableRow",
"cells": [
{
"type": "TableCell",
"style": "good",
"items": [
{
"type": "TextBlock",
"text": "columns",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "warning",
"items": [
{
"type": "TextBlock",
"text": "ColumnDefinition[]",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "accent",
"items": [
{
"type": "TextBlock",
"text": "Defines the table's columns (number of columns, and column sizes).",
"wrap": true
}
]
}
]
},
{
"type": "TableRow",
"cells": [
{
"type": "TableCell",
"style": "good",
"items": [
{
"type": "TextBlock",
"text": "rows",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "accent",
"items": [
{
"type": "TextBlock",
"text": "TableRow[]",
"wrap": true
}
]
},
{
"type": "TableCell",
"style": "attention",
"items": [
{
"type": "TextBlock",
"text": "Defines the rows of the Table, each being a collection of cells. Rows are not required, which allows empty Tables to be generated via templating without breaking the rendering of the whole card.",
"wrap": true
}
]
}
]
}
]
}
]
}
47 changes: 47 additions & 0 deletions samples/v1.5/Test/StandaloneTableRow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.5",
"body": [
{
"type": "TextBlock",
"text": "Below this is an empty TableRow not parented to a Table.",
"wrap": true
},
{
"type": "TableRow",
"horizontalContentAlignment": "center"
},
{
"type": "TextBlock",
"text": "Below this is a TableRow containing a cell, all of which is not parented to a Table.",
"wrap": true
},
{
"type": "TableRow",
"horizontalContentAlignment": "center",
"cells": [
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "TableCell inside an orphaned TableRow",
"wrap": true
}
]
}
]
},
{
"type": "TableCell",
"items": [
{
"type": "TextBlock",
"text": "Inside an orphaned TableCell",
"wrap": true
}
]
}
]
}
Loading