@atlaskit/datetime-picker 13.0.11 → 13.1.0

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

@@ -7,68 +7,15 @@ 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { mergeStyles } from '@atlaskit/select';
-import { B100, N0, N100, N20, N30, N500, N70, R400 } from '@atlaskit/theme/colors';
+import { N500, N70 } from '@atlaskit/theme/colors';
 import { defaultTimes, formatDateTimeZoneIntoIso } from '../internal';
+import { DateTimePickerContainer } from '../internal/date-time-picker-container';
 import { convertTokens } from '../internal/parse-tokens';
 import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "13.0.11";
-const isInvalidBorderStyles = css({
-  borderColor: `var(--ds-border-danger, ${R400})`
-});
-const isFocusedBorderStyles = css({
-  borderColor: `var(--ds-border-focused, ${B100})`
-});
-const isFocusedStyles = css({
-  backgroundColor: `var(--ds-background-input-pressed, ${N0})`
-});
-const subtleBgStyles = css({
-  backgroundColor: 'transparent',
-  borderColor: 'transparent'
-});
-const subtleFocusedBgStyles = css({
-  backgroundColor: "var(--ds-background-input-pressed, transparent)",
-  borderColor: 'transparent'
-});
-const noBgStyles = css({
-  backgroundColor: 'transparent',
-  borderColor: 'transparent',
-  '&:hover': {
-    backgroundColor: 'transparent',
-    borderColor: 'transparent'
-  }
-});
-const hoverStyles = css({
-  '&:hover': {
-    backgroundColor: `var(--ds-background-input-hovered, ${N30})`,
-    borderColor: `var(--ds-border-input, ${getBooleanFF('platform.design-system-team.border-checkbox_nyoiu') ? N100 : N30})`
-  }
-});
-const isInvalidHoverStyles = css({
-  '&:hover': {
-    backgroundColor: `var(--ds-background-input-hovered, ${N0})`,
-    borderColor: `var(--ds-border-danger, ${R400})`
-  }
-});
-const isDisabledStyles = css({
-  '&:hover': {
-    cursor: 'default'
-  }
-});
-const baseContainerStyles = css({
-  display: 'flex',
-  backgroundColor: `var(--ds-background-input, ${N20})`,
-  border: getBooleanFF('platform.design-system-team.update-input-border-wdith_5abwv') ? `${"var(--ds-border-width, 1px)"} solid ${`var(--ds-border-input, ${N100})`}` : `2px solid ${`var(--ds-border-input, ${N20})`}`,
-  borderRadius: "var(--ds-border-radius, 3px)",
-  transition: 'background-color 200ms ease-in-out, border-color 200ms ease-in-out',
-  '&:hover': {
-    cursor: 'pointer'
-  }
-});
-
+const packageVersion = "13.1.0";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 const datePickerContainerStyles = css({
@@ -278,24 +225,26 @@ class DateTimePicker extends React.Component {
     } = timePickerSelectProps;
     const mergedDatePickerSelectProps = {
       ...datePickerSelectProps,
-      'aria-label': datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
+      'aria-label': datePickerProps['label'] || datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
       styles: mergeStyles(styles, datePickerStyles)
     };
     const mergedTimePickerSelectProps = {
       ...timePickerSelectProps,
-      'aria-label': timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
+      'aria-label': timePickerProps['label'] || timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
       styles: mergeStyles(styles, timePickerStyles)
     };
 
     // Render DateTimePicker's IconContainer when a value has been filled
     // Don't use Date or TimePicker's because they can't be customised
     const isClearable = Boolean(dateValue || timeValue);
-    const notFocusedOrIsDisabled = !(isFocused || isDisabled);
-    return jsx("div", _extends({
-      css: [baseContainerStyles, isDisabled && isDisabledStyles, isFocused && isFocusedStyles, bothProps.appearance === 'subtle' && (isFocused ? subtleFocusedBgStyles : subtleBgStyles), isFocused && isFocusedBorderStyles, bothProps.isInvalid && isInvalidBorderStyles, notFocusedOrIsDisabled && (bothProps.isInvalid ? isInvalidHoverStyles : hoverStyles), bothProps.appearance === 'none' && noBgStyles]
-    }, innerProps, {
-      "data-testid": testId
-    }), jsx("input", {
+    return jsx(DateTimePickerContainer, {
+      appearance: bothProps.appearance,
+      isDisabled: isDisabled,
+      isFocused: isFocused,
+      isInvalid: bothProps.isInvalid,
+      testId: testId,
+      innerProps: innerProps
+    }, jsx("input", {
       name: name,
       type: "hidden",
       value: value,

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

@@ -1,5 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 
 // eslint-disable-next-line no-restricted-imports
@@ -7,16 +7,16 @@ 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, { components, CreatableSelect, mergeStyles } from '@atlaskit/select';
+import Select, { CreatableSelect, mergeStyles } from '@atlaskit/select';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { defaultTimeFormat, defaultTimes, EmptyComponent, placeholderDatetime } from '../internal';
-import FixedLayer from '../internal/fixed-layer';
+import { FixedLayerMenu } from '../internal/fixed-layer-menu';
 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.0.11";
+const packageVersion = "13.1.0";
 const menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -25,17 +25,6 @@ const menuStyles = {
   /* React-Popper has already offset the menu so we need to reset the margin, otherwise the offset value is doubled */
   margin: 0
 };
-const FixedLayerMenu = ({
-  selectProps,
-  ...rest
-}) => /*#__PURE__*/React.createElement(FixedLayer, {
-  inputValue: selectProps.inputValue,
-  containerRef: selectProps.fixedLayerRef,
-  content: /*#__PURE__*/React.createElement(components.Menu, _extends({}, rest, {
-    menuShouldScrollIntoView: false
-  })),
-  testId: selectProps.testId
-});
 const timePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,
@@ -46,6 +35,7 @@ const timePickerDefaultProps = {
   innerProps: {},
   isDisabled: false,
   isInvalid: false,
+  label: '',
   name: '',
   // These disables are here for proper typing when used as defaults. They
   // should *not* use the `noop` function.
@@ -191,6 +181,7 @@ class TimePicker extends React.Component {
       id,
       innerProps,
       isDisabled,
+      label,
       locale,
       name,
       placeholder,
@@ -286,6 +277,7 @@ class TimePicker extends React.Component {
       "data-testid": testId && `${testId}--input`,
       onKeyDown: this.onSelectKeyDown
     }), /*#__PURE__*/React.createElement(SelectComponent, _extends({
+      "aria-label": label || undefined,
       appearance: appearance,
       autoFocus: autoFocus,
       components: selectComponents,

package/dist/es2019/internal/date-time-picker-container.js

@@ -0,0 +1,77 @@
+import _extends from "@babel/runtime/helpers/extends";
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { B100, N0, N100, N20, N30, R400 } from '@atlaskit/theme/colors';
+const isInvalidBorderStyles = css({
+  borderColor: `var(--ds-border-danger, ${R400})`
+});
+const isFocusedBorderStyles = css({
+  borderColor: `var(--ds-border-focused, ${B100})`
+});
+const isFocusedStyles = css({
+  backgroundColor: `var(--ds-background-input-pressed, ${N0})`
+});
+const subtleBgStyles = css({
+  backgroundColor: 'transparent',
+  borderColor: 'transparent'
+});
+const subtleFocusedBgStyles = css({
+  backgroundColor: "var(--ds-background-input-pressed, transparent)",
+  borderColor: 'transparent'
+});
+const noBgStyles = css({
+  backgroundColor: 'transparent',
+  borderColor: 'transparent',
+  '&:hover': {
+    backgroundColor: 'transparent',
+    borderColor: 'transparent'
+  }
+});
+const hoverStyles = css({
+  '&:hover': {
+    backgroundColor: `var(--ds-background-input-hovered, ${N30})`,
+    borderColor: `var(--ds-border-input, ${getBooleanFF('platform.design-system-team.border-checkbox_nyoiu') ? N100 : N30})`
+  }
+});
+const isInvalidHoverStyles = css({
+  '&:hover': {
+    backgroundColor: `var(--ds-background-input-hovered, ${N0})`,
+    borderColor: `var(--ds-border-danger, ${R400})`
+  }
+});
+const isDisabledStyles = css({
+  '&:hover': {
+    cursor: 'default'
+  }
+});
+const baseContainerStyles = css({
+  display: 'flex',
+  backgroundColor: `var(--ds-background-input, ${N20})`,
+  border: getBooleanFF('platform.design-system-team.update-input-border-wdith_5abwv') ? `${"var(--ds-border-width, 1px)"} solid ${`var(--ds-border-input, ${N100})`}` : `2px solid ${`var(--ds-border-input, ${N20})`}`,
+  borderRadius: "var(--ds-border-radius, 3px)",
+  transition: 'background-color 200ms ease-in-out, border-color 200ms ease-in-out',
+  '&:hover': {
+    cursor: 'pointer'
+  }
+});
+
+/**
+ * This is the container for the datetime picker component.
+ */
+export const DateTimePickerContainer = ({
+  isDisabled,
+  isFocused,
+  appearance,
+  isInvalid,
+  innerProps,
+  testId,
+  children
+}) => {
+  const notFocusedOrIsDisabled = !(isFocused || isDisabled);
+  return jsx("div", _extends({
+    css: [baseContainerStyles, isDisabled && isDisabledStyles, isFocused && isFocusedStyles, appearance === 'subtle' && (isFocused ? subtleFocusedBgStyles : subtleBgStyles), isFocused && isFocusedBorderStyles, isInvalid && isInvalidBorderStyles, notFocusedOrIsDisabled && (isInvalid ? isInvalidHoverStyles : hoverStyles), appearance === 'none' && noBgStyles]
+  }, innerProps, {
+    "data-testid": testId
+  }), children);
+};

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

@@ -0,0 +1,20 @@
+import _extends from "@babel/runtime/helpers/extends";
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import { components } from '@atlaskit/select';
+import FixedLayer from '../internal/fixed-layer';
+
+/**
+ * This is the fixed layer menu used in the time picker.
+ */
+export const FixedLayerMenu = ({
+  selectProps,
+  ...rest
+}) => jsx(FixedLayer, {
+  inputValue: selectProps.inputValue,
+  containerRef: selectProps.fixedLayerRef,
+  content: jsx(components.Menu, _extends({}, rest, {
+    menuShouldScrollIntoView: false
+  })),
+  testId: selectProps.testId
+});

package/dist/es2019/internal/menu.js

@@ -0,0 +1,48 @@
+import _extends from "@babel/runtime/helpers/extends";
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
+import Calendar from '@atlaskit/calendar';
+import { UNSAFE_LAYERING } from '@atlaskit/layering';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { N0, N50A, N60A } from '@atlaskit/theme/colors';
+import { layers } from '@atlaskit/theme/constants';
+import FixedLayer from '../internal/fixed-layer';
+import { getValidDate } from './parse-date';
+const menuStyles = css({
+  zIndex: layers.dialog(),
+  backgroundColor: `var(--ds-surface-overlay, ${N0})`,
+  borderRadius: "var(--ds-border-radius, 3px)",
+  boxShadow: `var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N50A}, 0 0 1px ${N60A}`})`,
+  overflow: 'hidden'
+});
+
+/**
+ * This is the menu used in the select of the date picker.
+ */
+export const Menu = ({
+  selectProps,
+  innerProps
+}) => jsx(UNSAFE_LAYERING, {
+  isDisabled: getBooleanFF('platform.design-system-team.layering_qmiw3') ? false : true
+}, jsx(FixedLayer, {
+  inputValue: selectProps.inputValue,
+  containerRef: selectProps.calendarContainerRef,
+  content: jsx("div", _extends({
+    css: menuStyles
+  }, innerProps), jsx(Calendar, _extends({}, getValidDate(selectProps.calendarValue), getValidDate(selectProps.calendarView), {
+    disabled: selectProps.calendarDisabled,
+    disabledDateFilter: selectProps.calendarDisabledDateFilter,
+    minDate: selectProps.calendarMinDate,
+    maxDate: selectProps.calendarMaxDate,
+    nextMonthLabel: selectProps.nextMonthLabel,
+    onChange: selectProps.onCalendarChange,
+    onSelect: selectProps.onCalendarSelect,
+    previousMonthLabel: selectProps.previousMonthLabel,
+    calendarRef: selectProps.calendarRef,
+    selected: [selectProps.calendarValue],
+    locale: selectProps.calendarLocale,
+    testId: selectProps.testId && `${selectProps.testId}--calendar`,
+    weekStartDay: selectProps.calendarWeekStartDay
+  }))),
+  testId: selectProps.testId
+}));

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

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -6,67 +7,27 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _extends from "@babel/runtime/helpers/extends";
 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) { _defineProperty(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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { 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 */
 import { Component } from 'react';
-import { css, jsx } from '@emotion/react';
+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 Calendar from '@atlaskit/calendar';
 import CalendarIcon from '@atlaskit/icon/glyph/calendar';
-import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import { createLocalizationProvider } from '@atlaskit/locale';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Select, { mergeStyles } from '@atlaskit/select';
-import { N0, N50A, N60A } from '@atlaskit/theme/colors';
-import { layers } from '@atlaskit/theme/constants';
 import { defaultDateFormat, EmptyComponent, padToTwo, placeholderDatetime } from '../internal';
-import FixedLayer from '../internal/fixed-layer';
-import { getSafeCalendarValue, getShortISOString, getValidDate } from '../internal/parse-date';
+import { Menu } from '../internal/menu';
+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.0.11";
-var menuStyles = css({
-  zIndex: layers.dialog(),
-  backgroundColor: "var(--ds-surface-overlay, ".concat(N0, ")"),
-  borderRadius: "var(--ds-border-radius, 3px)",
-  boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N50A, ", 0 0 1px ").concat(N60A), ")"),
-  overflow: 'hidden'
-});
-var Menu = function Menu(_ref) {
-  var selectProps = _ref.selectProps,
-    innerProps = _ref.innerProps;
-  return jsx(UNSAFE_LAYERING, {
-    isDisabled: getBooleanFF('platform.design-system-team.layering_qmiw3') ? false : true
-  }, jsx(FixedLayer, {
-    inputValue: selectProps.inputValue,
-    containerRef: selectProps.calendarContainerRef,
-    content: jsx("div", _extends({
-      css: menuStyles
-    }, innerProps), jsx(Calendar, _extends({}, getValidDate(selectProps.calendarValue), getValidDate(selectProps.calendarView), {
-      disabled: selectProps.calendarDisabled,
-      disabledDateFilter: selectProps.calendarDisabledDateFilter,
-      minDate: selectProps.calendarMinDate,
-      maxDate: selectProps.calendarMaxDate,
-      nextMonthLabel: selectProps.nextMonthLabel,
-      onChange: selectProps.onCalendarChange,
-      onSelect: selectProps.onCalendarSelect,
-      previousMonthLabel: selectProps.previousMonthLabel,
-      calendarRef: selectProps.calendarRef,
-      selected: [selectProps.calendarValue],
-      locale: selectProps.calendarLocale,
-      testId: selectProps.testId && "".concat(selectProps.testId, "--calendar"),
-      weekStartDay: selectProps.calendarWeekStartDay
-    }))),
-    testId: selectProps.testId
-  }));
-};
+var packageVersion = "13.1.0";
 var datePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,
@@ -82,6 +43,7 @@ var datePickerDefaultProps = {
   innerProps: {},
   isDisabled: false,
   isInvalid: false,
+  label: '',
   name: '',
   // These disables are here for proper typing when used as defaults. They
   // should *not* use the `noop` function.
@@ -113,8 +75,8 @@ var DatePicker = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "isDateDisabled", function (date) {
       return _this.props.disabled.indexOf(date) > -1;
     });
-    _defineProperty(_assertThisInitialized(_this), "onCalendarChange", function (_ref2) {
-      var iso = _ref2.iso;
+    _defineProperty(_assertThisInitialized(_this), "onCalendarChange", function (_ref) {
+      var iso = _ref.iso;
       var _iso$split = iso.split('-'),
         _iso$split2 = _slicedToArray(_iso$split, 3),
         year = _iso$split2[0],
@@ -135,8 +97,8 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         calendarValue: newIso
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "onCalendarSelect", function (_ref3) {
-      var iso = _ref3.iso;
+    _defineProperty(_assertThisInitialized(_this), "onCalendarSelect", function (_ref2) {
+      var iso = _ref2.iso;
       _this.setState({
         selectInputValue: '',
         isOpen: false,
@@ -389,6 +351,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         maxDate = _this$props3.maxDate,
         minDate = _this$props3.minDate,
         isInvalid = _this$props3.isInvalid,
+        label = _this$props3.label,
         name = _this$props3.name,
         nextMonthLabel = _this$props3.nextMonthLabel,
         previousMonthLabel = _this$props3.previousMonthLabel,
@@ -460,6 +423,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
           value: value,
           "data-testid": testId && "".concat(testId, "--input")
         }), jsx(Select, _extends({
+          "aria-label": label || undefined,
           appearance: this.props.appearance,
           enableAnimation: false,
           menuIsOpen: menuIsOpen,

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

@@ -17,68 +17,15 @@ 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 { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { mergeStyles } from '@atlaskit/select';
-import { B100, N0, N100, N20, N30, N500, N70, R400 } from '@atlaskit/theme/colors';
+import { N500, N70 } from '@atlaskit/theme/colors';
 import { defaultTimes, formatDateTimeZoneIntoIso } from '../internal';
+import { DateTimePickerContainer } from '../internal/date-time-picker-container';
 import { convertTokens } from '../internal/parse-tokens';
 import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.0.11";
-var isInvalidBorderStyles = css({
-  borderColor: "var(--ds-border-danger, ".concat(R400, ")")
-});
-var isFocusedBorderStyles = css({
-  borderColor: "var(--ds-border-focused, ".concat(B100, ")")
-});
-var isFocusedStyles = css({
-  backgroundColor: "var(--ds-background-input-pressed, ".concat(N0, ")")
-});
-var subtleBgStyles = css({
-  backgroundColor: 'transparent',
-  borderColor: 'transparent'
-});
-var subtleFocusedBgStyles = css({
-  backgroundColor: "var(--ds-background-input-pressed, transparent)",
-  borderColor: 'transparent'
-});
-var noBgStyles = css({
-  backgroundColor: 'transparent',
-  borderColor: 'transparent',
-  '&:hover': {
-    backgroundColor: 'transparent',
-    borderColor: 'transparent'
-  }
-});
-var hoverStyles = css({
-  '&:hover': {
-    backgroundColor: "var(--ds-background-input-hovered, ".concat(N30, ")"),
-    borderColor: "var(--ds-border-input, ".concat(getBooleanFF('platform.design-system-team.border-checkbox_nyoiu') ? N100 : N30, ")")
-  }
-});
-var isInvalidHoverStyles = css({
-  '&:hover': {
-    backgroundColor: "var(--ds-background-input-hovered, ".concat(N0, ")"),
-    borderColor: "var(--ds-border-danger, ".concat(R400, ")")
-  }
-});
-var isDisabledStyles = css({
-  '&:hover': {
-    cursor: 'default'
-  }
-});
-var baseContainerStyles = css({
-  display: 'flex',
-  backgroundColor: "var(--ds-background-input, ".concat(N20, ")"),
-  border: getBooleanFF('platform.design-system-team.update-input-border-wdith_5abwv') ? "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, ".concat(N100, ")")) : "2px solid ".concat("var(--ds-border-input, ".concat(N20, ")")),
-  borderRadius: "var(--ds-border-radius, 3px)",
-  transition: 'background-color 200ms ease-in-out, border-color 200ms ease-in-out',
-  '&:hover': {
-    cursor: 'pointer'
-  }
-});
-
+var packageVersion = "13.1.0";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 var datePickerContainerStyles = css({
@@ -287,23 +234,25 @@ var DateTimePicker = /*#__PURE__*/function (_React$Component) {
       var _timePickerSelectProp = timePickerSelectProps.styles,
         timePickerStyles = _timePickerSelectProp === void 0 ? {} : _timePickerSelectProp;
       var mergedDatePickerSelectProps = _objectSpread(_objectSpread({}, datePickerSelectProps), {}, {
-        'aria-label': datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
+        'aria-label': datePickerProps['label'] || datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
         styles: mergeStyles(styles, datePickerStyles)
       });
       var mergedTimePickerSelectProps = _objectSpread(_objectSpread({}, timePickerSelectProps), {}, {
-        'aria-label': timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
+        'aria-label': timePickerProps['label'] || timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
         styles: mergeStyles(styles, timePickerStyles)
       });
 
       // Render DateTimePicker's IconContainer when a value has been filled
       // Don't use Date or TimePicker's because they can't be customised
       var isClearable = Boolean(dateValue || timeValue);
-      var notFocusedOrIsDisabled = !(isFocused || isDisabled);
-      return jsx("div", _extends({
-        css: [baseContainerStyles, isDisabled && isDisabledStyles, isFocused && isFocusedStyles, bothProps.appearance === 'subtle' && (isFocused ? subtleFocusedBgStyles : subtleBgStyles), isFocused && isFocusedBorderStyles, bothProps.isInvalid && isInvalidBorderStyles, notFocusedOrIsDisabled && (bothProps.isInvalid ? isInvalidHoverStyles : hoverStyles), bothProps.appearance === 'none' && noBgStyles]
-      }, innerProps, {
-        "data-testid": testId
-      }), jsx("input", {
+      return jsx(DateTimePickerContainer, {
+        appearance: bothProps.appearance,
+        isDisabled: isDisabled,
+        isFocused: isFocused,
+        isInvalid: bothProps.isInvalid,
+        testId: testId,
+        innerProps: innerProps
+      }, jsx("input", {
         name: name,
         type: "hidden",
         value: value,

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

@@ -1,3 +1,5 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -5,10 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["selectProps"],
-  _excluded2 = ["styles"];
+var _excluded = ["styles"];
 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) { _defineProperty(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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -20,16 +19,16 @@ 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, { components, CreatableSelect, mergeStyles } from '@atlaskit/select';
+import Select, { CreatableSelect, mergeStyles } from '@atlaskit/select';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
 import { defaultTimeFormat, defaultTimes, EmptyComponent, placeholderDatetime } from '../internal';
-import FixedLayer from '../internal/fixed-layer';
+import { FixedLayerMenu } from '../internal/fixed-layer-menu';
 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.0.11";
+var packageVersion = "13.1.0";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -38,18 +37,6 @@ var menuStyles = {
   /* React-Popper has already offset the menu so we need to reset the margin, otherwise the offset value is doubled */
   margin: 0
 };
-var FixedLayerMenu = function FixedLayerMenu(_ref) {
-  var selectProps = _ref.selectProps,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  return /*#__PURE__*/React.createElement(FixedLayer, {
-    inputValue: selectProps.inputValue,
-    containerRef: selectProps.fixedLayerRef,
-    content: /*#__PURE__*/React.createElement(components.Menu, _extends({}, rest, {
-      menuShouldScrollIntoView: false
-    })),
-    testId: selectProps.testId
-  });
-};
 var timePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,
@@ -60,6 +47,7 @@ var timePickerDefaultProps = {
   innerProps: {},
   isDisabled: false,
   isInvalid: false,
+  label: '',
   name: '',
   // These disables are here for proper typing when used as defaults. They
   // should *not* use the `noop` function.
@@ -210,6 +198,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         id = _this$props2.id,
         innerProps = _this$props2.innerProps,
         isDisabled = _this$props2.isDisabled,
+        label = _this$props2.label,
         locale = _this$props2.locale,
         name = _this$props2.name,
         placeholder = _this$props2.placeholder,
@@ -228,7 +217,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         isOpen = _this$getSafeState.isOpen;
       var _selectProps$styles = selectProps.styles,
         selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles,
-        otherSelectProps = _objectWithoutProperties(selectProps, _excluded2);
+        otherSelectProps = _objectWithoutProperties(selectProps, _excluded);
       var SelectComponent = timeIsEditable ? CreatableSelect : Select;
 
       /**
@@ -303,6 +292,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         "data-testid": testId && "".concat(testId, "--input"),
         onKeyDown: this.onSelectKeyDown
       }), /*#__PURE__*/React.createElement(SelectComponent, _extends({
+        "aria-label": label || undefined,
         appearance: appearance,
         autoFocus: autoFocus,
         components: selectComponents,