Re-enable onFocusOnly option for interaction defaults

This commit is contained in:
Andreas Hocevar
2020-06-03 12:29:37 +02:00
parent 346e9fadff
commit 2cac6c4f39
6 changed files with 28 additions and 42 deletions
+2 -18
View File
@@ -6,7 +6,7 @@ import PointerInteraction, {
} from './Pointer.js';
import {FALSE} from '../functions.js';
import {easeOut} from '../easing.js';
import {focus, noModifierKeys, primaryAction} from '../events/condition.js';
import {noModifierKeys, primaryAction} from '../events/condition.js';
import {
rotate as rotateCoordinate,
scale as scaleCoordinate,
@@ -72,19 +72,6 @@ class DragPan extends PointerInteraction {
this.noKinetic_ = false;
}
/**
* @private
* @param {import("../MapBrowserEvent").default} mapBrowserEvent Event.
* @return {boolean} Condition passes.
*/
conditionInternal_(mapBrowserEvent) {
let pass = true;
if (mapBrowserEvent.map.getTargetElement().hasAttribute('tabindex')) {
pass = focus(mapBrowserEvent);
}
return pass && this.condition_(mapBrowserEvent);
}
/**
* Handle pointer drag events.
* @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Event.
@@ -167,10 +154,7 @@ class DragPan extends PointerInteraction {
* @return {boolean} If the event was consumed.
*/
handleDownEvent(mapBrowserEvent) {
if (
this.targetPointers.length > 0 &&
this.conditionInternal_(mapBrowserEvent)
) {
if (this.targetPointers.length > 0 && this.condition_(mapBrowserEvent)) {
const map = mapBrowserEvent.map;
const view = map.getView();
this.lastCentroid = null;