@atlaskit/renderer 109.40.8 → 109.40.10

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/renderer
 
+## 109.40.10
+
+### Patch Changes
+
+- [#113218](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113218)
+  [`d1b428ec29d68`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d1b428ec29d68) -
+  [ED-23765] migrate inline node commenting feature flags to statsig feature gate
+- Updated dependencies
+
+## 109.40.9
+
+### Patch Changes
+
+- [#117398](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117398)
+  [`ff47bec4e7b6e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ff47bec4e7b6e) -
+  [ux] Fix issue where inline node calculation would crash renderer
+- Updated dependencies
+
 ## 109.40.8
 
 ### Patch Changes

package/dist/cjs/actions/get-renderer-range-inline-node-names.js

@@ -9,7 +9,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function getRendererRangeInlineNodeNames(_ref) {
   var actions = _ref.actions,
     pos = _ref.pos;
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   var doc = actions.doc;

package/dist/cjs/actions/index.js

@@ -166,7 +166,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       if (!range) {
         return false;
       }
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
         if (this.isRendererWithinRange(range)) {
           return false;
         }
@@ -335,7 +335,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     }
 
     // TODO: Do not forget to remove `undefined` when the
-    //       `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+    //       `editor_inline_comments_on_inline_nodes` is removed.
   }, {
     key: "getInlineNodeTypes",
     value: function getInlineNodeTypes(annotationId) {

package/dist/cjs/react/nodes/date.js

@@ -17,9 +17,7 @@ var _useInlineAnnotationProps = require("../../ui/annotations/element/useInlineA
 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 Date = /*#__PURE__*/(0, _react.memo)(function Date(props) {
-  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props, {
-    isInlineCard: false
-  });
+  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props);
   var timestamp = props.timestamp,
     parentIsIncompleteTask = props.parentIsIncompleteTask,
     intl = props.intl;

package/dist/cjs/react/nodes/emoji.js

@@ -19,10 +19,8 @@ function EmojiItem(props) {
     text = props.text,
     fitToHeight = props.fitToHeight,
     resourceConfig = props.resourceConfig;
-  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props, {
-    isInlineCard: false
-  });
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props);
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return (0, _react.jsx)("span", inlineAnnotationProps, (0, _react.jsx)(_emoji.Emoji, {
       allowTextFallback: true,
       id: id,

package/dist/cjs/react/nodes/inlineCard.js

@@ -45,13 +45,11 @@ var InlineCard = function InlineCard(props) {
     // Below is added for the future implementation of Linking Platform namespaced analytic context
     location: 'renderer'
   };
-  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props, {
-    isInlineCard: true
-  });
+  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props);
   if (ssr && url) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
-    (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       return (0, _react.jsx)("span", (0, _extends2.default)({
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,

package/dist/cjs/react/nodes/mention.js

@@ -18,10 +18,8 @@ var _default = exports.default = /*#__PURE__*/(0, _react.memo)(function MentionI
     text = props.text,
     accessLevel = props.accessLevel,
     localId = props.localId;
-  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props, {
-    isInlineCard: false
-  });
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props);
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return /*#__PURE__*/_react.default.createElement("span", inlineAnnotationProps, /*#__PURE__*/_react.default.createElement(_mention.Mention, {
       id: id,
       text: text,

package/dist/cjs/react/nodes/status.js

@@ -16,10 +16,8 @@ var _default = exports.default = /*#__PURE__*/(0, _react.memo)(function Status(p
   var text = props.text,
     color = props.color,
     localId = props.localId;
-  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props, {
-    isInlineCard: false
-  });
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props);
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return /*#__PURE__*/_react.default.createElement("span", inlineAnnotationProps, /*#__PURE__*/_react.default.createElement(_analyticsNamespacedContext.FabricElementsAnalyticsContext, {
       data: {
         userContext: 'document'

package/dist/cjs/steps/index.js

@@ -90,7 +90,7 @@ function isNodeInlineTextMark(node) {
  */
 function hasInlineNodeDescendant(node) {
   if (isElementNode(node)) {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       if (node.dataset.annotationInlineNode === 'true') {
         return true;
       }
@@ -110,7 +110,7 @@ function resolveNodePos(node) {
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
         if (isNodeInlineTextMark(prev) && prev.textContent) {
           resolvedPos += prev.textContent.length;
         } else {
@@ -137,10 +137,10 @@ function resolvePos(node, offset) {
   if (!node) {
     return false;
   }
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     var _node$parentElement;
     var startPosAncestor = (_node$parentElement = node.parentElement) === null || _node$parentElement === void 0 ? void 0 : _node$parentElement.closest('[data-renderer-start-pos');
-    var potentialParent = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? 'data-annotation-mark' : 'data-inline-card';
+    var potentialParent = (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? 'data-annotation-mark' : 'data-inline-card';
     if (startPosAncestor !== null && startPosAncestor !== void 0 && startPosAncestor.hasAttribute(potentialParent)) {
       if (findEnd) {
         return parseInt((startPosAncestor === null || startPosAncestor === void 0 ? void 0 : startPosAncestor.getAttribute('data-renderer-start-pos')) || '-1', 10) + 1;
@@ -168,7 +168,7 @@ function resolvePos(node, offset) {
     // If our range is inside an inline node
     // We need to move our pointers to parent element
     // since we don't want to count text inside inline nodes at all
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       if (!(isNodeInlineTextMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
         current = current.parentElement;
         offset = 0;

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

@@ -56,7 +56,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.40.8";
+var packageVersion = "109.40.10";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);

package/dist/cjs/ui/Renderer/style.js

@@ -84,9 +84,7 @@ var tableSortableColumnStyle = function tableSortableColumnStyle(_ref2) {
   if (allowNestedHeaderLinks) {
     headingsCss = "\n      /**\n       * When the sort button is enabled we want the heading's copy link button\n       * to reserve space so that it can prematurely wrap to avoid the button\n       * being displayed underneath the sort button (hidden or obscured).\n       *\n       * The two buttons fight each other since the sort button is displayed\n       * on hover of the <th /> and the copy link button is displayed on hover\n       * of the heading.\n       *\n       * Note that this can break the WYSIWYG experience in the case where\n       * a heading fills the width of the table cell and the only thing which\n       * wraps is the copy link button. This is hopefully a rare fringe case.\n       */\n      .".concat(_headingAnchor.HeadingAnchorWrapperClassName, " {\n        position: unset;\n      }\n      > {\n        h1, h2, h3, h4, h5, h6 {\n          margin-right: 30px;\n        }\n      }\n    ");
   }
-  return (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n\t\t.", " {\n\t\t\tpadding: 0;\n\n\t\t\t.", " {\n\t\t\t\twidth: 100%;\n\t\t\t\theight: 100%;\n\t\t\t\tpadding: ", ";\n\t\t\t\tborder-width: 1.5px;\n\t\t\t\tborder-style: solid;\n\t\t\t\tborder-color: transparent;\n\n\t\t\t\t> *:first-child {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + span + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + span + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t@supports selector(:focus-visible) {\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\toutline: unset;\n\t\t\t\t\t}\n\t\t\t\t\t&:focus-visible {\n\t\t\t\t\t\tborder-color: ", ";\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\tmargin: 0;\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 1;\n\t\t\t\t\ttransition: opacity 0.2s ease-in-out;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 0;\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t&:hover {\n\t\t\t\t.", " {\n\t\t\t\t\t.", " {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t"])), _consts.RendererCssClassName.SORTABLE_COLUMN_WRAPPER, _consts.RendererCssClassName.SORTABLE_COLUMN,
-  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-  (0, _platformFeatureFlags.fg)('platform_editor_tables_padding_increase') ? "".concat(_styles.tableCellPadding, "px ", "var(--ds-space-250, 20px)") : "".concat(_styles.tableCellPadding, "px"), "var(--ds-border-focused, ".concat(colors.B300, ")"), headingsCss, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, _table2.SORTABLE_COLUMN_ICON_CLASSNAME, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _table2.SORTABLE_COLUMN_ICON_CLASSNAME, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _table2.SORTABLE_COLUMN_ICON_CLASSNAME);
+  return (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n\t\t.", " {\n\t\t\tpadding: 0;\n\n\t\t\t.", " {\n\t\t\t\twidth: 100%;\n\t\t\t\theight: 100%;\n\t\t\t\tpadding: ", ";\n\t\t\t\tborder-width: 1.5px;\n\t\t\t\tborder-style: solid;\n\t\t\t\tborder-color: transparent;\n\n\t\t\t\t> *:first-child {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + span + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + span + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t@supports selector(:focus-visible) {\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\toutline: unset;\n\t\t\t\t\t}\n\t\t\t\t\t&:focus-visible {\n\t\t\t\t\t\tborder-color: ", ";\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\tmargin: 0;\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 1;\n\t\t\t\t\ttransition: opacity 0.2s ease-in-out;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 0;\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t&:hover {\n\t\t\t\t.", " {\n\t\t\t\t\t.", " {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t"])), _consts.RendererCssClassName.SORTABLE_COLUMN_WRAPPER, _consts.RendererCssClassName.SORTABLE_COLUMN, (0, _platformFeatureFlags.fg)('platform_editor_tables_padding_increase') ? "".concat(_styles.tableCellPadding, "px ", "var(--ds-space-250, 20px)") : "".concat(_styles.tableCellPadding, "px"), "var(--ds-border-focused, ".concat(colors.B300, ")"), headingsCss, _consts.RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, _table2.SORTABLE_COLUMN_ICON_CLASSNAME, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _table2.SORTABLE_COLUMN_ICON_CLASSNAME, _consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, _table2.SORTABLE_COLUMN_ICON_CLASSNAME);
 };
 var fullPageStyles = function fullPageStyles(_ref3, _ref4) {
   var appearance = _ref3.appearance;
@@ -111,10 +109,7 @@ var getShadowOverrides = function getShadowOverrides() {
 };
 function getAnnotationStyles(_ref6) {
   var allowAnnotations = _ref6.allowAnnotations;
-  if (!(0, _platformFeatureFlags.fg)('platform.editor.allow-inline-comments-for-inline-nodes')) {
-    return '';
-  }
-  if ((0, _platformFeatureFlags.fg)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return '';
   }
   return (0, _react.css)({

package/dist/cjs/ui/annotations/element/mark.js

@@ -23,7 +23,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState` is not object-safe
 var markStyles = function markStyles() {
-  return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\tcolor: inherit;\n\tbackground-color: unset;\n\t-webkit-tap-highlight-color: transparent;\n\n\t&[data-mark-annotation-state='", "'] {\n\t\t", "\n\t\t", "\n\n\t\t&:focus,\n\t\t\t&[data-has-focus='true'] {\n\t\t\t", "\n\t\t}\n\t}\n"])), _adfSchema.AnnotationMarkStates.ACTIVE, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? (0, _styles.AnnotationSharedCSSByState)().common : '', (0, _styles.AnnotationSharedCSSByState)().blur, (0, _styles.AnnotationSharedCSSByState)().focus);
+  return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\tcolor: inherit;\n\tbackground-color: unset;\n\t-webkit-tap-highlight-color: transparent;\n\n\t&[data-mark-annotation-state='", "'] {\n\t\t", "\n\t\t", "\n\n\t\t&:focus,\n\t\t\t&[data-has-focus='true'] {\n\t\t\t", "\n\t\t}\n\t}\n"])), _adfSchema.AnnotationMarkStates.ACTIVE, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? (0, _styles.AnnotationSharedCSSByState)().common : '', (0, _styles.AnnotationSharedCSSByState)().blur, (0, _styles.AnnotationSharedCSSByState)().focus);
 };
 var isMobile = function isMobile() {
   return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
@@ -73,7 +73,7 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
     if (event.defaultPrevented || state !== _adfSchema.AnnotationMarkStates.ACTIVE) {
       return;
     }
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       // We only want to interfere with click events if the click is on some ui inside the renderer document
       // This is to prevent the click events from portaled content (such as link previews and mention profiles)
       if (event.target instanceof HTMLElement && event.target.closest('.ak-renderer-document')) {
@@ -130,7 +130,7 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
   };
   return (0, _react2.jsx)(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)({
     id: id
-  }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
+  }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
     css: [markStyles, getAccessibilityStyles()]
   }), children);
 };

package/dist/cjs/ui/annotations/element/useInlineAnnotationProps.js

@@ -7,13 +7,9 @@ exports.useInlineAnnotationProps = useInlineAnnotationProps;
 var _react = require("react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _context = require("../context");
-function useInlineAnnotationProps(props, _ref) {
-  var isInlineCard = _ref.isInlineCard;
+function useInlineAnnotationProps(props) {
   var draftPosition = (0, _react.useContext)(_context.AnnotationsDraftContext);
-  if (!isInlineCard && !(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
-    return {};
-  }
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+  if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return {};
   }
   if (!props.dataAttributes) {

package/dist/cjs/ui/annotations/selection/mounter.js

@@ -9,6 +9,7 @@ exports.SelectionInlineCommentMounter = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _draft = require("../draft");
 var _analyticsListeners = require("@atlaskit/analytics-listeners");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -38,6 +39,9 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var inlineNodeTypes = (0, _react.useMemo)(function () {
+    if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+      return undefined;
+    }
     if (actions.isValidAnnotationRange(range)) {
       return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
         pos: documentPosition,

package/dist/es2019/actions/get-renderer-range-inline-node-names.js

@@ -1,10 +1,10 @@
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 export function getRendererRangeInlineNodeNames({
   actions,
   pos
 }) {
-  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   const {

package/dist/es2019/actions/index.js

@@ -7,7 +7,7 @@ import { createAnnotationStep, getPosFromRange } from '../steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getIndexMatch } from './matches-utils';
 import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 export default class RendererActions {
   // Any kind of refence is allowed
 
@@ -144,7 +144,7 @@ export default class RendererActions {
     if (!range) {
       return false;
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (this.isRendererWithinRange(range)) {
         return false;
       }
@@ -315,7 +315,7 @@ export default class RendererActions {
   }
 
   // TODO: Do not forget to remove `undefined` when the
-  //       `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+  //       `editor_inline_comments_on_inline_nodes` is removed.
   getInlineNodeTypes(annotationId) {
     if (!this.doc || !this.schema) {
       return [];

package/dist/es2019/react/nodes/date.js

@@ -6,9 +6,7 @@ import { injectIntl } from 'react-intl-next';
 import { useTaskItemsFormatContext } from '../../ui/TaskItemsFormatContext';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 const Date = /*#__PURE__*/memo(function Date(props) {
-  const inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
+  const inlineAnnotationProps = useInlineAnnotationProps(props);
   const {
     timestamp,
     parentIsIncompleteTask,

package/dist/es2019/react/nodes/emoji.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { memo } from 'react';
 import { Emoji } from '@atlaskit/editor-common/emoji';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
@@ -14,10 +14,8 @@ function EmojiItem(props) {
     fitToHeight,
     resourceConfig
   } = props;
-  const inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  const inlineAnnotationProps = useInlineAnnotationProps(props);
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     return jsx("span", inlineAnnotationProps, jsx(Emoji, {
       allowTextFallback: true,
       id: id,

package/dist/es2019/react/nodes/inlineCard.js

@@ -5,7 +5,7 @@ import { jsx } from '@emotion/react';
 import { Card } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { UnsupportedInline } from '@atlaskit/editor-common/ui';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { CardErrorBoundary } from './fallback';
 import { withSmartCardStorage } from '../../ui/SmartCardStorage';
 import { getCardClickHandler } from '../utils/getCardClickHandler';
@@ -40,13 +40,11 @@ const InlineCard = props => {
     // Below is added for the future implementation of Linking Platform namespaced analytic context
     location: 'renderer'
   };
-  const inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: true
-  });
+  const inlineAnnotationProps = useInlineAnnotationProps(props);
   if (ssr && url) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
-    getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    fg('editor_inline_comments_on_inline_nodes')) {
       return jsx("span", _extends({
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,

package/dist/es2019/react/nodes/mention.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { Mention } from '@atlaskit/editor-common/mention';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 export default /*#__PURE__*/memo(function MentionItem(props) {
   const {
@@ -11,10 +11,8 @@ export default /*#__PURE__*/memo(function MentionItem(props) {
     accessLevel,
     localId
   } = props;
-  const inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  const inlineAnnotationProps = useInlineAnnotationProps(props);
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     return /*#__PURE__*/React.createElement("span", inlineAnnotationProps, /*#__PURE__*/React.createElement(Mention, {
       id: id,
       text: text,

package/dist/es2019/react/nodes/status.js

@@ -1,7 +1,7 @@
 import React, { memo } from 'react';
 import { Status as AkStatus } from '@atlaskit/status/element';
 import { FabricElementsAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 export default /*#__PURE__*/memo(function Status(props) {
   const {
@@ -9,10 +9,8 @@ export default /*#__PURE__*/memo(function Status(props) {
     color,
     localId
   } = props;
-  const inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  const inlineAnnotationProps = useInlineAnnotationProps(props);
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     return /*#__PURE__*/React.createElement("span", inlineAnnotationProps, /*#__PURE__*/React.createElement(FabricElementsAnalyticsContext, {
       data: {
         userContext: 'document'

package/dist/es2019/steps/index.js

@@ -1,4 +1,4 @@
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 function getStartPos(element) {
   return parseInt(element.dataset.rendererStartPos || '-1', 10);
@@ -86,7 +86,7 @@ function isNodeInlineTextMark(node) {
  */
 function hasInlineNodeDescendant(node) {
   if (isElementNode(node)) {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (node.dataset.annotationInlineNode === 'true') {
         return true;
       }
@@ -106,7 +106,7 @@ function resolveNodePos(node) {
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {
-      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (fg('editor_inline_comments_on_inline_nodes')) {
         if (isNodeInlineTextMark(prev) && prev.textContent) {
           resolvedPos += prev.textContent.length;
         } else {
@@ -132,10 +132,10 @@ export function resolvePos(node, offset, findEnd = false) {
   if (!node) {
     return false;
   }
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     var _node$parentElement;
     const startPosAncestor = (_node$parentElement = node.parentElement) === null || _node$parentElement === void 0 ? void 0 : _node$parentElement.closest('[data-renderer-start-pos');
-    const potentialParent = getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? 'data-annotation-mark' : 'data-inline-card';
+    const potentialParent = fg('editor_inline_comments_on_inline_nodes') ? 'data-annotation-mark' : 'data-inline-card';
     if (startPosAncestor !== null && startPosAncestor !== void 0 && startPosAncestor.hasAttribute(potentialParent)) {
       if (findEnd) {
         return parseInt((startPosAncestor === null || startPosAncestor === void 0 ? void 0 : startPosAncestor.getAttribute('data-renderer-start-pos')) || '-1', 10) + 1;
@@ -163,7 +163,7 @@ export function resolvePos(node, offset, findEnd = false) {
     // If our range is inside an inline node
     // We need to move our pointers to parent element
     // since we don't want to count text inside inline nodes at all
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (!(isNodeInlineTextMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
         current = current.parentElement;
         offset = 0;

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

@@ -38,7 +38,7 @@ import { nodeToReact } from '../../react/nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.40.8";
+const packageVersion = "109.40.10";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {

package/dist/es2019/ui/Renderer/style.js

@@ -224,9 +224,7 @@ const tableSortableColumnStyle = ({
 			.${RendererCssClassName.SORTABLE_COLUMN} {
 				width: 100%;
 				height: 100%;
-				padding: ${
-  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-  fg('platform_editor_tables_padding_increase') ? `${tableCellPadding}px ${"var(--ds-space-250, 20px)"}` : `${tableCellPadding}px`};
+				padding: ${fg('platform_editor_tables_padding_increase') ? `${tableCellPadding}px ${"var(--ds-space-250, 20px)"}` : `${tableCellPadding}px`};
 				border-width: 1.5px;
 				border-style: solid;
 				border-color: transparent;
@@ -370,10 +368,7 @@ const getShadowOverrides = () => {
 function getAnnotationStyles({
   allowAnnotations
 }) {
-  if (!fg('platform.editor.allow-inline-comments-for-inline-nodes')) {
-    return '';
-  }
-  if (fg('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return '';
   }
   return css({

package/dist/es2019/ui/annotations/element/mark.js

@@ -6,7 +6,7 @@ import { css, jsx } from '@emotion/react';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { AnnotationSharedCSSByState } from '@atlaskit/editor-common/styles';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useIntl } from 'react-intl-next';
 import { inlineCommentMessages } from '../../../messages';
 
@@ -17,7 +17,7 @@ const markStyles = () => css`
 	-webkit-tap-highlight-color: transparent;
 
 	&[data-mark-annotation-state='${AnnotationMarkStates.ACTIVE}'] {
-		${getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? AnnotationSharedCSSByState().common : ''}
+		${fg('editor_inline_comments_on_inline_nodes') ? AnnotationSharedCSSByState().common : ''}
 		${AnnotationSharedCSSByState().blur}
 
 		&:focus,
@@ -71,7 +71,7 @@ export const MarkComponent = ({
     if (event.defaultPrevented || state !== AnnotationMarkStates.ACTIVE) {
       return;
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       // We only want to interfere with click events if the click is on some ui inside the renderer document
       // This is to prevent the click events from portaled content (such as link previews and mention profiles)
       if (event.target instanceof HTMLElement && event.target.closest('.ak-renderer-document')) {
@@ -130,7 +130,7 @@ export const MarkComponent = ({
   };
   return jsx(useBlockLevel ? 'div' : 'mark', {
     id,
-    [getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick']: onMarkClick,
+    [fg('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick']: onMarkClick,
     ...accessibility,
     ...overriddenData,
     ...(!useBlockLevel && {

package/dist/es2019/ui/annotations/element/useInlineAnnotationProps.js

@@ -1,14 +1,9 @@
 import { useContext } from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { AnnotationsDraftContext } from '../context';
-export function useInlineAnnotationProps(props, {
-  isInlineCard
-}) {
+export function useInlineAnnotationProps(props) {
   const draftPosition = useContext(AnnotationsDraftContext);
-  if (!isInlineCard && !getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
-    return {};
-  }
-  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return {};
   }
   if (!props.dataAttributes) {

package/dist/es2019/ui/annotations/selection/mounter.js

@@ -1,5 +1,6 @@
 import React, { useCallback, useState, useContext, useMemo } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { updateWindowSelectionAroundDraft } from '../draft';
 import { FabricChannel } from '@atlaskit/analytics-listeners';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
@@ -26,6 +27,9 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
   const providers = useContext(ProvidersContext);
   const isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   const inlineNodeTypes = useMemo(() => {
+    if (!fg('editor_inline_comments_on_inline_nodes')) {
+      return undefined;
+    }
     if (actions.isValidAnnotationRange(range)) {
       return getRendererRangeInlineNodeNames({
         pos: documentPosition,

package/dist/esm/actions/get-renderer-range-inline-node-names.js

@@ -1,9 +1,9 @@
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 export function getRendererRangeInlineNodeNames(_ref) {
   var actions = _ref.actions,
     pos = _ref.pos;
-  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   var doc = actions.doc;

package/dist/esm/actions/index.js

@@ -12,7 +12,7 @@ import { createAnnotationStep, getPosFromRange } from '../steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getIndexMatch } from './matches-utils';
 import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 var RendererActions = /*#__PURE__*/function () {
   // Any kind of refence is allowed
 
@@ -159,7 +159,7 @@ var RendererActions = /*#__PURE__*/function () {
       if (!range) {
         return false;
       }
-      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+      if (fg('editor_inline_comments_on_inline_nodes')) {
         if (this.isRendererWithinRange(range)) {
           return false;
         }
@@ -328,7 +328,7 @@ var RendererActions = /*#__PURE__*/function () {
     }
 
     // TODO: Do not forget to remove `undefined` when the
-    //       `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+    //       `editor_inline_comments_on_inline_nodes` is removed.
   }, {
     key: "getInlineNodeTypes",
     value: function getInlineNodeTypes(annotationId) {

package/dist/esm/react/nodes/date.js

@@ -7,9 +7,7 @@ import { injectIntl } from 'react-intl-next';
 import { useTaskItemsFormatContext } from '../../ui/TaskItemsFormatContext';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 var Date = /*#__PURE__*/memo(function Date(props) {
-  var inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
+  var inlineAnnotationProps = useInlineAnnotationProps(props);
   var timestamp = props.timestamp,
     parentIsIncompleteTask = props.parentIsIncompleteTask,
     intl = props.intl;

package/dist/esm/react/nodes/emoji.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { memo } from 'react';
 import { Emoji } from '@atlaskit/editor-common/emoji';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
@@ -12,10 +12,8 @@ function EmojiItem(props) {
     text = props.text,
     fitToHeight = props.fitToHeight,
     resourceConfig = props.resourceConfig;
-  var inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  var inlineAnnotationProps = useInlineAnnotationProps(props);
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     return jsx("span", inlineAnnotationProps, jsx(Emoji, {
       allowTextFallback: true,
       id: id,

package/dist/esm/react/nodes/inlineCard.js

@@ -5,7 +5,7 @@ import { jsx } from '@emotion/react';
 import { Card } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
 import { UnsupportedInline } from '@atlaskit/editor-common/ui';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { CardErrorBoundary } from './fallback';
 import { withSmartCardStorage } from '../../ui/SmartCardStorage';
 import { getCardClickHandler } from '../utils/getCardClickHandler';
@@ -37,13 +37,11 @@ var InlineCard = function InlineCard(props) {
     // Below is added for the future implementation of Linking Platform namespaced analytic context
     location: 'renderer'
   };
-  var inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: true
-  });
+  var inlineAnnotationProps = useInlineAnnotationProps(props);
   if (ssr && url) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
-    getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    fg('editor_inline_comments_on_inline_nodes')) {
       return jsx("span", _extends({
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,

package/dist/esm/react/nodes/mention.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import { Mention } from '@atlaskit/editor-common/mention';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 export default /*#__PURE__*/memo(function MentionItem(props) {
   var eventHandlers = props.eventHandlers,
@@ -9,10 +9,8 @@ export default /*#__PURE__*/memo(function MentionItem(props) {
     text = props.text,
     accessLevel = props.accessLevel,
     localId = props.localId;
-  var inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  var inlineAnnotationProps = useInlineAnnotationProps(props);
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     return /*#__PURE__*/React.createElement("span", inlineAnnotationProps, /*#__PURE__*/React.createElement(Mention, {
       id: id,
       text: text,

package/dist/esm/react/nodes/status.js

@@ -1,16 +1,14 @@
 import React, { memo } from 'react';
 import { Status as AkStatus } from '@atlaskit/status/element';
 import { FabricElementsAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 export default /*#__PURE__*/memo(function Status(props) {
   var text = props.text,
     color = props.color,
     localId = props.localId;
-  var inlineAnnotationProps = useInlineAnnotationProps(props, {
-    isInlineCard: false
-  });
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  var inlineAnnotationProps = useInlineAnnotationProps(props);
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     return /*#__PURE__*/React.createElement("span", inlineAnnotationProps, /*#__PURE__*/React.createElement(FabricElementsAnalyticsContext, {
       data: {
         userContext: 'document'

package/dist/esm/steps/index.js

@@ -1,4 +1,4 @@
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 function getStartPos(element) {
   return parseInt(element.dataset.rendererStartPos || '-1', 10);
@@ -82,7 +82,7 @@ function isNodeInlineTextMark(node) {
  */
 function hasInlineNodeDescendant(node) {
   if (isElementNode(node)) {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (node.dataset.annotationInlineNode === 'true') {
         return true;
       }
@@ -102,7 +102,7 @@ function resolveNodePos(node) {
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {
-      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (fg('editor_inline_comments_on_inline_nodes')) {
         if (isNodeInlineTextMark(prev) && prev.textContent) {
           resolvedPos += prev.textContent.length;
         } else {
@@ -129,10 +129,10 @@ export function resolvePos(node, offset) {
   if (!node) {
     return false;
   }
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     var _node$parentElement;
     var startPosAncestor = (_node$parentElement = node.parentElement) === null || _node$parentElement === void 0 ? void 0 : _node$parentElement.closest('[data-renderer-start-pos');
-    var potentialParent = getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? 'data-annotation-mark' : 'data-inline-card';
+    var potentialParent = fg('editor_inline_comments_on_inline_nodes') ? 'data-annotation-mark' : 'data-inline-card';
     if (startPosAncestor !== null && startPosAncestor !== void 0 && startPosAncestor.hasAttribute(potentialParent)) {
       if (findEnd) {
         return parseInt((startPosAncestor === null || startPosAncestor === void 0 ? void 0 : startPosAncestor.getAttribute('data-renderer-start-pos')) || '-1', 10) + 1;
@@ -160,7 +160,7 @@ export function resolvePos(node, offset) {
     // If our range is inside an inline node
     // We need to move our pointers to parent element
     // since we don't want to count text inside inline nodes at all
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (!(isNodeInlineTextMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
         current = current.parentElement;
         offset = 0;

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

@@ -48,7 +48,7 @@ import { nodeToReact } from '../../react/nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.40.8";
+var packageVersion = "109.40.10";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);

package/dist/esm/ui/Renderer/style.js

@@ -76,9 +76,7 @@ var tableSortableColumnStyle = function tableSortableColumnStyle(_ref2) {
   if (allowNestedHeaderLinks) {
     headingsCss = "\n      /**\n       * When the sort button is enabled we want the heading's copy link button\n       * to reserve space so that it can prematurely wrap to avoid the button\n       * being displayed underneath the sort button (hidden or obscured).\n       *\n       * The two buttons fight each other since the sort button is displayed\n       * on hover of the <th /> and the copy link button is displayed on hover\n       * of the heading.\n       *\n       * Note that this can break the WYSIWYG experience in the case where\n       * a heading fills the width of the table cell and the only thing which\n       * wraps is the copy link button. This is hopefully a rare fringe case.\n       */\n      .".concat(HeadingAnchorWrapperClassName, " {\n        position: unset;\n      }\n      > {\n        h1, h2, h3, h4, h5, h6 {\n          margin-right: 30px;\n        }\n      }\n    ");
   }
-  return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n\t\t.", " {\n\t\t\tpadding: 0;\n\n\t\t\t.", " {\n\t\t\t\twidth: 100%;\n\t\t\t\theight: 100%;\n\t\t\t\tpadding: ", ";\n\t\t\t\tborder-width: 1.5px;\n\t\t\t\tborder-style: solid;\n\t\t\t\tborder-color: transparent;\n\n\t\t\t\t> *:first-child {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + span + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + span + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t@supports selector(:focus-visible) {\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\toutline: unset;\n\t\t\t\t\t}\n\t\t\t\t\t&:focus-visible {\n\t\t\t\t\t\tborder-color: ", ";\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\tmargin: 0;\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 1;\n\t\t\t\t\ttransition: opacity 0.2s ease-in-out;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 0;\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t&:hover {\n\t\t\t\t.", " {\n\t\t\t\t\t.", " {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t"])), RendererCssClassName.SORTABLE_COLUMN_WRAPPER, RendererCssClassName.SORTABLE_COLUMN,
-  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-  fg('platform_editor_tables_padding_increase') ? "".concat(tableCellPadding, "px ", "var(--ds-space-250, 20px)") : "".concat(tableCellPadding, "px"), "var(--ds-border-focused, ".concat(colors.B300, ")"), headingsCss, RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, SORTABLE_COLUMN_ICON_CLASSNAME, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, SORTABLE_COLUMN_ICON_CLASSNAME, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, SORTABLE_COLUMN_ICON_CLASSNAME);
+  return css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n\t\t.", " {\n\t\t\tpadding: 0;\n\n\t\t\t.", " {\n\t\t\t\twidth: 100%;\n\t\t\t\theight: 100%;\n\t\t\t\tpadding: ", ";\n\t\t\t\tborder-width: 1.5px;\n\t\t\t\tborder-style: solid;\n\t\t\t\tborder-color: transparent;\n\n\t\t\t\t> *:first-child {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + span + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + span + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t@supports selector(:focus-visible) {\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\toutline: unset;\n\t\t\t\t\t}\n\t\t\t\t\t&:focus-visible {\n\t\t\t\t\t\tborder-color: ", ";\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t", "\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\tmargin: 0;\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 1;\n\t\t\t\t\ttransition: opacity 0.2s ease-in-out;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\t.", " {\n\t\t\t\t\topacity: 0;\n\t\t\t\t\t&:focus {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t&:hover {\n\t\t\t\t.", " {\n\t\t\t\t\t.", " {\n\t\t\t\t\t\topacity: 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t"])), RendererCssClassName.SORTABLE_COLUMN_WRAPPER, RendererCssClassName.SORTABLE_COLUMN, fg('platform_editor_tables_padding_increase') ? "".concat(tableCellPadding, "px ", "var(--ds-space-250, 20px)") : "".concat(tableCellPadding, "px"), "var(--ds-border-focused, ".concat(colors.B300, ")"), headingsCss, RendererCssClassName.SORTABLE_COLUMN_ICON_WRAPPER, SORTABLE_COLUMN_ICON_CLASSNAME, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, SORTABLE_COLUMN_ICON_CLASSNAME, RendererCssClassName.SORTABLE_COLUMN_NO_ORDER, SORTABLE_COLUMN_ICON_CLASSNAME);
 };
 var fullPageStyles = function fullPageStyles(_ref3, _ref4) {
   var appearance = _ref3.appearance;
@@ -103,10 +101,7 @@ var getShadowOverrides = function getShadowOverrides() {
 };
 function getAnnotationStyles(_ref6) {
   var allowAnnotations = _ref6.allowAnnotations;
-  if (!fg('platform.editor.allow-inline-comments-for-inline-nodes')) {
-    return '';
-  }
-  if (fg('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return '';
   }
   return css({

package/dist/esm/ui/annotations/element/mark.js

@@ -12,13 +12,13 @@ import { css, jsx } from '@emotion/react';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { AnnotationSharedCSSByState } from '@atlaskit/editor-common/styles';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useIntl } from 'react-intl-next';
 import { inlineCommentMessages } from '../../../messages';
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState` is not object-safe
 var markStyles = function markStyles() {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\tcolor: inherit;\n\tbackground-color: unset;\n\t-webkit-tap-highlight-color: transparent;\n\n\t&[data-mark-annotation-state='", "'] {\n\t\t", "\n\t\t", "\n\n\t\t&:focus,\n\t\t\t&[data-has-focus='true'] {\n\t\t\t", "\n\t\t}\n\t}\n"])), AnnotationMarkStates.ACTIVE, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? AnnotationSharedCSSByState().common : '', AnnotationSharedCSSByState().blur, AnnotationSharedCSSByState().focus);
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\tcolor: inherit;\n\tbackground-color: unset;\n\t-webkit-tap-highlight-color: transparent;\n\n\t&[data-mark-annotation-state='", "'] {\n\t\t", "\n\t\t", "\n\n\t\t&:focus,\n\t\t\t&[data-has-focus='true'] {\n\t\t\t", "\n\t\t}\n\t}\n"])), AnnotationMarkStates.ACTIVE, fg('editor_inline_comments_on_inline_nodes') ? AnnotationSharedCSSByState().common : '', AnnotationSharedCSSByState().blur, AnnotationSharedCSSByState().focus);
 };
 var isMobile = function isMobile() {
   return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
@@ -68,7 +68,7 @@ export var MarkComponent = function MarkComponent(_ref) {
     if (event.defaultPrevented || state !== AnnotationMarkStates.ACTIVE) {
       return;
     }
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       // We only want to interfere with click events if the click is on some ui inside the renderer document
       // This is to prevent the click events from portaled content (such as link previews and mention profiles)
       if (event.target instanceof HTMLElement && event.target.closest('.ak-renderer-document')) {
@@ -125,7 +125,7 @@ export var MarkComponent = function MarkComponent(_ref) {
   };
   return jsx(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread(_defineProperty({
     id: id
-  }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
+  }, fg('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
     css: [markStyles, getAccessibilityStyles()]
   }), children);
 };

package/dist/esm/ui/annotations/element/useInlineAnnotationProps.js

@@ -1,13 +1,9 @@
 import { useContext } from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { AnnotationsDraftContext } from '../context';
-export function useInlineAnnotationProps(props, _ref) {
-  var isInlineCard = _ref.isInlineCard;
+export function useInlineAnnotationProps(props) {
   var draftPosition = useContext(AnnotationsDraftContext);
-  if (!isInlineCard && !getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
-    return {};
-  }
-  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return {};
   }
   if (!props.dataAttributes) {

package/dist/esm/ui/annotations/selection/mounter.js

@@ -1,6 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useState, useContext, useMemo } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { updateWindowSelectionAroundDraft } from '../draft';
 import { FabricChannel } from '@atlaskit/analytics-listeners';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
@@ -28,6 +29,9 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
   var providers = useContext(ProvidersContext);
   var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var inlineNodeTypes = useMemo(function () {
+    if (!fg('editor_inline_comments_on_inline_nodes')) {
+      return undefined;
+    }
     if (actions.isValidAnnotationRange(range)) {
       return getRendererRangeInlineNodeNames({
         pos: documentPosition,

package/dist/types/ui/annotations/element/useInlineAnnotationProps.d.ts

@@ -3,9 +3,7 @@ export type MarkDataAttributes = {
         'data-renderer-start-pos': number;
     };
 };
-export declare function useInlineAnnotationProps(props: MarkDataAttributes, { isInlineCard }: {
-    isInlineCard: boolean;
-}): {
+export declare function useInlineAnnotationProps(props: MarkDataAttributes): {
     'data-renderer-mark'?: undefined;
     'data-annotation-draft-mark'?: undefined;
     'data-annotation-inline-node'?: undefined;

package/dist/types-ts4.5/ui/annotations/element/useInlineAnnotationProps.d.ts

@@ -3,9 +3,7 @@ export type MarkDataAttributes = {
         'data-renderer-start-pos': number;
     };
 };
-export declare function useInlineAnnotationProps(props: MarkDataAttributes, { isInlineCard }: {
-    isInlineCard: boolean;
-}): {
+export declare function useInlineAnnotationProps(props: MarkDataAttributes): {
     'data-renderer-mark'?: undefined;
     'data-annotation-draft-mark'?: undefined;
     'data-annotation-inline-node'?: undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "109.40.8",
+	"version": "109.40.10",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,16 +29,16 @@
 		"@atlaskit/analytics-listeners": "^8.10.0",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/button": "^18.1.0",
-		"@atlaskit/code": "^15.3.0",
-		"@atlaskit/editor-common": "^84.0.0",
+		"@atlaskit/button": "^18.2.0",
+		"@atlaskit/code": "^15.4.0",
+		"@atlaskit/editor-common": "^84.3.0",
 		"@atlaskit/editor-json-transformer": "^8.15.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.12.0",
 		"@atlaskit/emoji": "^67.6.0",
 		"@atlaskit/feature-gate-js-client": "^4.18.0",
-		"@atlaskit/icon": "^22.5.0",
+		"@atlaskit/icon": "^22.6.0",
 		"@atlaskit/link-datasource": "^2.5.0",
 		"@atlaskit/media-card": "^78.0.0",
 		"@atlaskit/media-client": "^27.3.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/media-ui": "^25.10.0",
 		"@atlaskit/media-viewer": "^48.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/smart-card": "^27.8.0",
+		"@atlaskit/smart-card": "^27.9.0",
 		"@atlaskit/status": "^1.4.0",
 		"@atlaskit/task-decision": "^17.10.0",
 		"@atlaskit/theme": "^12.11.0",
@@ -92,7 +92,7 @@
 		"@types/react-loadable": "^5.4.1",
 		"ajv": "^6.12.6",
 		"enzyme": "^3.10.0",
-		"jsdom": "^17.0.0",
+		"jsdom": "^22.0.0",
 		"mockdate": "^3.0.5",
 		"puppeteer": "13.7.0",
 		"react": "^16.8.0",
@@ -131,10 +131,7 @@
 		"platform_editor_tables_padding_increase": {
 			"type": "boolean"
 		},
-		"platform.editor.allow-inline-comments-for-inline-nodes": {
-			"type": "boolean"
-		},
-		"platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz": {
+		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
 		"platform.editor.renderer-error-boundary-for-dom-errors": {