You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2025/03/04 16:42:57 UTC
(myfaces-tobago) branch main updated: fix: broken layout by non-pretty-print (#6116)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/main by this push:
new 311106a8c2 fix: broken layout by non-pretty-print (#6116)
311106a8c2 is described below
commit 311106a8c256632af6ee97a8fda70b2f22536b60
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Tue Mar 4 17:42:51 2025 +0100
fix: broken layout by non-pretty-print (#6116)
* fix: broken layout by non-pretty-print
issue: TOBAGO-2393
* fix: broken layout by non-pretty-print
issue: TOBAGO-2393
---
.../tobago/internal/webapp/HtmlResponseWriter.java | 8 +-
.../internal/webapp/TobagoResponseWriterBase.java | 36 +--
.../tobago/internal/webapp/XmlResponseWriter.java | 6 +-
.../myfaces/tobago/renderkit/TobagoRenderKit.java | 5 +-
.../internal/config/AbstractTobagoTestBase.java | 2 +-
.../webapp/TobagoResponseWriterUnitTest.java | 35 +--
.../renderer/badge/badge-data-attribute.html | 3 +-
.../src/test/resources/renderer/badge/badge.html | 3 +-
.../src/test/resources/renderer/bar/bar.html | 9 +-
.../resources/renderer/box/box-label-facet.html | 10 +-
.../src/test/resources/renderer/box/box-label.html | 10 +-
.../src/test/resources/renderer/box/simple.html | 4 +-
.../renderer/buttons/badge-inside-buttons.html | 6 +-
.../buttons/badgeWarning-inside-buttons.html | 6 +-
.../renderer/buttons/separator-inside-buttons.html | 21 +-
.../src/test/resources/renderer/date/dateAuto.html | 6 +-
.../src/test/resources/renderer/date/dateBoth.html | 6 +-
.../src/test/resources/renderer/date/dateDate.html | 6 +-
.../resources/renderer/date/dateFacetAfter.html | 8 +-
.../resources/renderer/date/dateFacetBefore.html | 8 +-
.../src/test/resources/renderer/date/dateTime.html | 6 +-
.../test/resources/renderer/date/dateTimeStep.html | 6 +-
.../resources/renderer/date/error-message.html | 14 +-
.../src/test/resources/renderer/date/help.html | 14 +-
.../resources/renderer/date/localDateAuto.html | 6 +-
.../resources/renderer/date/localDateTimeAuto.html | 6 +-
.../resources/renderer/date/localTimeAuto.html | 6 +-
.../src/test/resources/renderer/date/minMax.html | 6 +-
.../test/resources/renderer/date/testLabel.html | 8 +-
.../resources/renderer/date/testTodayButton.html | 10 +-
.../src/test/resources/renderer/date/text.html | 6 +-
.../resources/renderer/date/zonedDateTimeAuto.html | 6 +-
.../renderer/file/file-drop-zone-this.html | 14 +-
.../resources/renderer/file/file-drop-zone.html | 14 +-
.../test/resources/renderer/file/file-label.html | 16 +-
.../resources/renderer/file/file-validator.html | 16 +-
.../src/test/resources/renderer/in/ajax.html | 16 +-
.../resources/renderer/in/ajaxKeyupDelay1000.html | 5 +-
.../resources/renderer/in/ajaxKeyupDelayNone.html | 5 +-
.../resources/renderer/in/autocomplete-on.html | 3 +-
.../test/resources/renderer/in/error-message.html | 13 +-
.../src/test/resources/renderer/in/help.html | 13 +-
.../renderer/in/input-group-button-after.html | 8 +-
.../renderer/in/input-group-button-before.html | 8 +-
.../renderer/in/input-group-choice-after.html | 17 +-
.../renderer/in/input-group-dropdown-after.html | 18 +-
.../renderer/in/input-group-dropdown-before.html | 18 +-
.../renderer/in/input-group-out-after.html | 8 +-
.../renderer/in/input-group-out-before.html | 8 +-
.../test/resources/renderer/in/label-flexLeft.html | 5 +-
.../resources/renderer/in/label-flexRight.html | 5 +-
.../test/resources/renderer/in/label-flowLeft.html | 3 +-
.../resources/renderer/in/label-flowRight.html | 3 +-
.../resources/renderer/in/label-gridBottom.html | 17 +-
.../test/resources/renderer/in/label-gridLeft.html | 17 +-
.../resources/renderer/in/label-gridRight.html | 17 +-
.../test/resources/renderer/in/label-gridTop.html | 17 +-
.../src/test/resources/renderer/in/label-none.html | 3 +-
.../resources/renderer/in/label-segmentLeft.html | 14 +-
.../resources/renderer/in/label-segmentRight.html | 14 +-
.../src/test/resources/renderer/in/label-skip.html | 5 +-
.../src/test/resources/renderer/in/label-top.html | 5 +-
.../renderer/in/required-label-flexLeft.html | 5 +-
.../renderer/in/required-label-flexRight.html | 5 +-
.../renderer/in/required-label-flowLeft.html | 3 +-
.../renderer/in/required-label-flowRight.html | 3 +-
.../renderer/in/required-label-gridBottom.html | 17 +-
.../renderer/in/required-label-gridLeft.html | 17 +-
.../renderer/in/required-label-gridRight.html | 17 +-
.../renderer/in/required-label-gridTop.html | 17 +-
.../resources/renderer/in/required-label-none.html | 3 +-
.../renderer/in/required-label-segmentLeft.html | 14 +-
.../renderer/in/required-label-segmentRight.html | 14 +-
.../resources/renderer/in/required-label-top.html | 5 +-
.../src/test/resources/renderer/in/simple.html | 3 +-
.../resources/renderer/link/booleanInsideLink.html | 13 +-
.../resources/renderer/link/manyInsideLink.html | 23 +-
.../link/plainFormEmbeddingBooleanInsideLink.html | 16 +-
.../resources/renderer/link/radioInsideLink.html | 23 +-
.../renderer/link/separatorInsideLink.html | 13 +-
.../renderer/links/link-inside-links-sub.html | 17 +-
.../renderer/links/link-inside-links.html | 9 +-
.../test/resources/renderer/range/range-label.html | 7 +-
.../renderer/section/section-label-facet.html | 10 +-
.../resources/renderer/section/section-label.html | 12 +-
.../test/resources/renderer/section/simple.html | 10 +-
.../selectBooleanCheckboxError.html | 16 +-
.../selectBooleanCheckboxFatal.html | 16 +-
.../selectBooleanCheckboxInfo.html | 16 +-
.../selectBooleanCheckboxItemLabel.html | 8 +-
.../selectBooleanCheckboxLabel.html | 10 +-
.../selectBooleanCheckboxWarning.html | 16 +-
.../selectBooleanToggleItemLabel.html | 8 +-
.../selectBooleanToggleLabel.html | 10 +-
.../selectManyCheckboxFatal.html | 26 +-
.../selectManyCheckboxItemLabel.html | 18 +-
...ctManyCheckboxNoSelectionOptionNotRendered.html | 18 +-
...electManyCheckboxNoSelectionOptionRendered.html | 25 +-
.../selectManyList/selectManyListAjax.html | 52 ++--
.../renderer/selectManyShuttle/error-message.html | 50 ++--
.../resources/renderer/selectManyShuttle/help.html | 50 ++--
.../renderer/selectManyShuttle/label.html | 44 ++--
.../renderer/selectManyShuttle/simple.html | 42 ++-
.../selectOneChoice/selectOneChoiceLabel.html | 11 +-
...electOneChoiceNoSelectionOptionNotRendered.html | 8 +-
.../selectOneChoiceNoSelectionOptionRendered.html | 11 +-
.../renderer/selectOneList/selectOneListAjax.html | 51 ++--
.../selectOneRadio/selectOneRadioLabel.html | 20 +-
.../renderer/selectOneRadio/selectReference.html | 31 +--
.../resources/renderer/sheet/sheet-columns.html | 119 ++++-----
.../renderer/sheet/sheet-label-bar-facet.html | 65 ++---
.../renderer/sheet/sheet-paginatorList.html | 91 +++----
.../resources/renderer/sheet/sheet-paging.html | 127 ++++-----
.../src/test/resources/renderer/sheet/sheet.html | 63 ++---
.../resources/renderer/tabGroup/tabGroup-bar.html | 33 +--
.../renderer/tabGroup/tabGroup-label.html | 28 +-
.../test/resources/renderer/tabGroup/tabGroup.html | 28 +-
.../renderer/textarea/autocomplete-impp.html | 3 +-
.../resources/renderer/textarea/with-label.html | 5 +-
.../treeListbox/treeListbox-customClass.html | 66 ++---
.../renderer/treeListbox/treeListbox.html | 66 ++---
.../renderer/treeSelect/treeSelect-single.html | 290 +++++++++------------
122 files changed, 908 insertions(+), 1526 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
index 833e14c929..a2d4e68b73 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
@@ -38,12 +38,12 @@ public class HtmlResponseWriter extends TobagoResponseWriterBase {
@Deprecated(since = "4.3.0", forRemoval = true)
public HtmlResponseWriter(
final Writer writer, final String contentType, final String characterEncoding) {
- this(writer, contentType, Charset.forName(characterEncoding), true);
+ this(writer, contentType, Charset.forName(characterEncoding));
}
public HtmlResponseWriter(
- final Writer writer, final String contentType, final Charset charset, final boolean prettyPrint) {
- super(writer, contentType, charset, prettyPrint);
+ final Writer writer, final String contentType, final Charset charset) {
+ super(writer, contentType, charset);
this.helper = new HtmlWriterHelper(writer, charset);
}
@@ -98,7 +98,7 @@ protected void writerAttributeValue(final String value, final boolean escape) th
@Override
public ResponseWriter cloneWithWriter(final Writer originalWriter) {
- return new HtmlResponseWriter(originalWriter, getContentType(), getCharset(), isPrettyPrint());
+ return new HtmlResponseWriter(originalWriter, getContentType(), getCharset());
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
index be612403e0..826397eb53 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
@@ -49,6 +49,8 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
protected static final char[] XML_VERSION_1_0_ENCODING_UTF_8_CHARS = XML_VERSION_1_0_ENCODING_UTF_8.toCharArray();
+ private static final boolean COMPATIBLE = false;
+
private int level = 0;
private int inlineStack = 0;
@@ -64,20 +66,10 @@ public abstract class TobagoResponseWriterBase extends TobagoResponseWriter {
private final Charset charset;
- private final boolean prettyPrint;
-
- @Deprecated(since = "4.3.0", forRemoval = true)
- protected TobagoResponseWriterBase(final Writer writer, final String contentType, final String characterEncoding) {
- this(writer, contentType, characterEncoding != null ? Charset.forName(characterEncoding) : StandardCharsets.UTF_8,
- true);
- }
-
- protected TobagoResponseWriterBase(final Writer writer, final String contentType, final Charset charset,
- final boolean prettyPrint) {
+ protected TobagoResponseWriterBase(final Writer writer, final String contentType, final Charset charset) {
this.writer = writer;
this.contentType = contentType;
this.charset = charset != null ? charset : StandardCharsets.UTF_8;
- this.prettyPrint = prettyPrint;
}
protected final Writer getWriter() {
@@ -250,10 +242,6 @@ protected Charset getCharset() {
return charset;
}
- protected boolean isPrettyPrint() {
- return prettyPrint;
- }
-
@Override
public void startElement(final String name, final UIComponent currentComponent) throws IOException {
closeOpenTag();
@@ -294,11 +282,8 @@ protected void startElementInternal(final Writer sink, final String name, final
if (localElementInline) {
inlineStack++;
}
- if (prettyPrint && inlineStack <= 1) {
+ if (inlineStack <= 1) {
sink.write('\n');
- for (int i = 0; i < level; i++) {
- sink.write(' ');
- }
}
sink.write('<');
if (localElementName != null) {
@@ -359,12 +344,6 @@ public void endElement(final HtmlElements name) throws IOException {
public void writeComment(final Object obj) throws IOException {
closeOpenTag();
final String comment = obj.toString();
- if (prettyPrint) {
- writer.write('\n');
- for (int i = 0; i < level; i++) {
- writer.write(' ');
- }
- }
write("<!--");
write(comment);
write("-->");
@@ -427,11 +406,8 @@ protected void endElementInternal(final Writer sink, final String name, final bo
if (inline) {
sink.write("</");
} else {
- if (prettyPrint) {
- sink.write('\n');
- for (int i = 0; i < level; i++) {
- sink.write(' ');
- }
+ if (COMPATIBLE) {
+ sink.write("\n");
}
sink.write("</");
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
index e5c3056038..151716ea7d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
@@ -34,8 +34,8 @@ public final class XmlResponseWriter extends TobagoResponseWriterBase {
private final WriterHelper helper;
public XmlResponseWriter(
- final Writer writer, final String contentType, final Charset charset, boolean prettyPrint) {
- super(writer, contentType, charset, prettyPrint);
+ final Writer writer, final String contentType, final Charset charset) {
+ super(writer, contentType, charset);
this.helper = new HtmlWriterHelper(writer, charset);
}
@@ -81,7 +81,7 @@ protected void writerAttributeValue(final String value, final boolean escape) th
@Override
public ResponseWriter cloneWithWriter(final Writer originalWriter) {
- return new XmlResponseWriter(originalWriter, getContentType(), getCharset(), isPrettyPrint());
+ return new XmlResponseWriter(originalWriter, getContentType(), getCharset());
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
index 5b657cbae6..0671e665fd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderKit.java
@@ -86,14 +86,13 @@ public ResponseWriter createResponseWriter(
final FacesContext facesContext = FacesContext.getCurrentInstance();
final Charset charset = Charset.forName(characterEncoding);
TobagoResponseWriter responseWriter;
- boolean developmentMode = facesContext.isProjectStage(ProjectStage.Development);
if (facesContext.getPartialViewContext().isAjaxRequest()) {
- responseWriter = new XmlResponseWriter(writer, CONTENT_TYPE_TEXT_XML, charset, developmentMode);
+ responseWriter = new XmlResponseWriter(writer, CONTENT_TYPE_TEXT_XML, charset);
} else {
if (contentType != null && !contentType.contains(CONTENT_TYPE_TEXT_HTML)) {
LOG.warn("Content-Type '{}' not supported! Using '{}'", contentType, CONTENT_TYPE_TEXT_HTML);
}
- responseWriter = new HtmlResponseWriter(writer, CONTENT_TYPE_TEXT_HTML, charset, developmentMode);
+ responseWriter = new HtmlResponseWriter(writer, CONTENT_TYPE_TEXT_HTML, charset);
// XXX enable xhtml here, by hand:
// responseWriter = new XmlResponseWriter(writer, "application/xhtml+xml", characterEncoding);
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
index 2309960689..bb2ea31a1c 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
@@ -166,7 +166,7 @@ public void setUp() throws Exception {
super.setUp();
stringWriter = new StringWriter();
- getFacesContext().setResponseWriter(new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8, true));
+ getFacesContext().setResponseWriter(new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8));
// Tobago specific extensions
final TobagoConfig tobagoConfig = new TobagoConfig(
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
index 4af41a200e..9461e9f3a0 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.webapp;
-import jakarta.faces.render.Renderer;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.Tags;
import org.apache.myfaces.tobago.component.UIButton;
@@ -38,6 +37,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import jakarta.faces.render.Renderer;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
@@ -52,7 +52,7 @@ public class TobagoResponseWriterUnitTest extends AbstractTobagoTestBase {
public void setUp() throws Exception {
super.setUp();
stringWriter = new StringWriter();
- writer = new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8, true);
+ writer = new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8);
}
@Test
@@ -145,7 +145,7 @@ public void testManyChars() throws IOException {
@Test
public void testNonUtf8() throws IOException {
try (TobagoResponseWriter writer1
- = new HtmlResponseWriter(stringWriter, "", StandardCharsets.ISO_8859_1, true)) {
+ = new HtmlResponseWriter(stringWriter, "", StandardCharsets.ISO_8859_1)) {
writer1.startElement(HtmlElements.INPUT);
writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein über 100 €.", true);
writer1.writeAttribute(HtmlAttributes.READONLY, true);
@@ -156,38 +156,23 @@ public void testNonUtf8() throws IOException {
}
@Test
- public void testNonPrettyPrint() throws IOException {
- try (TobagoResponseWriter writer1
- = new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8, false)) {
- writer1.startElement(HtmlElements.P);
- writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein", true);
- writer1.writeAttribute(HtmlAttributes.READONLY, true);
- writer1.writeComment("Test");
- writer1.endElement(HtmlElements.P);
- }
- Assertions.assertEquals("<p value='Gutschein' readonly='readonly'><!--Test--></p>",
- stringWriter.toString());
- }
-
- @Test
- public void testPrettyPrint() throws IOException {
+ public void testComment() throws IOException {
try (TobagoResponseWriter writer1
- = new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8, true)) {
+ = new HtmlResponseWriter(stringWriter, "", StandardCharsets.UTF_8)) {
writer1.startElement(HtmlElements.P);
writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein", true);
writer1.writeAttribute(HtmlAttributes.READONLY, true);
writer1.writeComment("Test");
writer1.endElement(HtmlElements.P);
}
- Assertions.assertEquals("\n<p value='Gutschein' readonly='readonly'>\n <!--Test-->\n</p>",
+ Assertions.assertEquals("\n<p value='Gutschein' readonly='readonly'><!--Test--></p>",
stringWriter.toString());
}
-
@Test
public void testCharArray() throws IOException {
final TobagoResponseWriter xmlResponseWriter
- = new XmlResponseWriter(stringWriter, "text/xml", StandardCharsets.ISO_8859_1, true);
+ = new XmlResponseWriter(stringWriter, "text/xml", StandardCharsets.ISO_8859_1);
xmlResponseWriter.writeText("123".toCharArray(), 0, 3);
Assertions.assertEquals("123", stringWriter.toString());
}
@@ -243,7 +228,7 @@ public void testPassthroughChangeElementTagInRender() throws IOException {
c.getPassThroughAttributes().put(Renderer.PASSTHROUGH_RENDERER_LOCALNAME_KEY, HtmlElements.TEXTAREA.getValue());
c.encodeAll(facesContext);
Assertions.assertEquals("\n<tobago-in id='id' class='tobago-auto-spacing'>\n"
- + " <textarea type='text' name='id' id='id::field' class='form-control' test='1'></textarea>\n"
+ + "<textarea type='text' name='id' id='id::field' class='form-control' test='1'></textarea>"
+ "</tobago-in>", getLastWritten());
}
@@ -256,7 +241,7 @@ public void testPassthroughWithTextareaRenderer() throws IOException {
c.getPassThroughAttributes().put("spellcheck", true);
c.encodeAll(facesContext);
Assertions.assertEquals("\n<tobago-textarea id='id' class='tobago-auto-spacing'>\n"
- + " <textarea name='id' id='id::field' class='form-control' spellcheck></textarea>\n"
+ + "<textarea name='id' id='id::field' class='form-control' spellcheck></textarea>"
+ "</tobago-textarea>", getLastWritten());
}
@@ -268,7 +253,7 @@ public void testPassthroughWithImgRenderer() throws IOException {
c.getPassThroughAttributes().put("spellcheck", true);
c.encodeAll(facesContext);
Assertions.assertEquals("\n<tobago-image id='id'>\n"
- + " <img alt='' spellcheck>\n"
+ + "<img alt='' spellcheck>"
+ "</tobago-image>", getLastWritten());
}
diff --git a/tobago-core/src/test/resources/renderer/badge/badge-data-attribute.html b/tobago-core/src/test/resources/renderer/badge/badge-data-attribute.html
index 388285a466..4380724fd9 100644
--- a/tobago-core/src/test/resources/renderer/badge/badge-data-attribute.html
+++ b/tobago-core/src/test/resources/renderer/badge/badge-data-attribute.html
@@ -16,5 +16,4 @@
-->
<tobago-badge id='id' class='badge' data-color='#00ff00'>
- <span>Text</span>
-</tobago-badge>
+<span>Text</span></tobago-badge>
diff --git a/tobago-core/src/test/resources/renderer/badge/badge.html b/tobago-core/src/test/resources/renderer/badge/badge.html
index 7ee968bdb8..96f488f2b9 100644
--- a/tobago-core/src/test/resources/renderer/badge/badge.html
+++ b/tobago-core/src/test/resources/renderer/badge/badge.html
@@ -16,5 +16,4 @@
-->
<tobago-badge id='id' class='badge'>
- <span>Text</span>
-</tobago-badge>
+<span>Text</span></tobago-badge>
diff --git a/tobago-core/src/test/resources/renderer/bar/bar.html b/tobago-core/src/test/resources/renderer/bar/bar.html
index 72af6629ea..b060f0df2e 100644
--- a/tobago-core/src/test/resources/renderer/bar/bar.html
+++ b/tobago-core/src/test/resources/renderer/bar/bar.html
@@ -16,9 +16,6 @@
-->
<tobago-bar id='id' class='navbar navbar-expand' role='navigation'>
- <div class='container-fluid'>
- <button type='button' class='navbar-toggler' data-toggle='collapse' data-target='#id::navbar' aria-expanded='false' aria-controls='id::navbar' aria-label='Toggle navigation'><span class='navbar-toggler-icon'></span></button>
- <div id='id::navbar' class='collapse navbar-collapse align-items-center'>
- </div>
- </div>
-</tobago-bar>
\ No newline at end of file
+<div class='container-fluid'>
+<button type='button' class='navbar-toggler' data-toggle='collapse' data-target='#id::navbar' aria-expanded='false' aria-controls='id::navbar' aria-label='Toggle navigation'><span class='navbar-toggler-icon'></span></button>
+<div id='id::navbar' class='collapse navbar-collapse align-items-center'></div></div></tobago-bar>
diff --git a/tobago-core/src/test/resources/renderer/box/box-label-facet.html b/tobago-core/src/test/resources/renderer/box/box-label-facet.html
index 06f8a622af..4191275e8d 100644
--- a/tobago-core/src/test/resources/renderer/box/box-label-facet.html
+++ b/tobago-core/src/test/resources/renderer/box/box-label-facet.html
@@ -16,10 +16,6 @@
-->
<tobago-box class='card tobago-auto-spacing' id='id'>
- <div class='card-header tobago-box-header'>
- <h3>label
- </h3>
- </div>
- <div class='card-body'>
- </div>
-</tobago-box>
\ No newline at end of file
+<div class='card-header tobago-box-header'>
+<h3>label</h3></div>
+<div class='card-body'></div></tobago-box>
diff --git a/tobago-core/src/test/resources/renderer/box/box-label.html b/tobago-core/src/test/resources/renderer/box/box-label.html
index 06f8a622af..4191275e8d 100644
--- a/tobago-core/src/test/resources/renderer/box/box-label.html
+++ b/tobago-core/src/test/resources/renderer/box/box-label.html
@@ -16,10 +16,6 @@
-->
<tobago-box class='card tobago-auto-spacing' id='id'>
- <div class='card-header tobago-box-header'>
- <h3>label
- </h3>
- </div>
- <div class='card-body'>
- </div>
-</tobago-box>
\ No newline at end of file
+<div class='card-header tobago-box-header'>
+<h3>label</h3></div>
+<div class='card-body'></div></tobago-box>
diff --git a/tobago-core/src/test/resources/renderer/box/simple.html b/tobago-core/src/test/resources/renderer/box/simple.html
index 547c5e6c43..255a33e13b 100644
--- a/tobago-core/src/test/resources/renderer/box/simple.html
+++ b/tobago-core/src/test/resources/renderer/box/simple.html
@@ -16,6 +16,4 @@
-->
<tobago-box class='card tobago-auto-spacing' id='id'>
- <div class='card-body'>
- </div>
-</tobago-box>
\ No newline at end of file
+<div class='card-body'></div></tobago-box>
diff --git a/tobago-core/src/test/resources/renderer/buttons/badge-inside-buttons.html b/tobago-core/src/test/resources/renderer/buttons/badge-inside-buttons.html
index 5979e2f2da..386b05e623 100644
--- a/tobago-core/src/test/resources/renderer/buttons/badge-inside-buttons.html
+++ b/tobago-core/src/test/resources/renderer/buttons/badge-inside-buttons.html
@@ -16,7 +16,5 @@
-->
<tobago-buttons id='list' class='btn-group tobago-auto-spacing' role='group'>
- <tobago-badge id='badge' class='badge btn'>
- </tobago-badge>
- <button type='button' id='id' name='id' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='id'></tobago-behavior><span>button</span></button>
-</tobago-buttons>
+<tobago-badge id='badge' class='badge btn'></tobago-badge>
+<button type='button' id='id' name='id' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='id'></tobago-behavior><span>button</span></button></tobago-buttons>
diff --git a/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html b/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html
index 9ff17d9e8a..2529e402c7 100644
--- a/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html
+++ b/tobago-core/src/test/resources/renderer/buttons/badgeWarning-inside-buttons.html
@@ -16,7 +16,5 @@
-->
<tobago-buttons id='list' class='btn-group tobago-auto-spacing' role='group'>
- <tobago-badge id='badge' class='badge text-bg-warning btn'>
- </tobago-badge>
- <button type='button' id='id' name='id' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='id'></tobago-behavior><span>button</span></button>
-</tobago-buttons>
+<tobago-badge id='badge' class='badge text-bg-warning btn'></tobago-badge>
+<button type='button' id='id' name='id' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='id'></tobago-behavior><span>button</span></button></tobago-buttons>
diff --git a/tobago-core/src/test/resources/renderer/buttons/separator-inside-buttons.html b/tobago-core/src/test/resources/renderer/buttons/separator-inside-buttons.html
index 4df742b525..2815f9c890 100644
--- a/tobago-core/src/test/resources/renderer/buttons/separator-inside-buttons.html
+++ b/tobago-core/src/test/resources/renderer/buttons/separator-inside-buttons.html
@@ -18,16 +18,11 @@
CSS class of "tobago-dropdown" has changed from btn-group to dropdown
-->
<tobago-buttons id='list' class='btn-group tobago-auto-spacing' role='group'>
- <tobago-dropdown id='id' class='dropdown btn-group'>
- <button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-button btn btn-secondary dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>button</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
- <button type='button' id='sub1' name='sub1' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub1'></tobago-behavior><span>sub1</span></button>
- <tobago-separator id='separator1' class='dropdown-divider'>
- </tobago-separator>
- <button type='button' id='sub2' name='sub2' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub2'></tobago-behavior><span>sub2</span></button>
- <tobago-separator id='separator2' class='dropdown-divider'>
- </tobago-separator>
- <button type='button' id='sub3' name='sub3' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub3'></tobago-behavior><span>sub3</span></button>
- </div>
- </tobago-dropdown>
-</tobago-buttons>
+<tobago-dropdown id='id' class='dropdown btn-group'>
+<button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-button btn btn-secondary dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>button</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
+<button type='button' id='sub1' name='sub1' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub1'></tobago-behavior><span>sub1</span></button>
+<tobago-separator id='separator1' class='dropdown-divider'></tobago-separator>
+<button type='button' id='sub2' name='sub2' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub2'></tobago-behavior><span>sub2</span></button>
+<tobago-separator id='separator2' class='dropdown-divider'></tobago-separator>
+<button type='button' id='sub3' name='sub3' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub3'></tobago-behavior><span>sub3</span></button></div></tobago-dropdown></tobago-buttons>
diff --git a/tobago-core/src/test/resources/renderer/date/dateAuto.html b/tobago-core/src/test/resources/renderer/date/dateAuto.html
index 0099f46ffa..491016555b 100644
--- a/tobago-core/src/test/resources/renderer/date/dateAuto.html
+++ b/tobago-core/src/test/resources/renderer/date/dateAuto.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/dateBoth.html b/tobago-core/src/test/resources/renderer/date/dateBoth.html
index e92a6563de..3149d631de 100644
--- a/tobago-core/src/test/resources/renderer/date/dateBoth.html
+++ b/tobago-core/src/test/resources/renderer/date/dateBoth.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='datetime-local' name='id' id='id::field' value='1957-10-04T19:28:34' max='9999-12-31T23:59' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='datetime-local' name='id' id='id::field' value='1957-10-04T19:28:34' max='9999-12-31T23:59' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/dateDate.html b/tobago-core/src/test/resources/renderer/date/dateDate.html
index 0099f46ffa..491016555b 100644
--- a/tobago-core/src/test/resources/renderer/date/dateDate.html
+++ b/tobago-core/src/test/resources/renderer/date/dateDate.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/dateFacetAfter.html b/tobago-core/src/test/resources/renderer/date/dateFacetAfter.html
index 89d064ad08..2332e64a96 100644
--- a/tobago-core/src/test/resources/renderer/date/dateFacetAfter.html
+++ b/tobago-core/src/test/resources/renderer/date/dateFacetAfter.html
@@ -16,8 +16,6 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'>
- <tobago-out id='out'><span class='form-control-plaintext'>after</span></tobago-out>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'>
+<tobago-out id='out'><span class='form-control-plaintext'>after</span></tobago-out></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/dateFacetBefore.html b/tobago-core/src/test/resources/renderer/date/dateFacetBefore.html
index 325db9f0d0..915d6e2b90 100644
--- a/tobago-core/src/test/resources/renderer/date/dateFacetBefore.html
+++ b/tobago-core/src/test/resources/renderer/date/dateFacetBefore.html
@@ -16,8 +16,6 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <tobago-out id='out'><span class='form-control-plaintext'>before</span></tobago-out>
- <input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<tobago-out id='out'><span class='form-control-plaintext'>before</span></tobago-out>
+<input type='date' name='id' id='id::field' value='1957-10-04' max='9999-12-31' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/dateTime.html b/tobago-core/src/test/resources/renderer/date/dateTime.html
index 6257d0bd36..901dc0f92b 100644
--- a/tobago-core/src/test/resources/renderer/date/dateTime.html
+++ b/tobago-core/src/test/resources/renderer/date/dateTime.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='time' name='id' id='id::field' value='19:28:34' class='form-control'>
- </div>
-</tobago-date>
\ No newline at end of file
+<div class='input-group'>
+<input type='time' name='id' id='id::field' value='19:28:34' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/dateTimeStep.html b/tobago-core/src/test/resources/renderer/date/dateTimeStep.html
index 8668060dd1..cf51557e18 100644
--- a/tobago-core/src/test/resources/renderer/date/dateTimeStep.html
+++ b/tobago-core/src/test/resources/renderer/date/dateTimeStep.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='time' step='0.001' name='id' id='id::field' value='19:28:34.123' class='form-control'>
- </div>
-</tobago-date>
\ No newline at end of file
+<div class='input-group'>
+<input type='time' step='0.001' name='id' id='id::field' value='19:28:34.123' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/error-message.html b/tobago-core/src/test/resources/renderer/date/error-message.html
index 87a9e628a7..8d6fe7f8a5 100644
--- a/tobago-core/src/test/resources/renderer/date/error-message.html
+++ b/tobago-core/src/test/resources/renderer/date/error-message.html
@@ -16,12 +16,8 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' title='a test' max='9999-12-31' class='is-error form-control' autofocus='autofocus'>
- </div>
- <tobago-popover label='Error' value='a test'>
- <a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-date>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' title='a test' max='9999-12-31' class='is-error form-control' autofocus='autofocus'></div>
+<tobago-popover label='Error' value='a test'>
+<a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/help.html b/tobago-core/src/test/resources/renderer/date/help.html
index 138a2ac6a1..5515e1a67b 100644
--- a/tobago-core/src/test/resources/renderer/date/help.html
+++ b/tobago-core/src/test/resources/renderer/date/help.html
@@ -16,12 +16,8 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'>
- </div>
- <tobago-popover label='Help' value='Help!'>
- <a tabindex='0' role='button' class='btn btn-outline-info'><i class='bi-question-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-date>
+<div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'></div>
+<tobago-popover label='Help' value='Help!'>
+<a tabindex='0' role='button' class='btn btn-outline-info'><i class='bi-question-lg'></i></a></tobago-popover></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/localDateAuto.html b/tobago-core/src/test/resources/renderer/date/localDateAuto.html
index 49ce3ba9e8..21e3c41ea3 100644
--- a/tobago-core/src/test/resources/renderer/date/localDateAuto.html
+++ b/tobago-core/src/test/resources/renderer/date/localDateAuto.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/localDateTimeAuto.html b/tobago-core/src/test/resources/renderer/date/localDateTimeAuto.html
index d623de883c..44cbccd8ce 100644
--- a/tobago-core/src/test/resources/renderer/date/localDateTimeAuto.html
+++ b/tobago-core/src/test/resources/renderer/date/localDateTimeAuto.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='datetime-local' name='id' id='id::field' value='1957-10-05T00:28' max='9999-12-31T23:59' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='datetime-local' name='id' id='id::field' value='1957-10-05T00:28' max='9999-12-31T23:59' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/localTimeAuto.html b/tobago-core/src/test/resources/renderer/date/localTimeAuto.html
index f7d10922e4..8f7b3abaea 100644
--- a/tobago-core/src/test/resources/renderer/date/localTimeAuto.html
+++ b/tobago-core/src/test/resources/renderer/date/localTimeAuto.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='time' name='id' id='id::field' value='00:28' class='form-control'>
- </div>
-</tobago-date>
\ No newline at end of file
+<div class='input-group'>
+<input type='time' name='id' id='id::field' value='00:28' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/minMax.html b/tobago-core/src/test/resources/renderer/date/minMax.html
index 9dc4fcd50a..9c4a95f6d9 100644
--- a/tobago-core/src/test/resources/renderer/date/minMax.html
+++ b/tobago-core/src/test/resources/renderer/date/minMax.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-05' min='1957-09-05' max='1957-11-04' class='form-control'>
- </div>
-</tobago-date>
\ No newline at end of file
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-05' min='1957-09-05' max='1957-11-04' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/testLabel.html b/tobago-core/src/test/resources/renderer/date/testLabel.html
index ca0fbd7ce2..6f0f981b94 100644
--- a/tobago-core/src/test/resources/renderer/date/testLabel.html
+++ b/tobago-core/src/test/resources/renderer/date/testLabel.html
@@ -16,8 +16,6 @@
-->
<tobago-date id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>Label</label>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'>
- </div>
-</tobago-date>
+<label for='id::field' class='col-form-label'>Label</label>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/testTodayButton.html b/tobago-core/src/test/resources/renderer/date/testTodayButton.html
index 706be58a65..ec692188ee 100644
--- a/tobago-core/src/test/resources/renderer/date/testTodayButton.html
+++ b/tobago-core/src/test/resources/renderer/date/testTodayButton.html
@@ -16,9 +16,7 @@
-->
<tobago-date id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>Label</label>
- <div class='input-group'>
- <input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'>
- <button class='btn btn-secondary tobago-now' type='button' title='Today'><i class='bi-arrow-down'></i></button>
- </div>
-</tobago-date>
+<label for='id::field' class='col-form-label'>Label</label>
+<div class='input-group'>
+<input type='date' name='id' id='id::field' value='1957-10-05' max='9999-12-31' class='form-control'>
+<button class='btn btn-secondary tobago-now' type='button' title='Today'><i class='bi-arrow-down'></i></button></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/text.html b/tobago-core/src/test/resources/renderer/date/text.html
index 2ad5eabc35..8090809517 100644
--- a/tobago-core/src/test/resources/renderer/date/text.html
+++ b/tobago-core/src/test/resources/renderer/date/text.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing' date-pattern='dd.mm.yyyy' time-pattern='HH:mm'>
- <div class='input-group'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </div>
-</tobago-date>
\ No newline at end of file
+<div class='input-group'>
+<input type='text' name='id' id='id::field' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/date/zonedDateTimeAuto.html b/tobago-core/src/test/resources/renderer/date/zonedDateTimeAuto.html
index d623de883c..44cbccd8ce 100644
--- a/tobago-core/src/test/resources/renderer/date/zonedDateTimeAuto.html
+++ b/tobago-core/src/test/resources/renderer/date/zonedDateTimeAuto.html
@@ -16,7 +16,5 @@
-->
<tobago-date id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='datetime-local' name='id' id='id::field' value='1957-10-05T00:28' max='9999-12-31T23:59' class='form-control'>
- </div>
-</tobago-date>
+<div class='input-group'>
+<input type='datetime-local' name='id' id='id::field' value='1957-10-05T00:28' max='9999-12-31T23:59' class='form-control'></div></tobago-date>
diff --git a/tobago-core/src/test/resources/renderer/file/file-drop-zone-this.html b/tobago-core/src/test/resources/renderer/file/file-drop-zone-this.html
index bbb8cb9d5f..ca90e531ab 100644
--- a/tobago-core/src/test/resources/renderer/file/file-drop-zone-this.html
+++ b/tobago-core/src/test/resources/renderer/file/file-drop-zone-this.html
@@ -16,12 +16,8 @@
-->
<tobago-file id='id' class='tobago-auto-spacing' drop-zone='id'>
- <div class='input-group'>
- <input type='file' tabindex='-1' id='id::field' class='form-control' name='id'>
- <label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label>
- </div>
- <tobago-progress class='progress d-none'>
- <div class='progress-bar' role='progressbar'>
- </div>
- </tobago-progress>
-</tobago-file>
+<div class='input-group'>
+<input type='file' tabindex='-1' id='id::field' class='form-control' name='id'>
+<label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label></div>
+<tobago-progress class='progress d-none'>
+<div class='progress-bar' role='progressbar'></div></tobago-progress></tobago-file>
diff --git a/tobago-core/src/test/resources/renderer/file/file-drop-zone.html b/tobago-core/src/test/resources/renderer/file/file-drop-zone.html
index cb6b58bfec..8dcb01b6df 100644
--- a/tobago-core/src/test/resources/renderer/file/file-drop-zone.html
+++ b/tobago-core/src/test/resources/renderer/file/file-drop-zone.html
@@ -16,12 +16,8 @@
-->
<tobago-file id='id' class='tobago-auto-spacing' drop-zone='drop-zone'>
- <div class='input-group'>
- <input type='file' tabindex='-1' id='id::field' class='form-control' name='id'>
- <label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label>
- </div>
- <tobago-progress class='progress d-none'>
- <div class='progress-bar' role='progressbar'>
- </div>
- </tobago-progress>
-</tobago-file>
+<div class='input-group'>
+<input type='file' tabindex='-1' id='id::field' class='form-control' name='id'>
+<label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label></div>
+<tobago-progress class='progress d-none'>
+<div class='progress-bar' role='progressbar'></div></tobago-progress></tobago-file>
diff --git a/tobago-core/src/test/resources/renderer/file/file-label.html b/tobago-core/src/test/resources/renderer/file/file-label.html
index d7144c5b2b..3e772929bb 100644
--- a/tobago-core/src/test/resources/renderer/file/file-label.html
+++ b/tobago-core/src/test/resources/renderer/file/file-label.html
@@ -16,13 +16,9 @@
-->
<tobago-file id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <div class='input-group'>
- <input type='file' tabindex='-1' id='id::field' class='form-control' name='id'>
- <label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label>
- </div>
- <tobago-progress class='progress d-none'>
- <div class='progress-bar' role='progressbar'>
- </div>
- </tobago-progress>
-</tobago-file>
+<label for='id::field' class='col-form-label'>label</label>
+<div class='input-group'>
+<input type='file' tabindex='-1' id='id::field' class='form-control' name='id'>
+<label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label></div>
+<tobago-progress class='progress d-none'>
+<div class='progress-bar' role='progressbar'></div></tobago-progress></tobago-file>
diff --git a/tobago-core/src/test/resources/renderer/file/file-validator.html b/tobago-core/src/test/resources/renderer/file/file-validator.html
index bde9e47128..8b708fcea0 100644
--- a/tobago-core/src/test/resources/renderer/file/file-validator.html
+++ b/tobago-core/src/test/resources/renderer/file/file-validator.html
@@ -16,13 +16,9 @@
-->
<tobago-file id='id' class='tobago-label-container tobago-auto-spacing' max-size='1000' max-size-message='The selected file exceeds the maximum allowed size of 1,000 bytes.'>
- <label for='id::field' class='col-form-label'>label</label>
- <div class='input-group'>
- <input type='file' accept='.png,application/pdf' tabindex='-1' id='id::field' class='form-control' name='id'>
- <label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label>
- </div>
- <tobago-progress class='progress d-none'>
- <div class='progress-bar' role='progressbar'>
- </div>
- </tobago-progress>
-</tobago-file>
+<label for='id::field' class='col-form-label'>label</label>
+<div class='input-group'>
+<input type='file' accept='.png,application/pdf' tabindex='-1' id='id::field' class='form-control' name='id'>
+<label class='input-group-text' for='id::field'><span><i class='bi-folder2-open'></i></span></label></div>
+<tobago-progress class='progress d-none'>
+<div class='progress-bar' role='progressbar'></div></tobago-progress></tobago-file>
diff --git a/tobago-core/src/test/resources/renderer/in/ajax.html b/tobago-core/src/test/resources/renderer/in/ajax.html
index 8c3bc6382f..754db65e30 100644
--- a/tobago-core/src/test/resources/renderer/in/ajax.html
+++ b/tobago-core/src/test/resources/renderer/in/ajax.html
@@ -14,14 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
<tobago-panel id='panel'>
- <tobago-in id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-behavior event='change' client-id='id' field-id='id::field' execute='textarea id' render='panel'></tobago-behavior>
- </tobago-in>
- <tobago-textarea id='textarea' class='tobago-auto-spacing'>
- <textarea name='textarea' id='textarea::field' class='form-control'></textarea>
- </tobago-textarea>
-</tobago-panel>
+<tobago-in id='id' class='tobago-label-container tobago-auto-spacing'>
+<label for='id::field' class='col-form-label'>label</label>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-behavior event='change' client-id='id' field-id='id::field' execute='textarea id' render='panel'></tobago-behavior></tobago-in>
+<tobago-textarea id='textarea' class='tobago-auto-spacing'>
+<textarea name='textarea' id='textarea::field' class='form-control'></textarea></tobago-textarea></tobago-panel>
diff --git a/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelay1000.html b/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelay1000.html
index 96b1069aa4..e48905bbd7 100644
--- a/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelay1000.html
+++ b/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelay1000.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-behavior event='keyup' client-id='id' field-id='id::field' execute='id' render='id' delay='1000'></tobago-behavior>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-behavior event='keyup' client-id='id' field-id='id::field' execute='id' render='id' delay='1000'></tobago-behavior></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelayNone.html b/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelayNone.html
index 029827a74c..39e838f4c9 100644
--- a/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelayNone.html
+++ b/tobago-core/src/test/resources/renderer/in/ajaxKeyupDelayNone.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-behavior event='keyup' client-id='id' field-id='id::field' execute='id' render='id'></tobago-behavior>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-behavior event='keyup' client-id='id' field-id='id::field' execute='id' render='id'></tobago-behavior></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/autocomplete-on.html b/tobago-core/src/test/resources/renderer/in/autocomplete-on.html
index 076a9cd014..11b1c819b8 100644
--- a/tobago-core/src/test/resources/renderer/in/autocomplete-on.html
+++ b/tobago-core/src/test/resources/renderer/in/autocomplete-on.html
@@ -16,5 +16,4 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' autocomplete='on' class='form-control'>
-</tobago-in>
+<input type='text' name='id' id='id::field' autocomplete='on' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/error-message.html b/tobago-core/src/test/resources/renderer/in/error-message.html
index 275cab206e..fad074a8f2 100644
--- a/tobago-core/src/test/resources/renderer/in/error-message.html
+++ b/tobago-core/src/test/resources/renderer/in/error-message.html
@@ -16,11 +16,8 @@
-->
<tobago-in id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
- <input type='text' name='id' id='id::field' title='a test' class='is-error form-control' autofocus='autofocus'>
- <tobago-popover label='Error' value='a test'>
- <a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-in>
+<label for='id::field' class='col-form-label'>label</label>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
+<input type='text' name='id' id='id::field' title='a test' class='is-error form-control' autofocus='autofocus'>
+<tobago-popover label='Error' value='a test'>
+<a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/help.html b/tobago-core/src/test/resources/renderer/in/help.html
index 7e405b3cfe..c54b9a0c3e 100644
--- a/tobago-core/src/test/resources/renderer/in/help.html
+++ b/tobago-core/src/test/resources/renderer/in/help.html
@@ -16,11 +16,8 @@
-->
<tobago-in id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-popover label='Help' value='Help!'>
- <a tabindex='0' role='button' class='btn btn-outline-info'><i class='bi-question-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-in>
+<label for='id::field' class='col-form-label'>label</label>
+<div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-popover label='Help' value='Help!'>
+<a tabindex='0' role='button' class='btn btn-outline-info'><i class='bi-question-lg'></i></a></tobago-popover></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-button-after.html b/tobago-core/src/test/resources/renderer/in/input-group-button-after.html
index 198dd0dd25..fdf4d71ad6 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-button-after.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-button-after.html
@@ -16,8 +16,6 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <button type='button' id='button' name='button' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='button'></tobago-behavior><span>button</span></button>
- </div>
-</tobago-in>
+<div class='input-group'>
+<input type='text' name='id' id='id::field' class='form-control'>
+<button type='button' id='button' name='button' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='button'></tobago-behavior><span>button</span></button></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-button-before.html b/tobago-core/src/test/resources/renderer/in/input-group-button-before.html
index 5069d9882b..3e9c6b9c1d 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-button-before.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-button-before.html
@@ -16,8 +16,6 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <button type='button' id='button' name='button' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='button'></tobago-behavior><span>button</span></button>
- <input type='text' name='id' id='id::field' class='form-control'>
- </div>
-</tobago-in>
+<div class='input-group'>
+<button type='button' id='button' name='button' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='button'></tobago-behavior><span>button</span></button>
+<input type='text' name='id' id='id::field' class='form-control'></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-choice-after.html b/tobago-core/src/test/resources/renderer/in/input-group-choice-after.html
index 3eea82c1aa..b2d7a3025e 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-choice-after.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-choice-after.html
@@ -16,14 +16,9 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-select-one-choice id='choice' class='form-select'>
- <select id='choice::field' name='choice' class='form-select'>
- <option value=''>Stratocaster
- </option>
- <option value=''>Telecaster
- </option></select>
- </tobago-select-one-choice>
- </div>
-</tobago-in>
+<div class='input-group'>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-select-one-choice id='choice' class='form-select'>
+<select id='choice::field' name='choice' class='form-select'>
+<option value=''>Stratocaster</option>
+<option value=''>Telecaster</option></select></tobago-select-one-choice></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-dropdown-after.html b/tobago-core/src/test/resources/renderer/in/input-group-dropdown-after.html
index f63407d2e4..cc84b7f9c4 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-dropdown-after.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-dropdown-after.html
@@ -18,14 +18,10 @@
dropdown-menu-right is temporarily not here (in the div with dropdown-menu), XXX might be to fixed?
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-dropdown id='button' class='dropdown'>
- <button type='button' id='button::command' name='button' aria-expanded='false' class='tobago-button btn btn-secondary dropdown-toggle'><tobago-behavior event='click' client-id='button' field-id='button::command' omit='omit'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu dropdown-menu-end' aria-labelledby='button::command' name='button'>
- <button type='button' id='l1' name='l1' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l1'></tobago-behavior><span>Link 1</span></button>
- <button type='button' id='l2' name='l2' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l2'></tobago-behavior><span>Link 2</span></button>
- </div>
- </tobago-dropdown>
- </div>
-</tobago-in>
+<div class='input-group'>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-dropdown id='button' class='dropdown'>
+<button type='button' id='button::command' name='button' aria-expanded='false' class='tobago-button btn btn-secondary dropdown-toggle'><tobago-behavior event='click' client-id='button' field-id='button::command' omit='omit'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu dropdown-menu-end' aria-labelledby='button::command' name='button'>
+<button type='button' id='l1' name='l1' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l1'></tobago-behavior><span>Link 1</span></button>
+<button type='button' id='l2' name='l2' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l2'></tobago-behavior><span>Link 2</span></button></div></tobago-dropdown></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-dropdown-before.html b/tobago-core/src/test/resources/renderer/in/input-group-dropdown-before.html
index 2a4964f93f..8c85d54871 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-dropdown-before.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-dropdown-before.html
@@ -16,14 +16,10 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <tobago-dropdown id='button' class='dropdown'>
- <button type='button' id='button::command' name='button' aria-expanded='false' class='tobago-button btn btn-secondary dropdown-toggle'><tobago-behavior event='click' client-id='button' field-id='button::command' omit='omit'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='button::command' name='button'>
- <button type='button' id='l1' name='l1' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l1'></tobago-behavior><span>Link 1</span></button>
- <button type='button' id='l2' name='l2' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l2'></tobago-behavior><span>Link 2</span></button>
- </div>
- </tobago-dropdown>
- <input type='text' name='id' id='id::field' class='form-control'>
- </div>
-</tobago-in>
+<div class='input-group'>
+<tobago-dropdown id='button' class='dropdown'>
+<button type='button' id='button::command' name='button' aria-expanded='false' class='tobago-button btn btn-secondary dropdown-toggle'><tobago-behavior event='click' client-id='button' field-id='button::command' omit='omit'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='button::command' name='button'>
+<button type='button' id='l1' name='l1' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l1'></tobago-behavior><span>Link 1</span></button>
+<button type='button' id='l2' name='l2' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='l2'></tobago-behavior><span>Link 2</span></button></div></tobago-dropdown>
+<input type='text' name='id' id='id::field' class='form-control'></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-out-after.html b/tobago-core/src/test/resources/renderer/in/input-group-out-after.html
index 32dd737e30..7af53161e2 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-out-after.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-out-after.html
@@ -16,8 +16,6 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <tobago-out class='input-group-text'>out</tobago-out>
- </div>
-</tobago-in>
\ No newline at end of file
+<div class='input-group'>
+<input type='text' name='id' id='id::field' class='form-control'>
+<tobago-out class='input-group-text'>out</tobago-out></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/input-group-out-before.html b/tobago-core/src/test/resources/renderer/in/input-group-out-before.html
index 5ec13a908f..b834be7e14 100644
--- a/tobago-core/src/test/resources/renderer/in/input-group-out-before.html
+++ b/tobago-core/src/test/resources/renderer/in/input-group-out-before.html
@@ -16,8 +16,6 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <div class='input-group'>
- <tobago-out class='input-group-text'>out</tobago-out>
- <input type='text' name='id' id='id::field' class='form-control'>
- </div>
-</tobago-in>
\ No newline at end of file
+<div class='input-group'>
+<tobago-out class='input-group-text'>out</tobago-out>
+<input type='text' name='id' id='id::field' class='form-control'></div></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/label-flexLeft.html b/tobago-core/src/test/resources/renderer/in/label-flexLeft.html
index b2f225f48c..963535ed45 100644
--- a/tobago-core/src/test/resources/renderer/in/label-flexLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/label-flexLeft.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
\ No newline at end of file
+<label for='id::field' class='col-form-label'>label</label>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/label-flexRight.html b/tobago-core/src/test/resources/renderer/in/label-flexRight.html
index 072aa046e6..bba1954c0a 100644
--- a/tobago-core/src/test/resources/renderer/in/label-flexRight.html
+++ b/tobago-core/src/test/resources/renderer/in/label-flexRight.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-label-container tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- <label for='id::field' class='col-form-label'>label</label>
-</tobago-in>
\ No newline at end of file
+<input type='text' name='id' id='id::field' class='form-control'>
+<label for='id::field' class='col-form-label'>label</label></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/label-flowLeft.html b/tobago-core/src/test/resources/renderer/in/label-flowLeft.html
index a5b90a4b09..87d4737486 100644
--- a/tobago-core/src/test/resources/renderer/in/label-flowLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/label-flowLeft.html
@@ -17,5 +17,4 @@
<label for='id::field' class='col-form-label'>label</label>
<tobago-in id='id' class='tobago-auto-spacing tobago-display-inline-block'>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
\ No newline at end of file
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/label-flowRight.html b/tobago-core/src/test/resources/renderer/in/label-flowRight.html
index bf3cf50403..812bf37e38 100644
--- a/tobago-core/src/test/resources/renderer/in/label-flowRight.html
+++ b/tobago-core/src/test/resources/renderer/in/label-flowRight.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing tobago-display-inline-block'>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
<label for='id::field' class='col-form-label'>label</label>
diff --git a/tobago-core/src/test/resources/renderer/in/label-gridBottom.html b/tobago-core/src/test/resources/renderer/in/label-gridBottom.html
index 491d9c1364..da327aed8f 100644
--- a/tobago-core/src/test/resources/renderer/in/label-gridBottom.html
+++ b/tobago-core/src/test/resources/renderer/in/label-gridBottom.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:2;-ms-grid-row:2;}
- </style>
- <label id='id::label' for='id::field' class='col-form-label'>label</label>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<tobago-in id='id' class='tobago-auto-spacing'>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:2;-ms-grid-row:2;}</style>
+<label id='id::label' for='id::field' class='col-form-label'>label</label>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/label-gridLeft.html b/tobago-core/src/test/resources/renderer/in/label-gridLeft.html
index 12dd039b32..e2259085b1 100644
--- a/tobago-core/src/test/resources/renderer/in/label-gridLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/label-gridLeft.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <label id='id::label' for='id::field' class='col-form-label'>label</label>
- <tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:2;-ms-grid-column:2;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}
- </style>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<label id='id::label' for='id::field' class='col-form-label'>label</label>
+<tobago-in id='id' class='tobago-auto-spacing'>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:2;-ms-grid-column:2;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}</style>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/label-gridRight.html b/tobago-core/src/test/resources/renderer/in/label-gridRight.html
index 25532bf77e..c9d656c6e9 100644
--- a/tobago-core/src/test/resources/renderer/in/label-gridRight.html
+++ b/tobago-core/src/test/resources/renderer/in/label-gridRight.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:2;-ms-grid-column:2;grid-row:1;-ms-grid-row:1;}
- </style>
- <label id='id::label' for='id::field' class='col-form-label'>label</label>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<tobago-in id='id' class='tobago-auto-spacing'>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:2;-ms-grid-column:2;grid-row:1;-ms-grid-row:1;}</style>
+<label id='id::label' for='id::field' class='col-form-label'>label</label>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/label-gridTop.html b/tobago-core/src/test/resources/renderer/in/label-gridTop.html
index 0aff9a52a2..f085e2f758 100644
--- a/tobago-core/src/test/resources/renderer/in/label-gridTop.html
+++ b/tobago-core/src/test/resources/renderer/in/label-gridTop.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <label id='id::label' for='id::field' class='col-form-label'>label</label>
- <tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </tobago-in>
- <style nonce='d+pxSQCXQa0XMPBsSMng0w==' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:2;-ms-grid-row:2;-ms-grid-row-span:1;}
- </style>
- <style nonce='d+pxSQCXQa0XMPBsSMng0w==' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}
- </style>
- <style nonce='d+pxSQCXQa0XMPBsSMng0w==' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<label id='id::label' for='id::field' class='col-form-label'>label</label>
+<tobago-in id='id' class='tobago-auto-spacing'>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
+<style nonce='d+pxSQCXQa0XMPBsSMng0w==' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:2;-ms-grid-row:2;-ms-grid-row-span:1;}</style>
+<style nonce='d+pxSQCXQa0XMPBsSMng0w==' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}</style>
+<style nonce='d+pxSQCXQa0XMPBsSMng0w==' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/label-none.html b/tobago-core/src/test/resources/renderer/in/label-none.html
index 58e647e791..8d4ef5fc64 100644
--- a/tobago-core/src/test/resources/renderer/in/label-none.html
+++ b/tobago-core/src/test/resources/renderer/in/label-none.html
@@ -16,5 +16,4 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/label-segmentLeft.html b/tobago-core/src/test/resources/renderer/in/label-segmentLeft.html
index 822b04efdc..9cebe1bff5 100644
--- a/tobago-core/src/test/resources/renderer/in/label-segmentLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/label-segmentLeft.html
@@ -16,12 +16,8 @@
-->
<tobago-segment-layout id='segid' class='row'>
- <div class='col-md-3'>
- <label for='id::field' class='col-form-label'>label</label>
- </div>
- <div class='col-md-9'>
- <tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </tobago-in>
- </div>
-</tobago-segment-layout>
+<div class='col-md-3'>
+<label for='id::field' class='col-form-label'>label</label></div>
+<div class='col-md-9'>
+<tobago-in id='id' class='tobago-auto-spacing'>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in></div></tobago-segment-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/label-segmentRight.html b/tobago-core/src/test/resources/renderer/in/label-segmentRight.html
index e38123eb2b..e2d4924ce1 100644
--- a/tobago-core/src/test/resources/renderer/in/label-segmentRight.html
+++ b/tobago-core/src/test/resources/renderer/in/label-segmentRight.html
@@ -16,12 +16,8 @@
-->
<tobago-segment-layout id='segid' class='row'>
- <div class='col-md-9'>
- <tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
- </tobago-in>
- </div>
- <div class='col-md-3'>
- <label for='id::field' class='col-form-label'>label</label>
- </div>
-</tobago-segment-layout>
+<div class='col-md-9'>
+<tobago-in id='id' class='tobago-auto-spacing'>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in></div>
+<div class='col-md-3'>
+<label for='id::field' class='col-form-label'>label</label></div></tobago-segment-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/label-skip.html b/tobago-core/src/test/resources/renderer/in/label-skip.html
index 40fa367656..3183671cb6 100644
--- a/tobago-core/src/test/resources/renderer/in/label-skip.html
+++ b/tobago-core/src/test/resources/renderer/in/label-skip.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
+<label for='id::field' class='col-form-label'>label</label>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/label-top.html b/tobago-core/src/test/resources/renderer/in/label-top.html
index 40fa367656..3183671cb6 100644
--- a/tobago-core/src/test/resources/renderer/in/label-top.html
+++ b/tobago-core/src/test/resources/renderer/in/label-top.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
+<label for='id::field' class='col-form-label'>label</label>
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-flexLeft.html b/tobago-core/src/test/resources/renderer/in/required-label-flexLeft.html
index 901aa88b47..688f14f041 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-flexLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-flexLeft.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-label-container tobago-auto-spacing tobago-required'>
- <label for='id::field' class='tobago-required col-form-label'>label</label>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
-</tobago-in>
+<label for='id::field' class='tobago-required col-form-label'>label</label>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-flexRight.html b/tobago-core/src/test/resources/renderer/in/required-label-flexRight.html
index 574baf4c5c..b0e18a3958 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-flexRight.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-flexRight.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-label-container tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- <label for='id::field' class='tobago-required col-form-label'>label</label>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control' required='required'>
+<label for='id::field' class='tobago-required col-form-label'>label</label></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-flowLeft.html b/tobago-core/src/test/resources/renderer/in/required-label-flowLeft.html
index b3a0490139..f8480f355d 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-flowLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-flowLeft.html
@@ -17,5 +17,4 @@
<label for='id::field' class='tobago-required col-form-label'>label</label>
<tobago-in id='id' class='tobago-auto-spacing tobago-required tobago-display-inline-block'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-flowRight.html b/tobago-core/src/test/resources/renderer/in/required-label-flowRight.html
index ab743d2e12..7663353d74 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-flowRight.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-flowRight.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing tobago-required tobago-display-inline-block'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
<label for='id::field' class='tobago-required col-form-label'>label</label>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-gridBottom.html b/tobago-core/src/test/resources/renderer/in/required-label-gridBottom.html
index bde1ae23ce..2553dd368a 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-gridBottom.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-gridBottom.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:2;-ms-grid-row:2;}
- </style>
- <label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:2;-ms-grid-row:2;}</style>
+<label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-gridLeft.html b/tobago-core/src/test/resources/renderer/in/required-label-gridLeft.html
index a94e0022c9..5196ebaa8f 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-gridLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-gridLeft.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
- <tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:2;-ms-grid-column:2;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}
- </style>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
+<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:2;-ms-grid-column:2;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}</style>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-gridRight.html b/tobago-core/src/test/resources/renderer/in/required-label-gridRight.html
index 4d2583a349..1a26b41251 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-gridRight.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-gridRight.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:2;-ms-grid-column:2;grid-row:1;-ms-grid-row:1;}
- </style>
- <label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:1;-ms-grid-row:1;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:2;-ms-grid-column:2;grid-row:1;-ms-grid-row:1;}</style>
+<label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-gridTop.html b/tobago-core/src/test/resources/renderer/in/required-label-gridTop.html
index ff7ac12580..3fd83ea9e2 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-gridTop.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-gridTop.html
@@ -16,14 +16,9 @@
-->
<tobago-grid-layout role='presentation' id='gridLayout'>
- <label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
- <tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- </tobago-in>
- <style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:2;-ms-grid-row:2;-ms-grid-row-span:1;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}
- </style>
- <style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}
- </style>
-</tobago-grid-layout>
+<label id='id::label' for='id::field' class='tobago-required col-form-label'>label</label>
+<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
+<style nonce='dummy' id='j_id__v_0'>#id{grid-column:1;-ms-grid-column:1;-ms-grid-column-span:1;grid-row:2;-ms-grid-row:2;-ms-grid-row-span:1;}</style>
+<style nonce='dummy' id='j_id__v_1'>#id\:\:label{grid-column:1;-ms-grid-column:1;grid-row:1;-ms-grid-row:1;}</style>
+<style nonce='dummy' id='j_id__v_2'>#gridLayout{grid-template-columns:auto auto 1fr ;-ms-grid-columns:auto auto 1fr ;grid-template-rows:auto ;-ms-grid-rows:auto ;}</style></tobago-grid-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-none.html b/tobago-core/src/test/resources/renderer/in/required-label-none.html
index 3215ca5fbf..ffb001c020 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-none.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-none.html
@@ -16,5 +16,4 @@
-->
<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
-</tobago-in>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-segmentLeft.html b/tobago-core/src/test/resources/renderer/in/required-label-segmentLeft.html
index d19305d677..fc5727de76 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-segmentLeft.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-segmentLeft.html
@@ -16,12 +16,8 @@
-->
<tobago-segment-layout id='segid' class='row'>
- <div class='col-md-3'>
- <label for='id::field' class='tobago-required col-form-label'>label</label>
- </div>
- <div class='col-md-9'>
- <tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- </tobago-in>
- </div>
-</tobago-segment-layout>
+<div class='col-md-3'>
+<label for='id::field' class='tobago-required col-form-label'>label</label></div>
+<div class='col-md-9'>
+<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in></div></tobago-segment-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-segmentRight.html b/tobago-core/src/test/resources/renderer/in/required-label-segmentRight.html
index 5c8b48b0c8..62bd5b6ad6 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-segmentRight.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-segmentRight.html
@@ -16,12 +16,8 @@
-->
<tobago-segment-layout id='segid' class='row'>
- <div class='col-md-9'>
- <tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
- </tobago-in>
- </div>
- <div class='col-md-3'>
- <label for='id::field' class='tobago-required col-form-label'>label</label>
- </div>
-</tobago-segment-layout>
+<div class='col-md-9'>
+<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in></div>
+<div class='col-md-3'>
+<label for='id::field' class='tobago-required col-form-label'>label</label></div></tobago-segment-layout>
diff --git a/tobago-core/src/test/resources/renderer/in/required-label-top.html b/tobago-core/src/test/resources/renderer/in/required-label-top.html
index 1e83c30231..11ed3e95ee 100644
--- a/tobago-core/src/test/resources/renderer/in/required-label-top.html
+++ b/tobago-core/src/test/resources/renderer/in/required-label-top.html
@@ -16,6 +16,5 @@
-->
<tobago-in id='id' class='tobago-auto-spacing tobago-required'>
- <label for='id::field' class='tobago-required col-form-label'>label</label>
- <input type='text' name='id' id='id::field' class='form-control' required='required'>
-</tobago-in>
+<label for='id::field' class='tobago-required col-form-label'>label</label>
+<input type='text' name='id' id='id::field' class='form-control' required='required'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/in/simple.html b/tobago-core/src/test/resources/renderer/in/simple.html
index 85e04942bb..8d4ef5fc64 100644
--- a/tobago-core/src/test/resources/renderer/in/simple.html
+++ b/tobago-core/src/test/resources/renderer/in/simple.html
@@ -16,5 +16,4 @@
-->
<tobago-in id='id' class='tobago-auto-spacing'>
- <input type='text' name='id' id='id::field' class='form-control'>
-</tobago-in>
\ No newline at end of file
+<input type='text' name='id' id='id::field' class='form-control'></tobago-in>
diff --git a/tobago-core/src/test/resources/renderer/link/booleanInsideLink.html b/tobago-core/src/test/resources/renderer/link/booleanInsideLink.html
index cc1b075911..b6c742ed1f 100644
--- a/tobago-core/src/test/resources/renderer/link/booleanInsideLink.html
+++ b/tobago-core/src/test/resources/renderer/link/booleanInsideLink.html
@@ -16,11 +16,8 @@
-->
<tobago-dropdown id='id1' class='dropdown'>
- <button type='button' id='id1::command' name='id1' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id1' field-id='id1::command'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id1::command' name='id1'>
- <tobago-select-boolean-checkbox id='id2' class='form-check dropdown-item'>
- <input class='form-check-input' type='checkbox' value='true' name='id2' id='id2::field'>
- <label class='form-check-label' for='id2::field'></label>
- </tobago-select-boolean-checkbox>
- </div>
-</tobago-dropdown>
+<button type='button' id='id1::command' name='id1' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id1' field-id='id1::command'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id1::command' name='id1'>
+<tobago-select-boolean-checkbox id='id2' class='form-check dropdown-item'>
+<input class='form-check-input' type='checkbox' value='true' name='id2' id='id2::field'>
+<label class='form-check-label' for='id2::field'></label></tobago-select-boolean-checkbox></div></tobago-dropdown>
diff --git a/tobago-core/src/test/resources/renderer/link/manyInsideLink.html b/tobago-core/src/test/resources/renderer/link/manyInsideLink.html
index c094e6f0f6..bddeab1ed0 100644
--- a/tobago-core/src/test/resources/renderer/link/manyInsideLink.html
+++ b/tobago-core/src/test/resources/renderer/link/manyInsideLink.html
@@ -16,17 +16,12 @@
-->
<tobago-dropdown id='id' class='dropdown'>
- <button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
- <tobago-select-many-checkbox>
- <div class='form-check dropdown-item'>
- <input class='form-check-input' type='checkbox' name='many' id='many::0' value=''>
- <label class='form-check-label' for='many::0'>Stratocaster</label>
- </div>
- <div class='form-check dropdown-item'>
- <input class='form-check-input' type='checkbox' name='many' id='many::1' value=''>
- <label class='form-check-label' for='many::1'>Telecaster</label>
- </div>
- </tobago-select-many-checkbox>
- </div>
-</tobago-dropdown>
+<button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
+<tobago-select-many-checkbox>
+<div class='form-check dropdown-item'>
+<input class='form-check-input' type='checkbox' name='many' id='many::0' value=''>
+<label class='form-check-label' for='many::0'>Stratocaster</label></div>
+<div class='form-check dropdown-item'>
+<input class='form-check-input' type='checkbox' name='many' id='many::1' value=''>
+<label class='form-check-label' for='many::1'>Telecaster</label></div></tobago-select-many-checkbox></div></tobago-dropdown>
diff --git a/tobago-core/src/test/resources/renderer/link/plainFormEmbeddingBooleanInsideLink.html b/tobago-core/src/test/resources/renderer/link/plainFormEmbeddingBooleanInsideLink.html
index 7bf780bc78..85b94b96eb 100644
--- a/tobago-core/src/test/resources/renderer/link/plainFormEmbeddingBooleanInsideLink.html
+++ b/tobago-core/src/test/resources/renderer/link/plainFormEmbeddingBooleanInsideLink.html
@@ -16,13 +16,9 @@
-->
<tobago-dropdown id='id1' class='dropdown'>
- <button type='button' id='id1::command' name='id1' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id1' field-id='id1::command'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id1::command' name='id1'>
- <tobago-select-boolean-checkbox id='form:id2' class='form-check dropdown-item'>
- <input class='form-check-input' type='checkbox' value='true' name='form:id2' id='form:id2::field'>
- <label class='form-check-label' for='form:id2::field'></label>
- </tobago-select-boolean-checkbox>
- </div>
- <style nonce='dummy' id='id3'>#id1{width:100px;}
- </style>
-</tobago-dropdown>
+<button type='button' id='id1::command' name='id1' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id1' field-id='id1::command'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id1::command' name='id1'>
+<tobago-select-boolean-checkbox id='form:id2' class='form-check dropdown-item'>
+<input class='form-check-input' type='checkbox' value='true' name='form:id2' id='form:id2::field'>
+<label class='form-check-label' for='form:id2::field'></label></tobago-select-boolean-checkbox></div>
+<style nonce='dummy' id='id3'>#id1{width:100px;}</style></tobago-dropdown>
diff --git a/tobago-core/src/test/resources/renderer/link/radioInsideLink.html b/tobago-core/src/test/resources/renderer/link/radioInsideLink.html
index ae114eb9bd..4a3c722ed3 100644
--- a/tobago-core/src/test/resources/renderer/link/radioInsideLink.html
+++ b/tobago-core/src/test/resources/renderer/link/radioInsideLink.html
@@ -16,17 +16,12 @@
-->
<tobago-dropdown id='id' class='dropdown'>
- <button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
- <tobago-select-one-radio>
- <div class='form-check dropdown-item'>
- <input class='form-check-input' type='radio' checked='checked' name='radio' id='radio::0' value=''>
- <label class='form-check-label' for='radio::0'>Stratocaster</label>
- </div>
- <div class='form-check dropdown-item'>
- <input class='form-check-input' type='radio' checked='checked' name='radio' id='radio::1' value=''>
- <label class='form-check-label' for='radio::1'>Telecaster</label>
- </div>
- </tobago-select-one-radio>
- </div>
-</tobago-dropdown>
+<button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
+<tobago-select-one-radio>
+<div class='form-check dropdown-item'>
+<input class='form-check-input' type='radio' checked='checked' name='radio' id='radio::0' value=''>
+<label class='form-check-label' for='radio::0'>Stratocaster</label></div>
+<div class='form-check dropdown-item'>
+<input class='form-check-input' type='radio' checked='checked' name='radio' id='radio::1' value=''>
+<label class='form-check-label' for='radio::1'>Telecaster</label></div></tobago-select-one-radio></div></tobago-dropdown>
diff --git a/tobago-core/src/test/resources/renderer/link/separatorInsideLink.html b/tobago-core/src/test/resources/renderer/link/separatorInsideLink.html
index ea88b39247..74121f5c69 100644
--- a/tobago-core/src/test/resources/renderer/link/separatorInsideLink.html
+++ b/tobago-core/src/test/resources/renderer/link/separatorInsideLink.html
@@ -16,11 +16,8 @@
-->
<tobago-dropdown id='id' class='dropdown'>
- <button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>dropdown</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
- <a id='link1' name='link1' href='https://www.apache.org/' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='link1' omit='omit'></tobago-behavior><span>Link 1</span></a>
- <tobago-separator id='separator' class='dropdown-divider'>
- </tobago-separator>
- <a id='link2' name='link2' href='https://www.apache.org/' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='link2' omit='omit'></tobago-behavior><span>Link 2</span></a>
- </div>
-</tobago-dropdown>
+<button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link tobago-auto-spacing dropdown-toggle'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>dropdown</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
+<a id='link1' name='link1' href='https://www.apache.org/' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='link1' omit='omit'></tobago-behavior><span>Link 1</span></a>
+<tobago-separator id='separator' class='dropdown-divider'></tobago-separator>
+<a id='link2' name='link2' href='https://www.apache.org/' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='link2' omit='omit'></tobago-behavior><span>Link 2</span></a></div></tobago-dropdown>
diff --git a/tobago-core/src/test/resources/renderer/links/link-inside-links-sub.html b/tobago-core/src/test/resources/renderer/links/link-inside-links-sub.html
index d41754f7cc..5269cc46af 100644
--- a/tobago-core/src/test/resources/renderer/links/link-inside-links-sub.html
+++ b/tobago-core/src/test/resources/renderer/links/link-inside-links-sub.html
@@ -18,14 +18,9 @@
CSS class nav-item has moved from "tobago-dropdown" to "li"
-->
<tobago-links id='list' class='tobago-auto-spacing'>
- <ul class='nav'>
- <li class='nav-item'>
- <tobago-dropdown id='id' class='dropdown'>
- <button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link dropdown-toggle nav-link'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>apache</span></button>
- <div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
- <a id='sub' name='sub' href='https://www.apache.org/' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub' omit='omit'></tobago-behavior><span>sub</span></a>
- </div>
- </tobago-dropdown>
- </li>
- </ul>
-</tobago-links>
+<ul class='nav'>
+<li class='nav-item'>
+<tobago-dropdown id='id' class='dropdown'>
+<button type='button' id='id::command' name='id' aria-expanded='false' class='tobago-link btn btn-link dropdown-toggle nav-link'><tobago-behavior event='click' client-id='id' field-id='id::command'></tobago-behavior><span>apache</span></button>
+<div class='tobago-dropdown-menu' aria-labelledby='id::command' name='id'>
+<a id='sub' name='sub' href='https://www.apache.org/' class='tobago-link dropdown-item'><tobago-behavior event='click' client-id='sub' omit='omit'></tobago-behavior><span>sub</span></a></div></tobago-dropdown></li></ul></tobago-links>
diff --git a/tobago-core/src/test/resources/renderer/links/link-inside-links.html b/tobago-core/src/test/resources/renderer/links/link-inside-links.html
index 588142235d..39e45077da 100644
--- a/tobago-core/src/test/resources/renderer/links/link-inside-links.html
+++ b/tobago-core/src/test/resources/renderer/links/link-inside-links.html
@@ -16,9 +16,6 @@
-->
<tobago-links id='list' class='tobago-auto-spacing'>
- <ul class='nav'>
- <li class='nav-item'>
- <a id='id' name='id' href='https://www.apache.org/' class='tobago-link nav-link'><tobago-behavior event='click' client-id='id' omit='omit'></tobago-behavior><span>apache</span></a>
- </li>
- </ul>
-</tobago-links>
+<ul class='nav'>
+<li class='nav-item'>
+<a id='id' name='id' href='https://www.apache.org/' class='tobago-link nav-link'><tobago-behavior event='click' client-id='id' omit='omit'></tobago-behavior><span>apache</span></a></li></ul></tobago-links>
diff --git a/tobago-core/src/test/resources/renderer/range/range-label.html b/tobago-core/src/test/resources/renderer/range/range-label.html
index a307a84d4d..2a53f6c1bc 100644
--- a/tobago-core/src/test/resources/renderer/range/range-label.html
+++ b/tobago-core/src/test/resources/renderer/range/range-label.html
@@ -16,7 +16,6 @@
-->
<tobago-range id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <span class='tobago-tooltip fade'></span>
- <input type='range' name='id' id='id::field' min='0' max='100' step='1' class='tobago-range form-range'>
-</tobago-range>
+<label for='id::field' class='col-form-label'>label</label>
+<span class='tobago-tooltip fade'></span>
+<input type='range' name='id' id='id::field' min='0' max='100' step='1' class='tobago-range form-range'></tobago-range>
diff --git a/tobago-core/src/test/resources/renderer/section/section-label-facet.html b/tobago-core/src/test/resources/renderer/section/section-label-facet.html
index 0497ebe4fe..9b4510bb1d 100644
--- a/tobago-core/src/test/resources/renderer/section/section-label-facet.html
+++ b/tobago-core/src/test/resources/renderer/section/section-label-facet.html
@@ -16,10 +16,6 @@
-->
<tobago-section id='id' class='tobago-auto-spacing'>
- <div class='tobago-header'>
- <h1>label
- </h1>
- </div>
- <div class='tobago-section-content'>
- </div>
-</tobago-section>
\ No newline at end of file
+<div class='tobago-header'>
+<h1>label</h1></div>
+<div class='tobago-section-content'></div></tobago-section>
diff --git a/tobago-core/src/test/resources/renderer/section/section-label.html b/tobago-core/src/test/resources/renderer/section/section-label.html
index a4e46f2029..99f88d66e2 100644
--- a/tobago-core/src/test/resources/renderer/section/section-label.html
+++ b/tobago-core/src/test/resources/renderer/section/section-label.html
@@ -16,11 +16,7 @@
-->
<tobago-section id='id' class='tobago-auto-spacing'>
- <div class='tobago-header'>
- <h1>
- <span>label</span>
- </h1>
- </div>
- <div class='tobago-section-content'>
- </div>
-</tobago-section>
\ No newline at end of file
+<div class='tobago-header'>
+<h1>
+<span>label</span></h1></div>
+<div class='tobago-section-content'></div></tobago-section>
diff --git a/tobago-core/src/test/resources/renderer/section/simple.html b/tobago-core/src/test/resources/renderer/section/simple.html
index 35e8c1306a..0af22e9b01 100644
--- a/tobago-core/src/test/resources/renderer/section/simple.html
+++ b/tobago-core/src/test/resources/renderer/section/simple.html
@@ -16,10 +16,6 @@
-->
<tobago-section id='id' class='tobago-auto-spacing'>
- <div class='tobago-header'>
- <h1>
- </h1>
- </div>
- <div class='tobago-section-content'>
- </div>
-</tobago-section>
\ No newline at end of file
+<div class='tobago-header'>
+<h1></h1></div>
+<div class='tobago-section-content'></div></tobago-section>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxError.html b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxError.html
index 28fd72ff01..6cba6ec24f 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxError.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxError.html
@@ -16,13 +16,9 @@
-->
<tobago-select-boolean-checkbox id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom error'>
- <div class='form-check col-form-label' title='This is a custom error'>
- <input class='form-check-input is-error' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
- <label class='form-check-label' for='id::field'></label>
- </div>
- <tobago-popover label='Error' value='This is a custom error'>
- <a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-boolean-checkbox>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom error'>
+<div class='form-check col-form-label' title='This is a custom error'>
+<input class='form-check-input is-error' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
+<label class='form-check-label' for='id::field'></label></div>
+<tobago-popover label='Error' value='This is a custom error'>
+<a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-select-boolean-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxFatal.html b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxFatal.html
index 67fb26819a..30f06007b6 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxFatal.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxFatal.html
@@ -16,13 +16,9 @@
-->
<tobago-select-boolean-checkbox id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom fatal error'>
- <div class='form-check col-form-label' title='This is a custom fatal error'>
- <input class='form-check-input is-error' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
- <label class='form-check-label' for='id::field'></label>
- </div>
- <tobago-popover label='Fatal' value='This is a custom fatal error'>
- <a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-boolean-checkbox>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom fatal error'>
+<div class='form-check col-form-label' title='This is a custom fatal error'>
+<input class='form-check-input is-error' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
+<label class='form-check-label' for='id::field'></label></div>
+<tobago-popover label='Fatal' value='This is a custom fatal error'>
+<a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-select-boolean-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxInfo.html b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxInfo.html
index 17d8e4cb6c..c6214d4e77 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxInfo.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxInfo.html
@@ -16,13 +16,9 @@
-->
<tobago-select-boolean-checkbox id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom information'>
- <div class='form-check col-form-label' title='This is a custom information'>
- <input class='form-check-input is-info' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
- <label class='form-check-label' for='id::field'></label>
- </div>
- <tobago-popover label='Information' value='This is a custom information'>
- <a tabindex='0' role='button' class='btn btn-info'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-boolean-checkbox>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom information'>
+<div class='form-check col-form-label' title='This is a custom information'>
+<input class='form-check-input is-info' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
+<label class='form-check-label' for='id::field'></label></div>
+<tobago-popover label='Information' value='This is a custom information'>
+<a tabindex='0' role='button' class='btn btn-info'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-select-boolean-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxItemLabel.html b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxItemLabel.html
index eb3ce3cc59..a910d089a7 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxItemLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxItemLabel.html
@@ -16,8 +16,6 @@
-->
<tobago-select-boolean-checkbox id='id' class='tobago-auto-spacing'>
- <div class='form-check col-form-label'>
- <input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
- <label class='form-check-label' for='id::field'>label</label>
- </div>
-</tobago-select-boolean-checkbox>
+<div class='form-check col-form-label'>
+<input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
+<label class='form-check-label' for='id::field'>label</label></div></tobago-select-boolean-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxLabel.html b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxLabel.html
index 72ffcbc90b..850f3fe334 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxLabel.html
@@ -16,9 +16,7 @@
-->
<tobago-select-boolean-checkbox id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <div class='form-check col-form-label'>
- <input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
- <label class='form-check-label' for='id::field'></label>
- </div>
-</tobago-select-boolean-checkbox>
+<label for='id::field' class='col-form-label'>label</label>
+<div class='form-check col-form-label'>
+<input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
+<label class='form-check-label' for='id::field'></label></div></tobago-select-boolean-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxWarning.html b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxWarning.html
index dad533fcf8..677a557417 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxWarning.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanCheckbox/selectBooleanCheckboxWarning.html
@@ -16,13 +16,9 @@
-->
<tobago-select-boolean-checkbox id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom warning'>
- <div class='form-check col-form-label' title='This is a custom warning'>
- <input class='form-check-input is-warning' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
- <label class='form-check-label' for='id::field'></label>
- </div>
- <tobago-popover label='Warning' value='This is a custom warning'>
- <a tabindex='0' role='button' class='btn btn-warning'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-boolean-checkbox>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom warning'>
+<div class='form-check col-form-label' title='This is a custom warning'>
+<input class='form-check-input is-warning' type='checkbox' value='true' name='id' id='id::field' autofocus='autofocus'>
+<label class='form-check-label' for='id::field'></label></div>
+<tobago-popover label='Warning' value='This is a custom warning'>
+<a tabindex='0' role='button' class='btn btn-warning'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-select-boolean-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleItemLabel.html b/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleItemLabel.html
index c64dcac322..0fcc6fc493 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleItemLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleItemLabel.html
@@ -16,8 +16,6 @@
-->
<tobago-select-boolean-toggle id='id' class='tobago-auto-spacing'>
- <div class='form-check col-form-label form-switch'>
- <input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
- <label class='form-check-label' for='id::field'>label</label>
- </div>
-</tobago-select-boolean-toggle>
+<div class='form-check col-form-label form-switch'>
+<input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
+<label class='form-check-label' for='id::field'>label</label></div></tobago-select-boolean-toggle>
diff --git a/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleLabel.html b/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleLabel.html
index 3d16fab479..d9999bd48b 100644
--- a/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectBooleanToggle/selectBooleanToggleLabel.html
@@ -16,9 +16,7 @@
-->
<tobago-select-boolean-toggle id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <div class='form-check col-form-label form-switch'>
- <input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
- <label class='form-check-label' for='id::field'></label>
- </div>
-</tobago-select-boolean-toggle>
+<label for='id::field' class='col-form-label'>label</label>
+<div class='form-check col-form-label form-switch'>
+<input class='form-check-input' type='checkbox' value='true' name='id' id='id::field'>
+<label class='form-check-label' for='id::field'></label></div></tobago-select-boolean-toggle>
diff --git a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxFatal.html b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxFatal.html
index 611caf7da0..46b2c43fee 100644
--- a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxFatal.html
+++ b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxFatal.html
@@ -16,19 +16,13 @@
-->
<tobago-select-many-checkbox id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom fatal error'>
- <div title='This is a custom fatal error'>
- <div class='form-check'>
- <input class='form-check-input is-error' type='checkbox' name='id' id='id::0' value='' autofocus='autofocus'>
- <label class='form-check-label' for='id::0'>Entry One</label>
- </div>
- <div class='form-check'>
- <input class='form-check-input is-error' type='checkbox' name='id' id='id::1' value=''>
- <label class='form-check-label' for='id::1'>Entry Two</label>
- </div>
- </div>
- <tobago-popover label='Fatal' value='This is a custom fatal error'>
- <a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-many-checkbox>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='This is a custom fatal error'>
+<div title='This is a custom fatal error'>
+<div class='form-check'>
+<input class='form-check-input is-error' type='checkbox' name='id' id='id::0' value='' autofocus='autofocus'>
+<label class='form-check-label' for='id::0'>Entry One</label></div>
+<div class='form-check'>
+<input class='form-check-input is-error' type='checkbox' name='id' id='id::1' value=''>
+<label class='form-check-label' for='id::1'>Entry Two</label></div></div>
+<tobago-popover label='Fatal' value='This is a custom fatal error'>
+<a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-select-many-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxItemLabel.html b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxItemLabel.html
index f848d5bf49..ff4c84df13 100644
--- a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxItemLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxItemLabel.html
@@ -16,14 +16,10 @@
-->
<tobago-select-many-checkbox id='id' class='tobago-auto-spacing'>
- <div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' name='id' id='id::0' value=''>
- <label class='form-check-label' for='id::0'>Entry One</label>
- </div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' name='id' id='id::1' value=''>
- <label class='form-check-label' for='id::1'>Entry Two</label>
- </div>
- </div>
-</tobago-select-many-checkbox>
+<div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' name='id' id='id::0' value=''>
+<label class='form-check-label' for='id::0'>Entry One</label></div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' name='id' id='id::1' value=''>
+<label class='form-check-label' for='id::1'>Entry Two</label></div></div></tobago-select-many-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionNotRendered.html b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionNotRendered.html
index 96a05bee73..32546b580d 100644
--- a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionNotRendered.html
+++ b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionNotRendered.html
@@ -16,14 +16,10 @@
-->
<tobago-select-many-checkbox id='id' class='tobago-auto-spacing tobago-required'>
- <div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' checked='checked' name='id' id='id::0' value='Entry One' required='required'>
- <label class='form-check-label' for='id::0'>Entry One</label>
- </div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' name='id' id='id::1' value='Entry Two' required='required'>
- <label class='form-check-label' for='id::1'>Entry Two</label>
- </div>
- </div>
-</tobago-select-many-checkbox>
+<div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' checked='checked' name='id' id='id::0' value='Entry One' required='required'>
+<label class='form-check-label' for='id::0'>Entry One</label></div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' name='id' id='id::1' value='Entry Two' required='required'>
+<label class='form-check-label' for='id::1'>Entry Two</label></div></div></tobago-select-many-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionRendered.html b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionRendered.html
index 1602eac779..e204dd0fe6 100644
--- a/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionRendered.html
+++ b/tobago-core/src/test/resources/renderer/selectManyCheckbox/selectManyCheckboxNoSelectionOptionRendered.html
@@ -16,18 +16,13 @@
-->
<tobago-select-many-checkbox id='id' class='tobago-auto-spacing'>
- <div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' name='id' id='id::0' value=''>
- <label class='form-check-label' for='id::0'>Choose a value..</label>
- </div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' name='id' id='id::1' value='Entry One'>
- <label class='form-check-label' for='id::1'>Entry One</label>
- </div>
- <div class='form-check'>
- <input class='form-check-input' type='checkbox' name='id' id='id::2' value='Entry Two'>
- <label class='form-check-label' for='id::2'>Entry Two</label>
- </div>
- </div>
-</tobago-select-many-checkbox>
+<div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' name='id' id='id::0' value=''>
+<label class='form-check-label' for='id::0'>Choose a value..</label></div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' name='id' id='id::1' value='Entry One'>
+<label class='form-check-label' for='id::1'>Entry One</label></div>
+<div class='form-check'>
+<input class='form-check-input' type='checkbox' name='id' id='id::2' value='Entry Two'>
+<label class='form-check-label' for='id::2'>Entry Two</label></div></div></tobago-select-many-checkbox>
diff --git a/tobago-core/src/test/resources/renderer/selectManyList/selectManyListAjax.html b/tobago-core/src/test/resources/renderer/selectManyList/selectManyListAjax.html
index 0148e49623..f5a738d5d2 100644
--- a/tobago-core/src/test/resources/renderer/selectManyList/selectManyListAjax.html
+++ b/tobago-core/src/test/resources/renderer/selectManyList/selectManyListAjax.html
@@ -16,37 +16,21 @@
-->
<tobago-select-many-list id='id' class='tobago-auto-spacing'>
- <select id='id::field' name='id' class='d-none' multiple='multiple'>
- <option value='Stratocaster'>Stratocaster
- </option>
- <option value='Telecaster'>Telecaster
- </option></select>
- <div class='dropdown'>
- <div id='id::selectField' name='id' class='form-select tobago-select-field dropdown-toggle' aria-expanded='false'>
- <div class='tobago-badges'>
- </div>
- <input type='search' id='id::filter' class='tobago-filter form-control' autocomplete='off' readonly='readonly'>
- </div>
- <div class='tobago-options tobago-dropdown-menu' name='id'>
- <table class='table table-hover table-sm'>
- <tbody>
- <tr data-tobago-value='Stratocaster' class='tobago-select-item' tabindex='-1'>
- <td value='Stratocaster'>Stratocaster
- </td>
- </tr>
- <tr data-tobago-value='Telecaster' class='tobago-select-item' tabindex='-1'>
- <td value='Telecaster'>Telecaster
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr class='tobago-no-entries d-none'>
- <td>---
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
- </div>
- <tobago-behavior event='change' client-id='id' field-id='id::field' execute='id'></tobago-behavior>
-</tobago-select-many-list>
+<select id='id::field' name='id' class='d-none' multiple='multiple'>
+<option value='Stratocaster'>Stratocaster</option>
+<option value='Telecaster'>Telecaster</option></select>
+<div class='dropdown'>
+<div id='id::selectField' name='id' class='form-select tobago-select-field dropdown-toggle' aria-expanded='false'>
+<div class='tobago-badges'></div>
+<input type='search' id='id::filter' class='tobago-filter form-control' autocomplete='off' readonly='readonly'></div>
+<div class='tobago-options tobago-dropdown-menu' name='id'>
+<table class='table table-hover table-sm'>
+<tbody>
+<tr data-tobago-value='Stratocaster' class='tobago-select-item' tabindex='-1'>
+<td value='Stratocaster'>Stratocaster</td></tr>
+<tr data-tobago-value='Telecaster' class='tobago-select-item' tabindex='-1'>
+<td value='Telecaster'>Telecaster</td></tr></tbody>
+<tfoot>
+<tr class='tobago-no-entries d-none'>
+<td>---</td></tr></tfoot></table></div></div>
+<tobago-behavior event='change' client-id='id' field-id='id::field' execute='id'></tobago-behavior></tobago-select-many-list>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html
index 0a4e6f465f..bfb5fa31c4 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/error-message.html
@@ -16,34 +16,22 @@
-->
<tobago-select-many-shuttle id='id' class='tobago-auto-spacing'>
- <div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
- <div class='tobago-body' title='a test'>
- <div class='tobago-unselected-container'>
- <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
- <div class='tobago-controls'>
- <div class='btn-group-vertical'>
- <button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
- <button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
- </div>
- </div>
- <div class='tobago-selected-container'>
- <select id='id::selected' class='tobago-selected is-error form-select' multiple='multiple' size='2'></select>
- </div>
- <select class='d-none' id='id::hidden' name='id' multiple='multiple'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
- <tobago-popover label='Error' value='a test'>
- <a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-many-shuttle>
+<div class='tobago-messages-container tobago-button-right' data-tobago-faces-message='a test'>
+<div class='tobago-body' title='a test'>
+<div class='tobago-unselected-container'>
+<select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div>
+<div class='tobago-controls'>
+<div class='btn-group-vertical'>
+<button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
+<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button></div></div>
+<div class='tobago-selected-container'>
+<select id='id::selected' class='tobago-selected is-error form-select' multiple='multiple' size='2'></select></div>
+<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div>
+<tobago-popover label='Error' value='a test'>
+<a tabindex='0' role='button' class='btn btn-danger'><i class='bi-exclamation-lg'></i></a></tobago-popover></div></tobago-select-many-shuttle>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html
index a25a430423..5175631d7b 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/help.html
@@ -16,34 +16,22 @@
-->
<tobago-select-many-shuttle id='id' class='tobago-auto-spacing'>
- <div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
- <div class='tobago-body'>
- <div class='tobago-unselected-container'>
- <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
- <div class='tobago-controls'>
- <div class='btn-group-vertical'>
- <button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
- <button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
- </div>
- </div>
- <div class='tobago-selected-container'>
- <select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select>
- </div>
- <select class='d-none' id='id::hidden' name='id' multiple='multiple'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
- <tobago-popover label='Help' value='Help!'>
- <a tabindex='0' role='button' class='btn btn-outline-info'><i class='bi-question-lg'></i></a>
- </tobago-popover>
- </div>
-</tobago-select-many-shuttle>
+<div class='tobago-help-container tobago-button-right' data-tobago-help='Help!'>
+<div class='tobago-body'>
+<div class='tobago-unselected-container'>
+<select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div>
+<div class='tobago-controls'>
+<div class='btn-group-vertical'>
+<button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
+<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button></div></div>
+<div class='tobago-selected-container'>
+<select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select></div>
+<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div>
+<tobago-popover label='Help' value='Help!'>
+<a tabindex='0' role='button' class='btn btn-outline-info'><i class='bi-question-lg'></i></a></tobago-popover></div></tobago-select-many-shuttle>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html
index c2b6b70973..87ad0fd15d 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/label.html
@@ -16,30 +16,20 @@
-->
<tobago-select-many-shuttle id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::unselected' class='col-form-label'>label</label>
- <div class='tobago-body'>
- <div class='tobago-unselected-container'>
- <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
- <div class='tobago-controls'>
- <div class='btn-group-vertical'>
- <button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
- <button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
- </div>
- </div>
- <div class='tobago-selected-container'>
- <select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select>
- </div>
- <select class='d-none' id='id::hidden' name='id' multiple='multiple'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
-</tobago-select-many-shuttle>
+<label for='id::unselected' class='col-form-label'>label</label>
+<div class='tobago-body'>
+<div class='tobago-unselected-container'>
+<select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div>
+<div class='tobago-controls'>
+<div class='btn-group-vertical'>
+<button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
+<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button></div></div>
+<div class='tobago-selected-container'>
+<select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select></div>
+<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div></tobago-select-many-shuttle>
diff --git a/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html b/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html
index bab5ed12b2..ee49508958 100644
--- a/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html
+++ b/tobago-core/src/test/resources/renderer/selectManyShuttle/simple.html
@@ -16,29 +16,19 @@
-->
<tobago-select-many-shuttle id='id' class='tobago-auto-spacing'>
- <div class='tobago-body'>
- <div class='tobago-unselected-container'>
- <select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
- <div class='tobago-controls'>
- <div class='btn-group-vertical'>
- <button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
- <button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
- <button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button>
- </div>
- </div>
- <div class='tobago-selected-container'>
- <select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select>
- </div>
- <select class='d-none' id='id::hidden' name='id' multiple='multiple'>
- <option value=''>Value 1
- </option>
- <option value=''>Value 2
- </option></select>
- </div>
-</tobago-select-many-shuttle>
+<div class='tobago-body'>
+<div class='tobago-unselected-container'>
+<select id='id::unselected' class='tobago-unselected form-select' multiple='multiple' size='2'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div>
+<div class='tobago-controls'>
+<div class='btn-group-vertical'>
+<button type='button' class='btn btn-secondary' id='id::addAll'><i class='bi-chevron-double-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::add'><i class='bi-chevron-right'></i></button>
+<button type='button' class='btn btn-secondary' id='id::remove'><i class='bi-chevron-left'></i></button>
+<button type='button' class='btn btn-secondary' id='id::removeAll'><i class='bi-chevron-double-left'></i></button></div></div>
+<div class='tobago-selected-container'>
+<select id='id::selected' class='tobago-selected form-select' multiple='multiple' size='2'></select></div>
+<select class='d-none' id='id::hidden' name='id' multiple='multiple'>
+<option value=''>Value 1</option>
+<option value=''>Value 2</option></select></div></tobago-select-many-shuttle>
diff --git a/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceLabel.html b/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceLabel.html
index 768d82bf02..135524f6b6 100644
--- a/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceLabel.html
@@ -16,10 +16,7 @@
-->
<tobago-select-one-choice id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <select id='id::field' name='id' class='form-select'>
- <option value=''>Stratocaster
- </option>
- <option value=''>Telecaster
- </option></select>
-</tobago-select-one-choice>
+<label for='id::field' class='col-form-label'>label</label>
+<select id='id::field' name='id' class='form-select'>
+<option value=''>Stratocaster</option>
+<option value=''>Telecaster</option></select></tobago-select-one-choice>
diff --git a/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionNotRendered.html b/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionNotRendered.html
index e96223bd9d..391c10ab43 100644
--- a/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionNotRendered.html
+++ b/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionNotRendered.html
@@ -16,8 +16,6 @@
-->
<tobago-select-one-choice id='id' class='tobago-label-container tobago-auto-spacing tobago-required'>
- <label for='id::field' class='tobago-required col-form-label'>label</label>
- <select id='id::field' name='id' required='required' class='form-select'>
- <option value='Telecaster' selected='selected'>Telecaster
- </option></select>
-</tobago-select-one-choice>
+<label for='id::field' class='tobago-required col-form-label'>label</label>
+<select id='id::field' name='id' required='required' class='form-select'>
+<option value='Telecaster' selected='selected'>Telecaster</option></select></tobago-select-one-choice>
diff --git a/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionRendered.html b/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionRendered.html
index 97e68d5acb..b478bdd56c 100644
--- a/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionRendered.html
+++ b/tobago-core/src/test/resources/renderer/selectOneChoice/selectOneChoiceNoSelectionOptionRendered.html
@@ -16,10 +16,7 @@
-->
<tobago-select-one-choice id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <select id='id::field' name='id' class='form-select'>
- <option value=''>Choose a value..
- </option>
- <option value=''>Telecaster
- </option></select>
-</tobago-select-one-choice>
+<label for='id::field' class='col-form-label'>label</label>
+<select id='id::field' name='id' class='form-select'>
+<option value=''>Choose a value..</option>
+<option value=''>Telecaster</option></select></tobago-select-one-choice>
diff --git a/tobago-core/src/test/resources/renderer/selectOneList/selectOneListAjax.html b/tobago-core/src/test/resources/renderer/selectOneList/selectOneListAjax.html
index 6b33ddd0ff..d29494144d 100644
--- a/tobago-core/src/test/resources/renderer/selectOneList/selectOneListAjax.html
+++ b/tobago-core/src/test/resources/renderer/selectOneList/selectOneListAjax.html
@@ -16,36 +16,21 @@
-->
<tobago-select-one-list id='id' class='tobago-auto-spacing'>
- <select id='id::field' name='id' class='d-none'>
- <option value='Stratocaster'>Stratocaster
- </option>
- <option value='Telecaster'>Telecaster
- </option></select>
- <div class='dropdown'>
- <div id='id::selectField' name='id' class='form-select tobago-select-field dropdown-toggle' aria-expanded='false'>
- <span></span>
- <input type='search' id='id::filter' class='tobago-filter form-control' autocomplete='off' readonly='readonly'>
- </div>
- <div class='tobago-options tobago-dropdown-menu' name='id'>
- <table class='table table-hover table-sm'>
- <tbody>
- <tr data-tobago-value='Stratocaster' class='tobago-select-item' tabindex='-1'>
- <td value='Stratocaster'>Stratocaster
- </td>
- </tr>
- <tr data-tobago-value='Telecaster' class='tobago-select-item' tabindex='-1'>
- <td value='Telecaster'>Telecaster
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr class='tobago-no-entries d-none'>
- <td>---
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
- </div>
- <tobago-behavior event='change' client-id='id' field-id='id::field' execute='id'></tobago-behavior>
-</tobago-select-one-list>
+<select id='id::field' name='id' class='d-none'>
+<option value='Stratocaster'>Stratocaster</option>
+<option value='Telecaster'>Telecaster</option></select>
+<div class='dropdown'>
+<div id='id::selectField' name='id' class='form-select tobago-select-field dropdown-toggle' aria-expanded='false'>
+<span></span>
+<input type='search' id='id::filter' class='tobago-filter form-control' autocomplete='off' readonly='readonly'></div>
+<div class='tobago-options tobago-dropdown-menu' name='id'>
+<table class='table table-hover table-sm'>
+<tbody>
+<tr data-tobago-value='Stratocaster' class='tobago-select-item' tabindex='-1'>
+<td value='Stratocaster'>Stratocaster</td></tr>
+<tr data-tobago-value='Telecaster' class='tobago-select-item' tabindex='-1'>
+<td value='Telecaster'>Telecaster</td></tr></tbody>
+<tfoot>
+<tr class='tobago-no-entries d-none'>
+<td>---</td></tr></tfoot></table></div></div>
+<tobago-behavior event='change' client-id='id' field-id='id::field' execute='id'></tobago-behavior></tobago-select-one-list>
diff --git a/tobago-core/src/test/resources/renderer/selectOneRadio/selectOneRadioLabel.html b/tobago-core/src/test/resources/renderer/selectOneRadio/selectOneRadioLabel.html
index 243f05cd1a..0d2bfabc43 100644
--- a/tobago-core/src/test/resources/renderer/selectOneRadio/selectOneRadioLabel.html
+++ b/tobago-core/src/test/resources/renderer/selectOneRadio/selectOneRadioLabel.html
@@ -16,15 +16,11 @@
-->
<tobago-select-one-radio id='id' class='tobago-label-container tobago-auto-spacing'>
- <label class='col-form-label'>label</label>
- <div>
- <div class='form-check'>
- <input class='form-check-input' type='radio' checked='checked' name='id' id='id::0' value=''>
- <label class='form-check-label' for='id::0'>Stratocaster</label>
- </div>
- <div class='form-check'>
- <input class='form-check-input' type='radio' checked='checked' name='id' id='id::1' value=''>
- <label class='form-check-label' for='id::1'>Telecaster</label>
- </div>
- </div>
-</tobago-select-one-radio>
\ No newline at end of file
+<label class='col-form-label'>label</label>
+<div>
+<div class='form-check'>
+<input class='form-check-input' type='radio' checked='checked' name='id' id='id::0' value=''>
+<label class='form-check-label' for='id::0'>Stratocaster</label></div>
+<div class='form-check'>
+<input class='form-check-input' type='radio' checked='checked' name='id' id='id::1' value=''>
+<label class='form-check-label' for='id::1'>Telecaster</label></div></div></tobago-select-one-radio>
diff --git a/tobago-core/src/test/resources/renderer/selectOneRadio/selectReference.html b/tobago-core/src/test/resources/renderer/selectOneRadio/selectReference.html
index a4af2749f2..eb77bbb9d3 100644
--- a/tobago-core/src/test/resources/renderer/selectOneRadio/selectReference.html
+++ b/tobago-core/src/test/resources/renderer/selectOneRadio/selectReference.html
@@ -16,22 +16,15 @@
-->
<tobago-panel id='panel'>
- <tobago-select-one-radio id='id' class='tobago-label-container tobago-auto-spacing'>
- <label class='col-form-label'>label</label>
- <div>
- <div class='form-check'>
- <input class='form-check-input' type='radio' checked='checked' name='id' id='id::0' value=''>
- <label class='form-check-label' for='id::0'>Stratocaster</label>
- </div>
- </div>
- </tobago-select-one-radio>
- <tobago-select-one-radio id='ref' class='tobago-label-container tobago-auto-spacing'>
- <label class='col-form-label'>label</label>
- <div>
- <div class='form-check'>
- <input class='form-check-input' type='radio' checked='checked' name='id' id='id::1' value=''>
- <label class='form-check-label' for='id::1'>Telecaster</label>
- </div>
- </div>
- </tobago-select-one-radio>
-</tobago-panel>
\ No newline at end of file
+<tobago-select-one-radio id='id' class='tobago-label-container tobago-auto-spacing'>
+<label class='col-form-label'>label</label>
+<div>
+<div class='form-check'>
+<input class='form-check-input' type='radio' checked='checked' name='id' id='id::0' value=''>
+<label class='form-check-label' for='id::0'>Stratocaster</label></div></div></tobago-select-one-radio>
+<tobago-select-one-radio id='ref' class='tobago-label-container tobago-auto-spacing'>
+<label class='col-form-label'>label</label>
+<div>
+<div class='form-check'>
+<input class='form-check-input' type='radio' checked='checked' name='id' id='id::1' value=''>
+<label class='form-check-label' for='id::1'>Telecaster</label></div></div></tobago-select-one-radio></tobago-panel>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html b/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html
index 325eb0928a..adaab4744b 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet-columns.html
@@ -16,77 +16,48 @@
-->
<tobago-sheet id='sheet' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='3' data-tobago-layout='{"columns":[{"measure":"300px"}]}'>
- <input id='sheet::widths' name='sheet::widths' type='hidden' value='[]'>
- <input id='sheet::rendered' name='sheet::rendered' type='hidden' value='[true]'>
- <input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
- <input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
- <header>
- <table cellspacing='0' cellpadding='0' summary='' class='table tobago-tableLayout-fixed'>
- <colgroup>
- <col>
- <col class='tobago-row-filler'>
- <col class='tobago-behavior-container'>
- </colgroup>
- <style nonce='dummy' id='j_id__v_0'>#sheet > header > table > colgroup > col:nth-child(1), #sheet > .tobago-body > table > colgroup > col:nth-child(1){width:300px;}
- </style>
- <style nonce='dummy' id='j_id__v_1'>#sheet > header > table > colgroup > col.tobago-row-filler, #sheet > .tobago-body > table > colgroup > col.tobago-row-filler{width:0px;}
- </style>
- <style nonce='dummy' id='j_id__v_2'>#sheet > header > table > colgroup > col.tobago-behavior-container, #sheet > .tobago-body > table > colgroup > col.tobago-behavior-container{width:0px;}
- </style>
- <thead>
- <tr>
- <th>
- <span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span>
- <span class='tobago-resize' data-tobago-column-index='0'> </span>
- </th>
- <th class='tobago-row-filler'>
- <span></span>
- </th>
- <th class='tobago-behavior-container'>
- <span></span>
- </th>
- </tr>
- </thead>
- </table>
- <div class='tobago-scrollbar-filler table'>
- </div>
- </header>
- <div class='tobago-body'>
- <table cellspacing='0' cellpadding='0' summary='' class='table tobago-tableLayout-fixed'>
- <colgroup>
- <col>
- <col class='tobago-row-filler'>
- <col class='tobago-behavior-container'>
- </colgroup>
- <tbody>
- <tr row-index='0'>
- <td>
- <tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
- </td>
- <td class='tobago-row-filler'>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='1'>
- <td>
- <tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
- </td>
- <td class='tobago-row-filler'>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='2'>
- <td>
- <tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out>
- </td>
- <td class='tobago-row-filler'>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</tobago-sheet>
+<input id='sheet::widths' name='sheet::widths' type='hidden' value='[]'>
+<input id='sheet::rendered' name='sheet::rendered' type='hidden' value='[true]'>
+<input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
+<input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
+<header>
+<table cellspacing='0' cellpadding='0' summary='' class='table tobago-tableLayout-fixed'>
+<colgroup>
+<col>
+<col class='tobago-row-filler'>
+<col class='tobago-behavior-container'></colgroup>
+<style nonce='dummy' id='j_id__v_0'>#sheet > header > table > colgroup > col:nth-child(1), #sheet > .tobago-body > table > colgroup > col:nth-child(1){width:300px;}</style>
+<style nonce='dummy' id='j_id__v_1'>#sheet > header > table > colgroup > col.tobago-row-filler, #sheet > .tobago-body > table > colgroup > col.tobago-row-filler{width:0px;}</style>
+<style nonce='dummy' id='j_id__v_2'>#sheet > header > table > colgroup > col.tobago-behavior-container, #sheet > .tobago-body > table > colgroup > col.tobago-behavior-container{width:0px;}</style>
+<thead>
+<tr>
+<th>
+<span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span>
+<span class='tobago-resize' data-tobago-column-index='0'> </span></th>
+<th class='tobago-row-filler'>
+<span></span></th>
+<th class='tobago-behavior-container'>
+<span></span></th></tr></thead></table>
+<div class='tobago-scrollbar-filler table'></div></header>
+<div class='tobago-body'>
+<table cellspacing='0' cellpadding='0' summary='' class='table tobago-tableLayout-fixed'>
+<colgroup>
+<col>
+<col class='tobago-row-filler'>
+<col class='tobago-behavior-container'></colgroup>
+<tbody>
+<tr row-index='0'>
+<td>
+<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out></td>
+<td class='tobago-row-filler'></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='1'>
+<td>
+<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out></td>
+<td class='tobago-row-filler'></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='2'>
+<td>
+<tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out></td>
+<td class='tobago-row-filler'></td>
+<td class='tobago-behavior-container'></td></tr></tbody></table></div></tobago-sheet>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet-label-bar-facet.html b/tobago-core/src/test/resources/renderer/sheet/sheet-label-bar-facet.html
index 7f30be1b63..8530ea3f27 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet-label-bar-facet.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet-label-bar-facet.html
@@ -16,44 +16,27 @@
-->
<tobago-sheet id='sheet' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='3'>
- <input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
- <input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
- <div class='tobago-body'>
- <table cellspacing='0' cellpadding='0' summary='' class='table'>
- <thead>
- <tr>
- <th>
- <span><tobago-out id='sheet:label'><span class='form-control-plaintext'>label text</span></tobago-out></span>
- <tobago-out id='sheet:bar'><span class='form-control-plaintext'>bar text</span></tobago-out>
- </th>
- <th class='tobago-behavior-container'>
- <span></span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr row-index='0'>
- <td>
- <tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='1'>
- <td>
- <tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='2'>
- <td>
- <tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</tobago-sheet>
+<input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
+<input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
+<div class='tobago-body'>
+<table cellspacing='0' cellpadding='0' summary='' class='table'>
+<thead>
+<tr>
+<th>
+<span><tobago-out id='sheet:label'><span class='form-control-plaintext'>label text</span></tobago-out></span>
+<tobago-out id='sheet:bar'><span class='form-control-plaintext'>bar text</span></tobago-out></th>
+<th class='tobago-behavior-container'>
+<span></span></th></tr></thead>
+<tbody>
+<tr row-index='0'>
+<td>
+<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='1'>
+<td>
+<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='2'>
+<td>
+<tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr></tbody></table></div></tobago-sheet>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet-paginatorList.html b/tobago-core/src/test/resources/renderer/sheet/sheet-paginatorList.html
index 149407ce0e..b44d624e0c 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet-paginatorList.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet-paginatorList.html
@@ -16,60 +16,37 @@
-->
<tobago-sheet id='sheet' data-tobago-selection-mode='multi' data-tobago-first='0' rows='2' row-count='10'>
- <input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
- <input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
- <div class='tobago-body'>
- <table cellspacing='0' cellpadding='0' summary='' class='table'>
- <thead>
- <tr>
- <th>
- <span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span>
- </th>
- <th class='tobago-behavior-container'>
- <span></span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr row-index='0'>
- <td>
- <tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='1'>
- <td>
- <tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <footer>
- </footer>
- <tobago-paginator-panel id='sheet:panel' class='d-flex justify-content-center'>
- <tobago-paginator-list id='sheet:list'>
- <input type='hidden' id='sheet:list::field' name='sheet:list'>
- <ul class='pagination'>
- <li class='active page-item'>
- <button type='button' class='page-link' title='Page 1' data-tobago-action='{"action":"toPage","target":1}'>1</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 2' data-tobago-action='{"action":"toPage","target":2}'>2</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 3' data-tobago-action='{"action":"toPage","target":3}'>3</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 4' data-tobago-action='{"action":"toPage","target":4}'>4</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 5' data-tobago-action='{"action":"toPage","target":5}'>5</button>
- </li>
- </ul>
- </tobago-paginator-list>
- </tobago-paginator-panel>
-</tobago-sheet>
+<input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
+<input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
+<div class='tobago-body'>
+<table cellspacing='0' cellpadding='0' summary='' class='table'>
+<thead>
+<tr>
+<th>
+<span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span></th>
+<th class='tobago-behavior-container'>
+<span></span></th></tr></thead>
+<tbody>
+<tr row-index='0'>
+<td>
+<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='1'>
+<td>
+<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr></tbody></table></div>
+<footer></footer>
+<tobago-paginator-panel id='sheet:panel' class='d-flex justify-content-center'>
+<tobago-paginator-list id='sheet:list'>
+<input type='hidden' id='sheet:list::field' name='sheet:list'>
+<ul class='pagination'>
+<li class='active page-item'>
+<button type='button' class='page-link' title='Page 1' data-tobago-action='{"action":"toPage","target":1}'>1</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 2' data-tobago-action='{"action":"toPage","target":2}'>2</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 3' data-tobago-action='{"action":"toPage","target":3}'>3</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 4' data-tobago-action='{"action":"toPage","target":4}'>4</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 5' data-tobago-action='{"action":"toPage","target":5}'>5</button></li></ul></tobago-paginator-list></tobago-paginator-panel></tobago-sheet>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html b/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html
index 027e149250..f7ab7f8d48 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet-paging.html
@@ -16,82 +16,51 @@
-->
<tobago-sheet id='sheet' data-tobago-selection-mode='multi' data-tobago-first='0' rows='2' row-count='10'>
- <input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
- <input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
- <div class='tobago-body'>
- <table cellspacing='0' cellpadding='0' summary='' class='table'>
- <thead>
- <tr>
- <th>
- <span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span>
- </th>
- <th class='tobago-behavior-container'>
- <span></span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr row-index='0'>
- <td>
- <tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='1'>
- <td>
- <tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <footer>
- </footer>
- <tobago-paginator-panel id='sheet:_after' class='d-flex justify-content-between'>
- <tobago-paginator-row id='sheet:_paginator_row' class='pagination'>
- <span class='page-item' title='Click here, to change the first displayed row'><span class='page-link text-nowrap'>Rows <span>1</span><input id='sheet:_paginator_row::field' name='sheet:_paginator_row' type='text' value='1' maxlength='2' pattern='[1-9][0-9]?'> to 2 of 10</span></span>
- </tobago-paginator-row>
- <tobago-paginator-list id='sheet:_paginator_list'>
- <input type='hidden' id='sheet:_paginator_list::field' name='sheet:_paginator_list'>
- <ul class='pagination'>
- <li class='active page-item'>
- <button type='button' class='page-link' title='Page 1' data-tobago-action='{"action":"toPage","target":1}'>1</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 2' data-tobago-action='{"action":"toPage","target":2}'>2</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 3' data-tobago-action='{"action":"toPage","target":3}'>3</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 4' data-tobago-action='{"action":"toPage","target":4}'>4</button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Page 5' data-tobago-action='{"action":"toPage","target":5}'>5</button>
- </li>
- </ul>
- </tobago-paginator-list>
- <tobago-paginator-page id='sheet:_paginator_page'>
- <ul class='pagination'>
- <li class='disabled page-item'>
- <button type='button' class='page-link' title='First Page' disabled='disabled' data-tobago-action='{"action":"first"}'><i class='bi-skip-start'></i></button>
- </li>
- <li class='disabled page-item'>
- <button type='button' class='page-link' title='Previous Page' disabled='disabled' data-tobago-action='{"action":"prev"}'><i class='bi-caret-left'></i></button>
- </li>
- <li class='page-item'>
- <span class='tobago-paging page-link text-nowrap' title='Click here, to change the displayed page'>Page <span>1</span><input id='sheet:_paginator_page::field' name='sheet:_paginator_page' type='text' value='1' maxlength='1'> of 5</span>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Next Page' data-tobago-action='{"action":"next"}'><i class='bi-caret-right'></i></button>
- </li>
- <li class='page-item'>
- <button type='button' class='page-link' title='Last Page' data-tobago-action='{"action":"last"}'><i class='bi-skip-end'></i></button>
- </li>
- </ul>
- </tobago-paginator-page>
- </tobago-paginator-panel>
-</tobago-sheet>
+<input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
+<input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
+<div class='tobago-body'>
+<table cellspacing='0' cellpadding='0' summary='' class='table'>
+<thead>
+<tr>
+<th>
+<span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span></th>
+<th class='tobago-behavior-container'>
+<span></span></th></tr></thead>
+<tbody>
+<tr row-index='0'>
+<td>
+<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='1'>
+<td>
+<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr></tbody></table></div>
+<footer></footer>
+<tobago-paginator-panel id='sheet:_after' class='d-flex justify-content-between'>
+<tobago-paginator-row id='sheet:_paginator_row' class='pagination'>
+<span class='page-item' title='Click here, to change the first displayed row'><span class='page-link text-nowrap'>Rows <span>1</span><input id='sheet:_paginator_row::field' name='sheet:_paginator_row' type='text' value='1' maxlength='2' pattern='[1-9][0-9]?'> to 2 of 10</span></span></tobago-paginator-row>
+<tobago-paginator-list id='sheet:_paginator_list'>
+<input type='hidden' id='sheet:_paginator_list::field' name='sheet:_paginator_list'>
+<ul class='pagination'>
+<li class='active page-item'>
+<button type='button' class='page-link' title='Page 1' data-tobago-action='{"action":"toPage","target":1}'>1</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 2' data-tobago-action='{"action":"toPage","target":2}'>2</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 3' data-tobago-action='{"action":"toPage","target":3}'>3</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 4' data-tobago-action='{"action":"toPage","target":4}'>4</button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Page 5' data-tobago-action='{"action":"toPage","target":5}'>5</button></li></ul></tobago-paginator-list>
+<tobago-paginator-page id='sheet:_paginator_page'>
+<ul class='pagination'>
+<li class='disabled page-item'>
+<button type='button' class='page-link' title='First Page' disabled='disabled' data-tobago-action='{"action":"first"}'><i class='bi-skip-start'></i></button></li>
+<li class='disabled page-item'>
+<button type='button' class='page-link' title='Previous Page' disabled='disabled' data-tobago-action='{"action":"prev"}'><i class='bi-caret-left'></i></button></li>
+<li class='page-item'>
+<span class='tobago-paging page-link text-nowrap' title='Click here, to change the displayed page'>Page <span>1</span><input id='sheet:_paginator_page::field' name='sheet:_paginator_page' type='text' value='1' maxlength='1'> of 5</span></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Next Page' data-tobago-action='{"action":"next"}'><i class='bi-caret-right'></i></button></li>
+<li class='page-item'>
+<button type='button' class='page-link' title='Last Page' data-tobago-action='{"action":"last"}'><i class='bi-skip-end'></i></button></li></ul></tobago-paginator-page></tobago-paginator-panel></tobago-sheet>
diff --git a/tobago-core/src/test/resources/renderer/sheet/sheet.html b/tobago-core/src/test/resources/renderer/sheet/sheet.html
index 4ac9291c66..513b9028b6 100644
--- a/tobago-core/src/test/resources/renderer/sheet/sheet.html
+++ b/tobago-core/src/test/resources/renderer/sheet/sheet.html
@@ -16,43 +16,26 @@
-->
<tobago-sheet id='sheet' data-tobago-selection-mode='multi' data-tobago-first='0' rows='0' row-count='3'>
- <input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
- <input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
- <div class='tobago-body'>
- <table cellspacing='0' cellpadding='0' summary='' class='table'>
- <thead>
- <tr>
- <th>
- <span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span>
- </th>
- <th class='tobago-behavior-container'>
- <span></span>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr row-index='0'>
- <td>
- <tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='1'>
- <td>
- <tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- <tr row-index='2'>
- <td>
- <tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out>
- </td>
- <td class='tobago-behavior-container'>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</tobago-sheet>
+<input id='sheet::scrollPosition' name='sheet::scrollPosition' type='hidden' value='[0,0]'>
+<input id='sheet::selected' name='sheet::selected' type='hidden' value='[]'>
+<div class='tobago-body'>
+<table cellspacing='0' cellpadding='0' summary='' class='table'>
+<thead>
+<tr>
+<th>
+<span><tobago-out id='sheet:_col0'><span class='form-control-plaintext'>Alphabet</span></tobago-out></span></th>
+<th class='tobago-behavior-container'>
+<span></span></th></tr></thead>
+<tbody>
+<tr row-index='0'>
+<td>
+<tobago-out id='sheet:0:out'><span class='form-control-plaintext'>Name 0</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='1'>
+<td>
+<tobago-out id='sheet:1:out'><span class='form-control-plaintext'>Name 1</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr>
+<tr row-index='2'>
+<td>
+<tobago-out id='sheet:2:out'><span class='form-control-plaintext'>Name 2</span></tobago-out></td>
+<td class='tobago-behavior-container'></td></tr></tbody></table></div></tobago-sheet>
diff --git a/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-bar.html b/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-bar.html
index 4d00614c6d..dc3c3fd16c 100644
--- a/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-bar.html
+++ b/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-bar.html
@@ -16,24 +16,15 @@
-->
<tobago-tab-group id='id' class='card tobago-auto-spacing' switch-type='client'>
- <input type='hidden' value='0' name='id::index' id='id::index'>
- <div class='card-header'>
- <ul class='nav nav-tabs card-header-tabs' role='tablist'>
- <tobago-tab id='t1' class='nav-item' for='id' role='presentation' index='0'>
- <a data-toggle='tab' class='nav-link active' data-target='#t1\:\:content' role='tab'><span>T1</span></a>
- </tobago-tab>
- <tobago-tab id='t2' class='nav-item tobago-bar' for='id' role='presentation' index='1'>
- <a data-toggle='tab' class='nav-link' data-target='#t2\:\:content' role='tab'><span>T2</span></a>
- <div>
- <button type='button' id='t2:b' name='t2:b' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='t2:b'></tobago-behavior><span>B</span></button>
- </div>
- </tobago-tab>
- </ul>
- </div>
- <div class='card-body tab-content'>
- <div class='tab-pane active' role='tabpanel' id='t1::content' data-index='0'>
- </div>
- <div class='tab-pane' role='tabpanel' id='t2::content' data-index='1'>
- </div>
- </div>
-</tobago-tab-group>
+<input type='hidden' value='0' name='id::index' id='id::index'>
+<div class='card-header'>
+<ul class='nav nav-tabs card-header-tabs' role='tablist'>
+<tobago-tab id='t1' class='nav-item' for='id' role='presentation' index='0'>
+<a data-toggle='tab' class='nav-link active' data-target='#t1\:\:content' role='tab'><span>T1</span></a></tobago-tab>
+<tobago-tab id='t2' class='nav-item tobago-bar' for='id' role='presentation' index='1'>
+<a data-toggle='tab' class='nav-link' data-target='#t2\:\:content' role='tab'><span>T2</span></a>
+<div>
+<button type='button' id='t2:b' name='t2:b' class='tobago-button btn btn-secondary'><tobago-behavior event='click' client-id='t2:b'></tobago-behavior><span>B</span></button></div></tobago-tab></ul></div>
+<div class='card-body tab-content'>
+<div class='tab-pane active' role='tabpanel' id='t1::content' data-index='0'></div>
+<div class='tab-pane' role='tabpanel' id='t2::content' data-index='1'></div></div></tobago-tab-group>
diff --git a/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-label.html b/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-label.html
index da1ede3d93..1fea24438c 100644
--- a/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-label.html
+++ b/tobago-core/src/test/resources/renderer/tabGroup/tabGroup-label.html
@@ -16,21 +16,13 @@
-->
<tobago-tab-group id='id' class='card tobago-auto-spacing' switch-type='client'>
- <input type='hidden' value='0' name='id::index' id='id::index'>
- <div class='card-header'>
- <ul class='nav nav-tabs card-header-tabs' role='tablist'>
- <tobago-tab id='t1' class='nav-item' for='id' role='presentation' index='0'>
- <a data-toggle='tab' class='nav-link active' data-target='#t1\:\:content' role='tab'><span>T1</span></a>
- </tobago-tab>
- <tobago-tab id='t2' class='nav-item' for='id' role='presentation' index='1'>
- <a data-toggle='tab' class='nav-link' data-target='#t2\:\:content' role='tab'><span>T2</span><tobago-out id='t2:o' class='tobago-label-container'><label for='t2:o' class='col-form-label'>Label</label><span class='form-control-plaintext'></span></tobago-out></a>
- </tobago-tab>
- </ul>
- </div>
- <div class='card-body tab-content'>
- <div class='tab-pane active' role='tabpanel' id='t1::content' data-index='0'>
- </div>
- <div class='tab-pane' role='tabpanel' id='t2::content' data-index='1'>
- </div>
- </div>
-</tobago-tab-group>
+<input type='hidden' value='0' name='id::index' id='id::index'>
+<div class='card-header'>
+<ul class='nav nav-tabs card-header-tabs' role='tablist'>
+<tobago-tab id='t1' class='nav-item' for='id' role='presentation' index='0'>
+<a data-toggle='tab' class='nav-link active' data-target='#t1\:\:content' role='tab'><span>T1</span></a></tobago-tab>
+<tobago-tab id='t2' class='nav-item' for='id' role='presentation' index='1'>
+<a data-toggle='tab' class='nav-link' data-target='#t2\:\:content' role='tab'><span>T2</span><tobago-out id='t2:o' class='tobago-label-container'><label for='t2:o' class='col-form-label'>Label</label><span class='form-control-plaintext'></span></tobago-out></a></tobago-tab></ul></div>
+<div class='card-body tab-content'>
+<div class='tab-pane active' role='tabpanel' id='t1::content' data-index='0'></div>
+<div class='tab-pane' role='tabpanel' id='t2::content' data-index='1'></div></div></tobago-tab-group>
diff --git a/tobago-core/src/test/resources/renderer/tabGroup/tabGroup.html b/tobago-core/src/test/resources/renderer/tabGroup/tabGroup.html
index 374961f735..79c28b5dd9 100644
--- a/tobago-core/src/test/resources/renderer/tabGroup/tabGroup.html
+++ b/tobago-core/src/test/resources/renderer/tabGroup/tabGroup.html
@@ -16,21 +16,13 @@
-->
<tobago-tab-group id='id' class='card tobago-auto-spacing' switch-type='client'>
- <input type='hidden' value='0' name='id::index' id='id::index'>
- <div class='card-header'>
- <ul class='nav nav-tabs card-header-tabs' role='tablist'>
- <tobago-tab id='t1' class='nav-item' for='id' role='presentation' index='0'>
- <a data-toggle='tab' class='nav-link active' data-target='#t1\:\:content' role='tab'><span>T1</span></a>
- </tobago-tab>
- <tobago-tab id='t2' class='nav-item' for='id' role='presentation' index='1'>
- <a data-toggle='tab' class='nav-link' data-target='#t2\:\:content' role='tab'><span>T2</span></a>
- </tobago-tab>
- </ul>
- </div>
- <div class='card-body tab-content'>
- <div class='tab-pane active' role='tabpanel' id='t1::content' data-index='0'>
- </div>
- <div class='tab-pane' role='tabpanel' id='t2::content' data-index='1'>
- </div>
- </div>
-</tobago-tab-group>
+<input type='hidden' value='0' name='id::index' id='id::index'>
+<div class='card-header'>
+<ul class='nav nav-tabs card-header-tabs' role='tablist'>
+<tobago-tab id='t1' class='nav-item' for='id' role='presentation' index='0'>
+<a data-toggle='tab' class='nav-link active' data-target='#t1\:\:content' role='tab'><span>T1</span></a></tobago-tab>
+<tobago-tab id='t2' class='nav-item' for='id' role='presentation' index='1'>
+<a data-toggle='tab' class='nav-link' data-target='#t2\:\:content' role='tab'><span>T2</span></a></tobago-tab></ul></div>
+<div class='card-body tab-content'>
+<div class='tab-pane active' role='tabpanel' id='t1::content' data-index='0'></div>
+<div class='tab-pane' role='tabpanel' id='t2::content' data-index='1'></div></div></tobago-tab-group>
diff --git a/tobago-core/src/test/resources/renderer/textarea/autocomplete-impp.html b/tobago-core/src/test/resources/renderer/textarea/autocomplete-impp.html
index 177e59a0fb..5e1486609e 100644
--- a/tobago-core/src/test/resources/renderer/textarea/autocomplete-impp.html
+++ b/tobago-core/src/test/resources/renderer/textarea/autocomplete-impp.html
@@ -16,5 +16,4 @@
-->
<tobago-textarea id='id' class='tobago-auto-spacing'>
- <textarea name='id' id='id::field' autocomplete='impp' class='form-control'></textarea>
-</tobago-textarea>
+<textarea name='id' id='id::field' autocomplete='impp' class='form-control'></textarea></tobago-textarea>
diff --git a/tobago-core/src/test/resources/renderer/textarea/with-label.html b/tobago-core/src/test/resources/renderer/textarea/with-label.html
index 1ce7b265e3..0571b2e1d6 100644
--- a/tobago-core/src/test/resources/renderer/textarea/with-label.html
+++ b/tobago-core/src/test/resources/renderer/textarea/with-label.html
@@ -16,6 +16,5 @@
-->
<tobago-textarea id='id' class='tobago-label-container tobago-auto-spacing'>
- <label for='id::field' class='col-form-label'>label</label>
- <textarea name='id' id='id::field' class='form-control'></textarea>
-</tobago-textarea>
\ No newline at end of file
+<label for='id::field' class='col-form-label'>label</label>
+<textarea name='id' id='id::field' class='form-control'></textarea></tobago-textarea>
diff --git a/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html
index fa5721df7e..97b16c565e 100644
--- a/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html
+++ b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox-customClass.html
@@ -18,44 +18,28 @@
-->
<tobago-tree-listbox id='treeListbox' class='custom-class' data-tobago-selection-mode='single'>
- <input type='hidden' name='treeListbox::selected' id='treeListbox::selected' value='[]'>
- <div class='tobago-level'>
- <select class='tobago-selected' id='treeListbox:0:treeNode::parent' size='10'>
- <option value='treeListbox:1:treeNode' id='treeListbox:1:treeNode' row-index='1'>
- </option>
- <option value='treeListbox:2:treeNode' id='treeListbox:2:treeNode' row-index='2'>
- </option>
- <option value='treeListbox:3:treeNode' id='treeListbox:3:treeNode' row-index='3'> →
- </option>
- <option value='treeListbox:7:treeNode' id='treeListbox:7:treeNode' row-index='7'>
- </option>
- <option value='treeListbox:8:treeNode' id='treeListbox:8:treeNode' row-index='8'> →
- </option></select>
- </div>
- <div class='tobago-level'>
- <select disabled='disabled' size='10' class='tobago-selected'></select>
- <select class='tobago-selected' id='treeListbox:3:treeNode::parent' size='10'>
- <option value='treeListbox:4:treeNode' id='treeListbox:4:treeNode' row-index='4'>
- </option>
- <option value='treeListbox:5:treeNode' id='treeListbox:5:treeNode' row-index='5'>
- </option>
- <option value='treeListbox:6:treeNode' id='treeListbox:6:treeNode' row-index='6'> →
- </option></select>
- <select class='tobago-selected' id='treeListbox:8:treeNode::parent' size='10'>
- <option value='treeListbox:9:treeNode' id='treeListbox:9:treeNode' row-index='9'> →
- </option>
- <option value='treeListbox:10:treeNode' id='treeListbox:10:treeNode' row-index='10'>
- </option>
- <option value='treeListbox:11:treeNode' id='treeListbox:11:treeNode' row-index='11'> →
- </option></select>
- </div>
- <div class='tobago-level'>
- <select disabled='disabled' size='10' class='tobago-selected'></select>
- <select class='tobago-selected' id='treeListbox:6:treeNode::parent' size='10'></select>
- <select class='tobago-selected' id='treeListbox:9:treeNode::parent' size='10'></select>
- <select class='tobago-selected' id='treeListbox:11:treeNode::parent' size='10'></select>
- </div>
- <div class='tobago-level'>
- <select disabled='disabled' size='10' class='tobago-selected'></select>
- </div>
-</tobago-tree-listbox>
+<input type='hidden' name='treeListbox::selected' id='treeListbox::selected' value='[]'>
+<div class='tobago-level'>
+<select class='tobago-selected' id='treeListbox:0:treeNode::parent' size='10'>
+<option value='treeListbox:1:treeNode' id='treeListbox:1:treeNode' row-index='1'></option>
+<option value='treeListbox:2:treeNode' id='treeListbox:2:treeNode' row-index='2'></option>
+<option value='treeListbox:3:treeNode' id='treeListbox:3:treeNode' row-index='3'> →</option>
+<option value='treeListbox:7:treeNode' id='treeListbox:7:treeNode' row-index='7'></option>
+<option value='treeListbox:8:treeNode' id='treeListbox:8:treeNode' row-index='8'> →</option></select></div>
+<div class='tobago-level'>
+<select disabled='disabled' size='10' class='tobago-selected'></select>
+<select class='tobago-selected' id='treeListbox:3:treeNode::parent' size='10'>
+<option value='treeListbox:4:treeNode' id='treeListbox:4:treeNode' row-index='4'></option>
+<option value='treeListbox:5:treeNode' id='treeListbox:5:treeNode' row-index='5'></option>
+<option value='treeListbox:6:treeNode' id='treeListbox:6:treeNode' row-index='6'> →</option></select>
+<select class='tobago-selected' id='treeListbox:8:treeNode::parent' size='10'>
+<option value='treeListbox:9:treeNode' id='treeListbox:9:treeNode' row-index='9'> →</option>
+<option value='treeListbox:10:treeNode' id='treeListbox:10:treeNode' row-index='10'></option>
+<option value='treeListbox:11:treeNode' id='treeListbox:11:treeNode' row-index='11'> →</option></select></div>
+<div class='tobago-level'>
+<select disabled='disabled' size='10' class='tobago-selected'></select>
+<select class='tobago-selected' id='treeListbox:6:treeNode::parent' size='10'></select>
+<select class='tobago-selected' id='treeListbox:9:treeNode::parent' size='10'></select>
+<select class='tobago-selected' id='treeListbox:11:treeNode::parent' size='10'></select></div>
+<div class='tobago-level'>
+<select disabled='disabled' size='10' class='tobago-selected'></select></div></tobago-tree-listbox>
diff --git a/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html
index 6e244d0d44..e0d3ea3db1 100644
--- a/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html
+++ b/tobago-core/src/test/resources/renderer/treeListbox/treeListbox.html
@@ -18,44 +18,28 @@
-->
<tobago-tree-listbox id='treeListbox' data-tobago-selection-mode='single'>
- <input type='hidden' name='treeListbox::selected' id='treeListbox::selected' value='[]'>
- <div class='tobago-level'>
- <select class='tobago-selected' id='treeListbox:0:treeNode::parent' size='10'>
- <option value='treeListbox:1:treeNode' id='treeListbox:1:treeNode' row-index='1'>
- </option>
- <option value='treeListbox:2:treeNode' id='treeListbox:2:treeNode' row-index='2'>
- </option>
- <option value='treeListbox:3:treeNode' id='treeListbox:3:treeNode' row-index='3'> →
- </option>
- <option value='treeListbox:7:treeNode' id='treeListbox:7:treeNode' row-index='7'>
- </option>
- <option value='treeListbox:8:treeNode' id='treeListbox:8:treeNode' row-index='8'> →
- </option></select>
- </div>
- <div class='tobago-level'>
- <select disabled='disabled' size='10' class='tobago-selected'></select>
- <select class='tobago-selected' id='treeListbox:3:treeNode::parent' size='10'>
- <option value='treeListbox:4:treeNode' id='treeListbox:4:treeNode' row-index='4'>
- </option>
- <option value='treeListbox:5:treeNode' id='treeListbox:5:treeNode' row-index='5'>
- </option>
- <option value='treeListbox:6:treeNode' id='treeListbox:6:treeNode' row-index='6'> →
- </option></select>
- <select class='tobago-selected' id='treeListbox:8:treeNode::parent' size='10'>
- <option value='treeListbox:9:treeNode' id='treeListbox:9:treeNode' row-index='9'> →
- </option>
- <option value='treeListbox:10:treeNode' id='treeListbox:10:treeNode' row-index='10'>
- </option>
- <option value='treeListbox:11:treeNode' id='treeListbox:11:treeNode' row-index='11'> →
- </option></select>
- </div>
- <div class='tobago-level'>
- <select disabled='disabled' size='10' class='tobago-selected'></select>
- <select class='tobago-selected' id='treeListbox:6:treeNode::parent' size='10'></select>
- <select class='tobago-selected' id='treeListbox:9:treeNode::parent' size='10'></select>
- <select class='tobago-selected' id='treeListbox:11:treeNode::parent' size='10'></select>
- </div>
- <div class='tobago-level'>
- <select disabled='disabled' size='10' class='tobago-selected'></select>
- </div>
-</tobago-tree-listbox>
+<input type='hidden' name='treeListbox::selected' id='treeListbox::selected' value='[]'>
+<div class='tobago-level'>
+<select class='tobago-selected' id='treeListbox:0:treeNode::parent' size='10'>
+<option value='treeListbox:1:treeNode' id='treeListbox:1:treeNode' row-index='1'></option>
+<option value='treeListbox:2:treeNode' id='treeListbox:2:treeNode' row-index='2'></option>
+<option value='treeListbox:3:treeNode' id='treeListbox:3:treeNode' row-index='3'> →</option>
+<option value='treeListbox:7:treeNode' id='treeListbox:7:treeNode' row-index='7'></option>
+<option value='treeListbox:8:treeNode' id='treeListbox:8:treeNode' row-index='8'> →</option></select></div>
+<div class='tobago-level'>
+<select disabled='disabled' size='10' class='tobago-selected'></select>
+<select class='tobago-selected' id='treeListbox:3:treeNode::parent' size='10'>
+<option value='treeListbox:4:treeNode' id='treeListbox:4:treeNode' row-index='4'></option>
+<option value='treeListbox:5:treeNode' id='treeListbox:5:treeNode' row-index='5'></option>
+<option value='treeListbox:6:treeNode' id='treeListbox:6:treeNode' row-index='6'> →</option></select>
+<select class='tobago-selected' id='treeListbox:8:treeNode::parent' size='10'>
+<option value='treeListbox:9:treeNode' id='treeListbox:9:treeNode' row-index='9'> →</option>
+<option value='treeListbox:10:treeNode' id='treeListbox:10:treeNode' row-index='10'></option>
+<option value='treeListbox:11:treeNode' id='treeListbox:11:treeNode' row-index='11'> →</option></select></div>
+<div class='tobago-level'>
+<select disabled='disabled' size='10' class='tobago-selected'></select>
+<select class='tobago-selected' id='treeListbox:6:treeNode::parent' size='10'></select>
+<select class='tobago-selected' id='treeListbox:9:treeNode::parent' size='10'></select>
+<select class='tobago-selected' id='treeListbox:11:treeNode::parent' size='10'></select></div>
+<div class='tobago-level'>
+<select disabled='disabled' size='10' class='tobago-selected'></select></div></tobago-tree-listbox>
diff --git a/tobago-core/src/test/resources/renderer/treeSelect/treeSelect-single.html b/tobago-core/src/test/resources/renderer/treeSelect/treeSelect-single.html
index 54fab3aea9..b65e5ffce7 100644
--- a/tobago-core/src/test/resources/renderer/treeSelect/treeSelect-single.html
+++ b/tobago-core/src/test/resources/renderer/treeSelect/treeSelect-single.html
@@ -18,169 +18,127 @@
-->
<tobago-tree id='tree' data-tobago-selectable='single' selectable='single'>
- <tobago-tree-node id='tree:0:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='0' data-tobago-level='0'>
- <span id='tree:0:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:0:treeSelect' id='tree:0:treeSelect'>
- <label class='form-check-label' for='tree:0:treeSelect'>Category</label>
- <tobago-behavior event='change' client-id='tree:0:treeSelect' execute='tree:0:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:1:treeNode' index='1' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
- <span id='tree:1:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:1:treeSelect' id='tree:1:treeSelect'>
- <label class='form-check-label' for='tree:1:treeSelect'>Sports</label>
- <tobago-behavior event='change' client-id='tree:1:treeSelect' execute='tree:1:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:2:treeNode' index='2' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
- <span id='tree:2:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:2:treeSelect' id='tree:2:treeSelect'>
- <label class='form-check-label' for='tree:2:treeSelect'>Movies</label>
- <tobago-behavior event='change' client-id='tree:2:treeSelect' execute='tree:2:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:3:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='3' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
- <span id='tree:3:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:3:treeSelect' id='tree:3:treeSelect'>
- <label class='form-check-label' for='tree:3:treeSelect'>Music</label>
- <tobago-behavior event='change' client-id='tree:3:treeSelect' execute='tree:3:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:4:treeNode' index='4' data-tobago-tree-parent='tree:3:treeNode' parent='tree:3:treeNode' data-tobago-level='2'>
- <span id='tree:4:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:4:treeSelect' id='tree:4:treeSelect'>
- <label class='form-check-label' for='tree:4:treeSelect'>Classic</label>
- <tobago-behavior event='change' client-id='tree:4:treeSelect' execute='tree:4:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:5:treeNode' index='5' data-tobago-tree-parent='tree:3:treeNode' parent='tree:3:treeNode' data-tobago-level='2'>
- <span id='tree:5:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:5:treeSelect' id='tree:5:treeSelect'>
- <label class='form-check-label' for='tree:5:treeSelect'>Pop</label>
- <tobago-behavior event='change' client-id='tree:5:treeSelect' execute='tree:5:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:6:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='6' data-tobago-tree-parent='tree:3:treeNode' parent='tree:3:treeNode' data-tobago-level='2'>
- <span id='tree:6:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:6:treeSelect' id='tree:6:treeSelect'>
- <label class='form-check-label' for='tree:6:treeSelect'>World</label>
- <tobago-behavior event='change' client-id='tree:6:treeSelect' execute='tree:6:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:7:treeNode' index='7' data-tobago-tree-parent='tree:6:treeNode' parent='tree:6:treeNode' data-tobago-level='3'>
- <span id='tree:7:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:7:treeSelect' id='tree:7:treeSelect'>
- <label class='form-check-label' for='tree:7:treeSelect'>Carib</label>
- <tobago-behavior event='change' client-id='tree:7:treeSelect' execute='tree:7:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:8:treeNode' index='8' data-tobago-tree-parent='tree:6:treeNode' parent='tree:6:treeNode' data-tobago-level='3'>
- <span id='tree:8:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:8:treeSelect' id='tree:8:treeSelect'>
- <label class='form-check-label' for='tree:8:treeSelect'>Africa</label>
- <tobago-behavior event='change' client-id='tree:8:treeSelect' execute='tree:8:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:9:treeNode' index='9' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
- <span id='tree:9:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:9:treeSelect' id='tree:9:treeSelect'>
- <label class='form-check-label' for='tree:9:treeSelect'>Games</label>
- <tobago-behavior event='change' client-id='tree:9:treeSelect' execute='tree:9:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:10:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='10' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
- <span id='tree:10:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:10:treeSelect' id='tree:10:treeSelect'>
- <label class='form-check-label' for='tree:10:treeSelect'>Science</label>
- <tobago-behavior event='change' client-id='tree:10:treeSelect' execute='tree:10:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:11:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='11' data-tobago-tree-parent='tree:10:treeNode' parent='tree:10:treeNode' data-tobago-level='2'>
- <span id='tree:11:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:11:treeSelect' id='tree:11:treeSelect'>
- <label class='form-check-label' for='tree:11:treeSelect'>Mathematics</label>
- <tobago-behavior event='change' client-id='tree:11:treeSelect' execute='tree:11:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:12:treeNode' index='12' data-tobago-tree-parent='tree:11:treeNode' parent='tree:11:treeNode' data-tobago-level='3'>
- <span id='tree:12:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:12:treeSelect' id='tree:12:treeSelect'>
- <label class='form-check-label' for='tree:12:treeSelect'>Analysis</label>
- <tobago-behavior event='change' client-id='tree:12:treeSelect' execute='tree:12:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:13:treeNode' index='13' data-tobago-tree-parent='tree:11:treeNode' parent='tree:11:treeNode' data-tobago-level='3'>
- <span id='tree:13:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:13:treeSelect' id='tree:13:treeSelect'>
- <label class='form-check-label' for='tree:13:treeSelect'>Algebra</label>
- <tobago-behavior event='change' client-id='tree:13:treeSelect' execute='tree:13:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:14:treeNode' index='14' data-tobago-tree-parent='tree:10:treeNode' parent='tree:10:treeNode' data-tobago-level='2'>
- <span id='tree:14:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:14:treeSelect' id='tree:14:treeSelect'>
- <label class='form-check-label' for='tree:14:treeSelect'>Geography</label>
- <tobago-behavior event='change' client-id='tree:14:treeSelect' execute='tree:14:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:15:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='15' data-tobago-tree-parent='tree:10:treeNode' parent='tree:10:treeNode' data-tobago-level='2'>
- <span id='tree:15:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:15:treeSelect' id='tree:15:treeSelect'>
- <label class='form-check-label' for='tree:15:treeSelect'>Astronomy</label>
- <tobago-behavior event='change' client-id='tree:15:treeSelect' execute='tree:15:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:16:treeNode' index='16' data-tobago-tree-parent='tree:15:treeNode' parent='tree:15:treeNode' data-tobago-level='3'>
- <span id='tree:16:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:16:treeSelect' id='tree:16:treeSelect'>
- <label class='form-check-label' for='tree:16:treeSelect'>Education</label>
- <tobago-behavior event='change' client-id='tree:16:treeSelect' execute='tree:16:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:17:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='17' data-tobago-tree-parent='tree:15:treeNode' parent='tree:15:treeNode' data-tobago-level='3'>
- <span id='tree:17:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:17:treeSelect' id='tree:17:treeSelect'>
- <label class='form-check-label' for='tree:17:treeSelect'>Pictures</label>
- <tobago-behavior event='change' client-id='tree:17:treeSelect' execute='tree:17:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:18:treeNode' index='18' data-tobago-tree-parent='tree:17:treeNode' parent='tree:17:treeNode' data-tobago-level='4'>
- <span id='tree:18:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:18:treeSelect' id='tree:18:treeSelect'>
- <label class='form-check-label' for='tree:18:treeSelect'>NGC</label>
- <tobago-behavior event='change' client-id='tree:18:treeSelect' execute='tree:18:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <tobago-tree-node id='tree:19:treeNode' index='19' data-tobago-tree-parent='tree:17:treeNode' parent='tree:17:treeNode' data-tobago-level='4'>
- <span id='tree:19:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
- <tobago-tree-select class='form-check-inline form-check'>
- <input class='form-check-input' type='radio' name='tree' value='tree:19:treeSelect' id='tree:19:treeSelect'>
- <label class='form-check-label' for='tree:19:treeSelect'>Messier</label>
- <tobago-behavior event='change' client-id='tree:19:treeSelect' execute='tree:19:treeSelect tree' render='null tree'></tobago-behavior>
- </tobago-tree-select>
- </tobago-tree-node>
- <input type='hidden' name='tree::selected' id='tree::selected' class='tobago-selected' value='[]'>
- <input type='hidden' name='tree::expanded' id='tree::expanded' class='tobago-expanded' value='[0,3,6,10,11,15,17]'>
- <tobago-scroll>
- <input id='tree::scrollPosition' name='tree::scrollPosition' type='hidden' value='[0,0]' data-tobago-scroll-position='true'>
- </tobago-scroll>
-</tobago-tree>
+<tobago-tree-node id='tree:0:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='0' data-tobago-level='0'>
+<span id='tree:0:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:0:treeSelect' id='tree:0:treeSelect'>
+<label class='form-check-label' for='tree:0:treeSelect'>Category</label>
+<tobago-behavior event='change' client-id='tree:0:treeSelect' execute='tree:0:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:1:treeNode' index='1' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
+<span id='tree:1:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:1:treeSelect' id='tree:1:treeSelect'>
+<label class='form-check-label' for='tree:1:treeSelect'>Sports</label>
+<tobago-behavior event='change' client-id='tree:1:treeSelect' execute='tree:1:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:2:treeNode' index='2' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
+<span id='tree:2:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:2:treeSelect' id='tree:2:treeSelect'>
+<label class='form-check-label' for='tree:2:treeSelect'>Movies</label>
+<tobago-behavior event='change' client-id='tree:2:treeSelect' execute='tree:2:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:3:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='3' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
+<span id='tree:3:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:3:treeSelect' id='tree:3:treeSelect'>
+<label class='form-check-label' for='tree:3:treeSelect'>Music</label>
+<tobago-behavior event='change' client-id='tree:3:treeSelect' execute='tree:3:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:4:treeNode' index='4' data-tobago-tree-parent='tree:3:treeNode' parent='tree:3:treeNode' data-tobago-level='2'>
+<span id='tree:4:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:4:treeSelect' id='tree:4:treeSelect'>
+<label class='form-check-label' for='tree:4:treeSelect'>Classic</label>
+<tobago-behavior event='change' client-id='tree:4:treeSelect' execute='tree:4:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:5:treeNode' index='5' data-tobago-tree-parent='tree:3:treeNode' parent='tree:3:treeNode' data-tobago-level='2'>
+<span id='tree:5:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:5:treeSelect' id='tree:5:treeSelect'>
+<label class='form-check-label' for='tree:5:treeSelect'>Pop</label>
+<tobago-behavior event='change' client-id='tree:5:treeSelect' execute='tree:5:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:6:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='6' data-tobago-tree-parent='tree:3:treeNode' parent='tree:3:treeNode' data-tobago-level='2'>
+<span id='tree:6:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:6:treeSelect' id='tree:6:treeSelect'>
+<label class='form-check-label' for='tree:6:treeSelect'>World</label>
+<tobago-behavior event='change' client-id='tree:6:treeSelect' execute='tree:6:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:7:treeNode' index='7' data-tobago-tree-parent='tree:6:treeNode' parent='tree:6:treeNode' data-tobago-level='3'>
+<span id='tree:7:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:7:treeSelect' id='tree:7:treeSelect'>
+<label class='form-check-label' for='tree:7:treeSelect'>Carib</label>
+<tobago-behavior event='change' client-id='tree:7:treeSelect' execute='tree:7:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:8:treeNode' index='8' data-tobago-tree-parent='tree:6:treeNode' parent='tree:6:treeNode' data-tobago-level='3'>
+<span id='tree:8:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:8:treeSelect' id='tree:8:treeSelect'>
+<label class='form-check-label' for='tree:8:treeSelect'>Africa</label>
+<tobago-behavior event='change' client-id='tree:8:treeSelect' execute='tree:8:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:9:treeNode' index='9' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
+<span id='tree:9:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:9:treeSelect' id='tree:9:treeSelect'>
+<label class='form-check-label' for='tree:9:treeSelect'>Games</label>
+<tobago-behavior event='change' client-id='tree:9:treeSelect' execute='tree:9:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:10:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='10' data-tobago-tree-parent='tree:0:treeNode' parent='tree:0:treeNode' data-tobago-level='1'>
+<span id='tree:10:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:10:treeSelect' id='tree:10:treeSelect'>
+<label class='form-check-label' for='tree:10:treeSelect'>Science</label>
+<tobago-behavior event='change' client-id='tree:10:treeSelect' execute='tree:10:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:11:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='11' data-tobago-tree-parent='tree:10:treeNode' parent='tree:10:treeNode' data-tobago-level='2'>
+<span id='tree:11:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:11:treeSelect' id='tree:11:treeSelect'>
+<label class='form-check-label' for='tree:11:treeSelect'>Mathematics</label>
+<tobago-behavior event='change' client-id='tree:11:treeSelect' execute='tree:11:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:12:treeNode' index='12' data-tobago-tree-parent='tree:11:treeNode' parent='tree:11:treeNode' data-tobago-level='3'>
+<span id='tree:12:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:12:treeSelect' id='tree:12:treeSelect'>
+<label class='form-check-label' for='tree:12:treeSelect'>Analysis</label>
+<tobago-behavior event='change' client-id='tree:12:treeSelect' execute='tree:12:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:13:treeNode' index='13' data-tobago-tree-parent='tree:11:treeNode' parent='tree:11:treeNode' data-tobago-level='3'>
+<span id='tree:13:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:13:treeSelect' id='tree:13:treeSelect'>
+<label class='form-check-label' for='tree:13:treeSelect'>Algebra</label>
+<tobago-behavior event='change' client-id='tree:13:treeSelect' execute='tree:13:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:14:treeNode' index='14' data-tobago-tree-parent='tree:10:treeNode' parent='tree:10:treeNode' data-tobago-level='2'>
+<span id='tree:14:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:14:treeSelect' id='tree:14:treeSelect'>
+<label class='form-check-label' for='tree:14:treeSelect'>Geography</label>
+<tobago-behavior event='change' client-id='tree:14:treeSelect' execute='tree:14:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:15:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='15' data-tobago-tree-parent='tree:10:treeNode' parent='tree:10:treeNode' data-tobago-level='2'>
+<span id='tree:15:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:15:treeSelect' id='tree:15:treeSelect'>
+<label class='form-check-label' for='tree:15:treeSelect'>Astronomy</label>
+<tobago-behavior event='change' client-id='tree:15:treeSelect' execute='tree:15:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:16:treeNode' index='16' data-tobago-tree-parent='tree:15:treeNode' parent='tree:15:treeNode' data-tobago-level='3'>
+<span id='tree:16:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:16:treeSelect' id='tree:16:treeSelect'>
+<label class='form-check-label' for='tree:16:treeSelect'>Education</label>
+<tobago-behavior event='change' client-id='tree:16:treeSelect' execute='tree:16:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:17:treeNode' class='tobago-folder tobago-expanded' expandable='expandable' index='17' data-tobago-tree-parent='tree:15:treeNode' parent='tree:15:treeNode' data-tobago-level='3'>
+<span id='tree:17:treeIndent' class='tobago-toggle'><i class='bi-dash-square' data-tobago-open='bi-dash-square' data-tobago-closed='bi-plus-square'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:17:treeSelect' id='tree:17:treeSelect'>
+<label class='form-check-label' for='tree:17:treeSelect'>Pictures</label>
+<tobago-behavior event='change' client-id='tree:17:treeSelect' execute='tree:17:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:18:treeNode' index='18' data-tobago-tree-parent='tree:17:treeNode' parent='tree:17:treeNode' data-tobago-level='4'>
+<span id='tree:18:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:18:treeSelect' id='tree:18:treeSelect'>
+<label class='form-check-label' for='tree:18:treeSelect'>NGC</label>
+<tobago-behavior event='change' client-id='tree:18:treeSelect' execute='tree:18:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<tobago-tree-node id='tree:19:treeNode' index='19' data-tobago-tree-parent='tree:17:treeNode' parent='tree:17:treeNode' data-tobago-level='4'>
+<span id='tree:19:treeIndent' class='tobago-toggle invisible'><i class='bi-square invisible'></i></span>
+<tobago-tree-select class='form-check-inline form-check'>
+<input class='form-check-input' type='radio' name='tree' value='tree:19:treeSelect' id='tree:19:treeSelect'>
+<label class='form-check-label' for='tree:19:treeSelect'>Messier</label>
+<tobago-behavior event='change' client-id='tree:19:treeSelect' execute='tree:19:treeSelect tree' render='null tree'></tobago-behavior></tobago-tree-select></tobago-tree-node>
+<input type='hidden' name='tree::selected' id='tree::selected' class='tobago-selected' value='[]'>
+<input type='hidden' name='tree::expanded' id='tree::expanded' class='tobago-expanded' value='[0,3,6,10,11,15,17]'>
+<tobago-scroll>
+<input id='tree::scrollPosition' name='tree::scrollPosition' type='hidden' value='[0,0]' data-tobago-scroll-position='true'></tobago-scroll></tobago-tree>