Skip to content

Update checkbox spacebar implementation to remove 'bandage' fix #762

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

Merged
AliyanH merged 2 commits into from
Feb 20, 2023
Merged

Update checkbox spacebar implementation to remove 'bandage' fix #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3e13d
Update checkbox spacebar implementation to remvoe 'bandage' fix
AliyanH Feb 20, 2023
c3d2366
fix web-map implementation
AliyanH Feb 20, 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
7 changes: 5 additions & 2 deletions src/mapml-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,13 @@ export class MapViewer extends HTMLElement {
(layer) => {
M._pasteLayer(this, layer);
});
} else if (e.keyCode === 32) {
// Prevents default spacebar event on all of mapml-viewer
} else if (e.keyCode === 32 &&
this.shadowRoot.activeElement.nodeName !== "INPUT") {
e.preventDefault();
this._map.fire('keypress', {originalEvent: e});
}});
}
});
this.parentElement.addEventListener('mousedown', function (e) {
if(document.activeElement.nodeName === "MAPML-VIEWER"){
document.activeElement.dispatchEvent(new CustomEvent('mapfocused', {detail:
Expand Down
13 changes: 0 additions & 13 deletions src/mapml/control/LayerControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ export var LayerControl = L.Control.Layers.extend({
L.DomEvent.on(this.options.mapEl, "layerchange", this._validateInput, this);
// Adding event on layer control button
L.DomEvent.on(this._container.getElementsByTagName("a")[0], 'keydown', this._focusFirstLayer, this._container);
// Adding event on layer checkbox
L.DomEvent.on(this._container, 'keyup', this._toggleLayer, this._container);
L.DomEvent.on(this._container, 'contextmenu', this._preventDefaultContextMenu, this);
this._update();
//this._validateExtents();
Expand All @@ -42,7 +40,6 @@ export var LayerControl = L.Control.Layers.extend({
onRemove: function (map) {
map.off('validate', this._validateInput, this);
L.DomEvent.off(this._container.getElementsByTagName("a")[0], 'keydown', this._focusFirstLayer, this._container);
L.DomEvent.off(this._container, 'keyup', this._toggleLayer, this._container);
// remove layer-registerd event handlers so that if the control is not
// on the map it does not generate layer events
for (var i = 0; i < this._layers.length; i++) {
Expand Down Expand Up @@ -113,16 +110,6 @@ export var LayerControl = L.Control.Layers.extend({
if(elem) setTimeout(() => elem.focus(), 0);
}
},

// toggle layer when spacebar is pressed
_toggleLayer: function(e) {
if (e.code === 'Space') {
let elem = document.activeElement.shadowRoot.activeElement;
if (elem.nodeName === "INPUT") {
elem.click();
}
}
},

_withinZoomBounds: function(zoom, range) {
return range.min <= zoom && zoom <= range.max;
Expand Down
4 changes: 3 additions & 1 deletion src/web-map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,9 @@ export class WebMap extends HTMLMapElement {
(layer) => {
M._pasteLayer(this, layer);
});
} else if (e.keyCode === 32) {
// Prevents default spacebar event on all of web-map
} else if (e.keyCode === 32 &&
document.activeElement.shadowRoot.activeElement.nodeName !== "INPUT") {
e.preventDefault();
this._map.fire('keypress', {originalEvent: e});
}
Expand Down