@atlaskit/datetime-picker 13.11.1 → 13.11.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/datetime-picker
 
+## 13.11.3
+
+### Patch Changes
+
+- [#132041](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/132041)
+  [`ce77b41a18a18`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ce77b41a18a18) -
+  Refactoring internal state management within the pickers.
+
+## 13.11.2
+
+### Patch Changes
+
+- [#130953](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130953)
+  [`a6c1f10b9f4b7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a6c1f10b9f4b7) -
+  Refactor internal types to make spread props explicit.
+
 ## 13.11.1
 
 ### Patch Changes

package/dist/cjs/components/date-picker.js

@@ -18,7 +18,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _dateFns = require("date-fns");
-var _pick = _interopRequireDefault(require("lodash/pick"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _calendar = _interopRequireDefault(require("@atlaskit/icon/glyph/calendar"));
 var _locale = require("@atlaskit/locale");
@@ -38,7 +37,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.1";
+var packageVersion = "13.11.3";
 var datePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,
@@ -80,8 +79,13 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "containerRef", null);
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSafeState", function () {
-      return _objectSpread(_objectSpread(_objectSpread({}, _this.state), (0, _pick.default)(_this.props, ['value', 'isOpen'])), (0, _pick.default)(_this.props.selectProps, ['inputValue']));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDateDisabled", function (date) {
       return _this.props.disabled.indexOf(date) > -1;
@@ -131,7 +135,7 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onInputClick", function () {
-      if (!_this.props.isDisabled && !_this.getSafeState().isOpen) {
+      if (!_this.props.isDisabled && !_this.getIsOpen()) {
         _this.setState({
           isOpen: true
         });
@@ -156,7 +160,7 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onSelectBlur", function (event) {
       var _this$containerRef3;
       var newlyFocusedElement = event.relatedTarget;
-      if (_this.getSafeState().clearingFromIcon) {
+      if (_this.state.clearingFromIcon) {
         // Don't close menu if blurring after the user has clicked clear
         _this.setState({
           clearingFromIcon: false
@@ -171,9 +175,8 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onSelectFocus", function (event) {
-      var _this$getSafeState = _this.getSafeState(),
-        clearingFromIcon = _this$getSafeState.clearingFromIcon,
-        value = _this$getSafeState.value;
+      var clearingFromIcon = _this.state.clearingFromIcon;
+      var value = _this.getValue();
       if (clearingFromIcon) {
         // Don't open menu if focussing after the user has clicked clear
         _this.setState({
@@ -207,9 +210,8 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onInputKeyDown", function (event) {
       var _this$containerRef4;
-      var _this$getSafeState2 = _this.getSafeState(),
-        value = _this$getSafeState2.value,
-        calendarValue = _this$getSafeState2.calendarValue;
+      var calendarValue = _this.state.calendarValue;
+      var value = _this.getValue();
       var keyPressed = event.key.toLowerCase();
 
       // If the input is focused and the calendar is not visible, handle space and enter clicks
@@ -337,8 +339,7 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
       if (parseInputValue) {
         return parseInputValue(date, dateFormat || _internal.defaultDateFormat);
       }
-      var _this$getSafeState3 = _this.getSafeState(),
-        l10n = _this$getSafeState3.l10n;
+      var l10n = _this.state.l10n;
       return l10n.parseDate(date);
     });
     /**
@@ -352,8 +353,7 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
       var _this$props2 = _this.props,
         formatDisplayLabel = _this$props2.formatDisplayLabel,
         dateFormat = _this$props2.dateFormat;
-      var _this$getSafeState4 = _this.getSafeState(),
-        l10n = _this$getSafeState4.l10n;
+      var l10n = _this.state.l10n;
       if (formatDisplayLabel) {
         return formatDisplayLabel(value, dateFormat || _internal.defaultDateFormat);
       }
@@ -365,8 +365,7 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
       if (placeholder) {
         return placeholder;
       }
-      var _this$getSafeState5 = _this.getSafeState(),
-        l10n = _this$getSafeState5.l10n;
+      var l10n = _this.state.l10n;
       return l10n.formatDate(_internal.placeholderDatetime);
     });
     _this.state = {
@@ -408,14 +407,13 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
         locale = _this$props3.locale,
         testId = _this$props3.testId,
         weekStartDay = _this$props3.weekStartDay;
-      var _this$getSafeState6 = this.getSafeState(),
-        value = _this$getSafeState6.value,
-        calendarValue = _this$getSafeState6.calendarValue,
-        isOpen = _this$getSafeState6.isOpen,
-        selectInputValue = _this$getSafeState6.selectInputValue;
+      var _this$state = this.state,
+        calendarValue = _this$state.calendarValue,
+        selectInputValue = _this$state.selectInputValue;
+      var value = this.getValue();
       var actualSelectInputValue;
       actualSelectInputValue = selectInputValue;
-      var menuIsOpen = isOpen && !isDisabled;
+      var menuIsOpen = this.getIsOpen() && !isDisabled;
       var showClearIndicator = Boolean((value || selectInputValue) && !hideIcon);
       var dropDownIcon = appearance === 'subtle' || hideIcon || showClearIndicator ? null : icon;
       var SingleValue = (0, _singleValue.makeSingleValue)({
@@ -447,8 +445,6 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
         onCalendarSelect: this.onCalendarSelect,
         calendarLocale: locale,
         calendarWeekStartDay: weekStartDay,
-        nextMonthLabel: nextMonthLabel,
-        previousMonthLabel: previousMonthLabel,
         shouldSetFocusOnCurrentDay: this.state.shouldSetFocusOnCurrentDay
       };
       var mergedStyles = (0, _select.mergeStyles)(selectStyles, {
@@ -485,31 +481,48 @@ var DatePickerComponent = exports.DatePickerWithoutAnalytics = /*#__PURE__*/func
           value: value,
           "data-testid": testId && "".concat(testId, "--input")
         }), (0, _react2.jsx)(_select.default, (0, _extends2.default)({
+          appearance: this.props.appearance,
           "aria-describedby": ariaDescribedBy,
           "aria-label": label || undefined,
-          appearance: this.props.appearance,
-          enableAnimation: false,
-          menuIsOpen: menuIsOpen,
-          closeMenuOnSelect: true,
           autoFocus: autoFocus,
+          closeMenuOnSelect: true,
+          components: selectComponents,
+          enableAnimation: false,
           inputId: id,
+          inputValue: actualSelectInputValue,
           isDisabled: isDisabled,
+          menuIsOpen: menuIsOpen,
           onBlur: this.onSelectBlur,
+          onChange: this.onSelectChange,
           onFocus: this.onSelectFocus,
-          inputValue: actualSelectInputValue,
           onInputChange: this.handleSelectInputChange,
-          components: selectComponents,
-          onChange: this.onSelectChange
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          ,
-          styles: mergedStyles,
           placeholder: this.getPlaceholder(),
+          styles: mergedStyles,
           value: initialValue
-        }, selectProps, calendarProps, {
+        }, selectProps, {
+          // These are below the spread because I don't know what is in
+          // selectProps or not and what wil be overwritten
           isClearable: true,
-          spacing: spacing,
           isInvalid: isInvalid,
+          spacing: spacing,
           testId: testId
+          // These aren't part of `Select`'s API, but we're using them here.
+          ,
+          calendarContainerRef: calendarProps.calendarContainerRef,
+          calendarDisabled: calendarProps.calendarDisabled,
+          calendarDisabledDateFilter: calendarProps.calendarDisabledDateFilter,
+          calendarLocale: calendarProps.calendarLocale,
+          calendarMaxDate: calendarProps.calendarMaxDate,
+          calendarMinDate: calendarProps.calendarMinDate,
+          calendarRef: calendarProps.calendarRef,
+          calendarValue: calendarProps.calendarValue,
+          calendarView: calendarProps.calendarView,
+          calendarWeekStartDay: calendarProps.calendarWeekStartDay,
+          nextMonthLabel: nextMonthLabel,
+          onCalendarChange: calendarProps.onCalendarChange,
+          onCalendarSelect: calendarProps.onCalendarSelect,
+          previousMonthLabel: previousMonthLabel,
+          shouldSetFocusOnCurrentDay: calendarProps.shouldSetFocusOnCurrentDay
         })))
       );
     }

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.timePickerDefaultAriaLabel = exports.default = exports.datePickerDefaultAriaLabel = exports.DateTimePickerWithoutAnalytics = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -16,7 +15,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _dateFns = require("date-fns");
-var _pick = _interopRequireDefault(require("lodash/pick"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _selectClear = _interopRequireDefault(require("@atlaskit/icon/glyph/select-clear"));
 var _select = require("@atlaskit/select");
@@ -34,7 +32,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.1";
+var packageVersion = "13.11.3";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 var datePickerContainerStyles = (0, _react2.css)({
@@ -127,9 +125,12 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSafeState", function () {
-      var mappedState = _objectSpread(_objectSpread({}, _this.state), (0, _pick.default)(_this.props, ['value']));
-      return _objectSpread(_objectSpread({}, mappedState), _this.parseValue(mappedState.value, mappedState.dateValue, mappedState.timeValue, mappedState.zoneValue));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getParsedValues", function () {
+      return _this.parseValue(_this.getValue(), _this.state.dateValue, _this.state.timeValue, _this.state.zoneValue);
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onBlur", function (event) {
       _this.setState({
@@ -144,20 +145,28 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
       _this.props.onFocus(event);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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
+      });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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
+      });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onClear", function () {
-      _this.onValueChange(_objectSpread(_objectSpread({}, _this.getSafeState()), {}, {
+      var parsedValues = _this.getParsedValues();
+      _this.onValueChange({
+        dateValue: '',
         timeValue: '',
-        dateValue: ''
-      }));
+        zoneValue: parsedValues.zoneValue
+      });
     });
     return _this;
   }
@@ -165,7 +174,18 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
     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 = (0, _dateFns.parseISO)(value);
       return (0, _dateFns.isValid)(parsed) ? {
@@ -199,7 +219,7 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         });
         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: ''
         });
@@ -229,11 +249,11 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         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 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 _datePickerSelectProp = datePickerSelectProps.styles,
         datePickerStyles = _datePickerSelectProp === void 0 ? {} : _datePickerSelectProp;
       var _timePickerSelectProp = timePickerSelectProps.styles,
@@ -266,41 +286,67 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         "data-testid": testId && "".concat(testId, "--input")
       }), (0, _react2.jsx)("div", {
         css: datePickerContainerStyles
-      }, (0, _react2.jsx)(_datePicker.default, (0, _extends2.default)({
+      }, (0, _react2.jsx)(_datePicker.default, {
         appearance: appearance,
-        autoFocus: autoFocus,
-        dateFormat: dateFormat,
-        hideIcon: true,
-        id: id,
-        isDisabled: isDisabled,
-        isInvalid: isInvalid,
-        locale: locale,
-        onBlur: this.onBlur,
-        onChange: this.onDateChange,
-        onFocus: this.onFocus,
+        autoFocus: datePickerProps.autoFocus || autoFocus,
+        dateFormat: datePickerProps.dateFormat || dateFormat,
+        defaultIsOpen: datePickerProps.defaultIsOpen,
+        defaultValue: datePickerProps.defaultValue,
+        disabled: datePickerProps.disabled,
+        disabledDateFilter: datePickerProps.disabledDateFilter,
+        formatDisplayLabel: datePickerProps.formatDisplayLabel,
+        hideIcon: datePickerProps.hideIcon || true,
+        icon: datePickerProps.icon,
+        id: datePickerProps.id || id,
+        innerProps: datePickerProps.innerProps,
+        isDisabled: datePickerProps.isDisabled || isDisabled,
+        isInvalid: datePickerProps.isInvalid || isInvalid,
+        isOpen: datePickerProps.isOpen,
+        locale: datePickerProps.locale || locale,
+        maxDate: datePickerProps.maxDate,
+        minDate: datePickerProps.minDate,
+        name: datePickerProps.name,
+        nextMonthLabel: datePickerProps.nextMonthLabel,
+        onBlur: datePickerProps.onBlur || this.onBlur,
+        onChange: datePickerProps.onChange || this.onDateChange,
+        onFocus: datePickerProps.onFocus || this.onFocus,
+        parseInputValue: datePickerProps.parseInputValue,
+        placeholder: datePickerProps.placeholder,
+        previousMonthLabel: datePickerProps.previousMonthLabel,
         selectProps: mergedDatePickerSelectProps,
-        spacing: spacing,
-        testId: testId && "".concat(testId, "--datepicker"),
-        value: dateValue
-      }, datePickerProps))), (0, _react2.jsx)("div", {
+        spacing: datePickerProps.spacing || spacing,
+        testId: testId && "".concat(testId, "--datepicker") || datePickerProps.testId,
+        value: dateValue,
+        weekStartDay: datePickerProps.weekStartDay
+      })), (0, _react2.jsx)("div", {
         css: timePickerContainerStyles
-      }, (0, _react2.jsx)(_timePicker.default, (0, _extends2.default)({
-        appearance: appearance,
-        hideIcon: true,
-        isDisabled: isDisabled,
-        isInvalid: isInvalid,
-        locale: locale,
-        onBlur: this.onBlur,
-        onChange: this.onTimeChange,
-        onFocus: this.onFocus,
+      }, (0, _react2.jsx)(_timePicker.default, {
+        appearance: timePickerProps.appearance || appearance,
+        autoFocus: timePickerProps.autoFocus,
+        defaultIsOpen: timePickerProps.defaultIsOpen,
+        defaultValue: timePickerProps.defaultValue,
+        formatDisplayLabel: timePickerProps.formatDisplayLabel,
+        hideIcon: timePickerProps.hideIcon || true,
+        id: timePickerProps.id,
+        innerProps: timePickerProps.innerProps,
+        isDisabled: timePickerProps.isDisabled || isDisabled,
+        isInvalid: timePickerProps.isInvalid || isInvalid,
+        isOpen: timePickerProps.isOpen,
+        locale: timePickerProps.locale || locale,
+        name: timePickerProps.name,
+        onBlur: timePickerProps.onBlur || this.onBlur,
+        onChange: timePickerProps.onChange || this.onTimeChange,
+        onFocus: timePickerProps.onFocus || this.onFocus,
+        parseInputValue: timePickerProps.parseInputValue,
+        placeholder: timePickerProps.placeholder,
         selectProps: mergedTimePickerSelectProps,
-        spacing: spacing,
-        testId: testId && "".concat(testId, "--timepicker"),
-        timeFormat: timeFormat,
-        timeIsEditable: timeIsEditable,
-        times: times,
+        spacing: timePickerProps.spacing || spacing,
+        testId: timePickerProps.testId || testId && "".concat(testId, "--timepicker"),
+        timeFormat: timePickerProps.timeFormat || timeFormat,
+        timeIsEditable: timePickerProps.timeIsEditable || timeIsEditable,
+        times: timePickerProps.times || times,
         value: timeValue
-      }, timePickerProps))), isClearable && !isDisabled ? (0, _react2.jsx)("button", {
+      })), isClearable && !isDisabled ? (0, _react2.jsx)("button", {
         css: iconContainerStyles,
         onClick: this.onClear,
         "data-testid": testId && "".concat(testId, "--icon--container"),

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

@@ -17,7 +17,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _dateFns = require("date-fns");
-var _pick = _interopRequireDefault(require("lodash/pick"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _locale = require("@atlaskit/locale");
 var _select = _interopRequireWildcard(require("@atlaskit/select"));
@@ -36,7 +35,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // eslint-disable-next-line no-restricted-imports
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.1";
+var packageVersion = "13.11.3";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -94,8 +93,13 @@ var TimePickerComponent = exports.TimePickerWithoutAnalytics = /*#__PURE__*/func
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSafeState", function () {
-      return _objectSpread(_objectSpread({}, _this.state), (0, _pick.default)(_this.props, ['value', 'isOpen']));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
+    });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onChange", function (newValue, action) {
       var rawValue = newValue ? newValue.value || newValue : '';
@@ -138,7 +142,7 @@ var TimePickerComponent = exports.TimePickerWithoutAnalytics = /*#__PURE__*/func
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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
         });
@@ -150,7 +154,7 @@ var TimePickerComponent = exports.TimePickerWithoutAnalytics = /*#__PURE__*/func
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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
         });
@@ -184,7 +188,7 @@ var TimePickerComponent = exports.TimePickerWithoutAnalytics = /*#__PURE__*/func
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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
@@ -219,10 +223,8 @@ var TimePickerComponent = exports.TimePickerWithoutAnalytics = /*#__PURE__*/func
         times = _this$props2.times;
       var ICON_PADDING = 2;
       var l10n = (0, _locale.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 = (0, _objectWithoutProperties2.default)(selectProps, _excluded);
@@ -321,9 +323,7 @@ var TimePickerComponent = exports.TimePickerWithoutAnalytics = /*#__PURE__*/func
         placeholder: placeholder || l10n.formatTime(_internal.placeholderDatetime),
         styles: mergedStyles,
         value: initialValue,
-        spacing: spacing
-        // @ts-ignore caused by prop not part of @atlaskit/select
-        ,
+        spacing: spacing,
         fixedLayerRef: this.containerRef,
         isInvalid: isInvalid,
         testId: testId

package/dist/cjs/internal/fixed-layer-menu.js

@@ -10,7 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = require("@emotion/react");
 var _select = require("@atlaskit/select");
 var _fixedLayer = _interopRequireDefault(require("../internal/fixed-layer"));
-var _excluded = ["selectProps"];
+var _excluded = ["className", "clearValue", "cx", "getStyles", "getValue", "hasValue", "innerProps", "innerRef", "isLoading", "isMulti", "isRtl", "maxMenuHeight", "menuPlacement", "menuPosition", "menuShouldScrollIntoView", "minMenuHeight", "options", "placement", "selectOption", "selectProps", "setValue", "theme", "children"];
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -20,14 +20,60 @@ var _excluded = ["selectProps"];
  * This is the fixed layer menu used in the time picker.
  */
 var FixedLayerMenu = exports.FixedLayerMenu = function FixedLayerMenu(_ref) {
-  var selectProps = _ref.selectProps,
+  var className = _ref.className,
+    clearValue = _ref.clearValue,
+    cx = _ref.cx,
+    getStyles = _ref.getStyles,
+    getValue = _ref.getValue,
+    hasValue = _ref.hasValue,
+    innerProps = _ref.innerProps,
+    innerRef = _ref.innerRef,
+    isLoading = _ref.isLoading,
+    isMulti = _ref.isMulti,
+    isRtl = _ref.isRtl,
+    maxMenuHeight = _ref.maxMenuHeight,
+    menuPlacement = _ref.menuPlacement,
+    menuPosition = _ref.menuPosition,
+    menuShouldScrollIntoView = _ref.menuShouldScrollIntoView,
+    minMenuHeight = _ref.minMenuHeight,
+    options = _ref.options,
+    placement = _ref.placement,
+    selectOption = _ref.selectOption,
+    selectProps = _ref.selectProps,
+    setValue = _ref.setValue,
+    theme = _ref.theme,
+    children = _ref.children,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return (0, _react.jsx)(_fixedLayer.default, {
     inputValue: selectProps.inputValue,
     containerRef: selectProps.fixedLayerRef,
     content: (0, _react.jsx)(_select.components.Menu, (0, _extends2.default)({}, rest, {
-      menuShouldScrollIntoView: false
-    })),
+      // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides, @atlaskit/ui-styling-standard/no-classname-prop
+      className: className,
+      clearValue: clearValue,
+      cx: cx,
+      getStyles: getStyles,
+      getValue: getValue,
+      hasValue: hasValue,
+      innerProps: innerProps,
+      innerRef: innerRef,
+      isLoading: isLoading,
+      isMulti: isMulti,
+      isRtl: isRtl,
+      maxMenuHeight: maxMenuHeight,
+      menuPlacement: menuPlacement,
+      menuPosition: menuPosition,
+      menuShouldScrollIntoView: false || menuShouldScrollIntoView,
+      minMenuHeight: minMenuHeight,
+      options: options,
+      placement: placement,
+      selectOption: selectOption,
+      selectProps: selectProps,
+      setValue: setValue
+      // eslint-disable-next-line @repo/internal/react/no-unsafe-overrides, @atlaskit/design-system/no-unsafe-style-overrides
+      ,
+      theme: theme
+    }), children),
     testId: selectProps.testId
   });
 };

package/dist/cjs/internal/menu.js

@@ -19,13 +19,19 @@ var _fixedLayer = _interopRequireDefault(require("../internal/fixed-layer"));
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
-function getValidDate(iso) {
-  var date = (0, _dateFns.parseISO)(iso);
-  return (0, _dateFns.isValid)(date) ? {
-    day: date.getDate(),
-    month: date.getMonth() + 1,
-    year: date.getFullYear()
-  } : {};
+/**
+ * @param isos A series of ISO dates.
+ * @returns The last valid date within the array of ISO strings.
+ */
+function getValidDate(isos) {
+  return isos.reduce(function (acc, iso) {
+    var date = (0, _dateFns.parseISO)(iso);
+    return (0, _dateFns.isValid)(date) ? {
+      day: date.getDate(),
+      month: date.getMonth() + 1,
+      year: date.getFullYear()
+    } : acc;
+  }, {});
 }
 var menuStyles = (0, _react.css)({
   zIndex: _constants.layers.dialog(),
@@ -41,6 +47,12 @@ var menuStyles = (0, _react.css)({
 var Menu = exports.Menu = function Menu(_ref) {
   var selectProps = _ref.selectProps,
     innerProps = _ref.innerProps;
+  var calendarValue = selectProps.calendarValue,
+    calendarView = selectProps.calendarView;
+  var _getValidDate = getValidDate([calendarValue, calendarView]),
+    day = _getValidDate.day,
+    month = _getValidDate.month,
+    year = _getValidDate.year;
   return (0, _react.jsx)(_layering.UNSAFE_LAYERING, {
     isDisabled: false
   }, (0, _react.jsx)(_fixedLayer.default, {
@@ -48,7 +60,10 @@ var Menu = exports.Menu = function Menu(_ref) {
     containerRef: selectProps.calendarContainerRef,
     content: (0, _react.jsx)("div", (0, _extends2.default)({
       css: menuStyles
-    }, innerProps), (0, _react.jsx)(_calendar.default, (0, _extends2.default)({}, getValidDate(selectProps.calendarValue), getValidDate(selectProps.calendarView), {
+    }, innerProps), (0, _react.jsx)(_calendar.default, {
+      day: day,
+      month: month,
+      year: year,
       disabled: selectProps.calendarDisabled,
       disabledDateFilter: selectProps.calendarDisabledDateFilter,
       minDate: selectProps.calendarMinDate,
@@ -63,7 +78,7 @@ var Menu = exports.Menu = function Menu(_ref) {
       locale: selectProps.calendarLocale,
       testId: selectProps.testId && "".concat(selectProps.testId, "--calendar"),
       weekStartDay: selectProps.calendarWeekStartDay
-    }))),
+    })),
     testId: selectProps.testId
   }));
 };