@atlaskit/datetime-picker 13.11.3 → 14.0.1

package/codemods/utils/helpers.tsx

@@ -0,0 +1,306 @@
+import type {
+	ASTPath,
+	CallExpression,
+	default as core,
+	Identifier,
+	ImportDeclaration,
+	ImportSpecifier,
+	JSCodeshift,
+	JSXAttribute,
+	JSXElement,
+	ObjectProperty,
+	StringLiteral,
+} from 'jscodeshift';
+import { type Collection } from 'jscodeshift/src/Collection';
+
+import { addCommentToStartOfFile, getNamedSpecifier } from '@atlaskit/codemod-utils';
+
+export function hasImportDeclaration(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	importPath: string,
+) {
+	return getImportDeclarationCollection(j, collection, importPath).length > 0;
+}
+
+export function getImportDeclarationCollection(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	importPath: string,
+) {
+	return collection
+		.find(j.ImportDeclaration)
+		.filter((importDeclarationPath) => importDeclarationPath.node.source.value === importPath);
+}
+
+export function hasDynamicImport(j: JSCodeshift, collection: Collection<any>, importPath: string) {
+	return getDynamicImportCollection(j, collection, importPath).length > 0;
+}
+
+export function getDynamicImportCollection(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	importPath: string,
+) {
+	return collection.find(j.CallExpression).filter((callExpressionPath) => {
+		const { callee, arguments: callExpressionArguments } = callExpressionPath.node;
+
+		return !!(
+			isCallExpressionCalleeImportType(callee) &&
+			isCallExpressionArgumentStringLiteralType(callExpressionArguments) &&
+			isCallExpressionArgumentValueMatches(callExpressionArguments[0], j, importPath)
+		);
+	});
+}
+function isCallExpressionCalleeImportType(callee: CallExpression['callee']) {
+	return callee && callee.type === 'Import';
+}
+function isCallExpressionArgumentStringLiteralType(
+	callExpressionArguments: CallExpression['arguments'],
+) {
+	return (
+		callExpressionArguments &&
+		callExpressionArguments.length &&
+		callExpressionArguments[0].type === 'StringLiteral'
+	);
+}
+function isCallExpressionArgumentValueMatches(
+	callExpressionArgument: CallExpression['arguments'][0],
+	j: JSCodeshift,
+	value: string,
+) {
+	return j(callExpressionArgument).some((path) => path.node.value === value);
+}
+
+export function getImportSpecifierCollection(
+	j: JSCodeshift,
+	importDeclarationCollection: Collection<ImportDeclaration>,
+	importName: string,
+) {
+	return importDeclarationCollection
+		.find(j.ImportSpecifier)
+		.filter((importSpecifierPath) => importSpecifierPath.node.imported.name === importName);
+}
+
+export function getImportSpecifierName(importSpecifierCollection: Collection<ImportSpecifier>) {
+	if (importSpecifierCollection.length === 0) {
+		return null;
+	}
+
+	return importSpecifierCollection.nodes()[0]!.local!.name;
+}
+
+export function isVariableDeclaratorIdentifierPresent(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	variableName: string,
+) {
+	return collection
+		.find(j.VariableDeclaration)
+		.find(j.VariableDeclarator)
+		.some((variableDeclaratorPath) => {
+			const { id } = variableDeclaratorPath.node;
+
+			return !!(id && id.type === 'Identifier' && (id as Identifier).name === variableName);
+		});
+}
+
+export function isFunctionDeclarationIdentifierPresent(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	variableName: string,
+) {
+	return collection.find(j.FunctionDeclaration).some((functionDeclarationPath) => {
+		const { id } = functionDeclarationPath.node;
+
+		return !!(id && id.type === 'Identifier' && (id as Identifier).name === variableName);
+	});
+}
+
+export function isClassDeclarationIdentifierPresent(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	variableName: string,
+) {
+	return collection.find(j.ClassDeclaration).some((classDeclarationPath) => {
+		const { id } = classDeclarationPath.node;
+
+		return !!(id && id.type === 'Identifier' && (id as Identifier).name === variableName);
+	});
+}
+
+export function isImportDeclarationIdentifierPresent(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	variableName: string,
+) {
+	return collection
+		.find(j.ImportDeclaration)
+		.find(j.Identifier)
+		.some((identifierPath) => identifierPath.node.name === variableName);
+}
+
+export function getJSXAttributesByName(
+	j: JSCodeshift,
+	jsxElementPath: ASTPath<JSXElement>,
+	attributeName: string,
+): Collection<JSXAttribute> {
+	return j(jsxElementPath)
+		.find(j.JSXOpeningElement)
+		.find(j.JSXAttribute)
+		.filter((jsxAttributePath) =>
+			j(jsxAttributePath)
+				.find(j.JSXIdentifier)
+				.some((jsxIdentifierPath) => jsxIdentifierPath.node.name === attributeName),
+		);
+}
+
+export function getJSXSpreadIdentifierAttributesByName(
+	j: JSCodeshift,
+	collection: Collection<any>,
+	jsxElementPath: ASTPath<JSXElement>,
+	attributeName: string,
+): Collection<ObjectProperty> | null {
+	const identifierCollection = j(jsxElementPath)
+		.find(j.JSXOpeningElement)
+		.find(j.JSXSpreadAttribute)
+		.filter((jsxSpreadAttributePath) => jsxSpreadAttributePath.node.argument.type === 'Identifier')
+		.find(j.Identifier);
+
+	if (identifierCollection.length === 0) {
+		return null;
+	}
+
+	return collection
+		.find(j.VariableDeclarator)
+		.filter((variableDeclaratorPath) => {
+			const { id } = variableDeclaratorPath.node;
+
+			return (
+				id.type === 'Identifier' &&
+				identifierCollection.some((identifierPath) => identifierPath.node.name === id.name)
+			);
+		})
+		.find(j.ObjectExpression)
+		.find(j.ObjectProperty)
+		.filter((objectPropertyPath) =>
+			j(objectPropertyPath)
+				.find(j.Identifier)
+				.some((identifierPath) => identifierPath.node.name === attributeName),
+		);
+}
+
+export function getJSXSpreadObjectExpressionAttributesByName(
+	j: JSCodeshift,
+	jsxElementPath: ASTPath<JSXElement>,
+	attributeName: string,
+) {
+	return j(jsxElementPath)
+		.find(j.JSXOpeningElement)
+		.find(j.JSXSpreadAttribute)
+		.find(j.ObjectExpression)
+		.find(j.ObjectProperty)
+		.filter((objectPropertyPath) =>
+			j(objectPropertyPath)
+				.find(j.Identifier)
+				.some((identifierPath) => identifierPath.node.name === attributeName),
+		);
+}
+
+export const createRemoveFuncFor =
+	(component: string, importName: string, prop: string, comment?: string) =>
+	(j: core.JSCodeshift, source: Collection<Node>) => {
+		const specifier = getNamedSpecifier(j, source, component, importName);
+
+		if (!specifier) {
+			return;
+		}
+
+		source.findJSXElements(specifier).forEach((element) => {
+			getJSXAttributesByName(j, element, prop).forEach((attribute: any) => {
+				j(attribute).remove();
+				if (comment) {
+					addCommentToStartOfFile({ j, base: source, message: comment });
+				}
+			});
+		});
+	};
+
+export const getJSXAttributeByName = (
+	j: JSCodeshift,
+	jsxElementPath: ASTPath<JSXElement>,
+	attributeName: string,
+): JSXAttribute | undefined => {
+	const attributes: JSXAttribute[] = j(jsxElementPath).find(j.JSXAttribute).nodes();
+
+	return attributes?.find((attr) => attr.name && attr.name.name === attributeName);
+};
+
+export const addJSXAttributeToJSXElement = (
+	j: JSCodeshift,
+	jsxElementPath: ASTPath<JSXElement>,
+	jsxAttribute: JSXAttribute,
+) => {
+	j(jsxElementPath)
+		.find(j.JSXOpeningElement)
+		.forEach((openingElement) => {
+			openingElement.node.attributes?.push(jsxAttribute);
+		});
+};
+
+export const removeJSXAttributeByName = (
+	j: JSCodeshift,
+	jsxElementPath: ASTPath<JSXElement>,
+	attrName: string,
+) => {
+	const attributes = getJSXAttributes(jsxElementPath);
+	const attr = getJSXAttributeByName(j, jsxElementPath, attrName);
+	if (attr) {
+		attributes?.splice(attributes.indexOf(attr), 1);
+	}
+};
+
+export const getJSXAttributes = (jsxElementPath: ASTPath<JSXElement>) =>
+	jsxElementPath.node.openingElement.attributes as JSXAttribute[];
+
+export const removeJSXAttributeObjectPropertyByName = (
+	j: JSCodeshift,
+	jsxElementPath: ASTPath<JSXElement>,
+	attrName: string,
+	propertyToRemove: string,
+) => {
+	const attr = getJSXAttributeByName(j, jsxElementPath, attrName);
+
+	if (!attr) {
+		return;
+	}
+
+	const attrCollection = getJSXAttributesByName(j, jsxElementPath, attrName);
+
+	const removeMatchingNodes = (p: ASTPath<Identifier | StringLiteral>) => {
+		const name = p.node.type === 'Identifier' ? p.node?.name : p.node?.value;
+		// Need to account for quoted properties
+		const nameMatches = propertyToRemove.match(new RegExp(`['"]?${name}['"]?`));
+		// This will otherwise try to remove values of properties since they are literals
+		const isKey = p.parent.value?.type === 'ObjectProperty';
+		// Sorry about all the parents. This is the easiest way to get the name
+		// of the attribute name. And I always know the depth of the object
+		// property here.
+		const parentNameMatches = attrName === p.parent.parent.parent.parent.node?.name?.name;
+		if (isKey && nameMatches && parentNameMatches) {
+			j(p.parent).remove();
+		}
+	};
+
+	// Remove all the now migrated object properties
+	const objectProperties = attrCollection.find(j.ObjectProperty);
+	objectProperties.find(j.Identifier).forEach(removeMatchingNodes);
+	objectProperties.find(j.StringLiteral).forEach(removeMatchingNodes);
+
+	// @ts-ignore -- Property 'expression' does not exist on type 'LiteralKind | JSXElement | JSXExpressionContainer | JSXFragment'. Property 'expression' does not exist on type 'Literal'.
+	const attrProperties = attr.value?.expression.properties;
+
+	if (attrProperties && attrProperties?.length === 0) {
+		removeJSXAttributeByName(j, jsxElementPath, attrName);
+	}
+};

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

