Skip to content

Add Search Control #808

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Add Search Control #808

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd7fba6
initial searchbar setup
AliyanH Mar 15, 2023
9dcae7c
Make search control a bit more stable and functioning
AliyanH Mar 27, 2023
7b8c211
reposition and style search control
AliyanH Mar 31, 2023
a66ebb5
Hide searchbar on a mapml-viewer with no layers
AliyanH Apr 3, 2023
5fe1af6
Update Styling
AliyanH Apr 3, 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
Prev Previous commit
Next Next commit
Hide searchbar on a mapml-viewer with no layers
  • Loading branch information
@AliyanH
AliyanH committed Apr 3, 2023
commit a66ebb527fae7895e447ce8e37388f15d41ed7a1
5 changes: 4 additions & 1 deletion src/mapml-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,11 @@ export class MapViewer extends HTMLElement {
}
});
}
if (this._layerControl && this._layerControl._layers.length === 0) {
if (this._layerControl?._layers.length === 0) {
this._layerControl._container.setAttribute("hidden","");
if (this._searchBar) {
this._setControlsVisibility("search",true);
}
}
}

Expand Down
9 changes: 6 additions & 3 deletions test/e2e/api/domApi-mapml-viewer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,25 +187,28 @@ test.describe("mapml-viewer DOM API Tests", () => {
await page.evaluateHandle((viewer) => viewer.setAttribute("controls", ""), viewerHandle);
await page.evaluateHandle( (viewer) => document.body.appendChild(viewer), viewerHandle);

let leftControlCount = await page.$eval(".leaflet-top.leaflet-left", (div) => div.childElementCount);
expect(leftControlCount).toBe(2);

let zoomHidden = await page.$eval(".leaflet-top.leaflet-left > .leaflet-control-zoom", (div) => div.hidden);
let reloadHidden = await page.$eval(".leaflet-top.leaflet-left > .mapml-reload-button", (div) => div.hidden);
let searchHidden = await page.$eval(".leaflet-top.leaflet-left > .mapml-search-control", (div) => div.hidden);
expect(zoomHidden).toEqual(false);
expect(reloadHidden).toEqual(false);
expect(searchHidden).toEqual(true);

await page.evaluate( viewer => viewer.removeAttribute("controls"), viewerHandle);
zoomHidden = await page.$eval(".leaflet-top.leaflet-left > .leaflet-control-zoom", (div) => div.hidden);
reloadHidden = await page.$eval(".leaflet-top.leaflet-left > .mapml-reload-button", (div) => div.hidden);
searchHidden = await page.$eval(".leaflet-top.leaflet-left > .mapml-search-control", (div) => div.hidden);
expect(zoomHidden).toEqual(true);
expect(reloadHidden).toEqual(true);
expect(searchHidden).toEqual(true);

await page.evaluate( viewer => viewer.setAttribute("controls",""), viewerHandle);
zoomHidden = await page.$eval(".leaflet-top.leaflet-left > .leaflet-control-zoom", (div) => div.hidden);
reloadHidden = await page.$eval(".leaflet-top.leaflet-left > .mapml-reload-button", (div) => div.hidden);
searchHidden = await page.$eval(".leaflet-top.leaflet-left > .mapml-search-control", (div) => div.hidden);
expect(zoomHidden).toEqual(false);
expect(reloadHidden).toEqual(false);
expect(searchHidden).toEqual(true);

// remove map for next test
await page.evaluateHandle(() => document.querySelector('mapml-viewer').remove());
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/core/touchDevice.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test.describe("Playwright touch device tests", () => {
});

test("Tap/Long press to show layer control", async () => {
const layerControl = await page.locator("div > div.leaflet-control-container > div.leaflet-top.leaflet-right > div").first();
const layerControl = await page.locator("div > div.leaflet-control-container > div.leaflet-top.leaflet-right > div");
await layerControl.tap();
let className = await layerControl.evaluate(
(el) => el.classList.contains('leaflet-control-layers-expanded') && el._isExpanded
Expand Down