@atlaskit/datetime-picker 13.11.2 → 14.0.0

package/dist/esm/components/date-time-picker.js

@@ -1,4 +1,4 @@
-import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -6,6 +6,8 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["selectProps"],
+  _excluded2 = ["selectProps"];
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -19,7 +21,6 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { format, isValid, parseISO } from 'date-fns';
-import pick from 'lodash/pick';
 import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import SelectClearIcon from '@atlaskit/icon/glyph/select-clear';
 import { mergeStyles } from '@atlaskit/select';
@@ -30,7 +31,7 @@ import { convertTokens } from '../internal/parse-tokens';
 import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.2";
+var packageVersion = "14.0.0";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 var datePickerContainerStyles = css({
@@ -94,8 +95,6 @@ var dateTimePickerDefaultProps = {
   isInvalid: false,
   datePickerProps: {},
   timePickerProps: {},
-  datePickerSelectProps: {},
-  timePickerSelectProps: {},
   times: defaultTimes,
   spacing: 'default',
   locale: 'en-US'
@@ -123,9 +122,12 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
-    _defineProperty(_assertThisInitialized(_this), "getSafeState", function () {
-      var mappedState = _objectSpread(_objectSpread({}, _this.state), pick(_this.props, ['value']));
-      return _objectSpread(_objectSpread({}, mappedState), _this.parseValue(mappedState.value, mappedState.dateValue, mappedState.timeValue, mappedState.zoneValue));
+    _defineProperty(_assertThisInitialized(_this), "getParsedValues", function () {
+      return _this.parseValue(_this.getValue(), _this.state.dateValue, _this.state.timeValue, _this.state.zoneValue);
+    });
+    _defineProperty(_assertThisInitialized(_this), "getValue", function () {
+      var _this$props$value;
+      return (_this$props$value = _this.props.value) !== null && _this$props$value !== void 0 ? _this$props$value : _this.state.value;
     });
     _defineProperty(_assertThisInitialized(_this), "onBlur", function (event) {
       _this.setState({
@@ -140,20 +142,28 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
       _this.props.onFocus(event);
     });
     _defineProperty(_assertThisInitialized(_this), "onDateChange", function (dateValue) {
-      _this.onValueChange(_objectSpread(_objectSpread({}, _this.getSafeState()), {}, {
-        dateValue: dateValue
-      }));
+      var parsedValues = _this.getParsedValues();
+      _this.onValueChange({
+        dateValue: dateValue,
+        timeValue: parsedValues.timeValue,
+        zoneValue: parsedValues.zoneValue
+      });
     });
     _defineProperty(_assertThisInitialized(_this), "onTimeChange", function (timeValue) {
-      _this.onValueChange(_objectSpread(_objectSpread({}, _this.getSafeState()), {}, {
-        timeValue: timeValue
-      }));
+      var parsedValues = _this.getParsedValues();
+      _this.onValueChange({
+        dateValue: parsedValues.dateValue,
+        timeValue: timeValue,
+        zoneValue: parsedValues.zoneValue
+      });
     });
     _defineProperty(_assertThisInitialized(_this), "onClear", function () {
-      _this.onValueChange(_objectSpread(_objectSpread({}, _this.getSafeState()), {}, {
+      var parsedValues = _this.getParsedValues();
+      _this.onValueChange({
+        dateValue: '',
         timeValue: '',
-        dateValue: ''
-      }));
+        zoneValue: parsedValues.zoneValue
+      });
     });
     return _this;
   }
@@ -161,7 +171,18 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
     key: "parseValue",
     value: function parseValue(value, dateValue, timeValue, zoneValue) {
       if (this.props.parseValue) {
-        return this.props.parseValue(value, dateValue, timeValue, zoneValue);
+        var parsedFromFn = this.props.parseValue(value, dateValue, timeValue, zoneValue);
+        // This handles cases found in Jira where the parse function actually does
+        // nothing and returns undefined. The previous `getSafeState` function
+        // just spread the values over the state, but if it returned `undefined`,
+        // it would just rely on the previous state values. Considering this is
+        // what is input to this function anyway, this is a safe way to handle
+        // this, colocate the behavior, and not rely on `getSafeState`.
+        return parsedFromFn || {
+          dateValue: dateValue,
+          timeValue: timeValue,
+          zoneValue: zoneValue
+        };
       }
       var parsed = parseISO(value);
       return isValid(parsed) ? {
@@ -195,7 +216,7 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         });
         this.props.onChange(valueWithValidZone);
         // If the date or time value was cleared when there is an existing datetime value, then clear the value.
-      } else if (this.getSafeState().value) {
+      } else if (this.getValue()) {
         this.setState({
           value: ''
         });
@@ -209,9 +230,7 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         ariaDescribedBy = _this$props['aria-describedby'],
         appearance = _this$props.appearance,
         autoFocus = _this$props.autoFocus,
-        dateFormat = _this$props.dateFormat,
-        datePickerProps = _this$props.datePickerProps,
-        datePickerSelectProps = _this$props.datePickerSelectProps,
+        datePickerPropsWithSelectProps = _this$props.datePickerProps,
         id = _this$props.id,
         innerProps = _this$props.innerProps,
         isDisabled = _this$props.isDisabled,
@@ -220,29 +239,25 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         name = _this$props.name,
         spacing = _this$props.spacing,
         testId = _this$props.testId,
-        timeFormat = _this$props.timeFormat,
-        timeIsEditable = _this$props.timeIsEditable,
-        timePickerProps = _this$props.timePickerProps,
-        timePickerSelectProps = _this$props.timePickerSelectProps,
-        times = _this$props.times;
-      var _this$getSafeState = this.getSafeState(),
-        isFocused = _this$getSafeState.isFocused,
-        value = _this$getSafeState.value,
-        dateValue = _this$getSafeState.dateValue,
-        timeValue = _this$getSafeState.timeValue;
-      var _datePickerSelectProp = datePickerSelectProps.styles,
-        datePickerStyles = _datePickerSelectProp === void 0 ? {} : _datePickerSelectProp;
-      var _timePickerSelectProp = timePickerSelectProps.styles,
-        timePickerStyles = _timePickerSelectProp === void 0 ? {} : _timePickerSelectProp;
+        timePickerPropsWithSelectProps = _this$props.timePickerProps;
+      var value = this.getValue();
+      var isFocused = this.state.isFocused;
+      var parsedValues = this.getParsedValues();
+      var dateValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.dateValue;
+      var timeValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.timeValue;
+      var datePickerSelectProps = datePickerPropsWithSelectProps.selectProps,
+        datePickerProps = _objectWithoutProperties(datePickerPropsWithSelectProps, _excluded);
+      var datePickerAriaDescribedBy = datePickerProps['aria-describedby'] || ariaDescribedBy;
+      var datePickerLabel = datePickerProps.label || datePickerDefaultAriaLabel;
       var mergedDatePickerSelectProps = _objectSpread(_objectSpread({}, datePickerSelectProps), {}, {
-        'aria-describedby': datePickerProps['aria-describedby'] || ariaDescribedBy,
-        'aria-label': datePickerProps['label'] || datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
-        styles: mergeStyles(styles, datePickerStyles)
+        styles: mergeStyles(styles, datePickerSelectProps === null || datePickerSelectProps === void 0 ? void 0 : datePickerSelectProps.styles)
       });
+      var timePickerSelectProps = timePickerPropsWithSelectProps.selectProps,
+        timePickerProps = _objectWithoutProperties(timePickerPropsWithSelectProps, _excluded2);
+      var timePickerAriaDescribedBy = timePickerProps['aria-describedby'] || ariaDescribedBy;
+      var timePickerLabel = timePickerProps.label || timePickerDefaultAriaLabel;
       var mergedTimePickerSelectProps = _objectSpread(_objectSpread({}, timePickerSelectProps), {}, {
-        'aria-describedby': timePickerProps['aria-describedby'] || ariaDescribedBy,
-        'aria-label': timePickerProps['label'] || timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
-        styles: mergeStyles(styles, timePickerStyles)
+        styles: mergeStyles(styles, timePickerSelectProps === null || timePickerSelectProps === void 0 ? void 0 : timePickerSelectProps.styles)
       });
 
       // Render DateTimePicker's IconContainer when a value has been filled
@@ -262,10 +277,11 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         "data-testid": testId && "".concat(testId, "--input")
       }), jsx("div", {
         css: datePickerContainerStyles
-      }, jsx(DatePicker, _extends({
+      }, jsx(DatePicker, {
         appearance: appearance,
+        "aria-describedby": datePickerAriaDescribedBy,
         autoFocus: datePickerProps.autoFocus || autoFocus,
-        dateFormat: datePickerProps.dateFormat || dateFormat,
+        dateFormat: datePickerProps.dateFormat,
         defaultIsOpen: datePickerProps.defaultIsOpen,
         defaultValue: datePickerProps.defaultValue,
         disabled: datePickerProps.disabled,
@@ -276,15 +292,9 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         id: datePickerProps.id || id,
         innerProps: datePickerProps.innerProps,
         isDisabled: datePickerProps.isDisabled || isDisabled,
-        isInvalid: datePickerProps.isInvalid || isInvalid
-        // If you set this or `value` explicitly like
-        // `isOpen={datePickerProps.isOpen}`, the date picker will set
-        // `isOpen` to `undefined` forever. I believe this has to do with
-        // the `getSafeState` function in the picker, since it overwrites
-        // state with values from the props.
-      }, datePickerProps.isOpen ? {
-        isOpen: datePickerProps.isOpen
-      } : {}, {
+        isInvalid: datePickerProps.isInvalid || isInvalid,
+        isOpen: datePickerProps.isOpen,
+        label: datePickerLabel,
         locale: datePickerProps.locale || locale,
         maxDate: datePickerProps.maxDate,
         minDate: datePickerProps.minDate,
@@ -301,10 +311,11 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         testId: testId && "".concat(testId, "--datepicker") || datePickerProps.testId,
         value: dateValue,
         weekStartDay: datePickerProps.weekStartDay
-      }))), jsx("div", {
+      })), jsx("div", {
         css: timePickerContainerStyles
-      }, jsx(TimePicker, _extends({
+      }, jsx(TimePicker, {
         appearance: timePickerProps.appearance || appearance,
+        "aria-describedby": timePickerAriaDescribedBy,
         autoFocus: timePickerProps.autoFocus,
         defaultIsOpen: timePickerProps.defaultIsOpen,
         defaultValue: timePickerProps.defaultValue,
@@ -313,15 +324,9 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         id: timePickerProps.id,
         innerProps: timePickerProps.innerProps,
         isDisabled: timePickerProps.isDisabled || isDisabled,
-        isInvalid: timePickerProps.isInvalid || isInvalid
-        // If you set this or `value` explicitly like
-        // `isOpen={datePickerProps.isOpen}`, the date picker will set
-        // `isOpen` to `undefined` forever. I believe this has to do with
-        // the `getSafeState` function in the picker, since it overwrites
-        // state with values from the props.
-      }, timePickerProps.isOpen ? {
-        isOpen: timePickerProps.isOpen
-      } : {}, {
+        isInvalid: timePickerProps.isInvalid || isInvalid,
+        isOpen: timePickerProps.isOpen,
+        label: timePickerLabel,
         locale: timePickerProps.locale || locale,
         name: timePickerProps.name,
         onBlur: timePickerProps.onBlur || this.onBlur,
@@ -332,11 +337,11 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         selectProps: mergedTimePickerSelectProps,
         spacing: timePickerProps.spacing || spacing,
         testId: timePickerProps.testId || testId && "".concat(testId, "--timepicker"),
-        timeFormat: timePickerProps.timeFormat || timeFormat,
-        timeIsEditable: timePickerProps.timeIsEditable || timeIsEditable,
-        times: timePickerProps.times || times,
+        timeFormat: timePickerProps.timeFormat,
+        timeIsEditable: timePickerProps.timeIsEditable,
+        times: timePickerProps.times,
         value: timeValue
-      }))), isClearable && !isDisabled ? jsx("button", {
+      })), isClearable && !isDisabled ? jsx("button", {
         css: iconContainerStyles,
         onClick: this.onClear,
         "data-testid": testId && "".concat(testId, "--icon--container"),

package/dist/esm/components/time-picker.js

@@ -16,7 +16,6 @@ import React from 'react';
 
 // eslint-disable-next-line no-restricted-imports
 import { format, isValid } from 'date-fns';
-import pick from 'lodash/pick';
 import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createLocalizationProvider } from '@atlaskit/locale';
 import Select, { CreatableSelect, mergeStyles } from '@atlaskit/select';
@@ -28,7 +27,7 @@ import parseTime from '../internal/parse-time';
 import { convertTokens } from '../internal/parse-tokens';
 import { makeSingleValue } from '../internal/single-value';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.2";
+var packageVersion = "14.0.0";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -86,8 +85,13 @@ var TimePickerComponent = /*#__PURE__*/function (_React$Component) {
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
-    _defineProperty(_assertThisInitialized(_this), "getSafeState", function () {
-      return _objectSpread(_objectSpread({}, _this.state), pick(_this.props, ['value', 'isOpen']));
+    _defineProperty(_assertThisInitialized(_this), "getValue", function () {
+      var _this$props$value;
+      return (_this$props$value = _this.props.value) !== null && _this$props$value !== void 0 ? _this$props$value : _this.state.value;
+    });
+    _defineProperty(_assertThisInitialized(_this), "getIsOpen", function () {
+      var _this$props$isOpen;
+      return (_this$props$isOpen = _this.props.isOpen) !== null && _this$props$isOpen !== void 0 ? _this$props$isOpen : _this.state.isOpen;
     });
     _defineProperty(_assertThisInitialized(_this), "onChange", function (newValue, action) {
       var rawValue = newValue ? newValue.value || newValue : '';
@@ -130,7 +134,7 @@ var TimePickerComponent = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "onMenuOpen", function () {
       // Don't open menu after the user has clicked clear
-      if (_this.getSafeState().clearingFromIcon) {
+      if (_this.state.clearingFromIcon) {
         _this.setState({
           clearingFromIcon: false
         });
@@ -142,7 +146,7 @@ var TimePickerComponent = /*#__PURE__*/function (_React$Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "onMenuClose", function () {
       // Don't close menu after the user has clicked clear
-      if (_this.getSafeState().clearingFromIcon) {
+      if (_this.state.clearingFromIcon) {
         _this.setState({
           clearingFromIcon: false
         });
@@ -176,7 +180,7 @@ var TimePickerComponent = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_assertThisInitialized(_this), "onSelectKeyDown", function (event) {
       var key = event.key;
       var keyPressed = key.toLowerCase();
-      if (_this.getSafeState().clearingFromIcon && (keyPressed === 'backspace' || keyPressed === 'delete')) {
+      if (_this.state.clearingFromIcon && (keyPressed === 'backspace' || keyPressed === 'delete')) {
         // If being cleared from keyboard, don't change behaviour
         _this.setState({
           clearingFromIcon: false
@@ -211,10 +215,8 @@ var TimePickerComponent = /*#__PURE__*/function (_React$Component) {
         times = _this$props2.times;
       var ICON_PADDING = 2;
       var l10n = createLocalizationProvider(locale);
-      var _this$getSafeState = this.getSafeState(),
-        _this$getSafeState$va = _this$getSafeState.value,
-        value = _this$getSafeState$va === void 0 ? '' : _this$getSafeState$va,
-        isOpen = _this$getSafeState.isOpen;
+      var value = this.getValue() || '';
+      var isOpen = this.getIsOpen();
       var _selectProps$styles = selectProps.styles,
         selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles,
         otherSelectProps = _objectWithoutProperties(selectProps, _excluded);

package/dist/types/components/date-picker.d.ts

@@ -77,18 +77,8 @@ declare class DatePickerComponent extends Component<DatePickerProps, State> {
         l10n: LocalizationProvider;
         locale: string;
     } | null;
-    getSafeState: () => {
-        inputValue: any;
-        value: string;
-        isOpen: boolean;
-        isFocused: boolean;
-        clearingFromIcon: boolean;
-        calendarValue: string;
-        selectInputValue: string;
-        l10n: LocalizationProvider;
-        locale: string;
-        shouldSetFocusOnCurrentDay: boolean;
-    };
+    getValue: () => string;
+    getIsOpen: () => boolean;
     isDateDisabled: (date: string) => boolean;
     onCalendarChange: ({ iso }: {
         iso: string;

package/dist/types/components/date-time-picker.d.ts

@@ -28,8 +28,6 @@ declare const dateTimePickerDefaultProps: {
     isInvalid: boolean;
     datePickerProps: {};
     timePickerProps: {};
-    datePickerSelectProps: {};
-    timePickerSelectProps: {};
     times: string[];
     spacing: NonNullable<import("../types").Spacing | undefined>;
     locale: string;
@@ -39,13 +37,12 @@ export declare const timePickerDefaultAriaLabel = "Time";
 declare class DateTimePickerComponent extends React.Component<DateTimePickerProps, State> {
     static defaultProps: DateTimePickerProps;
     state: State;
-    getSafeState: () => {
+    getParsedValues: () => {
         dateValue: string;
         timeValue: string;
         zoneValue: string;
-        value: string;
-        isFocused: boolean;
     };
+    getValue: () => string;
     parseValue(value: string, dateValue: string, timeValue: string, zoneValue: string): {
         dateValue: string;
         timeValue: string;
@@ -73,5 +70,5 @@ export { DateTimePickerComponent as DateTimePickerWithoutAnalytics };
  * - [Code](https://atlassian.design/components/datetime-picker/code)
  * - [Usage](https://atlassian.design/components/datetime-picker/usage)
  */
-declare const DateTimePicker: React.ForwardRefExoticComponent<Pick<Pick<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, never> & Partial<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "dateFormat" | "timeIsEditable" | "timeFormat" | "datePickerProps" | "timePickerProps" | "parseValue" | "datePickerSelectProps" | "timePickerSelectProps">> & Partial<Pick<DateTimePickerProps, "ref" | "createAnalyticsEvent">>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "dateFormat" | "timeIsEditable" | "timeFormat" | "datePickerProps" | "timePickerProps" | "parseValue" | "datePickerSelectProps" | "timePickerSelectProps"> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "key" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "analyticsContext" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "dateFormat" | "timeIsEditable" | "timeFormat" | "datePickerProps" | "timePickerProps" | "parseValue" | "datePickerSelectProps" | "timePickerSelectProps"> & React.RefAttributes<any>>;
+declare const DateTimePicker: React.ForwardRefExoticComponent<Pick<Pick<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, never> & Partial<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "parseValue">> & Partial<Pick<DateTimePickerProps, "ref" | "createAnalyticsEvent">>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "parseValue"> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "key" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "analyticsContext" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "parseValue"> & React.RefAttributes<any>>;
 export default DateTimePicker;

package/dist/types/components/time-picker.d.ts

@@ -65,7 +65,8 @@ declare class TimePickerComponent extends React.Component<TimePickerProps, State
         value: string;
         isFocused: boolean;
     };
-    getSafeState: () => State;
+    getValue: () => string;
+    getIsOpen: () => boolean;
     onChange: (newValue: ValueType<OptionType> | string, action?: ActionMeta<OptionType>) => void;
     /**
      * Only allow custom times if timeIsEditable prop is true

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export { default as DatePicker } from './components/date-picker';
 export { default as TimePicker } from './components/time-picker';
 export { default as DateTimePicker } from './components/date-time-picker';
-export type { Appearance, Spacing, DatePickerBaseProps as DatePickerProps, TimePickerBaseProps as TimePickerProps, DateTimePickerBaseProps as DateTimePickerProps, } from './types';
+export type { Appearance, Spacing, DatePickerBaseProps as DatePickerProps, TimePickerBaseProps as TimePickerProps, DateTimePickerBaseProps as DateTimePickerProps, DateTimePickerSelectProps, } from './types';

package/dist/types/types.d.ts

@@ -4,12 +4,48 @@ import { type DropdownIndicatorProps, type OptionType, type SelectProps } from '
 export type Appearance = 'default' | 'subtle' | 'none';
 export type Spacing = 'compact' | 'default';
 type Combine<First, Second> = Omit<First, keyof Second> & Second;
+/**
+ * Props to apply to the select. These include all of [the props from our
+ * `Select` component](/components/select). For the following properties, use
+ * the top-level prop alternatives:
+ *
+ * - `aria-describedby`, use `aria-describedby` prop
+ * - `aria-label`, use `label` prop
+ * - `inputId`, use `id` prop
+ * - `placeholder`, use `placeholder` prop
+ *
+ * Example:
+ *
+ * ```tsx
+ * // Don't do this
+ * <DatePicker selectProps={{
+ *   'aria-describedby': 'helper-id'
+ * }} />
+ *
+ * // Do this
+ * <DatePicker aria-describedby="helper-id" />
+ * ```
+ */
+export type DateTimePickerSelectProps = Combine<SelectProps<OptionType>, {
+    /**
+     * Use the `aria-describedby` prop on the picker..
+     */
+    'aria-describedby'?: never;
+    /**
+     * Use the `label` prop on the picker..
+     */
+    'aria-label'?: never;
+    /**
+     * Use the `id` prop on the picker.`.
+     */
+    inputId?: never;
+    /**
+     * Use the `placeholder` prop on the picker.
+     */
+    placeholder?: never;
+}>;
 interface PickerSelectProps {
-    /**
-     * Props to apply to the select. These include all of [the props from our
-     * `Select` component](/components/select).
-     */
-    selectProps?: Combine<SelectProps<OptionType>, {}>;
+    selectProps?: DateTimePickerSelectProps;
 }
 export interface DatePickerBaseProps extends WithAnalyticsEventsProps, PickerSelectProps {
     /**
@@ -298,8 +334,8 @@ export interface DateTimePickerBaseProps extends WithAnalyticsEventsProps {
     /**
      * Used to associate accessible descriptions to both the date and time
      * picker. If you want to associate individual accessible descriptions, this
-     * should be done through the `datePickerSelectProps` and
-     * `timePickerSelectProps`.
+     * should be done through the `aria-describedby` props on the
+     * `datePickerProps` and `timePickerProps`.
      */
     'aria-describedby'?: string;
     /**
@@ -345,18 +381,10 @@ export interface DateTimePickerBaseProps extends WithAnalyticsEventsProps {
      * The ISO time that should be used as the input value.
      */
     value?: string;
-    /**
-     * Set if users can edit the input, allowing them to add custom times.
-     */
-    timeIsEditable?: boolean;
     /**
      * Set if the picker has an invalid value.
      */
     isInvalid?: boolean;
-    /**
-     * Format the date with a string that is accepted by [date-fns's format function](https://date-fns.org/v1.29.0/docs/format).
-     */
-    dateFormat?: string;
     /**
      * Props applied to the `DatePicker`.
      */
@@ -373,22 +401,6 @@ export interface DateTimePickerBaseProps extends WithAnalyticsEventsProps {
         timeValue: string;
         zoneValue: string;
     };
-    /**
-     * [Select props](/components/select) to pass onto the `DatePicker` component's `Select`. This can be used to set options such as placeholder text.
-     */
-    datePickerSelectProps?: SelectProps<any>;
-    /**
-     * [Select props](/components/select) to pass onto the `TimePicker` component's `Select`. This can be used to set options such as placeholder text.
-     */
-    timePickerSelectProps?: SelectProps<any>;
-    /**
-     * The times shown by the `TimePicker`.
-     */
-    times?: Array<string>;
-    /**
-     * The format that times are displayed in. Values should be those accepted by [date-fns's format function](https://date-fns.org/v1.29.0/docs/format).
-     */
-    timeFormat?: string;
     /**
      * The spacing for the select control.
      *

package/dist/types-ts4.5/components/date-picker.d.ts

@@ -77,18 +77,8 @@ declare class DatePickerComponent extends Component<DatePickerProps, State> {
         l10n: LocalizationProvider;
         locale: string;
     } | null;
-    getSafeState: () => {
-        inputValue: any;
-        value: string;
-        isOpen: boolean;
-        isFocused: boolean;
-        clearingFromIcon: boolean;
-        calendarValue: string;
-        selectInputValue: string;
-        l10n: LocalizationProvider;
-        locale: string;
-        shouldSetFocusOnCurrentDay: boolean;
-    };
+    getValue: () => string;
+    getIsOpen: () => boolean;
     isDateDisabled: (date: string) => boolean;
     onCalendarChange: ({ iso }: {
         iso: string;

package/dist/types-ts4.5/components/date-time-picker.d.ts

@@ -28,8 +28,6 @@ declare const dateTimePickerDefaultProps: {
     isInvalid: boolean;
     datePickerProps: {};
     timePickerProps: {};
-    datePickerSelectProps: {};
-    timePickerSelectProps: {};
     times: string[];
     spacing: NonNullable<import("../types").Spacing | undefined>;
     locale: string;
@@ -39,13 +37,12 @@ export declare const timePickerDefaultAriaLabel = "Time";
 declare class DateTimePickerComponent extends React.Component<DateTimePickerProps, State> {
     static defaultProps: DateTimePickerProps;
     state: State;
-    getSafeState: () => {
+    getParsedValues: () => {
         dateValue: string;
         timeValue: string;
         zoneValue: string;
-        value: string;
-        isFocused: boolean;
     };
+    getValue: () => string;
     parseValue(value: string, dateValue: string, timeValue: string, zoneValue: string): {
         dateValue: string;
         timeValue: string;
@@ -73,5 +70,5 @@ export { DateTimePickerComponent as DateTimePickerWithoutAnalytics };
  * - [Code](https://atlassian.design/components/datetime-picker/code)
  * - [Usage](https://atlassian.design/components/datetime-picker/usage)
  */
-declare const DateTimePicker: React.ForwardRefExoticComponent<Pick<Pick<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, never> & Partial<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "dateFormat" | "timeIsEditable" | "timeFormat" | "datePickerProps" | "timePickerProps" | "parseValue" | "datePickerSelectProps" | "timePickerSelectProps">> & Partial<Pick<DateTimePickerProps, "ref" | "createAnalyticsEvent">>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "dateFormat" | "timeIsEditable" | "timeFormat" | "datePickerProps" | "timePickerProps" | "parseValue" | "datePickerSelectProps" | "timePickerSelectProps"> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "key" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "analyticsContext" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "dateFormat" | "timeIsEditable" | "timeFormat" | "datePickerProps" | "timePickerProps" | "parseValue" | "datePickerSelectProps" | "timePickerSelectProps"> & React.RefAttributes<any>>;
+declare const DateTimePicker: React.ForwardRefExoticComponent<Pick<Pick<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, never> & Partial<Pick<Omit<DateTimePickerProps, keyof import("@atlaskit/analytics-next").WithAnalyticsEventsProps>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "parseValue">> & Partial<Pick<DateTimePickerProps, "ref" | "createAnalyticsEvent">>, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "parseValue"> & React.RefAttributes<any> & import("@atlaskit/analytics-next").WithContextProps, "times" | "testId" | "appearance" | "innerProps" | "isDisabled" | "key" | "defaultValue" | "id" | "aria-describedby" | "onFocus" | "onBlur" | "onChange" | "locale" | "analyticsContext" | "createAnalyticsEvent" | "value" | "autoFocus" | "name" | "spacing" | "isInvalid" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "parseValue"> & React.RefAttributes<any>>;
 export default DateTimePicker;

package/dist/types-ts4.5/components/time-picker.d.ts

@@ -65,7 +65,8 @@ declare class TimePickerComponent extends React.Component<TimePickerProps, State
         value: string;
         isFocused: boolean;
     };
-    getSafeState: () => State;
+    getValue: () => string;
+    getIsOpen: () => boolean;
     onChange: (newValue: ValueType<OptionType> | string, action?: ActionMeta<OptionType>) => void;
     /**
      * Only allow custom times if timeIsEditable prop is true

package/dist/types-ts4.5/index.d.ts

@@ -1,4 +1,4 @@
 export { default as DatePicker } from './components/date-picker';
 export { default as TimePicker } from './components/time-picker';
 export { default as DateTimePicker } from './components/date-time-picker';
-export type { Appearance, Spacing, DatePickerBaseProps as DatePickerProps, TimePickerBaseProps as TimePickerProps, DateTimePickerBaseProps as DateTimePickerProps, } from './types';
+export type { Appearance, Spacing, DatePickerBaseProps as DatePickerProps, TimePickerBaseProps as TimePickerProps, DateTimePickerBaseProps as DateTimePickerProps, DateTimePickerSelectProps, } from './types';