@atlaskit/datetime-picker 13.11.2 → 13.11.3

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

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /**
  * @jsxRuntime classic
@@ -9,7 +8,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';
@@ -20,7 +18,7 @@ import { convertTokens } from '../internal/parse-tokens';
 import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "13.11.2";
+const packageVersion = "13.11.3";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 const datePickerContainerStyles = css({
@@ -105,15 +103,10 @@ class DateTimePickerComponent extends 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(this, "getSafeState", () => {
-      const mappedState = {
-        ...this.state,
-        ...pick(this.props, ['value'])
-      };
-      return {
-        ...mappedState,
-        ...this.parseValue(mappedState.value, mappedState.dateValue, mappedState.timeValue, mappedState.zoneValue)
-      };
+    _defineProperty(this, "getParsedValues", () => this.parseValue(this.getValue(), this.state.dateValue, this.state.timeValue, this.state.zoneValue));
+    _defineProperty(this, "getValue", () => {
+      var _this$props$value;
+      return (_this$props$value = this.props.value) !== null && _this$props$value !== void 0 ? _this$props$value : this.state.value;
     });
     _defineProperty(this, "onBlur", event => {
       this.setState({
@@ -128,28 +121,44 @@ class DateTimePickerComponent extends React.Component {
       this.props.onFocus(event);
     });
     _defineProperty(this, "onDateChange", dateValue => {
+      const parsedValues = this.getParsedValues();
       this.onValueChange({
-        ...this.getSafeState(),
-        dateValue
+        dateValue,
+        timeValue: parsedValues.timeValue,
+        zoneValue: parsedValues.zoneValue
       });
     });
     _defineProperty(this, "onTimeChange", timeValue => {
+      const parsedValues = this.getParsedValues();
       this.onValueChange({
-        ...this.getSafeState(),
-        timeValue
+        dateValue: parsedValues.dateValue,
+        timeValue,
+        zoneValue: parsedValues.zoneValue
       });
     });
     _defineProperty(this, "onClear", () => {
+      const parsedValues = this.getParsedValues();
       this.onValueChange({
-        ...this.getSafeState(),
+        dateValue: '',
         timeValue: '',
-        dateValue: ''
+        zoneValue: parsedValues.zoneValue
       });
     });
   }
   parseValue(value, dateValue, timeValue, zoneValue) {
     if (this.props.parseValue) {
-      return this.props.parseValue(value, dateValue, timeValue, zoneValue);
+      const 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,
+        timeValue,
+        zoneValue
+      };
     }
     const parsed = parseISO(value);
     return isValid(parsed) ? {
@@ -183,7 +192,7 @@ class DateTimePickerComponent extends 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: ''
       });
@@ -212,12 +221,13 @@ class DateTimePickerComponent extends React.Component {
       timePickerSelectProps,
       times
     } = this.props;
+    const value = this.getValue();
     const {
-      isFocused,
-      value,
-      dateValue,
-      timeValue
-    } = this.getSafeState();
+      isFocused
+    } = this.state;
+    const parsedValues = this.getParsedValues();
+    const dateValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.dateValue;
+    const timeValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.timeValue;
     const {
       styles: datePickerStyles = {}
     } = datePickerSelectProps;
@@ -254,7 +264,7 @@ class DateTimePickerComponent extends React.Component {
       "data-testid": testId && `${testId}--input`
     }), jsx("div", {
       css: datePickerContainerStyles
-    }, jsx(DatePicker, _extends({
+    }, jsx(DatePicker, {
       appearance: appearance,
       autoFocus: datePickerProps.autoFocus || autoFocus,
       dateFormat: datePickerProps.dateFormat || dateFormat,
@@ -268,15 +278,8 @@ class DateTimePickerComponent extends 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,
       locale: datePickerProps.locale || locale,
       maxDate: datePickerProps.maxDate,
       minDate: datePickerProps.minDate,
@@ -293,9 +296,9 @@ class DateTimePickerComponent extends React.Component {
       testId: testId && `${testId}--datepicker` || datePickerProps.testId,
       value: dateValue,
       weekStartDay: datePickerProps.weekStartDay
-    }))), jsx("div", {
+    })), jsx("div", {
       css: timePickerContainerStyles
-    }, jsx(TimePicker, _extends({
+    }, jsx(TimePicker, {
       appearance: timePickerProps.appearance || appearance,
       autoFocus: timePickerProps.autoFocus,
       defaultIsOpen: timePickerProps.defaultIsOpen,
@@ -305,15 +308,8 @@ class DateTimePickerComponent extends 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,
       locale: timePickerProps.locale || locale,
       name: timePickerProps.name,
       onBlur: timePickerProps.onBlur || this.onBlur,
@@ -328,7 +324,7 @@ class DateTimePickerComponent extends React.Component {
       timeIsEditable: timePickerProps.timeIsEditable || timeIsEditable,
       times: timePickerProps.times || times,
       value: timeValue
-    }))), isClearable && !isDisabled ? jsx("button", {
+    })), isClearable && !isDisabled ? jsx("button", {
       css: iconContainerStyles,
       onClick: this.onClear,
       "data-testid": testId && `${testId}--icon--container`,

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

@@ -4,7 +4,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';
@@ -16,7 +15,7 @@ import parseTime from '../internal/parse-time';
 import { convertTokens } from '../internal/parse-tokens';
 import { makeSingleValue } from '../internal/single-value';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "13.11.2";
+const packageVersion = "13.11.3";
 const menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -65,11 +64,13 @@ class TimePickerComponent extends 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(this, "getSafeState", () => {
-      return {
-        ...this.state,
-        ...pick(this.props, ['value', 'isOpen'])
-      };
+    _defineProperty(this, "getValue", () => {
+      var _this$props$value;
+      return (_this$props$value = this.props.value) !== null && _this$props$value !== void 0 ? _this$props$value : this.state.value;
+    });
+    _defineProperty(this, "getIsOpen", () => {
+      var _this$props$isOpen;
+      return (_this$props$isOpen = this.props.isOpen) !== null && _this$props$isOpen !== void 0 ? _this$props$isOpen : this.state.isOpen;
     });
     _defineProperty(this, "onChange", (newValue, action) => {
       const rawValue = newValue ? newValue.value || newValue : '';
@@ -114,7 +115,7 @@ class TimePickerComponent extends React.Component {
     });
     _defineProperty(this, "onMenuOpen", () => {
       // Don't open menu after the user has clicked clear
-      if (this.getSafeState().clearingFromIcon) {
+      if (this.state.clearingFromIcon) {
         this.setState({
           clearingFromIcon: false
         });
@@ -126,7 +127,7 @@ class TimePickerComponent extends React.Component {
     });
     _defineProperty(this, "onMenuClose", () => {
       // Don't close menu after the user has clicked clear
-      if (this.getSafeState().clearingFromIcon) {
+      if (this.state.clearingFromIcon) {
         this.setState({
           clearingFromIcon: false
         });
@@ -162,7 +163,7 @@ class TimePickerComponent extends React.Component {
         key
       } = event;
       const 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
@@ -194,10 +195,8 @@ class TimePickerComponent extends React.Component {
     } = this.props;
     const ICON_PADDING = 2;
     const l10n = createLocalizationProvider(locale);
-    const {
-      value = '',
-      isOpen
-    } = this.getSafeState();
+    const value = this.getValue() || '';
+    const isOpen = this.getIsOpen();
     const {
       styles: selectStyles = {},
       ...otherSelectProps

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

@@ -20,7 +20,6 @@ import { Component } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { format, isValid, lastDayOfMonth, parseISO } from 'date-fns';
-import pick from 'lodash/pick';
 import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import CalendarIcon from '@atlaskit/icon/glyph/calendar';
 import { createLocalizationProvider } from '@atlaskit/locale';
@@ -31,7 +30,7 @@ import { getSafeCalendarValue, getShortISOString } from '../internal/parse-date'
 import { convertTokens } from '../internal/parse-tokens';
 import { makeSingleValue } from '../internal/single-value';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.2";
+var packageVersion = "13.11.3";
 var datePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,
@@ -73,8 +72,13 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_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.
-    _defineProperty(_assertThisInitialized(_this), "getSafeState", function () {
-      return _objectSpread(_objectSpread(_objectSpread({}, _this.state), pick(_this.props, ['value', 'isOpen'])), pick(_this.props.selectProps, ['inputValue']));
+    _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), "isDateDisabled", function (date) {
       return _this.props.disabled.indexOf(date) > -1;
@@ -124,7 +128,7 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
       });
     });
     _defineProperty(_assertThisInitialized(_this), "onInputClick", function () {
-      if (!_this.props.isDisabled && !_this.getSafeState().isOpen) {
+      if (!_this.props.isDisabled && !_this.getIsOpen()) {
         _this.setState({
           isOpen: true
         });
@@ -149,7 +153,7 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_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
@@ -164,9 +168,8 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
       }
     });
     _defineProperty(_assertThisInitialized(_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({
@@ -200,9 +203,8 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_assertThisInitialized(_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
@@ -330,8 +332,7 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
       if (parseInputValue) {
         return parseInputValue(date, dateFormat || defaultDateFormat);
       }
-      var _this$getSafeState3 = _this.getSafeState(),
-        l10n = _this$getSafeState3.l10n;
+      var l10n = _this.state.l10n;
       return l10n.parseDate(date);
     });
     /**
@@ -345,8 +346,7 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
       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 || defaultDateFormat);
       }
@@ -358,8 +358,7 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
       if (placeholder) {
         return placeholder;
       }
-      var _this$getSafeState5 = _this.getSafeState(),
-        l10n = _this$getSafeState5.l10n;
+      var l10n = _this.state.l10n;
       return l10n.formatDate(placeholderDatetime);
     });
     _this.state = {
@@ -401,14 +400,13 @@ var DatePickerComponent = /*#__PURE__*/function (_Component) {
         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 = makeSingleValue({

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

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -19,7 +18,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 +28,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 = "13.11.3";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 var datePickerContainerStyles = css({
@@ -123,9 +121,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 +141,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 +170,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 +215,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: ''
         });
@@ -225,11 +245,11 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         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,
@@ -262,7 +282,7 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         "data-testid": testId && "".concat(testId, "--input")
       }), jsx("div", {
         css: datePickerContainerStyles
-      }, jsx(DatePicker, _extends({
+      }, jsx(DatePicker, {
         appearance: appearance,
         autoFocus: datePickerProps.autoFocus || autoFocus,
         dateFormat: datePickerProps.dateFormat || dateFormat,
@@ -276,15 +296,8 @@ 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,
         locale: datePickerProps.locale || locale,
         maxDate: datePickerProps.maxDate,
         minDate: datePickerProps.minDate,
@@ -301,9 +314,9 @@ 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,
         autoFocus: timePickerProps.autoFocus,
         defaultIsOpen: timePickerProps.defaultIsOpen,
@@ -313,15 +326,8 @@ 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,
         locale: timePickerProps.locale || locale,
         name: timePickerProps.name,
         onBlur: timePickerProps.onBlur || this.onBlur,
@@ -336,7 +342,7 @@ var DateTimePickerComponent = /*#__PURE__*/function (_React$Component) {
         timeIsEditable: timePickerProps.timeIsEditable || timeIsEditable,
         times: timePickerProps.times || 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 = "13.11.3";
 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;