Skip to content
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.

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

Add option to define a selection of MouseButtons to ignore #216

Merged
merged 4 commits into from
Dec 9, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
6 changes: 5 additions & 1 deletion packages/vanilla/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {EventTarget} from './EventEmitter';
import type {AreaLocation, Coordinates, ScrollEvent, SelectionEvents, SelectionOptions, SelectionStore} from './types';
import {PartialSelectionOptions} from './types';
import {css, frames, Frames, intersects, isSafariBrowser, isTouchDevice, off, on, selectAll, SelectAllSelectors, simplifyEvent} from './utils';
import {css, frames, Frames, intersects, isSafariBrowser, isTouchDevice, off, on, selectAll, SelectAllSelectors, simplifyEvent, shouldTrigger} from './utils';

// Re-export types
export * from './types';
Expand Down Expand Up @@ -69,6 +69,7 @@ export default class SelectionArea extends EventTarget<SelectionEvents> {
behaviour: {
overlap: 'invert',
intersect: 'touch',
triggers: [{button: 0, modifiers: ["ctrl", "alt", "meta"]}],
...opt.behaviour,
startThreshold: opt.behaviour?.startThreshold ?
typeof opt.behaviour.startThreshold === 'number' ?
Expand Down Expand Up @@ -154,6 +155,9 @@ export default class SelectionArea extends EventTarget<SelectionEvents> {
const {_options} = this;
const {document} = this._options;
const targetBoundingClientRect = target.getBoundingClientRect();

if (evt instanceof MouseEvent && !shouldTrigger(evt, _options.behaviour.triggers))
return;

// Find start-areas and boundaries
const startAreas = selectAll(_options.startAreas, _options.document);
Expand Down
20 changes: 20 additions & 0 deletions packages/vanilla/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,25 @@ export interface Coordinates {
export type TapMode = 'touch' | 'native';
export type OverlapMode = 'keep' | 'drop' | 'invert';

// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button#value
export type MouseButton = 0 // Main
| 1 // Auxiliary
| 2 // Secondary
| 3 // Fourth
| 4; // Fifth

export type Modifier = 'ctrl'
| 'meta'
| 'alt'
| 'shift';

export type Trigger = MouseButton | MouseButtonWithModifiers;

export type MouseButtonWithModifiers = {
button: MouseButton,
modifiers: Modifier[]
};

export interface Scrolling {
speedDivider: number;
manualSpeed: number;
Expand All @@ -77,6 +96,7 @@ export interface Behaviour {
startThreshold: number | Coordinates;
overlap: OverlapMode;
scrolling: Scrolling;
triggers: Trigger[];
}

export interface SelectionOptions {
Expand Down
1 change: 1 addition & 0 deletions packages/vanilla/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export * from './intersects';
export * from './selectAll';
export * from './constants';
export * from './frames';
export * from './shouldTrigger';
48 changes: 48 additions & 0 deletions packages/vanilla/src/utils/shouldTrigger.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { Modifier, Trigger } from "../types";

type MouseEventModifierProperty = Extract<keyof MouseEvent, "altKey" | "ctrlKey" | "metaKey" | "shiftKey">;

/**
* Determines whether a MouseEvent should execute until completion depending on
* which button and modifier(s) are active for the MouseEvent.
* The Event will execute to completion if ANY of the triggers "matches"
* @param event MouseEvent that should be checked
* @param triggers A list of Triggers that signify that the event should execute until completion
* @returns Whether the MouseEvent should execute until completion
*/
export function shouldTrigger(event: MouseEvent, triggers: Trigger[]): boolean {
for (const trigger of triggers) {
// The trigger requires only a specific button to be pressed
if (typeof trigger === "number") {
if (event.button === trigger) return true;
}

// The trigger requires a specific button to be pressed AND some modifiers
if (typeof trigger === "object") {
const reqButtonIsPressed = trigger.button === event.button;
const allReqModifiersArePressed = trigger.modifiers.reduce((doActivate, modifier) => {
const prop = modifierToMouseEventProperty(modifier);

if (prop === null) return false;
Pietrrrek marked this conversation as resolved.
Show resolved Hide resolved

const modifierIsPressed = event[prop];

return doActivate && modifierIsPressed;
}, true);

if (reqButtonIsPressed && allReqModifiersArePressed) return true;
}
}

// By default we do not process the event
return false;
}

function modifierToMouseEventProperty(modifier: Modifier): MouseEventModifierProperty | null {
if (modifier === "alt") return "altKey";
if (modifier === "ctrl") return "ctrlKey";
if (modifier === "meta") return "metaKey";
if (modifier === "shift") return "shiftKey";

return null;
}