@atlaskit/renderer 148.0.4 → 149.0.0

package/dist/esm/steps/index.js

@@ -216,11 +216,34 @@ export function resolvePos(node, offset) {
   }
   return resolvedPos + offset;
 }
+function getSelectedCommentTargetPosition(range) {
+  var startContainer = range.startContainer,
+    startOffset = range.startOffset,
+    endContainer = range.endContainer,
+    endOffset = range.endOffset;
+  if (startContainer !== endContainer || endOffset !== startOffset + 1) {
+    return false;
+  }
+  var 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) {
   var startContainer = range.startContainer,
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
+  var selectedCommentTargetPosition = fg('cc_maui_annotations_on_extensions') && getSelectedCommentTargetPosition(range);
+  if (selectedCommentTargetPosition !== false) {
+    return {
+      from: selectedCommentTargetPosition,
+      to: selectedCommentTargetPosition
+    };
+  }
   var possibleMediaOrMediaSingleElement = findParent(startContainer);
 
   // Video hover targets return media single, not media, thus, the extra check in condition.

package/dist/esm/ui/Expand.js

@@ -16,6 +16,7 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { ExpandIconWrapper, ExpandLayoutWrapperWithRef, expandMessages, WidthProvider } from '@atlaskit/editor-common/ui';
 import { akEditorLineHeight, akEditorSwoopCubicBezier, akLayoutGutterOffset } from '@atlaskit/editor-shared-styles';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { MODE, PLATFORM } from '../analytics/events';
 import { ActiveHeaderIdConsumer } from './active-header-id-provider';
@@ -394,10 +395,19 @@ function Expand(_ref) {
       e.preventDefault();
       e.stopPropagation();
       fireExpandToggleAnalytics(nodeType, expanded, fireAnalyticsEvent);
+      // Recorded so a product remounting this expand under its own body gets it back as the
+      // reader left it.
+      var recordsToggle = node !== undefined && isExperimentEnabled('cc_light_mode_table_virtualization');
       if (expanded) {
         setExpanded(false);
+        if (recordsToggle) {
+          revealedByFind.delete(node);
+        }
       } else {
         openBody();
+        if (recordsToggle) {
+          revealedByFind.add(node);
+        }
       }
       e.persist();
       // @ts-ignore detail doesn't exist on type

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

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

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

@@ -2,7 +2,8 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import 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
 
@@ -113,7 +114,9 @@ export var AnnotationRangeDispatchContext = /*#__PURE__*/createContext({
 });
 export var AnnotationRangeProviderInner = function AnnotationRangeProviderInner(_ref) {
   var children = _ref.children,
-    allowCommentsOnMedia = _ref.allowCommentsOnMedia;
+    allowCommentsOnMedia = _ref.allowCommentsOnMedia,
+    hasBlockNodeSupport = _ref.hasBlockNodeSupport;
+  var extensionCommentsEnabled = !!hasBlockNodeSupport && fg('cc_maui_annotations_on_extensions');
   var _useReducer = useReducer(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     _useReducer2$ = _useReducer2[0],
@@ -141,21 +144,34 @@ export var AnnotationRangeProviderInner = function AnnotationRangeProviderInner(
       range: range
     });
   }, []);
+  var hoverDraftRangeRef = useRef(hoverDraftRange);
+  hoverDraftRangeRef.current = hoverDraftRange;
   var setHoverTarget = useCallback(function (target) {
-    // the HoverComponent expects an element deeply nested inside media, these classes work with the current implementation
-    var mediaNode = target.querySelector('.media-card-inline-player, .media-file-card-view');
-    if (!mediaNode) {
+    var draftRange = hoverDraftRangeRef.current;
+    var 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;
     }
-    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- range for media hover highlight
+    // 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.
+    var selectors = [allowCommentsOnMedia && '.media-card-inline-player, .media-file-card-view', extensionCommentsEnabled && '.ak-renderer-extension[data-inline-comments-target="true"]'].filter(function (selector) {
+      return Boolean(selector);
+    }).join(', ');
+    var 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/extension hover highlight
     var range = document.createRange();
-    range.setStartBefore(mediaNode);
-    range.setEndAfter(mediaNode);
+    range.setStartBefore(hoverableNode);
+    range.setEndAfter(hoverableNode);
     dispatch({
       type: 'setHover',
       range: range
     });
-  }, []);
+  }, [allowCommentsOnMedia, extensionCommentsEnabled]);
   var promoteSelectionToDraft = useCallback(function (position) {
     dispatch({
       type: 'promoteSelectionToDraft',
@@ -195,13 +211,13 @@ export var AnnotationRangeProviderInner = function AnnotationRangeProviderInner(
       clearSelectionRange: clearSelectionRange,
       clearHoverRange: clearHoverRange,
       setSelectionRange: setSelectionRange,
-      setHoverTarget: !!allowCommentsOnMedia ? setHoverTarget : undefined,
+      setHoverTarget: allowCommentsOnMedia || extensionCommentsEnabled ? setHoverTarget : undefined,
       promoteSelectionToDraft: promoteSelectionToDraft,
       promoteHoverToDraft: promoteHoverToDraft,
       clearSelectionDraft: clearSelectionDraft,
       clearHoverDraft: 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, {
@@ -211,6 +227,7 @@ export var AnnotationRangeProviderInner = function AnnotationRangeProviderInner(
 export var AnnotationRangeProvider = function AnnotationRangeProvider(_ref2) {
   var children = _ref2.children,
     allowCommentsOnMedia = _ref2.allowCommentsOnMedia,
+    hasBlockNodeSupport = _ref2.hasBlockNodeSupport,
     isNestedRender = _ref2.isNestedRender;
   /*
    * If this is a nested render, we do not provide the context
@@ -218,7 +235,8 @@ export var AnnotationRangeProvider = function AnnotationRangeProvider(_ref2) {
    * 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 var useAnnotationRangeState = function useAnnotationRangeState() {

package/dist/esm/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/esm/ui/annotations/element/extension.js

@@ -0,0 +1,27 @@
+/* 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';
+var styles = {
+  anchor: "_kqswstnw _154iidpf _1xi2idpf _94n5idpf _1ltvidpf _lcxvglyw"
+};
+
+/** Full-chart anchors for comment navigation, without wrapping or intercepting the iframe. */
+export var ExtensionAnnotation = function ExtensionAnnotation(_ref) {
+  var id = _ref.id,
+    dataAttributes = _ref.dataAttributes,
+    markRef = _ref.markRef;
+  return /*#__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/esm/ui/annotations/element/index.js

@@ -12,7 +12,8 @@ var MarkElement = function MarkElement(_ref) {
     children = _ref.children,
     dataAttributes = _ref.dataAttributes,
     id = _ref.id,
-    useBlockLevel = _ref.useBlockLevel;
+    useBlockLevel = _ref.useBlockLevel,
+    isExtension = _ref.isExtension;
   var updateSubscriber = useInlineCommentSubscriberContext();
   var states = useContext(InlineCommentsStateContext);
   var _useHasFocusEvent = useHasFocusEvent({
@@ -90,7 +91,8 @@ var MarkElement = function MarkElement(_ref) {
     hasFocus: hasFocus,
     isHovered: isHovered,
     state: states[id],
-    useBlockLevel: useBlockLevel
+    useBlockLevel: useBlockLevel,
+    isExtension: isExtension
   }, children);
 };
 export { MarkElement };

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

@@ -16,6 +16,7 @@ import { AnnotationMarkStates } from '@atlaskit/adf-schema/annotation';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { inlineCommentMessages } from '../../../messages';
 import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
+import { ExtensionAnnotation } from './extension';
 var markStyles = css(_defineProperty({
   color: 'inherit',
   backgroundColor: 'unset',
@@ -120,7 +121,8 @@ export var MarkComponent = function MarkComponent(_ref) {
     hasFocus = _ref.hasFocus,
     isHovered = _ref.isHovered,
     onClick = _ref.onClick,
-    useBlockLevel = _ref.useBlockLevel;
+    useBlockLevel = _ref.useBlockLevel,
+    isExtension = _ref.isExtension;
   var intl = useIntl();
   var annotationIds = useMemo(function () {
     return _toConsumableArray(new Set([].concat(_toConsumableArray(annotationParentIds), [id])));
@@ -210,6 +212,14 @@ export var MarkComponent = function MarkComponent(_ref) {
   } : _objectSpread({
     'aria-details': annotationIds.join(', ')
   }, desktopAccessibilityAttributes);
+  if (isExtension && fg('cc_maui_annotations_on_extensions')) {
+    // The chart's badge owns interaction. Anchors only supply geometry and annotation state.
+    return jsx(ExtensionAnnotation, {
+      id: id,
+      dataAttributes: overriddenData,
+      markRef: id === currentSelectedAnnotationId ? markRef : undefined
+    });
+  }
   return jsx(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread(_defineProperty({
     ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id: id

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

@@ -29,7 +29,7 @@ export var AnnotationsPositionContext = /*#__PURE__*/React.createContext({
   startPos: 1
 });
 export var 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,
@@ -47,6 +47,7 @@ export var AnnotationsWrapperInner = function AnnotationsWrapperInner(props) {
     value: inlineCommentAnnotationsState
   }, /*#__PURE__*/React.createElement(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.createElement(AnnotationHoverContext, null, /*#__PURE__*/React.createElement(AnnotationsContextWrapper, {
     createAnalyticsEvent: createAnalyticsEvent,

package/dist/types/actions/index.d.ts

@@ -71,6 +71,19 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     annotate(range: Range, annotationId: string, _annotationType: 'inlineComment'): AnnotationActionResult;
     isValidAnnotationRange(range: Range | null): boolean;
     isRangeAnnotatable(range: Range | null): boolean;
+    /**
+     * 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.
+     */
+    private isInsideNestedExtensionRenderer;
     /**
      * This is replaced by `isRangeAnnotatable`.
      *

package/dist/types/entry-points/expand-body.d.ts

@@ -0,0 +1,2 @@
+export { ExpandBodyProvider } from '../ui/utils/expand-body';
+export type { ExpandBody } from '../ui/utils/expand-body';

package/dist/types/react/marks/annotation.d.ts

@@ -2,5 +2,5 @@ import React from 'react';
 import type { Mark } from '@atlaskit/editor-prosemirror/model';
 import type { MarkProps, AnnotationMarkMeta } from '../types';
 export declare const isAnnotationMark: (mark: Mark) => boolean;
-declare const AnnotationComponent: ({ id, annotationType, children, dataAttributes, annotationParentIds, allowAnnotations, useBlockLevel, isMediaInline, }: MarkProps<AnnotationMarkMeta>) => React.JSX.Element;
+declare const AnnotationComponent: ({ id, annotationType, children, dataAttributes, annotationParentIds, allowAnnotations, useBlockLevel, isExtension, isMediaInline, }: MarkProps<AnnotationMarkMeta>) => React.JSX.Element;
 export default AnnotationComponent;

package/dist/types/react/nodes/extension-comments.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ * @jsxFrag React.Fragment
+ */
+import React from 'react';
+import type { Mark } from '@atlaskit/editor-prosemirror/model';
+type Props = React.PropsWithChildren<{
+    allowAnnotations?: boolean;
+    allowAnnotationsDraftMode?: boolean;
+    enabled?: boolean;
+    marks?: readonly Mark[];
+    startPos?: number;
+}>;
+/** Only node-aware provider-approved extensions receive comment visuals. */
+export declare const ExtensionComments: (props: Props) => React.JSX.Element;
+export {};

package/dist/types/react/nodes/extension.d.ts

@@ -12,8 +12,14 @@ import type { AnalyticsEventPayload } from '../../analytics/events';
 import type { RendererAppearance } from '../../ui/Renderer/types';
 import type { RendererContext, ExtensionViewportSize } from '../types';
 interface Props {
+    allowAnnotations?: boolean;
+    allowAnnotationsDraftMode?: boolean;
+    dataAttributes?: {
+        'data-renderer-start-pos': number;
+    };
     extensionHandlers?: ExtensionHandlers;
     extensionKey: string;
+    extensionNode?: PMNode;
     extensionType: string;
     extensionViewportSizes?: ExtensionViewportSize[];
     /**
@@ -40,8 +46,14 @@ type AllOrNone<T> = T | {
     [K in keyof T]?: never;
 };
 type RenderExtensionOptions = {
+    dataAttributes?: Props['dataAttributes'];
     fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
+    isCommentTarget?: boolean;
     isTopLevel?: boolean;
+    onBlur?: React.FocusEventHandler<HTMLDivElement>;
+    onFocus?: React.FocusEventHandler<HTMLDivElement>;
+    onMouseEnter?: React.MouseEventHandler<HTMLDivElement>;
+    onMouseLeave?: React.MouseEventHandler<HTMLDivElement>;
     rendererAppearance?: RendererAppearance;
 } & AllOrNone<OverflowShadowProps>;
 export declare const renderExtension: (content: any, layout: ExtensionLayout, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string, shouldDisplayExtensionAsInline?: (extensionParams?: ExtensionParams<Parameters>) => boolean, node?: ExtensionParams<Parameters>, isInsideOfInlineExtension?: boolean) => React.JSX.Element;

package/dist/types/react/types.d.ts

@@ -79,6 +79,7 @@ export interface AnnotationMarkMeta extends MarkMeta {
     annotationParentIds: string[];
     annotationType: AnnotationTypes;
     id: AnnotationId;
+    isExtension?: boolean;
     isMediaInline?: boolean;
     useBlockLevel?: boolean;
 }

package/dist/types/ui/annotations/contexts/AnnotationRangeContext.d.ts

@@ -36,13 +36,15 @@ interface AnnotationRangeDispatchContext {
 }
 export declare const AnnotationRangeStateContext: React.Context<AnnotationRangeStateContext>;
 export declare const AnnotationRangeDispatchContext: React.Context<AnnotationRangeDispatchContext>;
-export declare const AnnotationRangeProviderInner: ({ children, allowCommentsOnMedia, }: {
+export declare const AnnotationRangeProviderInner: ({ children, allowCommentsOnMedia, hasBlockNodeSupport, }: {
     allowCommentsOnMedia?: boolean;
     children?: ReactNode;
+    hasBlockNodeSupport?: boolean;
 }) => React.JSX.Element;
-export declare const AnnotationRangeProvider: ({ children, allowCommentsOnMedia, isNestedRender, }: {
+export declare const AnnotationRangeProvider: ({ children, allowCommentsOnMedia, hasBlockNodeSupport, isNestedRender, }: {
     allowCommentsOnMedia?: boolean;
     children?: ReactNode;
+    hasBlockNodeSupport?: boolean;
     isNestedRender?: boolean;
 }) => React.JSX.Element;
 export declare const useAnnotationRangeState: () => AnnotationRangeStateContext;

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

@@ -0,0 +1,17 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import React from 'react';
+import type { AnnotationDataAttributes } from '@atlaskit/adf-schema/annotation';
+/** Full-chart anchors for comment navigation, without wrapping or intercepting the iframe. */
+export declare const ExtensionAnnotation: ({ id, dataAttributes, markRef, }: {
+    dataAttributes: AnnotationDataAttributes & {
+        'data-block-mark'?: boolean;
+        'data-has-focus'?: boolean;
+        'data-is-hovered'?: boolean;
+        'data-renderer-mark'?: boolean;
+    };
+    id: string;
+    markRef?: React.Ref<HTMLDivElement>;
+}) => React.JSX.Element;

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

@@ -5,7 +5,8 @@ type MarkElementProps = React.PropsWithChildren<{
     annotationType: AnnotationTypes;
     dataAttributes: AnnotationDataAttributes;
     id: AnnotationId;
+    isExtension?: boolean;
     useBlockLevel?: boolean;
 }>;
-declare const MarkElement: ({ annotationParentIds, children, dataAttributes, id, useBlockLevel, }: MarkElementProps) => React.JSX.Element;
+declare const MarkElement: ({ annotationParentIds, children, dataAttributes, id, useBlockLevel, isExtension, }: MarkElementProps) => React.JSX.Element;
 export { MarkElement };

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

@@ -3,8 +3,7 @@
  * @jsx jsx
  */
 import type React from 'react';
-import { type SerializedStyles } from '@emotion/react';
-import type { AnnotationId, AnnotationDataAttributes, AnnotationTypes } from '@atlaskit/adf-schema/annotation';
+import type { AnnotationId, AnnotationDataAttributes } from '@atlaskit/adf-schema/annotation';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema/annotation';
 import type { OnAnnotationClickPayload } from '@atlaskit/editor-common/types';
 type MarkComponentProps = {
@@ -12,114 +11,11 @@ type MarkComponentProps = {
     dataAttributes: AnnotationDataAttributes;
     hasFocus: boolean;
     id: AnnotationId;
+    isExtension?: boolean;
     isHovered: boolean;
     onClick: (props: OnAnnotationClickPayload) => void;
     state: AnnotationMarkStates | null;
     useBlockLevel?: boolean;
 };
-export declare const MarkComponent: ({ annotationParentIds, children, dataAttributes, id, state, hasFocus, isHovered, onClick, useBlockLevel, }: React.PropsWithChildren<MarkComponentProps>) => React.ReactElement<{
-    'aria-disabled': boolean;
-    css?: (false | SerializedStyles)[] | undefined;
-    'data-id': AnnotationId;
-    'data-mark-annotation-state'?: AnnotationMarkStates;
-    'data-mark-annotation-type': AnnotationTypes;
-    'data-mark-type': string;
-    id: string;
-    ref: ((node: HTMLElement | null) => void) | undefined;
-    style?: {
-        '--ak-renderer-annotation-endmarker': string;
-        '--ak-renderer-annotation-startmarker': string;
-    } | undefined;
-} | {
-    'aria-disabled': boolean;
-    css?: (false | SerializedStyles)[] | undefined;
-    'data-has-focus': boolean;
-    'data-id': AnnotationId;
-    'data-is-hovered': boolean;
-    'data-mark-annotation-state': AnnotationMarkStates;
-    'data-mark-annotation-type': AnnotationTypes;
-    'data-mark-type': string;
-    id: string;
-    ref: ((node: HTMLElement | null) => void) | undefined;
-    style?: {
-        '--ak-renderer-annotation-endmarker': string;
-        '--ak-renderer-annotation-startmarker': string;
-    } | undefined;
-} | {
-    'aria-details': string;
-    'aria-disabled'?: undefined;
-    'aria-expanded'?: undefined;
-    css?: (false | SerializedStyles)[] | undefined;
-    'data-id': AnnotationId;
-    'data-mark-annotation-state'?: AnnotationMarkStates;
-    'data-mark-annotation-type': AnnotationTypes;
-    'data-mark-type': string;
-    id: string;
-    onKeyDown?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
-    role?: undefined;
-    style?: {
-        '--ak-renderer-annotation-endmarker': string;
-        '--ak-renderer-annotation-startmarker': string;
-    } | undefined;
-    tabIndex?: undefined;
-} | {
-    'aria-details': string;
-    'aria-disabled'?: undefined;
-    'aria-expanded'?: undefined;
-    css?: (false | SerializedStyles)[] | undefined;
-    'data-has-focus': boolean;
-    'data-id': AnnotationId;
-    'data-is-hovered': boolean;
-    'data-mark-annotation-state': AnnotationMarkStates;
-    'data-mark-annotation-type': AnnotationTypes;
-    'data-mark-type': string;
-    id: string;
-    onKeyDown?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
-    role?: undefined;
-    style?: {
-        '--ak-renderer-annotation-endmarker': string;
-        '--ak-renderer-annotation-startmarker': string;
-    } | undefined;
-    tabIndex?: undefined;
-} | {
-    'aria-details': string;
-    'aria-disabled'?: undefined;
-    'aria-expanded': boolean;
-    css?: (false | SerializedStyles)[] | undefined;
-    'data-id': AnnotationId;
-    'data-mark-annotation-state'?: AnnotationMarkStates;
-    'data-mark-annotation-type': AnnotationTypes;
-    'data-mark-type': string;
-    id: string;
-    onKeyDown: (evt: KeyboardEvent) => void;
-    ref: ((node: HTMLElement | null) => void) | undefined;
-    role: string;
-    style?: {
-        '--ak-renderer-annotation-endmarker': string;
-        '--ak-renderer-annotation-startmarker': string;
-    } | undefined;
-    tabIndex: number;
-} | {
-    'aria-details': string;
-    'aria-disabled'?: undefined;
-    'aria-expanded': boolean;
-    css?: (false | SerializedStyles)[] | undefined;
-    'data-has-focus': boolean;
-    'data-id': AnnotationId;
-    'data-is-hovered': boolean;
-    'data-mark-annotation-state': AnnotationMarkStates;
-    'data-mark-annotation-type': AnnotationTypes;
-    'data-mark-type': string;
-    id: string;
-    onKeyDown: (evt: KeyboardEvent) => void;
-    ref: ((node: HTMLElement | null) => void) | undefined;
-    role: string;
-    style?: {
-        '--ak-renderer-annotation-endmarker': string;
-        '--ak-renderer-annotation-startmarker': string;
-    } | undefined;
-    tabIndex: number;
-}>;
+export declare const MarkComponent: ({ annotationParentIds, children, dataAttributes, id, state, hasFocus, isHovered, onClick, useBlockLevel, isExtension, }: React.PropsWithChildren<MarkComponentProps>) => React.JSX.Element;
 export {};

package/dist/types/ui/utils/expand-body.d.ts

@@ -1,6 +1,6 @@
 import type { Provider, ReactNode } from 'react';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-type ExpandBody = {
+export type ExpandBody = {
     /**
      * Opens this expand, then asks the expand above it to do the same.
      *
@@ -20,11 +20,13 @@ type ExpandBody = {
      */
     revealed: boolean;
     /**
-     * The expands browser find has opened. One set is shared by a whole chain of expands.
+     * The expands browser find or the reader has opened. One set is shared by a whole chain of
+     * expands, and by every expand under a body a product provides itself.
      *
      * A table standing in for itself does swap out what it renders, and a nested expand in one of its
      * rows is rebuilt when it does. This is how that expand knows to come back open rather than
-     * closed over the match the reader was just taken to.
+     * closed over the match the reader was just taken to. A product that remounts what is under its
+     * own body gets its expands back the same way.
      */
     revealedByFind: WeakSet<PMNode>;
 };

package/expand-body/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@atlaskit/renderer/expand-body",
+  "main": "../dist/cjs/entry-points/expand-body.js",
+  "module": "../dist/esm/entry-points/expand-body.js",
+  "module:es2019": "../dist/es2019/entry-points/expand-body.js",
+  "sideEffects": [
+    "*.compiled.css"
+  ],
+  "types": "../dist/types/entry-points/expand-body.d.ts"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "148.0.4",
+	"version": "149.0.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -73,8 +73,8 @@
 		"@atlaskit/status": "^5.13.0",
 		"@atlaskit/task-decision": "^21.12.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^226.0.0",
-		"@atlaskit/tokens": "^20.3.0",
+		"@atlaskit/tmp-editor-statsig": "^227.0.0",
+		"@atlaskit/tokens": "^20.4.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -88,7 +88,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^129.1.0",
+		"@atlaskit/editor-common": "^130.0.0",
 		"@atlaskit/link-provider": "^6.0.0",
 		"@atlaskit/media-core": "^39.0.0",
 		"react": "^18.2.0 || ^19.2.0",
@@ -100,7 +100,7 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/analytics-gas-types": "^6.2.0",
 		"@atlaskit/checkbox": "^19.3.0",
-		"@atlaskit/editor-plugin-media": "^27.0.0",
+		"@atlaskit/editor-plugin-media": "^28.0.0",
 		"@atlaskit/editor-test-helpers": "workspace:^",
 		"@atlaskit/inline-edit": "^16.4.0",
 		"@atlaskit/json-ld-types": "^2.0.0",