@atlaskit/renderer 148.1.0 → 149.0.0

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

@@ -20,7 +20,8 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
     children = _ref.children,
     dataAttributes = _ref.dataAttributes,
     id = _ref.id,
-    useBlockLevel = _ref.useBlockLevel;
+    useBlockLevel = _ref.useBlockLevel,
+    isExtension = _ref.isExtension;
   var updateSubscriber = (0, _useInlineCommentSubscriber.useInlineCommentSubscriberContext)();
   var states = (0, _react.useContext)(_context.InlineCommentsStateContext);
   var _useHasFocusEvent = (0, _useEvents.useHasFocusEvent)({
@@ -98,6 +99,7 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
     hasFocus: hasFocus,
     isHovered: isHovered,
     state: states[id],
-    useBlockLevel: useBlockLevel
+    useBlockLevel: useBlockLevel,
+    isExtension: isExtension
   }, children);
 };

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

@@ -14,6 +14,7 @@ var _annotation = require("@atlaskit/adf-schema/annotation");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _messages = require("../../../messages");
 var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
+var _extension = require("./extension");
 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; } /**
  * @jsxRuntime classic
@@ -123,7 +124,8 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
     hasFocus = _ref.hasFocus,
     isHovered = _ref.isHovered,
     onClick = _ref.onClick,
-    useBlockLevel = _ref.useBlockLevel;
+    useBlockLevel = _ref.useBlockLevel,
+    isExtension = _ref.isExtension;
   var intl = (0, _reactIntl.useIntl)();
   var annotationIds = (0, _react.useMemo)(function () {
     return (0, _toConsumableArray2.default)(new Set([].concat((0, _toConsumableArray2.default)(annotationParentIds), [id])));
@@ -213,6 +215,14 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
   } : _objectSpread({
     'aria-details': annotationIds.join(', ')
   }, desktopAccessibilityAttributes);
+  if (isExtension && (0, _fg.fg)('cc_maui_annotations_on_extensions')) {
+    // The chart's badge owns interaction. Anchors only supply geometry and annotation state.
+    return (0, _react2.jsx)(_extension.ExtensionAnnotation, {
+      id: id,
+      dataAttributes: overriddenData,
+      markRef: id === currentSelectedAnnotationId ? markRef : undefined
+    });
+  }
   return (0, _react2.jsx)(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)({
     ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id: id

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

@@ -37,7 +37,7 @@ var AnnotationsPositionContext = exports.AnnotationsPositionContext = /*#__PURE_
   startPos: 1
 });
 var AnnotationsWrapperInner = exports.AnnotationsWrapperInner = function AnnotationsWrapperInner(props) {
-  var _providers$inlineComm, _providers$inlineComm2;
+  var _providers$inlineComm, _providers$inlineComm2, _providers$inlineComm3;
   var children = props.children,
     rendererRef = props.rendererRef,
     adfDocument = props.adfDocument,
@@ -55,6 +55,7 @@ var AnnotationsWrapperInner = exports.AnnotationsWrapperInner = function Annotat
     value: inlineCommentAnnotationsState
   }, /*#__PURE__*/_react.default.createElement(_AnnotationRangeContext.AnnotationRangeProvider, {
     allowCommentsOnMedia: (_providers$inlineComm = providers === null || providers === void 0 || (_providers$inlineComm2 = providers.inlineComment) === null || _providers$inlineComm2 === void 0 ? void 0 : _providers$inlineComm2.allowCommentsOnMedia) !== null && _providers$inlineComm !== void 0 ? _providers$inlineComm : false,
+    hasBlockNodeSupport: Boolean(providers === null || providers === void 0 || (_providers$inlineComm3 = providers.inlineComment) === null || _providers$inlineComm3 === void 0 ? void 0 : _providers$inlineComm3.isBlockNodeSupported),
     isNestedRender: isNestedRender
   }, /*#__PURE__*/_react.default.createElement(_AnnotationHoverContext.AnnotationHoverContext, null, /*#__PURE__*/_react.default.createElement(_wrapper.AnnotationsContextWrapper, {
     createAnalyticsEvent: createAnalyticsEvent,

package/dist/es2019/actions/index.js

@@ -75,9 +75,10 @@ export default class RendererActions {
     let to;
     let nodePos;
     let step;
+    const schema = this.schema;
     this.doc.descendants((node, pos) => {
       const found = mark.isInSet(node.marks);
-      if (found && node.type.name === 'media') {
+      if (found && isBlockAnnotationTarget(node, schema)) {
         nodePos = pos;
       }
       if (found && !from) {
@@ -169,7 +170,6 @@ export default class RendererActions {
   }
   isRangeAnnotatable(range) {
     try {
-      var _startContainer$paren, _endContainer$parentE;
       if (!range) {
         return false;
       }
@@ -177,7 +177,7 @@ export default class RendererActions {
         startContainer,
         endContainer
       } = range;
-      if ((_startContainer$paren = startContainer.parentElement) !== null && _startContainer$paren !== void 0 && _startContainer$paren.closest('.ak-renderer-extension') || (_endContainer$parentE = endContainer.parentElement) !== null && _endContainer$parentE !== void 0 && _endContainer$parentE.closest('.ak-renderer-extension')) {
+      if (this.isInsideNestedExtensionRenderer(startContainer) || this.isInsideNestedExtensionRenderer(endContainer)) {
         return false;
       }
       return this.isValidAnnotationRange(range);
@@ -193,6 +193,36 @@ export default class RendererActions {
     }
   }
 
+  /**
+   * A range only threatens a nested renderer's own document (e.g. a bodiedExtension's macro
+   * body, which renders its own nested `<Renderer>`) when it sits inside that nested renderer's
+   * `.ak-renderer-document`. Landing directly on the extension's own outer wrapper -- with no
+   * nested document in between -- must stay annotatable so the whole chart/extension can be
+   * targeted (MAUI-1256), rather than being rejected outright the way any range touching
+   * `.ak-renderer-extension` previously was.
+   *
+   * Behind `cc_maui_annotations_on_extensions` -- the same gate MAUI-1255 added for extension
+   * node-mark support -- to preserve the previous behaviour (reject anything touching
+   * `.ak-renderer-extension`) while the feature is off.
+   */
+  isInsideNestedExtensionRenderer(container) {
+    // Preserve the legacy parent-based rejection while the gate is disabled.
+    if (!fg('cc_maui_annotations_on_extensions')) {
+      var _container$parentElem;
+      return !!((_container$parentElem = container.parentElement) !== null && _container$parentElem !== void 0 && _container$parentElem.closest('.ak-renderer-extension'));
+    }
+    const element = container instanceof Element ? container : container.parentElement;
+    if (!element) {
+      return false;
+    }
+    const extensionAncestor = element.closest('.ak-renderer-extension');
+    if (!extensionAncestor) {
+      return false;
+    }
+    const nestedDocument = element.closest('.ak-renderer-document');
+    return !!nestedDocument && extensionAncestor.contains(nestedDocument);
+  }
+
   // eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
   /**
    * This is replaced by `isRangeAnnotatable`.

package/dist/es2019/react/index.js

@@ -85,6 +85,11 @@ export default class ReactSerializer {
         if (shouldSkipLinkMark(mark) || shouldSkipBorderMark(mark)) {
           return content;
         }
+        // Extension annotations are sibling anchors inside the stable extension shell.
+        // Wrapping the extension here would remount its iframe whenever marks change.
+        if (node.type.name === 'extension' && mark.type.name === 'annotation' && this.allowAnnotations && fg('cc_maui_annotations_on_extensions')) {
+          return content;
+        }
         return this.renderMark(markToReact(mark), this.withMediaMarkProps(node, mark, this.getMarkProps(mark, [], node)), `${mark.type.name}-${index}`, content);
       }, serializedContent);
       return withExpandBodyBlock(node, currentPath, index, serialized);
@@ -503,6 +508,9 @@ export default class ReactSerializer {
     var _this$getExtensionHei;
     return {
       ...this.getProps(node, path),
+      allowAnnotations: this.allowAnnotations,
+      allowAnnotationsDraftMode: this.surroundTextNodesWithTextWrapper,
+      extensionNode: node,
       extensionViewportSizes: this.extensionViewportSizes,
       hideExtensionKeysWhilePending: this.hideExtensionKeysWhilePending,
       nodeHeight: (_this$getExtensionHei = this.getExtensionHeight) === null || _this$getExtensionHei === void 0 ? void 0 : _this$getExtensionHei.call(this, node),

package/dist/es2019/react/marks/annotation.js

@@ -13,6 +13,7 @@ const AnnotationComponent = ({
   annotationParentIds = [],
   allowAnnotations,
   useBlockLevel,
+  isExtension,
   isMediaInline
 }) => {
   const data = {
@@ -36,7 +37,8 @@ const AnnotationComponent = ({
       dataAttributes: data,
       annotationParentIds: annotationParentIds,
       annotationType: annotationType,
-      useBlockLevel: useBlockLevel
+      useBlockLevel: useBlockLevel,
+      isExtension: isExtension
     }, children);
   }
   return (

package/dist/es2019/react/nodes/extension-comments.compiled.css

@@ -0,0 +1,4 @@
+._154iu2gc{top:var(--ds-space-100,8px)}
+._1xi2u2gc{right:var(--ds-space-100,8px)}
+._kqswh2mm{position:relative}
+._kqswstnw{position:absolute}

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

@@ -0,0 +1,115 @@
+/* extension-comments.tsx generated by @compiled/babel-plugin v3.0.2 */
+import "./extension-comments.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { AnnotationMarkStates, AnnotationTypes } from '@atlaskit/adf-schema/annotation';
+import { VIEW_METHOD } from '@atlaskit/editor-common/analytics';
+import { CommentBadgeNext } from '@atlaskit/editor-common/media-single';
+import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
+import { useAnnotationManagerState } from '../../ui/annotations/contexts/AnnotationManagerContext';
+import { useAnnotationRangeState } from '../../ui/annotations/contexts/AnnotationRangeContext';
+import { useInlineCommentSubscriberContext } from '../../ui/annotations/hooks/use-inline-comment-subscriber';
+import { useInlineCommentsFilter } from '../../ui/annotations/hooks/use-inline-comments-filter';
+import AnnotationComponent from '../marks/annotation';
+const containerStyles = null;
+const annotationParentIds = [];
+const annotationDataAttributes = {
+  'data-renderer-mark': true,
+  'data-block-mark': true
+};
+const badgeStyles = null;
+const ExtensionCommentsEnabled = ({
+  marks,
+  children,
+  enabled,
+  allowAnnotations,
+  allowAnnotationsDraftMode,
+  startPos
+}) => {
+  const {
+    hoverDraftDocumentPosition
+  } = useAnnotationRangeState();
+  const isDraft = Boolean(enabled && allowAnnotationsDraftMode && hoverDraftDocumentPosition && hoverDraftDocumentPosition.from + 1 === startPos);
+  const updateSubscriber = useInlineCommentSubscriberContext();
+  const annotationIds = useMemo(() => {
+    var _marks$filter$map;
+    return (_marks$filter$map = marks === null || marks === void 0 ? void 0 : marks.filter(mark => mark.type.name === 'annotation').map(mark => mark.attrs.id)) !== null && _marks$filter$map !== void 0 ? _marks$filter$map : [];
+  }, [marks]);
+  const activeIds = useInlineCommentsFilter({
+    annotationIds,
+    filter: {
+      state: AnnotationMarkStates.ACTIVE
+    }
+  });
+  const [focusedId, setFocusedId] = useState();
+  const [entered, setEntered] = useState(false);
+  const {
+    currentSelectedAnnotationId
+  } = useAnnotationManagerState();
+  const active = activeIds.some(id => id === focusedId || id === currentSelectedAnnotationId);
+  useEffect(() => {
+    if (!updateSubscriber) {
+      return;
+    }
+    const onFocus = payload => setFocusedId(payload === null || payload === void 0 ? void 0 : payload.annotationId);
+    const onBlur = () => setFocusedId(undefined);
+    updateSubscriber.on(AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, onFocus);
+    updateSubscriber.on(AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, onBlur);
+    return () => {
+      updateSubscriber.off(AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, onFocus);
+      updateSubscriber.off(AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, onBlur);
+    };
+  }, [updateSubscriber]);
+  const onClick = useCallback(event => {
+    event.preventDefault();
+    event.stopPropagation();
+    // Anchor the thread to this chart, not an icon inside the badge or a nested renderer.
+    const extension = event.currentTarget.closest('.ak-renderer-extension');
+    if (extension && activeIds.length) {
+      updateSubscriber === null || updateSubscriber === void 0 ? void 0 : updateSubscriber.emit(AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
+        annotationIds: activeIds,
+        eventTarget: extension,
+        eventTargetType: 'extension',
+        viewMethod: VIEW_METHOD.BADGE
+      });
+    }
+  }, [activeIds, updateSubscriber]);
+  const onMouseEnter = useCallback(() => setEntered(true), []);
+  const onMouseLeave = useCallback(() => setEntered(false), []);
+  return /*#__PURE__*/React.createElement("div", {
+    "data-annotation-draft-mark": isDraft || undefined,
+    "data-renderer-mark": isDraft || undefined,
+    "data-renderer-start-pos": isDraft ? startPos : undefined,
+    className: ax(["_kqswh2mm"])
+  }, children, allowAnnotations && annotationIds.map(id => /*#__PURE__*/React.createElement(AnnotationComponent, {
+    key: id,
+    id: id,
+    annotationType: AnnotationTypes.INLINE_COMMENT,
+    annotationParentIds: annotationParentIds,
+    allowAnnotations: true,
+    useBlockLevel: true,
+    isExtension: true,
+    dataAttributes: annotationDataAttributes
+  })), enabled && activeIds.length > 0 && updateSubscriber && /*#__PURE__*/React.createElement("div", {
+    className: ax(["_kqswstnw _154iu2gc _1xi2u2gc"])
+  }, /*#__PURE__*/React.createElement(CommentBadgeNext, {
+    status: active ? 'active' : entered ? 'entered' : 'default',
+    onClick: onClick,
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave
+  })));
+};
+
+/** Only node-aware provider-approved extensions receive comment visuals. */
+export const ExtensionComments = props => {
+  if (!props.enabled && !props.allowAnnotations) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  }
+  return /*#__PURE__*/React.createElement(ExtensionCommentsEnabled, {
+    enabled: props.enabled,
+    allowAnnotations: props.allowAnnotations,
+    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode,
+    startPos: props.startPos,
+    marks: props.marks
+  }, props.children);
+};

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

@@ -4,7 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
  * @jsx jsx
  */
 
-import React, { useEffect, useRef } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx, css } from '@emotion/react';
@@ -13,8 +13,12 @@ import { overflowShadow } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { RendererCssClassName } from '../../consts';
+import { ProvidersContext } from '../../ui/annotations/context';
+import { useAnnotationHoverDispatch } from '../../ui/annotations/contexts/AnnotationHoverContext';
+import { useAnnotationRangeDispatch } from '../../ui/annotations/contexts/AnnotationRangeContext';
 import ExtensionRenderer from '../../ui/ExtensionRenderer';
 import { calcBreakoutWidthCss } from '../utils/breakout';
+import { ExtensionComments } from './extension-comments';
 const FORGE_EXTENSION_TYPE = 'com.atlassian.ecosystem';
 /**
  * Mirrors `FORGE_INLINE_BODIED_PARAM` in `@atlassian/xen-editor-provider`. Duplicated rather than
@@ -68,7 +72,7 @@ const FireExtensionAsInlineAnalytics = ({
   return null;
 };
 export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight, localId, shouldDisplayExtensionAsInline, node, isInsideOfInlineExtension) => {
-  var _node$parameters, _node$parameters$gues, _node$parameters2;
+  var _node$parameters, _node$parameters$gues, _node$parameters2, _options$dataAttribut;
   const overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -147,11 +151,17 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
     },
     "data-layout": layout,
     "data-local-id": localId,
+    "data-renderer-start-pos": (_options$dataAttribut = options.dataAttributes) === null || _options$dataAttribut === void 0 ? void 0 : _options$dataAttribut['data-renderer-start-pos'],
     "data-testid": "extension--wrapper",
     "data-node-type": "extension",
+    "data-inline-comments-target": options.isCommentTarget || undefined,
     "data-top-level": isTopLevel || undefined,
     "data-forge-inline": isNativeForgeInline || undefined,
-    "data-migrated-inline": isMigratedInlineBodied || undefined
+    "data-migrated-inline": isMigratedInlineBodied || undefined,
+    onBlur: options.onBlur,
+    onFocus: options.onFocus,
+    onMouseEnter: options.onMouseEnter,
+    onMouseLeave: options.onMouseLeave
   }, jsx("div", {
     tabIndex: options.tabIndex
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
@@ -165,6 +175,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
   }, extensionDiv) : extensionDiv;
 };
 const Extension = props => {
+  var _providers$inlineComm, _props$dataAttributes;
   const {
     text,
     layout = 'default',
@@ -177,6 +188,55 @@ const Extension = props => {
     localId,
     isInsideOfInlineExtension
   } = props;
+  const providers = useContext(ProvidersContext);
+  const {
+    setHoverTarget
+  } = useAnnotationRangeDispatch();
+  const {
+    cancelTimeout,
+    initiateTimeout,
+    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 isFullPageRenderer = props.rendererAppearance === 'full-page' || props.rendererAppearance === 'full-width';
+  const onMouseEnter = useCallback(event => {
+    cancelTimeout();
+    if (event.buttons === 0) {
+      setHoverTarget === null || setHoverTarget === void 0 ? void 0 : setHoverTarget(event.currentTarget);
+      setIsWithinRange(true);
+    }
+  }, [cancelTimeout, setHoverTarget, setIsWithinRange]);
+  const onMouseLeave = useCallback(() => initiateTimeout(), [initiateTimeout]);
+  const onFocus = useCallback(event => {
+    if (event.currentTarget.contains(event.relatedTarget)) {
+      return;
+    }
+    cancelTimeout();
+    setHoverTarget === null || setHoverTarget === void 0 ? void 0 : setHoverTarget(event.currentTarget);
+    setIsWithinRange(true);
+  }, [cancelTimeout, setHoverTarget, setIsWithinRange]);
+  const onBlur = useCallback(event => {
+    if (!event.currentTarget.contains(event.relatedTarget)) {
+      initiateTimeout();
+    }
+  }, [initiateTimeout]);
+  const commentTargetOptions = isCommentTarget && isFullPageRenderer ? {
+    isCommentTarget: true,
+    onBlur,
+    onFocus,
+    onMouseEnter,
+    onMouseLeave
+  } : {
+    isCommentTarget
+  };
+  const commentProps = {
+    enabled: isCommentTarget,
+    allowAnnotations: props.allowAnnotations && fg('cc_maui_annotations_on_extensions'),
+    allowAnnotationsDraftMode: props.allowAnnotationsDraftMode,
+    startPos: (_props$dataAttributes = props.dataAttributes) === null || _props$dataAttributes === void 0 ? void 0 : _props$dataAttributes['data-renderer-start-pos'],
+    marks: props.marks
+  };
   return jsx(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -190,12 +250,20 @@ const Extension = props => {
     try {
       // Return the result directly if it's a valid JSX.Element
       if (result && /*#__PURE__*/React.isValidElement(result)) {
-        return renderExtension(result, layout, {
+        return renderExtension(jsx(ExtensionComments, {
+          enabled: commentProps.enabled,
+          allowAnnotations: commentProps.allowAnnotations,
+          allowAnnotationsDraftMode: commentProps.allowAnnotationsDraftMode,
+          startPos: commentProps.startPos,
+          marks: commentProps.marks
+        }, result), layout, {
+          dataAttributes: props.dataAttributes,
           isTopLevel: path.length < 1,
           handleRef,
           shadowClassNames,
           tabIndex: props.tabIndex,
-          rendererAppearance: props.rendererAppearance
+          rendererAppearance: props.rendererAppearance,
+          ...commentTargetOptions
         }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
       }
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -208,12 +276,20 @@ const Extension = props => {
     }
 
     // Always return default content if anything goes wrong
-    return renderExtension(text || 'extension', layout, {
+    return renderExtension(jsx(ExtensionComments, {
+      enabled: commentProps.enabled,
+      allowAnnotations: commentProps.allowAnnotations,
+      allowAnnotationsDraftMode: commentProps.allowAnnotationsDraftMode,
+      startPos: commentProps.startPos,
+      marks: commentProps.marks
+    }, text || 'extension'), layout, {
+      dataAttributes: props.dataAttributes,
       isTopLevel: path.length < 1,
       handleRef,
       shadowClassNames,
       tabIndex: props.tabIndex,
-      rendererAppearance: props.rendererAppearance
+      rendererAppearance: props.rendererAppearance,
+      ...commentTargetOptions
     }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId, undefined, undefined, isInsideOfInlineExtension);
   });
 };

package/dist/es2019/steps/index.js

@@ -219,6 +219,24 @@ export function resolvePos(node, offset, findEnd = false) {
   }
   return resolvedPos + offset;
 }
+function getSelectedCommentTargetPosition(range) {
+  const {
+    startContainer,
+    startOffset,
+    endContainer,
+    endOffset
+  } = range;
+  if (startContainer !== endContainer || endOffset !== startOffset + 1) {
+    return false;
+  }
+  const selectedNode = startContainer.childNodes[startOffset];
+  if (!selectedNode || !isElementNode(selectedNode) || selectedNode.dataset.inlineCommentsTarget !== 'true' || !isPositionPointer(selectedNode)) {
+    return false;
+  }
+
+  // Subtract 1 from the renderer start position to get the position before the extension node.
+  return getStartPos(selectedNode) - 1;
+}
 export function getPosFromRange(range) {
   const {
     startContainer,
@@ -226,6 +244,13 @@ export function getPosFromRange(range) {
     endContainer,
     endOffset
   } = range;
+  const selectedCommentTargetPosition = fg('cc_maui_annotations_on_extensions') && getSelectedCommentTargetPosition(range);
+  if (selectedCommentTargetPosition !== false) {
+    return {
+      from: selectedCommentTargetPosition,
+      to: selectedCommentTargetPosition
+    };
+  }
   const possibleMediaOrMediaSingleElement = findParent(startContainer);
 
   // Video hover targets return media single, not media, thus, the extra check in condition.

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

@@ -57,7 +57,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 = "148.0.4";
+const packageVersion = "148.1.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/ui/annotations/contexts/AnnotationRangeContext.js

@@ -1,4 +1,5 @@
-import React, { createContext, useCallback, useContext, useMemo, useReducer } from 'react';
+import React, { createContext, useCallback, useContext, useMemo, useReducer, useRef } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 
 // oxlint-disable-next-line eslint/no-redeclare
 
@@ -117,8 +118,10 @@ export const AnnotationRangeDispatchContext = /*#__PURE__*/createContext({
 });
 export const AnnotationRangeProviderInner = ({
   children,
-  allowCommentsOnMedia
+  allowCommentsOnMedia,
+  hasBlockNodeSupport
 }) => {
+  const extensionCommentsEnabled = !!hasBlockNodeSupport && fg('cc_maui_annotations_on_extensions');
   const [{
     selectionRange,
     hoverRange,
@@ -138,21 +141,32 @@ export const AnnotationRangeProviderInner = ({
     type: 'setSelection',
     range
   }), []);
+  const hoverDraftRangeRef = useRef(hoverDraftRange);
+  hoverDraftRangeRef.current = hoverDraftRange;
   const setHoverTarget = useCallback(target => {
-    // the HoverComponent expects an element deeply nested inside media, these classes work with the current implementation
-    const mediaNode = target.querySelector('.media-card-inline-player, .media-file-card-view');
-    if (!mediaNode) {
+    const draftRange = hoverDraftRangeRef.current;
+    const draftTarget = draftRange === null || draftRange === void 0 ? void 0 : draftRange.startContainer.childNodes[draftRange.startOffset];
+    if (extensionCommentsEnabled && draftTarget instanceof HTMLElement && draftTarget.matches('.ak-renderer-extension[data-inline-comments-target="true"]')) {
+      // Keep the composer callbacks bound to the chart chosen when its draft opened.
+      return;
+    }
+    // The HoverComponent expects an element deeply nested inside media or the eligible
+    // block node's wrapper. Each selector is only included when its comment type is
+    // supported, so hover targeting never activates on an ineligible block node.
+    const selectors = [allowCommentsOnMedia && '.media-card-inline-player, .media-file-card-view', extensionCommentsEnabled && '.ak-renderer-extension[data-inline-comments-target="true"]'].filter(selector => Boolean(selector)).join(', ');
+    const hoverableNode = extensionCommentsEnabled && target.matches('.ak-renderer-extension[data-inline-comments-target="true"]') ? target : selectors ? target.querySelector(selectors) : null;
+    if (!hoverableNode) {
       return;
     }
-    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- range for media hover highlight
+    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- range for media/extension hover highlight
     const range = document.createRange();
-    range.setStartBefore(mediaNode);
-    range.setEndAfter(mediaNode);
+    range.setStartBefore(hoverableNode);
+    range.setEndAfter(hoverableNode);
     dispatch({
       type: 'setHover',
       range
     });
-  }, []);
+  }, [allowCommentsOnMedia, extensionCommentsEnabled]);
   const promoteSelectionToDraft = useCallback(position => {
     dispatch({
       type: 'promoteSelectionToDraft',
@@ -191,12 +205,12 @@ export const AnnotationRangeProviderInner = ({
     clearSelectionRange,
     clearHoverRange,
     setSelectionRange,
-    setHoverTarget: !!allowCommentsOnMedia ? setHoverTarget : undefined,
+    setHoverTarget: allowCommentsOnMedia || extensionCommentsEnabled ? setHoverTarget : undefined,
     promoteSelectionToDraft,
     promoteHoverToDraft,
     clearSelectionDraft,
     clearHoverDraft
-  }), [allowCommentsOnMedia, clearSelectionRange, clearHoverRange, setSelectionRange, setHoverTarget, promoteSelectionToDraft, promoteHoverToDraft, clearSelectionDraft, clearHoverDraft]);
+  }), [allowCommentsOnMedia, extensionCommentsEnabled, clearSelectionRange, clearHoverRange, setSelectionRange, setHoverTarget, promoteSelectionToDraft, promoteHoverToDraft, clearSelectionDraft, clearHoverDraft]);
   return /*#__PURE__*/React.createElement(AnnotationRangeStateContext.Provider, {
     value: stateData
   }, /*#__PURE__*/React.createElement(AnnotationRangeDispatchContext.Provider, {
@@ -206,6 +220,7 @@ export const AnnotationRangeProviderInner = ({
 export const AnnotationRangeProvider = ({
   children,
   allowCommentsOnMedia,
+  hasBlockNodeSupport,
   isNestedRender
 }) => {
   /*
@@ -214,7 +229,8 @@ export const AnnotationRangeProvider = ({
    * and we need the original context to create annotations on extensions.
    */
   return isNestedRender ? /*#__PURE__*/React.createElement(React.Fragment, null, children) : /*#__PURE__*/React.createElement(AnnotationRangeProviderInner, {
-    allowCommentsOnMedia: allowCommentsOnMedia
+    allowCommentsOnMedia: allowCommentsOnMedia,
+    hasBlockNodeSupport: hasBlockNodeSupport
   }, children);
 };
 export const useAnnotationRangeState = () => {

package/dist/es2019/ui/annotations/element/extension.compiled.css

@@ -0,0 +1,6 @@
+._154iidpf{top:0}
+._1ltvidpf{left:0}
+._1xi2idpf{right:0}
+._94n5idpf{bottom:0}
+._kqswstnw{position:absolute}
+._lcxvglyw{pointer-events:none}

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

@@ -0,0 +1,26 @@
+/* extension.tsx generated by @compiled/babel-plugin v3.0.2 */
+import "./extension.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
+import React from 'react';
+const styles = {
+  anchor: "_kqswstnw _154iidpf _1xi2idpf _94n5idpf _1ltvidpf _lcxvglyw"
+};
+
+/** Full-chart anchors for comment navigation, without wrapping or intercepting the iframe. */
+export const ExtensionAnnotation = ({
+  id,
+  dataAttributes,
+  markRef
+}) => /*#__PURE__*/React.createElement("div", {
+  id: id,
+  ref: markRef,
+  "data-id": dataAttributes['data-id'],
+  "data-mark-type": dataAttributes['data-mark-type'],
+  "data-mark-annotation-type": dataAttributes['data-mark-annotation-type'],
+  "data-mark-annotation-state": dataAttributes['data-mark-annotation-state'],
+  "data-block-mark": dataAttributes['data-block-mark'],
+  "data-renderer-mark": dataAttributes['data-renderer-mark'],
+  "data-has-focus": dataAttributes['data-has-focus'],
+  "data-is-hovered": dataAttributes['data-is-hovered'],
+  className: ax([styles.anchor])
+});

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

@@ -12,7 +12,8 @@ const MarkElement = ({
   children,
   dataAttributes,
   id,
-  useBlockLevel
+  useBlockLevel,
+  isExtension
 }) => {
   const updateSubscriber = useInlineCommentSubscriberContext();
   const states = useContext(InlineCommentsStateContext);
@@ -93,7 +94,8 @@ const MarkElement = ({
     hasFocus: hasFocus,
     isHovered: isHovered,
     state: states[id],
-    useBlockLevel: useBlockLevel
+    useBlockLevel: useBlockLevel,
+    isExtension: isExtension
   }, children);
 };
 export { MarkElement };