@atlaskit/datetime-picker 12.1.2 → 12.2.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaskit/datetime-picker
 
+## 12.2.0
+
+### Minor Changes
+
+- [`a91fbaf0552`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a91fbaf0552) - Updates `@emotion/core` to `@emotion/react`; v10 to v11. There is no expected behavior change.
+
+### Patch Changes
+
+- [`0fbb2840aba`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0fbb2840aba) - Add isInvalid prop to `@atlastkit/Select`. The prop indicates whether if the component is in the error state. If true, it visually shows a red border around the input.
+
+  This replaces validationState to make Select more consistent like other components that uses isInvalid prop.
+
+- Updated dependencies
+
+## 12.1.4
+
+### Patch Changes
+
+- [`8d4228767b0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8d4228767b0) - Upgrade Typescript from `4.2.4` to `4.3.5`.
+
+## 12.1.3
+
+### Patch Changes
+
+- [`299e4104e10`](https://bitbucket.org/atlassian/atlassian-frontend/commits/299e4104e10) - [ux] Added appearance 'none' option to component and adopts appearance handling from @atlaskit/select
+- Updated dependencies
+
 ## 12.1.2
 
 ### Patch Changes

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

@@ -29,7 +29,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _react = require("react");
 
-var _core = require("@emotion/core");
+var _react2 = require("@emotion/react");
 
 var _dateFns = require("date-fns");
 
@@ -68,7 +68,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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.1.2";
+var packageVersion = "12.2.0";
 /* eslint-disable react/no-unused-prop-types */
 
 function getDateObj(date) {
@@ -84,7 +84,7 @@ function getValidDate(iso) {
   return (0, _dateFns.isValid)(date) ? getDateObj(date) : {};
 }
 
-var menuStyles = (0, _core.css)({
+var menuStyles = (0, _react2.css)({
   zIndex: _constants.layers.dialog(),
   backgroundColor: "var(--ds-surface-overlay, ".concat(_colors.N20, ")"),
   borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
@@ -95,12 +95,12 @@ var menuStyles = (0, _core.css)({
 var Menu = function Menu(_ref) {
   var selectProps = _ref.selectProps,
       innerProps = _ref.innerProps;
-  return (0, _core.jsx)(_fixedLayer.default, {
+  return (0, _react2.jsx)(_fixedLayer.default, {
     inputValue: selectProps.inputValue,
     containerRef: selectProps.calendarContainerRef,
-    content: (0, _core.jsx)("div", (0, _extends2.default)({
+    content: (0, _react2.jsx)("div", (0, _extends2.default)({
       css: menuStyles
-    }, innerProps), (0, _core.jsx)(_calendar.default, (0, _extends2.default)({}, getValidDate(selectProps.calendarValue), getValidDate(selectProps.calendarView), {
+    }, innerProps), (0, _react2.jsx)(_calendar.default, (0, _extends2.default)({}, getValidDate(selectProps.calendarValue), getValidDate(selectProps.calendarView), {
       disabled: selectProps.calendarDisabled,
       disabledDateFilter: selectProps.calendarDisabledDateFilter,
       minDate: selectProps.calendarMinDate,
@@ -400,13 +400,6 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         _this.forceUpdate();
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSubtleControlStyles", function () {
-      return {
-        border: "2px solid ".concat(_this.getSafeState().isFocused ? "var(--ds-border-focused, ".concat(_colors.B100, ")") : "transparent"),
-        backgroundColor: _this.getSafeState().isOpen ? "var(--ds-background-input-pressed, transparent)" : 'transparent',
-        padding: '1px'
-      };
-    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "parseDate", function (date) {
       var _this$props = _this.props,
           parseInputValue = _this$props.parseInputValue,
@@ -524,7 +517,6 @@ var DatePicker = /*#__PURE__*/function (_Component) {
 
       var _selectProps$styles = selectProps.styles,
           selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles;
-      var controlStyles = appearance === 'subtle' ? this.getSubtleControlStyles() : {};
       var disabledStyle = isDisabled ? {
         pointerEvents: 'none'
       } : {};
@@ -544,20 +536,21 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         nextMonthLabel: nextMonthLabel,
         previousMonthLabel: previousMonthLabel
       };
-      return (0, _core.jsx)("div", (0, _extends2.default)({}, innerProps, {
+      return (0, _react2.jsx)("div", (0, _extends2.default)({}, innerProps, {
         role: "presentation",
         onClick: this.onInputClick,
         onInput: this.onSelectInput,
         onKeyDown: this.onSelectKeyDown,
         ref: this.getContainerRef,
         "data-testid": testId && "".concat(testId, "--container")
-      }), (0, _core.jsx)("input", {
+      }), (0, _react2.jsx)("input", {
         id: selectProps.inputId,
         name: name,
         type: "hidden",
         value: value,
         "data-testid": testId && "".concat(testId, "--input")
-      }), (0, _core.jsx)(_select.default, (0, _extends2.default)({
+      }), (0, _react2.jsx)(_select.default, (0, _extends2.default)({
+        appearance: this.props.appearance,
         enableAnimation: false,
         menuIsOpen: menuIsOpen,
         closeMenuOnSelect: true,
@@ -572,7 +565,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         onChange: this.onSelectChange,
         styles: (0, _select.mergeStyles)(selectStyles, {
           control: function control(base) {
-            return _objectSpread(_objectSpread(_objectSpread({}, base), controlStyles), disabledStyle);
+            return _objectSpread(_objectSpread({}, base), disabledStyle);
           },
           indicatorsContainer: function indicatorsContainer(base) {
             return _objectSpread(_objectSpread({}, base), {}, {
@@ -589,7 +582,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       }, selectProps, calendarProps, {
         isClearable: true,
         spacing: spacing,
-        validationState: isInvalid ? 'error' : 'default',
+        isInvalid: isInvalid,
         testId: testId
       })));
     }

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

@@ -25,7 +25,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
-var _core = require("@emotion/core");
+var _react2 = require("@emotion/react");
 
 var _dateFns = require("date-fns");
 
@@ -58,44 +58,52 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.1.2";
+var packageVersion = "12.2.0";
 /* eslint-disable react/no-unused-prop-types */
 
-var isInvalidBorderStyles = (0, _core.css)({
+var isInvalidBorderStyles = (0, _react2.css)({
   borderColor: "var(--ds-border-danger, ".concat(_colors.R400, ")")
 });
-var isFocusedBorderStyles = (0, _core.css)({
+var isFocusedBorderStyles = (0, _react2.css)({
   borderColor: "var(--ds-border-focused, ".concat(_colors.B100, ")")
 });
-var isFocusedStyles = (0, _core.css)({
+var isFocusedStyles = (0, _react2.css)({
   backgroundColor: "var(--ds-background-input-pressed, ".concat(_colors.N0, ")")
 });
-var subtleBgStyles = (0, _core.css)({
+var subtleBgStyles = (0, _react2.css)({
   backgroundColor: 'transparent',
   borderColor: 'transparent'
 });
-var subtleFocusedBgStyles = (0, _core.css)({
+var subtleFocusedBgStyles = (0, _react2.css)({
   backgroundColor: "var(--ds-background-input-pressed, transparent)",
   borderColor: 'transparent'
 });
-var hoverStyles = (0, _core.css)({
+var noBgStyles = (0, _react2.css)({
+  backgroundColor: 'transparent',
+  borderColor: 'transparent',
+  '&:hover': {
+    backgroundColor: 'transparent',
+    borderColor: 'transparent'
+  }
+});
+var hoverStyles = (0, _react2.css)({
   '&:hover': {
     backgroundColor: "var(--ds-background-input-hovered, ".concat(_colors.N30, ")"),
     borderColor: "var(--ds-border-input, ".concat(_colors.N30, ")")
   }
 });
-var isInvalidHoverStyles = (0, _core.css)({
+var isInvalidHoverStyles = (0, _react2.css)({
   '&:hover': {
     backgroundColor: "var(--ds-background-input-hovered, ".concat(_colors.N0, ")"),
     borderColor: "var(--ds-border-danger, ".concat(_colors.R400, ")")
   }
 });
-var isDisabledStyles = (0, _core.css)({
+var isDisabledStyles = (0, _react2.css)({
   '&:hover': {
     cursor: 'default'
   }
 });
-var baseContainerStyles = (0, _core.css)({
+var baseContainerStyles = (0, _react2.css)({
   display: 'flex',
   backgroundColor: "var(--ds-background-input, ".concat(_colors.N20, ")"),
   border: "2px solid ".concat("var(--ds-border-input, ".concat(_colors.N20, ")")),
@@ -107,17 +115,17 @@ var baseContainerStyles = (0, _core.css)({
 }); // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 
-var datePickerContainerStyles = (0, _core.css)({
+var datePickerContainerStyles = (0, _react2.css)({
   flexBasis: '50%',
   flexGrow: 1,
   flexShrink: 0
 });
-var timePickerContainerStyles = (0, _core.css)({
+var timePickerContainerStyles = (0, _react2.css)({
   flexBasis: '50%',
   flexGrow: 1
 });
 var ICON_PADDING = 2;
-var iconContainerStyles = (0, _core.css)({
+var iconContainerStyles = (0, _react2.css)({
   display: 'flex',
   paddingTop: "6px",
   paddingRight: "".concat((0, _constants.gridSize)(), "px"),
@@ -331,18 +339,18 @@ var DateTimePicker = /*#__PURE__*/function (_React$Component) {
       var isClearable = Boolean(dateValue || timeValue);
       var notFocusedOrIsDisabled = !(isFocused || isDisabled);
       var labelId = (datePickerSelectProps === null || datePickerSelectProps === void 0 ? void 0 : datePickerSelectProps.inputId) || (timePickerSelectProps === null || timePickerSelectProps === void 0 ? void 0 : timePickerSelectProps.inputId) || '';
-      return (0, _core.jsx)("div", (0, _extends2.default)({
-        css: [baseContainerStyles, isDisabled && isDisabledStyles, isFocused && isFocusedStyles, bothProps.appearance === 'subtle' && (isFocused ? subtleFocusedBgStyles : subtleBgStyles), isFocused && isFocusedBorderStyles, bothProps.isInvalid && isInvalidBorderStyles, notFocusedOrIsDisabled && (bothProps.isInvalid ? isInvalidHoverStyles : hoverStyles)]
+      return (0, _react2.jsx)("div", (0, _extends2.default)({
+        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
-      }), (0, _core.jsx)("input", {
+      }), (0, _react2.jsx)("input", {
         id: labelId,
         name: name,
         type: "hidden",
         value: value
-      }), (0, _core.jsx)("div", {
+      }), (0, _react2.jsx)("div", {
         css: datePickerContainerStyles
-      }, (0, _core.jsx)(_datePicker.default, (0, _extends2.default)({}, bothProps, {
+      }, (0, _react2.jsx)(_datePicker.default, (0, _extends2.default)({}, bothProps, {
         autoFocus: autoFocus,
         dateFormat: dateFormat,
         hideIcon: true,
@@ -352,9 +360,9 @@ var DateTimePicker = /*#__PURE__*/function (_React$Component) {
         value: dateValue,
         locale: locale,
         testId: testId && "".concat(testId, "--datepicker")
-      }, datePickerProps))), (0, _core.jsx)("div", {
+      }, datePickerProps))), (0, _react2.jsx)("div", {
         css: timePickerContainerStyles
-      }, (0, _core.jsx)(_timePicker.default, (0, _extends2.default)({}, bothProps, {
+      }, (0, _react2.jsx)(_timePicker.default, (0, _extends2.default)({}, bothProps, {
         hideIcon: true,
         onChange: this.onTimeChange,
         selectProps: mergedTimePickerSelectProps,
@@ -365,11 +373,11 @@ var DateTimePicker = /*#__PURE__*/function (_React$Component) {
         locale: locale,
         testId: testId && "".concat(testId, "--timepicker")
       }, timePickerProps))), isClearable && !isDisabled ? // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
-      (0, _core.jsx)("div", {
+      (0, _react2.jsx)("div", {
         css: iconContainerStyles,
         onClick: this.onClear,
         "data-testid": testId && "".concat(testId, "--icon--container")
-      }, (0, _core.jsx)(_selectClear.default, {
+      }, (0, _react2.jsx)(_selectClear.default, {
         size: "small",
         primaryColor: "inherit",
         label: "clear"

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

@@ -39,8 +39,6 @@ var _locale = require("@atlaskit/locale");
 
 var _select = _interopRequireWildcard(require("@atlaskit/select"));
 
-var _colors = require("@atlaskit/theme/colors");
-
 var _constants = require("@atlaskit/theme/constants");
 
 var _internal = require("../internal");
@@ -67,7 +65,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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.1.2";
+var packageVersion = "12.2.0";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -242,13 +240,6 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSubtleControlStyles", function (selectStyles) {
-      return !selectStyles.control ? {
-        border: "2px solid ".concat(_this.getSafeState().isFocused ? "var(--ds-border-focused, ".concat(_colors.B100, ")") : "transparent"),
-        backgroundColor: _this.getSafeState().isFocused ? "var(--ds-background-input-pressed, transparent)" : 'transparent',
-        padding: '1px'
-      } : {};
-    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "formatTime", function (time) {
       var _this$props2 = _this.props,
           formatDisplayLabel = _this$props2.formatDisplayLabel,
@@ -329,7 +320,8 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           name = _this$props3.name,
           selectProps = _this$props3.selectProps,
           spacing = _this$props3.spacing,
-          testId = _this$props3.testId;
+          testId = _this$props3.testId,
+          isInvalid = _this$props3.isInvalid;
       var ICON_PADDING = 2;
 
       var _this$getSafeState3 = this.getSafeState(),
@@ -337,11 +329,9 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           value = _this$getSafeState3$v === void 0 ? '' : _this$getSafeState3$v,
           isOpen = _this$getSafeState3.isOpen;
 
-      var validationState = this.props.isInvalid ? 'error' : 'default';
       var _selectProps$styles = selectProps.styles,
           selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles,
           otherSelectProps = (0, _objectWithoutProperties2.default)(selectProps, _excluded2);
-      var controlStyles = this.props.appearance === 'subtle' ? this.getSubtleControlStyles(selectStyles) : {};
       var SelectComponent = this.props.timeIsEditable ? _select.CreatableSelect : _select.default;
       var labelAndValue = value && {
         label: this.formatTime(value),
@@ -359,7 +349,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
       var renderIconContainer = Boolean(!hideIcon && value);
       var mergedStyles = (0, _select.mergeStyles)(selectStyles, {
         control: function control(base) {
-          return _objectSpread(_objectSpread({}, base), controlStyles);
+          return _objectSpread({}, base);
         },
         menu: function menu(base) {
           return _objectSpread(_objectSpread(_objectSpread({}, base), menuStyles), {}, {
@@ -388,6 +378,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           type: "hidden",
           value: value
         }), /*#__PURE__*/_react.default.createElement(SelectComponent, (0, _extends2.default)({
+          appearance: this.props.appearance,
           autoFocus: autoFocus,
           components: selectComponents,
           instanceId: id,
@@ -408,7 +399,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           value: labelAndValue,
           spacing: spacing,
           fixedLayerRef: this.containerRef,
-          validationState: validationState,
+          isInvalid: isInvalid,
           testId: testId
         }, otherSelectProps)))
       );

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/datetime-picker",
-	"version": "12.1.2",
+	"version": "12.2.0",
 	"sideEffects": false
 }

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

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
 
 /** @jsx jsx */
 import { Component } from 'react';
-import { css, jsx } from '@emotion/core'; // eslint-disable-next-line no-restricted-imports
+import { css, jsx } from '@emotion/react'; // eslint-disable-next-line no-restricted-imports
 
 import { format, isValid, lastDayOfMonth, parseISO } from 'date-fns';
 import pick from 'lodash/pick';
@@ -14,13 +14,13 @@ import Calendar from '@atlaskit/calendar';
 import CalendarIcon from '@atlaskit/icon/glyph/calendar';
 import { createLocalizationProvider } from '@atlaskit/locale';
 import Select, { mergeStyles } from '@atlaskit/select';
-import { B100, N20, N50A, N60A } from '@atlaskit/theme/colors';
+import { N20, N50A, N60A } from '@atlaskit/theme/colors';
 import { borderRadius, gridSize, layers } from '@atlaskit/theme/constants';
 import { defaultDateFormat, EmptyClearIndicator, padToTwo, placeholderDatetime } from '../internal';
 import FixedLayer from '../internal/fixed-layer';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.1.2";
+const packageVersion = "12.2.0";
 /* eslint-disable react/no-unused-prop-types */
 
 function getDateObj(date) {
@@ -351,12 +351,6 @@ class DatePicker extends Component {
       }
     });
 
-    _defineProperty(this, "getSubtleControlStyles", () => ({
-      border: `2px solid ${this.getSafeState().isFocused ? `var(--ds-border-focused, ${B100})` : `transparent`}`,
-      backgroundColor: this.getSafeState().isOpen ? "var(--ds-background-input-pressed, transparent)" : 'transparent',
-      padding: '1px'
-    }));
-
     _defineProperty(this, "parseDate", date => {
       const {
         parseInputValue,
@@ -477,7 +471,6 @@ class DatePicker extends Component {
     const {
       styles: selectStyles = {}
     } = selectProps;
-    const controlStyles = appearance === 'subtle' ? this.getSubtleControlStyles() : {};
     const disabledStyle = isDisabled ? {
       pointerEvents: 'none'
     } : {};
@@ -511,6 +504,7 @@ class DatePicker extends Component {
       value: value,
       "data-testid": testId && `${testId}--input`
     }), jsx(Select, _extends({
+      appearance: this.props.appearance,
       enableAnimation: false,
       menuIsOpen: menuIsOpen,
       closeMenuOnSelect: true,
@@ -525,7 +519,6 @@ class DatePicker extends Component {
       onChange: this.onSelectChange,
       styles: mergeStyles(selectStyles, {
         control: base => ({ ...base,
-          ...controlStyles,
           ...disabledStyle
         }),
         indicatorsContainer: base => ({ ...base,
@@ -541,7 +534,7 @@ class DatePicker extends Component {
     }, selectProps, calendarProps, {
       isClearable: true,
       spacing: spacing,
-      validationState: isInvalid ? 'error' : 'default',
+      isInvalid: isInvalid,
       testId: testId
     })));
   }

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

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 /** @jsx jsx */
 import React from 'react';
-import { css, jsx } from '@emotion/core'; // eslint-disable-next-line no-restricted-imports
+import { css, jsx } from '@emotion/react'; // eslint-disable-next-line no-restricted-imports
 
 import { format, isValid, parseISO } from 'date-fns';
 import pick from 'lodash/pick';
@@ -19,7 +19,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.1.2";
+const packageVersion = "12.2.0";
 /* eslint-disable react/no-unused-prop-types */
 
 const isInvalidBorderStyles = css({
@@ -39,6 +39,14 @@ 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})`,
@@ -281,7 +289,7 @@ class DateTimePicker extends React.Component {
     const notFocusedOrIsDisabled = !(isFocused || isDisabled);
     const labelId = (datePickerSelectProps === null || datePickerSelectProps === void 0 ? void 0 : datePickerSelectProps.inputId) || (timePickerSelectProps === null || timePickerSelectProps === void 0 ? void 0 : timePickerSelectProps.inputId) || '';
     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)]
