@mui/x-date-pickers 8.0.0-beta.0 → 8.0.0-beta.1

package/esm/internals/hooks/useField/useFieldV6TextField.js

@@ -1,10 +1,17 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useRtl } from '@mui/system/RtlProvider';
+import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import useEventCallback from '@mui/utils/useEventCallback';
+import useTimeout from '@mui/utils/useTimeout';
 import useForkRef from '@mui/utils/useForkRef';
+import { useSplitFieldProps } from "../../../hooks/index.js";
 import { getActiveElement } from "../../utils/utils.js";
 import { getSectionVisibleValue, isAndroid } from "./useField.utils.js";
+import { useFieldCharacterEditing } from "./useFieldCharacterEditing.js";
+import { useFieldRootHandleKeyDown } from "./useFieldRootHandleKeyDown.js";
+import { useFieldState } from "./useFieldState.js";
+import { useFieldInternalPropsWithDefaults } from "./useFieldInternalPropsWithDefaults.js";
 const cleanString = dirtyString => dirtyString.replace(/[\u2066\u2067\u2068\u2069]/g, '');
 export const addPositionPropertiesToSections = (sections, localizedDigits, isRtl) => {
   let position = 0;
@@ -33,116 +40,82 @@ export const addPositionPropertiesToSections = (sections, localizedDigits, isRtl
   }
   return newSections;
 };
