TOBAGO-2044: Evaluate use of Bootstrap 5
* input (help and message): Dismiss popover on next click
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
index c3e1a8c..0cbd0e6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessageLayoutRendererBase.java
@@ -214,9 +214,10 @@
writer.writeAttribute(DataAttributes.BS_TOGGLE, "popover", false);
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
writer.writeAttribute(DataAttributes.BS_CONTENT, content, true);
+ writer.writeAttribute(DataAttributes.BS_TRIGGER, "focus", false);
writer.startElement(HtmlElements.A);
- writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
+ writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex != null ? tabIndex : 0);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlButtonTypes.BUTTON);
writer.writeClassAttribute(BootstrapClass.BTN, buttonColor);
writer.startElement(HtmlElements.I);
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 6aecec9..7b5c6c3 100644
--- a/tobago-core/src/test/resources/renderer/in/error-message.html
+++ b/tobago-core/src/test/resources/renderer/in/error-message.html
@@ -19,8 +19,8 @@
<label for='id::field' class='col-form-label'>label</label>
<div class='tobago-messages-container'>
<input type='text' name='id' id='id::field' title='a test' class='tobago-in border-danger form-control' autofocus='autofocus'>
- <tobago-popover data-bs-toggle='popover' title='Error' data-bs-content='a test'>
- <a role='button' class='btn btn-danger'><i class='fa fa-exclamation'></i></a>
+ <tobago-popover data-bs-toggle='popover' title='Error' data-bs-content='a test' data-bs-trigger='focus'>
+ <a tabindex='0' role='button' class='btn btn-danger'><i class='fa fa-exclamation'></i></a>
</tobago-popover>
</div>
</tobago-in>
\ No newline at end of file
diff --git a/tobago-core/src/test/resources/renderer/in/help.html b/tobago-core/src/test/resources/renderer/in/help.html
index 9846e3b..e277305 100644
--- a/tobago-core/src/test/resources/renderer/in/help.html
+++ b/tobago-core/src/test/resources/renderer/in/help.html
@@ -19,8 +19,8 @@
<label for='id::field' class='col-form-label'>label</label>
<div class='tobago-messages-container'>
<input type='text' name='id' id='id::field' class='tobago-in form-control'>
- <tobago-popover data-bs-toggle='popover' title='Help' data-bs-content='Help!'>
- <a role='button' class='btn btn-outline-info'><i class='fa fa-question'></i></a>
+ <tobago-popover data-bs-toggle='popover' title='Help' data-bs-content='Help!' data-bs-trigger='focus'>
+ <a tabindex='0' role='button' class='btn btn-outline-info'><i class='fa fa-question'></i></a>
</tobago-popover>
</div>
</tobago-in>
\ No newline at end of file
