@atlaskit/editor-common 74.2.0 → 74.3.0

package/dist/es2019/ui/Expand/index.js

@@ -94,9 +94,7 @@ const containerStyles = styleProps => {
     expanded,
     focused
   } = styleProps;
-  // TODO: Migrate away from gridSize
-  // Recommendation: Verify if this is intentional: 8 / 4 / 14 rem = 4.57px?
-  const marginTop = `${gridSize() / 2 / fontSize()}rem`;
+  const marginTop = "var(--ds-space-050, 0.25rem)";
   const marginBottom = 0;
   // Only only these margins if the expand isn't editable
   // and is the root level expand.

package/dist/es2019/ui-menu/ToolbarButton/index.js

@@ -1,3 +1,6 @@
+// This file is copied to `packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/ToolbarButton/index.tsx`
+// If you make any change here, copy it to above file as well
+//  and notify about the change in #team-fc-editor-ai-dev channel.
 /** @jsx jsx */
 import React, { useCallback } from 'react';
 import { css, jsx } from '@emotion/react';

package/dist/es2019/ui-menu/ToolbarButton/styles.js

@@ -1,4 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
+// This file is copied to `packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/ToolbarButton/styles.tsx`
+// If you make any change here, copy it to above file as well
+//  and notify about the change in #team-fc-editor-ai-dev channel.
 import React from 'react';
 import Button from '@atlaskit/button/standard-button';
 export default /*#__PURE__*/React.forwardRef((props, ref) => {

package/dist/es2019/utils/compareNodes.js

@@ -12,46 +12,59 @@ function getLinkMark(node) {
   const [linkMark] = node.marks.filter(mark => mark.type.name === 'link');
   return linkMark || null;
 }
-
-// Source: https://stackoverflow.com/questions/12004808/does-javascript-take-local-decimal-separators-into-account
-function parseLocaleNumber(stringNumber) {
-  if (stringNumber.trim() === '') {
+function parseLocaleNumber(stringNumber, groupPattern, fractionPattern) {
+  if (!stringNumber.trim().length) {
     return null;
   }
-  const locale = window.navigator.language;
-  const thousandSeparator = Intl.NumberFormat(locale).format(11111).replace(/\p{Number}/gu, '');
-  const decimalSeparator = Intl.NumberFormat(locale).format(1.1).replace(/\p{Number}/gu, '');
-  const maybeANumber = Number(stringNumber.replace(new RegExp('\\' + thousandSeparator, 'g'), '').replace(new RegExp('\\' + decimalSeparator), '.'));
-  const isANumber = !Number.isNaN(maybeANumber);
-  if (!isANumber) {
+  const maybeANumber = Number.parseFloat(stringNumber.replace(groupPattern, '').replace(fractionPattern, '.'));
+  if (Number.isNaN(maybeANumber)) {
     return null;
   }
   return maybeANumber;
 }
-function extractFirstWordFromString(text) {
-  // Firefox is the only browser that doesn't support it
-  if (!Intl || !Intl.Segmenter) {
-    // If the Segment API is not available
-    // let's fallback to a dumb way to extract the first word.
-    // However, this method doesn't cover some languages like Japanase
-    const firstEmptySpace = text.indexOf(' ');
-    const firstWord = firstEmptySpace !== -1 ? text.substring(0, firstEmptySpace) : text;
-    return firstWord;
-  }
-  const languageSegment = new Intl.Segmenter(window.navigator.language, {
-    granularity: 'word'
-  });
-  const segmentsIterator = languageSegment.segment(text);
-  if (!segmentsIterator) {
-    return text;
-  }
-  const segmentsArray = Array.from(segmentsIterator);
-  if (segmentsArray.length === 0) {
-    return text;
-  }
-  return segmentsArray[0].segment;
+export function createNormalizeTextParser() {
+  // Source: https://stackoverflow.com/questions/12004808/does-javascript-take-local-decimal-separators-into-account
+  const locale = window.navigator.language;
+  const thousandSeparator = Intl.NumberFormat(locale).format(11111).replace(/\p{Number}/gu, '');
+  const decimalSeparator = Intl.NumberFormat(locale).format(1.1).replace(/\p{Number}/gu, '');
+  const numericPattern = new RegExp(`(\\d+(?:[${thousandSeparator}${decimalSeparator}]?\\d+)*)`, 'g');
+  const thousandSeparatorPattern = new RegExp('\\' + thousandSeparator, 'g');
+  const decimalSeparatorPattern = new RegExp('\\' + decimalSeparator);
+  return text => {
+    if (!text.trim().length) {
+      return null;
+    }
+
+    // This will break the text apart at the locations of the formatted numbers
+    const result = text.split(numericPattern);
+
+    // We then put the text back together but with all the formatted numbers converted back to plain numerals,
+    // for example a sentence like "What is 1,000.01% of 10,000.01" would be normalized and sorted as
+    // if it's saying "What is 1000.01% of 10000.01". This way the Intl.Collator can use the numeric setting to sort
+    // numeral values within string correctly.
+    const tokens = result.reduce((acc, stringNumber) => {
+      if (!(stringNumber !== null && stringNumber !== void 0 && stringNumber.length)) {
+        return acc;
+      }
+      const maybeANumber = parseLocaleNumber(stringNumber, thousandSeparatorPattern, decimalSeparatorPattern);
+
+      // NOTE: We know there can only be a single decimal separator. So we can assume that if the first found separator
+      // is not at the same position as the last found one, then we can assume the locale used to format the number
+      // is different to our locale. This will result in the value being treated as a string.
+      if (maybeANumber !== null && stringNumber.indexOf(decimalSeparator) === stringNumber.lastIndexOf(decimalSeparator)) {
+        acc.push(maybeANumber);
+      } else {
+        acc.push(stringNumber);
+      }
+      return acc;
+    }, []);
+    if (tokens.length === 1) {
+      return tokens[0];
+    }
+    return tokens.join('');
+  };
 }
-export function extractMetaFromTextNode(textNode) {
+export function extractMetaFromTextNode(textNode, normalizeTextParser) {
   // treat as a link if contain a link
   const linkMark = getLinkMark(textNode);
   if (linkMark) {
@@ -62,20 +75,19 @@ export function extractMetaFromTextNode(textNode) {
     };
   }
   const text = textNode.text || '';
-  const firstWord = extractFirstWordFromString(text);
-  const maybeANumber = parseLocaleNumber(firstWord);
-  if (maybeANumber !== null) {
+  const normalizedText = normalizeTextParser(text);
+  if (typeof normalizedText === 'number') {
     return {
       type: ContentType.NUMBER,
-      value: maybeANumber
+      value: normalizedText
     };
   }
   return {
     type: ContentType.TEXT,
-    value: firstWord
+    value: normalizedText !== null && normalizedText !== void 0 ? normalizedText : text
   };
 }
-function getMetaFromNode(node, options) {
+function getMetaFromNode(node, options, normalizeTextParser) {
   if (!node) {
     return null;
   }
@@ -88,12 +100,12 @@ function getMetaFromNode(node, options) {
     /*
       Get Meta value from the first child if the cell is of type
         * Heading (Any cell where the text is set to a heading type)
-        * Paragraph (Normal text) 
+        * Paragraph (Normal text)
      */
     case 'heading':
     case 'paragraph':
       {
-        return getMetaFromNode(firstChild, options);
+        return getMetaFromNode(firstChild, options, normalizeTextParser);
       }
     case 'inlineCard':
       {
@@ -113,7 +125,7 @@ function getMetaFromNode(node, options) {
       }
     case 'text':
       {
-        return extractMetaFromTextNode(firstChild);
+        return extractMetaFromTextNode(firstChild, normalizeTextParser);
       }
     case 'status':
       {
@@ -150,7 +162,8 @@ function compareValue(valueA, valueB) {
   }
   if (typeof valueA === 'string' && typeof valueB === 'string') {
     return valueA.localeCompare(valueB, window.navigator.language, {
-      caseFirst: 'upper'
+      caseFirst: 'upper',
+      numeric: true
     });
   }
   return valueA > valueB ? 1 : -1;
@@ -181,11 +194,12 @@ function compareValue(valueA, valueB) {
  * like a regular JS sort method.
  */
 export const createCompareNodes = (options, order = SortOrder.ASC) => {
+  const normalizeTextParser = createNormalizeTextParser();
   return (nodeA, nodeB) => {
-    const metaNodeA = getMetaFromNode(nodeA, options);
-    const metaNodeB = getMetaFromNode(nodeB, options);
-    /*  
-      Donot switch the order (Asec or Desc) if either node is null. 
+    const metaNodeA = getMetaFromNode(nodeA, options, normalizeTextParser);
+    const metaNodeB = getMetaFromNode(nodeB, options, normalizeTextParser);
+    /*
+      Donot switch the order (Asec or Desc) if either node is null.
       This will ensure that empty cells are always at the bottom during sorting.
     */
     if (metaNodeA === null || metaNodeB === null) {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.2.0",
+	"version": "74.3.0",
 	"sideEffects": false
 }

package/dist/esm/i18n/en_ZZ.js

@@ -9,6 +9,7 @@
 export default {
   'fabric.editor.action': '⁣⁢Action item؜‍⁠⁠؜⁡‌‍⁡‍‌⁣⁤',
   'fabric.editor.action.description': '⁣⁢Create and assign action items‌‌⁡‌⁡‌؜⁠⁡⁣⁤',
+  'fabric.editor.addMediaFiles': '⁣⁢Add image, video, or file‌‍؜؜‍‍؜‍؜؜‍⁣⁤',
   'fabric.editor.alignImageCenter': '⁣⁢Align center⁡⁡‍⁠‌⁡⁠⁡⁡‌⁡⁣⁤',
   'fabric.editor.alignImageLeft': '⁣⁢Align left⁠⁠‍؜⁡⁡⁠⁡⁠‍؜‌⁡⁣⁤',
   'fabric.editor.alignImageRight': '⁣⁢Align right⁠⁠⁡؜⁡؜⁡؜؜⁣⁤',
@@ -18,6 +19,8 @@ export default {
   'fabric.editor.codeBidiWarningLabel': '⁣⁢Bidirectional characters change the order that text is rendered. This could be used to obscure malicious code.‌⁡؜‍⁠⁠‌؜‌⁣⁤',
   'fabric.editor.codeBlockCopyButton.copiedToClipboard': '⁣⁢Copied!؜⁡‌⁡‍⁡⁠‍⁡⁡⁡⁣⁤',
   'fabric.editor.codeBlockCopyButton.copyToClipboard': '⁣⁢Copy as text‍⁠‌‍؜‍‌⁡⁡‍‍⁣⁤',
+  'fabric.editor.codeBlockWrapButton.unwrapCodeBlock': '⁣⁢Turn off wrap⁠‍⁠‌‌؜‌‍‍‌⁠؜⁣⁤',
+  'fabric.editor.codeBlockWrapButton.wrapCodeBlock': '⁣⁢Turn on wrap⁡‍‍⁠‌‍⁡؜‍‌⁣⁤',
   'fabric.editor.collapseNode': '⁣⁢Collapse content‍⁡‌⁠؜‍‍‌؜⁠‌⁡‍⁡‌⁣⁤',
   'fabric.editor.columns': '⁣⁢Layouts⁡⁠‍⁠⁡‌⁠‍⁡⁣⁤',
   'fabric.editor.columns.description': '⁣⁢Structure your page using sections‌‍⁠⁠‍؜‍⁡⁡⁡⁣⁤',
@@ -37,8 +40,6 @@ export default {
   'fabric.editor.expandPlaceholder': '⁣⁢Give this expand a title...؜⁠⁡‍؜؜؜⁡⁣⁤',
   'fabric.editor.feedbackDialog': '⁣⁢Give feedback؜⁡؜⁠‍‌‌‍⁡⁣⁤',
   'fabric.editor.feedbackDialog.description': '⁣⁢Tell us about your experience using the new editor‌‌؜؜؜؜؜⁡‍‍‍‌⁣⁤',
-  'fabric.editor.filesAndImages': '⁣⁢Files & images؜⁡‌⁡⁠⁡‍‍⁡؜‌⁡؜⁠‍‌⁠‌⁣⁤',
-  'fabric.editor.filesAndImages.description': '⁣⁢Add images and other files to your page؜⁡‍‌‍‌؜⁠⁠؜؜⁣⁤',
   'fabric.editor.help': '⁣⁢Help⁡‌‍‌⁡‌⁠⁠‍‍⁡⁣⁤',
   'fabric.editor.help.description': '⁣⁢Browse all the keyboard shortcuts and markdown options‌⁡⁠‍⁡⁠⁣⁤',
   'fabric.editor.horizontalRule': '⁣⁢Divider‍‌⁠‌⁡‌⁡؜‌⁡‍⁠‍⁣⁤',
@@ -50,6 +51,8 @@ export default {
   'fabric.editor.layoutWide': '⁣⁢Go wide‌؜؜‍‍⁡⁡؜⁣⁤',
   'fabric.editor.link': '⁣⁢Link⁡‍⁡‍؜؜؜⁠⁠⁣⁤',
   'fabric.editor.link.description': '⁣⁢Insert a link‌⁠⁠‌؜‍؜⁠؜⁣⁤',
+  'fabric.editor.mediaFiles': '⁣⁢Image, video, or file⁠‍‌؜⁠‌‍⁣⁤',
+  'fabric.editor.mediaFiles.description': '⁣⁢Add images and other files to your page⁠‍‌؜؜؜‍⁠⁠⁠⁠‍⁣⁤',
   'fabric.editor.mention': '⁣⁢Mention‌؜‌⁡⁡؜⁠⁣⁤',
   'fabric.editor.mention.description': '⁣⁢Mention someone to send them a notification‍؜‌‌⁡؜‌‌؜⁠⁠؜⁣⁤',
   'fabric.editor.openLink': '⁣⁢Open link in a new tab⁠⁡⁡‌‍‌⁠‌‌⁡⁡⁣⁤',
@@ -77,12 +80,32 @@ export default {
   'fabric.editor.viewMore': '⁣⁢View more⁠⁠⁡‌‍‌‌‌؜‍‌⁣⁤',
   'fabric.editor.visit': '⁣⁢Open link in a new window⁡⁠‍⁠⁠⁡‍⁡⁣⁤',
   'fabric.theme.blue': '⁣⁢Blue‍⁠‍؜‌⁠⁡‍؜⁣⁤',
+  'fabric.theme.bold-blue': '⁣⁢Bold blue⁠⁡؜؜‍‍‌‌⁠‍⁣⁤',
+  'fabric.theme.bold-gray': '⁣⁢Bold gray‌⁠⁠‌⁠⁠⁡‍‌⁣⁤',
+  'fabric.theme.bold-green': '⁣⁢Bold green؜⁡؜؜‌⁡‍‌⁡⁣⁤',
+  'fabric.theme.bold-magenta': '⁣⁢Bold magenta‍؜‌؜⁡⁠‍⁡‌‌‍‌⁣⁤',
+  'fabric.theme.bold-orange': '⁣⁢Bold orange؜⁡؜⁡⁠⁡⁡؜؜‌⁡؜‍⁣⁤',
+  'fabric.theme.bold-purple': '⁣⁢Bold purple‍‌‍‌؜‍⁡؜⁠‍‌⁣⁤',
+  'fabric.theme.bold-red': '⁣⁢Bold red‌؜؜⁡⁡‍⁡⁠⁣⁤',
+  'fabric.theme.bold-teal': '⁣⁢Bold teal‌؜‍‍⁡⁠⁠؜⁠؜؜؜⁣⁤',
+  'fabric.theme.bold-yellow': '⁣⁢Bold yellow⁠‌‌‌⁠⁠⁡⁡⁡؜‌‌‌؜⁠‌؜⁠⁣⁤',
+  'fabric.theme.bolder-blue': '⁣⁢Bolder blue⁡⁡‍‌‍⁠‍‌⁠⁣⁤',
+  'fabric.theme.bolder-gray': '⁣⁢Bolder gray؜‍؜⁠‌⁡⁠⁣⁤',
+  'fabric.theme.bolder-green': '⁣⁢Bolder green‌؜؜‍؜⁡⁡‍⁣⁤',
+  'fabric.theme.bolder-magenta': '⁣⁢Bolder magenta؜‌؜⁡؜؜⁠⁣⁤',
+  'fabric.theme.bolder-orange': '⁣⁢Bolder orange؜‍‌‍⁣⁤',
+  'fabric.theme.bolder-purple': '⁣⁢Bolder purple؜⁠⁠⁠⁡⁡⁣⁤',
+  'fabric.theme.bolder-red': '⁣⁢Bolder red‍⁡؜؜⁠؜⁠؜‍‍‍⁣⁤',
+  'fabric.theme.bolder-teal': '⁣⁢Bolder teal⁡‌‌‌؜‍⁠‌‍⁡⁡⁣⁤',
+  'fabric.theme.bolder-yellow': '⁣⁢Bolder yellow؜؜‍⁡⁠⁡‌‌⁡⁠⁣⁤',
   'fabric.theme.dark-blue': '⁣⁢Dark blue⁠‍⁠⁠⁠⁠‌‍⁠‍؜⁠⁡‍⁣⁤',
+  'fabric.theme.dark-gray': '⁣⁢Dark gray⁡‍؜‍‌⁠؜‍‌⁡‌‌⁣⁤',
   'fabric.theme.dark-green': '⁣⁢Dark green‍‌‍⁡؜‍⁡‌‌؜⁡؜⁣⁤',
   'fabric.theme.dark-purple': '⁣⁢Dark purple⁡⁠‌؜؜⁠‍⁠؜⁣⁤',
   'fabric.theme.dark-red': '⁣⁢Dark red‌‍⁡‌‌‍‌⁡‌⁡‍⁠‌⁠⁣⁤',
   'fabric.theme.dark-teal': '⁣⁢Dark teal⁠⁠⁡⁠⁠⁠⁡⁣⁤',
   'fabric.theme.dark-yellow': '⁣⁢Dark yellow⁠‌⁠؜‌⁡؜⁣⁤',
+  'fabric.theme.default': '⁣⁢Default⁡‍؜⁠‌؜⁠⁣⁤',
   'fabric.theme.gray': '⁣⁢Gray؜⁠⁡‌⁠⁡؜⁠‌؜؜؜⁡⁠⁠⁣⁤',
   'fabric.theme.green': '⁣⁢Green‍‍‌⁡⁡‍⁡⁠⁠⁣⁤',
   'fabric.theme.light-blue': '⁣⁢Light blue‍⁠⁡‌⁡؜؜‌⁡⁡⁠⁣⁤',
@@ -92,9 +115,19 @@ export default {
   'fabric.theme.light-red': '⁣⁢Light red‌؜‌؜‌؜⁡؜⁡⁡⁣⁤',
   'fabric.theme.light-teal': '⁣⁢Light teal‍‍‍‍‌‍⁠⁡⁣⁤',
   'fabric.theme.light-yellow': '⁣⁢Light yellow‌‌‌‌‍⁠؜⁠‍⁣⁤',
+  'fabric.theme.magenta': '⁣⁢Magenta‍؜⁠؜⁡‌‍⁡‍⁠⁣⁤',
   'fabric.theme.orange': '⁣⁢Orange؜⁡‍⁠؜‍⁠⁠‍⁠⁣⁤',
   'fabric.theme.purple': '⁣⁢Purple⁠؜‍‍؜؜⁠⁠‌‌⁡⁣⁤',
   'fabric.theme.red': '⁣⁢Red‌‍؜⁡؜‍‌⁡⁡⁣⁤',
+  'fabric.theme.subtle-blue': '⁣⁢Subtle blue⁡‌⁠⁡⁠⁠⁣⁤',
+  'fabric.theme.subtle-gray': '⁣⁢Subtle gray‍‍‍⁡⁠‍⁠‍⁡⁠⁣⁤',
+  'fabric.theme.subtle-green': '⁣⁢Subtle green؜⁡⁡‍‌؜⁡⁣⁤',
+  'fabric.theme.subtle-magenta': '⁣⁢Subtle magenta‌⁡⁡⁠⁡⁠⁡؜⁠⁣⁤',
+  'fabric.theme.subtle-orange': '⁣⁢Subtle orange‌⁡⁠⁡⁡⁡⁠⁣⁤',
+  'fabric.theme.subtle-purple': '⁣⁢Subtle purple⁠⁠‍‍⁠‍؜⁡⁠⁡⁣⁤',
+  'fabric.theme.subtle-red': '⁣⁢Subtle red⁠‌‍‌⁡‍⁣⁤',
+  'fabric.theme.subtle-teal': '⁣⁢Subtle teal‍‌‍⁠⁡؜‍؜؜⁣⁤',
+  'fabric.theme.subtle-yellow': '⁣⁢Subtle yellow‍‍⁡⁠⁡؜؜‌؜؜؜⁣⁤',
   'fabric.theme.teal': '⁣⁢Teal⁡⁡⁠‍؜‍‌؜⁣⁤',
   'fabric.theme.white': '⁣⁢White⁡‌‌؜⁠⁡⁠‌‌؜⁣⁤',
   'fabric.theme.yellow': '⁣⁢Yellow‌⁡⁠‍؜⁡‌‌⁠‌‌‍⁡⁠‍؜⁣⁤'

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ 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) { _defineProperty(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 SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "74.2.0";
+var packageVersion = "74.3.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/styles/shared/table.js

@@ -38,11 +38,11 @@ export var TableSharedCssClassName = {
 };
 var tableSharedStyle = function tableSharedStyle(props) {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", "\n  .", " {\n    position: relative;\n    margin: 0 auto ", "px;\n    box-sizing: border-box;\n\n    /**\n     * Fix block top alignment inside table cells.\n     */\n    .decisionItemView-content-wrap:first-of-type > div {\n      margin-top: 0;\n    }\n  }\n  .", "[data-number-column='true'] {\n    padding-left: ", "px;\n    clear: both;\n  }\n  .", " > table {\n    margin: ", "px 0 0 0;\n  }\n\n  .", " > table,\n  .", " > table {\n    margin: ", "px ", "px 0 0;\n  }\n\n  /* avoid applying styles to nested tables (possible via extensions) */\n  .", " > table,\n  .", " > table,\n  .", " > table {\n    border-collapse: collapse;\n    border: ", "px solid\n      ", ";\n    table-layout: fixed;\n    font-size: 1em;\n    width: 100%;\n\n    &[data-autosize='true'] {\n      table-layout: auto;\n    }\n\n    & {\n      * {\n        box-sizing: border-box;\n      }\n      hr {\n        box-sizing: content-box;\n      }\n\n      tbody {\n        border-bottom: none;\n      }\n      th td {\n        background-color: ", ";\n      }\n      th,\n      td {\n        min-width: ", "px;\n        font-weight: normal;\n        vertical-align: top;\n        border: 1px solid\n          ", ";\n        border-right-width: 0;\n        border-bottom-width: 0;\n        padding: ", "px;\n        /* https://stackoverflow.com/questions/7517127/borders-not-shown-in-firefox-with-border-collapse-on-table-position-relative-o */\n        ", "\n\n        ", ";\n\n        > :first-child:not(style),\n        > style:first-child + * {\n          margin-top: 0;\n        }\n\n        > .ProseMirror-gapcursor:first-child + *,\n        > style:first-child + .ProseMirror-gapcursor + * {\n          margin-top: 0;\n        }\n\n        > .ProseMirror-gapcursor:first-child + span + *,\n        > style:first-child + .ProseMirror-gapcursor + span + * {\n          margin-top: 0;\n        }\n\n        th p:not(:first-of-type),\n        td p:not(:first-of-type) {\n          margin-top: 12px;\n        }\n      }\n      th {\n        background-color: ", ";\n        text-align: left;\n\n        /* only apply this styling to codeblocks in default background headercells */\n        /* TODO this needs to be overhauled as it relies on unsafe selectors */\n        &:not([style]):not(.danger) {\n          .", ":not(.danger) {\n            background-color: ", ";\n\n            :not(.", ") {\n              box-shadow: 0px 0px 0px 1px\n                ", ";\n            }\n\n            .", " {\n              background-image: ", ";\n\n              background-color: ", ";\n            }\n\n            .", " {\n              background-color: ", ";\n            }\n\n            /* this is only relevant to the element taken care of by renderer */\n            > [data-ds--code--code-block] {\n              background-image: ", "!important;\n\n              background-color: ", "!important;\n\n              // selector lives inside @atlaskit/code\n              --ds--code--line-number-bg-color: ", ";\n            }\n          }\n        }\n      }\n    }\n  }\n"])), tableCellBackgroundStyleOverride(), TableSharedCssClassName.TABLE_CONTAINER, tableMarginBottom, TableSharedCssClassName.TABLE_CONTAINER, akEditorTableNumberColumnWidth - 1, TableSharedCssClassName.TABLE_NODE_WRAPPER, tableMarginTop, TableSharedCssClassName.TABLE_CONTAINER, TableSharedCssClassName.TABLE_STICKY_WRAPPER, tableMarginTop, tableMarginSides, TableSharedCssClassName.TABLE_CONTAINER, TableSharedCssClassName.TABLE_NODE_WRAPPER, TableSharedCssClassName.TABLE_STICKY_WRAPPER, tableCellBorderWidth, themed({
-    light: "var(--ds-border, ".concat(akEditorTableBorder, ")"),
-    dark: "var(--ds-border, ".concat(akEditorTableBorderDark, ")")
+    light: "var(--ds-background-accent-gray-subtler, ".concat(akEditorTableBorder, ")"),
+    dark: "var(--ds-background-accent-gray-subtler, ".concat(akEditorTableBorderDark, ")")
   })(props), "var(--ds-background-neutral-subtle, white)", tableCellMinWidth, themed({
-    light: "var(--ds-border, ".concat(akEditorTableBorder, ")"),
-    dark: "var(--ds-border, ".concat(akEditorTableBorderDark, ")")
+    light: "var(--ds-background-accent-gray-subtler, ".concat(akEditorTableBorder, ")"),
+    dark: "var(--ds-background-accent-gray-subtler, ".concat(akEditorTableBorderDark, ")")
   })(props), tableCellPadding, browser.gecko || browser.ie || browser.mac && browser.chrome ? 'background-clip: padding-box;' : '', themed({
     dark: getTableCellBackgroundDarkModeColors
   })(props), themed({

package/dist/esm/ui/DropList/index.js

@@ -15,15 +15,12 @@ import { css, jsx } from '@emotion/react';
 import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { DN50, DN600, N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import { themed } from '@atlaskit/theme/components';
-// eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
-import { borderRadius, gridSize } from '@atlaskit/theme/constants';
+import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.2.0";
+var packageVersion = "74.3.0";
 var halfFocusRing = 1;
-// TODO: Migrate away from gridSize
-// Recommendation: Replace gridSize with token('space.100', '8px') after verfiying Popper can accept this
-var dropOffset = "0, ".concat(gridSize(), "px");
+var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {
   _inherits(DropList, _Component);
   var _super = _createSuper(DropList);

package/dist/esm/ui/Expand/index.js

@@ -75,9 +75,7 @@ export var ExpandLayoutWrapperWithRef = /*#__PURE__*/forwardRef(function (props,
 var containerStyles = function containerStyles(styleProps) {
   var expanded = styleProps.expanded,
     focused = styleProps.focused;
-  // TODO: Migrate away from gridSize
-  // Recommendation: Verify if this is intentional: 8 / 4 / 14 rem = 4.57px?
-  var marginTop = "".concat(gridSize() / 2 / fontSize(), "rem");
+  var marginTop = "var(--ds-space-050, 0.25rem)";
   var marginBottom = 0;
   // Only only these margins if the expand isn't editable
   // and is the root level expand.

package/dist/esm/ui-menu/ToolbarButton/index.js

@@ -3,6 +3,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 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) { _defineProperty(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; }
+// This file is copied to `packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/ToolbarButton/index.tsx`
+// If you make any change here, copy it to above file as well
+//  and notify about the change in #team-fc-editor-ai-dev channel.
 /** @jsx jsx */
 import React, { useCallback } from 'react';
 import { css, jsx } from '@emotion/react';

package/dist/esm/ui-menu/ToolbarButton/styles.js

@@ -1,4 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
+// This file is copied to `packages/editor/editor-plugin-ai/src/ui/components/AtlassianIntelligenceToolbarButton/ToolbarButton/styles.tsx`
+// If you make any change here, copy it to above file as well
+//  and notify about the change in #team-fc-editor-ai-dev channel.
 import React from 'react';
 import Button from '@atlaskit/button/standard-button';
 export default /*#__PURE__*/React.forwardRef(function (props, ref) {

package/dist/esm/utils/compareNodes.js

@@ -17,46 +17,59 @@ function getLinkMark(node) {
     linkMark = _node$marks$filter2[0];
   return linkMark || null;
 }
-
-// Source: https://stackoverflow.com/questions/12004808/does-javascript-take-local-decimal-separators-into-account
-function parseLocaleNumber(stringNumber) {
-  if (stringNumber.trim() === '') {
+function parseLocaleNumber(stringNumber, groupPattern, fractionPattern) {
+  if (!stringNumber.trim().length) {
     return null;
   }
-  var locale = window.navigator.language;
-  var thousandSeparator = Intl.NumberFormat(locale).format(11111).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, '');
-  var decimalSeparator = Intl.NumberFormat(locale).format(1.1).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, '');
-  var maybeANumber = Number(stringNumber.replace(new RegExp('\\' + thousandSeparator, 'g'), '').replace(new RegExp('\\' + decimalSeparator), '.'));
-  var isANumber = !Number.isNaN(maybeANumber);
-  if (!isANumber) {
+  var maybeANumber = Number.parseFloat(stringNumber.replace(groupPattern, '').replace(fractionPattern, '.'));
+  if (Number.isNaN(maybeANumber)) {
     return null;
   }
   return maybeANumber;
 }
-function extractFirstWordFromString(text) {
-  // Firefox is the only browser that doesn't support it
-  if (!Intl || !Intl.Segmenter) {
-    // If the Segment API is not available
-    // let's fallback to a dumb way to extract the first word.
-    // However, this method doesn't cover some languages like Japanase
-    var firstEmptySpace = text.indexOf(' ');
-    var firstWord = firstEmptySpace !== -1 ? text.substring(0, firstEmptySpace) : text;
-    return firstWord;
-  }
-  var languageSegment = new Intl.Segmenter(window.navigator.language, {
-    granularity: 'word'
-  });
-  var segmentsIterator = languageSegment.segment(text);
-  if (!segmentsIterator) {
-    return text;
-  }
-  var segmentsArray = Array.from(segmentsIterator);
-  if (segmentsArray.length === 0) {
-    return text;
-  }
-  return segmentsArray[0].segment;
+export function createNormalizeTextParser() {
+  // Source: https://stackoverflow.com/questions/12004808/does-javascript-take-local-decimal-separators-into-account
+  var locale = window.navigator.language;
+  var thousandSeparator = Intl.NumberFormat(locale).format(11111).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, '');
+  var decimalSeparator = Intl.NumberFormat(locale).format(1.1).replace(/(?:[0-9\xB2\xB3\xB9\xBC-\xBE\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u0966-\u096F\u09E6-\u09EF\u09F4-\u09F9\u0A66-\u0A6F\u0AE6-\u0AEF\u0B66-\u0B6F\u0B72-\u0B77\u0BE6-\u0BF2\u0C66-\u0C6F\u0C78-\u0C7E\u0CE6-\u0CEF\u0D58-\u0D5E\u0D66-\u0D78\u0DE6-\u0DEF\u0E50-\u0E59\u0ED0-\u0ED9\u0F20-\u0F33\u1040-\u1049\u1090-\u1099\u1369-\u137C\u16EE-\u16F0\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1946-\u194F\u19D0-\u19DA\u1A80-\u1A89\u1A90-\u1A99\u1B50-\u1B59\u1BB0-\u1BB9\u1C40-\u1C49\u1C50-\u1C59\u2070\u2074-\u2079\u2080-\u2089\u2150-\u2182\u2185-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2CFD\u3007\u3021-\u3029\u3038-\u303A\u3192-\u3195\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\uA620-\uA629\uA6E6-\uA6EF\uA830-\uA835\uA8D0-\uA8D9\uA900-\uA909\uA9D0-\uA9D9\uA9F0-\uA9F9\uAA50-\uAA59\uABF0-\uABF9\uFF10-\uFF19]|\uD800[\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDEE1-\uDEFB\uDF20-\uDF23\uDF41\uDF4A\uDFD1-\uDFD5]|\uD801[\uDCA0-\uDCA9]|\uD802[\uDC58-\uDC5F\uDC79-\uDC7F\uDCA7-\uDCAF\uDCFB-\uDCFF\uDD16-\uDD1B\uDDBC\uDDBD\uDDC0-\uDDCF\uDDD2-\uDDFF\uDE40-\uDE48\uDE7D\uDE7E\uDE9D-\uDE9F\uDEEB-\uDEEF\uDF58-\uDF5F\uDF78-\uDF7F\uDFA9-\uDFAF]|\uD803[\uDCFA-\uDCFF\uDD30-\uDD39\uDE60-\uDE7E\uDF1D-\uDF26\uDF51-\uDF54\uDFC5-\uDFCB]|\uD804[\uDC52-\uDC6F\uDCF0-\uDCF9\uDD36-\uDD3F\uDDD0-\uDDD9\uDDE1-\uDDF4\uDEF0-\uDEF9]|\uD805[\uDC50-\uDC59\uDCD0-\uDCD9\uDE50-\uDE59\uDEC0-\uDEC9\uDF30-\uDF3B]|\uD806[\uDCE0-\uDCF2\uDD50-\uDD59]|\uD807[\uDC50-\uDC6C\uDD50-\uDD59\uDDA0-\uDDA9\uDF50-\uDF59\uDFC0-\uDFD4]|\uD809[\uDC00-\uDC6E]|\uD81A[\uDE60-\uDE69\uDEC0-\uDEC9\uDF50-\uDF59\uDF5B-\uDF61]|\uD81B[\uDE80-\uDE96]|\uD834[\uDEC0-\uDED3\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDFCE-\uDFFF]|\uD838[\uDD40-\uDD49\uDEF0-\uDEF9]|\uD839[\uDCF0-\uDCF9]|\uD83A[\uDCC7-\uDCCF\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9])/g, '');
+  var numericPattern = new RegExp("(\\d+(?:[".concat(thousandSeparator).concat(decimalSeparator, "]?\\d+)*)"), 'g');
+  var thousandSeparatorPattern = new RegExp('\\' + thousandSeparator, 'g');
+  var decimalSeparatorPattern = new RegExp('\\' + decimalSeparator);
+  return function (text) {
+    if (!text.trim().length) {
+      return null;
+    }
+
+    // This will break the text apart at the locations of the formatted numbers
+    var result = text.split(numericPattern);
+
+    // We then put the text back together but with all the formatted numbers converted back to plain numerals,
+    // for example a sentence like "What is 1,000.01% of 10,000.01" would be normalized and sorted as
+    // if it's saying "What is 1000.01% of 10000.01". This way the Intl.Collator can use the numeric setting to sort
+    // numeral values within string correctly.
+    var tokens = result.reduce(function (acc, stringNumber) {
+      if (!(stringNumber !== null && stringNumber !== void 0 && stringNumber.length)) {
+        return acc;
+      }
+      var maybeANumber = parseLocaleNumber(stringNumber, thousandSeparatorPattern, decimalSeparatorPattern);
+
+      // NOTE: We know there can only be a single decimal separator. So we can assume that if the first found separator
+      // is not at the same position as the last found one, then we can assume the locale used to format the number
+      // is different to our locale. This will result in the value being treated as a string.
+      if (maybeANumber !== null && stringNumber.indexOf(decimalSeparator) === stringNumber.lastIndexOf(decimalSeparator)) {
+        acc.push(maybeANumber);
+      } else {
+        acc.push(stringNumber);
+      }
+      return acc;
+    }, []);
+    if (tokens.length === 1) {
+      return tokens[0];
+    }
+    return tokens.join('');
+  };
 }
-export function extractMetaFromTextNode(textNode) {
+export function extractMetaFromTextNode(textNode, normalizeTextParser) {
   // treat as a link if contain a link
   var linkMark = getLinkMark(textNode);
   if (linkMark) {
@@ -67,20 +80,19 @@ export function extractMetaFromTextNode(textNode) {
     };
   }
   var text = textNode.text || '';
-  var firstWord = extractFirstWordFromString(text);
-  var maybeANumber = parseLocaleNumber(firstWord);
-  if (maybeANumber !== null) {
+  var normalizedText = normalizeTextParser(text);
+  if (typeof normalizedText === 'number') {
     return {
       type: ContentType.NUMBER,
-      value: maybeANumber
+      value: normalizedText
     };
   }
   return {
     type: ContentType.TEXT,
-    value: firstWord
+    value: normalizedText !== null && normalizedText !== void 0 ? normalizedText : text
   };
 }
-function getMetaFromNode(node, options) {
+function getMetaFromNode(node, options, normalizeTextParser) {
   if (!node) {
     return null;
   }
@@ -93,12 +105,12 @@ function getMetaFromNode(node, options) {
     /*
       Get Meta value from the first child if the cell is of type
         * Heading (Any cell where the text is set to a heading type)
-        * Paragraph (Normal text) 
+        * Paragraph (Normal text)
      */
     case 'heading':
     case 'paragraph':
       {
-        return getMetaFromNode(firstChild, options);
+        return getMetaFromNode(firstChild, options, normalizeTextParser);
       }
     case 'inlineCard':
       {
@@ -118,14 +130,14 @@ function getMetaFromNode(node, options) {
       }
     case 'text':
       {
-        return extractMetaFromTextNode(firstChild);
+        return extractMetaFromTextNode(firstChild, normalizeTextParser);
       }
     case 'status':
       {
-        var text = firstChild.attrs.text;
+        var _text = firstChild.attrs.text;
         return {
           type: ContentType.STATUS,
-          value: text
+          value: _text
         };
       }
     case 'date':
@@ -139,10 +151,10 @@ function getMetaFromNode(node, options) {
     case 'mention':
       {
         // TODO: Check what should be the fallback when mention does not have a text
-        var _text = firstChild.attrs.text || '';
+        var _text2 = firstChild.attrs.text || '';
         return {
           type: ContentType.MENTION,
-          value: _text.toLowerCase()
+          value: _text2.toLowerCase()
         };
       }
     default:
@@ -155,7 +167,8 @@ function compareValue(valueA, valueB) {
   }
   if (typeof valueA === 'string' && typeof valueB === 'string') {
     return valueA.localeCompare(valueB, window.navigator.language, {
-      caseFirst: 'upper'
+      caseFirst: 'upper',
+      numeric: true
     });
   }
   return valueA > valueB ? 1 : -1;
@@ -187,11 +200,12 @@ function compareValue(valueA, valueB) {
  */
 export var createCompareNodes = function createCompareNodes(options) {
   var order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SortOrder.ASC;
+  var normalizeTextParser = createNormalizeTextParser();
   return function (nodeA, nodeB) {
-    var metaNodeA = getMetaFromNode(nodeA, options);
-    var metaNodeB = getMetaFromNode(nodeB, options);
-    /*  
-      Donot switch the order (Asec or Desc) if either node is null. 
+    var metaNodeA = getMetaFromNode(nodeA, options, normalizeTextParser);
+    var metaNodeB = getMetaFromNode(nodeB, options, normalizeTextParser);
+    /*
+      Donot switch the order (Asec or Desc) if either node is null.
       This will ensure that empty cells are always at the bottom during sorting.
     */
     if (metaNodeA === null || metaNodeB === null) {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.2.0",
+	"version": "74.3.0",
 	"sideEffects": false
 }