Skip to content

Commit 5d7ad5c

Browse files
gunndabadgunndabad
committed
WIP Short tag names
1 parent 0ab5378 commit 5d7ad5c

File tree

8 files changed

+87
-63
lines changed

8 files changed

+87
-63
lines changed

‎src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithActions.cshtml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
@page
22

33
<govuk-summary-list>
4-
<govuk-summary-list-row>
5-
<govuk-summary-list-row-key>
4+
<row>
5+
<key>
66
Name
7-
</govuk-summary-list-row-key>
8-
<govuk-summary-list-row-value>
7+
</key>
8+
<value>
99
Sarah Philips
10-
</govuk-summary-list-row-value>
11-
<govuk-summary-list-row-actions>
12-
<govuk-summary-list-row-action href="#" visually-hidden-text="name">Change</govuk-summary-list-row-action>
13-
</govuk-summary-list-row-actions>
14-
</govuk-summary-list-row>
15-
<govuk-summary-list-row>
16-
<govuk-summary-list-row-key>
10+
</value>
11+
<actions>
12+
<action href="#" visually-hidden-text="name">Change</action>
13+
</actions>
14+
</row>
15+
<row>
16+
<key>
1717
Date of birth
18-
</govuk-summary-list-row-key>
19-
<govuk-summary-list-row-value>
18+
</key>
19+
<value>
2020
5 January 1978
21-
</govuk-summary-list-row-value>
22-
<govuk-summary-list-row-actions>
23-
<govuk-summary-list-row-action href="#" visually-hidden-text="date of birth">Change</govuk-summary-list-row-action>
24-
</govuk-summary-list-row-actions>
25-
</govuk-summary-list-row>
26-
<govuk-summary-list-row>
27-
<govuk-summary-list-row-key>
21+
</value>
22+
<actions>
23+
<action href="#" visually-hidden-text="date of birth">Change</action>
24+
</actions>
25+
</row>
26+
<row>
27+
<key>
2828
Contact information
29-
</govuk-summary-list-row-key>
30-
<govuk-summary-list-row-value>
29+
</key>
30+
<value>
3131
72 Guild Street<br>London<br>SE23 6FH
32-
</govuk-summary-list-row-value>
33-
<govuk-summary-list-row-actions>
34-
<govuk-summary-list-row-action href="#" visually-hidden-text="contact information">Change</govuk-summary-list-row-action>
35-
</govuk-summary-list-row-actions>
36-
</govuk-summary-list-row>
37-
<govuk-summary-list-row>
38-
<govuk-summary-list-row-key>
32+
</value>
33+
<actions>
34+
<action href="#" visually-hidden-text="contact information">Change</action>
35+
</actions>
36+
</row>
37+
<row>
38+
<key>
3939
Contact details
40-
</govuk-summary-list-row-key>
41-
<govuk-summary-list-row-value>
40+
</key>
41+
<value>
4242
<p class="govuk-body">07700 900457</p><p class="govuk-body">sarah.phillips@example.com</p>
43-
</govuk-summary-list-row-value>
44-
<govuk-summary-list-row-actions>
45-
<govuk-summary-list-row-action href="#" visually-hidden-text="contact details">Change</govuk-summary-list-row-action>
46-
</govuk-summary-list-row-actions>
47-
</govuk-summary-list-row>
43+
</value>
44+
<actions>
45+
<action href="#" visually-hidden-text="contact details">Change</action>
46+
</actions>
47+
</row>
4848
</govuk-summary-list>

‎src/GovUk.Frontend.AspNetCore.DocSamples/Pages/SummaryList/SummaryListWithoutActions.cshtml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
@page
22

33
<govuk-summary-list>
4-
<govuk-summary-list-row>
5-
<govuk-summary-list-row-key>
4+
<row>
5+
<key>
66
Name
7-
</govuk-summary-list-row-key>
8-
<govuk-summary-list-row-value>
7+
</key>
8+
<value>
99
Sarah Philips
10-
</govuk-summary-list-row-value>
11-
</govuk-summary-list-row>
12-
<govuk-summary-list-row>
13-
<govuk-summary-list-row-key>
10+
</value>
11+
</row>
12+
<row>
13+
<key>
1414
Date of birth
15-
</govuk-summary-list-row-key>
16-
<govuk-summary-list-row-value>
15+
</key>
16+
<value>
1717
5 January 1978
18-
</govuk-summary-list-row-value>
19-
</govuk-summary-list-row>
20-
<govuk-summary-list-row>
21-
<govuk-summary-list-row-key>
18+
</value>
19+
</row>
20+
<row>
21+
<key>
2222
Contact information
23-
</govuk-summary-list-row-key>
24-
<govuk-summary-list-row-value>
23+
</key>
24+
<value>
2525
72 Guild Street<br>London<br>SE23 6FH
26-
</govuk-summary-list-row-value>
27-
</govuk-summary-list-row>
28-
<govuk-summary-list-row>
29-
<govuk-summary-list-row-key>
26+
</value>
27+
</row>
28+
<row>
29+
<key>
3030
Contact details
31-
</govuk-summary-list-row-key>
32-
<govuk-summary-list-row-value>
31+
</key>
32+
<value>
3333
<p class="govuk-body">07700 900457</p><p class="govuk-body">sarah.phillips@example.com</p>
34-
</govuk-summary-list-row-value>
35-
</govuk-summary-list-row>
34+
</value>
35+
</row>
3636
</govuk-summary-list>

