@mui/x-date-pickers 8.0.0-alpha.4 → 8.0.0-alpha.6

package/modern/PickersTextField/PickersInput/pickersInputClasses.js

@@ -5,4 +5,4 @@ import { pickersInputBaseClasses } from "../PickersInputBase/index.js";
 export function getPickersInputUtilityClass(slot) {
   return generateUtilityClass('MuiPickersFilledInput', slot);
 }
-export const pickersInputClasses = _extends({}, pickersInputBaseClasses, generateUtilityClasses('MuiPickersInput', ['root', 'input']));
+export const pickersInputClasses = _extends({}, pickersInputBaseClasses, generateUtilityClasses('MuiPickersInput', ['root', 'underline', 'input']));

package/modern/PickersTextField/PickersInputBase/PickersInputBase.js

@@ -1,6 +1,6 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["elements", "areAllSectionsEmpty", "defaultValue", "label", "value", "onChange", "id", "autoFocus", "endAdornment", "startAdornment", "renderSuffix", "slots", "slotProps", "contentEditable", "tabIndex", "onInput", "onPaste", "onKeyDown", "fullWidth", "name", "readOnly", "inputProps", "inputRef", "sectionListRef", "onFocus", "onBlur"];
+const _excluded = ["elements", "areAllSectionsEmpty", "defaultValue", "label", "value", "onChange", "id", "autoFocus", "endAdornment", "startAdornment", "renderSuffix", "slots", "slotProps", "contentEditable", "tabIndex", "onInput", "onPaste", "onKeyDown", "fullWidth", "name", "readOnly", "inputProps", "inputRef", "sectionListRef", "onFocus", "onBlur", "classes", "ownerState"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useFormControl } from '@mui/material/FormControl';
@@ -11,9 +11,9 @@ import composeClasses from '@mui/utils/composeClasses';
 import capitalize from '@mui/utils/capitalize';
 import useSlotProps from '@mui/utils/useSlotProps';
 import visuallyHidden from '@mui/utils/visuallyHidden';
-import { useRtl } from '@mui/system/RtlProvider';
 import { pickersInputBaseClasses, getPickersInputBaseUtilityClass } from "./pickersInputBaseClasses.js";
 import { Unstable_PickersSectionList as PickersSectionList, Unstable_PickersSectionListRoot as PickersSectionListRoot, Unstable_PickersSectionListSection as PickersSectionListSection, Unstable_PickersSectionListSectionSeparator as PickersSectionListSectionSeparator, Unstable_PickersSectionListSectionContent as PickersSectionListSectionContent } from "../../PickersSectionList/index.js";
