add onKeyDown Props that supports prevent default behavior

README.md

@@ -1,4 +1,4 @@
-# rc-picker 
+# rc-picker
 
 [![NPM version][npm-image]][npm-url]
 [![build status][github-actions-image]][github-actions-url]
@@ -76,8 +76,9 @@ render(<Picker />, mountNode);
 | getPopupContainer | function(trigger) |  | to set the container of the floating layer, while the default is to create a div element in body |
 | onChange | Function(date: moment, dateString: string) |  | a callback function, can be executed when the selected time is changing |
 | onOpenChange | Function(open:boolean) |  | called when open/close picker |
-| onFocus | (evnet:React.FocusEventHandler<HTMLInputElement>) => void |  | called like input's on focus |
-| onBlur | (evnet:React.FocusEventHandler<HTMLInputElement>) => void |  | called like input's on blur |
+| onFocus | (event:React.FocusEvent<HTMLInputElement>) => void |  | called like input's on focus |
+| onBlur | (event:React.FocusEvent<HTMLInputElement>) => void |  | called like input's on blur |
+| onKeyDown | (event:React.KeyboardEvent<HTMLInputElement>, preventDefault: () => void) => void |  | input on keydown event |
 | direction | String: ltr or rtl |  | Layout direction of picker component, it supports RTL direction too. |
 
 ### PickerPanel
@@ -102,7 +103,7 @@ render(<Picker />, mountNode);
 | renderExtraFooter | (mode) => React.Node |  | extra footer |
 | onSelect | Function(date: moment) |  | a callback function, can be executed when the selected time |
 | onPanelChange | Function(value: moment, mode) |  | callback when picker panel mode is changed |
-| onMouseDown | (evnet:React.MouseEventHandler<HTMLInputElement>) => void |  | callback when executed onMouseDown evnent |
+| onMouseDown | (event:React.MouseEvent<HTMLInputElement>) => void |  | callback when executed onMouseDown evnent |
 | direction | String: ltr or rtl |  | Layout direction of picker component, it supports RTL direction too. |
 
 ### RangePicker

examples/basic.tsx

@@ -29,6 +29,10 @@ export default () => {
     onChange,
   };
 
+  const keyDown = (e, preventDefault) => {
+    if (e.keyCode === 13) preventDefault();
+  };
+
   return (
     <div>
       <h1>Value: {value ? value.format('YYYY-MM-DD HH:mm:ss') : 'null'}</h1>
@@ -125,6 +129,10 @@ export default () => {
           <h3>Keyboard navigation (Tab key) disabled</h3>
           <Picker<Moment> {...sharedProps} locale={enUS} tabIndex={-1} />
         </div>
+        <div style={{ margin: '0 8px' }}>
+          <h3>Keyboard event with prevent default behaviors</h3>
+          <Picker<Moment> {...sharedProps} locale={enUS} onKeyDown={keyDown} />
+        </div>
       </div>
     </div>
   );

src/Picker.tsx

@@ -77,6 +77,7 @@ export interface PickerSharedProps<DateType> extends React.AriaAttributes {
   onMouseLeave?: React.MouseEventHandler<HTMLDivElement>;
   onClick?: React.MouseEventHandler<HTMLDivElement>;
   onContextMenu?: React.MouseEventHandler<HTMLDivElement>;
+  onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>, preventDefault: () => void) => void;
 
   // Internal
   /** @private Internal usage, do not use in production mode!!! */
@@ -170,6 +171,7 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
     onMouseLeave,
     onContextMenu,
     onClick,
+    onKeyDown,
     onSelect,
     direction,
     autoComplete = 'off',
@@ -310,6 +312,9 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
       setSelectedValue(mergedValue);
       resetText();
     },
+    onKeyDown: (e, preventDefault) => {
+      onKeyDown?.(e, preventDefault);
+    },
     onFocus,
     onBlur,
   });

src/RangePicker.tsx

@@ -210,6 +210,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
     onFocus,
     onBlur,
     onOk,
+    onKeyDown,
     components,
     order,
     direction,
@@ -610,12 +611,18 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
     ...getSharedInputHookProps(0, resetStartText),
     open: startOpen,
     value: startText,
+    onKeyDown: (e, preventDefault) => {
+      onKeyDown?.(e, preventDefault);
+    },
   });
 
   const [endInputProps, { focused: endFocused, typing: endTyping }] = usePickerInput({
     ...getSharedInputHookProps(1, resetEndText),
     open: endOpen,
     value: endText,
+    onKeyDown: (e, preventDefault) => {
+      onKeyDown?.(e, preventDefault);
+    },
   });
 
   // ========================== Click Picker ==========================

src/hooks/usePickerInput.ts

@@ -9,6 +9,7 @@ export default function usePickerInput({
   isClickOutside,
   triggerOpen,
   forwardKeyDown,
+  onKeyDown,
   blurToCancel,
   onSubmit,
   onCancel,
@@ -20,6 +21,10 @@ export default function usePickerInput({
   isClickOutside: (clickElement: EventTarget | null) => boolean;
   triggerOpen: (open: boolean) => void;
   forwardKeyDown: (e: React.KeyboardEvent<HTMLInputElement>) => boolean;
+  onKeyDown: (
+    e: React.KeyboardEvent<HTMLInputElement>,
+    preventDefault: () => void,
+  ) => void;
   blurToCancel?: boolean;
   onSubmit: () => void | boolean;
   onCancel: () => void;
@@ -37,12 +42,22 @@ export default function usePickerInput({
 
   const valueChangedRef = useRef<boolean>(false);
 
+  const preventDefaultRef = useRef<boolean>(false);
+
   const inputProps: React.DOMAttributes<HTMLInputElement> = {
     onMouseDown: () => {
       setTyping(true);
       triggerOpen(true);
     },
     onKeyDown: e => {
+      const preventDefault = (): void => {
+        preventDefaultRef.current = true;
+      };
+
+      onKeyDown(e, preventDefault);
+
+      if (preventDefaultRef.current) return;
+
       switch (e.which) {
         case KeyCode.ENTER: {
           if (!open) {

tests/picker.spec.tsx

@@ -866,4 +866,31 @@ describe('Picker.Basic', () => {
       wrapper.unmount();
     });
   });
+
+  describe('prevent default on keydown', () => {
+    it('should open picker panel if no prevent default', () => {
+      const keyDown = jest.fn();
+      const wrapper = mount(<MomentPicker onKeyDown={keyDown} />);
+
+      wrapper.closePicker();
+      wrapper.keyDown(KeyCode.ENTER);
+      expect(wrapper.isOpen()).toBeTruthy();
+    });
+
+    it('should not open if prevent default is called', () => {
+      const keyDown = jest.fn(({ which }, preventDefault) => {
+        if(which === 13) preventDefault();
+      });
+      const wrapper = mount(<MomentPicker onKeyDown={keyDown} />);
+
+      wrapper.openPicker();
+      expect(wrapper.isOpen()).toBeTruthy();
+
+      wrapper.keyDown(KeyCode.ESC);
+      expect(wrapper.isOpen()).toBeFalsy();
+
+      wrapper.keyDown(KeyCode.ENTER);
+      expect(wrapper.isOpen()).toBeFalsy();
+    });
+  })
 });