Do not accept a and p sympbols in not am/pm mode (#1183)

mui · Jul 15, 2019 · 5b7e485 · 5b7e485
1 parent a9067fd
commit 5b7e485
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/lib/src/DateTimePicker/DateTimePicker.tsx b/lib/src/DateTimePicker/DateTimePicker.tsx
@@ -60,6 +60,9 @@ export const DateTimePicker = makePurePicker<DateTimePickerProps>({
 export const KeyboardDateTimePicker = makeKeyboardPicker<KeyboardDateTimePickerProps>({
   useOptions,
   DefaultToolbarComponent: DateTimePickerToolbar,
+  getCustomProps: props => ({
+    refuse: props.ampm ? /[^\dap]+/gi : /[^\d]+/gi,
+  }),
 });
 
 DateTimePicker.defaultProps = defaultProps;

diff --git a/lib/src/Picker/WrappedKeyboardPicker.tsx b/lib/src/Picker/WrappedKeyboardPicker.tsx
@@ -13,17 +13,19 @@ export type WrappedKeyboardPickerProps = DateValidationProps &
   BaseKeyboardPickerProps &
   ExtendWrapper<KeyboardDateInputProps>;
 
-export interface MakePickerOptions {
+export interface MakePickerOptions<T> {
   useOptions: (props: any) => StateHookOptions;
+  getCustomProps?: (props: T) => Partial<T>;
   DefaultToolbarComponent: React.ComponentType<ToolbarComponentProps>;
 }
 
 // Mostly duplicate of ./WrappedPurePicker.tsx to enable tree-shaking of keyboard logic
 // TODO investigate how to reduce duplications
 export function makeKeyboardPicker<T extends any>({
   useOptions,
+  getCustomProps,
   DefaultToolbarComponent,
-}: MakePickerOptions): React.FC<WrappedKeyboardPickerProps & T> {
+}: MakePickerOptions<WrappedKeyboardPickerProps & T>): React.FC<WrappedKeyboardPickerProps & T> {
   function WrappedKeyboardPicker(props: WrappedKeyboardPickerProps & T) {
     const {
       allowKeyboardControl,
@@ -71,6 +73,8 @@ export function makeKeyboardPicker<T extends any>({
       ...other
     } = props;
 
+    const injectedProps = getCustomProps ? getCustomProps(props) : {};
+
     const options = useOptions(props);
     const { pickerProps, inputProps, wrapperProps } = useKeyboardPickerState(props, options);
 
@@ -79,6 +83,7 @@ export function makeKeyboardPicker<T extends any>({
         variant={variant}
         InputComponent={KeyboardDateInput}
         DateInputProps={inputProps}
+        {...injectedProps}
         {...wrapperProps}
         {...other}
       >

diff --git a/lib/src/Picker/WrappedPurePicker.tsx b/lib/src/Picker/WrappedPurePicker.tsx
@@ -13,8 +13,9 @@ export type WrappedPurePickerProps = DateValidationProps &
 
 export function makePurePicker<T extends any>({
   useOptions,
+  getCustomProps,
   DefaultToolbarComponent,
-}: MakePickerOptions): React.FC<WrappedPurePickerProps & T> {
+}: MakePickerOptions<WrappedPurePickerProps & T>): React.FC<WrappedPurePickerProps & T> {
   function WrappedPurePicker(props: WrappedPurePickerProps & T) {
     const {
       allowKeyboardControl,
@@ -62,6 +63,8 @@ export function makePurePicker<T extends any>({
       ...other
     } = props;
 
+    const injectedProps = getCustomProps ? getCustomProps(props) : {};
+
     const options = useOptions(props);
     const { pickerProps, inputProps, wrapperProps } = usePickerState(props, options);
 
@@ -71,6 +74,7 @@ export function makePurePicker<T extends any>({
         InputComponent={PureDateInput}
         DateInputProps={inputProps}
         {...wrapperProps}
+        {...injectedProps}
         {...other}
       >
         <Picker

diff --git a/lib/src/TimePicker/TimePicker.tsx b/lib/src/TimePicker/TimePicker.tsx
@@ -57,6 +57,9 @@ export const TimePicker = makePurePicker<TimePickerViewsProps>({
 export const KeyboardTimePicker = makeKeyboardPicker<TimePickerViewsProps>({
   useOptions,
   DefaultToolbarComponent: TimePickerToolbar,
+  getCustomProps: props => ({
+    refuse: props.ampm ? /[^\dap]+/gi : /[^\d]+/gi,
+  }),
 });
 
 TimePicker.defaultProps = defaultProps;

diff --git a/lib/src/_shared/KeyboardDateInput.tsx b/lib/src/_shared/KeyboardDateInput.tsx
@@ -33,7 +33,7 @@ export interface KeyboardDateInputProps
   maskChar?: string;
   /**
    * Refuse values regexp
-   * @default /[^\dap]+/gi
+   * @default /[^\d]+/gi
    */
   refuse?: RegExp;
   /**
@@ -61,7 +61,7 @@ const KeyboardDateInput: React.FunctionComponent<KeyboardDateInputProps> = ({
   InputProps,
   mask,
   maskChar = '_',
-  refuse = /[^\dap]+/gi,
+  refuse = /[^\d]+/gi,
   format,
   keyboardIcon,
   disabled,