@atlaskit/editor-common 82.0.1 → 82.1.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-common
 
+## 82.1.0
+
+### Minor Changes
+
+- [#102065](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102065)
+  [`3550442d1b3d2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3550442d1b3d2) -
+  [ux] [ECA11Y-185] Element Browser Modal: Replaced Collection component with Grid in order to
+  layout remains readable when WCAG values are applied
+- [#108459](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108459)
+  [`dff16b735e876`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dff16b735e876) -
+  [ED-23613] Avoid blending background color when inline comments overlap with highlights
+- [#108623](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108623)
+  [`c01339668ebde`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c01339668ebde) -
+  [ux] ED-23617 Add support in editor for comments on status, emoji, date and mention nodes
+- [#108623](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108623)
+  [`5af1dca5d4168`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5af1dca5d4168) -
+  [ux] ED-23616 Introduces support in renderer for commenting on status, emoji, date and mention
+  nodes.
+
+### Patch Changes
+
+- [#108217](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108217)
+  [`97daaf15d02fb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/97daaf15d02fb) -
+  [ED-23052] disable Sentry logging in FedRamp instances
+- Updated dependencies
+
 ## 82.0.1
 
 ### Patch Changes

package/dist/cjs/element-browser/components/ElementList/ElementList.js

@@ -12,7 +12,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
+var _reactVirtualized = require("react-virtualized");
 var _AutoSizer = require("react-virtualized/dist/commonjs/AutoSizer");
+var _CellMeasurer = require("react-virtualized/dist/commonjs/CellMeasurer");
 var _Collection = require("react-virtualized/dist/commonjs/Collection");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -31,7 +33,7 @@ var _types = require("../../types");
 var _cellSizeAndPositionGetter = _interopRequireDefault(require("./cellSizeAndPositionGetter"));
 var _EmptyState = _interopRequireDefault(require("./EmptyState"));
 var _utils = require("./utils");
-var _excluded = ["items", "mode", "selectedItemIndex", "focusedItemIndex", "setColumnCount", "createAnalyticsEvent", "emptyStateHandler", "selectedCategory", "selectedCategoryIndex", "searchTerm", "setFocusedCategoryIndex", "setFocusedItemIndex"];
+var _excluded = ["items", "mode", "selectedItemIndex", "focusedItemIndex", "columnCount", "setColumnCount", "createAnalyticsEvent", "emptyStateHandler", "selectedCategory", "selectedCategoryIndex", "searchTerm", "setFocusedCategoryIndex", "setFocusedItemIndex"];
 /** @jsx jsx */
 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); }
 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; }
@@ -57,6 +59,7 @@ function ElementList(_ref) {
     mode = _ref.mode,
     selectedItemIndex = _ref.selectedItemIndex,
     focusedItemIndex = _ref.focusedItemIndex,
+    columnCount = _ref.columnCount,
     setColumnCount = _ref.setColumnCount,
     createAnalyticsEvent = _ref.createAnalyticsEvent,
     emptyStateHandler = _ref.emptyStateHandler,
@@ -96,11 +99,28 @@ function ElementList(_ref) {
       }
     });
   }, [createAnalyticsEvent]);
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  var cache = new _CellMeasurer.CellMeasurerCache({
+    fixedWidth: true,
+    defaultHeight: _constants2.ELEMENT_ITEM_HEIGHT,
+    minHeight: _constants2.ELEMENT_ITEM_HEIGHT
+  });
+  var columnWidth = (containerWidth - _constants2.ELEMENT_ITEM_PADDING * 2) / columnCount;
+  var rowCount = Math.ceil(items.length / columnCount);
+  var rowHeight = function rowHeight(_ref2) {
+    var index = _ref2.index;
+    return cache.rowHeight({
+      index: index
+    }) <= _constants2.ELEMENT_ITEM_HEIGHT ? _constants2.ELEMENT_ITEM_HEIGHT : cache.rowHeight({
+      index: index
+    }) + _constants2.ELEMENT_ITEM_PADDING * 2;
+  };
   var cellRenderer = (0, _react.useMemo)(function () {
-    return function (_ref2) {
-      var index = _ref2.index,
-        key = _ref2.key,
-        style = _ref2.style;
+    return function (_ref3) {
+      var index = _ref3.index,
+        key = _ref3.key,
+        style = _ref3.style;
       if (items[index] == null) {
         return;
       }
@@ -143,6 +163,61 @@ function ElementList(_ref) {
       }, props)));
     };
   }, [items, fullMode, selectedItemIndex, focusedItemIndex, selectedCategoryIndex, setFocusedCategoryIndex, setFocusedItemIndex, props]);
