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

Focus on Layer Menu Item or Link if Remove Button is clicked #600

Merged
merged 5 commits into from
Nov 26, 2021
Merged

Focus on Layer Menu Item or Link if Remove Button is clicked #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ace460b
focus on layer menu item/link if remove button clicked
Nov 26, 2021
1ad4106
fixed getting the shadow root
Nov 26, 2021
9054f7c
removed unused function
Nov 26, 2021
ba78c6c
made some fixes
Nov 26, 2021
80bc73b
added timeouts to featureLinks test
Nov 26, 2021
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
14 changes: 14 additions & 0 deletions src/mapml/layers/MapLayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,21 @@ export var MapMLLayer = L.Layer.extend({
//L.DomEvent.disableClickPropagation(removeControlButton);
L.DomEvent.on(removeControlButton, 'click', L.DomEvent.stop);
L.DomEvent.on(removeControlButton, 'click', (e)=>{
let fieldset = 0, elem, root;
root = mapEl.tagName === "MAPML-VIEWER" ? mapEl.shadowRoot : mapEl.querySelector(".mapml-web-map").shadowRoot;
if(e.target.closest("fieldset").nextElementSibling && !e.target.closest("fieldset").nextElementSibling.disbaled){
elem = e.target.closest("fieldset").previousElementSibling;
while(elem){
fieldset += 2; // find the next layer menu item
elem = elem.previousElementSibling;
}
} else {
// focus on the link
elem = "link";
}
mapEl.removeChild(e.target.closest("fieldset").querySelector("span").layer._layerEl);
elem = elem ? root.querySelector(".leaflet-control-attribution").firstElementChild: elem = root.querySelectorAll('input')[fieldset];
setTimeout(() => elem.focus(), 800); // a timeout is set so "pressed remove layer" is announced first
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This timeout seems to cause NVDA (using Chrome) to announce the document title + map then next layer/link, I'm not hearing "pressed remove layer". In that sense I think doing without the timeout provides a better experience?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using a Mac and voiceover, I hear "pressed remove layer", but if that's the case with NVDA, I could remove the timeout for better consistency

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if that's the case with NVDA, I could remove the timeout for better consistency

There doesn't seem to be a whole lot of guidance on the desired behavior when removing/hiding the currently focused element. But I think removing the timeout provides a similar experience to when e.g. dialog elements are hidden as a result of closing it: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/dialog#result

}, this);

let itemSettingControlButton = L.DomUtil.create('button', 'mapml-layer-item-settings-control', layerItemControls);
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/core/featureLinks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe("Playwright Feature Links Tests", () => {
test("Sub-point inplace link adds new layer, parent feature has separate link", async () => {
await page.hover(".leaflet-top.leaflet-right");
await page.click("div > div.leaflet-control-container > div.leaflet-top.leaflet-right > div > section > div.leaflet-control-layers-overlays > fieldset:nth-child(2) > div:nth-child(1) > div > button:nth-child(1)");
await page.waitForTimeout(850);
await page.click("body > map");
for(let i = 0; i < 6; i++) {
await page.keyboard.press("Tab");
Expand Down Expand Up @@ -59,6 +60,7 @@ describe("Playwright Feature Links Tests", () => {
test("Main part adds new layer", async () => {
await page.hover(".leaflet-top.leaflet-right");
await page.click("div > div.leaflet-control-container > div.leaflet-top.leaflet-right > div > section > div.leaflet-control-layers-overlays > fieldset:nth-child(2) > div:nth-child(1) > div > button:nth-child(1)");
await page.waitForTimeout(850);
await page.click("body > map");
for(let i = 0; i < 5; i++) {
await page.keyboard.press("Tab");
Expand Down