@atlaskit/datetime-picker 12.8.1 → 12.9.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/datetime-picker
 
+## 12.9.0
+
+### Minor Changes
+
+- [`4afff68f652`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4afff68f652) - Make typing more complete and accurate for date picker.
+
+## 12.8.2
+
+### Patch Changes
+
+- [`829d92bcf37`](https://bitbucket.org/atlassian/atlassian-frontend/commits/829d92bcf37) - Remove out of date lifecycle methods in favor of up to date methods.
+
 ## 12.8.1
 
 ### Patch Changes

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

@@ -38,7 +38,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.8.1";
+var packageVersion = "12.9.0";
 function getValidDate(iso) {
   var date = (0, _dateFns.parseISO)(iso);
   return (0, _dateFns.isValid)(date) ? {
@@ -412,23 +412,15 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       isOpen: _this.props.defaultIsOpen,
       isFocused: false,
       clearingFromIcon: false,
-      selectInputValue: _this.props.selectProps.inputValue,
+      selectInputValue: _this.props.selectProps.inputValue || '',
       value: _this.props.value || _this.props.defaultValue,
       calendarValue: _this.props.value || _this.props.defaultValue || getShortISOString(new Date()),
-      l10n: (0, _locale.createLocalizationProvider)(_this.props.locale)
+      l10n: (0, _locale.createLocalizationProvider)(_this.props.locale),
+      locale: _this.props.locale
     };
     return _this;
   }
   (0, _createClass2.default)(DatePicker, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (this.props.locale !== nextProps.locale) {
-        this.setState({
-          l10n: (0, _locale.createLocalizationProvider)(nextProps.locale)
-        });
-      }
-    }
-  }, {
     key: "render",
     value: function render() {
       var _this$props3 = this.props,
@@ -554,6 +546,18 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         })))
       );
     }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(nextProps, prevState) {
+      if (nextProps.locale !== prevState.locale) {
+        return {
+          l10n: (0, _locale.createLocalizationProvider)(nextProps.locale),
+          locale: nextProps.locale
+        };
+      } else {
+        return null;
+      }
+    }
   }]);
   return DatePicker;
 }(_react.Component);

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

@@ -31,7 +31,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /** @jsx jsx */
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.8.1";
+var packageVersion = "12.9.0";
 var isInvalidBorderStyles = (0, _react2.css)({
   borderColor: "var(--ds-border-danger, ".concat(_colors.R400, ")")
 });

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

@@ -37,7 +37,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.8.1";
+var packageVersion = "12.9.0";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -102,8 +102,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
       isOpen: _this.props.defaultIsOpen,
       clearingFromIcon: false,
       value: _this.props.defaultValue,
-      isFocused: false,
-      l10n: (0, _locale.createLocalizationProvider)(_this.props.locale)
+      isFocused: false
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
@@ -203,92 +202,72 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    /**
-     * There are multiple props that can change how the time is formatted.
-     * The priority of props used is:
-     *   1. formatDisplayLabel
-     *   2. timeFormat
-     *   3. locale
-     */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "formatTime", function (time) {
-      var _this$props2 = _this.props,
-        formatDisplayLabel = _this$props2.formatDisplayLabel,
-        timeFormat = _this$props2.timeFormat;
-      var _this$getSafeState = _this.getSafeState(),
-        l10n = _this$getSafeState.l10n;
-      if (formatDisplayLabel) {
-        return formatDisplayLabel(time, timeFormat || _internal.defaultTimeFormat);
-      }
-      var date = (0, _parseTime.default)(time);
-      if (!(date instanceof Date)) {
-        return '';
-      }
-      if (!(0, _dateFns.isValid)(date)) {
-        return time;
-      }
-      if (timeFormat) {
-        return (0, _dateFns.format)(date, (0, _utils.convertTokens)(timeFormat));
-      }
-      return l10n.formatTime(date);
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getPlaceholder", function () {
-      var placeholder = _this.props.placeholder;
-      if (placeholder) {
-        return placeholder;
-      }
-      var _this$getSafeState2 = _this.getSafeState(),
-        l10n = _this$getSafeState2.l10n;
-      return l10n.formatTime(_internal.placeholderDatetime);
-    });
     return _this;
   }
   (0, _createClass2.default)(TimePicker, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (this.props.locale !== nextProps.locale) {
-        this.setState({
-          l10n: (0, _locale.createLocalizationProvider)(nextProps.locale)
-        });
-      }
-    }
-  }, {
-    key: "getOptions",
-    value: function getOptions() {
-      var _this2 = this;
-      return this.props.times.map(function (time) {
-        return {
-          label: _this2.formatTime(time),
-          value: time
-        };
-      });
-    }
-  }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
-      var _this$props3 = this.props,
-        autoFocus = _this$props3.autoFocus,
-        hideIcon = _this$props3.hideIcon,
-        id = _this$props3.id,
-        innerProps = _this$props3.innerProps,
-        isDisabled = _this$props3.isDisabled,
-        name = _this$props3.name,
-        selectProps = _this$props3.selectProps,
-        spacing = _this$props3.spacing,
-        testId = _this$props3.testId,
-        isInvalid = _this$props3.isInvalid,
-        timeIsEditable = _this$props3.timeIsEditable;
+      var _this2 = this;
+      var _this$props2 = this.props,
+        appearance = _this$props2.appearance,
+        autoFocus = _this$props2.autoFocus,
+        formatDisplayLabel = _this$props2.formatDisplayLabel,
+        hideIcon = _this$props2.hideIcon,
+        id = _this$props2.id,
+        innerProps = _this$props2.innerProps,
+        isDisabled = _this$props2.isDisabled,
+        locale = _this$props2.locale,
+        name = _this$props2.name,
+        placeholder = _this$props2.placeholder,
+        selectProps = _this$props2.selectProps,
+        spacing = _this$props2.spacing,
+        testId = _this$props2.testId,
+        isInvalid = _this$props2.isInvalid,
+        timeIsEditable = _this$props2.timeIsEditable,
+        timeFormat = _this$props2.timeFormat,
+        times = _this$props2.times;
       var ICON_PADDING = 2;
