@atlaskit/datetime-picker 12.7.6 → 12.7.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/datetime-picker
 
+## 12.7.8
+
+### Patch Changes
+
+- [`e8bb91da805`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e8bb91da805) - [ux] Ensure menu doesn't close when focus moves within it. Makes future keyboard accessibility possible.
+
+## 12.7.7
+
+### Patch Changes
+
+- [`ba50169844e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ba50169844e) - Remove lookahead and lookbehind in format util to support browsers without that functionality.
+
 ## 12.7.6
 
 ### Patch Changes

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

@@ -37,7 +37,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /* eslint-disable @repo/internal/react/use-noop */ /** @jsx jsx */ // eslint-disable-next-line no-restricted-imports
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.6";
+var packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 
@@ -168,12 +168,16 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onSelectBlur", function (event) {
+      var _this$containerRef;
+      var newlyFocusedElement = event.relatedTarget;
       if (_this.getSafeState().clearingFromIcon) {
         // Don't close menu if blurring after the user has clicked clear
         _this.setState({
           clearingFromIcon: false
         });
-      } else {
+      } else if (!((_this$containerRef = _this.containerRef) !== null && _this$containerRef !== void 0 && _this$containerRef.contains(newlyFocusedElement))) {
+        // Don't close menu if focus is staying within the date picker's
+        // container. Makes keyboard accessibility of calendar possible
         _this.setState({
           isOpen: false,
           isFocused: false
@@ -471,56 +475,60 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         nextMonthLabel: nextMonthLabel,
         previousMonthLabel: previousMonthLabel
       };
-      return (0, _react2.jsx)("div", (0, _extends2.default)({}, innerProps, {
-        role: "presentation",
-        onClick: this.onInputClick,
-        onInput: this.onTextInput,
-        onKeyDown: this.onInputKeyDown,
-        ref: this.getContainerRef,
-        "data-testid": testId && "".concat(testId, "--container")
-      }), (0, _react2.jsx)("input", {
-        name: name,
-        type: "hidden",
-        value: value,
-        "data-testid": testId && "".concat(testId, "--input")
-      }), (0, _react2.jsx)(_select.default, (0, _extends2.default)({
-        appearance: this.props.appearance,
-        enableAnimation: false,
-        menuIsOpen: menuIsOpen,
-        closeMenuOnSelect: true,
-        autoFocus: autoFocus,
-        instanceId: id,
-        isDisabled: isDisabled,
-        onBlur: this.onSelectBlur,
-        onFocus: this.onSelectFocus,
-        inputValue: actualSelectInputValue,
-        onInputChange: this.handleSelectInputChange,
-        components: selectComponents,
-        onChange: this.onSelectChange,
-        styles: (0, _select.mergeStyles)(selectStyles, {
-          control: function control(base) {
-            return _objectSpread(_objectSpread({}, base), disabledStyle);
-          },
-          indicatorsContainer: function indicatorsContainer(base) {
-            return _objectSpread(_objectSpread({}, base), {}, {
-              paddingLeft: "var(--ds-space-025, 2px)",
-              // ICON_PADDING = 2
-              paddingRight: "var(--ds-space-075, 6px)" // 8 - ICON_PADDING = 6
-            });
-          }
-        }),
+      return (
+        // TODO: Remove role="presentation", since div's have no semantics anyway
+        // (DSP-11587)
+        (0, _react2.jsx)("div", (0, _extends2.default)({}, innerProps, {
+          role: "presentation",
+          onClick: this.onInputClick,
+          onInput: this.onTextInput,
+          onKeyDown: this.onInputKeyDown,
+          ref: this.getContainerRef,
+          "data-testid": testId && "".concat(testId, "--container")
+        }), (0, _react2.jsx)("input", {
+          name: name,
+          type: "hidden",
+          value: value,
+          "data-testid": testId && "".concat(testId, "--input")
+        }), (0, _react2.jsx)(_select.default, (0, _extends2.default)({
+          appearance: this.props.appearance,
+          enableAnimation: false,
+          menuIsOpen: menuIsOpen,
+          closeMenuOnSelect: true,
+          autoFocus: autoFocus,
+          instanceId: id,
+          isDisabled: isDisabled,
+          onBlur: this.onSelectBlur,
+          onFocus: this.onSelectFocus,
+          inputValue: actualSelectInputValue,
+          onInputChange: this.handleSelectInputChange,
+          components: selectComponents,
+          onChange: this.onSelectChange,
+          styles: (0, _select.mergeStyles)(selectStyles, {
+            control: function control(base) {
+              return _objectSpread(_objectSpread({}, base), disabledStyle);
+            },
+            indicatorsContainer: function indicatorsContainer(base) {
+              return _objectSpread(_objectSpread({}, base), {}, {
+                paddingLeft: "var(--ds-space-025, 2px)",
+                // ICON_PADDING = 2
+                paddingRight: "var(--ds-space-075, 6px)" // 8 - ICON_PADDING = 6
+              });
+            }
+          }),
 
-        placeholder: this.getPlaceholder(),
-        value: value && {
-          label: this.formatDate(value),
-          value: value
-        }
-      }, selectProps, calendarProps, {
-        isClearable: true,
-        spacing: spacing,
-        isInvalid: isInvalid,
-        testId: testId
-      })));
+          placeholder: this.getPlaceholder(),
+          value: value && {
+            label: this.formatDate(value),
+            value: value
+          }
+        }, selectProps, calendarProps, {
+          isClearable: true,
+          spacing: spacing,
+          isInvalid: isInvalid,
+          testId: testId
+        })))
+      );
     }
   }]);
   return DatePicker;

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

@@ -31,7 +31,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 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; } /* eslint-disable @repo/internal/react/use-noop */ /** @jsx jsx */ // eslint-disable-next-line no-restricted-imports
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.6";
+var packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 

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

@@ -38,7 +38,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.6";
+var packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 

package/dist/cjs/components/utils.js

@@ -56,34 +56,51 @@ var tokensMap = {
   x: 'T'
 };
 var v1tokens = Object.keys(tokensMap).sort().reverse();
-var tokensRegExp = new RegExp('(\\[[^\\[]*\\])|(\\\\)?' + '(' + v1tokens.join('|') + '|.)', 'g');
+var tokensRegExp = new RegExp(
+// v1 escape string (unsure the purpose of post-pipe capture group)
+'(\\[[^\\[]*\\])|(\\\\)?' +
+// v2 escape string
+"('.+'|" +
+// All v1 tokens
+v1tokens.join('|') + '|.)', 'g');
 function convertTokens(format) {
   var tokensCaptures = format.match(tokensRegExp);
-  if (tokensCaptures) {
-    return tokensCaptures.reduce(function (acc, tokenString, index) {
-      var v2token = tokensMap[tokenString];
-      if (!v2token) {
-        var escapedCaptures = tokenString.match(/^\[(.+)\]$/);
-        if (escapedCaptures) {
-          acc.textBuffer.push(escapedCaptures[1]);
-        } else {
-          acc.textBuffer.push(tokenString);
-        }
-      }
-      var endOfString = index === tokensCaptures.length - 1;
-      if (acc.textBuffer.length && (v2token || endOfString)) {
-        acc.formatBuffer.push("'".concat(acc.textBuffer.join(''), "'"));
-        acc.textBuffer = [];
-      }
-      if (v2token) {
-        acc.formatBuffer.push(v2token);
-      }
-      return acc;
-    }, {
-      formatBuffer: [],
-      textBuffer: []
-    }).formatBuffer.join('');
-  } else {
+  if (!tokensCaptures) {
     return format;
   }
+  return tokensCaptures.reduce(function (parsed, tokenString, index) {
+    var v2token = tokensMap[tokenString];
+    if (!v2token) {
+      var escapedCaptures = tokenString.match(/^\[(.+)\]$/);
+      if (escapedCaptures) {
+        parsed.escapedTextBuffer.push(escapedCaptures[1]);
+      } else {
+        parsed.escapedTextBuffer.push(tokenString);
+      }
+    }
+    var endOfString = index === tokensCaptures.length - 1;
+    if (parsed.escapedTextBuffer.length && (v2token || endOfString)) {
+      // This allows double parentheses to be rendered correctly
+      // according to date-fns's spec.
+      // https://date-fns.org/v2.29.3/docs/format
+      //
+      // We have to keep the single quote and then remove it because
+      // browser support for lookahead/behind is low and causes breaking
+      // errors (HOT-104152)
+      var filteredEscapedTextBuffer = parsed.escapedTextBuffer.map(function (token) {
+        return token[0] === "'" && token.slice(-1) === "'" ? token.slice(1, -1) : token;
+      }).filter(function (token) {
+        return token !== "'";
+      }).join('');
+      parsed.formatBuffer.push("'".concat(filteredEscapedTextBuffer, "'"));
+      parsed.escapedTextBuffer = [];
+    }
+    if (v2token) {
+      parsed.formatBuffer.push(v2token);
+    }
+    return parsed;
+  }, {
+    formatBuffer: [],
+    escapedTextBuffer: []
+  }).formatBuffer.join('');
 }

package/dist/cjs/version.json

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

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

@@ -19,7 +19,7 @@ import { defaultDateFormat, EmptyComponent, padToTwo, placeholderDatetime } from
 import FixedLayer from '../internal/fixed-layer';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.7.6";
+const packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 
@@ -146,12 +146,16 @@ class DatePicker extends Component {
       }
     });
     _defineProperty(this, "onSelectBlur", event => {
+      var _this$containerRef;
+      const newlyFocusedElement = event.relatedTarget;
       if (this.getSafeState().clearingFromIcon) {
         // Don't close menu if blurring after the user has clicked clear
         this.setState({
           clearingFromIcon: false
         });
-      } else {
+      } else if (!((_this$containerRef = this.containerRef) !== null && _this$containerRef !== void 0 && _this$containerRef.contains(newlyFocusedElement))) {
+        // Don't close menu if focus is staying within the date picker's
+        // container. Makes keyboard accessibility of calendar possible
         this.setState({
           isOpen: false,
           isFocused: false
@@ -461,56 +465,60 @@ class DatePicker extends Component {
       nextMonthLabel,
       previousMonthLabel
     };
-    return jsx("div", _extends({}, innerProps, {
-      role: "presentation",
-      onClick: this.onInputClick,
-      onInput: this.onTextInput,
-      onKeyDown: this.onInputKeyDown,
-      ref: this.getContainerRef,
-      "data-testid": testId && `${testId}--container`
-    }), jsx("input", {
-      name: name,
-      type: "hidden",
-      value: value,
-      "data-testid": testId && `${testId}--input`
-    }), jsx(Select, _extends({
-      appearance: this.props.appearance,
-      enableAnimation: false,
-      menuIsOpen: menuIsOpen,
-      closeMenuOnSelect: true,
-      autoFocus: autoFocus,
-      instanceId: id,
-      isDisabled: isDisabled,
-      onBlur: this.onSelectBlur,
-      onFocus: this.onSelectFocus,
-      inputValue: actualSelectInputValue,
-      onInputChange: this.handleSelectInputChange,
-      components: selectComponents,
-      onChange: this.onSelectChange,
-      styles: mergeStyles(selectStyles, {
-        control: base => ({
-          ...base,
-          ...disabledStyle
+    return (
+      // TODO: Remove role="presentation", since div's have no semantics anyway
+      // (DSP-11587)
+      jsx("div", _extends({}, innerProps, {
+        role: "presentation",
+        onClick: this.onInputClick,
+        onInput: this.onTextInput,
+        onKeyDown: this.onInputKeyDown,
+        ref: this.getContainerRef,
+        "data-testid": testId && `${testId}--container`
+      }), jsx("input", {
+        name: name,
+        type: "hidden",
+        value: value,
+        "data-testid": testId && `${testId}--input`
+      }), jsx(Select, _extends({
+        appearance: this.props.appearance,
+        enableAnimation: false,
+        menuIsOpen: menuIsOpen,
+        closeMenuOnSelect: true,
+        autoFocus: autoFocus,
+        instanceId: id,
+        isDisabled: isDisabled,
+        onBlur: this.onSelectBlur,
+        onFocus: this.onSelectFocus,
+        inputValue: actualSelectInputValue,
+        onInputChange: this.handleSelectInputChange,
+        components: selectComponents,
+        onChange: this.onSelectChange,
+        styles: mergeStyles(selectStyles, {
+          control: base => ({
+            ...base,
+            ...disabledStyle
+          }),
+          indicatorsContainer: base => ({
+            ...base,
+            paddingLeft: "var(--ds-space-025, 2px)",
+            // ICON_PADDING = 2
+            paddingRight: "var(--ds-space-075, 6px)" // 8 - ICON_PADDING = 6
+          })
         }),
-        indicatorsContainer: base => ({
-          ...base,
-          paddingLeft: "var(--ds-space-025, 2px)",
-          // ICON_PADDING = 2
-          paddingRight: "var(--ds-space-075, 6px)" // 8 - ICON_PADDING = 6
-        })
-      }),
 
-      placeholder: this.getPlaceholder(),
-      value: value && {
-        label: this.formatDate(value),
-        value
-      }
-    }, selectProps, calendarProps, {
-      isClearable: true,
-      spacing: spacing,
-      isInvalid: isInvalid,
-      testId: testId
-    })));
+        placeholder: this.getPlaceholder(),
+        value: value && {
+          label: this.formatDate(value),
+          value
+        }
+      }, selectProps, calendarProps, {
+        isClearable: true,
+        spacing: spacing,
+        isInvalid: isInvalid,
+        testId: testId
+      })))
+    );
   }
 }
 _defineProperty(DatePicker, "defaultProps", datePickerDefaultProps);

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

@@ -17,7 +17,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.7.6";
+const packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 

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

@@ -16,7 +16,7 @@ import FixedLayer from '../internal/fixed-layer';
 import parseTime from '../internal/parse-time';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.7.6";
+const packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 

package/dist/es2019/components/utils.js

@@ -50,34 +50,47 @@ const tokensMap = {
   x: 'T'
 };
 const v1tokens = Object.keys(tokensMap).sort().reverse();
-const tokensRegExp = new RegExp('(\\[[^\\[]*\\])|(\\\\)?' + '(' + v1tokens.join('|') + '|.)', 'g');
+const tokensRegExp = new RegExp(
+// v1 escape string (unsure the purpose of post-pipe capture group)
+'(\\[[^\\[]*\\])|(\\\\)?' +
+// v2 escape string
+"('.+'|" +
+// All v1 tokens
+v1tokens.join('|') + '|.)', 'g');
 export function convertTokens(format) {
   const tokensCaptures = format.match(tokensRegExp);
-  if (tokensCaptures) {
-    return tokensCaptures.reduce((acc, tokenString, index) => {
-      const v2token = tokensMap[tokenString];
-      if (!v2token) {
-        const escapedCaptures = tokenString.match(/^\[(.+)\]$/);
-        if (escapedCaptures) {
-          acc.textBuffer.push(escapedCaptures[1]);
-        } else {
-          acc.textBuffer.push(tokenString);
-        }
-      }
-      const endOfString = index === tokensCaptures.length - 1;
-      if (acc.textBuffer.length && (v2token || endOfString)) {
-        acc.formatBuffer.push(`'${acc.textBuffer.join('')}'`);
-        acc.textBuffer = [];
-      }
-      if (v2token) {
-        acc.formatBuffer.push(v2token);
-      }
-      return acc;
-    }, {
-      formatBuffer: [],
-      textBuffer: []
-    }).formatBuffer.join('');
-  } else {
+  if (!tokensCaptures) {
     return format;
   }
+  return tokensCaptures.reduce((parsed, tokenString, index) => {
+    const v2token = tokensMap[tokenString];
+    if (!v2token) {
+      const escapedCaptures = tokenString.match(/^\[(.+)\]$/);
+      if (escapedCaptures) {
+        parsed.escapedTextBuffer.push(escapedCaptures[1]);
+      } else {
+        parsed.escapedTextBuffer.push(tokenString);
+      }
+    }
+    const endOfString = index === tokensCaptures.length - 1;
+    if (parsed.escapedTextBuffer.length && (v2token || endOfString)) {
+      // This allows double parentheses to be rendered correctly
+      // according to date-fns's spec.
+      // https://date-fns.org/v2.29.3/docs/format
+      //
+      // We have to keep the single quote and then remove it because
+      // browser support for lookahead/behind is low and causes breaking
+      // errors (HOT-104152)
+      const filteredEscapedTextBuffer = parsed.escapedTextBuffer.map(token => token[0] === "'" && token.slice(-1) === "'" ? token.slice(1, -1) : token).filter(token => token !== "'").join('');
+      parsed.formatBuffer.push(`'${filteredEscapedTextBuffer}'`);
+      parsed.escapedTextBuffer = [];
+    }
+    if (v2token) {
+      parsed.formatBuffer.push(v2token);
+    }
+    return parsed;
+  }, {
+    formatBuffer: [],
+    escapedTextBuffer: []
+  }).formatBuffer.join('');
 }

package/dist/es2019/version.json

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

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

@@ -30,7 +30,7 @@ import { defaultDateFormat, EmptyComponent, padToTwo, placeholderDatetime } from
 import FixedLayer from '../internal/fixed-layer';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.6";
+var packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 
@@ -161,12 +161,16 @@ var DatePicker = /*#__PURE__*/function (_Component) {
       }
     });
     _defineProperty(_assertThisInitialized(_this), "onSelectBlur", function (event) {
+      var _this$containerRef;
+      var newlyFocusedElement = event.relatedTarget;
       if (_this.getSafeState().clearingFromIcon) {
         // Don't close menu if blurring after the user has clicked clear
         _this.setState({
           clearingFromIcon: false
         });
-      } else {
+      } else if (!((_this$containerRef = _this.containerRef) !== null && _this$containerRef !== void 0 && _this$containerRef.contains(newlyFocusedElement))) {
+        // Don't close menu if focus is staying within the date picker's
+        // container. Makes keyboard accessibility of calendar possible
         _this.setState({
           isOpen: false,
           isFocused: false
@@ -464,56 +468,60 @@ var DatePicker = /*#__PURE__*/function (_Component) {
         nextMonthLabel: nextMonthLabel,
         previousMonthLabel: previousMonthLabel
       };
-      return jsx("div", _extends({}, innerProps, {
-        role: "presentation",
-        onClick: this.onInputClick,
-        onInput: this.onTextInput,
-        onKeyDown: this.onInputKeyDown,
-        ref: this.getContainerRef,
-        "data-testid": testId && "".concat(testId, "--container")
-      }), jsx("input", {
-        name: name,
-        type: "hidden",
-        value: value,
-        "data-testid": testId && "".concat(testId, "--input")
-      }), jsx(Select, _extends({
-        appearance: this.props.appearance,
-        enableAnimation: false,
-        menuIsOpen: menuIsOpen,
-        closeMenuOnSelect: true,
-        autoFocus: autoFocus,
-        instanceId: id,
-        isDisabled: isDisabled,
-        onBlur: this.onSelectBlur,
-        onFocus: this.onSelectFocus,
-        inputValue: actualSelectInputValue,
-        onInputChange: this.handleSelectInputChange,
-        components: selectComponents,
-        onChange: this.onSelectChange,
-        styles: mergeStyles(selectStyles, {
-          control: function control(base) {
-            return _objectSpread(_objectSpread({}, base), disabledStyle);
-          },
-          indicatorsContainer: function indicatorsContainer(base) {
-            return _objectSpread(_objectSpread({}, base), {}, {
-              paddingLeft: "var(--ds-space-025, 2px)",
-              // ICON_PADDING = 2
-              paddingRight: "var(--ds-space-075, 6px)" // 8 - ICON_PADDING = 6
-            });
-          }
-        }),
+      return (
+        // TODO: Remove role="presentation", since div's have no semantics anyway
+        // (DSP-11587)
+        jsx("div", _extends({}, innerProps, {
+          role: "presentation",
+          onClick: this.onInputClick,
+          onInput: this.onTextInput,
+          onKeyDown: this.onInputKeyDown,
+          ref: this.getContainerRef,
+          "data-testid": testId && "".concat(testId, "--container")
+        }), jsx("input", {
+          name: name,
+          type: "hidden",
+          value: value,
+          "data-testid": testId && "".concat(testId, "--input")
+        }), jsx(Select, _extends({
+          appearance: this.props.appearance,
+          enableAnimation: false,
+          menuIsOpen: menuIsOpen,
+          closeMenuOnSelect: true,
+          autoFocus: autoFocus,
+          instanceId: id,
+          isDisabled: isDisabled,
+          onBlur: this.onSelectBlur,
+          onFocus: this.onSelectFocus,
+          inputValue: actualSelectInputValue,
+          onInputChange: this.handleSelectInputChange,
+          components: selectComponents,
+          onChange: this.onSelectChange,
+          styles: mergeStyles(selectStyles, {
+            control: function control(base) {
+              return _objectSpread(_objectSpread({}, base), disabledStyle);
+            },
+            indicatorsContainer: function indicatorsContainer(base) {
+              return _objectSpread(_objectSpread({}, base), {}, {
+                paddingLeft: "var(--ds-space-025, 2px)",
+                // ICON_PADDING = 2
+                paddingRight: "var(--ds-space-075, 6px)" // 8 - ICON_PADDING = 6
+              });
+            }
+          }),
 
-        placeholder: this.getPlaceholder(),
-        value: value && {
-          label: this.formatDate(value),
-          value: value
-        }
-      }, selectProps, calendarProps, {
-        isClearable: true,
-        spacing: spacing,
-        isInvalid: isInvalid,
-        testId: testId
-      })));
+          placeholder: this.getPlaceholder(),
+          value: value && {
+            label: this.formatDate(value),
+            value: value
+          }
+        }, selectProps, calendarProps, {
+          isClearable: true,
+          spacing: spacing,
+          isInvalid: isInvalid,
+          testId: testId
+        })))
+      );
     }
   }]);
   return DatePicker;

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

@@ -27,7 +27,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.6";
+var packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 

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

@@ -29,7 +29,7 @@ import FixedLayer from '../internal/fixed-layer';
 import parseTime from '../internal/parse-time';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.6";
+var packageVersion = "12.7.8";
 
 /* eslint-disable react/no-unused-prop-types */
 

package/dist/esm/components/utils.js

@@ -50,34 +50,51 @@ var tokensMap = {
   x: 'T'
 };
 var v1tokens = Object.keys(tokensMap).sort().reverse();
-var tokensRegExp = new RegExp('(\\[[^\\[]*\\])|(\\\\)?' + '(' + v1tokens.join('|') + '|.)', 'g');
+var tokensRegExp = new RegExp(
+// v1 escape string (unsure the purpose of post-pipe capture group)
+'(\\[[^\\[]*\\])|(\\\\)?' +
+// v2 escape string
+"('.+'|" +
+// All v1 tokens
+v1tokens.join('|') + '|.)', 'g');
 export function convertTokens(format) {
   var tokensCaptures = format.match(tokensRegExp);
-  if (tokensCaptures) {
-    return tokensCaptures.reduce(function (acc, tokenString, index) {
-      var v2token = tokensMap[tokenString];
-      if (!v2token) {
-        var escapedCaptures = tokenString.match(/^\[(.+)\]$/);
-        if (escapedCaptures) {
-          acc.textBuffer.push(escapedCaptures[1]);
-        } else {
-          acc.textBuffer.push(tokenString);
-        }
-      }
-      var endOfString = index === tokensCaptures.length - 1;
-      if (acc.textBuffer.length && (v2token || endOfString)) {
-        acc.formatBuffer.push("'".concat(acc.textBuffer.join(''), "'"));
-        acc.textBuffer = [];
-      }
-      if (v2token) {
-        acc.formatBuffer.push(v2token);
-      }
-      return acc;
-    }, {
-      formatBuffer: [],
-      textBuffer: []
-    }).formatBuffer.join('');
-  } else {
+  if (!tokensCaptures) {
     return format;
   }
+  return tokensCaptures.reduce(function (parsed, tokenString, index) {
+    var v2token = tokensMap[tokenString];
+    if (!v2token) {
+      var escapedCaptures = tokenString.match(/^\[(.+)\]$/);
+      if (escapedCaptures) {
+        parsed.escapedTextBuffer.push(escapedCaptures[1]);
+      } else {
+        parsed.escapedTextBuffer.push(tokenString);
+      }
+    }
+    var endOfString = index === tokensCaptures.length - 1;
+    if (parsed.escapedTextBuffer.length && (v2token || endOfString)) {
+      // This allows double parentheses to be rendered correctly
+      // according to date-fns's spec.
+      // https://date-fns.org/v2.29.3/docs/format
+      //
+      // We have to keep the single quote and then remove it because
+      // browser support for lookahead/behind is low and causes breaking
+      // errors (HOT-104152)
+      var filteredEscapedTextBuffer = parsed.escapedTextBuffer.map(function (token) {
+        return token[0] === "'" && token.slice(-1) === "'" ? token.slice(1, -1) : token;
+      }).filter(function (token) {
+        return token !== "'";
+      }).join('');
+      parsed.formatBuffer.push("'".concat(filteredEscapedTextBuffer, "'"));
+      parsed.escapedTextBuffer = [];
+    }
+    if (v2token) {
+      parsed.formatBuffer.push(v2token);
+    }
+    return parsed;
+  }, {
+    formatBuffer: [],
+    escapedTextBuffer: []
+  }).formatBuffer.join('');
 }

package/dist/esm/version.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/datetime-picker",
-  "version": "12.7.6",
+  "version": "12.7.8",
   "description": "A date time picker allows the user to select an associated date and time.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
     "@atlaskit/popper": "^5.5.0",
     "@atlaskit/select": "^16.5.0",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.11.0",
+    "@atlaskit/tokens": "^1.13.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "date-fns": "^2.17.0",
@@ -52,11 +52,12 @@
     "react": "^16.8.0"
   },
   "devDependencies": {
+    "@af/accessibility-testing": "*",
     "@atlaskit/button": "^16.8.0",
     "@atlaskit/docs": "*",
     "@atlaskit/form": "^8.11.0",
     "@atlaskit/modal-dialog": "^12.6.0",
-    "@atlaskit/popup": "^1.8.0",
+    "@atlaskit/popup": "^1.9.0",
     "@atlaskit/range": "^7.1.0",
     "@atlaskit/section-message": "^6.4.0",
     "@atlaskit/ssr": "*",