Skip to content

Commit 05434be

Browse files
committed
refactor(cdk-experimental/ui-patterns): rename ModifierKey
1 parent 696ee1f commit 05434be

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

src/cdk-experimental/ui-patterns/behaviors/event-manager/event-manager.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export interface EventHandlerConfig<T extends Event> extends EventHandlerOptions
4141
}
4242

4343
/** Bit flag representation of the possible modifier keys that can be present on an event. */
44-
export enum ModifierKey {
44+
export enum Modifier {
4545
None = 0,
4646
Ctrl = 0b1,
4747
Shift = 0b10,
@@ -50,7 +50,7 @@ export enum ModifierKey {
5050
Any = 'Any',
5151
}
5252

53-
export type ModifierInputs = ModifierKey | ModifierKey[];
53+
export type ModifierInputs = Modifier | Modifier[];
5454

5555
/**
5656
* Abstract base class for all event managers.
@@ -86,10 +86,10 @@ export abstract class EventManager<T extends Event> {
8686
/** Gets bit flag representation of the modifier keys present on the given event. */
8787
export function getModifiers(event: EventWithModifiers): number {
8888
return (
89-
(+event.ctrlKey && ModifierKey.Ctrl) |
90-
(+event.shiftKey && ModifierKey.Shift) |
91-
(+event.altKey && ModifierKey.Alt) |
92-
(+event.metaKey && ModifierKey.Meta)
89+
(+event.ctrlKey && Modifier.Ctrl) |
90+
(+event.shiftKey && Modifier.Shift) |
91+
(+event.altKey && Modifier.Alt) |
92+
(+event.metaKey && Modifier.Meta)
9393
);
9494
}
9595

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

104-
if (modifiersList.includes(ModifierKey.Any)) {
104+
if (modifiersList.includes(Modifier.Any)) {
105105
return true;
106106
}
107107

src/cdk-experimental/ui-patterns/behaviors/event-manager/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
export {ModifierKey} from './event-manager';
9+
export {Modifier} from './event-manager';
1010
export {KeyboardEventManager} from './keyboard-event-manager';
1111
export {PointerEventManager} from './pointer-event-manager';

src/cdk-experimental/ui-patterns/behaviors/event-manager/keyboard-event-manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
EventManager,
1414
hasModifiers,
1515
ModifierInputs,
16-
ModifierKey,
16+
Modifier,
1717
} from './event-manager';
1818

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

6060
return {
6161
key: key as KeyCode,

src/cdk-experimental/ui-patterns/behaviors/event-manager/pointer-event-manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
EventManager,
1313
hasModifiers,
1414
ModifierInputs,
15-
ModifierKey,
15+
Modifier,
1616
} from './event-manager';
1717

1818
/**
@@ -80,7 +80,7 @@ export class PointerEventManager<T extends PointerEvent> extends EventManager<T>
8080

8181
return {
8282
button: MouseButton.Main,
83-
modifiers: ModifierKey.None,
83+
modifiers: Modifier.None,
8484
handler: args[0] as EventHandler<T>,
8585
};
8686
}

src/cdk-experimental/ui-patterns/listbox/listbox.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {
10-
KeyboardEventManager,
11-
PointerEventManager,
12-
ModifierKey as Modifier,
13-
} from '../behaviors/event-manager';
149
import {OptionPattern} from './option';
10+
import {KeyboardEventManager, PointerEventManager, Modifier} from '../behaviors/event-manager';
1511
import {ListSelection, ListSelectionInputs} from '../behaviors/list-selection/list-selection';
1612
import {ListTypeahead, ListTypeaheadInputs} from '../behaviors/list-typeahead/list-typeahead';
1713
import {ListNavigation, ListNavigationInputs} from '../behaviors/list-navigation/list-navigation';

src/cdk-experimental/ui-patterns/tree/tree.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ import {
2525
ListTypeaheadItem,
2626
} from '../behaviors/list-typeahead/list-typeahead';
2727
import {ExpansionItem, ExpansionControl, ListExpansion} from '../behaviors/expansion/expansion';
28-
import {
29-
KeyboardEventManager,
30-
PointerEventManager,
31-
ModifierKey as Modifier,
32-
} from '../behaviors/event-manager';
28+
import {KeyboardEventManager, PointerEventManager, Modifier} from '../behaviors/event-manager';
3329

3430
/** Represents the required inputs for a tree item. */
3531
export interface TreeItemInputs<V>

0 commit comments

Comments
 (0)