-      var _this$getSafeState3 = this.getSafeState(),
-        _this$getSafeState3$v = _this$getSafeState3.value,
-        value = _this$getSafeState3$v === void 0 ? '' : _this$getSafeState3$v,
-        isOpen = _this$getSafeState3.isOpen;
+      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 _selectProps$styles = selectProps.styles,
         selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles,
         otherSelectProps = (0, _objectWithoutProperties2.default)(selectProps, _excluded2);
       var SelectComponent = timeIsEditable ? _select.CreatableSelect : _select.default;
+
+      /**
+       * There are multiple props that can change how the time is formatted.
+       * The priority of props used is:
+       *   1. formatDisplayLabel
+       *   2. timeFormat
+       *   3. locale
+       */
+      var formatTime = function formatTime(time) {
+        if (formatDisplayLabel) {
+          return formatDisplayLabel(time, timeFormat || _internal.defaultTimeFormat);
+        }
+        var date = (0, _parseTime.default)(time);
+        if (!(date instanceof Date)) {
+          return '';
+        }
+        if (!(0, _dateFns.isValid)(date)) {
+          return time;
+        }
+        if (timeFormat) {
+          return (0, _dateFns.format)(date, (0, _utils.convertTokens)(timeFormat));
+        }
+        return l10n.formatTime(date);
+      };
+      var options = times.map(function (time) {
+        return {
+          label: formatTime(time),
+          value: time
+        };
+      });
       var labelAndValue = value && {
-        label: this.formatTime(value),
+        label: formatTime(value),
         value: value
       };
       var SingleValue = (0, _singleValue.makeSingleValue)({
@@ -310,7 +289,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           return _objectSpread(_objectSpread(_objectSpread({}, base), menuStyles), {}, {
             // Fixed positioned elements no longer inherit width from their parent, so we must explicitly set the
             // menu width to the width of our container
-            width: _this3.containerRef ? _this3.containerRef.getBoundingClientRect().width : 'auto'
+            width: _this2.containerRef ? _this2.containerRef.getBoundingClientRect().width : 'auto'
           });
         },
         indicatorsContainer: function indicatorsContainer(base) {
@@ -330,7 +309,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         "data-testid": testId && "".concat(testId, "--input"),
         onKeyDown: this.onSelectKeyDown
       }), /*#__PURE__*/_react.default.createElement(SelectComponent, (0, _extends2.default)({
-        appearance: this.props.appearance,
+        appearance: appearance,
         autoFocus: autoFocus,
         components: selectComponents,
         instanceId: id,
@@ -342,11 +321,11 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         onBlur: this.onBlur,
         onCreateOption: this.onCreateOption,
         onChange: this.onChange,
-        options: this.getOptions(),
+        options: options,
         onFocus: this.onFocus,
         onMenuOpen: this.onMenuOpen,
         onMenuClose: this.onMenuClose,
-        placeholder: this.getPlaceholder(),
+        placeholder: placeholder || l10n.formatTime(_internal.placeholderDatetime),
         styles: mergedStyles,
         value: labelAndValue,
         spacing: spacing

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

@@ -18,7 +18,7 @@ import FixedLayer from '../internal/fixed-layer';
 import { makeSingleValue } from '../internal/single-value';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.8.1";
+const packageVersion = "12.9.0";
 function getValidDate(iso) {
   const date = parseISO(iso);
   return isValid(date) ? {
@@ -401,17 +401,21 @@ class DatePicker extends Component {
       isOpen: this.props.defaultIsOpen,
       isFocused: false,
       clearingFromIcon: false,
-      selectInputValue: this.props.selectProps.inputValue,
+      selectInputValue: this.props.selectProps.inputValue || '',
       value: this.props.value || this.props.defaultValue,
       calendarValue: this.props.value || this.props.defaultValue || getShortISOString(new Date()),
-      l10n: createLocalizationProvider(this.props.locale)
+      l10n: createLocalizationProvider(this.props.locale),
+      locale: this.props.locale
     };
   }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.locale !== nextProps.locale) {
-      this.setState({
-        l10n: createLocalizationProvider(nextProps.locale)
-      });
+  static getDerivedStateFromProps(nextProps, prevState) {
+    if (nextProps.locale !== prevState.locale) {
+      return {
+        l10n: createLocalizationProvider(nextProps.locale),
+        locale: nextProps.locale
+      };
+    } else {
+      return null;
     }
   }
   render() {

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

@@ -15,7 +15,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.8.1";
+const packageVersion = "12.9.0";
 const isInvalidBorderStyles = css({
   borderColor: `var(--ds-border-danger, ${R400})`
 });

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

@@ -16,7 +16,7 @@ import parseTime from '../internal/parse-time';
 import { makeSingleValue } from '../internal/single-value';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.8.1";
+const packageVersion = "12.9.0";
 const menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -72,8 +72,7 @@ class TimePicker extends React.Component {
       isOpen: this.props.defaultIsOpen,
       clearingFromIcon: false,
       value: this.props.defaultValue,
-      isFocused: false,
-      l10n: createLocalizationProvider(this.props.locale)
+      isFocused: false
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
@@ -180,6 +179,39 @@ class TimePicker extends React.Component {
         });
       }
     });
+  }
+  render() {
+    const {
+      appearance,
+      autoFocus,
+      formatDisplayLabel,
+      hideIcon,
+      id,
+      innerProps,
+      isDisabled,
+      locale,
+      name,
+      placeholder,
+      selectProps,
+      spacing,
+      testId,
+      isInvalid,
+      timeIsEditable,
+      timeFormat,
+      times
+    } = this.props;
+    const ICON_PADDING = 2;
+    const l10n = createLocalizationProvider(locale);
+    const {
+      value = '',
+      isOpen
+    } = this.getSafeState();
+    const {
+      styles: selectStyles = {},
+      ...otherSelectProps
+    } = selectProps;
+    const SelectComponent = timeIsEditable ? CreatableSelect : Select;
+
     /**
      * There are multiple props that can change how the time is formatted.
      * The priority of props used is:
@@ -187,14 +219,7 @@ class TimePicker extends React.Component {
      *   2. timeFormat
      *   3. locale
      */
-    _defineProperty(this, "formatTime", time => {
-      const {
-        formatDisplayLabel,
-        timeFormat
-      } = this.props;
-      const {
-        l10n
-      } = this.getSafeState();
+    const formatTime = time => {
       if (formatDisplayLabel) {
         return formatDisplayLabel(time, timeFormat || defaultTimeFormat);
       }
@@ -209,61 +234,15 @@ class TimePicker extends React.Component {
         return format(date, convertTokens(timeFormat));
       }
       return l10n.formatTime(date);
-    });
-    _defineProperty(this, "getPlaceholder", () => {
-      const {
-        placeholder
-      } = this.props;
-      if (placeholder) {
-        return placeholder;
-      }
-      const {
-        l10n
-      } = this.getSafeState();
-      return l10n.formatTime(placeholderDatetime);
-    });
-  }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.locale !== nextProps.locale) {
-      this.setState({
-        l10n: createLocalizationProvider(nextProps.locale)
-      });
-    }
-  }
-  getOptions() {
-    return this.props.times.map(time => {
+    };
+    const options = times.map(time => {
       return {
-        label: this.formatTime(time),
+        label: formatTime(time),
         value: time
       };
     });
-  }
-  render() {
-    const {
-      autoFocus,
-      hideIcon,
-      id,
-      innerProps,
-      isDisabled,
-      name,
-      selectProps,
-      spacing,
-      testId,
-      isInvalid,
-      timeIsEditable
-    } = this.props;
-    const ICON_PADDING = 2;
-    const {
-      value = '',
-      isOpen
-    } = this.getSafeState();
-    const {
-      styles: selectStyles = {},
-      ...otherSelectProps
-    } = selectProps;
-    const SelectComponent = timeIsEditable ? CreatableSelect : Select;
     const labelAndValue = value && {
-      label: this.formatTime(value),
+      label: formatTime(value),
       value
     };
     const SingleValue = makeSingleValue({
@@ -305,7 +284,7 @@ class TimePicker extends React.Component {
       "data-testid": testId && `${testId}--input`,
       onKeyDown: this.onSelectKeyDown
     }), /*#__PURE__*/React.createElement(SelectComponent, _extends({
-      appearance: this.props.appearance,
+      appearance: appearance,
       autoFocus: autoFocus,
       components: selectComponents,
       instanceId: id,
@@ -317,11 +296,11 @@ class TimePicker extends React.Component {
       onBlur: this.onBlur,
       onCreateOption: this.onCreateOption,
       onChange: this.onChange,
-      options: this.getOptions(),
+      options: options,
       onFocus: this.onFocus,
       onMenuOpen: this.onMenuOpen,
       onMenuClose: this.onMenuClose,
-      placeholder: this.getPlaceholder(),
+      placeholder: placeholder || l10n.formatTime(placeholderDatetime),
       styles: mergedStyles,
       value: labelAndValue,
       spacing: spacing

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

@@ -29,7 +29,7 @@ import FixedLayer from '../internal/fixed-layer';
 import { makeSingleValue } from '../internal/single-value';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.8.1";
+var packageVersion = "12.9.0";
 function getValidDate(iso) {
   var date = parseISO(iso);
   return isValid(date) ? {
@@ -403,23 +403,15 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       isOpen: _this.props.defaultIsOpen,
       isFocused: false,
       clearingFromIcon: false,
-      selectInputValue: _this.props.selectProps.inputValue,
+      selectInputValue: _this.props.selectProps.inputValue || '',
       value: _this.props.value || _this.props.defaultValue,
       calendarValue: _this.props.value || _this.props.defaultValue || getShortISOString(new Date()),
-      l10n: createLocalizationProvider(_this.props.locale)
+      l10n: createLocalizationProvider(_this.props.locale),
+      locale: _this.props.locale
     };
     return _this;
   }
   _createClass(DatePicker, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (this.props.locale !== nextProps.locale) {
-        this.setState({
-          l10n: createLocalizationProvider(nextProps.locale)
-        });
-      }
-    }
-  }, {
     key: "render",
     value: function render() {
       var _this$props3 = this.props,
@@ -545,6 +537,18 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         })))
       );
     }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(nextProps, prevState) {
+      if (nextProps.locale !== prevState.locale) {
+        return {
+          l10n: createLocalizationProvider(nextProps.locale),
+          locale: nextProps.locale
+        };
+      } else {
+        return null;
+      }
+    }
   }]);
   return DatePicker;
 }(Component);

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

