@atlaskit/editor-common 86.1.0 → 86.2.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-common
 
+## 86.2.1
+
+### Patch Changes
+
+- [#121315](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/121315)
+  [`f550b1a0c6e85`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f550b1a0c6e85) -
+  [ux] ED-24237 Fix comment appearances in renderer to match editor
+- [#120992](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/120992)
+  [`a61cfb5567823`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a61cfb5567823) -
+  ED-23357 Update annotation node name calculations to avoid crashes on invalid ranges
+- Updated dependencies
+
+## 86.2.0
+
+### Minor Changes
+
+- [`ca831efa17dd5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ca831efa17dd5) -
+  [ED-23922] Added utility to count the number of unique elements, text formats, macros and layouts
+  in a JSONDocNode or JSONNode
+
+### Patch Changes
+
+- [#121046](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/121046)
+  [`c5cbf1d63b0c8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c5cbf1d63b0c8) -
+  [ED-24241] Memonize the document.body to avoid multiple Layout Reflows for the same page
+
 ## 86.1.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 = "86.1.0";
+var packageVersion = "86.2.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/styles/shared/annotation.js

@@ -36,7 +36,9 @@ var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function A
         borderBottom: '2px solid transparent',
         cursor: 'pointer',
         padding: '1px 0 2px',
-        '&:has(.card), &:has([data-inline-card])': {
+        '&:has(.card), &:has([data-inline-card])': (0, _platformFeatureFlags.fg)('annotations_align_editor_and_renderer_styles') ? {
+          padding: '5px 0 3px 0'
+        } : {
           paddingTop: '4px',
           border: 'none',
           boxShadow: "0 2px 0 0 ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")"))

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

@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
 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; })(); } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "86.1.0";
+var packageVersion = "86.2.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/ui/WidthProvider/index.js

