Skip to content

Commit 7ecec03

Browse files
committed
feat(ripple): use key names instead of codes
1 parent 87a8a3e commit 7ecec03

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

packages/vuetify/src/components/VList/VListItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import vRipple from '@/directives/ripple'
2828

2929
// Utilities
3030
import { computed, onBeforeMount, toDisplayString, toRef, watch } from 'vue'
31-
import { deprecate, EventProp, genericComponent, keyCodes, propsFactory, useRender } from '@/util'
31+
import { deprecate, EventProp, genericComponent, propsFactory, useRender } from '@/util'
3232

3333
// Types
3434
import type { PropType } from 'vue'
@@ -190,7 +190,7 @@ export const VListItem = genericComponent<VListItemSlots>()({
190190
!!props.ripple &&
191191
list?.filterable
192192
)
193-
? { keys: [keyCodes.enter] }
193+
? { keys: ['Enter'] }
194194
: props.ripple
195195
)
196196

packages/vuetify/src/directives/ripple/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import './VRipple.sass'
33

44
// Utilities
5-
import { isObject, keyCodes } from '@/util'
5+
import { isObject } from '@/util'
66

77
// Types
88
import type { DirectiveBinding } from 'vue'
@@ -27,7 +27,7 @@ interface RippleOptions {
2727
export interface RippleDirectiveBinding extends Omit<DirectiveBinding, 'modifiers' | 'value'> {
2828
value?: boolean | {
2929
class?: string
30-
keys?: number[]
30+
keys?: string[]
3131
}
3232
modifiers: {
3333
center?: boolean
@@ -252,8 +252,8 @@ function rippleCancelShow (e: MouseEvent | TouchEvent) {
252252

253253
let keyboardRipple = false
254254

255-
function keyboardRippleShow (e: KeyboardEvent, keys: number[]) {
256-
if (!keyboardRipple && keys.includes(e.keyCode)) {
255+
function keyboardRippleShow (e: KeyboardEvent, keys: string[]) {
256+
if (!keyboardRipple && keys.includes(e.key)) {
257257
keyboardRipple = true
258258
rippleShow(e)
259259
}
@@ -289,7 +289,7 @@ function updateRipple (el: HTMLElement, binding: RippleDirectiveBinding, wasEnab
289289
el._ripple.class = bindingValue.class
290290
}
291291

292-
const allowedKeys = bindingValue.keys ?? [keyCodes.enter, keyCodes.space]
292+
const allowedKeys = bindingValue.keys ?? ['Enter', 'Space']
293293
el._ripple.keyDownHandler = (e: KeyboardEvent) => keyboardRippleShow(e, allowedKeys)
294294

295295
if (enabled && !wasEnabled) {

0 commit comments

Comments
 (0)