More convenience with condition chaining

src/ol/interaction.js

@@ -3,9 +3,7 @@
  */
 import Collection from './Collection.js';
 import DoubleClickZoom from './interaction/DoubleClickZoom.js';
-import DragPan, {
-  defaultCondition as dragPanDefaultCondition,
-} from './interaction/DragPan.js';
+import DragPan from './interaction/DragPan.js';
 import DragRotate from './interaction/DragRotate.js';
 import DragZoom from './interaction/DragZoom.js';
 import KeyboardPan from './interaction/KeyboardPan.js';
@@ -14,7 +12,6 @@ import Kinetic from './Kinetic.js';
 import MouseWheelZoom from './interaction/MouseWheelZoom.js';
 import PinchRotate from './interaction/PinchRotate.js';
 import PinchZoom from './interaction/PinchZoom.js';
-import {focusWithTabindex} from './events/condition.js';
 
 export {default as DoubleClickZoom} from './interaction/DoubleClickZoom.js';
 export {default as DragAndDrop} from './interaction/DragAndDrop.js';
@@ -114,11 +111,7 @@ export function defaults(opt_options) {
   if (dragPan) {
     interactions.push(
       new DragPan({
-        condition: options.onFocusOnly
-          ? function (event) {
-              return focusWithTabindex(event) && dragPanDefaultCondition(event);
-            }
-          : undefined,
+        onFocusOnly: options.onFocusOnly,
         kinetic: kinetic,
       })
     );
@@ -155,7 +148,7 @@ export function defaults(opt_options) {
   if (mouseWheelZoom) {
     interactions.push(
       new MouseWheelZoom({
-        condition: options.onFocusOnly ? focusWithTabindex : undefined,
+        onFocusOnly: options.onFocusOnly,
         duration: options.zoomDuration,
       })
     );