+  var gridCellRenderer = (0, _react.useMemo)(function () {
+    return function (_ref4) {
+      var columnIndex = _ref4.columnIndex,
+        key = _ref4.key,
+        parent = _ref4.parent,
+        rowIndex = _ref4.rowIndex,
+        style = _ref4.style;
+      var index = rowIndex * columnCount + columnIndex;
+      if (items[index] == null) {
+        return;
+      }
+      return index > items.length - 1 ? null : (0, _react2.jsx)(_CellMeasurer.CellMeasurer, {
+        cache: cache,
+        key: key,
+        rowIndex: rowIndex,
+        columnIndex: columnIndex,
+        parent: parent
+      }, (0, _react2.jsx)("div", {
+        style: style,
+        key: key,
+        className: "element-item-wrapper",
+        css: elementItemWrapper,
+        onKeyDown: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-focus-order-for-element-browser-categories_ztiw1') ? function (e) {
+          if (e.key === 'Tab') {
+            if (e.shiftKey && index === 0) {
+              if (setFocusedCategoryIndex) {
+                if (!!selectedCategoryIndex) {
+                  setFocusedCategoryIndex(selectedCategoryIndex);
+                } else {
+                  setFocusedCategoryIndex(0);
+                }
+                e.preventDefault();
+              }
+            }
+            // before focus jumps from elements list we need to rerender react-virtualized collection.
+            // Otherwise on the next render 'scrollToCell' will have same cached value
+            // and collection will not be scrolled to top.
+            // So Tab press on category will not work anymore due to invisible 1-t element.
+            else if (index === items.length - 2) {
+              setFocusedItemIndex(items.length - 1);
+            }
+          }
+        } : undefined
+      }, (0, _react2.jsx)(MemoizedElementItem, (0, _extends2.default)({
+        inlineMode: !fullMode,
+        index: index,
+        item: items[index],
+        selected: selectedItemIndex === index,
+        focus: focusedItemIndex === index,
+        setFocusedItemIndex: setFocusedItemIndex
+      }, props))));
+    };
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [cache, items, fullMode, selectedItemIndex, columnCount, focusedItemIndex, selectedCategoryIndex, setFocusedCategoryIndex, setFocusedItemIndex, props]);
   return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(ContainerWidthMonitor, null), (0, _react2.jsx)("div", {
     css: elementItemsWrapper,
     "data-testid": "element-items",
@@ -158,9 +233,30 @@ function ElementList(_ref) {
     onExternalLinkClick: onExternalLinkClick
   }) : (0, _react2.jsx)(_react.Fragment, null, containerWidth > 0 && (0, _react2.jsx)(_AutoSizer.AutoSizer, {
     disableWidth: true
-  }, function (_ref3) {
-    var height = _ref3.height;
-    return (0, _react2.jsx)(_Collection.Collection, {
+  }, function (_ref5) {
+    var height = _ref5.height;
+    return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-element-browser') ? (0, _react2.jsx)(_reactVirtualized.Grid, (0, _extends2.default)({
+      cellRenderer: gridCellRenderer,
+      height: height,
+      width: containerWidth - _constants2.ELEMENT_LIST_PADDING * 2 // containerWidth - padding on Left/Right (for focus outline)
+      /**
+       * Refresh Grid on WidthObserver value change.
+       * Length of the items used to force re-render to solve Firefox bug with react-virtualized retaining
+       * scroll position after updating the data. If new data has different number of cells, a re-render
+       * is forced to prevent the scroll position render bug.
+       */,
+      key: containerWidth + items.length,
+      rowHeight: rowHeight,
+      rowCount: rowCount,
+      columnCount: columnCount,
+      columnWidth: columnWidth,
+      deferredMeasurementCache: cache
+    }, selectedItemIndex && {
+      scrollToCell: {
+        rowIndex: selectedItemIndex / columnCount,
+        columnIndex: selectedItemIndex % columnCount
+      }
+    })) : (0, _react2.jsx)(_Collection.Collection, {
       cellCount: items.length,
       cellRenderer: cellRenderer,
       cellSizeAndPositionGetter: (0, _cellSizeAndPositionGetter.default)(containerWidth - _constants2.ELEMENT_LIST_PADDING * 2, scrollbarWidth),
@@ -179,14 +275,14 @@ function ElementList(_ref) {
 }
 var MemoizedElementItem = /*#__PURE__*/(0, _react.memo)(ElementItem);
 MemoizedElementItem.displayName = 'MemoizedElementItem';
-function ElementItem(_ref4) {
-  var inlineMode = _ref4.inlineMode,
-    selected = _ref4.selected,
-    item = _ref4.item,
-    index = _ref4.index,
-    onInsertItem = _ref4.onInsertItem,
-    focus = _ref4.focus,
-    setFocusedItemIndex = _ref4.setFocusedItemIndex;
+function ElementItem(_ref6) {
+  var inlineMode = _ref6.inlineMode,
+    selected = _ref6.selected,
+    item = _ref6.item,
+    index = _ref6.index,
+    onInsertItem = _ref6.onInsertItem,
+    focus = _ref6.focus,
+    setFocusedItemIndex = _ref6.setFocusedItemIndex;
   var ref = (0, _useFocus.default)(focus);
 
   /**
@@ -251,17 +347,17 @@ function ElementItem(_ref4) {
 var itemStyleOverrides = {
   alignItems: 'flex-start'
 };
-var ElementBefore = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
-  var icon = _ref5.icon,
-    title = _ref5.title;
+var ElementBefore = /*#__PURE__*/(0, _react.memo)(function (_ref7) {
+  var icon = _ref7.icon,
+    title = _ref7.title;
   return (0, _react2.jsx)("div", {
     css: [itemIcon, itemIconStyle]
   }, icon ? icon() : (0, _react2.jsx)(_quickInsert.IconFallback, null));
 });
-var ItemContent = /*#__PURE__*/(0, _react.memo)(function (_ref6) {
-  var title = _ref6.title,
-    description = _ref6.description,
-    keyshortcut = _ref6.keyshortcut;
+var ItemContent = /*#__PURE__*/(0, _react.memo)(function (_ref8) {
+  var title = _ref8.title,
+    description = _ref8.description,
+    keyshortcut = _ref8.keyshortcut;
   return (
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     (0, _react2.jsx)("div", {
@@ -289,14 +385,14 @@ var elementItemsWrapper = (0, _react2.css)({
   justifyContent: 'flex-start',
   overflow: 'hidden',
   padding: "var(--ds-space-025, 2px)",
-  '.ReactVirtualized__Collection': {
+  '.ReactVirtualized__Collection, .ReactVirtualized__Grid': {
     borderRadius: '3px',
     outline: 'none',
-    ':focus': {
+    '&:focus': {
       boxShadow: "0 0 0 ".concat(_constants2.ELEMENT_LIST_PADDING, "px ", "var(--ds-border-focused, ".concat(_colors.B100, ")"))
     }
   },
-  '.ReactVirtualized__Collection__innerScrollContainer': {
+  '.ReactVirtualized__Collection__innerScrollContainer, .ReactVirtualized__Grid__innerScrollContainer': {
     "div[class='element-item-wrapper']:last-child": {
       paddingBottom: "var(--ds-space-050, 4px)"
     }
@@ -305,7 +401,7 @@ var elementItemsWrapper = (0, _react2.css)({
 var elementItemWrapper = (0, _react2.css)({
   div: {
     button: {
-      height: '75px',
+      minHeight: '75px',
       alignItems: 'flex-start',
       padding: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-150, 12px)", " 11px")
     }

package/dist/cjs/element-browser/components/StatelessElementBrowser.js

@@ -87,7 +87,7 @@ var mobileCategoryListWrapper = (0, _react2.css)({
   padding: "var(--ds-space-200, 8px)".concat(" 0 ", "var(--ds-space-200, 16px)", " 0"),
   minHeight: "".concat(_constants.GRID_SIZE * 4, "px"),
   overflow: '-moz-scrollbars-none',
-  '::-webkit-scrollbar': {
+  '&::-webkit-scrollbar': {
     display: 'none'
   },
   scrollbarWidth: 'none',
@@ -219,6 +219,7 @@ function StatelessElementBrowser(props) {
     focusedCategoryIndex: focusedCategoryIndex,
     setFocusedCategoryIndex: setFocusedCategoryIndex,
     focusOnSearch: focusOnSearch,
+    columnCount: columnCount,
     setColumnCount: setColumnCount,
     setFocusOnSearch: setFocusOnSearch,
     onKeyPress: onItemsEnterTabKeyPress,
@@ -231,6 +232,7 @@ function StatelessElementBrowser(props) {
     setFocusedItemIndex: setFocusedItemIndex,
     focusOnSearch: focusOnSearch,
     setColumnCount: setColumnCount,
+    columnCount: columnCount,
     setFocusOnSearch: setFocusOnSearch,
     onKeyPress: onItemsEnterTabKeyPress,
     onKeyDown: onKeyDown,
@@ -257,6 +259,7 @@ function MobileBrowser(_ref) {
     setFocusedCategoryIndex = _ref.setFocusedCategoryIndex,
     focusOnSearch = _ref.focusOnSearch,
     focusOnViewMore = _ref.focusOnViewMore,
+    columnCount = _ref.columnCount,
     setColumnCount = _ref.setColumnCount,
     setFocusOnSearch = _ref.setFocusOnSearch,
     onKeyPress = _ref.onKeyPress,
@@ -300,6 +303,7 @@ function MobileBrowser(_ref) {
     selectedItemIndex: selectedItemIndex,
     focusedItemIndex: focusedItemIndex,
     setFocusedItemIndex: setFocusedItemIndex,
+    columnCount: columnCount,
     setColumnCount: setColumnCount,
     createAnalyticsEvent: createAnalyticsEvent,
     emptyStateHandler: emptyStateHandler,
@@ -327,6 +331,7 @@ function DesktopBrowser(_ref2) {
     setFocusedCategoryIndex = _ref2.setFocusedCategoryIndex,
     selectedCategoryIndex = _ref2.selectedCategoryIndex,
     focusOnSearch = _ref2.focusOnSearch,
+    columnCount = _ref2.columnCount,
     setColumnCount = _ref2.setColumnCount,
     setFocusOnSearch = _ref2.setFocusOnSearch,
     onKeyPress = _ref2.onKeyPress,
@@ -384,6 +389,7 @@ function DesktopBrowser(_ref2) {
     selectedItemIndex: selectedItemIndex,
     focusedItemIndex: focusedItemIndex,
     setFocusedItemIndex: setFocusedItemIndex,
+    columnCount: columnCount,
     setColumnCount: setColumnCount,
     createAnalyticsEvent: createAnalyticsEvent,
     emptyStateHandler: emptyStateHandler,

package/dist/cjs/element-browser/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SIDEBAR_WIDTH = exports.SIDEBAR_HEADING_WRAPPER_HEIGHT = exports.SIDEBAR_HEADING_PADDING_LEFT = exports.SEARCH_ITEM_HEIGHT_WIDTH = exports.SCROLLBAR_WIDTH = exports.INLINE_SIDEBAR_HEIGHT = exports.GRID_SIZE = exports.FLEX_ITEMS_CONTAINER_BREAKPOINT_NUMBERS = exports.ELEMENT_LIST_PADDING = exports.ELEMENT_ITEM_HEIGHT = exports.DEVICE_BREAKPOINT_NUMBERS = void 0;
+exports.SIDEBAR_WIDTH = exports.SIDEBAR_HEADING_WRAPPER_HEIGHT = exports.SIDEBAR_HEADING_PADDING_LEFT = exports.SEARCH_ITEM_HEIGHT_WIDTH = exports.SCROLLBAR_WIDTH = exports.INLINE_SIDEBAR_HEIGHT = exports.GRID_SIZE = exports.FLEX_ITEMS_CONTAINER_BREAKPOINT_NUMBERS = exports.ELEMENT_LIST_PADDING = exports.ELEMENT_ITEM_PADDING = exports.ELEMENT_ITEM_HEIGHT = exports.DEVICE_BREAKPOINT_NUMBERS = void 0;
 var _constants = require("@atlaskit/theme/constants");
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 
@@ -27,4 +27,5 @@ var INLINE_SIDEBAR_HEIGHT = exports.INLINE_SIDEBAR_HEIGHT = '54px';
 var SEARCH_ITEM_HEIGHT_WIDTH = exports.SEARCH_ITEM_HEIGHT_WIDTH = '20px';
 var SCROLLBAR_WIDTH = exports.SCROLLBAR_WIDTH = 15;
 var ELEMENT_LIST_PADDING = exports.ELEMENT_LIST_PADDING = 2;
-var ELEMENT_ITEM_HEIGHT = exports.ELEMENT_ITEM_HEIGHT = 75;
+var ELEMENT_ITEM_HEIGHT = exports.ELEMENT_ITEM_HEIGHT = 75;
+var ELEMENT_ITEM_PADDING = exports.ELEMENT_ITEM_PADDING = 10;

package/dist/cjs/mark/commands.js

@@ -145,7 +145,14 @@ var applyMarkOnRange = exports.applyMarkOnRange = function applyMarkOnRange(from
     (0, _platformFeatureFlags.getBooleanFF)('platform.editor.simplify-inline-cards-in-code-blocks_jw6t1') ? transformNonTextNodesToText(from, to, tr) : transformSmartCharsMentionsAndEmojis(from, to, tr);
   }
   tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), function (node, pos) {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (!node.isText) {
+        var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+        if (!isAllowedInlineNode) {
+          return true;
+        }
+      }
+    } else if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
       if (!node.isText && node.type !== inlineCard) {
         return true;
       }

package/dist/cjs/monitoring/environment.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFedRamp = isFedRamp;
+var FEDRAMP_MODERATE = 'fedramp-moderate';
+
+// To determine whether an instance is a FedRAMP instance
+// Copied from platform/packages/uip/atl-context/src/services/is-fedramp/index.tsx
+// We cannot import the same-named function from @atlassian/atl-context due to editor-common being a public package (and atl-context being private)
+// TODO: Seek alternatives
+function isFedRamp() {
+  var _globalThis$location;
+  // MICROS_PERIMETER is already used by few products, so we need to keep it for backward compatibility
+  var env = globalThis.MICROS_PERIMETER || globalThis.UNSAFE_ATL_CONTEXT_BOUNDARY;
+  if (env) {
+    return env === FEDRAMP_MODERATE;
+  }
+  var matches = (_globalThis$location = globalThis.location) === null || _globalThis$location === void 0 || (_globalThis$location = _globalThis$location.hostname) === null || _globalThis$location === void 0 ? void 0 : _globalThis$location.match(/atlassian-us-gov-mod\.(com|net)|atlassian-us-gov\.(com|net)|atlassian-fex\.(com|net)|atlassian-stg-fedm\.(com|net)/);
+  return matches ? matches.length > 0 : false;
+}

package/dist/cjs/monitoring/error.js

@@ -10,13 +10,14 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _environment = require("./environment");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }
 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 = "82.0.1";
+var packageVersion = "82.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it
@@ -55,7 +56,7 @@ var logException = exports.logException = /*#__PURE__*/function () {
           _yield$import2 = _context.sent;
           ExtraErrorData = _yield$import2.ExtraErrorData;
           sentryOptions = {
-            dsn: SENTRY_DSN,
+            dsn: (0, _environment.isFedRamp)() ? undefined : SENTRY_DSN,
             release: "".concat(packageName, "@").concat(packageVersion),
             environment: (_process$env$CLOUD_EN = process.env.CLOUD_ENV) !== null && _process$env$CLOUD_EN !== void 0 ? _process$env$CLOUD_EN : 'unknown',
             ignoreErrors: [

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

@@ -22,53 +22,78 @@ var BlockAnnotationSharedClassNames = exports.BlockAnnotationSharedClassNames =
   blur: "".concat(blockAnnotationPrefix, "-blur"),
   draft: "".concat(blockAnnotationPrefix, "-draft")
 };
-var Y75a = 'rgba(255, 240, 179, 0.5)';
+var Yellow100 = 'rgb(255, 247, 214)';
 var Y200a = 'rgba(255, 196, 0, 0.82)';
 var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
-  return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') ? {
-    focus: (0, _react.css)({
-      background: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"),
-      borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")")),
-      boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"),
-      cursor: 'pointer',
-      '&:has(.card)': {
-        fontSize: '1.5rem',
-        lineHeight: '1.2rem',
-        '& > *': {
-          fontSize: '16px'
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    return {
+      focus: (0, _react.css)({
+        background: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")")),
+        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"),
+        cursor: 'pointer',
+        padding: '1.5px 0',
+        '&:has(.card)': {
+          padding: '4.5px 0 3px 0'
         }
-      }
-    }),
-    blur: (0, _react.css)({
-      background: "var(--ds-background-accent-yellow-subtlest, ".concat(Y75a, ")"),
-      borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")")),
-      cursor: 'pointer',
-      '&:has(.card)': {
-        fontSize: '1.5rem',
-        lineHeight: '1.2rem',
-        '& > *': {
-          fontSize: '16px'
+      }),
+      blur: (0, _react.css)({
+        background: "var(--ds-background-accent-yellow-subtlest, ".concat(Yellow100, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")")),
+        cursor: 'pointer',
+        padding: '1.5px 0',
+        '&:has(.card)': {
+          padding: '4.5px 0 3px 0'
         }
-      }
-    })
-  } : {
-    focus: (0, _react.css)({
-      // Background is not coming through in confluence, suspecting to be caused by some specific combination of
-      // emotion and token look up
-      background: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"),
-      borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")")),
-      // TODO: https://product-fabric.atlassian.net/browse/DSP-4147
-      boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"),
-      cursor: 'pointer'
-    }),
-    blur: (0, _react.css)({
-      background: "var(--ds-background-accent-yellow-subtlest, ".concat(Y75a, ")"),
-      borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")")),
-      cursor: 'pointer'
-    })
-  };
+      })
+    };
+  } else if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    return {
+      focus: (0, _react.css)({
+        background: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")")),
+        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"),
+        cursor: 'pointer',
+        '&:has(.card)': {
+          fontSize: '1.5rem',
+          lineHeight: '1.2rem',
+          '& > *': {
+            fontSize: '16px'
+          }
+        }
+      }),
+      blur: (0, _react.css)({
+        background: "var(--ds-background-accent-yellow-subtlest, ".concat(Yellow100, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")")),
+        cursor: 'pointer',
+        '&:has(.card)': {
+          fontSize: '1.5rem',
+          lineHeight: '1.2rem',
+          '& > *': {
+            fontSize: '16px'
+          }
+        }
+      })
+    };
+  } else {
+    return {
+      focus: (0, _react.css)({
+        // Background is not coming through in confluence, suspecting to be caused by some specific combination of
+        // emotion and token look up
+        background: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")")),
+        // TODO: https://product-fabric.atlassian.net/browse/DSP-4147
+        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"),
+        cursor: 'pointer'
+      }),
+      blur: (0, _react.css)({
+        background: "var(--ds-background-accent-yellow-subtlest, ".concat(Yellow100, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")")),
+        cursor: 'pointer'
+      })
+    };
+  }
 };
-
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
 var annotationSharedStyles = exports.annotationSharedStyles = function annotationSharedStyles() {
   return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t.", " {\n\t\t\t", ";\n\t\t}\n\n\t\t.", " {\n\t\t\t", ";\n\t\t\tcursor: initial;\n\t\t}\n\n\t\t.", " {\n\t\t\t", ";\n\t\t}\n\t}\n"])), AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur);

package/dist/cjs/styles/shared/background-color.js

@@ -5,16 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.backgroundColorStyles = void 0;
 var _react = require("@emotion/react");
-var backgroundColorStyles = exports.backgroundColorStyles = function backgroundColorStyles(colorMode) {
-  return (0, _react.css)({
-    '.fabric-background-color-mark': {
-      backgroundColor: 'var(--custom-palette-color, inherit)'
-    },
-    'a .fabric-background-color-mark': {
-      backgroundColor: 'unset'
-    },
-    '.fabric-background-color-mark .ak-editor-annotation, .fabric-background-color-mark [data-mark-type="annotation"]': {
-      mixBlendMode: colorMode === 'dark' ? 'color-dodge' : 'multiply'
-    }
-  });
-};
+var backgroundColorStyles = exports.backgroundColorStyles = (0, _react.css)({
+  '.fabric-background-color-mark': {
+    backgroundColor: 'var(--custom-palette-color, inherit)'
+  },
+  'a .fabric-background-color-mark': {
+    backgroundColor: 'unset'
+  },
+  '.fabric-background-color-mark .ak-editor-annotation': {
+    backgroundColor: 'unset'
+  }
+});

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 */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "82.0.1";
+var packageVersion = "82.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -26,9 +26,17 @@ var canApplyAnnotationOnRange = exports.canApplyAnnotationOnRange = function can
     // or if we're leaf and not text
 
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
-      if (node.isInline && !node.isText && node.type !== inlineCard || node.isLeaf && !node.isText && node.type !== inlineCard || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-        foundInvalid = true;
-        return false;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+        var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+        if (node.isInline && !node.isText && !isAllowedInlineNode || node.isLeaf && !node.isText && !isAllowedInlineNode || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+          foundInvalid = true;
+          return false;
+        }
+      } else {
+        if (node.isInline && !node.isText && node.type !== inlineCard || node.isLeaf && !node.isText && node.type !== inlineCard || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+          foundInvalid = true;
+          return false;
+        }
       }
     } else {
       if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {