Skip to content

Fix incorrect template HTML tag rendering in src/html #2193

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
jviotti merged 1 commit into from
Jan 21, 2026
Merged

Fix incorrect template HTML tag rendering in src/html #2193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/core/html/include/sourcemeta/core/html_elements.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,23 @@ namespace sourcemeta::core::html {
return HTML(#name, std::move(attributes), true); \
}

#define HTML_CONTAINER_ELEMENT(name) \
#define HTML_CONTAINER_ELEMENT_NAMED(name, tag) \
inline auto name(HTMLAttributes attributes) -> HTML { \
return HTML(#name, std::move(attributes)); \
return HTML(#tag, std::move(attributes)); \
} \
template <typename... Children> \
inline auto name(HTMLAttributes attributes, Children &&...children) \
-> HTML { \
return HTML(#name, std::move(attributes), \
return HTML(#tag, std::move(attributes), \
std::forward<Children>(children)...); \
} \
template <typename... Children> \
inline auto name(Children &&...children) -> HTML { \
return HTML(#name, std::forward<Children>(children)...); \
return HTML(#tag, std::forward<Children>(children)...); \
}

#define HTML_CONTAINER_ELEMENT(name) HTML_CONTAINER_ELEMENT_NAMED(name, name)

#define HTML_COMPACT_ELEMENT(name) \
inline auto name(HTMLAttributes attributes) -> HTML { \
return HTML(#name, std::move(attributes)); \
Expand Down Expand Up @@ -433,11 +435,12 @@ HTML_CONTAINER_ELEMENT(summary)
HTML_CONTAINER_ELEMENT(slot)

/// @ingroup html
HTML_CONTAINER_ELEMENT(template_)
HTML_CONTAINER_ELEMENT_NAMED(template_, template)

#ifndef DOXYGEN
#undef HTML_VOID_ELEMENT
#undef HTML_CONTAINER_ELEMENT
#undef HTML_CONTAINER_ELEMENT_NAMED
#undef HTML_COMPACT_ELEMENT
#undef HTML_VOID_ATTR_ELEMENT
#endif
Expand Down
8 changes: 8 additions & 0 deletions test/html/html_encoder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,3 +435,11 @@ TEST(HTML_encoder, push_back_return_reference) {

EXPECT_EQ(&ref, &element);
}

TEST(HTML_encoder, template_element_tag_name) {
using namespace sourcemeta::core::html;

EXPECT_EQ(template_("Content").render(), "<template>Content</template>");
EXPECT_EQ(template_({{"id", "my-template"}}, "Content").render(),
"<template id=\"my-template\">Content</template>");
}