diff --git a/components/vc-picker/PanelContext.tsx b/components/vc-picker/PanelContext.tsx index 3b593d528..1949ca843 100644 --- a/components/vc-picker/PanelContext.tsx +++ b/components/vc-picker/PanelContext.tsx @@ -3,7 +3,7 @@ import { inject, provide } from 'vue'; import type { OnSelect, PanelMode } from './interface'; export type ContextOperationRefProps = { - onKeyDown?: (e: KeyboardEvent) => boolean; + onKeydown?: (e: KeyboardEvent) => boolean; onClose?: () => void; }; @@ -14,8 +14,8 @@ export type PanelContextProps = { panelRef?: Ref; hidePrevBtn?: Ref; hideNextBtn?: Ref; - onDateMouseEnter?: (date: any) => void; - onDateMouseLeave?: (date: any) => void; + onDateMouseenter?: (date: any) => void; + onDateMouseleave?: (date: any) => void; onSelect?: OnSelect; hideRanges?: Ref; open?: Ref; diff --git a/components/vc-picker/Picker.tsx b/components/vc-picker/Picker.tsx index 087706e5e..7e38292b5 100644 --- a/components/vc-picker/Picker.tsx +++ b/components/vc-picker/Picker.tsx @@ -76,13 +76,13 @@ export type PickerSharedProps = { onOpenChange?: (open: boolean) => void; onFocus?: FocusEventHandler; onBlur?: FocusEventHandler; - onMouseDown?: MouseEventHandler; - onMouseUp?: MouseEventHandler; - onMouseEnter?: MouseEventHandler; - onMouseLeave?: MouseEventHandler; + onMousedown?: MouseEventHandler; + onMouseup?: MouseEventHandler; + onMouseenter?: MouseEventHandler; + onMouseleave?: MouseEventHandler; onClick?: MouseEventHandler; - onContextMenu?: MouseEventHandler; - onKeyDown?: (event: KeyboardEvent, preventDefault: () => void) => void; + onContextmenu?: MouseEventHandler; + onKeydown?: (event: KeyboardEvent, preventDefault: () => void) => void; // WAI-ARIA role?: string; @@ -163,13 +163,13 @@ function Picker() { 'onOpenChange', 'onFocus', 'onBlur', - 'onMouseDown', - 'onMouseUp', - 'onMouseEnter', - 'onMouseLeave', - 'onContextMenu', + 'onMousedown', + 'onMouseup', + 'onMouseenter', + 'onMouseleave', + 'onContextmenu', 'onClick', - 'onKeyDown', + 'onKeydown', 'onSelect', 'direction', 'autocomplete', @@ -273,10 +273,10 @@ function Picker() { triggerInnerOpen(newOpen); }; - const forwardKeyDown = (e: KeyboardEvent) => { - if (mergedOpen && operationRef.value && operationRef.value.onKeyDown) { + const forwardKeydown = (e: KeyboardEvent) => { + if (mergedOpen && operationRef.value && operationRef.value.onKeydown) { // Let popup panel handle keyboard - return operationRef.value.onKeyDown(e); + return operationRef.value.onKeydown(e); } /* istanbul ignore next */ @@ -284,15 +284,15 @@ function Picker() { { warning( false, - 'Picker not correct forward KeyDown operation. Please help to fire issue about this.', + 'Picker not correct forward Keydown operation. Please help to fire issue about this.', ); return false; } }; - const onInternalMouseUp: MouseEventHandler = (...args) => { - if (props.onMouseUp) { - props.onMouseUp(...args); + const onInternalMouseup: MouseEventHandler = (...args) => { + if (props.onMouseup) { + props.onMouseup(...args); } if (inputRef.value) { @@ -307,7 +307,7 @@ function Picker() { open: mergedOpen, value: text, triggerOpen, - forwardKeyDown, + forwardKeydown, isClickOutside: target => !elementsContains([panelDivRef.value, inputDivRef.value], target as HTMLElement), onSubmit: () => { @@ -325,8 +325,8 @@ function Picker() { setSelectedValue(mergedValue.value); resetText(); }, - onKeyDown: (e, preventDefault) => { - props.onKeyDown?.(e, preventDefault); + onKeydown: (e, preventDefault) => { + props.onKeydown?.(e, preventDefault); }, onFocus: (e: FocusEvent) => { props.onFocus?.(e); @@ -387,8 +387,8 @@ function Picker() { onSelect: onContextSelect, open: mergedOpen, defaultOpenValue: toRef(props, 'defaultOpenValue'), - onDateMouseEnter: onEnter, - onDateMouseLeave: onLeave, + onDateMouseenter: onEnter, + onDateMouseleave: onLeave, }); expose({ @@ -426,10 +426,10 @@ function Picker() { placeholder, getPopupContainer, panelRender, - onMouseDown, - onMouseEnter, - onMouseLeave, - onContextMenu, + onMousedown, + onMouseenter, + onMouseleave, + onContextmenu, onClick, onSelect, direction, @@ -542,11 +542,11 @@ function Picker() { [`${prefixCls}-rtl`]: direction === 'rtl', })} style={attrs.style} - onMousedown={onMouseDown} - onMouseup={onInternalMouseUp} - onMouseenter={onMouseEnter} - onMouseleave={onMouseLeave} - onContextmenu={onContextMenu} + onMousedown={onMousedown} + onMouseup={onInternalMouseup} + onMouseenter={onMouseenter} + onMouseleave={onMouseleave} + onContextmenu={onContextmenu} onClick={onClick} >
= { onSelect?: (value: DateType) => void; onChange?: (value: DateType) => void; onPanelChange?: OnPanelChange; - onMouseDown?: (e: MouseEvent) => void; + onMousedown?: (e: MouseEvent) => void; onOk?: (date: DateType) => void; direction?: 'ltr' | 'rtl'; @@ -142,7 +142,7 @@ function PickerPanel() { 'onSelect', 'onChange', 'onPanelChange', - 'onMouseDown', + 'onMousedown', 'onPickerValueChange', 'onOk', 'components', @@ -309,8 +309,8 @@ function PickerPanel() { }; // ========================= Interactive ========================== - const onInternalKeyDown = (e: KeyboardEvent) => { - if (panelRef.value && panelRef.value.onKeyDown) { + const onInternalKeydown = (e: KeyboardEvent) => { + if (panelRef.value && panelRef.value.onKeydown) { if ( [ KeyCode.LEFT, @@ -324,7 +324,7 @@ function PickerPanel() { ) { e.preventDefault(); } - return panelRef.value.onKeyDown(e); + return panelRef.value.onKeydown(e); } /* istanbul ignore next */ @@ -399,13 +399,13 @@ function PickerPanel() { showTime, showToday, renderExtraFooter, - onMouseDown, + onMousedown, onOk, components, } = props; if (operationRef && panelPosition.value !== 'right') { operationRef.value = { - onKeyDown: onInternalKeyDown, + onKeydown: onInternalKeydown, onClose: () => { if (panelRef.value && panelRef.value.onClose) { panelRef.value.onClose(); @@ -580,9 +580,9 @@ function PickerPanel() { tabindex={tabindex} class={classNames(classString.value, attrs.class)} style={attrs.style} - onKeydown={onInternalKeyDown} + onKeydown={onInternalKeydown} onBlur={onInternalBlur} - onMousedown={onMouseDown} + onMousedown={onMousedown} ref={panelDivRef} > {panelNode} diff --git a/components/vc-picker/RangePicker.tsx b/components/vc-picker/RangePicker.tsx index af5ee78c7..2529756fa 100644 --- a/components/vc-picker/RangePicker.tsx +++ b/components/vc-picker/RangePicker.tsx @@ -105,8 +105,8 @@ export type RangePickerSharedProps = { onPanelChange?: (values: RangeValue, modes: [PanelMode, PanelMode]) => void; onFocus?: FocusEventHandler; onBlur?: FocusEventHandler; - onMouseEnter?: MouseEventHandler; - onMouseLeave?: MouseEventHandler; + onMouseenter?: MouseEventHandler; + onMouseleave?: MouseEventHandler; onOk?: (dates: RangeValue) => void; direction?: 'ltr' | 'rtl'; autocomplete?: string; @@ -168,6 +168,8 @@ type MergedRangePickerProps = { } & OmitType; function RangerPicker() { return defineComponent>({ + name: 'RangerPicker', + inheritAttrs: false, props: [ 'prefixCls', 'id', @@ -210,10 +212,10 @@ function RangerPicker() { 'onCalendarChange', 'onFocus', 'onBlur', - 'onMouseEnter', - 'onMouseLeave', + 'onMouseenter', + 'onMouseleave', 'onOk', - 'onKeyDown', + 'onKeydown', 'components', 'order', 'direction', @@ -502,10 +504,10 @@ function RangerPicker() { } } - const forwardKeyDown = (e: KeyboardEvent) => { - if (mergedOpen && operationRef.value && operationRef.value.onKeyDown) { + const forwardKeydown = (e: KeyboardEvent) => { + if (mergedOpen && operationRef.value && operationRef.value.onKeydown) { // Let popup panel handle keyboard - return operationRef.value.onKeyDown(e); + return operationRef.value.onKeydown(e); } /* istanbul ignore next */ @@ -513,7 +515,7 @@ function RangerPicker() { { warning( false, - 'Picker not correct forward KeyDown operation. Please help to fire issue about this.', + 'Picker not correct forward Keydown operation. Please help to fire issue about this.', ); return false; } @@ -573,7 +575,7 @@ function RangerPicker() { const [endHoverValue, onEndEnter, onEndLeave] = useHoverValue(endText, sharedTextHooksProps); - const onDateMouseEnter = (date: DateType) => { + const onDateMouseenter = (date: DateType) => { setHoverRangedValue(updateValues(selectedValue.value, date, mergedActivePickerIndex.value)); if (mergedActivePickerIndex.value === 0) { onStartEnter(date); @@ -582,7 +584,7 @@ function RangerPicker() { } }; - const onDateMouseLeave = () => { + const onDateMouseleave = () => { setHoverRangedValue(updateValues(selectedValue.value, null, mergedActivePickerIndex.value)); if (mergedActivePickerIndex.value === 0) { onStartLeave(); @@ -593,7 +595,7 @@ function RangerPicker() { // ============================= Input ============================= const getSharedInputHookProps = (index: 0 | 1, resetText: () => void) => ({ - forwardKeyDown, + forwardKeydown, onBlur: (e: FocusEvent) => { props.onBlur?.(e); }, @@ -625,8 +627,8 @@ function RangerPicker() { blurToCancel: needConfirmButton, open: startOpen, value: startText, - onKeyDown: (e, preventDefault) => { - props.onKeyDown?.(e, preventDefault); + onKeydown: (e, preventDefault) => { + props.onKeydown?.(e, preventDefault); }, }); @@ -635,8 +637,8 @@ function RangerPicker() { blurToCancel: needConfirmButton, open: endOpen, value: endText, - onKeyDown: (e, preventDefault) => { - props.onKeyDown?.(e, preventDefault); + onKeydown: (e, preventDefault) => { + props.onKeydown?.(e, preventDefault); }, }); @@ -657,7 +659,7 @@ function RangerPicker() { } }; - const onPickerMouseDown = (e: MouseEvent) => { + const onPickerMousedown = (e: MouseEvent) => { // shouldn't affect input elements if picker is active if ( mergedOpen.value && @@ -759,10 +761,10 @@ function RangerPicker() { triggerChange(newValues, null); triggerOpen(false, mergedActivePickerIndex.value); }, - onMouseEnter: () => { + onMouseenter: () => { setRangeHoverValue(newValues); }, - onMouseLeave: () => { + onMouseleave: () => { setRangeHoverValue(null); }, }; @@ -897,8 +899,8 @@ function RangerPicker() { useProvidePanel({ operationRef, hideHeader: computed(() => props.picker === 'time'), - onDateMouseEnter, - onDateMouseLeave, + onDateMouseenter, + onDateMouseleave, hideRanges: computed(() => true), onSelect: onContextSelect, open: mergedOpen, @@ -927,8 +929,8 @@ function RangerPicker() { clearIcon, inputReadOnly, renderExtraFooter, - onMouseEnter, - onMouseLeave, + onMouseenter, + onMouseleave, onOk, components, direction, @@ -1145,9 +1147,9 @@ function RangerPicker() { })} style={attrs.style} onClick={onPickerClick} - onMouseenter={onMouseEnter} - onMouseleave={onMouseLeave} - onMousedown={onPickerMouseDown} + onMouseenter={onMouseenter} + onMouseleave={onMouseleave} + onMousedown={onPickerMousedown} {...getDataOrAriaProps(props)} >
; isClickOutside: (clickElement: EventTarget | null) => boolean; triggerOpen: (open: boolean) => void; - forwardKeyDown: (e: KeyboardEvent) => boolean; - onKeyDown: (e: KeyboardEvent, preventDefault: () => void) => void; + forwardKeydown: (e: KeyboardEvent) => boolean; + onKeydown: (e: KeyboardEvent, preventDefault: () => void) => void; blurToCancel?: ComputedRef; onSubmit: () => void | boolean; onCancel: () => void; @@ -56,7 +56,7 @@ export default function usePickerInput({ preventDefaultRef.value = true; }; - onKeyDown(e, preventDefault); + onKeydown(e, preventDefault); if (preventDefaultRef.value) return; @@ -77,7 +77,7 @@ export default function usePickerInput({ typing.value = false; e.preventDefault(); } else if (!typing.value && open.value) { - if (!forwardKeyDown(e) && e.shiftKey) { + if (!forwardKeydown(e) && e.shiftKey) { typing.value = true; e.preventDefault(); } @@ -96,7 +96,7 @@ export default function usePickerInput({ triggerOpen(true); } else if (!typing.value) { // Let popup panel handle keyboard - forwardKeyDown(e); + forwardKeydown(e); } }, @@ -149,13 +149,13 @@ export default function usePickerInput({ watch(value, () => { valueChangedRef.value = true; }); - const globalMouseDownEvent = ref(); + const globalMousedownEvent = ref(); // Global click handler watchEffect( () => - globalMouseDownEvent.value && - globalMouseDownEvent.value()( - (globalMouseDownEvent.value = addGlobalMouseDownEvent((e: MouseEvent) => { + globalMousedownEvent.value && + globalMousedownEvent.value()( + (globalMousedownEvent.value = addGlobalMousedownEvent((e: MouseEvent) => { const target = getTargetFromEvent(e); if (open) { @@ -176,7 +176,7 @@ export default function usePickerInput({ ), ); onBeforeUnmount(() => { - globalMouseDownEvent.value && globalMouseDownEvent.value(); + globalMousedownEvent.value && globalMousedownEvent.value(); }); return [inputProps, { focused, typing }]; diff --git a/components/vc-picker/interface.ts b/components/vc-picker/interface.ts index 6bf906f79..0390d4744 100644 --- a/components/vc-picker/interface.ts +++ b/components/vc-picker/interface.ts @@ -46,7 +46,7 @@ export type PanelMode = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year' export type PickerMode = Exclude; export type PanelRefProps = { - onKeyDown?: (e: KeyboardEvent) => boolean; + onKeydown?: (e: KeyboardEvent) => boolean; onBlur?: (e: FocusEvent) => void; onClose?: () => void; }; @@ -103,8 +103,8 @@ export type Components = { export type RangeList = { label: string; onClick: () => void; - onMouseEnter: () => void; - onMouseLeave: () => void; + onMouseenter: () => void; + onMouseleave: () => void; }[]; export type CustomFormat = (value: DateType) => string; diff --git a/components/vc-picker/panels/DatePanel/index.tsx b/components/vc-picker/panels/DatePanel/index.tsx index b41896a57..052b00e8d 100644 --- a/components/vc-picker/panels/DatePanel/index.tsx +++ b/components/vc-picker/panels/DatePanel/index.tsx @@ -4,7 +4,7 @@ import DateHeader from './DateHeader'; import type { PanelSharedProps } from '../../interface'; import { WEEK_DAY_COUNT } from '../../utils/dateUtil'; import type { KeyboardConfig } from '../../utils/uiUtil'; -import { createKeyDownHandler } from '../../utils/uiUtil'; +import { createKeydownHandler } from '../../utils/uiUtil'; import classNames from '../../../_util/classNames'; import useMergeProps from '../../hooks/useMergeProps'; @@ -38,8 +38,8 @@ function DatePanel(_props: DatePanelProps) { const panelPrefixCls = `${prefixCls}-${panelName}-panel`; // ======================= Keyboard ======================= operationRef.value = { - onKeyDown: (event: KeyboardEvent) => - createKeyDownHandler(event, { + onKeydown: (event: KeyboardEvent) => + createKeydownHandler(event, { onLeftRight: diff => { onSelect(generateConfig.addDate(value || viewDate, diff), 'key'); }, diff --git a/components/vc-picker/panels/DatetimePanel/index.tsx b/components/vc-picker/panels/DatetimePanel/index.tsx index 1f8048c87..79fd79538 100644 --- a/components/vc-picker/panels/DatetimePanel/index.tsx +++ b/components/vc-picker/panels/DatetimePanel/index.tsx @@ -54,7 +54,7 @@ function DatetimePanel(_props: DatetimePanelProps) { }; operationRef.value = { - onKeyDown: (event: KeyboardEvent) => { + onKeydown: (event: KeyboardEvent) => { // Switch active panel if (event.which === KeyCode.TAB) { const nextActivePanel = getNextActive(event.shiftKey ? -1 : 1); @@ -71,8 +71,8 @@ function DatetimePanel(_props: DatetimePanelProps) { if (activePanel.value) { const ref = activePanel.value === 'date' ? dateOperationRef : timeOperationRef; - if (ref.value && ref.value.onKeyDown) { - ref.value.onKeyDown(event); + if (ref.value && ref.value.onKeydown) { + ref.value.onKeydown(event); } return true; diff --git a/components/vc-picker/panels/DecadePanel/index.tsx b/components/vc-picker/panels/DecadePanel/index.tsx index f7e465417..e600b3351 100644 --- a/components/vc-picker/panels/DecadePanel/index.tsx +++ b/components/vc-picker/panels/DecadePanel/index.tsx @@ -1,7 +1,7 @@ import DecadeHeader from './DecadeHeader'; import DecadeBody, { DECADE_COL_COUNT } from './DecadeBody'; import type { PanelSharedProps } from '../../interface'; -import { createKeyDownHandler } from '../../utils/uiUtil'; +import { createKeydownHandler } from '../../utils/uiUtil'; import useMergeProps from '../../hooks/useMergeProps'; export type DecadePanelProps = PanelSharedProps; @@ -25,8 +25,8 @@ function DecadePanel(_props: DecadePanelProps) { // ======================= Keyboard ======================= operationRef.value = { - onKeyDown: (event: KeyboardEvent) => - createKeyDownHandler(event, { + onKeydown: (event: KeyboardEvent) => + createKeydownHandler(event, { onLeftRight: diff => { onSelect(generateConfig.addYear(viewDate, diff * DECADE_UNIT_DIFF), 'key'); }, diff --git a/components/vc-picker/panels/MonthPanel/index.tsx b/components/vc-picker/panels/MonthPanel/index.tsx index 1cf7b427e..04fdfd776 100644 --- a/components/vc-picker/panels/MonthPanel/index.tsx +++ b/components/vc-picker/panels/MonthPanel/index.tsx @@ -2,7 +2,7 @@ import MonthHeader from './MonthHeader'; import type { MonthCellRender } from './MonthBody'; import MonthBody, { MONTH_COL_COUNT } from './MonthBody'; import type { PanelSharedProps } from '../../interface'; -import { createKeyDownHandler } from '../../utils/uiUtil'; +import { createKeydownHandler } from '../../utils/uiUtil'; import useMergeProps from '../../hooks/useMergeProps'; export type MonthPanelProps = { @@ -26,8 +26,8 @@ function MonthPanel(_props: MonthPanelProps) { // ======================= Keyboard ======================= operationRef.value = { - onKeyDown: (event: KeyboardEvent) => - createKeyDownHandler(event, { + onKeydown: (event: KeyboardEvent) => + createKeydownHandler(event, { onLeftRight: diff => { onSelect(generateConfig.addMonth(value || viewDate, diff), 'key'); }, diff --git a/components/vc-picker/panels/PanelBody.tsx b/components/vc-picker/panels/PanelBody.tsx index b7407c14b..4af0ee3f2 100644 --- a/components/vc-picker/panels/PanelBody.tsx +++ b/components/vc-picker/panels/PanelBody.tsx @@ -49,7 +49,7 @@ function PanelBody(_props: PanelBodyProps) { titleCell, headerCells, } = useMergeProps(_props); - const { onDateMouseEnter, onDateMouseLeave, mode } = useInjectPanel(); + const { onDateMouseenter, onDateMouseleave, mode } = useInjectPanel(); const cellPrefixCls = `${prefixCls}-cell`; @@ -99,13 +99,13 @@ function PanelBody(_props: PanelBodyProps) { } }} onMouseenter={() => { - if (!disabled && onDateMouseEnter) { - onDateMouseEnter(currentDate); + if (!disabled && onDateMouseenter) { + onDateMouseenter(currentDate); } }} onMouseleave={() => { - if (!disabled && onDateMouseLeave) { - onDateMouseLeave(currentDate); + if (!disabled && onDateMouseleave) { + onDateMouseleave(currentDate); } }} > diff --git a/components/vc-picker/panels/QuarterPanel/index.tsx b/components/vc-picker/panels/QuarterPanel/index.tsx index 49825ca75..a1f5057b3 100644 --- a/components/vc-picker/panels/QuarterPanel/index.tsx +++ b/components/vc-picker/panels/QuarterPanel/index.tsx @@ -1,7 +1,7 @@ import QuarterHeader from './QuarterHeader'; import QuarterBody from './QuarterBody'; import type { PanelSharedProps } from '../../interface'; -import { createKeyDownHandler } from '../../utils/uiUtil'; +import { createKeydownHandler } from '../../utils/uiUtil'; import useMergeProps from '../../hooks/useMergeProps'; export type QuarterPanelProps = {} & PanelSharedProps; @@ -23,8 +23,8 @@ function QuarterPanel(_props: QuarterPanelProps) { // ======================= Keyboard ======================= operationRef.value = { - onKeyDown: (event: KeyboardEvent) => - createKeyDownHandler(event, { + onKeydown: (event: KeyboardEvent) => + createKeydownHandler(event, { onLeftRight: diff => { onSelect(generateConfig.addMonth(value || viewDate, diff * 3), 'key'); }, diff --git a/components/vc-picker/panels/TimePanel/index.tsx b/components/vc-picker/panels/TimePanel/index.tsx index 915e3f4e9..31530d66b 100644 --- a/components/vc-picker/panels/TimePanel/index.tsx +++ b/components/vc-picker/panels/TimePanel/index.tsx @@ -2,7 +2,7 @@ import TimeHeader from './TimeHeader'; import type { BodyOperationRef } from './TimeBody'; import TimeBody from './TimeBody'; import type { PanelSharedProps, DisabledTimes } from '../../interface'; -import { createKeyDownHandler } from '../../utils/uiUtil'; +import { createKeydownHandler } from '../../utils/uiUtil'; import classNames from '../../../_util/classNames'; import { ref } from '@vue/reactivity'; import useMergeProps from '../../hooks/useMergeProps'; @@ -53,8 +53,8 @@ function TimePanel(_props: TimePanelProps) { const columnsCount = countBoolean([showHour, showMinute, showSecond, use12Hours]); operationRef.value = { - onKeyDown: (event: KeyboardEvent) => - createKeyDownHandler(event, { + onKeydown: (event: KeyboardEvent) => + createKeydownHandler(event, { onLeftRight: diff => { activeColumnIndex.value = (activeColumnIndex.value + diff + columnsCount) % columnsCount; }, diff --git a/components/vc-picker/panels/YearPanel/index.tsx b/components/vc-picker/panels/YearPanel/index.tsx index 046b3e62e..7a43bc86a 100644 --- a/components/vc-picker/panels/YearPanel/index.tsx +++ b/components/vc-picker/panels/YearPanel/index.tsx @@ -1,7 +1,7 @@ import YearHeader from './YearHeader'; import YearBody, { YEAR_COL_COUNT } from './YearBody'; import type { PanelSharedProps, PanelMode } from '../../interface'; -import { createKeyDownHandler } from '../../utils/uiUtil'; +import { createKeydownHandler } from '../../utils/uiUtil'; import useMergeProps from '../../hooks/useMergeProps'; export type YearPanelProps = { @@ -28,8 +28,8 @@ function YearPanel(_props: YearPanelProps) { // ======================= Keyboard ======================= operationRef.value = { - onKeyDown: (event: KeyboardEvent) => - createKeyDownHandler(event, { + onKeydown: (event: KeyboardEvent) => + createKeydownHandler(event, { onLeftRight: diff => { onSelect(generateConfig.addYear(value || viewDate, diff), 'key'); }, diff --git a/components/vc-picker/utils/getRanges.tsx b/components/vc-picker/utils/getRanges.tsx index 4aab0daac..5f1e68ce4 100644 --- a/components/vc-picker/utils/getRanges.tsx +++ b/components/vc-picker/utils/getRanges.tsx @@ -32,9 +32,9 @@ export default function getRanges({ presetNode = ( <> - {rangeList.map(({ label, onClick, onMouseEnter, onMouseLeave }) => ( + {rangeList.map(({ label, onClick, onMouseenter, onMouseleave }) => (
  • - + {label}
  • diff --git a/components/vc-picker/utils/uiUtil.ts b/components/vc-picker/utils/uiUtil.ts index 6145af915..c874fa517 100644 --- a/components/vc-picker/utils/uiUtil.ts +++ b/components/vc-picker/utils/uiUtil.ts @@ -66,7 +66,7 @@ export type KeyboardConfig = { onPageUpDown?: ((diff: number) => void) | null; onEnter?: (() => void) | null; }; -export function createKeyDownHandler( +export function createKeydownHandler( event: KeyboardEvent, { onLeftRight, onCtrlLeftRight, onUpDown, onPageUpDown, onEnter }: KeyboardConfig, ): boolean { @@ -197,7 +197,7 @@ type ClickEventHandler = (event: MouseEvent) => void; let globalClickFunc: ClickEventHandler | null = null; const clickCallbacks = new Set(); -export function addGlobalMouseDownEvent(callback: ClickEventHandler) { +export function addGlobalMousedownEvent(callback: ClickEventHandler) { if (!globalClickFunc && typeof window !== 'undefined' && window.addEventListener) { globalClickFunc = (e: MouseEvent) => { // Clone a new list to avoid repeat trigger events