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

Malvoz attribution control #815

Merged
merged 16 commits into from
Apr 17, 2023
Merged

Malvoz attribution control #815

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
018cc9e
Collapse attribution behind a button
Malvoz Dec 20, 2021
8472318
Update attribution
Malvoz Dec 20, 2021
f3cacc2
Change the attribution control SVG to dark on light
Malvoz Jan 10, 2022
17f4b92
attribution control
Jacky0299 Apr 13, 2023
c76a965
tests fix
Jacky0299 Apr 13, 2023
f021c8b
Aliyan suggested changes
Jacky0299 Apr 14, 2023
70f6730
deleted comments
Jacky0299 Apr 14, 2023
1708d8b
Merge branch 'main' into malvoz-attribution-control
Jacky0299 Apr 14, 2023
7c6f34e
test fix
Jacky0299 Apr 14, 2023
35187a6
Merge branch 'malvoz-attribution-control' of https://github.com/prush…
Jacky0299 Apr 14, 2023
61f52c1
one flaky test
Jacky0299 Apr 14, 2023
4d123e3
Restore and fix old test
Apr 14, 2023
b08d6eb
Peter suggested changes
Jacky0299 Apr 14, 2023
e2dcef3
string localized
Jacky0299 Apr 14, 2023
9e9f79c
Get rid of unused file, formatting
prushforth Apr 15, 2023
6db7922
Make sure aria-label has localized string, get rid of title to eliminate
prushforth Apr 15, 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
4 changes: 2 additions & 2 deletions src/mapml/control/AttributionButton.js
View file
Open in desktop
prushforth marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export var AttributionButton = L.Control.Attribution.extend({
options: {
position: 'bottomright',
prefix: '<a href="https://www.w3.org/community/maps4html/">Maps for HTML Community Group</a> <span aria-hidden="true">|</span> <a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'
prefix: '<a href="https://www.w3.org/community/maps4html/">Maps for HTML Community Group</a> '
},

initialize: function (options) {
Expand Down Expand Up @@ -101,7 +101,7 @@ export var AttributionButton = L.Control.Attribution.extend({
prefixAndAttribs.push(attribs.join(', '));
}

this._container.innerHTML = '<summary title="Map data attribution"><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 0 24 24" width="30px" fill="currentColor"><path d="M0 0h24v24H0V0z" fill="none"></path><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"></path></svg></summary>' + '<div class="mapml-attribution-container">' + `<button onclick="this.closest(\'.leaflet-container\').querySelector(\'.shortcuts-dialog\').showModal()" class="shortcuts-button mapml-button">${M.options.locale.kbdShortcuts}</button> | <a href="https://www.w3.org/community/maps4html/" title="W3C Maps for HTML Community Group">Maps4HTML</a> | <img src="data:image/svg+xml;base64,PHN2ZyBhcmlhLWhpZGRlbj0idHJ1ZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTIiIGhlaWdodD0iOCI+PHBhdGggZmlsbD0iIzRDN0JFMSIgZD0iTTAgMGgxMnY0SDB6Ii8+PHBhdGggZmlsbD0iI0ZGRDUwMCIgZD0iTTAgNGgxMnYzSDB6Ii8+PHBhdGggZmlsbD0iI0UwQkMwMCIgZD0iTTAgN2gxMnYxSDB6Ii8+PC9zdmc+" style="padding-right: 0.3em;" alt="Slava Ukraini"> <a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>` + '</div>';
this._container.innerHTML = '<summary title="Map data attribution"><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 0 24 24" width="30px" fill="currentColor"><path d="M0 0h24v24H0V0z" fill="none"></path><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"></path></svg></summary>' + '<div class="mapml-attribution-container">' + `<button onclick="this.closest(\'.leaflet-container\').querySelector(\'.shortcuts-dialog\').showModal()" class="shortcuts-button mapml-button">${M.options.locale.kbdShortcuts}</button> | <img src="data:image/svg+xml;base64,PHN2ZyBhcmlhLWhpZGRlbj0idHJ1ZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMTIiIGhlaWdodD0iOCI+PHBhdGggZmlsbD0iIzRDN0JFMSIgZD0iTTAgMGgxMnY0SDB6Ii8+PHBhdGggZmlsbD0iI0ZGRDUwMCIgZD0iTTAgNGgxMnYzSDB6Ii8+PHBhdGggZmlsbD0iI0UwQkMwMCIgZD0iTTAgN2gxMnYxSDB6Ii8+PC9zdmc+" style="padding-right: 0.3em;" alt="Slava Ukraini"> <a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a> | ` + prefixAndAttribs.join(' <span aria-hidden="true">|</span> ') + '</div>';
this._container.setAttribute("role","group");
this._container.setAttribute("aria-label","Map data attribution");
}
Expand Down
1 change: 0 additions & 1 deletion src/web-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ export class WebMap extends HTMLMapElement {
});
this._addToHistory();
// the attribution control is not optional
M.attributionControl(this);

this._createControls();
this._toggleControls();
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/core/popupTabNavigation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ test.describe("Playwright Keyboard Navigation + Query Layer Tests" , () => {
const nh = await page.evaluateHandle(doc => doc.shadowRoot, h);
const rh = await page.evaluateHandle(root => root.activeElement, nh);
const f = await (await page.evaluateHandle(elem => elem.innerText, rh)).jsonValue();
expect(f).toEqual("Maps4HTML");
expect(f).toEqual("Leaflet");
AliyanH marked this conversation as resolved.
Show resolved Hide resolved
});
});
});
4 changes: 2 additions & 2 deletions test/e2e/mapml-viewer/mapml-viewer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ test.describe("Playwright mapml-viewer Element Tests", () => {
});

test("Ensure attribution control has role='group' aria-label='Map data attribution'", async () => {
let role = await page.evaluate(`document.querySelector('mapml-viewer')._attributionControl.getContainer().getAttribute('role')`);
let role = await page.evaluate(`document.querySelector('mapml-viewer')._map.attributionControl._container.getAttribute('role')`);
expect(role).toEqual("group");
let arialabel = await page.evaluate(`document.querySelector('mapml-viewer')._attributionControl.getContainer().getAttribute('aria-label')`);
let arialabel = await page.evaluate(`document.querySelector('mapml-viewer')._map.attributionControl._container.getAttribute('aria-label')`);
expect(arialabel).toEqual("Map data attribution");
prushforth marked this conversation as resolved.
Show resolved Hide resolved
});

Expand Down