Skip to content

Commit d31fcf0

Browse files
committed
Fix opacity when the attribute is provided at page load, _opacity is
not set (setter not run), should return the attribute value if _opacity is nullish.
1 parent 5105086 commit d31fcf0

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

src/layer.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ export class MapLayer extends HTMLElement {
4848
}
4949

5050
get opacity() {
51-
return this._opacity;
51+
// use ?? since 0 is falsy, || would return rhs in that case
52+
return this._opacity ?? this.getAttribute('opacity');
5253
}
5354

5455
set opacity(val) {

test/e2e/layers/layerOpacityAttribute.test.js

+12-18
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,27 @@ test.describe('Adding Opacity Attribute to the Layer- Element', () => {
1717
});
1818

1919
test('Setting Opacity Attibute to Layer- Element', async () => {
20+
await page.pause();
2021
let opacity_attribute_value = await page.$eval(
2122
'body > mapml-viewer > layer-',
2223
(layer) => layer.getAttribute('opacity')
2324
);
24-
if (!opacity_attribute_value) {
25-
return;
26-
} else {
27-
let layer_opacity = await page.$eval(
28-
'body > mapml-viewer > layer-',
29-
(layer) => layer.opacity
30-
);
31-
expect(layer_opacity).toEqual(opacity_attribute_value);
32-
}
25+
let layer_opacity = await page.$eval(
26+
'body > mapml-viewer > layer-',
27+
(layer) => layer.opacity
28+
);
29+
expect(layer_opacity).toEqual(opacity_attribute_value);
3330
});
3431
test('Opacity Slider Value Test', async () => {
32+
await page.pause();
3533
let opacity_slider_value = await page.$eval(
3634
'div > div.leaflet-control-container > div.leaflet-top.leaflet-right > div > section > div.leaflet-control-layers-overlays > fieldset > div:nth-child(2) > details > input[type=range]',
3735
(input) => input.value
3836
);
39-
if (!opacity_slider_value) {
40-
return;
41-
} else {
42-
let layer_opacity = await page.$eval(
43-
'body > mapml-viewer > layer-',
44-
(layer) => layer.opacity
45-
);
46-
expect(layer_opacity).toEqual(opacity_slider_value);
47-
}
37+
let layer_opacity = await page.$eval(
38+
'body > mapml-viewer > layer-',
39+
(layer) => layer.opacity
40+
);
41+
expect(layer_opacity).toEqual(opacity_slider_value);
4842
});
4943
});

0 commit comments

Comments
 (0)