@atlaskit/renderer 149.0.5 → 149.0.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/renderer
 
+## 149.0.6
+
+### Patch Changes
+
+- [`5f335f67f55d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5f335f67f55d9) -
+  [ux] Separate existing extension comment viewing from creation in the renderer behind
+  `cc_maui_annotations_on_extensions`. Add an optional `canCreateCommentOnBlockNode` provider
+  predicate that controls whether a supported extension can be targeted for new comments, so
+  Confluence can keep existing chart threads accessible while `cc_maui_comments_on_charts_exp`
+  disables new-thread creation.
+
+  Avoid subscribing extension nodes to annotation contexts when `cc_maui_annotations_on_extensions`
+  is disabled, preventing annotation hover updates from rerendering unrelated extensions.
+
+- Updated dependencies
+
 ## 149.0.5
 
 ### Patch Changes

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderExtension = exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _enums = require("@atlaskit/editor-common/analytics/types/enums");
@@ -21,12 +22,15 @@ var _AnnotationRangeContext = require("../../ui/annotations/contexts/AnnotationR
 var _ExtensionRenderer = _interopRequireDefault(require("../../ui/ExtensionRenderer"));
 var _breakout = require("../utils/breakout");
 var _extensionComments = require("./extension-comments");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-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; } /**
+var _excluded = ["commentProps", "commentTargetOptions"];
+/**
  * @jsxRuntime classic
  * @jsx jsx
- */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+ */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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; }
 var FORGE_EXTENSION_TYPE = 'com.atlassian.ecosystem';
 /**
  * Mirrors `FORGE_INLINE_BODIED_PARAM` in `@atlassian/xen-editor-provider`. Duplicated rather than
@@ -194,20 +198,8 @@ var renderExtension = exports.renderExtension = function renderExtension(content
     className: _consts.RendererCssClassName.STICKY_SAFE_CENTER_WRAPPER + ' ' + _consts.RendererCssClassName.FLEX_CENTER_WRAPPER
   }, extensionDiv) : extensionDiv;
 };
-var Extension = function Extension(props) {
-  var _providers$inlineComm, _props$dataAttributes;
-  var text = props.text,
-    _props$layout = props.layout,
-    layout = _props$layout === void 0 ? 'default' : _props$layout,
-    handleRef = props.handleRef,
-    shadowClassNames = props.shadowClassNames,
-    _props$path = props.path,
-    path = _props$path === void 0 ? [] : _props$path,
-    extensionViewportSizes = props.extensionViewportSizes,
-    parameters = props.parameters,
-    nodeHeight = props.nodeHeight,
-    localId = props.localId,
-    isInsideOfInlineExtension = props.isInsideOfInlineExtension;
+var ExtensionWithAnnotations = function ExtensionWithAnnotations(props) {
+  var _providers$inlineComm, _providers$inlineComm2, _props$dataAttributes;
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
     setHoverTarget = _useAnnotationRangeDi.setHoverTarget;
@@ -216,9 +208,13 @@ var Extension = function Extension(props) {
     initiateTimeout = _useAnnotationHoverDi.initiateTimeout,
     setIsWithinRange = _useAnnotationHoverDi.setIsWithinRange;
   var isBlockNodeSupported = providers === null || providers === void 0 || (_providers$inlineComm = providers.inlineComment) === null || _providers$inlineComm === void 0 ? void 0 : _providers$inlineComm.isBlockNodeSupported;
-  var isCommentTarget = (0, _react.useMemo)(function () {
-    return Boolean((0, _fg.fg)('cc_maui_annotations_on_extensions') && props.extensionNode && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(props.extensionNode)) === true);
+  var supportsComments = (0, _react.useMemo)(function () {
+    return Boolean(props.extensionNode && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(props.extensionNode)) === true);
   }, [props.extensionNode, isBlockNodeSupported]);
+  var canCreateCommentOnBlockNode = providers === null || providers === void 0 || (_providers$inlineComm2 = providers.inlineComment) === null || _providers$inlineComm2 === void 0 ? void 0 : _providers$inlineComm2.canCreateCommentOnBlockNode;
+  var isCommentTarget = (0, _react.useMemo)(function () {
+    return Boolean(supportsComments && props.extensionNode && (!canCreateCommentOnBlockNode || canCreateCommentOnBlockNode(props.extensionNode)));
+  }, [supportsComments, props.extensionNode, canCreateCommentOnBlockNode]);
   var isFullPageRenderer = props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width';
   var onMouseEnter = (0, _react.useCallback)(function (event) {
     cancelTimeout();
@@ -253,21 +249,45 @@ var Extension = function Extension(props) {
     isCommentTarget: isCommentTarget
   };
   var commentProps = {
-    enabled: isCommentTarget,
-    allowAnnotations: props.allowAnnotations && (0, _fg.fg)('cc_maui_annotations_on_extensions'),
-    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode,
+    enabled: supportsComments,
+    allowAnnotations: props.allowAnnotations,
+    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode && isCommentTarget,
     startPos: (_props$dataAttributes = props.dataAttributes) === null || _props$dataAttributes === void 0 ? void 0 : _props$dataAttributes['data-renderer-start-pos'],
     marks: props.marks
   };
+  return (0, _react2.jsx)(ExtensionContent
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , (0, _extends2.default)({}, props, {
+    commentProps: commentProps,
+    commentTargetOptions: commentTargetOptions
+  }));
+};
+var ExtensionContent = function ExtensionContent(_ref3) {
+  var _ref3$commentProps = _ref3.commentProps,
+    commentProps = _ref3$commentProps === void 0 ? {} : _ref3$commentProps,
+    commentTargetOptions = _ref3.commentTargetOptions,
+    props = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
+  var text = props.text,
+    _props$layout = props.layout,
+    layout = _props$layout === void 0 ? 'default' : _props$layout,
+    handleRef = props.handleRef,
+    shadowClassNames = props.shadowClassNames,
+    _props$path = props.path,
+    path = _props$path === void 0 ? [] : _props$path,
+    extensionViewportSizes = props.extensionViewportSizes,
+    parameters = props.parameters,
+    nodeHeight = props.nodeHeight,
+    localId = props.localId,
+    isInsideOfInlineExtension = props.isInsideOfInlineExtension;
   return (0, _react2.jsx)(_ExtensionRenderer.default
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   , (0, _extends2.default)({}, props, {
     type: "extension"
-  }), function (_ref3) {
+  }), function (_ref4) {
     var _props$hideExtensionK;
-    var isExtensionProviderPending = _ref3.isExtensionProviderPending,
-      result = _ref3.result;
+    var isExtensionProviderPending = _ref4.isExtensionProviderPending,
+      result = _ref4.result;
     try {
       // Return the result directly if it's a valid JSX.Element
       if (result && /*#__PURE__*/_react.default.isValidElement(result)) {
@@ -312,6 +332,15 @@ var Extension = function Extension(props) {
     }, commentTargetOptions), undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };
+var Extension = function Extension(props) {
+  // Keep annotation context subscriptions out of the gate-off render path.
+  if ((0, _fg.fg)('cc_maui_annotations_on_extensions')) {
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return (0, _react2.jsx)(ExtensionWithAnnotations, props);
+  }
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return (0, _react2.jsx)(ExtensionContent, props);
+};
 var _default_1 = (0, _OverflowShadow.default)(Extension, {
   overflowSelector: ".".concat(_consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER)
 });

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

@@ -79,7 +79,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "149.0.4";
+var packageVersion = "149.0.5";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -176,20 +176,8 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
     className: RendererCssClassName.STICKY_SAFE_CENTER_WRAPPER + ' ' + RendererCssClassName.FLEX_CENTER_WRAPPER
   }, extensionDiv) : extensionDiv;
 };
-const Extension = props => {
-  var _providers$inlineComm, _props$dataAttributes;
-  const {
-    text,
-    layout = 'default',
-    handleRef,
-    shadowClassNames,
-    path = [],
-    extensionViewportSizes,
-    parameters,
-    nodeHeight,
-    localId,
-    isInsideOfInlineExtension
-  } = props;
+const ExtensionWithAnnotations = props => {
+  var _providers$inlineComm, _providers$inlineComm2, _props$dataAttributes;
   const providers = useContext(ProvidersContext);
   const {
     setHoverTarget
@@ -200,7 +188,9 @@ const Extension = props => {
     setIsWithinRange
   } = useAnnotationHoverDispatch();
   const isBlockNodeSupported = providers === null || providers === void 0 ? void 0 : (_providers$inlineComm = providers.inlineComment) === null || _providers$inlineComm === void 0 ? void 0 : _providers$inlineComm.isBlockNodeSupported;
-  const isCommentTarget = useMemo(() => Boolean(fg('cc_maui_annotations_on_extensions') && props.extensionNode && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(props.extensionNode)) === true), [props.extensionNode, isBlockNodeSupported]);
+  const supportsComments = useMemo(() => Boolean(props.extensionNode && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(props.extensionNode)) === true), [props.extensionNode, isBlockNodeSupported]);
+  const canCreateCommentOnBlockNode = providers === null || providers === void 0 ? void 0 : (_providers$inlineComm2 = providers.inlineComment) === null || _providers$inlineComm2 === void 0 ? void 0 : _providers$inlineComm2.canCreateCommentOnBlockNode;
+  const isCommentTarget = useMemo(() => Boolean(supportsComments && props.extensionNode && (!canCreateCommentOnBlockNode || canCreateCommentOnBlockNode(props.extensionNode))), [supportsComments, props.extensionNode, canCreateCommentOnBlockNode]);
   const isFullPageRenderer = props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width';
   const onMouseEnter = useCallback(event => {
     cancelTimeout();
@@ -233,12 +223,36 @@ const Extension = props => {
     isCommentTarget
   };
   const commentProps = {
-    enabled: isCommentTarget,
-    allowAnnotations: props.allowAnnotations && fg('cc_maui_annotations_on_extensions'),
-    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode,
+    enabled: supportsComments,
+    allowAnnotations: props.allowAnnotations,
+    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode && isCommentTarget,
     startPos: (_props$dataAttributes = props.dataAttributes) === null || _props$dataAttributes === void 0 ? void 0 : _props$dataAttributes['data-renderer-start-pos'],
     marks: props.marks
   };
+  return jsx(ExtensionContent
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , _extends({}, props, {
+    commentProps: commentProps,
+    commentTargetOptions: commentTargetOptions
+  }));
+};
+const ExtensionContent = ({
+  commentProps = {},
+  commentTargetOptions,
+  ...props
+}) => {
+  const {
+    text,
+    layout = 'default',
+    handleRef,
+    shadowClassNames,
+    path = [],
+    extensionViewportSizes,
+    parameters,
+    nodeHeight,
+    localId,
+    isInsideOfInlineExtension
+  } = props;
   return jsx(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -295,6 +309,15 @@ const Extension = props => {
     }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };
+const Extension = props => {
+  // Keep annotation context subscriptions out of the gate-off render path.
+  if (fg('cc_maui_annotations_on_extensions')) {
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return jsx(ExtensionWithAnnotations, props);
+  }
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return jsx(ExtensionContent, props);
+};
 const _default_1 = overflowShadow(Extension, {
   overflowSelector: `.${RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER}`
 });

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

@@ -64,7 +64,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.1;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "149.0.4";
+const packageVersion = "149.0.5";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -1,5 +1,7 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _extends from "@babel/runtime/helpers/extends";
+var _excluded = ["commentProps", "commentTargetOptions"];
 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; }
 /**
@@ -189,20 +191,8 @@ export var renderExtension = function renderExtension(content, layout) {
     className: RendererCssClassName.STICKY_SAFE_CENTER_WRAPPER + ' ' + RendererCssClassName.FLEX_CENTER_WRAPPER
   }, extensionDiv) : extensionDiv;
 };
-var Extension = function Extension(props) {
-  var _providers$inlineComm, _props$dataAttributes;
-  var text = props.text,
-    _props$layout = props.layout,
-    layout = _props$layout === void 0 ? 'default' : _props$layout,
-    handleRef = props.handleRef,
-    shadowClassNames = props.shadowClassNames,
-    _props$path = props.path,
-    path = _props$path === void 0 ? [] : _props$path,
-    extensionViewportSizes = props.extensionViewportSizes,
-    parameters = props.parameters,
-    nodeHeight = props.nodeHeight,
-    localId = props.localId,
-    isInsideOfInlineExtension = props.isInsideOfInlineExtension;
+var ExtensionWithAnnotations = function ExtensionWithAnnotations(props) {
+  var _providers$inlineComm, _providers$inlineComm2, _props$dataAttributes;
   var providers = useContext(ProvidersContext);
   var _useAnnotationRangeDi = useAnnotationRangeDispatch(),
     setHoverTarget = _useAnnotationRangeDi.setHoverTarget;
@@ -211,9 +201,13 @@ var Extension = function Extension(props) {
     initiateTimeout = _useAnnotationHoverDi.initiateTimeout,
     setIsWithinRange = _useAnnotationHoverDi.setIsWithinRange;
   var isBlockNodeSupported = providers === null || providers === void 0 || (_providers$inlineComm = providers.inlineComment) === null || _providers$inlineComm === void 0 ? void 0 : _providers$inlineComm.isBlockNodeSupported;
-  var isCommentTarget = useMemo(function () {
-    return Boolean(fg('cc_maui_annotations_on_extensions') && props.extensionNode && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(props.extensionNode)) === true);
+  var supportsComments = useMemo(function () {
+    return Boolean(props.extensionNode && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(props.extensionNode)) === true);
   }, [props.extensionNode, isBlockNodeSupported]);
+  var canCreateCommentOnBlockNode = providers === null || providers === void 0 || (_providers$inlineComm2 = providers.inlineComment) === null || _providers$inlineComm2 === void 0 ? void 0 : _providers$inlineComm2.canCreateCommentOnBlockNode;
+  var isCommentTarget = useMemo(function () {
+    return Boolean(supportsComments && props.extensionNode && (!canCreateCommentOnBlockNode || canCreateCommentOnBlockNode(props.extensionNode)));
+  }, [supportsComments, props.extensionNode, canCreateCommentOnBlockNode]);
   var isFullPageRenderer = props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width';
   var onMouseEnter = useCallback(function (event) {
     cancelTimeout();
@@ -248,21 +242,45 @@ var Extension = function Extension(props) {
     isCommentTarget: isCommentTarget
   };
   var commentProps = {
-    enabled: isCommentTarget,
-    allowAnnotations: props.allowAnnotations && fg('cc_maui_annotations_on_extensions'),
-    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode,
+    enabled: supportsComments,
+    allowAnnotations: props.allowAnnotations,
+    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode && isCommentTarget,
     startPos: (_props$dataAttributes = props.dataAttributes) === null || _props$dataAttributes === void 0 ? void 0 : _props$dataAttributes['data-renderer-start-pos'],
     marks: props.marks
   };
+  return jsx(ExtensionContent
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , _extends({}, props, {
+    commentProps: commentProps,
+    commentTargetOptions: commentTargetOptions
+  }));
+};
+var ExtensionContent = function ExtensionContent(_ref3) {
+  var _ref3$commentProps = _ref3.commentProps,
+    commentProps = _ref3$commentProps === void 0 ? {} : _ref3$commentProps,
+    commentTargetOptions = _ref3.commentTargetOptions,
+    props = _objectWithoutProperties(_ref3, _excluded);
+  var text = props.text,
+    _props$layout = props.layout,
+    layout = _props$layout === void 0 ? 'default' : _props$layout,
+    handleRef = props.handleRef,
+    shadowClassNames = props.shadowClassNames,
+    _props$path = props.path,
+    path = _props$path === void 0 ? [] : _props$path,
+    extensionViewportSizes = props.extensionViewportSizes,
+    parameters = props.parameters,
+    nodeHeight = props.nodeHeight,
+    localId = props.localId,
+    isInsideOfInlineExtension = props.isInsideOfInlineExtension;
   return jsx(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   , _extends({}, props, {
     type: "extension"
-  }), function (_ref3) {
+  }), function (_ref4) {
     var _props$hideExtensionK;
-    var isExtensionProviderPending = _ref3.isExtensionProviderPending,
-      result = _ref3.result;
+    var isExtensionProviderPending = _ref4.isExtensionProviderPending,
+      result = _ref4.result;
     try {
       // Return the result directly if it's a valid JSX.Element
       if (result && /*#__PURE__*/React.isValidElement(result)) {
@@ -307,6 +325,15 @@ var Extension = function Extension(props) {
     }, commentTargetOptions), undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };
+var Extension = function Extension(props) {
+  // Keep annotation context subscriptions out of the gate-off render path.
+  if (fg('cc_maui_annotations_on_extensions')) {
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return jsx(ExtensionWithAnnotations, props);
+  }
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  return jsx(ExtensionContent, props);
+};
 var _default_1 = overflowShadow(Extension, {
   overflowSelector: ".".concat(RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER)
 });

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

@@ -69,7 +69,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "149.0.4";
+var packageVersion = "149.0.5";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "149.0.5",
+	"version": "149.0.6",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -88,7 +88,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.3.0",
+		"@atlaskit/editor-common": "^130.4.0",
 		"@atlaskit/link-provider": "^6.0.0",
 		"@atlaskit/media-core": "^39.0.0",
 		"react": "^18.2.0 || ^19.2.0",