‎src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionTagHelper.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
88
/// Represents an action in a GDS summary list row.
99
/// </summary>
1010
[HtmlTargetElement(TagName, ParentTag = SummaryListRowActionsTagHelper.TagName)]
11+
[HtmlTargetElement(TagName, ParentTag = SummaryListRowActionsTagHelper.ShortTagName)]
12+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowActionsTagHelper.TagName)]
13+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowActionsTagHelper.ShortTagName)]
1114
[OutputElementHint(ComponentGenerator.SummaryListRowActionElement)]
1215
public class SummaryListRowActionTagHelper : TagHelper
1316
{
1417
internal const string TagName = "govuk-summary-list-row-action";
18+
internal const string ShortTagName = "action";
1519

1620
private const string VisuallyHiddenTextAttributeName = "visually-hidden-text";
1721

‎src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowActionsTagHelper.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
88
/// Represents the actions wrapper in a GDS summary list component row.
99
/// </summary>
1010
[HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.TagName)]
11-
[RestrictChildren(SummaryListRowActionTagHelper.TagName)]
11+
[HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
12+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.TagName)]
13+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
14+
[RestrictChildren(SummaryListRowActionTagHelper.TagName, SummaryListRowActionTagHelper.ShortTagName)]
1215
[OutputElementHint(ComponentGenerator.SummaryListRowActionsElement)]
1316
public class SummaryListRowActionsTagHelper : TagHelper
1417
{
1518
internal const string TagName = "govuk-summary-list-row-actions";
19+
internal const string ShortTagName = "actions";
1620

1721
/// <summary>
1822
/// Creates a new <see cref="SummaryListRowActionsTagHelper"/>.

‎src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowKeyTagHelper.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
88
/// Represents the value in a GDS summary list component row.
99
/// </summary>
1010
[HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.TagName)]
11+
[HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
12+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.TagName)]
13+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
1114
[OutputElementHint(ComponentGenerator.SummaryListRowKeyElement)]
1215
public class SummaryListRowKeyTagHelper : TagHelper
1316
{
1417
internal const string TagName = "govuk-summary-list-row-key";
18+
internal const string ShortTagName = "key";
1519

1620
/// <inheritdoc/>
1721
public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)

‎src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowTagHelper.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
88
/// Represents a row in a GDS summary list component.
99
/// </summary>
1010
[HtmlTargetElement(TagName, ParentTag = SummaryListTagHelper.TagName)]
11-
[RestrictChildren(SummaryListRowKeyTagHelper.TagName, SummaryListRowValueTagHelper.TagName, SummaryListRowActionsTagHelper.TagName)]
11+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListTagHelper.TagName)]
12+
[RestrictChildren(
13+
SummaryListRowKeyTagHelper.TagName,
14+
SummaryListRowKeyTagHelper.ShortTagName,
15+
SummaryListRowValueTagHelper.TagName,
16+
SummaryListRowValueTagHelper.ShortTagName,
17+
SummaryListRowActionsTagHelper.TagName,
18+
SummaryListRowActionsTagHelper.ShortTagName)]
1219
[OutputElementHint(ComponentGenerator.SummaryListRowElement)]
1320
public class SummaryListRowTagHelper : TagHelper
1421
{
1522
internal const string TagName = "govuk-summary-list-row";
23+
internal const string ShortTagName = "row";
1624

1725
/// <inheritdoc/>
1826
public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)

‎src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListRowValueTagHelper.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
88
/// Represents the value in a GDS summary list component row.
99
/// </summary>
1010
[HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.TagName)]
11+
[HtmlTargetElement(TagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
12+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.TagName)]
13+
[HtmlTargetElement(ShortTagName, ParentTag = SummaryListRowTagHelper.ShortTagName)]
1114
[OutputElementHint(ComponentGenerator.SummaryListRowValueElement)]
1215
public class SummaryListRowValueTagHelper : TagHelper
1316
{
1417
internal const string TagName = "govuk-summary-list-row-value";
18+
internal const string ShortTagName = "value";
1519

1620
/// <inheritdoc/>
1721
public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)

‎src/GovUk.Frontend.AspNetCore/TagHelpers/SummaryListTagHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace GovUk.Frontend.AspNetCore.TagHelpers
99
/// Generates a GDS summary list component.
1010
/// </summary>
1111
[HtmlTargetElement(TagName)]
12-
[RestrictChildren(SummaryListRowTagHelper.TagName)]
12+
[RestrictChildren(SummaryListRowTagHelper.TagName, SummaryListRowTagHelper.ShortTagName)]
1313
[OutputElementHint(ComponentGenerator.SummaryListElement)]
1414
public class SummaryListTagHelper : TagHelper
1515
{

0 commit comments

Comments
 (0)