@@ -25,7 +25,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.8.1";
+var packageVersion = "12.9.0";
 var isInvalidBorderStyles = css({
   borderColor: "var(--ds-border-danger, ".concat(R400, ")")
 });

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

@@ -29,7 +29,7 @@ import parseTime from '../internal/parse-time';
 import { makeSingleValue } from '../internal/single-value';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.8.1";
+var packageVersion = "12.9.0";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -94,8 +94,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
       isOpen: _this.props.defaultIsOpen,
       clearingFromIcon: false,
       value: _this.props.defaultValue,
-      isFocused: false,
-      l10n: createLocalizationProvider(_this.props.locale)
+      isFocused: false
     });
     // All state needs to be accessed via this function so that the state is mapped from props
     // correctly to allow controlled/uncontrolled usage.
@@ -195,92 +194,72 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    /**
-     * There are multiple props that can change how the time is formatted.
-     * The priority of props used is:
-     *   1. formatDisplayLabel
-     *   2. timeFormat
-     *   3. locale
-     */
-    _defineProperty(_assertThisInitialized(_this), "formatTime", function (time) {
-      var _this$props2 = _this.props,
-        formatDisplayLabel = _this$props2.formatDisplayLabel,
-        timeFormat = _this$props2.timeFormat;
-      var _this$getSafeState = _this.getSafeState(),
-        l10n = _this$getSafeState.l10n;
-      if (formatDisplayLabel) {
-        return formatDisplayLabel(time, timeFormat || defaultTimeFormat);
-      }
-      var date = parseTime(time);
-      if (!(date instanceof Date)) {
-        return '';
-      }
-      if (!isValid(date)) {
-        return time;
-      }
-      if (timeFormat) {
-        return format(date, convertTokens(timeFormat));
-      }
-      return l10n.formatTime(date);
-    });
-    _defineProperty(_assertThisInitialized(_this), "getPlaceholder", function () {
-      var placeholder = _this.props.placeholder;
-      if (placeholder) {
-        return placeholder;
-      }
-      var _this$getSafeState2 = _this.getSafeState(),
-        l10n = _this$getSafeState2.l10n;
-      return l10n.formatTime(placeholderDatetime);
-    });
     return _this;
   }
   _createClass(TimePicker, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (this.props.locale !== nextProps.locale) {
-        this.setState({
-          l10n: createLocalizationProvider(nextProps.locale)
-        });
-      }
-    }
-  }, {
-    key: "getOptions",
-    value: function getOptions() {
-      var _this2 = this;
-      return this.props.times.map(function (time) {
-        return {
-          label: _this2.formatTime(time),
-          value: time
-        };
-      });
-    }
-  }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
-      var _this$props3 = this.props,
-        autoFocus = _this$props3.autoFocus,
-        hideIcon = _this$props3.hideIcon,
-        id = _this$props3.id,
-        innerProps = _this$props3.innerProps,
-        isDisabled = _this$props3.isDisabled,
-        name = _this$props3.name,
-        selectProps = _this$props3.selectProps,
-        spacing = _this$props3.spacing,
-        testId = _this$props3.testId,
-        isInvalid = _this$props3.isInvalid,
-        timeIsEditable = _this$props3.timeIsEditable;
+      var _this2 = this;
+      var _this$props2 = this.props,
+        appearance = _this$props2.appearance,
+        autoFocus = _this$props2.autoFocus,
+        formatDisplayLabel = _this$props2.formatDisplayLabel,
+        hideIcon = _this$props2.hideIcon,
+        id = _this$props2.id,
+        innerProps = _this$props2.innerProps,
+        isDisabled = _this$props2.isDisabled,
+        locale = _this$props2.locale,
+        name = _this$props2.name,
+        placeholder = _this$props2.placeholder,
+        selectProps = _this$props2.selectProps,
+        spacing = _this$props2.spacing,
+        testId = _this$props2.testId,
+        isInvalid = _this$props2.isInvalid,
+        timeIsEditable = _this$props2.timeIsEditable,
+        timeFormat = _this$props2.timeFormat,
+        times = _this$props2.times;
       var ICON_PADDING = 2;
