archive-gh-me/heavyai-charting
1
0
Fork 0
mirror of https://github.com/heavyai/heavyai-charting.git synced 2026-02-01 16:00:04 +00:00
Code Issues Projects Releases Wiki Activity

[FE-18172] Listen for esc key on map root, close ruler if active (#695)

Browse Source
This commit is contained in:
Joe O'Hallaron 2025-02-12 16:24:21 -07:00 committed by GitHub
parent 73dbe9aa12
commit da4963486a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/charting.js vendored
View File

@ -38715,12 +38715,20 @@ function mapMixin(_chart, chartDivId, _mapboxgl) {
});
_map.dragRotate.disable();
_map.touchZoomRotate.disableRotation();
_map.addControl(new __WEBPACK_IMPORTED_MODULE_5__mapbox_controls_ruler__["a" /* default */]({
var rulerControl = new __WEBPACK_IMPORTED_MODULE_5__mapbox_controls_ruler__["a" /* default */]({
linePaint: {
"line-color": "#999",
"line-width": 2
}
}), "bottom-right");
});
_map.addControl(rulerControl, "bottom-right");
_chart.root().on("keydown", function () {
if (__WEBPACK_IMPORTED_MODULE_0_d3___default.a.event.key === "Escape" || __WEBPACK_IMPORTED_MODULE_0_d3___default.a.event.key === 27) {
if (rulerControl !== null && rulerControl !== void 0 && rulerControl.isActive) {
rulerControl.deactivate();
}
}
});
_map.addControl(new _mapboxgl.NavigationControl(), "bottom-right");
_map.addControl(new _mapboxgl.AttributionControl(), _attribLocation);
_map.addControl(new _mapboxgl.ScaleControl({

22
src/mixins/map-mixin.js
View File

@ -738,15 +738,21 @@ export default function mapMixin(
_map.dragRotate.disable()
_map.touchZoomRotate.disableRotation()
_map.addControl(
new RulerControl({
linePaint: {
"line-color": "#999",
"line-width": 2
const rulerControl = new RulerControl({
linePaint: {
"line-color": "#999",
"line-width": 2
}
})
_map.addControl(rulerControl, "bottom-right")
_chart.root().on("keydown", () => {
if (d3.event.key === "Escape" || d3.event.key === 27) {
if (rulerControl?.isActive) {
rulerControl.deactivate()
}
}),
"bottom-right"
)
}
})
_map.addControl(new _mapboxgl.NavigationControl(), "bottom-right")
_map.addControl(new _mapboxgl.AttributionControl(), _attribLocation)
_map.addControl(