@@ -37,7 +37,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.3";
+var packageVersion = "14.0.1";
 var datePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.timePickerDefaultAriaLabel = exports.default = exports.datePickerDefaultAriaLabel = exports.DateTimePickerWithoutAnalytics = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -24,6 +25,8 @@ var _dateTimePickerContainer = require("../internal/date-time-picker-container")
 var _parseTokens = require("../internal/parse-tokens");
 var _datePicker = _interopRequireDefault(require("./date-picker"));
 var _timePicker = _interopRequireDefault(require("./time-picker"));
+var _excluded = ["selectProps"],
+  _excluded2 = ["selectProps"];
 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() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 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; }
@@ -32,7 +35,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.3";
+var packageVersion = "14.0.1";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 var datePickerContainerStyles = (0, _react2.css)({
@@ -96,8 +99,6 @@ var dateTimePickerDefaultProps = {
   isInvalid: false,
   datePickerProps: {},
   timePickerProps: {},
-  datePickerSelectProps: {},
-  timePickerSelectProps: {},
   times: _internal.defaultTimes,
   spacing: 'default',
   locale: 'en-US'
@@ -233,9 +234,7 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         ariaDescribedBy = _this$props['aria-describedby'],
         appearance = _this$props.appearance,
         autoFocus = _this$props.autoFocus,
-        dateFormat = _this$props.dateFormat,
-        datePickerProps = _this$props.datePickerProps,
-        datePickerSelectProps = _this$props.datePickerSelectProps,
+        datePickerPropsWithSelectProps = _this$props.datePickerProps,
         id = _this$props.id,
         innerProps = _this$props.innerProps,
         isDisabled = _this$props.isDisabled,
@@ -244,29 +243,25 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         name = _this$props.name,
         spacing = _this$props.spacing,
         testId = _this$props.testId,
-        timeFormat = _this$props.timeFormat,
-        timeIsEditable = _this$props.timeIsEditable,
-        timePickerProps = _this$props.timePickerProps,
-        timePickerSelectProps = _this$props.timePickerSelectProps,
-        times = _this$props.times;
+        timePickerPropsWithSelectProps = _this$props.timePickerProps;
       var value = this.getValue();
       var isFocused = this.state.isFocused;
       var parsedValues = this.getParsedValues();
       var dateValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.dateValue;
       var timeValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.timeValue;
-      var _datePickerSelectProp = datePickerSelectProps.styles,
-        datePickerStyles = _datePickerSelectProp === void 0 ? {} : _datePickerSelectProp;
-      var _timePickerSelectProp = timePickerSelectProps.styles,
-        timePickerStyles = _timePickerSelectProp === void 0 ? {} : _timePickerSelectProp;
+      var datePickerSelectProps = datePickerPropsWithSelectProps.selectProps,
+        datePickerProps = (0, _objectWithoutProperties2.default)(datePickerPropsWithSelectProps, _excluded);
+      var datePickerAriaDescribedBy = datePickerProps['aria-describedby'] || ariaDescribedBy;
+      var datePickerLabel = datePickerProps.label || datePickerDefaultAriaLabel;
       var mergedDatePickerSelectProps = _objectSpread(_objectSpread({}, datePickerSelectProps), {}, {
-        'aria-describedby': datePickerProps['aria-describedby'] || ariaDescribedBy,
-        'aria-label': datePickerProps['label'] || datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
-        styles: (0, _select.mergeStyles)(styles, datePickerStyles)
+        styles: (0, _select.mergeStyles)(styles, datePickerSelectProps === null || datePickerSelectProps === void 0 ? void 0 : datePickerSelectProps.styles)
       });
+      var timePickerSelectProps = timePickerPropsWithSelectProps.selectProps,
+        timePickerProps = (0, _objectWithoutProperties2.default)(timePickerPropsWithSelectProps, _excluded2);
+      var timePickerAriaDescribedBy = timePickerProps['aria-describedby'] || ariaDescribedBy;
+      var timePickerLabel = timePickerProps.label || timePickerDefaultAriaLabel;
       var mergedTimePickerSelectProps = _objectSpread(_objectSpread({}, timePickerSelectProps), {}, {
-        'aria-describedby': timePickerProps['aria-describedby'] || ariaDescribedBy,
-        'aria-label': timePickerProps['label'] || timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
-        styles: (0, _select.mergeStyles)(styles, timePickerStyles)
+        styles: (0, _select.mergeStyles)(styles, timePickerSelectProps === null || timePickerSelectProps === void 0 ? void 0 : timePickerSelectProps.styles)
       });
 
       // Render DateTimePicker's IconContainer when a value has been filled
@@ -288,8 +283,9 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         css: datePickerContainerStyles
       }, (0, _react2.jsx)(_datePicker.default, {
         appearance: appearance,
+        "aria-describedby": datePickerAriaDescribedBy,
         autoFocus: datePickerProps.autoFocus || autoFocus,
-        dateFormat: datePickerProps.dateFormat || dateFormat,
+        dateFormat: datePickerProps.dateFormat,
         defaultIsOpen: datePickerProps.defaultIsOpen,
         defaultValue: datePickerProps.defaultValue,
         disabled: datePickerProps.disabled,
@@ -302,6 +298,7 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         isDisabled: datePickerProps.isDisabled || isDisabled,
         isInvalid: datePickerProps.isInvalid || isInvalid,
         isOpen: datePickerProps.isOpen,
+        label: datePickerLabel,
         locale: datePickerProps.locale || locale,
         maxDate: datePickerProps.maxDate,
         minDate: datePickerProps.minDate,
@@ -322,6 +319,7 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         css: timePickerContainerStyles
       }, (0, _react2.jsx)(_timePicker.default, {
         appearance: timePickerProps.appearance || appearance,
+        "aria-describedby": timePickerAriaDescribedBy,
         autoFocus: timePickerProps.autoFocus,
         defaultIsOpen: timePickerProps.defaultIsOpen,
         defaultValue: timePickerProps.defaultValue,
@@ -332,6 +330,7 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         isDisabled: timePickerProps.isDisabled || isDisabled,
         isInvalid: timePickerProps.isInvalid || isInvalid,
         isOpen: timePickerProps.isOpen,
+        label: timePickerLabel,
         locale: timePickerProps.locale || locale,
         name: timePickerProps.name,
         onBlur: timePickerProps.onBlur || this.onBlur,
@@ -342,9 +341,9 @@ var DateTimePickerComponent = exports.DateTimePickerWithoutAnalytics = /*#__PURE
         selectProps: mergedTimePickerSelectProps,
         spacing: timePickerProps.spacing || spacing,
         testId: timePickerProps.testId || testId && "".concat(testId, "--timepicker"),
-        timeFormat: timePickerProps.timeFormat || timeFormat,
-        timeIsEditable: timePickerProps.timeIsEditable || timeIsEditable,
-        times: timePickerProps.times || times,
+        timeFormat: timePickerProps.timeFormat,
+        timeIsEditable: timePickerProps.timeIsEditable,
+        times: timePickerProps.times,
         value: timeValue
       })), isClearable && !isDisabled ? (0, _react2.jsx)("button", {
         css: iconContainerStyles,

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

@@ -35,7 +35,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // eslint-disable-next-line no-restricted-imports
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.3";
+var packageVersion = "14.0.1";
 var menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',

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

@@ -19,7 +19,7 @@ import { getSafeCalendarValue, getShortISOString } from '../internal/parse-date'
 import { convertTokens } from '../internal/parse-tokens';
 import { makeSingleValue } from '../internal/single-value';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "13.11.3";
+const packageVersion = "14.0.1";
 const datePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,

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

@@ -18,7 +18,7 @@ import { convertTokens } from '../internal/parse-tokens';
 import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "13.11.3";
+const packageVersion = "14.0.1";
 // Make DatePicker 50% the width of DateTimePicker
 // If rendering an icon container, shrink the TimePicker
 const datePickerContainerStyles = css({
@@ -81,8 +81,6 @@ const dateTimePickerDefaultProps = {
   isInvalid: false,
   datePickerProps: {},
   timePickerProps: {},
-  datePickerSelectProps: {},
-  timePickerSelectProps: {},
   times: defaultTimes,
   spacing: 'default',
   locale: 'en-US'
@@ -204,9 +202,7 @@ class DateTimePickerComponent extends React.Component {
       'aria-describedby': ariaDescribedBy,
       appearance,
       autoFocus,
-      dateFormat,
-      datePickerProps,
-      datePickerSelectProps,
+      datePickerProps: datePickerPropsWithSelectProps,
       id,
       innerProps,
       isDisabled,
@@ -215,11 +211,7 @@ class DateTimePickerComponent extends React.Component {
       name,
       spacing,
       testId,
-      timeFormat,
-      timeIsEditable,
-      timePickerProps,
-      timePickerSelectProps,
-      times
+      timePickerProps: timePickerPropsWithSelectProps
     } = this.props;
     const value = this.getValue();
     const {
@@ -229,22 +221,24 @@ class DateTimePickerComponent extends React.Component {
     const dateValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.dateValue;
     const timeValue = parsedValues === null || parsedValues === void 0 ? void 0 : parsedValues.timeValue;
     const {
-      styles: datePickerStyles = {}
-    } = datePickerSelectProps;
-    const {
-      styles: timePickerStyles = {}
-    } = timePickerSelectProps;
+      selectProps: datePickerSelectProps,
+      ...datePickerProps
+    } = datePickerPropsWithSelectProps;
+    const datePickerAriaDescribedBy = datePickerProps['aria-describedby'] || ariaDescribedBy;
+    const datePickerLabel = datePickerProps.label || datePickerDefaultAriaLabel;
     const mergedDatePickerSelectProps = {
       ...datePickerSelectProps,
-      'aria-describedby': datePickerProps['aria-describedby'] || ariaDescribedBy,
-      'aria-label': datePickerProps['label'] || datePickerSelectProps['aria-label'] || datePickerDefaultAriaLabel,
-      styles: mergeStyles(styles, datePickerStyles)
+      styles: mergeStyles(styles, datePickerSelectProps === null || datePickerSelectProps === void 0 ? void 0 : datePickerSelectProps.styles)
     };
+    const {
+      selectProps: timePickerSelectProps,
+      ...timePickerProps
+    } = timePickerPropsWithSelectProps;
+    const timePickerAriaDescribedBy = timePickerProps['aria-describedby'] || ariaDescribedBy;
+    const timePickerLabel = timePickerProps.label || timePickerDefaultAriaLabel;
     const mergedTimePickerSelectProps = {
       ...timePickerSelectProps,
-      'aria-describedby': timePickerProps['aria-describedby'] || ariaDescribedBy,
-      'aria-label': timePickerProps['label'] || timePickerSelectProps['aria-label'] || timePickerDefaultAriaLabel,
-      styles: mergeStyles(styles, timePickerStyles)
+      styles: mergeStyles(styles, timePickerSelectProps === null || timePickerSelectProps === void 0 ? void 0 : timePickerSelectProps.styles)
     };
 
     // Render DateTimePicker's IconContainer when a value has been filled
@@ -266,8 +260,9 @@ class DateTimePickerComponent extends React.Component {
       css: datePickerContainerStyles
     }, jsx(DatePicker, {
       appearance: appearance,
+      "aria-describedby": datePickerAriaDescribedBy,
       autoFocus: datePickerProps.autoFocus || autoFocus,
-      dateFormat: datePickerProps.dateFormat || dateFormat,
+      dateFormat: datePickerProps.dateFormat,
       defaultIsOpen: datePickerProps.defaultIsOpen,
       defaultValue: datePickerProps.defaultValue,
       disabled: datePickerProps.disabled,
@@ -280,6 +275,7 @@ class DateTimePickerComponent extends React.Component {
       isDisabled: datePickerProps.isDisabled || isDisabled,
       isInvalid: datePickerProps.isInvalid || isInvalid,
       isOpen: datePickerProps.isOpen,
+      label: datePickerLabel,
       locale: datePickerProps.locale || locale,
       maxDate: datePickerProps.maxDate,
       minDate: datePickerProps.minDate,
@@ -300,6 +296,7 @@ class DateTimePickerComponent extends React.Component {
       css: timePickerContainerStyles
     }, jsx(TimePicker, {
       appearance: timePickerProps.appearance || appearance,
+      "aria-describedby": timePickerAriaDescribedBy,
       autoFocus: timePickerProps.autoFocus,
       defaultIsOpen: timePickerProps.defaultIsOpen,
       defaultValue: timePickerProps.defaultValue,
@@ -310,6 +307,7 @@ class DateTimePickerComponent extends React.Component {
       isDisabled: timePickerProps.isDisabled || isDisabled,
       isInvalid: timePickerProps.isInvalid || isInvalid,
       isOpen: timePickerProps.isOpen,
+      label: timePickerLabel,
       locale: timePickerProps.locale || locale,
       name: timePickerProps.name,
       onBlur: timePickerProps.onBlur || this.onBlur,
@@ -320,9 +318,9 @@ class DateTimePickerComponent extends React.Component {
       selectProps: mergedTimePickerSelectProps,
       spacing: timePickerProps.spacing || spacing,
       testId: timePickerProps.testId || testId && `${testId}--timepicker`,
-      timeFormat: timePickerProps.timeFormat || timeFormat,
-      timeIsEditable: timePickerProps.timeIsEditable || timeIsEditable,
-      times: timePickerProps.times || times,
+      timeFormat: timePickerProps.timeFormat,
+      timeIsEditable: timePickerProps.timeIsEditable,
+      times: timePickerProps.times,
       value: timeValue
     })), isClearable && !isDisabled ? jsx("button", {
       css: iconContainerStyles,

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

@@ -15,7 +15,7 @@ import parseTime from '../internal/parse-time';
 import { convertTokens } from '../internal/parse-tokens';
 import { makeSingleValue } from '../internal/single-value';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "13.11.3";
+const packageVersion = "14.0.1";
 const menuStyles = {
   /* Need to remove default absolute positioning as that causes issues with position fixed */
   position: 'static',

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

@@ -30,7 +30,7 @@ import { getSafeCalendarValue, getShortISOString } from '../internal/parse-date'
 import { convertTokens } from '../internal/parse-tokens';
 import { makeSingleValue } from '../internal/single-value';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "13.11.3";
+var packageVersion = "14.0.1";
 var datePickerDefaultProps = {
   appearance: 'default',
   autoFocus: false,