@mui/x-date-pickers-pro 8.0.0-alpha.5 → 8.0.0-alpha.7

package/node/internals/hooks/useMultiInputRangeField/useMultiInputDateTimeRangeField.js

@@ -14,14 +14,19 @@ var _validation2 = require("../../../validation");
 var _valueManagers = require("../../utils/valueManagers");
 var _shared = require("./shared");
 var _useMultiInputFieldSelectedSections = require("../useMultiInputFieldSelectedSections");
+var _managers = require("../../../managers");
 const useMultiInputDateTimeRangeField = ({
-  sharedProps: inSharedProps,
+  sharedProps,
   startTextFieldProps,
   unstableStartFieldRef,
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = (0, _internals.useDefaultizedDateTimeField)(inSharedProps);
+  const manager = (0, _managers.useDateTimeRangeManager)(sharedProps);
+  const sharedPropsWithDefaults = (0, _internals.useFieldInternalPropsWithDefaults)({
+    manager,
+    internalProps: sharedProps
+  });
   const {
     value: valueProp,
     defaultValue,
@@ -37,13 +42,13 @@ const useMultiInputDateTimeRangeField = ({
     timezone: timezoneProp,
     enableAccessibleFieldDOMStructure,
     autoFocus
-  } = sharedProps;
+  } = sharedPropsWithDefaults;
   const {
     value,
     handleValueChange,
     timezone
   } = (0, _internals.useControlledValueWithTimezone)({
-    name: 'useMultiInputDateRangeField',
+    name: 'useMultiInputDateTimeRangeField',
     timezone: timezoneProp,
     value: valueProp,
     defaultValue,
@@ -55,11 +60,11 @@ const useMultiInputDateTimeRangeField = ({
     validationError,
     getValidationErrorForNewValue
   } = (0, _validation.useValidation)({
-    props: sharedProps,
+    props: sharedPropsWithDefaults,
     value,
     timezone,
     validator: _validation2.validateDateTimeRange,
-    onError: sharedProps.onError
+    onError: sharedPropsWithDefaults.onError
   });
 
   // TODO: Maybe export utility from `useField` instead of copy/pasting the logic

package/node/internals/hooks/useMultiInputRangeField/useMultiInputTimeRangeField.js

@@ -14,14 +14,19 @@ var _validation2 = require("../../../validation");
 var _valueManagers = require("../../utils/valueManagers");
 var _shared = require("./shared");
 var _useMultiInputFieldSelectedSections = require("../useMultiInputFieldSelectedSections");
+var _managers = require("../../../managers");
 const useMultiInputTimeRangeField = ({
-  sharedProps: inSharedProps,
+  sharedProps,
   startTextFieldProps,
   unstableStartFieldRef,
   endTextFieldProps,
   unstableEndFieldRef
 }) => {
-  const sharedProps = (0, _internals.useDefaultizedTimeField)(inSharedProps);
+  const manager = (0, _managers.useTimeRangeManager)(sharedProps);
+  const sharedPropsWithDefaults = (0, _internals.useFieldInternalPropsWithDefaults)({
+    manager,
+    internalProps: sharedProps
+  });
   const {
     value: valueProp,
     defaultValue,
@@ -37,13 +42,13 @@ const useMultiInputTimeRangeField = ({
     timezone: timezoneProp,
     enableAccessibleFieldDOMStructure,
     autoFocus
-  } = sharedProps;
+  } = sharedPropsWithDefaults;
   const {
     value,
     handleValueChange,
     timezone
   } = (0, _internals.useControlledValueWithTimezone)({
-    name: 'useMultiInputDateRangeField',
+    name: 'useMultiInputTimeRangeField',
     timezone: timezoneProp,
     value: valueProp,
     defaultValue,
@@ -55,11 +60,11 @@ const useMultiInputTimeRangeField = ({
     validationError,
     getValidationErrorForNewValue
   } = (0, _validation.useValidation)({
-    props: sharedProps,
-    validator: _validation2.validateTimeRange,
+    props: sharedPropsWithDefaults,
     value,
     timezone,
-    onError: sharedProps.onError
+    validator: _validation2.validateTimeRange,
+    onError: sharedPropsWithDefaults.onError
   });
 
   // TODO: Maybe export utility from `useField` instead of copy/pasting the logic

package/node/internals/hooks/useNullablePickerRangePositionContext.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useNullablePickerRangePositionContext = useNullablePickerRangePositionContext;
+var React = _interopRequireWildcard(require("react"));
+var _usePickerRangePositionContext = require("../../hooks/usePickerRangePositionContext");
+/**
+ * Returns information about the range position of the picker that wraps the current component.
+ * If no picker wraps the current component, returns `null`.
+ */
+function useNullablePickerRangePositionContext() {
+  return React.useContext(_usePickerRangePositionContext.PickerRangePositionContext);
+}

package/node/internals/hooks/useStaticRangePicker/useStaticRangePicker.js

@@ -14,6 +14,7 @@ var _styles = require("@mui/material/styles");
 var _PickersLayout = require("@mui/x-date-pickers/PickersLayout");
 var _internals = require("@mui/x-date-pickers/internals");
 var _useRangePosition = require("../useRangePosition");
+var _usePickerRangePositionContext = require("../../../hooks/usePickerRangePositionContext");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["props", "ref"];
 const PickerStaticLayout = (0, _styles.styled)(_PickersLayout.PickersLayout)(({
@@ -43,12 +44,8 @@ const useStaticRangePicker = _ref => {
     displayStaticWrapperAs,
     autoFocus
   } = props;
+  const rangePositionResponse = (0, _useRangePosition.useRangePosition)(props);
   const {
-    rangePosition,
-    onRangePositionChange
-  } = (0, _useRangePosition.useRangePosition)(props);
-  const {
-    layoutProps,
     providerProps,
     renderCurrentView
   } = (0, _internals.usePicker)((0, _extends2.default)({}, pickerParams, {
@@ -56,29 +53,22 @@ const useStaticRangePicker = _ref => {
     autoFocusView: autoFocus ?? false,
     fieldRef: undefined,
     localeText,
-    additionalViewProps: {
-      rangePosition,
-      onRangePositionChange
-    },
     variant: displayStaticWrapperAs
   }));
   const Layout = slots?.layout ?? PickerStaticLayout;
-  const slotPropsForLayout = (0, _extends2.default)({}, slotProps, {
-    toolbar: (0, _extends2.default)({}, slotProps?.toolbar, {
-      rangePosition,
-      onRangePositionChange
-    })
-  });
-  const renderPicker = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_internals.PickerProvider, (0, _extends2.default)({}, providerProps, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Layout, (0, _extends2.default)({}, layoutProps, slotProps?.layout, {
-      slots: slots,
-      slotProps: slotPropsForLayout,
-      sx: [...(Array.isArray(sx) ? sx : [sx]), ...(Array.isArray(slotProps?.layout?.sx) ? slotProps.layout.sx : [slotProps?.layout?.sx])],
-      className: (0, _clsx.default)(className, slotProps?.layout?.className),
-      ref: ref,
-      children: renderCurrentView()
+  const renderPicker = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_usePickerRangePositionContext.PickerRangePositionContext.Provider, {
+    value: rangePositionResponse,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_internals.PickerProvider, (0, _extends2.default)({}, providerProps, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Layout, (0, _extends2.default)({}, slotProps?.layout, {
+        slots: slots,
+        slotProps: slotProps,
+        sx: [...(Array.isArray(sx) ? sx : [sx]), ...(Array.isArray(slotProps?.layout?.sx) ? slotProps.layout.sx : [slotProps?.layout?.sx])],
+        className: (0, _clsx.default)(className, slotProps?.layout?.className),
+        ref: ref,
+        children: renderCurrentView()
+      }))
     }))
-  }));
+  });
   return {
     renderPicker
   };

package/node/internals/utils/date-range-manager.js

@@ -15,7 +15,8 @@ function calculateRangeChange({
   shouldMergeDateAndTime = false,
   referenceDate
 }) {
-  const [start, end] = range;
+  const start = !utils.isValid(range[0]) ? null : range[0];
+  const end = !utils.isValid(range[1]) ? null : range[1];
   if (shouldMergeDateAndTime && selectedDate) {
     // If there is a date already selected, then we want to keep its time
     if (start && rangePosition === 'start') {

package/node/internals/utils/releaseInfo.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getReleaseInfo = void 0;
 var _utils = require("@mui/utils");
 const getReleaseInfo = () => {
-  const releaseInfo = "MTczNDU2NjQwMDAwMA==";
+  const releaseInfo = "MTczNjM3NzIwMDAwMA==";
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).
     // eslint-disable-next-line no-useless-concat

package/node/internals/utils/valueManagers.js

@@ -19,8 +19,8 @@ const rangeValueManager = exports.rangeValueManager = {
         referenceDate: referenceDateProp
       } = _ref,
       params = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
-    const shouldKeepStartDate = value[0] != null && params.utils.isValid(value[0]);
-    const shouldKeepEndDate = value[1] != null && params.utils.isValid(value[1]);
+    const shouldKeepStartDate = params.utils.isValid(value[0]);
+    const shouldKeepEndDate = params.utils.isValid(value[1]);
     if (shouldKeepStartDate && shouldKeepEndDate) {
       return value;
     }
@@ -33,8 +33,8 @@ const rangeValueManager = exports.rangeValueManager = {
   hasError: error => error[0] != null || error[1] != null,
   defaultErrorState: [null, null],
   getTimezone: (utils, value) => {
-    const timezoneStart = value[0] == null || !utils.isValid(value[0]) ? null : utils.getTimezone(value[0]);
-    const timezoneEnd = value[1] == null || !utils.isValid(value[1]) ? null : utils.getTimezone(value[1]);
+    const timezoneStart = utils.isValid(value[0]) ? utils.getTimezone(value[0]) : null;
+    const timezoneEnd = utils.isValid(value[1]) ? utils.getTimezone(value[1]) : null;
     if (timezoneStart != null && timezoneEnd != null && timezoneStart !== timezoneEnd) {
       throw new Error('MUI X: The timezone of the start and the end date should be the same.');
     }
@@ -46,8 +46,8 @@ const getRangeFieldValueManager = ({
   dateSeparator = '–'
 }) => ({
   updateReferenceValue: (utils, value, prevReferenceValue) => {
-    const shouldKeepStartDate = value[0] != null && utils.isValid(value[0]);
-    const shouldKeepEndDate = value[1] != null && utils.isValid(value[1]);
+    const shouldKeepStartDate = utils.isValid(value[0]);
+    const shouldKeepEndDate = utils.isValid(value[1]);
     if (!shouldKeepStartDate && !shouldKeepEndDate) {
       return prevReferenceValue;
     }
@@ -118,7 +118,7 @@ const getRangeFieldValueManager = ({
       },
       getNewValuesFromNewActiveDate: newActiveDate => ({
         value: updateDateInRange(newActiveDate, state.value),
-        referenceValue: newActiveDate == null || !utils.isValid(newActiveDate) ? state.referenceValue : updateDateInRange(newActiveDate, state.referenceValue)
+        referenceValue: !utils.isValid(newActiveDate) ? state.referenceValue : updateDateInRange(newActiveDate, state.referenceValue)
       })
     };
   }

package/node/managers/index.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "useDateRangeManager", {
+  enumerable: true,
+  get: function () {
+    return _useDateRangeManager.useDateRangeManager;
+  }
+});
+Object.defineProperty(exports, "useDateTimeRangeManager", {
+  enumerable: true,
+  get: function () {
+    return _useDateTimeRangeManager.useDateTimeRangeManager;
+  }
+});
+Object.defineProperty(exports, "useTimeRangeManager", {
+  enumerable: true,
+  get: function () {
+    return _useTimeRangeManager.useTimeRangeManager;
+  }
+});
+var _useDateRangeManager = require("./useDateRangeManager");
+var _useTimeRangeManager = require("./useTimeRangeManager");
+var _useDateTimeRangeManager = require("./useDateTimeRangeManager");

package/node/managers/useDateRangeManager.js

@@ -0,0 +1,38 @@
+"use strict";
+'use client';
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDateRangeManager = useDateRangeManager;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var React = _interopRequireWildcard(require("react"));
+var _internals = require("@mui/x-date-pickers/internals");
+var _valueManagers = require("../internals/utils/valueManagers");
+var _validation = require("../validation");
+function useDateRangeManager(parameters = {}) {
+  const {
+    enableAccessibleFieldDOMStructure = true,
+    dateSeparator
+  } = parameters;
+  return React.useMemo(() => ({
+    valueType: 'date',
+    validator: _validation.validateDateRange,
+    internal_valueManager: _valueManagers.rangeValueManager,
+    internal_fieldValueManager: (0, _valueManagers.getRangeFieldValueManager)({
+      dateSeparator
+    }),
+    internal_enableAccessibleFieldDOMStructure: enableAccessibleFieldDOMStructure,
+    internal_applyDefaultsToFieldInternalProps: ({
+      internalProps,
+      utils,
+      defaultDates
+    }) => (0, _extends2.default)({}, internalProps, (0, _internals.getDateFieldInternalPropsDefaults)({
+      defaultDates,
+      utils,
+      internalProps
+    }))
+  }), [enableAccessibleFieldDOMStructure, dateSeparator]);
+}

package/node/managers/useDateTimeRangeManager.js

@@ -0,0 +1,38 @@
+"use strict";
+'use client';
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDateTimeRangeManager = useDateTimeRangeManager;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var React = _interopRequireWildcard(require("react"));
+var _internals = require("@mui/x-date-pickers/internals");
+var _valueManagers = require("../internals/utils/valueManagers");
+var _validation = require("../validation");
+function useDateTimeRangeManager(parameters = {}) {
+  const {
+    enableAccessibleFieldDOMStructure = true,
+    dateSeparator
+  } = parameters;
+  return React.useMemo(() => ({
+    valueType: 'date-time',
+    validator: _validation.validateDateTimeRange,
+    internal_valueManager: _valueManagers.rangeValueManager,
+    internal_fieldValueManager: (0, _valueManagers.getRangeFieldValueManager)({
+      dateSeparator
+    }),
+    internal_enableAccessibleFieldDOMStructure: enableAccessibleFieldDOMStructure,
+    internal_applyDefaultsToFieldInternalProps: ({
+      internalProps,
+      utils,
+      defaultDates
+    }) => (0, _extends2.default)({}, internalProps, (0, _internals.getDateTimeFieldInternalPropsDefaults)({
+      internalProps,
+      utils,
+      defaultDates
+    }))
+  }), [enableAccessibleFieldDOMStructure, dateSeparator]);
+}

package/node/managers/useTimeRangeManager.js

@@ -0,0 +1,36 @@
+"use strict";
+'use client';
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useTimeRangeManager = useTimeRangeManager;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var React = _interopRequireWildcard(require("react"));
+var _internals = require("@mui/x-date-pickers/internals");
+var _valueManagers = require("../internals/utils/valueManagers");
+var _validation = require("../validation");
+function useTimeRangeManager(parameters = {}) {
+  const {
+    enableAccessibleFieldDOMStructure = true,
+    dateSeparator
+  } = parameters;
+  return React.useMemo(() => ({
+    valueType: 'time',
+    validator: _validation.validateTimeRange,
+    internal_valueManager: _valueManagers.rangeValueManager,
+    internal_fieldValueManager: (0, _valueManagers.getRangeFieldValueManager)({
+      dateSeparator
+    }),
+    internal_enableAccessibleFieldDOMStructure: enableAccessibleFieldDOMStructure,
+    internal_applyDefaultsToFieldInternalProps: ({
+      internalProps,
+      utils
+    }) => (0, _extends2.default)({}, internalProps, (0, _internals.getTimeFieldInternalPropsDefaults)({
+      utils,
+      internalProps
+    }))
+  }), [enableAccessibleFieldDOMStructure, dateSeparator]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-date-pickers-pro",
-  "version": "8.0.0-alpha.5",
+  "version": "8.0.0-alpha.7",
   "description": "The Pro plan edition of the Date and Time Picker components (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -37,9 +37,9 @@
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "react-transition-group": "^4.4.5",
-    "@mui/x-date-pickers": "8.0.0-alpha.5",
-    "@mui/x-license": "8.0.0-alpha.5",
-    "@mui/x-internals": "8.0.0-alpha.5"
+    "@mui/x-date-pickers": "8.0.0-alpha.7",
+    "@mui/x-internals": "8.0.0-alpha.7",
+    "@mui/x-license": "8.0.0-alpha.7"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",
@@ -47,7 +47,7 @@
     "@mui/material": "^5.15.14 || ^6.0.0",
     "@mui/system": "^5.15.14 || ^6.0.0",
     "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0",
-    "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0",
+    "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0",
     "dayjs": "^1.10.7",
     "luxon": "^3.0.2",
     "moment": "^2.29.4",