Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace .sr-only with .visually-hidden, use static Helper.screenReaderOnly class where applicable, fix SpinnerAjax(Button|Link) label rendering #1010

Merged
merged 4 commits into from
Dec 5, 2023
Merged

Replace .sr-only with .visually-hidden, use static Helper.screenReaderOnly class where applicable, fix SpinnerAjax(Button|Link) label rendering #1010

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1e3d40
Only add class .sr-only when the label is empty - check in onConfigure
vrozkovec Dec 3, 2023
580869a
Update helper class name for screenReaderOnly content
vrozkovec Dec 4, 2023
62e2049
Replace .sr-only -> .visually-hidden, use static Helper where applicable
vrozkovec Dec 4, 2023
f41c6ad
rename all references from "srOnly" to "visuallyHidden" for consistency
vrozkovec Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...in/java/de/agilecoders/wicket/core/markup/html/bootstrap/button/dropdown/SplitButton.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<button type="button" class="btn" wicket:id="button"></button>
<button type="button" class="btn dropdown-toggle dropdown-toggle-split" wicket:id="caret"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only"></span>
<span class="visually-hidden"></span>
</button>
<div wicket:id="dropdown-menu" class="dropdown-menu">
<wicket:container wicket:id="buttons">
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel><span wicket:id="srOnly" class="sr-only"></span></wicket:panel>
<wicket:panel><span wicket:id="srOnly"></span></wicket:panel>
</body>
</html>
3 changes: 3 additions & 0 deletions ...main/java/de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/Stack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.agilecoders.wicket.core.markup.html.bootstrap.components.progress;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
Expand All @@ -9,6 +10,7 @@

import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
import de.agilecoders.wicket.core.util.Attributes;
import de.agilecoders.wicket.core.util.CssClassNames.Helper;

/**
* Represents a stack of the progress bar.
Expand Down Expand Up @@ -57,6 +59,7 @@ protected void onInitialize() {
super.onInitialize();

srOnly = new Label("srOnly", createLabelModel());
vrozkovec marked this conversation as resolved.
Show resolved Hide resolved
srOnly.add(AttributeModifier.append("class", Helper.screenReaderOnly));
vrozkovec marked this conversation as resolved.
Show resolved Hide resolved
add(srOnly);
}

Expand Down
2 changes: 1 addition & 1 deletion bootstrap-core/src/main/java/de/agilecoders/wicket/core/util/CssClassNames.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public boolean contains(final String className) {
@SuppressWarnings("UnusedDeclaration")
public static final class Helper {
public static final String clearfix = "clearfix";
public static final String screenReaderOnly = "sr-only";
public static final String screenReaderOnly = "visually-hidden";
}

@SuppressWarnings("UnusedDeclaration")
Expand Down
3 changes: 2 additions & 1 deletion ...de/agilecoders/wicket/core/markup/html/bootstrap/components/progress/ProgressBarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import de.agilecoders.wicket.core.WicketApplicationTest;
import de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
import de.agilecoders.wicket.core.util.CssClassNames.Helper;

/**
* Tests for ProgressBar
Expand Down Expand Up @@ -58,7 +59,7 @@ void progressBarWithDefaultStackMarkup() {
assertEquals("" + ProgressBar.MIN, stackTester.getAttribute("aria-valuemin"));
assertEquals("" + ProgressBar.MAX, stackTester.getAttribute("aria-valuemax"));

TagTester stackLabelTester = stackTester.getChild("class", "sr-only");
TagTester stackLabelTester = stackTester.getChild("class", Helper.screenReaderOnly);
assertEquals("" + progress + "%", stackLabelTester.getValue());
}

Expand Down
9 changes: 5 additions & 4 deletions ...ava/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.util.CssClassNames.Helper;

/**
* A specialization of {@link de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton}
Expand Down Expand Up @@ -103,11 +104,11 @@ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
}

@Override
protected <L extends Serializable> Component newLabel(String markupId, IModel<L> model) {
Component label = super.newLabel(markupId, model);
protected void onConfigure() {
super.onConfigure();
Component label = get("label");
if (Strings.isEmpty(label.getDefaultModelObjectAsString())) {
label.add(AttributeModifier.append("class", "sr-only"));
label.add(AttributeModifier.append("class", Helper.screenReaderOnly));
}
return label;
}
}
11 changes: 9 additions & 2 deletions .../java/de/agilecoders/wicket/extensions/markup/html/bootstrap/spinner/SpinnerAjaxLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.util.CssClassNames.Helper;

/**
* A specialization of {@link de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink}
Expand Down Expand Up @@ -94,9 +95,15 @@ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
protected <L extends Serializable> Component newLabel(String markupId, IModel<L> model) {
Component label = super.newLabel(markupId, model);
label.setRenderBodyOnly(false);
return label;
}

@Override
protected void onConfigure() {
super.onConfigure();
Component label = get("label");
if (Strings.isEmpty(label.getDefaultModelObjectAsString())) {
label.add(AttributeModifier.append("class", "sr-only"));
label.add(AttributeModifier.append("class", Helper.screenReaderOnly));
}
return label;
}
}
2 changes: 1 addition & 1 deletion bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/BasePage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<body style="padding-top: 60px">
<a name="top" style="display: none;"></a>
<a class="sr-only" href="#content">Skip navigation</a>
<a class="visually-hidden" href="#content">Skip navigation</a>

<header wicket:id="navbar" class="bs-docs-nav"></header>

Expand Down
4 changes: 2 additions & 2 deletions bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/ComponentsPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,14 +1538,14 @@ <h3>Pills</h3>
<div class="mb-2 p-2">
<a href="#" wicket:id="button-with-badge">
Submit <span wicket:id="badge"></span>
<span class="sr-only">unread messages</span>
<span class="visually-hidden">unread messages</span>
</a>
</div>

<pre class="prettyprint linenum">
&lt;button wicket:id="badge-button"&gt;
Submit &lt;span wicket:id="button-count"&gt;&lt;/span&gt;
&lt;span class="sr-only"&gt;unread messages&lt;/span&gt;
&lt;span class="visually-hidden"&gt;unread messages&lt;/span&gt;
&lt;/button&gt;
</pre>
</div>
Expand Down
2 changes: 1 addition & 1 deletion bootstrap-samples/src/main/java/de/agilecoders/wicket/samples/pages/SelectPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h2>Example</h2>
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Modal title</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal">
<span class="sr-only">Close</span>
<span class="visually-hidden">Close</span>
</button>
</div>
<div class="modal-body">
Expand Down