@@ -11,6 +11,7 @@ exports.getBreakpoint = getBreakpoint;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
+var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _widthDetector = require("@atlaskit/width-detector");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -45,13 +46,28 @@ function createWidthContext() {
 var WidthContext = exports.WidthContext = /*#__PURE__*/_react.default.createContext(createWidthContext());
 var Provider = WidthContext.Provider,
   Consumer = exports.WidthConsumer = WidthContext.Consumer;
-var WidthProvider = exports.WidthProvider = function WidthProvider(_ref) {
+/**
+ * 🧱 Internal function: Editor FE Platform
+ *
+ * Returns the width of the document body.
+ *
+ * This function is memoized to avoid forcing a layout reflow multiple times.
+ * It uses `document.body.offsetWidth` as the source of the width, which can lead to
+ * a layout reflow if accessed repeatedly. To mitigate performance issues, the result
+ * is cached using `memoizeOne`.
+ *
+ * @returns {number} The width of the document body or 0 if the document is undefined.
+ */
+var getBodyWidth = (0, _memoizeOne.default)(function () {
   var _document$body$offset, _document$body;
+  return typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0;
+});
+var WidthProvider = exports.WidthProvider = function WidthProvider(_ref) {
   var className = _ref.className,
     shouldCheckExistingValue = _ref.shouldCheckExistingValue,
     children = _ref.children;
   var existingContextValue = _react.default.useContext(WidthContext);
-  var _React$useState = _react.default.useState(typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0),
+  var _React$useState = _react.default.useState(getBodyWidth),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     width = _React$useState2[0],
     setWidth = _React$useState2[1];

package/dist/cjs/utils/annotation/index.js

@@ -107,15 +107,23 @@ function getRangeInlineNodeNames(_ref) {
     return undefined;
   }
   var nodeNames = new Set();
-  doc.nodesBetween(pos.from, pos.to, function (node) {
-    if (node.isInline) {
-      nodeNames.add(node.type.name);
-    }
-  });
+  try {
+    doc.nodesBetween(pos.from, pos.to, function (node) {
+      if (node.isInline) {
+        nodeNames.add(node.type.name);
+      }
+    });
 
-  // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
-  var sortedNames = (0, _toConsumableArray2.default)(nodeNames).sort();
-  return sortedNames;
+    // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
+    var sortedNames = (0, _toConsumableArray2.default)(nodeNames).sort();
+    return sortedNames;
+  } catch (_unused) {
+    // Some callers have existing gaps where the positions are not valid,
+    // and so when called in the current document can throw an error if out of range.
+    //
+    // This is a defensive check to ensure we don't throw an error in those cases.
+    return undefined;
+  }
 }
 
 /**

package/dist/cjs/utils/index.js

@@ -492,6 +492,12 @@ Object.defineProperty(exports, "getOrderFromOrderedListNode", {
     return _list.getOrderFromOrderedListNode;
   }
 });
+Object.defineProperty(exports, "getPageElementCounts", {
+  enumerable: true,
+  get: function get() {
+    return _pageElementCounts.getPageElementCounts;
+  }
+});
 Object.defineProperty(exports, "getPerformanceOptions", {
   enumerable: true,
   get: function get() {
@@ -1181,6 +1187,7 @@ var _insertNodeIntoOrderedList = require("./insert-node-into-ordered-list");
 var _wrapSelectionIn = require("./wrap-selection-in");
 var _calculateToolbarPosition = require("./calculate-toolbar-position");
 var _nodesByLocalIds = require("./nodes-by-localIds");
+var _pageElementCounts = require("./page-element-counts");
 /**
  * @deprecated - [ED-23844] moving to own entry point @atlaskit/editor-common/whitespace
  */

package/dist/cjs/utils/page-element-counts.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPageElementCounts = void 0;
+var _traverse = require("@atlaskit/adf-utils/traverse");
+/**
+ * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
+ *
+ **/
+var getPageElementCounts = exports.getPageElementCounts = function getPageElementCounts(doc) {
+  var pageElementCounts = {
+    elements: {},
+    textFormats: {},
+    macros: {}
+  };
+  (0, _traverse.reduce)(doc, function (acc, node) {
+    if (node.type === 'text') {
+      var _acc$elements$node$ty;
+      if (node.marks) {
+        node.marks.forEach(function (mark) {
+          var _acc$textFormats$mark;
+          var markType = mark.type;
+          acc.textFormats[markType] = ((_acc$textFormats$mark = acc.textFormats[markType]) !== null && _acc$textFormats$mark !== void 0 ? _acc$textFormats$mark : 0) + 1;
+        });
+      }
+      acc.elements[node.type] = ((_acc$elements$node$ty = acc.elements[node.type]) !== null && _acc$elements$node$ty !== void 0 ? _acc$elements$node$ty : 0) + 1;
+    }
+    // If the node is a 'macro'or extension
+    else if (node.type === 'extension' || node.type === 'inlineExtension' || node.type === 'bodiedExtension' || node.type === 'multiBodiedExtension' || node.type === 'extensionFrame') {
+      if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
+        var _acc$macros$extension;
+        var extensionKey = node.attrs.extensionKey;
+        acc.macros[extensionKey] = ((_acc$macros$extension = acc.macros[extensionKey]) !== null && _acc$macros$extension !== void 0 ? _acc$macros$extension : 0) + 1;
+      }
+    } else {
+      var _acc$elements$node$ty2;
+      acc.elements[node.type] = ((_acc$elements$node$ty2 = acc.elements[node.type]) !== null && _acc$elements$node$ty2 !== void 0 ? _acc$elements$node$ty2 : 0) + 1;
+    }
+    return acc;
+  }, pageElementCounts);
+  return pageElementCounts;
+};

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "86.1.0";
+const packageVersion = "86.2.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/styles/shared/annotation.js

@@ -28,7 +28,9 @@ export const AnnotationSharedCSSByState = () => {
         borderBottom: '2px solid transparent',
         cursor: 'pointer',
         padding: '1px 0 2px',
-        '&:has(.card), &:has([data-inline-card])': {
+        '&:has(.card), &:has([data-inline-card])': fg('annotations_align_editor_and_renderer_styles') ? {
+          padding: '5px 0 3px 0'
+        } : {
           paddingTop: '4px',
           border: 'none',
           boxShadow: `0 2px 0 0 ${`var(--ds-border-accent-yellow, ${Y200a})`}`

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

@@ -9,7 +9,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "86.1.0";
+const packageVersion = "86.2.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -3,6 +3,7 @@ import React, { Fragment } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
+import memoizeOne from 'memoize-one';
 import rafSchedule from 'raf-schd';
 import { WidthObserver } from '@atlaskit/width-detector';
 const styles = css({
@@ -31,14 +32,29 @@ const {
   Provider,
   Consumer
 } = WidthContext;
+/**
+ * 🧱 Internal function: Editor FE Platform
+ *
+ * Returns the width of the document body.
+ *
+ * This function is memoized to avoid forcing a layout reflow multiple times.
+ * It uses `document.body.offsetWidth` as the source of the width, which can lead to
+ * a layout reflow if accessed repeatedly. To mitigate performance issues, the result
+ * is cached using `memoizeOne`.
+ *
+ * @returns {number} The width of the document body or 0 if the document is undefined.
+ */
+const getBodyWidth = memoizeOne(() => {
+  var _document$body$offset, _document$body;
+  return typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0;
+});
 export const WidthProvider = ({
   className,
   shouldCheckExistingValue,
   children
 }) => {
-  var _document$body$offset, _document$body;
   const existingContextValue = React.useContext(WidthContext);
-  const [width, setWidth] = React.useState(typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0);
+  const [width, setWidth] = React.useState(getBodyWidth);
   const widthRef = React.useRef(width);
   const isMountedRef = React.useRef(true);
   const providerValue = React.useMemo(() => createWidthContext(width), [width]);

package/dist/es2019/utils/annotation/index.js

@@ -105,15 +105,23 @@ export function getRangeInlineNodeNames({
     return undefined;
   }
   let nodeNames = new Set();
-  doc.nodesBetween(pos.from, pos.to, node => {
-    if (node.isInline) {
-      nodeNames.add(node.type.name);
-    }
-  });
+  try {
+    doc.nodesBetween(pos.from, pos.to, node => {
+      if (node.isInline) {
+        nodeNames.add(node.type.name);
+      }
+    });
 
-  // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
-  const sortedNames = [...nodeNames].sort();
-  return sortedNames;
+    // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
+    const sortedNames = [...nodeNames].sort();
+    return sortedNames;
+  } catch {
+    // Some callers have existing gaps where the positions are not valid,
+    // and so when called in the current document can throw an error if out of range.
+    //
+    // This is a defensive check to ensure we don't throw an error in those cases.
+    return undefined;
+  }
 }
 
 /**

package/dist/es2019/utils/index.js

@@ -221,4 +221,5 @@ export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from './calculate-toolbar-position';
-export { findNodePosByLocalIds } from './nodes-by-localIds';
+export { findNodePosByLocalIds } from './nodes-by-localIds';
+export { getPageElementCounts } from './page-element-counts';

package/dist/es2019/utils/page-element-counts.js

@@ -0,0 +1,38 @@
+import { reduce } from '@atlaskit/adf-utils/traverse';
+/**
+ * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
+ *
+ **/
+export const getPageElementCounts = doc => {
+  const pageElementCounts = {
+    elements: {},
+    textFormats: {},
+    macros: {}
+  };
+  reduce(doc, (acc, node) => {
+    if (node.type === 'text') {
+      var _acc$elements$node$ty;
+      if (node.marks) {
+        node.marks.forEach(mark => {
+          var _acc$textFormats$mark;
+          const markType = mark.type;
+          acc.textFormats[markType] = ((_acc$textFormats$mark = acc.textFormats[markType]) !== null && _acc$textFormats$mark !== void 0 ? _acc$textFormats$mark : 0) + 1;
+        });
+      }
+      acc.elements[node.type] = ((_acc$elements$node$ty = acc.elements[node.type]) !== null && _acc$elements$node$ty !== void 0 ? _acc$elements$node$ty : 0) + 1;
+    }
+    // If the node is a 'macro'or extension
+    else if (node.type === 'extension' || node.type === 'inlineExtension' || node.type === 'bodiedExtension' || node.type === 'multiBodiedExtension' || node.type === 'extensionFrame') {
+      if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
+        var _acc$macros$extension;
+        const extensionKey = node.attrs.extensionKey;
+        acc.macros[extensionKey] = ((_acc$macros$extension = acc.macros[extensionKey]) !== null && _acc$macros$extension !== void 0 ? _acc$macros$extension : 0) + 1;
+      }
+    } else {
+      var _acc$elements$node$ty2;
+      acc.elements[node.type] = ((_acc$elements$node$ty2 = acc.elements[node.type]) !== null && _acc$elements$node$ty2 !== void 0 ? _acc$elements$node$ty2 : 0) + 1;
+    }
+    return acc;
+  }, pageElementCounts);
+  return pageElementCounts;
+};

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "86.1.0";
+var packageVersion = "86.2.1";
 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/annotation.js

@@ -30,7 +30,9 @@ export var AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
         borderBottom: '2px solid transparent',
         cursor: 'pointer',
         padding: '1px 0 2px',
-        '&:has(.card), &:has([data-inline-card])': {
+        '&:has(.card), &:has([data-inline-card])': fg('annotations_align_editor_and_renderer_styles') ? {
+          padding: '5px 0 3px 0'
+        } : {
           paddingTop: '4px',
           border: 'none',
           boxShadow: "0 2px 0 0 ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")"))

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

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "86.1.0";
+var packageVersion = "86.2.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -4,6 +4,7 @@ import React, { Fragment } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
+import memoizeOne from 'memoize-one';
 import rafSchedule from 'raf-schd';
 import { WidthObserver } from '@atlaskit/width-detector';
 var styles = css({
@@ -32,13 +33,28 @@ export function createWidthContext() {
 export var WidthContext = /*#__PURE__*/React.createContext(createWidthContext());
 var Provider = WidthContext.Provider,
   Consumer = WidthContext.Consumer;
-export var WidthProvider = function WidthProvider(_ref) {
+/**
+ * 🧱 Internal function: Editor FE Platform
+ *
+ * Returns the width of the document body.
+ *
+ * This function is memoized to avoid forcing a layout reflow multiple times.
+ * It uses `document.body.offsetWidth` as the source of the width, which can lead to
+ * a layout reflow if accessed repeatedly. To mitigate performance issues, the result
+ * is cached using `memoizeOne`.
+ *
+ * @returns {number} The width of the document body or 0 if the document is undefined.
+ */
+var getBodyWidth = memoizeOne(function () {
   var _document$body$offset, _document$body;
+  return typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0;
+});
+export var WidthProvider = function WidthProvider(_ref) {
   var className = _ref.className,
     shouldCheckExistingValue = _ref.shouldCheckExistingValue,
     children = _ref.children;
   var existingContextValue = React.useContext(WidthContext);
-  var _React$useState = React.useState(typeof document !== 'undefined' ? (_document$body$offset = (_document$body = document.body) === null || _document$body === void 0 ? void 0 : _document$body.offsetWidth) !== null && _document$body$offset !== void 0 ? _document$body$offset : 0 : 0),
+  var _React$useState = React.useState(getBodyWidth),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     width = _React$useState2[0],
     setWidth = _React$useState2[1];

package/dist/esm/utils/annotation/index.js

@@ -95,15 +95,23 @@ export function getRangeInlineNodeNames(_ref) {
     return undefined;
   }
   var nodeNames = new Set();
-  doc.nodesBetween(pos.from, pos.to, function (node) {
-    if (node.isInline) {
-      nodeNames.add(node.type.name);
-    }
-  });
+  try {
+    doc.nodesBetween(pos.from, pos.to, function (node) {
+      if (node.isInline) {
+        nodeNames.add(node.type.name);
+      }
+    });
 
-  // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
-  var sortedNames = _toConsumableArray(nodeNames).sort();
-  return sortedNames;
+    // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
+    var sortedNames = _toConsumableArray(nodeNames).sort();
+    return sortedNames;
+  } catch (_unused) {
+    // Some callers have existing gaps where the positions are not valid,
+    // and so when called in the current document can throw an error if out of range.
+    //
+    // This is a defensive check to ensure we don't throw an error in those cases.
+    return undefined;
+  }
 }
 
 /**

package/dist/esm/utils/index.js

@@ -224,4 +224,5 @@ export { transformNodeIntoListItem } from './insert-node-into-ordered-list';
 export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from './calculate-toolbar-position';
-export { findNodePosByLocalIds } from './nodes-by-localIds';
+export { findNodePosByLocalIds } from './nodes-by-localIds';
+export { getPageElementCounts } from './page-element-counts';

package/dist/esm/utils/page-element-counts.js

@@ -0,0 +1,38 @@
+import { reduce } from '@atlaskit/adf-utils/traverse';
+/**
+ * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
+ *
+ **/
+export var getPageElementCounts = function getPageElementCounts(doc) {
+  var pageElementCounts = {
+    elements: {},
+    textFormats: {},
+    macros: {}
+  };
+  reduce(doc, function (acc, node) {
+    if (node.type === 'text') {
+      var _acc$elements$node$ty;
+      if (node.marks) {
+        node.marks.forEach(function (mark) {
+          var _acc$textFormats$mark;
+          var markType = mark.type;
+          acc.textFormats[markType] = ((_acc$textFormats$mark = acc.textFormats[markType]) !== null && _acc$textFormats$mark !== void 0 ? _acc$textFormats$mark : 0) + 1;
+        });
+      }
+      acc.elements[node.type] = ((_acc$elements$node$ty = acc.elements[node.type]) !== null && _acc$elements$node$ty !== void 0 ? _acc$elements$node$ty : 0) + 1;
+    }
+    // If the node is a 'macro'or extension
+    else if (node.type === 'extension' || node.type === 'inlineExtension' || node.type === 'bodiedExtension' || node.type === 'multiBodiedExtension' || node.type === 'extensionFrame') {
+      if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
+        var _acc$macros$extension;
+        var extensionKey = node.attrs.extensionKey;
+        acc.macros[extensionKey] = ((_acc$macros$extension = acc.macros[extensionKey]) !== null && _acc$macros$extension !== void 0 ? _acc$macros$extension : 0) + 1;
+      }
+    } else {
+      var _acc$elements$node$ty2;
+      acc.elements[node.type] = ((_acc$elements$node$ty2 = acc.elements[node.type]) !== null && _acc$elements$node$ty2 !== void 0 ? _acc$elements$node$ty2 : 0) + 1;
+    }
+    return acc;
+  }, pageElementCounts);
+  return pageElementCounts;
+};

package/dist/types/react-node-view/generateUniqueNodeKey.d.ts

@@ -1 +1 @@
-export declare const generateUniqueNodeKey: () => string;
+export declare const generateUniqueNodeKey: () => any;

package/dist/types/styles/shared/annotation.d.ts

@@ -16,9 +16,15 @@ export declare const AnnotationSharedCSSByState: () => {
         cursor: string;
         padding: string;
         '&:has(.card), &:has([data-inline-card])': {
+            padding: string;
+            paddingTop?: undefined;
+            border?: undefined;
+            boxShadow?: undefined;
+        } | {
             paddingTop: string;
             border: string;
             boxShadow: string;
+            padding?: undefined;
         };
         '&:has(.date-lozenger-container)': {
             paddingTop: string;

package/dist/types/utils/index.d.ts

@@ -91,3 +91,4 @@ export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, } from './calculate-toolbar-position';
 export { findNodePosByLocalIds } from './nodes-by-localIds';
+export { getPageElementCounts } from './page-element-counts';

package/dist/types/utils/page-element-counts.d.ts

@@ -0,0 +1,17 @@
+import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
+export type PageElementCounts = {
+    elements: {
+        [key: string]: number;
+    };
+    textFormats: {
+        [key: string]: number;
+    };
+    macros: {
+        [key: string]: number;
+    };
+};
+/**
+ * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
+ *
+ **/
+export declare const getPageElementCounts: (doc: JSONDocNode) => PageElementCounts;

package/dist/types-ts4.5/react-node-view/generateUniqueNodeKey.d.ts

@@ -1 +1 @@
-export declare const generateUniqueNodeKey: () => string;
+export declare const generateUniqueNodeKey: () => any;

package/dist/types-ts4.5/styles/shared/annotation.d.ts

@@ -16,9 +16,15 @@ export declare const AnnotationSharedCSSByState: () => {
         cursor: string;
         padding: string;
         '&:has(.card), &:has([data-inline-card])': {
+            padding: string;
+            paddingTop?: undefined;
+            border?: undefined;
+            boxShadow?: undefined;
+        } | {
             paddingTop: string;
             border: string;
             boxShadow: string;
+            padding?: undefined;
         };
         '&:has(.date-lozenger-container)': {
             paddingTop: string;

package/dist/types-ts4.5/utils/index.d.ts

@@ -91,3 +91,4 @@ export { wrapSelectionIn } from './wrap-selection-in';
 export { toJSON, nodeToJSON } from './nodes';
 export { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead, } from './calculate-toolbar-position';
 export { findNodePosByLocalIds } from './nodes-by-localIds';
+export { getPageElementCounts } from './page-element-counts';

package/dist/types-ts4.5/utils/page-element-counts.d.ts

@@ -0,0 +1,17 @@
+import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
+export type PageElementCounts = {
+    elements: {
+        [key: string]: number;
+    };
+    textFormats: {
+        [key: string]: number;
+    };
+    macros: {
+        [key: string]: number;
+    };
+};
+/**
+ * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
+ *
+ **/
+export declare const getPageElementCounts: (doc: JSONDocNode) => PageElementCounts;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "86.1.0",
+	"version": "86.2.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -103,7 +103,7 @@
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/atlassian-context": "^0.0.0",
-		"@atlaskit/button": "^18.4.0",
+		"@atlaskit/button": "^19.0.0",
 		"@atlaskit/code": "^15.4.0",
 		"@atlaskit/codemod-utils": "^4.2.0",
 		"@atlaskit/custom-steps": "^0.4.0",
@@ -125,7 +125,7 @@
 		"@atlaskit/media-file-preview": "^0.6.0",
 		"@atlaskit/media-picker": "^66.4.0",
 		"@atlaskit/media-ui": "^25.10.0",
-		"@atlaskit/media-viewer": "48.6.11",
+		"@atlaskit/media-viewer": "48.6.12",
 		"@atlaskit/mention": "^23.2.0",
 		"@atlaskit/menu": "^2.8.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
@@ -138,7 +138,7 @@
 		"@atlaskit/task-decision": "^17.10.0",
 		"@atlaskit/textfield": "^6.4.0",
 		"@atlaskit/theme": "^12.11.0",
-		"@atlaskit/tokens": "^1.55.0",
+		"@atlaskit/tokens": "^1.56.0",
 		"@atlaskit/tooltip": "^18.5.0",
 		"@atlaskit/ufo": "^0.2.0",
 		"@atlaskit/width-detector": "^4.2.0",
@@ -176,7 +176,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/media-core": "^34.2.0",
-		"@atlaskit/media-test-helpers": "^33.0.0",
+		"@atlaskit/media-test-helpers": "^34.0.0",
 		"@atlaskit/util-data-test": "^17.9.0",
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/feature-flags-test-utils": "*",
@@ -244,6 +244,9 @@
 		"platform_editor_tables_padding_increase": {
 			"type": "boolean"
 		},
+		"annotations_align_editor_and_renderer_styles": {
+			"type": "boolean"
+		},
 		"platform-editor-a11y-image-border-options-dropdown": {
 			"type": "boolean"
 		},