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

fix(ui5-checkbox): ensure consistent focus behavior #10639

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −8
Open

fix(ui5-checkbox): ensure consistent focus behavior #10639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2863bb7
fix(ui5-checkbox): ensure consistent focus behavior
kgogov Jan 23, 2025
1bcbd92
chore(ui5-multi-combobox): adjust MultiComboBox spec
kgogov Jan 23, 2025
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 packages/main/src/themes/CheckBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
position: relative;
display: inline-flex;
align-items: center;
width: 100%;
max-width: 100%;
min-height: var(--_ui5_checkbox_width_height);
min-width: var(--_ui5_checkbox_width_height);
padding: 0 var(--_ui5_checkbox_wrapper_padding);
Expand Down
11 changes: 11 additions & 0 deletions packages/main/test/pages/CheckBox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@
<input type="hidden" id="cbFormSubmitted" value="false" />
</form>

<br />
<div style="width: 300px; border: 1px solid black; padding: 1rem;">
<ui5-checkbox style="width: 100%; border: 1px solid red;"></ui5-checkbox>
<ui5-radio-button style="width: 100%; border: 1px solid red;"></ui5-radio-button>
<ui5-switch style="width: 100%; border: 1px solid red;"></ui5-switch>
<hr />
<ui5-checkbox style="width: 100%; border: 1px solid red;" text="Some text"></ui5-checkbox>
<ui5-radio-button style="width: 100%; border: 1px solid red;" text="Some text"></ui5-radio-button>
<ui5-switch style="width: 100%; border: 1px solid red;"></ui5-switch>
</div>

<script>
var hcb = false;
var cbForm = document.querySelector("#cbForm");
Expand Down
16 changes: 9 additions & 7 deletions packages/main/test/specs/MultiComboBox.mobile.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,34 +315,36 @@ describe("Items selection", () => {
});

it("should select all items when clicking select all", async () => {
const cb = await $("#mcb-select-all-vs");
const cb = await browser.$("#mcb-select-all-vs");
const popover = await cb.shadow$("ui5-responsive-popover");
const spanRef = await $("#select-all-event");
const selectAllCheckbox = await popover.$(".ui5-mcb-select-all-checkbox");
const selectAllCheckboxRoot = await selectAllCheckbox.shadow$(".ui5-checkbox-root");
const spanRef = await browser.$("#select-all-event");

await cb.click();

await popover.$(".ui5-mcb-select-all-checkbox").click();
await selectAllCheckboxRoot.click();
// ok button
await popover.$(".ui5-responsive-popover-footer").$("ui5-button").click();
assert.strictEqual(await spanRef.getText(), "Selected items count: 27");

await cb.click();
await popover.$(".ui5-mcb-select-all-checkbox").click();
await selectAllCheckboxRoot.click();
// ok button
await popover.$(".ui5-responsive-popover-footer").$("ui5-button").click();
assert.strictEqual(await spanRef.getText(), "Selected items count: 0");
});


it("select all should not be checked if all items are not selected", async () => {
const mcb = await $("#mcb-select-all-vs");
const mcb = await browser.$("#mcb-select-all-vs");
const popover = await mcb.shadow$("ui5-responsive-popover");
const closeIcon = await popover.$(".ui5-responsive-popover-close-btn");
const selectAllCheckbox = await popover.$(".ui5-mcb-select-all-checkbox");
const selectAllCheckboxRoot = await selectAllCheckbox.shadow$(".ui5-checkbox-root");

await mcb.click();

await selectAllCheckbox.click();
await selectAllCheckboxRoot.click();
await closeIcon.click();
await mcb.click();

Expand Down