-      var _this$getSafeState3 = this.getSafeState(),
-        _this$getSafeState3$v = _this$getSafeState3.value,
-        value = _this$getSafeState3$v === void 0 ? '' : _this$getSafeState3$v,
-        isOpen = _this$getSafeState3.isOpen;
+      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 _selectProps$styles = selectProps.styles,
         selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles,
         otherSelectProps = _objectWithoutProperties(selectProps, _excluded2);
       var SelectComponent = timeIsEditable ? CreatableSelect : Select;
+
+      /**
+       * There are multiple props that can change how the time is formatted.
+       * The priority of props used is:
+       *   1. formatDisplayLabel
+       *   2. timeFormat
+       *   3. locale
+       */
+      var formatTime = function formatTime(time) {
+        if (formatDisplayLabel) {
+          return formatDisplayLabel(time, timeFormat || defaultTimeFormat);
+        }
+        var date = parseTime(time);
+        if (!(date instanceof Date)) {
+          return '';
+        }
+        if (!isValid(date)) {
+          return time;
+        }
+        if (timeFormat) {
+          return format(date, convertTokens(timeFormat));
+        }
+        return l10n.formatTime(date);
+      };
+      var options = times.map(function (time) {
+        return {
+          label: formatTime(time),
+          value: time
+        };
+      });
       var labelAndValue = value && {
-        label: this.formatTime(value),
+        label: formatTime(value),
         value: value
       };
       var SingleValue = makeSingleValue({
@@ -302,7 +281,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           return _objectSpread(_objectSpread(_objectSpread({}, base), menuStyles), {}, {
             // Fixed positioned elements no longer inherit width from their parent, so we must explicitly set the
             // menu width to the width of our container
-            width: _this3.containerRef ? _this3.containerRef.getBoundingClientRect().width : 'auto'
+            width: _this2.containerRef ? _this2.containerRef.getBoundingClientRect().width : 'auto'
           });
         },
         indicatorsContainer: function indicatorsContainer(base) {
@@ -322,7 +301,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         "data-testid": testId && "".concat(testId, "--input"),
         onKeyDown: this.onSelectKeyDown
       }), /*#__PURE__*/React.createElement(SelectComponent, _extends({
-        appearance: this.props.appearance,
+        appearance: appearance,
         autoFocus: autoFocus,
         components: selectComponents,
         instanceId: id,
@@ -334,11 +313,11 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         onBlur: this.onBlur,
         onCreateOption: this.onCreateOption,
         onChange: this.onChange,
-        options: this.getOptions(),
+        options: options,
         onFocus: this.onFocus,
         onMenuOpen: this.onMenuOpen,
         onMenuClose: this.onMenuClose,
-        placeholder: this.getPlaceholder(),
+        placeholder: placeholder || l10n.formatTime(placeholderDatetime),
         styles: mergedStyles,
         value: labelAndValue,
         spacing: spacing

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

@@ -4,8 +4,8 @@ import { jsx } from '@emotion/react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { CalendarRef } from '@atlaskit/calendar';
 import { LocalizationProvider } from '@atlaskit/locale';
-import { ActionMeta, DropdownIndicatorProps, OptionType, ValueType } from '@atlaskit/select';
-import { Appearance, SelectProps, Spacing } from '../types';
+import { ActionMeta, DropdownIndicatorProps, InputActionMeta, OptionType, SelectProps, ValueType } from '@atlaskit/select';
+import { Appearance, Spacing } from '../types';
 export interface DatePickerBaseProps extends WithAnalyticsEventsProps {
     /**
      * Set the appearance of the picker.
@@ -103,7 +103,7 @@ export interface DatePickerBaseProps extends WithAnalyticsEventsProps {
      * Props to apply to the select. This can be used to set options such as placeholder text.
      *  See [the `Select` documentation for further information](/components/select).
      */
-    selectProps?: SelectProps;
+    selectProps?: SelectProps<any>;
     /**
      * The spacing for the select control.
      *
@@ -166,6 +166,7 @@ interface State {
     calendarValue: string;
     selectInputValue: string;
     l10n: LocalizationProvider;
+    locale: string;
 }
 declare const datePickerDefaultProps: {
     appearance: Appearance;
@@ -213,9 +214,12 @@ declare class DatePicker extends Component<DatePickerProps, State> {
     calendarRef: CalendarRef | null;
     containerRef: HTMLElement | null;
     constructor(props: any);
-    UNSAFE_componentWillReceiveProps(nextProps: Readonly<DatePickerProps>): void;
+    static getDerivedStateFromProps(nextProps: Readonly<DatePickerProps>, prevState: State): {
+        l10n: LocalizationProvider;
+        locale: string;
+    } | null;
     getSafeState: () => {
-        inputValue: any;
+        inputValue?: string | undefined;
         value: string;
         isOpen: boolean;
         isFocused: boolean;
@@ -223,6 +227,7 @@ declare class DatePicker extends Component<DatePickerProps, State> {
         calendarValue: string;
         selectInputValue: string;
         l10n: LocalizationProvider;
+        locale: string;
     };
     isDateDisabled: (date: string) => boolean;
     onCalendarChange: ({ iso }: {
@@ -241,7 +246,7 @@ declare class DatePicker extends Component<DatePickerProps, State> {
     onClear: () => void;
     onSelectChange: (value: ValueType<OptionType>, action: ActionMeta) => void;
     refCalendar: (ref: CalendarRef | null) => void;
-    handleSelectInputChange: (selectInputValue: string, actionMeta: {}) => void;
+    handleSelectInputChange: (selectInputValue: string, actionMeta: InputActionMeta) => void;
     getContainerRef: (ref: HTMLElement | null) => void;
     /**
      * There are two props that can change how the date is parsed.

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

@@ -1,12 +1,7 @@
 import React from 'react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
-import { LocalizationProvider } from '@atlaskit/locale';
 import { ActionMeta, OptionType, SelectProps, ValueType } from '@atlaskit/select';
 import { Appearance, Spacing } from '../types';
-interface Option {
-    label: string;
-    value: string;
-}
 export interface TimePickerBaseProps extends WithAnalyticsEventsProps {
     /**
      * Set the appearance of the picker.
@@ -123,7 +118,6 @@ interface State {
     clearingFromIcon: boolean;
     value: string;
     isFocused: boolean;
-    l10n: LocalizationProvider;
 }
 declare const timePickerDefaultProps: {
     appearance: Appearance;
@@ -174,11 +168,8 @@ declare class TimePicker extends React.Component<TimePickerProps, State> {
         clearingFromIcon: boolean;
         value: string;
         isFocused: boolean;
-        l10n: LocalizationProvider;
     };
-    UNSAFE_componentWillReceiveProps(nextProps: TimePickerProps): void;
     getSafeState: () => State;
-    getOptions(): Array<Option>;
     onChange: (newValue: ValueType<OptionType> | string, action?: ActionMeta<OptionType>) => void;
     /**
      * Only allow custom times if timeIsEditable prop is true
@@ -190,15 +181,6 @@ declare class TimePicker extends React.Component<TimePickerProps, State> {
     onBlur: (event: React.FocusEvent<HTMLElement>) => void;
     onFocus: (event: React.FocusEvent<HTMLElement>) => void;
     onSelectKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void;
-    /**
-     * There are multiple props that can change how the time is formatted.
-     * The priority of props used is:
-     *   1. formatDisplayLabel
-     *   2. timeFormat
-     *   3. locale
-     */
-    formatTime: (time: string) => string;
-    getPlaceholder: () => string;
     render(): JSX.Element;
 }
 export { TimePicker as TimePickerWithoutAnalytics };

package/dist/types/types.d.ts

@@ -1,3 +1,2 @@
 export type Appearance = 'default' | 'subtle' | 'none';
 export type Spacing = 'compact' | 'default';
-export type SelectProps = any;

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

@@ -4,8 +4,8 @@ import { jsx } from '@emotion/react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { CalendarRef } from '@atlaskit/calendar';
 import { LocalizationProvider } from '@atlaskit/locale';
-import { ActionMeta, DropdownIndicatorProps, OptionType, ValueType } from '@atlaskit/select';
-import { Appearance, SelectProps, Spacing } from '../types';
+import { ActionMeta, DropdownIndicatorProps, InputActionMeta, OptionType, SelectProps, ValueType } from '@atlaskit/select';
+import { Appearance, Spacing } from '../types';
 export interface DatePickerBaseProps extends WithAnalyticsEventsProps {
     /**
      * Set the appearance of the picker.
@@ -103,7 +103,7 @@ export interface DatePickerBaseProps extends WithAnalyticsEventsProps {
      * Props to apply to the select. This can be used to set options such as placeholder text.
      *  See [the `Select` documentation for further information](/components/select).
      */
-    selectProps?: SelectProps;
+    selectProps?: SelectProps<any>;
     /**
      * The spacing for the select control.
      *
@@ -166,6 +166,7 @@ interface State {
     calendarValue: string;
     selectInputValue: string;
     l10n: LocalizationProvider;
+    locale: string;
 }
 declare const datePickerDefaultProps: {
     appearance: Appearance;
@@ -213,9 +214,12 @@ declare class DatePicker extends Component<DatePickerProps, State> {
     calendarRef: CalendarRef | null;
     containerRef: HTMLElement | null;
     constructor(props: any);
-    UNSAFE_componentWillReceiveProps(nextProps: Readonly<DatePickerProps>): void;
+    static getDerivedStateFromProps(nextProps: Readonly<DatePickerProps>, prevState: State): {
+        l10n: LocalizationProvider;
+        locale: string;
+    } | null;
     getSafeState: () => {
-        inputValue: any;
+        inputValue?: string | undefined;
         value: string;
         isOpen: boolean;
         isFocused: boolean;
@@ -223,6 +227,7 @@ declare class DatePicker extends Component<DatePickerProps, State> {
         calendarValue: string;
         selectInputValue: string;
         l10n: LocalizationProvider;
+        locale: string;
     };
     isDateDisabled: (date: string) => boolean;
     onCalendarChange: ({ iso }: {
@@ -241,7 +246,7 @@ declare class DatePicker extends Component<DatePickerProps, State> {
     onClear: () => void;
     onSelectChange: (value: ValueType<OptionType>, action: ActionMeta) => void;
     refCalendar: (ref: CalendarRef | null) => void;
-    handleSelectInputChange: (selectInputValue: string, actionMeta: {}) => void;
+    handleSelectInputChange: (selectInputValue: string, actionMeta: InputActionMeta) => void;
     getContainerRef: (ref: HTMLElement | null) => void;
     /**
      * There are two props that can change how the date is parsed.

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

@@ -1,12 +1,7 @@
 import React from 'react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
-import { LocalizationProvider } from '@atlaskit/locale';
 import { ActionMeta, OptionType, SelectProps, ValueType } from '@atlaskit/select';
 import { Appearance, Spacing } from '../types';
-interface Option {
-    label: string;
-    value: string;
-}
 export interface TimePickerBaseProps extends WithAnalyticsEventsProps {
     /**
      * Set the appearance of the picker.
@@ -123,7 +118,6 @@ interface State {
     clearingFromIcon: boolean;
     value: string;
     isFocused: boolean;
-    l10n: LocalizationProvider;
 }
 declare const timePickerDefaultProps: {
     appearance: Appearance;
@@ -174,11 +168,8 @@ declare class TimePicker extends React.Component<TimePickerProps, State> {
         clearingFromIcon: boolean;
         value: string;
         isFocused: boolean;
-        l10n: LocalizationProvider;
     };
-    UNSAFE_componentWillReceiveProps(nextProps: TimePickerProps): void;
     getSafeState: () => State;
-    getOptions(): Array<Option>;
     onChange: (newValue: ValueType<OptionType> | string, action?: ActionMeta<OptionType>) => void;
     /**
      * Only allow custom times if timeIsEditable prop is true
@@ -190,15 +181,6 @@ declare class TimePicker extends React.Component<TimePickerProps, State> {
     onBlur: (event: React.FocusEvent<HTMLElement>) => void;
     onFocus: (event: React.FocusEvent<HTMLElement>) => void;
     onSelectKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void;
-    /**
-     * There are multiple props that can change how the time is formatted.
-     * The priority of props used is:
-     *   1. formatDisplayLabel
-     *   2. timeFormat
-     *   3. locale
-     */
-    formatTime: (time: string) => string;
-    getPlaceholder: () => string;
     render(): JSX.Element;
 }
 export { TimePicker as TimePickerWithoutAnalytics };

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

@@ -1,3 +1,2 @@
 export type Appearance = 'default' | 'subtle' | 'none';
 export type Spacing = 'compact' | 'default';
-export type SelectProps = any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/datetime-picker",
-  "version": "12.8.1",
+  "version": "12.9.0",
   "description": "A date time picker allows the user to select an associated date and time.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
     "@atlaskit/popper": "^5.5.0",
     "@atlaskit/select": "^16.5.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.18.0",
+    "@atlaskit/tokens": "^1.20.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "date-fns": "^2.17.0",

package/report.api.md

@@ -23,7 +23,7 @@ import { GroupType } from '@atlaskit/select';
 import { OptionType } from '@atlaskit/select';
 import { default as React_2 } from 'react';
 import { RefAttributes } from 'react';
-import { SelectProps as SelectProps_2 } from '@atlaskit/select';
+import { SelectProps } from '@atlaskit/select';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { WithContextProps } from '@atlaskit/analytics-next';
 
@@ -192,7 +192,7 @@ export interface DatePickerProps extends WithAnalyticsEventsProps {
   parseInputValue?: (date: string, dateFormat: string) => Date;
   placeholder?: string;
   previousMonthLabel?: string;
-  selectProps?: SelectProps;
+  selectProps?: SelectProps<any>;
   spacing?: Spacing;
   testId?: string;
   value?: string;
@@ -320,7 +320,7 @@ export interface DateTimePickerProps extends WithAnalyticsEventsProps {
   autoFocus?: boolean;
   dateFormat?: string;
   datePickerProps?: DatePickerProps;
-  datePickerSelectProps?: SelectProps_2<any>;
+  datePickerSelectProps?: SelectProps<any>;
   defaultValue?: string;
   id?: string;
   innerProps?: React_2.AllHTMLAttributes<HTMLElement>;
@@ -346,7 +346,7 @@ export interface DateTimePickerProps extends WithAnalyticsEventsProps {
   timeFormat?: string;
   timeIsEditable?: boolean;
   timePickerProps?: TimePickerProps;
-  timePickerSelectProps?: SelectProps_2<any>;
+  timePickerSelectProps?: SelectProps<any>;
   times?: Array<string>;
   value?: string;
 }
@@ -355,9 +355,6 @@ export interface DateTimePickerProps extends WithAnalyticsEventsProps {
 type DateTimePickerProps_2 = typeof dateTimePickerDefaultProps &
   DateTimePickerProps;
 
-// @public (undocumented)
-type SelectProps = any;
-
 // @public (undocumented)
 export type Spacing = 'compact' | 'default';
 
@@ -503,7 +500,7 @@ export interface TimePickerProps extends WithAnalyticsEventsProps {
   // (undocumented)
   parseInputValue?: (time: string, timeFormat: string) => Date | string;
   placeholder?: string;
-  selectProps?: SelectProps_2<any>;
+  selectProps?: SelectProps<any>;
   spacing?: Spacing;
   testId?: string;
   timeFormat?: string;

package/tmp/api-report-tmp.d.ts

@@ -12,7 +12,7 @@ import { GroupType } from '@atlaskit/select';
 import { OptionType } from '@atlaskit/select';
 import { default as React_2 } from 'react';
 import { RefAttributes } from 'react';
-import { SelectProps as SelectProps_2 } from '@atlaskit/select';
+import { SelectProps } from '@atlaskit/select';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { WithContextProps } from '@atlaskit/analytics-next';
 
@@ -93,7 +93,7 @@ export interface DatePickerProps extends WithAnalyticsEventsProps {
     parseInputValue?: (date: string, dateFormat: string) => Date;
     placeholder?: string;
     previousMonthLabel?: string;
-    selectProps?: SelectProps;
+    selectProps?: SelectProps<any>;
     spacing?: Spacing;
     testId?: string;
     value?: string;
@@ -155,7 +155,7 @@ export interface DateTimePickerProps extends WithAnalyticsEventsProps {
     autoFocus?: boolean;
     dateFormat?: string;
     datePickerProps?: DatePickerProps;
-    datePickerSelectProps?: SelectProps_2<any>;
+    datePickerSelectProps?: SelectProps<any>;
     defaultValue?: string;
     id?: string;
     innerProps?: React_2.AllHTMLAttributes<HTMLElement>;
@@ -176,7 +176,7 @@ export interface DateTimePickerProps extends WithAnalyticsEventsProps {
     timeFormat?: string;
     timeIsEditable?: boolean;
     timePickerProps?: TimePickerProps;
-    timePickerSelectProps?: SelectProps_2<any>;
+    timePickerSelectProps?: SelectProps<any>;
     times?: Array<string>;
     value?: string;
 }
@@ -184,9 +184,6 @@ export interface DateTimePickerProps extends WithAnalyticsEventsProps {
 // @public (undocumented)
 type DateTimePickerProps_2 = typeof dateTimePickerDefaultProps & DateTimePickerProps;
 
-// @public (undocumented)
-type SelectProps = any;
-
 // @public (undocumented)
 export type Spacing = 'compact' | 'default';
 
@@ -257,7 +254,7 @@ export interface TimePickerProps extends WithAnalyticsEventsProps {
     // (undocumented)
     parseInputValue?: (time: string, timeFormat: string) => Date | string;
     placeholder?: string;
-    selectProps?: SelectProps_2<any>;
+    selectProps?: SelectProps<any>;
     spacing?: Spacing;
     testId?: string;
     timeFormat?: string;