+import { usePickerTextFieldOwnerState } from "../usePickerTextFieldOwnerState.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const round = value => Math.round(value * 1e5) / 1e5;
 export const PickersInputBaseRoot = styled('div', {
@@ -35,7 +35,7 @@ export const PickersInputBaseRoot = styled('div', {
   letterSpacing: `${round(0.15 / 16)}em`,
   variants: [{
     props: {
-      fullWidth: true
+      isInputInFullWidth: true
     },
     style: {
       width: '100%'
@@ -64,36 +64,35 @@ export const PickersInputBaseSectionsContainer = styled(PickersSectionListRoot,
   width: '182px',
   variants: [{
     props: {
-      isRtl: true
+      fieldDirection: 'rtl'
     },
     style: {
       textAlign: 'right /*! @noflip */'
     }
   }, {
     props: {
-      size: 'small'
+      inputSize: 'small'
     },
     style: {
       paddingTop: 1
     }
   }, {
     props: {
-      adornedStart: false,
-      focused: false,
-      filled: false
+      hasStartAdornment: false,
+      isFieldFocused: false,
+      isFieldValueEmpty: true
     },
     style: {
       color: 'currentColor',
       opacity: 0
     }
   }, {
-    // Can't use the object notation because label can be null or undefined
-    props: ({
-      adornedStart,
-      focused,
-      filled,
-      label
-    }) => !adornedStart && !focused && !filled && label == null,
+    props: {
+      hasStartAdornment: false,
+      isFieldFocused: false,
+      isFieldValueEmpty: true,
+      inputHasLabel: false
+    },
     style: theme.vars ? {
       opacity: theme.vars.opacity.inputPlaceholder
     } : {
@@ -142,21 +141,20 @@ const PickersInputBaseInput = styled('input', {
   slot: 'Input',
   overridesResolver: (props, styles) => styles.hiddenInput
 })(_extends({}, visuallyHidden));
-const useUtilityClasses = ownerState => {
+const useUtilityClasses = (classes, ownerState) => {
   const {
-    focused,
-    disabled,
-    error,
-    classes,
-    fullWidth,
-    readOnly,
-    color,
-    size,
-    endAdornment,
-    startAdornment
+    isFieldFocused,
+    isFieldDisabled,
+    isFieldReadOnly,
+    hasFieldError,
+    inputSize,
+    isInputInFullWidth,
+    inputColor,
+    hasStartAdornment,
+    hasEndAdornment
   } = ownerState;
   const slots = {
-    root: ['root', focused && !disabled && 'focused', disabled && 'disabled', readOnly && 'readOnly', error && 'error', fullWidth && 'fullWidth', `color${capitalize(color)}`, size === 'small' && 'inputSizeSmall', Boolean(startAdornment) && 'adornedStart', Boolean(endAdornment) && 'adornedEnd'],
+    root: ['root', isFieldFocused && !isFieldDisabled && 'focused', isFieldDisabled && 'disabled', isFieldReadOnly && 'readOnly', hasFieldError && 'error', isInputInFullWidth && 'fullWidth', `color${capitalize(inputColor)}`, inputSize === 'small' && 'inputSizeSmall', hasStartAdornment && 'adornedStart', hasEndAdornment && 'adornedEnd'],
     notchedOutline: ['notchedOutline'],
     input: ['input'],
     sectionsContainer: ['sectionsContainer'],
@@ -166,6 +164,7 @@ const useUtilityClasses = ownerState => {
   };
   return composeClasses(slots, getPickersInputBaseUtilityClass, classes);
 };
+
 /**
  * @ignore - internal component.
  */
@@ -196,17 +195,20 @@ const PickersInputBase = /*#__PURE__*/React.forwardRef(function PickersInputBase
       inputRef,
       sectionListRef,
       onFocus,
-      onBlur
+      onBlur,
+      classes: classesProp,
+      ownerState: ownerStateProp
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const ownerStateContext = usePickerTextFieldOwnerState();
   const rootRef = React.useRef(null);
   const handleRootRef = useForkRef(ref, rootRef);
   const handleInputRef = useForkRef(inputProps?.ref, inputRef);
-  const isRtl = useRtl();
   const muiFormControl = useFormControl();
   if (!muiFormControl) {
     throw new Error('MUI X: PickersInputBase should always be used inside a PickersTextField component');
   }
+  const ownerState = ownerStateProp ?? ownerStateContext;
   const handleInputFocus = event => {
     muiFormControl.onFocus?.(event);
     onFocus?.(event);
@@ -230,10 +232,7 @@ const PickersInputBase = /*#__PURE__*/React.forwardRef(function PickersInputBase
       muiFormControl.onFilled();
     }
   }, [muiFormControl, areAllSectionsEmpty]);
-  const ownerState = _extends({}, props, muiFormControl, {
-    isRtl
-  });
-  const classes = useUtilityClasses(ownerState);
+  const classes = useUtilityClasses(classesProp, ownerState);
   const InputRoot = slots?.root || PickersInputBaseRoot;
   const inputRootProps = useSlotProps({
     elementType: InputRoot,
@@ -266,16 +265,16 @@ const PickersInputBase = /*#__PURE__*/React.forwardRef(function PickersInputBase
         sectionSeparator: PickersInputBaseSectionSeparator
       },
       slotProps: {
-        root: {
+        root: _extends({}, slotProps?.input, {
           ownerState
-        },
+        }),
         sectionContent: {
           className: pickersInputBaseClasses.sectionContent
         },
         sectionSeparator: ({
-          position
+          separatorPosition
         }) => ({
-          className: position === 'before' ? pickersInputBaseClasses.sectionBefore : pickersInputBaseClasses.sectionAfter
+          className: separatorPosition === 'before' ? pickersInputBaseClasses.sectionBefore : pickersInputBaseClasses.sectionAfter
         })
       }
     }), endAdornment, renderSuffix ? renderSuffix(_extends({}, muiFormControl)) : null, /*#__PURE__*/_jsx(PickersInputBaseInput, _extends({

package/modern/PickersTextField/PickersOutlinedInput/Outline.js

@@ -3,6 +3,8 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["children", "className", "label", "notched", "shrink"];
 import * as React from 'react';
 import { styled } from '@mui/material/styles';
+import { shouldForwardProp } from '@mui/system/createStyled';
+import { usePickerTextFieldOwnerState } from "../usePickerTextFieldOwnerState.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const OutlineRoot = styled('fieldset', {
   name: 'MuiPickersOutlinedInput',
@@ -36,7 +38,9 @@ const OutlineLabel = styled('span')(({
   fontFamily: theme.typography.fontFamily,
   fontSize: 'inherit'
 }));
-const OutlineLegend = styled('legend')(({
+const OutlineLegend = styled('legend', {
+  shouldForwardProp: prop => shouldForwardProp(prop) && prop !== 'notched'
+})(({
   theme
 }) => ({
   float: 'unset',
@@ -47,7 +51,7 @@ const OutlineLegend = styled('legend')(({
   // Fix Horizontal scroll when label too long
   variants: [{
     props: {
-      withLabel: false
+      inputHasLabel: false
     },
     style: {
       padding: 0,
@@ -60,7 +64,7 @@ const OutlineLegend = styled('legend')(({
     }
   }, {
     props: {
-      withLabel: true
+      inputHasLabel: true
     },
     style: {
       display: 'block',
@@ -86,7 +90,7 @@ const OutlineLegend = styled('legend')(({
     }
   }, {
     props: {
-      withLabel: true,
+      inputHasLabel: true,
       notched: true
     },
     style: {
@@ -106,13 +110,11 @@ const OutlineLegend = styled('legend')(({
 export default function Outline(props) {
   const {
       className,
-      label
+      label,
+      notched
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const withLabel = label != null && label !== '';
-  const ownerState = _extends({}, props, {
-    withLabel
-  });
+  const ownerState = usePickerTextFieldOwnerState();
   return /*#__PURE__*/_jsx(OutlineRoot, _extends({
     "aria-hidden": true,
     className: className
@@ -120,7 +122,8 @@ export default function Outline(props) {
     ownerState: ownerState,
     children: /*#__PURE__*/_jsx(OutlineLegend, {
       ownerState: ownerState,
-      children: withLabel ? /*#__PURE__*/_jsx(OutlineLabel, {
+      notched: notched,
+      children: label ? /*#__PURE__*/_jsx(OutlineLabel, {
         children: label
       }) :
       /*#__PURE__*/

package/modern/PickersTextField/PickersOutlinedInput/PickersOutlinedInput.js

@@ -1,6 +1,6 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["label", "autoFocus", "ownerState", "notched"];
+const _excluded = ["label", "autoFocus", "ownerState", "classes", "notched"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useFormControl } from '@mui/material/FormControl';
@@ -51,7 +51,7 @@ const PickersOutlinedInputRoot = styled(PickersInputBaseRoot, {
     // @ts-ignore
     .filter(key => (theme.vars ?? theme).palette[key]?.main ?? false).map(color => ({
       props: {
-        color
+        inputColor: color
       },
       style: {
         [`&.${pickersOutlinedInputClasses.focused}:not(.${pickersOutlinedInputClasses.error}) .${pickersOutlinedInputClasses.notchedOutline}`]: {
@@ -70,17 +70,14 @@ const PickersOutlinedInputSectionsContainer = styled(PickersInputBaseSectionsCon
   padding: '16.5px 0',
   variants: [{
     props: {
-      size: 'small'
+      inputSize: 'small'
     },
     style: {
       padding: '8.5px 0'
     }
   }]
 });
-const useUtilityClasses = ownerState => {
-  const {
-    classes
-  } = ownerState;
+const useUtilityClasses = classes => {
   const slots = {
     root: ['root'],
     notchedOutline: ['notchedOutline'],
@@ -89,6 +86,7 @@ const useUtilityClasses = ownerState => {
   const composedClasses = composeClasses(slots, getPickersOutlinedInputUtilityClass, classes);
   return _extends({}, classes, composedClasses);
 };
+
 /**
  * @ignore - internal component.
  */
@@ -99,15 +97,12 @@ const PickersOutlinedInput = /*#__PURE__*/React.forwardRef(function PickersOutli
   });
   const {
       label,
-      ownerState: ownerStateProp,
+      classes: classesProp,
       notched
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const muiFormControl = useFormControl();
-  const ownerState = _extends({}, props, ownerStateProp, muiFormControl, {
-    color: muiFormControl?.color || 'primary'
-  });
-  const classes = useUtilityClasses(ownerState);
+  const classes = useUtilityClasses(classesProp);
   return /*#__PURE__*/_jsx(PickersInputBase, _extends({
     slots: {
       root: PickersOutlinedInputRoot,
@@ -119,8 +114,7 @@ const PickersOutlinedInput = /*#__PURE__*/React.forwardRef(function PickersOutli
       className: classes.notchedOutline,
       label: label != null && label !== '' && muiFormControl?.required ? /*#__PURE__*/_jsxs(React.Fragment, {
         children: [label, "\u2009", '*']
-      }) : label,
-      ownerState: ownerState
+      }) : label
     })
   }, other, {
     label: label,

package/modern/PickersTextField/PickersTextField.js

@@ -2,7 +2,7 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["onFocus", "onBlur", "className", "color", "disabled", "error", "variant", "required", "InputProps", "inputProps", "inputRef", "sectionListRef", "elements", "areAllSectionsEmpty", "onClick", "onKeyDown", "onKeyUp", "onPaste", "onInput", "endAdornment", "startAdornment", "tabIndex", "contentEditable", "focused", "value", "onChange", "fullWidth", "id", "name", "helperText", "FormHelperTextProps", "label", "InputLabelProps"];
+const _excluded = ["onFocus", "onBlur", "className", "classes", "color", "disabled", "error", "variant", "required", "InputProps", "inputProps", "inputRef", "sectionListRef", "elements", "areAllSectionsEmpty", "onClick", "onKeyDown", "onKeyUp", "onPaste", "onInput", "endAdornment", "startAdornment", "tabIndex", "contentEditable", "focused", "value", "onChange", "fullWidth", "id", "name", "helperText", "FormHelperTextProps", "label", "InputLabelProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
@@ -18,6 +18,8 @@ import { getPickersTextFieldUtilityClass } from "./pickersTextFieldClasses.js";
 import { PickersOutlinedInput } from "./PickersOutlinedInput/index.js";
 import { PickersFilledInput } from "./PickersFilledInput/index.js";
 import { PickersInput } from "./PickersInput/index.js";
+import { useFieldOwnerState } from "../internals/hooks/useFieldOwnerState.js";
+import { PickerTextFieldOwnerStateContext } from "./usePickerTextFieldOwnerState.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const VARIANT_COMPONENT = {
   standard: PickersInput,
@@ -29,15 +31,14 @@ const PickersTextFieldRoot = styled(FormControl, {
   slot: 'Root',
   overridesResolver: (props, styles) => styles.root
 })({});
-const useUtilityClasses = ownerState => {
+const useUtilityClasses = (classes, ownerState) => {
   const {
-    focused,
-    disabled,
-    classes,
-    required
+    isFieldFocused,
+    isFieldDisabled,
+    isFieldRequired
   } = ownerState;
   const slots = {
-    root: ['root', focused && !disabled && 'focused', disabled && 'disabled', required && 'required']
+    root: ['root', isFieldFocused && !isFieldDisabled && 'focused', isFieldDisabled && 'disabled', isFieldRequired && 'required']
   };
   return composeClasses(slots, getPickersTextFieldUtilityClass, classes);
 };
@@ -51,6 +52,7 @@ const PickersTextField = /*#__PURE__*/React.forwardRef(function PickersTextField
       onFocus,
       onBlur,
       className,
+      classes: classesProp,
       color = 'primary',
       disabled = false,
       error = false,
@@ -91,64 +93,75 @@ const PickersTextField = /*#__PURE__*/React.forwardRef(function PickersTextField
   const id = useId(idProp);
   const helperTextId = helperText && id ? `${id}-helper-text` : undefined;
   const inputLabelId = label && id ? `${id}-label` : undefined;
-  const ownerState = _extends({}, props, {
-    color,
-    disabled,
-    error,
-    focused,
-    required,
-    variant
+  const fieldOwnerState = useFieldOwnerState({
+    disabled: props.disabled,
+    required: props.required,
+    readOnly: InputProps?.readOnly
   });
-  const classes = useUtilityClasses(ownerState);
+  const ownerState = React.useMemo(() => _extends({}, fieldOwnerState, {
+    isFieldValueEmpty: areAllSectionsEmpty,
+    isFieldFocused: focused ?? false,
+    hasFieldError: error ?? false,
+    inputSize: props.size ?? 'medium',
+    inputColor: color ?? 'primary',
+    isInputInFullWidth: fullWidth ?? false,
+    hasStartAdornment: Boolean(startAdornment ?? InputProps?.startAdornment),
+    hasEndAdornment: Boolean(endAdornment ?? InputProps?.endAdornment),
+    inputHasLabel: !!label
+  }), [fieldOwnerState, areAllSectionsEmpty, focused, error, props.size, color, fullWidth, startAdornment, endAdornment, InputProps?.startAdornment, InputProps?.endAdornment, label]);
+  const classes = useUtilityClasses(classesProp, ownerState);
   const PickersInputComponent = VARIANT_COMPONENT[variant];
-  return /*#__PURE__*/_jsxs(PickersTextFieldRoot, _extends({
-    className: clsx(classes.root, className),
-    ref: handleRootRef,
-    focused: focused,
-    disabled: disabled,
-    variant: variant,
-    error: error,
-    color: color,
-    fullWidth: fullWidth,
-    required: required,
-    ownerState: ownerState
-  }, other, {
-    children: [/*#__PURE__*/_jsx(InputLabel, _extends({
-      htmlFor: id,
-      id: inputLabelId
-    }, InputLabelProps, {
-      children: label
-    })), /*#__PURE__*/_jsx(PickersInputComponent, _extends({
-      elements: elements,
-      areAllSectionsEmpty: areAllSectionsEmpty,
-      onClick: onClick,
-      onKeyDown: onKeyDown,
-      onKeyUp: onKeyUp,
-      onInput: onInput,
-      onPaste: onPaste,
-      onFocus: onFocus,
-      onBlur: onBlur,
-      endAdornment: endAdornment,
-      startAdornment: startAdornment,
-      tabIndex: tabIndex,
-      contentEditable: contentEditable,
-      value: value,
-      onChange: onChange,
-      id: id,
+  return /*#__PURE__*/_jsx(PickerTextFieldOwnerStateContext.Provider, {
+    value: ownerState,
+    children: /*#__PURE__*/_jsxs(PickersTextFieldRoot, _extends({
+      className: clsx(classes.root, className),
+      ref: handleRootRef,
+      focused: focused,
+      disabled: disabled,
+      variant: variant,
+      error: error,
+      color: color,
       fullWidth: fullWidth,
-      inputProps: inputProps,
-      inputRef: inputRef,
-      sectionListRef: sectionListRef,
-      label: label,
-      name: name,
-      role: "group",
-      "aria-labelledby": inputLabelId
-    }, InputProps)), helperText && /*#__PURE__*/_jsx(FormHelperText, _extends({
-      id: helperTextId
-    }, FormHelperTextProps, {
-      children: helperText
-    }))]
-  }));
+      required: required,
+      ownerState: ownerState
+    }, other, {
+      children: [/*#__PURE__*/_jsx(InputLabel, _extends({
+        htmlFor: id,
+        id: inputLabelId
+      }, InputLabelProps, {
+        children: label
+      })), /*#__PURE__*/_jsx(PickersInputComponent, _extends({
+        elements: elements,
+        areAllSectionsEmpty: areAllSectionsEmpty,
+        onClick: onClick,
+        onKeyDown: onKeyDown,
+        onKeyUp: onKeyUp,
+        onInput: onInput,
+        onPaste: onPaste,
+        onFocus: onFocus,
+        onBlur: onBlur,
+        endAdornment: endAdornment,
+        startAdornment: startAdornment,
+        tabIndex: tabIndex,
+        contentEditable: contentEditable,
+        value: value,
+        onChange: onChange,
+        id: id,
+        fullWidth: fullWidth,
+        inputProps: inputProps,
+        inputRef: inputRef,
+        sectionListRef: sectionListRef,
+        label: label,
+        name: name,
+        role: "group",
+        "aria-labelledby": inputLabelId
+      }, InputProps)), helperText && /*#__PURE__*/_jsx(FormHelperText, _extends({
+        id: helperTextId
+      }, FormHelperTextProps, {
+        children: helperText
+      }))]
+    }))
+  });
 });
 process.env.NODE_ENV !== "production" ? PickersTextField.propTypes = {
   // ----------------------------- Warning --------------------------------

package/modern/PickersTextField/usePickerTextFieldOwnerState.js

@@ -0,0 +1,11 @@
+'use client';
+
+import * as React from 'react';
+export const PickerTextFieldOwnerStateContext = /*#__PURE__*/React.createContext(null);
+export const usePickerTextFieldOwnerState = () => {
+  const value = React.useContext(PickerTextFieldOwnerStateContext);
+  if (value == null) {
+    throw new Error(['MUI X: The `usePickerTextFieldOwnerState` can only be called in components that are used inside a PickerTextField component'].join('\n'));
+  }
+  return value;
+};

package/modern/TimeClock/Clock.js

@@ -177,6 +177,7 @@ export function Clock(inProps) {
     selectedId,
     type,
     viewValue,
+    viewRange: [minViewValue, maxViewValue],
     disabled = false,
     readOnly,
     className,
@@ -251,6 +252,8 @@ export function Clock(inProps) {
       listboxRef.current.focus();
     }
   }, [autoFocus]);
+  const clampValue = newValue => Math.max(minViewValue, Math.min(maxViewValue, newValue));
+  const circleValue = newValue => (newValue + (maxViewValue + 1)) % (maxViewValue + 1);
   const handleKeyDown = event => {
     // TODO: Why this early exit?
     if (isMoving.current) {
@@ -259,27 +262,27 @@ export function Clock(inProps) {
     switch (event.key) {
       case 'Home':
         // reset both hours and minutes
-        handleValueChange(0, 'partial');
+        handleValueChange(minViewValue, 'partial');
         event.preventDefault();
         break;
       case 'End':
-        handleValueChange(type === 'minutes' ? 59 : 23, 'partial');
+        handleValueChange(maxViewValue, 'partial');
         event.preventDefault();
         break;
       case 'ArrowUp':
-        handleValueChange(viewValue + keyboardControlStep, 'partial');
+        handleValueChange(circleValue(viewValue + keyboardControlStep), 'partial');
         event.preventDefault();
         break;
       case 'ArrowDown':
-        handleValueChange(viewValue - keyboardControlStep, 'partial');
+        handleValueChange(circleValue(viewValue - keyboardControlStep), 'partial');
         event.preventDefault();
         break;
       case 'PageUp':
-        handleValueChange(viewValue + 5, 'partial');
+        handleValueChange(clampValue(viewValue + 5), 'partial');
         event.preventDefault();
         break;
       case 'PageDown':
-        handleValueChange(viewValue - 5, 'partial');
+        handleValueChange(clampValue(viewValue - 5), 'partial');
         event.preventDefault();
         break;
       case 'Enter':

package/modern/TimeClock/TimeClock.js

@@ -186,6 +186,9 @@ export const TimeClock = /*#__PURE__*/React.forwardRef(function TimeClock(inProp
         {
           const valueWithMeridiem = convertValueToMeridiem(rawValue, meridiemMode, ampm);
           const dateWithNewHours = utils.setHours(valueOrReferenceDate, valueWithMeridiem);
+          if (utils.getHours(dateWithNewHours) !== valueWithMeridiem) {
+            return true;
+          }
           const start = utils.setSeconds(utils.setMinutes(dateWithNewHours, 0), 0);
           const end = utils.setSeconds(utils.setMinutes(dateWithNewHours, 59), 59);
           return !containsValidTime({
@@ -225,9 +228,20 @@ export const TimeClock = /*#__PURE__*/React.forwardRef(function TimeClock(inProp
             const valueWithMeridiem = convertValueToMeridiem(hourValue, meridiemMode, ampm);
             setValueAndGoToNextView(utils.setHours(valueOrReferenceDate, valueWithMeridiem), isFinish, 'hours');
           };
+          const viewValue = utils.getHours(valueOrReferenceDate);
+          let viewRange;
+          if (ampm) {
+            if (viewValue > 12) {
+              viewRange = [12, 23];
+            } else {
+              viewRange = [0, 11];
+            }
+          } else {
+            viewRange = [0, 23];
+          }
           return {
             onChange: handleHoursChange,
-            viewValue: utils.getHours(valueOrReferenceDate),
+            viewValue,
             children: getHourNumbers({
               value,
               utils,
@@ -236,7 +250,8 @@ export const TimeClock = /*#__PURE__*/React.forwardRef(function TimeClock(inProp
               getClockNumberText: translations.hoursClockNumberText,
               isDisabled: hourValue => disabled || isTimeDisabled(hourValue, 'hours'),
               selectedId
-            })
+            }),
+            viewRange
           };
         }
       case 'minutes':
@@ -255,7 +270,8 @@ export const TimeClock = /*#__PURE__*/React.forwardRef(function TimeClock(inProp
               getClockNumberText: translations.minutesClockNumberText,
               isDisabled: minuteValue => disabled || isTimeDisabled(minuteValue, 'minutes'),
               selectedId
-            })
+            }),
+            viewRange: [0, 59]
           };
         }
       case 'seconds':
@@ -274,7 +290,8 @@ export const TimeClock = /*#__PURE__*/React.forwardRef(function TimeClock(inProp
               getClockNumberText: translations.secondsClockNumberText,
               isDisabled: secondValue => disabled || isTimeDisabled(secondValue, 'seconds'),
               selectedId
-            })
+            }),
+            viewRange: [0, 59]
           };
         }
       default: