@atlaskit/editor-common 82.0.1 → 82.1.0

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

@@ -1,11 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-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 */
 import React, { Fragment, memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
+import { Grid } from 'react-virtualized';
 import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer';
+import { CellMeasurer, CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { Collection } from 'react-virtualized/dist/commonjs/Collection';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
@@ -17,7 +19,7 @@ import { borderRadius } from '@atlaskit/theme/constants';
 import Tooltip from '@atlaskit/tooltip';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '../../../analytics';
 import { IconFallback } from '../../../quick-insert';
-import { ELEMENT_LIST_PADDING, SCROLLBAR_WIDTH } from '../../constants';
+import { ELEMENT_ITEM_HEIGHT, ELEMENT_ITEM_PADDING, ELEMENT_LIST_PADDING, SCROLLBAR_WIDTH } from '../../constants';
 import useContainerWidth from '../../hooks/use-container-width';
 import useFocus from '../../hooks/use-focus';
 import { Modes } from '../../types';
@@ -46,6 +48,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,
@@ -85,11 +88,28 @@ function ElementList(_ref) {
       }
     });
   }, [createAnalyticsEvent]);
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  var cache = new CellMeasurerCache({
+    fixedWidth: true,
+    defaultHeight: ELEMENT_ITEM_HEIGHT,
+    minHeight: ELEMENT_ITEM_HEIGHT
+  });
+  var columnWidth = (containerWidth - 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
+    }) <= ELEMENT_ITEM_HEIGHT ? ELEMENT_ITEM_HEIGHT : cache.rowHeight({
+      index: index
+    }) + ELEMENT_ITEM_PADDING * 2;
+  };
   var cellRenderer = 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;
       }
@@ -132,6 +152,61 @@ function ElementList(_ref) {
       }, props)));
     };
   }, [items, fullMode, selectedItemIndex, focusedItemIndex, selectedCategoryIndex, setFocusedCategoryIndex, setFocusedItemIndex, props]);
+  var gridCellRenderer = 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 : jsx(CellMeasurer, {
+        cache: cache,
+        key: key,
+        rowIndex: rowIndex,
+        columnIndex: columnIndex,
+        parent: parent
+      }, jsx("div", {
+        style: style,
+        key: key,
+        className: "element-item-wrapper",
+        css: elementItemWrapper,
+        onKeyDown: 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
+      }, jsx(MemoizedElementItem, _extends({
+        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 jsx(Fragment, null, jsx(ContainerWidthMonitor, null), jsx("div", {
     css: elementItemsWrapper,
     "data-testid": "element-items",
@@ -147,9 +222,30 @@ function ElementList(_ref) {
     onExternalLinkClick: onExternalLinkClick
   }) : jsx(Fragment, null, containerWidth > 0 && jsx(AutoSizer, {
     disableWidth: true
-  }, function (_ref3) {
-    var height = _ref3.height;
-    return jsx(Collection, {
+  }, function (_ref5) {
+    var height = _ref5.height;
+    return getBooleanFF('platform.editor.a11y-element-browser') ? jsx(Grid, _extends({
+      cellRenderer: gridCellRenderer,
+      height: height,
+      width: containerWidth - 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
+      }
+    })) : jsx(Collection, {
       cellCount: items.length,
       cellRenderer: cellRenderer,
       cellSizeAndPositionGetter: cellSizeAndPositionGetter(containerWidth - ELEMENT_LIST_PADDING * 2, scrollbarWidth),
@@ -168,14 +264,14 @@ function ElementList(_ref) {
 }
 var MemoizedElementItem = /*#__PURE__*/memo(ElementItem);
 MemoizedElementItem.displayName = 'MemoizedElementItem';
-export 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;
+export 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 = useFocus(focus);
 
   /**
@@ -240,17 +336,17 @@ export function ElementItem(_ref4) {
 var itemStyleOverrides = {
   alignItems: 'flex-start'
 };
-var ElementBefore = /*#__PURE__*/memo(function (_ref5) {
-  var icon = _ref5.icon,
-    title = _ref5.title;
+var ElementBefore = /*#__PURE__*/memo(function (_ref7) {
+  var icon = _ref7.icon,
+    title = _ref7.title;
   return jsx("div", {
     css: [itemIcon, itemIconStyle]
   }, icon ? icon() : jsx(IconFallback, null));
 });
-var ItemContent = /*#__PURE__*/memo(function (_ref6) {
-  var title = _ref6.title,
-    description = _ref6.description,
-    keyshortcut = _ref6.keyshortcut;
+var ItemContent = /*#__PURE__*/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
     jsx("div", {
@@ -278,14 +374,14 @@ var elementItemsWrapper = 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(ELEMENT_LIST_PADDING, "px ", "var(--ds-border-focused, ".concat(B100, ")"))
     }
   },
-  '.ReactVirtualized__Collection__innerScrollContainer': {
+  '.ReactVirtualized__Collection__innerScrollContainer, .ReactVirtualized__Grid__innerScrollContainer': {
     "div[class='element-item-wrapper']:last-child": {
       paddingBottom: "var(--ds-space-050, 4px)"
     }
@@ -294,7 +390,7 @@ var elementItemsWrapper = css({
 var elementItemWrapper = 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/esm/element-browser/components/StatelessElementBrowser.js

@@ -76,7 +76,7 @@ var mobileCategoryListWrapper = css({
   padding: "var(--ds-space-200, 8px)".concat(" 0 ", "var(--ds-space-200, 16px)", " 0"),
   minHeight: "".concat(GRID_SIZE * 4, "px"),
   overflow: '-moz-scrollbars-none',
-  '::-webkit-scrollbar': {
+  '&::-webkit-scrollbar': {
     display: 'none'
   },
   scrollbarWidth: 'none',
@@ -208,6 +208,7 @@ function StatelessElementBrowser(props) {
     focusedCategoryIndex: focusedCategoryIndex,
     setFocusedCategoryIndex: setFocusedCategoryIndex,
     focusOnSearch: focusOnSearch,
+    columnCount: columnCount,
     setColumnCount: setColumnCount,
     setFocusOnSearch: setFocusOnSearch,
     onKeyPress: onItemsEnterTabKeyPress,
@@ -220,6 +221,7 @@ function StatelessElementBrowser(props) {
     setFocusedItemIndex: setFocusedItemIndex,
     focusOnSearch: focusOnSearch,
     setColumnCount: setColumnCount,
+    columnCount: columnCount,
     setFocusOnSearch: setFocusOnSearch,
     onKeyPress: onItemsEnterTabKeyPress,
     onKeyDown: onKeyDown,
@@ -246,6 +248,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,
@@ -289,6 +292,7 @@ function MobileBrowser(_ref) {
     selectedItemIndex: selectedItemIndex,
     focusedItemIndex: focusedItemIndex,
     setFocusedItemIndex: setFocusedItemIndex,
+    columnCount: columnCount,
     setColumnCount: setColumnCount,
     createAnalyticsEvent: createAnalyticsEvent,
     emptyStateHandler: emptyStateHandler,
@@ -316,6 +320,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,
@@ -373,6 +378,7 @@ function DesktopBrowser(_ref2) {
     selectedItemIndex: selectedItemIndex,
     focusedItemIndex: focusedItemIndex,
     setFocusedItemIndex: setFocusedItemIndex,
+    columnCount: columnCount,
     setColumnCount: setColumnCount,
     createAnalyticsEvent: createAnalyticsEvent,
     emptyStateHandler: emptyStateHandler,

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

@@ -20,4 +20,5 @@ export var INLINE_SIDEBAR_HEIGHT = '54px';
 export var SEARCH_ITEM_HEIGHT_WIDTH = '20px';
 export var SCROLLBAR_WIDTH = 15;
 export var ELEMENT_LIST_PADDING = 2;
-export var ELEMENT_ITEM_HEIGHT = 75;
+export var ELEMENT_ITEM_HEIGHT = 75;
+export var ELEMENT_ITEM_PADDING = 10;

package/dist/esm/mark/commands.js

@@ -135,7 +135,14 @@ export var applyMarkOnRange = function applyMarkOnRange(from, to, removeMark, ma
     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 (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if (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 (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
       if (!node.isText && node.type !== inlineCard) {
         return true;
       }

package/dist/esm/monitoring/environment.js

@@ -0,0 +1,16 @@
+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
+export 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/esm/monitoring/error.js

@@ -4,9 +4,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
+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 = "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
@@ -41,7 +42,7 @@ export var logException = /*#__PURE__*/function () {
           _yield$import2 = _context.sent;
           ExtraErrorData = _yield$import2.ExtraErrorData;
           sentryOptions = {
-            dsn: SENTRY_DSN,
+            dsn: 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/esm/styles/shared/annotation.js

@@ -15,53 +15,78 @@ export var 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)';
 export var AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
-  return getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? {
-    focus: css({
-      background: "var(--ds-background-accent-yellow-subtler, ".concat(Y75, ")"),
-      borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y300, ")")),
-      boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A), ")"),
-      cursor: 'pointer',
-      '&:has(.card)': {
-        fontSize: '1.5rem',
-        lineHeight: '1.2rem',
-        '& > *': {
-          fontSize: '16px'
+  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    return {
+      focus: css({
+        background: "var(--ds-background-accent-yellow-subtler, ".concat(Y75, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y300, ")")),
+        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A), ")"),
+        cursor: 'pointer',
+        padding: '1.5px 0',
+        '&:has(.card)': {
+          padding: '4.5px 0 3px 0'
         }
-      }
-    }),
-    blur: 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: 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: 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(Y75, ")"),
-      borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y300, ")")),
-      // TODO: https://product-fabric.atlassian.net/browse/DSP-4147
-      boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A), ")"),
-      cursor: 'pointer'
-    }),
-    blur: 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 (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    return {
+      focus: css({
+        background: "var(--ds-background-accent-yellow-subtler, ".concat(Y75, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y300, ")")),
+        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A), ")"),
+        cursor: 'pointer',
+        '&:has(.card)': {
+          fontSize: '1.5rem',
+          lineHeight: '1.2rem',
+          '& > *': {
+            fontSize: '16px'
+          }
+        }
+      }),
+      blur: 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: 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(Y75, ")"),
+        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y300, ")")),
+        // TODO: https://product-fabric.atlassian.net/browse/DSP-4147
+        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(N60A, ", -1px 2px 3px ").concat(N60A), ")"),
+        cursor: 'pointer'
+      }),
+      blur: 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
 export var annotationSharedStyles = function annotationSharedStyles() {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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/esm/styles/shared/background-color.js

@@ -1,14 +1,12 @@
 import { css } from '@emotion/react';
-export var backgroundColorStyles = function backgroundColorStyles(colorMode) {
-  return 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'
-    }
-  });
-};
+export var backgroundColorStyles = 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/esm/ui/DropList/index.js

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

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

@@ -17,9 +17,17 @@ export var canApplyAnnotationOnRange = function canApplyAnnotationOnRange(rangeS
     // or if we're leaf and not text
 
     if (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 (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))) {

package/dist/esm/utils/validator.js

@@ -245,30 +245,36 @@ export var getValidNode = function getValidNode(originalNode) {
       case 'date':
         {
           if (attrs && attrs.timestamp) {
-            return {
+            return _objectSpread({
               type: type,
               attrs: attrs
-            };
+            }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+              marks: marks
+            } : {});
           }
           break;
         }
       case 'status':
         {
           if (attrs && attrs.text && attrs.color) {
-            return {
+            return _objectSpread({
               type: type,
               attrs: attrs
-            };
+            }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+              marks: marks
+            } : {});
           }
           break;
         }
       case 'emoji':
         {
           if (attrs && attrs.shortName) {
-            return {
+            return _objectSpread({
               type: type,
               attrs: attrs
-            };
+            }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+              marks: marks
+            } : {});
           }
           break;
         }
@@ -285,26 +291,15 @@ export var getValidNode = function getValidNode(originalNode) {
         }
       case 'inlineCard':
         {
-          if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
-            var inlineCardNode = {
-              type: type
-            };
-            if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
-              inlineCardNode.attrs = _objectSpread({}, attrs);
-            }
-            if (marks) {
-              inlineCardNode.marks = _toConsumableArray(marks);
-            }
-            return inlineCardNode;
-          } else {
-            if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
-              return {
-                type: type,
-                attrs: attrs
-              };
-            }
-            break;
+          if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
+            return _objectSpread({
+              type: type,
+              attrs: attrs
+            }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? {
+              marks: marks
+            } : {});
           }
+          break;
         }
       case 'blockCard':
         {
@@ -500,14 +495,16 @@ export var getValidNode = function getValidNode(originalNode) {
             mentionText = text || '@unknown';
           }
           if (mentionText && mentionId) {
-            var mentionNode = {
+            var mentionNode = _objectSpread({
               type: type,
               attrs: {
                 id: mentionId,
                 text: mentionText,
                 accessLevel: ''
               }
-            };
+            }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+              marks: marks
+            } : {});
             if (mentionAccess) {
               mentionNode.attrs.accessLevel = mentionAccess;
             }

package/dist/types/element-browser/components/ElementList/ElementList.d.ts

@@ -13,6 +13,7 @@ export interface Props {
     items: QuickInsertItem[];
     mode: keyof typeof Modes;
     onInsertItem: (item: QuickInsertItem) => void;
+    columnCount: number;
     setColumnCount: (columnCount: number) => void;
     setFocusedItemIndex: (index: number) => void;
     setFocusedCategoryIndex?: (index: number) => void;

package/dist/types/element-browser/constants.d.ts

@@ -17,3 +17,4 @@ export declare const SEARCH_ITEM_HEIGHT_WIDTH = "20px";
 export declare const SCROLLBAR_WIDTH = 15;
 export declare const ELEMENT_LIST_PADDING = 2;
 export declare const ELEMENT_ITEM_HEIGHT = 75;
+export declare const ELEMENT_ITEM_PADDING = 10;

package/dist/types/monitoring/environment.d.ts

@@ -0,0 +1 @@
+export declare function isFedRamp(): boolean;