@atlaskit/datetime-picker 12.7.2 → 12.7.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/datetime-picker
 
+## 12.7.3
+
+### Patch Changes
+
+- [`758165c64f6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/758165c64f6) - Fixes bug that made escapes not work correctly in format strings.
+
 ## 12.7.2
 
 ### 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.2";
+var packageVersion = "12.7.3";
 
 /* eslint-disable react/no-unused-prop-types */
 

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

@@ -32,7 +32,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.2";
+var packageVersion = "12.7.3";
 
 /* 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.2";
+var packageVersion = "12.7.3";
 
 /* eslint-disable react/no-unused-prop-types */
 

package/dist/cjs/components/utils.js

@@ -56,34 +56,45 @@ 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
+      var filteredEscapedTextBuffer = parsed.escapedTextBuffer.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.2",
+	"version": "12.7.3",
 	"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.2";
+const packageVersion = "12.7.3";
 
 /* eslint-disable react/no-unused-prop-types */
 

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

@@ -18,7 +18,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 const packageName = "@atlaskit/datetime-picker";
-const packageVersion = "12.7.2";
+const packageVersion = "12.7.3";
 
 /* 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.2";
+const packageVersion = "12.7.3";
 
 /* eslint-disable react/no-unused-prop-types */
 

package/dist/es2019/components/utils.js

@@ -50,34 +50,43 @@ 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
+      const filteredEscapedTextBuffer = parsed.escapedTextBuffer.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.2",
+	"version": "12.7.3",
 	"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.2";
+var packageVersion = "12.7.3";
 
 /* eslint-disable react/no-unused-prop-types */
 

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

@@ -28,7 +28,7 @@ import DatePicker from './date-picker';
 import TimePicker from './time-picker';
 import { convertTokens } from './utils';
 var packageName = "@atlaskit/datetime-picker";
-var packageVersion = "12.7.2";
+var packageVersion = "12.7.3";
 
 /* 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.2";
+var packageVersion = "12.7.3";
 
 /* eslint-disable react/no-unused-prop-types */
 

package/dist/esm/components/utils.js

@@ -50,34 +50,45 @@ 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
+      var filteredEscapedTextBuffer = parsed.escapedTextBuffer.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.2",
+	"version": "12.7.3",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/datetime-picker",
-  "version": "12.7.2",
+  "version": "12.7.3",
   "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.8.0",
+    "@atlaskit/tokens": "^1.9.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "date-fns": "^2.17.0",
@@ -52,7 +52,7 @@
     "react": "^16.8.0"
   },
   "devDependencies": {
-    "@atlaskit/button": "^16.7.0",
+    "@atlaskit/button": "^16.8.0",
     "@atlaskit/docs": "*",
     "@atlaskit/form": "^8.11.0",
     "@atlaskit/modal-dialog": "^12.6.0",

package/extract-react-types/datetime-picker-props.tsx

@@ -1,5 +0,0 @@
-import { DateTimePickerBaseProps } from '../src/components/date-time-picker';
-
-export default function DateTimePickerProps(props: DateTimePickerBaseProps) {
-  return null;
-}