+      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", {

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

@@ -9,14 +9,13 @@ 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 { B100 } from '@atlaskit/theme/colors';
 import { gridSize } from '@atlaskit/theme/constants';
 import { defaultTimeFormat, defaultTimes, DropdownIndicator, EmptyClearIndicator, placeholderDatetime } from '../internal';
 import FixedLayer from '../internal/fixed-layer';
 import parseTime from '../internal/parse-time';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.1.2";
+const packageVersion = "12.2.0";
 const menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -188,12 +187,6 @@ class TimePicker extends React.Component {
       }
     });
 
-    _defineProperty(this, "getSubtleControlStyles", selectStyles => !selectStyles.control ? {
-      border: `2px solid ${this.getSafeState().isFocused ? `var(--ds-border-focused, ${B100})` : `transparent`}`,
-      backgroundColor: this.getSafeState().isFocused ? "var(--ds-background-input-pressed, transparent)" : 'transparent',
-      padding: '1px'
-    } : {});
-
     _defineProperty(this, "formatTime", time => {
       const {
         formatDisplayLabel,
@@ -269,19 +262,18 @@ class TimePicker extends React.Component {
       name,
       selectProps,
       spacing,
-      testId
+      testId,
+      isInvalid
     } = this.props;
     const ICON_PADDING = 2;
     const {
       value = '',
       isOpen
     } = this.getSafeState();
-    const validationState = this.props.isInvalid ? 'error' : 'default';
     const {
       styles: selectStyles = {},
       ...otherSelectProps
     } = selectProps;
-    const controlStyles = this.props.appearance === 'subtle' ? this.getSubtleControlStyles(selectStyles) : {};
     const SelectComponent = this.props.timeIsEditable ? CreatableSelect : Select;
     const labelAndValue = value && {
       label: this.formatTime(value),
@@ -298,8 +290,7 @@ class TimePicker extends React.Component {
 
     const renderIconContainer = Boolean(!hideIcon && value);
     const mergedStyles = mergeStyles(selectStyles, {
-      control: base => ({ ...base,
-        ...controlStyles
+      control: base => ({ ...base
       }),
       menu: base => ({ ...base,
         ...menuStyles,
@@ -325,6 +316,7 @@ class TimePicker extends React.Component {
         type: "hidden",
         value: value
       }), /*#__PURE__*/React.createElement(SelectComponent, _extends({
+        appearance: this.props.appearance,
         autoFocus: autoFocus,
         components: selectComponents,
         instanceId: id,
@@ -345,7 +337,7 @@ class TimePicker extends React.Component {
         value: labelAndValue,
         spacing: spacing,
         fixedLayerRef: this.containerRef,
-        validationState: validationState,
+        isInvalid: isInvalid,
         testId: testId
       }, otherSelectProps)))
     );

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/datetime-picker",
-	"version": "12.1.2",
+	"version": "12.2.0",
 	"sideEffects": false
 }

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

@@ -20,7 +20,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 /** @jsx jsx */
 import { Component } from 'react';
-import { css, jsx } from '@emotion/core'; // eslint-disable-next-line no-restricted-imports
+import { css, jsx } from '@emotion/react'; // eslint-disable-next-line no-restricted-imports
 
 import { format, isValid, lastDayOfMonth, parseISO } from 'date-fns';
 import pick from 'lodash/pick';
@@ -29,13 +29,13 @@ import Calendar from '@atlaskit/calendar';
 import CalendarIcon from '@atlaskit/icon/glyph/calendar';
 import { createLocalizationProvider } from '@atlaskit/locale';
 import Select, { mergeStyles } from '@atlaskit/select';
-import { B100, N20, N50A, N60A } from '@atlaskit/theme/colors';
+import { N20, N50A, N60A } from '@atlaskit/theme/colors';
 import { borderRadius, gridSize, layers } from '@atlaskit/theme/constants';
 import { defaultDateFormat, EmptyClearIndicator, padToTwo, placeholderDatetime } from '../internal';
 import FixedLayer from '../internal/fixed-layer';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.1.2";
+var packageVersion = "12.2.0";
 /* eslint-disable react/no-unused-prop-types */
 
 function getDateObj(date) {
@@ -385,14 +385,6 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getSubtleControlStyles", function () {
-      return {
-        border: "2px solid ".concat(_this.getSafeState().isFocused ? "var(--ds-border-focused, ".concat(B100, ")") : "transparent"),
-        backgroundColor: _this.getSafeState().isOpen ? "var(--ds-background-input-pressed, transparent)" : 'transparent',
-        padding: '1px'
-      };
-    });
-
     _defineProperty(_assertThisInitialized(_this), "parseDate", function (date) {
       var _this$props = _this.props,
           parseInputValue = _this$props.parseInputValue,
@@ -512,7 +504,6 @@ var DatePicker = /*#__PURE__*/function (_Component) {
 
       var _selectProps$styles = selectProps.styles,
           selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles;
-      var controlStyles = appearance === 'subtle' ? this.getSubtleControlStyles() : {};
       var disabledStyle = isDisabled ? {
         pointerEvents: 'none'
       } : {};
@@ -546,6 +537,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         value: value,
         "data-testid": testId && "".concat(testId, "--input")
       }), jsx(Select, _extends({
+        appearance: this.props.appearance,
         enableAnimation: false,
         menuIsOpen: menuIsOpen,
         closeMenuOnSelect: true,
@@ -560,7 +552,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         onChange: this.onSelectChange,
         styles: mergeStyles(selectStyles, {
           control: function control(base) {
-            return _objectSpread(_objectSpread(_objectSpread({}, base), controlStyles), disabledStyle);
+            return _objectSpread(_objectSpread({}, base), disabledStyle);
           },
           indicatorsContainer: function indicatorsContainer(base) {
             return _objectSpread(_objectSpread({}, base), {}, {
@@ -577,7 +569,7 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       }, selectProps, calendarProps, {
         isClearable: true,
         spacing: spacing,
-        validationState: isInvalid ? 'error' : 'default',
+        isInvalid: isInvalid,
         testId: testId
       })));
     }

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

@@ -19,7 +19,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 /** @jsx jsx */
 import React from 'react';
-import { css, jsx } from '@emotion/core'; // eslint-disable-next-line no-restricted-imports
+import { css, jsx } from '@emotion/react'; // eslint-disable-next-line no-restricted-imports
 
 import { format, isValid, parseISO } from 'date-fns';
 import pick from 'lodash/pick';
@@ -33,7 +33,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.1.2";
+var packageVersion = "12.2.0";
 /* eslint-disable react/no-unused-prop-types */
 
 var isInvalidBorderStyles = css({
@@ -53,6 +53,14 @@ 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, ")"),
@@ -315,7 +323,7 @@ var DateTimePicker = /*#__PURE__*/function (_React$Component) {
       var notFocusedOrIsDisabled = !(isFocused || isDisabled);
       var labelId = (datePickerSelectProps === null || datePickerSelectProps === void 0 ? void 0 : datePickerSelectProps.inputId) || (timePickerSelectProps === null || timePickerSelectProps === void 0 ? void 0 : timePickerSelectProps.inputId) || '';
       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)]
+        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", {

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

@@ -26,14 +26,13 @@ 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 { B100 } from '@atlaskit/theme/colors';
 import { gridSize } from '@atlaskit/theme/constants';
 import { defaultTimeFormat, defaultTimes, DropdownIndicator, EmptyClearIndicator, placeholderDatetime } from '../internal';
 import FixedLayer from '../internal/fixed-layer';
 import parseTime from '../internal/parse-time';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.1.2";
+var packageVersion = "12.2.0";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',
@@ -221,14 +220,6 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getSubtleControlStyles", function (selectStyles) {
-      return !selectStyles.control ? {
-        border: "2px solid ".concat(_this.getSafeState().isFocused ? "var(--ds-border-focused, ".concat(B100, ")") : "transparent"),
-        backgroundColor: _this.getSafeState().isFocused ? "var(--ds-background-input-pressed, transparent)" : 'transparent',
-        padding: '1px'
-      } : {};
-    });
-
     _defineProperty(_assertThisInitialized(_this), "formatTime", function (time) {
       var _this$props2 = _this.props,
           formatDisplayLabel = _this$props2.formatDisplayLabel,
@@ -311,7 +302,8 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           name = _this$props3.name,
           selectProps = _this$props3.selectProps,
           spacing = _this$props3.spacing,
-          testId = _this$props3.testId;
+          testId = _this$props3.testId,
+          isInvalid = _this$props3.isInvalid;
       var ICON_PADDING = 2;
 
       var _this$getSafeState3 = this.getSafeState(),
@@ -319,13 +311,10 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           value = _this$getSafeState3$v === void 0 ? '' : _this$getSafeState3$v,
           isOpen = _this$getSafeState3.isOpen;
 
-      var validationState = this.props.isInvalid ? 'error' : 'default';
-
       var _selectProps$styles = selectProps.styles,
           selectStyles = _selectProps$styles === void 0 ? {} : _selectProps$styles,
           otherSelectProps = _objectWithoutProperties(selectProps, _excluded2);
 
-      var controlStyles = this.props.appearance === 'subtle' ? this.getSubtleControlStyles(selectStyles) : {};
       var SelectComponent = this.props.timeIsEditable ? CreatableSelect : Select;
       var labelAndValue = value && {
         label: this.formatTime(value),
@@ -343,7 +332,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
       var renderIconContainer = Boolean(!hideIcon && value);
       var mergedStyles = mergeStyles(selectStyles, {
         control: function control(base) {
-          return _objectSpread(_objectSpread({}, base), controlStyles);
+          return _objectSpread({}, base);
         },
         menu: function menu(base) {
           return _objectSpread(_objectSpread(_objectSpread({}, base), menuStyles), {}, {
@@ -372,6 +361,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           type: "hidden",
           value: value
         }), /*#__PURE__*/React.createElement(SelectComponent, _extends({
+          appearance: this.props.appearance,
           autoFocus: autoFocus,
           components: selectComponents,
           instanceId: id,
@@ -392,7 +382,7 @@ var TimePicker = /*#__PURE__*/function (_React$Component) {
           value: labelAndValue,
           spacing: spacing,
           fixedLayerRef: this.containerRef,
-          validationState: validationState,
+          isInvalid: isInvalid,
           testId: testId
         }, otherSelectProps)))
       );

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/datetime-picker",
-	"version": "12.1.2",
+	"version": "12.2.0",
 	"sideEffects": false
 }

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

@@ -1,5 +1,6 @@
 /** @jsx jsx */
 import { Component } from 'react';
+import { jsx } from '@emotion/react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { CalendarRef } from '@atlaskit/calendar';
 import { LocalizationProvider } from '@atlaskit/locale';
@@ -244,11 +245,6 @@ declare class DatePicker extends Component<DatePickerProps, State> {
     refCalendar: (ref: CalendarRef | null) => void;
     handleInputChange: (inputValue: string, actionMeta: {}) => void;
     getContainerRef: (ref: HTMLElement | null) => void;
-    getSubtleControlStyles: () => {
-        border: string;
-        backgroundColor: string;
-        padding: string;
-    };
     /**
      * There are two props that can change how the date is parsed.
      * The priority of props used is:
@@ -265,7 +261,7 @@ declare class DatePicker extends Component<DatePickerProps, State> {
      */
     formatDate: (value: string) => string;
     getPlaceholder: () => string;
-    render(): JSX.Element;
+    render(): jsx.JSX.Element;
 }
 export { DatePicker as DatePickerWithoutAnalytics };
 declare const _default: import("react").ForwardRefExoticComponent<Pick<Pick<Omit<DatePickerProps, keyof WithAnalyticsEventsProps>, "testId" | "maxDate" | "minDate" | "isOpen" | "nextMonthLabel" | "parseInputValue" | "formatDisplayLabel" | "previousMonthLabel" | "value" | "dateFormat" | "placeholder" | "weekStartDay"> & Partial<Pick<Omit<DatePickerProps, keyof WithAnalyticsEventsProps>, "icon" | "disabled" | "appearance" | "selectProps" | "innerProps" | "autoFocus" | "defaultIsOpen" | "defaultValue" | "disabledDateFilter" | "hideIcon" | "id" | "isDisabled" | "isInvalid" | "name" | "onBlur" | "onChange" | "onFocus" | "spacing" | "locale">> & Partial<Pick<{

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

@@ -1,5 +1,6 @@
 /** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { SelectProps } from '@atlaskit/select';
 import { Appearance, Spacing } from '../types';
@@ -190,7 +191,7 @@ declare class DateTimePicker extends React.Component<DateTimePickerProps, State>
         timeValue: string;
         zoneValue: string;
     }): void;
-    render(): JSX.Element;
+    render(): jsx.JSX.Element;
 }
 export { DateTimePicker as DateTimePickerWithoutAnalytics };
 declare const _default: React.ForwardRefExoticComponent<Pick<Pick<Omit<DateTimePickerProps, keyof WithAnalyticsEventsProps>, "testId" | "value" | "dateFormat" | "timeFormat" | "parseValue"> & Partial<Pick<Omit<DateTimePickerProps, keyof WithAnalyticsEventsProps>, "appearance" | "innerProps" | "autoFocus" | "defaultValue" | "id" | "isDisabled" | "isInvalid" | "name" | "onBlur" | "onChange" | "onFocus" | "spacing" | "locale" | "times" | "timeIsEditable" | "datePickerProps" | "timePickerProps" | "datePickerSelectProps" | "timePickerSelectProps">> & Partial<Pick<{

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
 import { LocalizationProvider } from '@atlaskit/locale';
-import { ActionMeta, OptionType, SelectProps, StylesConfig } from '@atlaskit/select';
+import { ActionMeta, OptionType, SelectProps } from '@atlaskit/select';
 import { Appearance, Spacing } from '../types';
 interface Option {
     label: string;
@@ -192,15 +192,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;
-    getSubtleControlStyles: (selectStyles: StylesConfig) => {
-        border: string;
-        backgroundColor: string;
-        padding: string;
-    } | {
-        border?: undefined;
-        backgroundColor?: undefined;
-        padding?: undefined;
-    };
     /**
      * There are multiple props that can change how the time is formatted.
      * The priority of props used is:

package/dist/types/types.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/datetime-picker",
-  "version": "12.1.2",
+  "version": "12.2.0",
   "description": "A date time picker allows the user to select an associated date and time.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -25,16 +25,16 @@
   },
   "dependencies": {
     "@atlaskit/analytics-next": "^8.2.0",
-    "@atlaskit/calendar": "^12.3.0",
+    "@atlaskit/calendar": "^12.4.0",
     "@atlaskit/ds-lib": "^2.1.0",
     "@atlaskit/icon": "^21.10.0",
     "@atlaskit/locale": "^2.1.0",
     "@atlaskit/popper": "^5.2.0",
-    "@atlaskit/select": "^15.5.0",
-    "@atlaskit/theme": "^12.1.0",
+    "@atlaskit/select": "^15.7.0",
+    "@atlaskit/theme": "^12.2.0",
     "@atlaskit/tokens": "^0.10.0",
     "@babel/runtime": "^7.0.0",
-    "@emotion/core": "^10.0.9",
+    "@emotion/react": "^11.7.1",
     "date-fns": "^2.17.0",
     "lodash": "^4.17.21",
     "react-scrolllock": "^5.0.1"
@@ -47,17 +47,17 @@
     "@atlaskit/docs": "*",
     "@atlaskit/field-base": "^15.0.5",
     "@atlaskit/form": "^8.5.0",
-    "@atlaskit/modal-dialog": "^12.2.0",
+    "@atlaskit/modal-dialog": "^12.3.0",
     "@atlaskit/popup": "^1.4.0",
     "@atlaskit/range": "^6.0.0",
-    "@atlaskit/section-message": "^6.0.0",
+    "@atlaskit/section-message": "^6.2.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/textfield": "^5.0.0",
-    "@atlaskit/toggle": "^12.4.0",
+    "@atlaskit/textfield": "^5.2.0",
+    "@atlaskit/toggle": "^12.5.0",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
-    "@emotion/core": "^10.0.9",
+    "@emotion/react": "^11.7.1",
     "@testing-library/react": "^8.0.1",
     "enzyme": "^3.10.0",
     "enzyme-to-json": "^3.3.0",
@@ -65,7 +65,7 @@
     "react-dom": "^16.8.0",
     "react-lorem-component": "^0.13.0",
     "react-test-renderer": "^16.8.0",
-    "typescript": "4.2.4"
+    "typescript": "4.3.5"
   },
   "techstack": {
     "@atlassian/frontend": {