-export const useFieldV6TextField = params => {
+export const useFieldV6TextField = parameters => {
   const isRtl = useRtl();
-  const focusTimeoutRef = React.useRef(undefined);
-  const selectionSyncTimeoutRef = React.useRef(undefined);
+  const focusTimeout = useTimeout();
+  const selectionSyncTimeout = useTimeout();
   const {
-    forwardedProps: {
-      onFocus,
-      onClick,
-      onPaste,
-      onBlur,
-      inputRef: inputRefProp,
-      placeholder: inPlaceholder
-    },
-    internalProps: {
-      readOnly = false,
-      disabled = false,
-      focused
-    },
-    parsedSelectedSections,
+    props,
+    manager,
+    skipContextFieldRefAssignment,
+    manager: {
+      valueType,
+      internal_valueManager: valueManager,
+      internal_fieldValueManager: fieldValueManager,
+      internal_useOpenPickerButtonAriaLabel: useOpenPickerButtonAriaLabel
+    }
+  } = parameters;
+  const {
+    internalProps,
+    forwardedProps
+  } = useSplitFieldProps(props, valueType);
+  const internalPropsWithDefaults = useFieldInternalPropsWithDefaults({
+    manager,
+    internalProps,
+    skipContextFieldRefAssignment
+  });
+  const {
+    onFocus,
+    onClick,
+    onPaste,
+    onBlur,
+    onKeyDown,
+    onClear,
+    clearable,
+    inputRef: inputRefProp,
+    placeholder: inPlaceholder
+  } = forwardedProps;
+  const {
+    readOnly = false,
+    disabled = false,
+    autoFocus = false,
+    focused,
+    unstableFieldRef
+  } = internalPropsWithDefaults;
+  const inputRef = React.useRef(null);
+  const handleRef = useForkRef(inputRefProp, inputRef);
+  const stateResponse = useFieldState({
+    manager,
+    internalPropsWithDefaults,
+    forwardedProps
+  });
+  const {
+    // States and derived states
     activeSectionIndex,
+    areAllSectionsEmpty,
+    error,
+    localizedDigits,
+    parsedSelectedSections,
+    sectionOrder,
     state,
-    fieldValueManager,
-    valueManager,
-    applyCharacterEditing,
-    resetCharacterQuery,
-    updateSectionValue,
-    updateValueFromValueStr,
-    clearActiveSection,
+    value,
+    // Methods to update the states
     clearValue,
-    setTempAndroidValueStr,
+    clearActiveSection,
+    setCharacterQuery,
     setSelectedSections,
-    getSectionsFromValue,
-    areAllSectionsEmpty,
-    localizedDigits
-  } = params;
-  const inputRef = React.useRef(null);
-  const handleRef = useForkRef(inputRefProp, inputRef);
+    setTempAndroidValueStr,
+    updateSectionValue,
+    updateValueFromValueStr,
+    // Utilities methods
+    getSectionsFromValue
+  } = stateResponse;
+  const applyCharacterEditing = useFieldCharacterEditing({
+    stateResponse
+  });
+  const openPickerAriaLabel = useOpenPickerButtonAriaLabel(value);
   const sections = React.useMemo(() => addPositionPropertiesToSections(state.sections, localizedDigits, isRtl), [state.sections, localizedDigits, isRtl]);
-  const interactions = React.useMemo(() => ({
-    syncSelectionToDOM: () => {
-      if (!inputRef.current) {
-        return;
-      }
-      if (parsedSelectedSections == null) {
-        if (inputRef.current.scrollLeft) {
-          // Ensure that input content is not marked as selected.
-          // setting selection range to 0 causes issues in Safari.
-          // https://bugs.webkit.org/show_bug.cgi?id=224425
-          inputRef.current.scrollLeft = 0;
-        }
-        return;
-      }
-
-      // On multi input range pickers we want to update selection range only for the active input
-      // This helps to avoid the focus jumping on Safari https://github.com/mui/mui-x/issues/9003
-      // because WebKit implements the `setSelectionRange` based on the spec: https://bugs.webkit.org/show_bug.cgi?id=224425
-      if (inputRef.current !== getActiveElement(document)) {
-        return;
-      }
-
-      // Fix scroll jumping on iOS browser: https://github.com/mui/mui-x/issues/8321
-      const currentScrollTop = inputRef.current.scrollTop;
-      if (parsedSelectedSections === 'all') {
-        inputRef.current.select();
-      } else {
-        const selectedSection = sections[parsedSelectedSections];
-        const selectionStart = selectedSection.type === 'empty' ? selectedSection.startInInput - selectedSection.startSeparator.length : selectedSection.startInInput;
-        const selectionEnd = selectedSection.type === 'empty' ? selectedSection.endInInput + selectedSection.endSeparator.length : selectedSection.endInInput;
-        if (selectionStart !== inputRef.current.selectionStart || selectionEnd !== inputRef.current.selectionEnd) {
-          if (inputRef.current === getActiveElement(document)) {
-            inputRef.current.setSelectionRange(selectionStart, selectionEnd);
-          }
-        }
-        clearTimeout(selectionSyncTimeoutRef.current);
-        selectionSyncTimeoutRef.current = setTimeout(() => {
-          // handle case when the selection is not updated correctly
-          // could happen on Android
-          if (inputRef.current && inputRef.current === getActiveElement(document) &&
-          // The section might loose all selection, where `selectionStart === selectionEnd`
-          // https://github.com/mui/mui-x/pull/13652
-          inputRef.current.selectionStart === inputRef.current.selectionEnd && (inputRef.current.selectionStart !== selectionStart || inputRef.current.selectionEnd !== selectionEnd)) {
-            interactions.syncSelectionToDOM();
-          }
-        });
-      }
-
-      // Even reading this variable seems to do the trick, but also setting it just to make use of it
-      inputRef.current.scrollTop = currentScrollTop;
-    },
-    getActiveSectionIndexFromDOM: () => {
-      const browserStartIndex = inputRef.current.selectionStart ?? 0;
-      const browserEndIndex = inputRef.current.selectionEnd ?? 0;
-      if (browserStartIndex === 0 && browserEndIndex === 0) {
-        return null;
-      }
-      const nextSectionIndex = browserStartIndex <= sections[0].startInInput ? 1 // Special case if browser index is in invisible characters at the beginning.
-      : sections.findIndex(section => section.startInInput - section.startSeparator.length > browserStartIndex);
-      return nextSectionIndex === -1 ? sections.length - 1 : nextSectionIndex - 1;
-    },
-    focusField: (newSelectedSection = 0) => {
-      if (getActiveElement(document) === inputRef.current) {
-        return;
-      }
-      inputRef.current?.focus();
-      setSelectedSections(newSelectedSection);
-    },
-    setSelectedSections: newSelectedSections => setSelectedSections(newSelectedSections),
-    isFieldFocused: () => inputRef.current === getActiveElement(document)
-  }), [inputRef, parsedSelectedSections, sections, setSelectedSections]);
-  const syncSelectionFromDOM = () => {
+  function syncSelectionFromDOM() {
     const browserStartIndex = inputRef.current.selectionStart ?? 0;
     let nextSectionIndex;
     if (browserStartIndex <= sections[0].startInInput) {
@@ -156,13 +129,19 @@ export const useFieldV6TextField = params => {
     }
     const sectionIndex = nextSectionIndex === -1 ? sections.length - 1 : nextSectionIndex - 1;
     setSelectedSections(sectionIndex);
-  };
+  }
+  function focusField(newSelectedSection = 0) {
+    if (getActiveElement(document) === inputRef.current) {
+      return;
+    }
+    inputRef.current?.focus();
+    setSelectedSections(newSelectedSection);
+  }
   const handleInputFocus = useEventCallback(event => {
     onFocus?.(event);
     // The ref is guaranteed to be resolved at this point.
     const input = inputRef.current;
-    clearTimeout(focusTimeoutRef.current);
-    focusTimeoutRef.current = setTimeout(() => {
+    focusTimeout.start(0, () => {
       // The ref changed, the component got remounted, the focus event is no longer relevant.
       if (!input || input !== inputRef.current) {
         return;
@@ -204,7 +183,7 @@ export const useFieldV6TextField = params => {
       const digitsAndLetterOnly = /^(([a-zA-Z]+)|)([0-9]+)(([a-zA-Z]+)|)$/.test(pastedValue);
       const isValidPastedValue = activeSection.contentType === 'letter' && lettersOnly || activeSection.contentType === 'digit' && digitsOnly || activeSection.contentType === 'digit-with-letter' && digitsAndLetterOnly;
       if (isValidPastedValue) {
-        resetCharacterQuery();
+        setCharacterQuery(null);
         updateSectionValue({
           section: activeSection,
           newSectionValue: pastedValue,
@@ -218,7 +197,7 @@ export const useFieldV6TextField = params => {
         return;
       }
     }
-    resetCharacterQuery();
+    setCharacterQuery(null);
     updateValueFromValueStr(pastedValue);
   });
   const handleContainerBlur = useEventCallback(event => {
@@ -231,7 +210,6 @@ export const useFieldV6TextField = params => {
     }
     const targetValue = event.target.value;
     if (targetValue === '') {
-      resetCharacterQuery();
       clearValue();
       return;
     }
@@ -281,7 +259,6 @@ export const useFieldV6TextField = params => {
       if (isAndroid()) {
         setTempAndroidValueStr(valueStr);
       }
-      resetCharacterQuery();
       clearActiveSection();
       return;
     }
@@ -290,6 +267,26 @@ export const useFieldV6TextField = params => {
       sectionIndex: activeSectionIndex
     });
   });
+  const handleClear = useEventCallback((event, ...args) => {
+    event.preventDefault();
+    onClear?.(event, ...args);
+    clearValue();
+    if (!isFieldFocused(inputRef)) {
+      // setSelectedSections is called internally
+      focusField(0);
+    } else {
+      setSelectedSections(sectionOrder.startIndex);
+    }
+  });
+  const handleContainerKeyDown = useFieldRootHandleKeyDown({
+    manager,
+    internalPropsWithDefaults,
+    stateResponse
+  });
+  const wrappedHandleContainerKeyDown = useEventCallback(event => {
+    onKeyDown?.(event);
+    handleContainerKeyDown(event);
+  });
   const placeholder = React.useMemo(() => {
     if (inPlaceholder !== undefined) {
       return inPlaceholder;
@@ -302,12 +299,60 @@ export const useFieldV6TextField = params => {
     if (inputRef.current && inputRef.current === getActiveElement(document)) {
       setSelectedSections('all');
     }
-    return () => {
-      clearTimeout(focusTimeoutRef.current);
-      clearTimeout(selectionSyncTimeoutRef.current);
-    };
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
+  useEnhancedEffect(() => {
+    function syncSelectionToDOM() {
+      if (!inputRef.current) {
+        return;
+      }
+      if (parsedSelectedSections == null) {
+        if (inputRef.current.scrollLeft) {
+          // Ensure that input content is not marked as selected.
+          // setting selection range to 0 causes issues in Safari.
+          // https://bugs.webkit.org/show_bug.cgi?id=224425
+          inputRef.current.scrollLeft = 0;
+        }
+        return;
+      }
+
+      // On multi input range pickers we want to update selection range only for the active input
+      // This helps to avoid the focus jumping on Safari https://github.com/mui/mui-x/issues/9003
+      // because WebKit implements the `setSelectionRange` based on the spec: https://bugs.webkit.org/show_bug.cgi?id=224425
+      if (inputRef.current !== getActiveElement(document)) {
+        return;
+      }
+
+      // Fix scroll jumping on iOS browser: https://github.com/mui/mui-x/issues/8321
+      const currentScrollTop = inputRef.current.scrollTop;
+      if (parsedSelectedSections === 'all') {
+        inputRef.current.select();
+      } else {
+        const selectedSection = sections[parsedSelectedSections];
+        const selectionStart = selectedSection.type === 'empty' ? selectedSection.startInInput - selectedSection.startSeparator.length : selectedSection.startInInput;
+        const selectionEnd = selectedSection.type === 'empty' ? selectedSection.endInInput + selectedSection.endSeparator.length : selectedSection.endInInput;
+        if (selectionStart !== inputRef.current.selectionStart || selectionEnd !== inputRef.current.selectionEnd) {
+          if (inputRef.current === getActiveElement(document)) {
+            inputRef.current.setSelectionRange(selectionStart, selectionEnd);
+          }
+        }
+        selectionSyncTimeout.start(0, () => {
+          // handle case when the selection is not updated correctly
+          // could happen on Android
+          if (inputRef.current && inputRef.current === getActiveElement(document) &&
+          // The section might loose all selection, where `selectionStart === selectionEnd`
+          // https://github.com/mui/mui-x/pull/13652
+          inputRef.current.selectionStart === inputRef.current.selectionEnd && (inputRef.current.selectionStart !== selectionStart || inputRef.current.selectionEnd !== selectionEnd)) {
+            syncSelectionToDOM();
+          }
+        });
+      }
+
+      // Even reading this variable seems to do the trick, but also setting it just to make use of it
+      inputRef.current.scrollTop = currentScrollTop;
+    }
+    syncSelectionToDOM();
+  });
   const inputMode = React.useMemo(() => {
     if (activeSectionIndex == null) {
       return 'text';
@@ -319,24 +364,46 @@ export const useFieldV6TextField = params => {
   }, [activeSectionIndex, state.sections]);
   const inputHasFocus = inputRef.current && inputRef.current === getActiveElement(document);
   const shouldShowPlaceholder = !inputHasFocus && areAllSectionsEmpty;
-  return {
-    interactions,
-    returnedValue: {
-      // Forwarded
-      readOnly,
-      onBlur: handleContainerBlur,
-      onClick: handleInputClick,
-      onFocus: handleInputFocus,
-      onPaste: handleInputPaste,
-      inputRef: handleRef,
-      // Additional
-      enableAccessibleFieldDOMStructure: false,
-      placeholder,
-      inputMode,
-      autoComplete: 'off',
-      value: shouldShowPlaceholder ? '' : valueStr,
-      onChange: handleInputChange,
-      focused
-    }
-  };
-};
+  React.useImperativeHandle(unstableFieldRef, () => ({
+    getSections: () => state.sections,
+    getActiveSectionIndex: () => {
+      const browserStartIndex = inputRef.current.selectionStart ?? 0;
+      const browserEndIndex = inputRef.current.selectionEnd ?? 0;
+      if (browserStartIndex === 0 && browserEndIndex === 0) {
+        return null;
+      }
+      const nextSectionIndex = browserStartIndex <= sections[0].startInInput ? 1 // Special case if browser index is in invisible characters at the beginning.
+      : sections.findIndex(section => section.startInInput - section.startSeparator.length > browserStartIndex);
+      return nextSectionIndex === -1 ? sections.length - 1 : nextSectionIndex - 1;
+    },
+    setSelectedSections: newSelectedSections => setSelectedSections(newSelectedSections),
+    focusField,
+    isFieldFocused: () => isFieldFocused(inputRef)
+  }));
+  return _extends({}, forwardedProps, {
+    error,
+    clearable: Boolean(clearable && !areAllSectionsEmpty && !readOnly && !disabled),
+    onBlur: handleContainerBlur,
+    onClick: handleInputClick,
+    onFocus: handleInputFocus,
+    onPaste: handleInputPaste,
+    onKeyDown: wrappedHandleContainerKeyDown,
+    onClear: handleClear,
+    inputRef: handleRef,
+    // Additional
+    enableAccessibleFieldDOMStructure: false,
+    placeholder,
+    inputMode,
+    autoComplete: 'off',
+    value: shouldShowPlaceholder ? '' : valueStr,
+    onChange: handleInputChange,
+    focused,
+    disabled,
+    readOnly,
+    autoFocus,
+    openPickerAriaLabel
+  });
+};
+function isFieldFocused(inputRef) {
+  return inputRef.current === getActiveElement(document);
+}

package/esm/internals/hooks/useField/useFieldV7TextField.d.ts

@@ -1,2 +1,3 @@
-import { UseFieldTextField } from "./useField.types.js";
-export declare const useFieldV7TextField: UseFieldTextField<true>;
+import { UseFieldParameters, UseFieldProps, UseFieldReturnValue } from "./useField.types.js";
+import { PickerValidValue } from "../../models/index.js";
+export declare const useFieldV7TextField: <TValue extends PickerValidValue, TError, TValidationProps extends {}, TProps extends UseFieldProps<true>>(parameters: UseFieldParameters<TValue, true, TError, TValidationProps, TProps>) => UseFieldReturnValue<true, TProps>;