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

observe and deal with map-style mutations #951

Merged
merged 1 commit into from
Apr 3, 2024
Merged

observe and deal with map-style mutations #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
<map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png"></map-link>
</map-extent>
</layer->
</layer->
</mapml-viewer>
</body>
</html>
10 changes: 10 additions & 0 deletions src/map-style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ export class MapStyle extends HTMLElement {
target.setAttribute(attribute.nodeName, attribute.nodeValue);
});
}

// use observer to monitor the changes in mapStyle textContent
this._observer = new MutationObserver(() => {
this.styleElement.textContent = this.textContent;
});
this._observer.observe(this, {
prushforth marked this conversation as resolved.
Show resolved Hide resolved
childList: true,
subtree: true,
characterData: true
});
}
disconnectedCallback() {
if (this._stylesheetHost) {
Expand Down
88 changes: 88 additions & 0 deletions test/e2e/elements/map-style/map-style.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>map-style tests</title>
<script type="module" src="mapml-viewer.js"></script>
<style>
html,
body {
height: 100%;
}
* {
margin: 0;
padding: 0;
}

/* Specifying the `:defined` selector is recommended to style the map
element, such that styles don't apply when fallback content is in use
(e.g. when scripting is disabled or when custom/built-in elements isn't
supported in the browser). */
mapml-viewer:defined {
/* Responsive map. */
max-width: 100%;

/* Full viewport. */
width: 100%;
height: 100%;

/* Remove default (native-like) border. */
border: none;

vertical-align: middle;
}

/* Pre-style to avoid FOUC of inline layer- and fallback content. */
mapml-viewer:not(:defined) > * {
display: none;
}

/* Pre-style to avoid Layout Shift. */
mapml-viewer:not(:defined) {
display: inline-block;
contain: size;
contain-intrinsic-size: 304px 154px;
}

/* Ensure inline layer content is hidden if custom/built-in elements isn't
supported, or if javascript is disabled. This needs to be defined separately
from the above, because the `:not(:defined)` selector invalidates the entire
declaration in browsers that do not support it. */
layer- {
display: none;
}
</style>
<noscript>
<style>
/* Ensure fallback content (children of the map element) is displayed if
custom/built-in elements is supported but javascript is disabled. */
mapml-viewer:not(:defined) > :not(layer-) {
display: initial;
}

/* "Reset" the properties used to pre-style (to avoid Layout Shift) if
custom/built-in elements is supported but javascript is disabled. */
mapml-viewer:not(:defined) {
display: initial;
contain: initial;
contain-intrinsic-size: initial;
}
</style>
</noscript>
</head>
<body>

<mapml-viewer projection="OSMTILE" zoom="3" lat="45.406314" lon="-75.6883335" controls>
<layer- label="Layer" checked="">
<map-meta name="extent" content="top-left-longitude=-108.18295690328578, top-left-latitude=50.014258109371525, bottom-right-longitude=-80.36884559227745,bottom-right-latitude=56.408480743634385"></map-meta>
<map-meta name="projection" content="OSMTILE"></map-meta>
<map-meta name="cs" content="gcrs"></map-meta>
<!----------------------- Element being tested ----------------------->
<map-style>.poly {stroke: black; fill:black}</map-style>
<!----------------------- Element being tested ----------------------->
<map-feature class="poly"><map-featurecaption>Layer</map-featurecaption><map-geometry><map-polygon><map-coordinates>-100.50664854831412 56.0571475247103 -108.18295690328578 55.57677707477441 -106.44464507203479 51.99763924555603 -91.90173251505614 50.014258109371525 -80.36884559227745 50.0637759718567 -92.5284724652151 56.408480743634385 -100.50664854831412 56.0571475247103 </map-coordinates></map-polygon></map-geometry><map-properties>Styled Polygon</map-properties></map-feature>
</layer->
</mapml-viewer>
</body>
</html>
43 changes: 43 additions & 0 deletions test/e2e/elements/map-style/map-style.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { test, expect, chromium } from '@playwright/test';

test.describe('map-style element tests', () => {
let page;
let context;
test.beforeAll(async () => {
context = await chromium.launchPersistentContext('');
page =
context.pages().find((page) => page.url() === 'about:blank') ||
(await context.newPage());
await page.goto('map-style.html');
});

test.afterAll(async function () {
await context.close();
});

test(`mutation observer - style changes when map-style gets updated`, async () => {
let mapStyle = await page.locator('map-style');
let styleTextContentMatch = await mapStyle.evaluate((mapStyle) => {
return mapStyle.styleElement.textContent === mapStyle.textContent;
});

expect(styleTextContentMatch).toEqual(true);
expect(mapStyle).toHaveText('.poly {stroke: black; fill:black}');

// Change the map-style element to red
await mapStyle.evaluate((mapStyle) => {
mapStyle.textContent = '.poly {stroke: red; fill:red}';
});

// the style element and the map style should now be red
mapStyle = await page.locator('map-style');
styleTextContentMatch = await mapStyle.evaluate((mapStyle) => {
return mapStyle.styleElement.textContent === mapStyle.textContent;
});
expect(styleTextContentMatch).toEqual(true);
let styleTextContent = await mapStyle.evaluate((mapStyle) => {
return mapStyle.styleElement.textContent;
});
expect(styleTextContent).toEqual('.poly {stroke: red; fill:red}');
});
});
1 change: 1 addition & 0 deletions test/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ app.use(express.static(path.join(__dirname, 'e2e/elements/map')));
app.use(express.static(path.join(__dirname, 'e2e/elements/map-feature')));
app.use(express.static(path.join(__dirname, 'e2e/elements/map-input')));
app.use(express.static(path.join(__dirname, 'e2e/elements/map-link')));
app.use(express.static(path.join(__dirname, 'e2e/elements/map-style')));
app.use(express.static(path.join(__dirname, 'e2e/elements/layer-')));
app.use(express.static(path.join(__dirname, 'e2e/api')));
app.use(express.static(path.join(__dirname, 'e2e/data')));
Expand Down