Skip to content

refactor(cdk-experimental/ui-patterns): create event manager index file #31561

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

Merged
merged 3 commits into from
Jul 21, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 1 addition & 2 deletions src/cdk-experimental/ui-patterns/accordion/accordion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
*/

import {computed} from '@angular/core';
import {KeyboardEventManager} from '../behaviors/event-manager/keyboard-event-manager';
import {PointerEventManager} from '../behaviors/event-manager/pointer-event-manager';
import {KeyboardEventManager, PointerEventManager} from '../behaviors/event-manager';
import {
ExpansionItem,
ExpansionControl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export interface EventHandlerConfig<T extends Event> extends EventHandlerOptions
}

/** Bit flag representation of the possible modifier keys that can be present on an event. */
export enum ModifierKey {
export enum Modifier {
None = 0,
Ctrl = 0b1,
Shift = 0b10,
Expand All @@ -50,7 +50,7 @@ export enum ModifierKey {
Any = 'Any',
}

export type ModifierInputs = ModifierKey | ModifierKey[];
export type ModifierInputs = Modifier | Modifier[];

/**
* Abstract base class for all event managers.
Expand Down Expand Up @@ -86,10 +86,10 @@ export abstract class EventManager<T extends Event> {
/** Gets bit flag representation of the modifier keys present on the given event. */
export function getModifiers(event: EventWithModifiers): number {
return (
(+event.ctrlKey && ModifierKey.Ctrl) |
(+event.shiftKey && ModifierKey.Shift) |
(+event.altKey && ModifierKey.Alt) |
(+event.metaKey && ModifierKey.Meta)
(+event.ctrlKey && Modifier.Ctrl) |
(+event.shiftKey && Modifier.Shift) |
(+event.altKey && Modifier.Alt) |
(+event.metaKey && Modifier.Meta)
);
}

Expand All @@ -101,7 +101,7 @@ export function hasModifiers(event: EventWithModifiers, modifiers: ModifierInput
const eventModifiers = getModifiers(event);
const modifiersList = Array.isArray(modifiers) ? modifiers : [modifiers];

if (modifiersList.includes(ModifierKey.Any)) {
if (modifiersList.includes(Modifier.Any)) {
return true;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* @license
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.dev/license
*/

export {Modifier} from './event-manager';
export {KeyboardEventManager} from './keyboard-event-manager';
export {PointerEventManager} from './pointer-event-manager';
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
EventManager,
hasModifiers,
ModifierInputs,
ModifierKey,
Modifier,
} from './event-manager';

/**
Expand Down Expand Up @@ -55,7 +55,7 @@ export class KeyboardEventManager<T extends KeyboardEvent> extends EventManager<
private _normalizeInputs(...args: any[]) {
const key = args.length === 3 ? args[1] : args[0];
const handler = args.length === 3 ? args[2] : args[1];
const modifiers = args.length === 3 ? args[0] : ModifierKey.None;
const modifiers = args.length === 3 ? args[0] : Modifier.None;

return {
key: key as KeyCode,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
EventManager,
hasModifiers,
ModifierInputs,
ModifierKey,
Modifier,
} from './event-manager';

/**
Expand Down Expand Up @@ -80,7 +80,7 @@ export class PointerEventManager<T extends PointerEvent> extends EventManager<T>

return {
button: MouseButton.Main,
modifiers: ModifierKey.None,
modifiers: Modifier.None,
handler: args[0] as EventHandler<T>,
};
}
Expand Down
4 changes: 1 addition & 3 deletions src/cdk-experimental/ui-patterns/listbox/listbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/

import {ModifierKey as Modifier} from '../behaviors/event-manager/event-manager';
import {KeyboardEventManager} from '../behaviors/event-manager/keyboard-event-manager';
import {PointerEventManager} from '../behaviors/event-manager/pointer-event-manager';
import {OptionPattern} from './option';
import {KeyboardEventManager, PointerEventManager, Modifier} from '../behaviors/event-manager';
import {ListSelection, ListSelectionInputs} from '../behaviors/list-selection/list-selection';
import {ListTypeahead, ListTypeaheadInputs} from '../behaviors/list-typeahead/list-typeahead';
import {ListNavigation, ListNavigationInputs} from '../behaviors/list-navigation/list-navigation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
*/

import {computed} from '@angular/core';
import {KeyboardEventManager} from '../behaviors/event-manager/keyboard-event-manager';
import {PointerEventManager} from '../behaviors/event-manager/pointer-event-manager';
import {KeyboardEventManager, PointerEventManager} from '../behaviors/event-manager';
import {ListFocus, ListFocusInputs} from '../behaviors/list-focus/list-focus';
import {ListNavigation, ListNavigationInputs} from '../behaviors/list-navigation/list-navigation';
import {ListSelection, ListSelectionInputs} from '../behaviors/list-selection/list-selection';
Expand Down
3 changes: 1 addition & 2 deletions src/cdk-experimental/ui-patterns/tabs/tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
*/

import {computed} from '@angular/core';
import {KeyboardEventManager} from '../behaviors/event-manager/keyboard-event-manager';
import {PointerEventManager} from '../behaviors/event-manager/pointer-event-manager';
import {KeyboardEventManager, PointerEventManager} from '../behaviors/event-manager';
import {ListFocus, ListFocusInputs, ListFocusItem} from '../behaviors/list-focus/list-focus';
import {
ListNavigation,
Expand Down
4 changes: 1 addition & 3 deletions src/cdk-experimental/ui-patterns/tree/tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ import {
ListTypeaheadItem,
} from '../behaviors/list-typeahead/list-typeahead';
import {ExpansionItem, ExpansionControl, ListExpansion} from '../behaviors/expansion/expansion';
import {KeyboardEventManager} from '../behaviors/event-manager/keyboard-event-manager';
import {PointerEventManager} from '../behaviors/event-manager/pointer-event-manager';
import {ModifierKey as Modifier} from '../behaviors/event-manager/event-manager';
import {KeyboardEventManager, PointerEventManager, Modifier} from '../behaviors/event-manager';

/** Represents the required inputs for a tree item. */
export interface TreeItemInputs<V>
Expand Down
Loading