@atlaskit/renderer 115.0.4 → 115.0.6

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

@@ -9,10 +9,12 @@ exports.Mounter = 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 _dom = require("../draft/dom");
 var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _RendererActionsContext = require("../../RendererActionsContext");
+var _AnnotationRangeContext = require("../contexts/AnnotationRangeContext");
 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 && {}.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 Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props) {
@@ -28,13 +30,24 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
     applyAnnotation = props.applyAnnotation,
     createAnalyticsEvent = props.createAnalyticsEvent,
     generateIndexMatch = props.generateIndexMatch;
+
+  // if platform_renderer_annotation_draft_position_fix is enabled; then
+  var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
+    promoteHoverToDraft = _useAnnotationRangeDi.promoteHoverToDraft,
+    clearHoverDraft = _useAnnotationRangeDi.clearHoverDraft;
+  var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
+    hoverDraftDocumentPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
+  // else;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     draftDocumentPosition = _useState2[0],
     setDraftDocumentPosition = _useState2[1];
+  // end-if
+
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
-    if (!isAnnotationAllowed || !documentPosition || !applyAnnotation) {
+    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
+    if (!isAnnotationAllowed || !positionToAnnotate || !applyAnnotation) {
       return false;
     }
     var annotation = {
@@ -50,8 +63,8 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
         eventType: _analytics.EVENT_TYPE.TRACK
       }).fire(_types.FabricChannel.editor);
     }
-    return applyAnnotation(draftDocumentPosition || documentPosition, annotation);
-  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, hoverDraftDocumentPosition]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -75,8 +88,12 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       }
       return false;
     }
-    setDraftDocumentPosition(documentPosition);
-    applyAnnotationDraftAt(documentPosition);
+    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
+      promoteHoverToDraft(documentPosition);
+    } else {
+      setDraftDocumentPosition(documentPosition);
+      applyAnnotationDraftAt && applyAnnotationDraftAt(documentPosition);
+    }
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = actions.getAnnotationsByPosition(range);
       createAnalyticsEvent({
@@ -99,7 +116,7 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
         }
       }
     });
-    var positionToAnnotate = draftDocumentPosition || documentPosition;
+    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       return false;
     }
@@ -108,15 +125,19 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range]);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, promoteHoverToDraft, hoverDraftDocumentPosition]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
-    clearAnnotationDraft();
-    setDraftDocumentPosition(null);
+    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
+      clearHoverDraft();
+    } else {
+      clearAnnotationDraft && clearAnnotationDraft();
+      setDraftDocumentPosition(null);
+    }
     var sel = window.getSelection();
     if (sel) {
       sel.removeAllRanges();
     }
-  }, [clearAnnotationDraft]);
+  }, [clearAnnotationDraft, clearHoverDraft]);
   var onCloseCallback = (0, _react.useCallback)(function () {
     if (createAnalyticsEvent) {
       createAnalyticsEvent({

package/dist/cjs/ui/annotations/hover/range-validator.js

@@ -44,4 +44,5 @@ var RangeValidator = exports.RangeValidator = function RangeValidator(props) {
     clearAnnotationDraft: clearAnnotationDraft,
     createAnalyticsEvent: createAnalyticsEvent
   });
-};
+};
+RangeValidator.displayName = 'HoverRangeValidator';

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

@@ -56,7 +56,8 @@ var AnnotationsWrapperInner = exports.AnnotationsWrapperInner = function Annotat
   return /*#__PURE__*/_react.default.createElement(_context.InlineCommentsStateContext.Provider, {
     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
+    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,
+    isNestedRender: isNestedRender
   }, /*#__PURE__*/_react.default.createElement(_AnnotationHoverContext.AnnotationHoverContext, null, /*#__PURE__*/_react.default.createElement(_wrapper.AnnotationsContextWrapper, {
     createAnalyticsEvent: createAnalyticsEvent,
     rendererRef: rendererRef,

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

@@ -17,6 +17,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _getRendererRangeInlineNodeNames = require("../../../actions/get-renderer-range-inline-node-names");
 var _RendererActionsContext = require("../../RendererActionsContext");
 var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
+var _AnnotationRangeContext = require("../contexts/AnnotationRangeContext");
 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 && {}.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 SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#__PURE__*/_react.default.memo(function (props) {
@@ -32,10 +33,20 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     applyAnnotation = props.applyAnnotation,
     createAnalyticsEvent = props.createAnalyticsEvent,
     generateIndexMatch = props.generateIndexMatch;
+
+  // if platform_renderer_annotation_draft_position_fix is enabled; then
+  var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
+    promoteSelectionToDraft = _useAnnotationRangeDi.promoteSelectionToDraft,
+    clearSelectionDraft = _useAnnotationRangeDi.clearSelectionDraft;
+  var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
+    selectionDraftDocumentPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
+  // else;
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     draftDocumentPosition = _useState2[0],
     setDraftDocumentPosition = _useState2[1];
+  // end-if
+
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var _useAnnotationManager = (0, _AnnotationManagerContext.useAnnotationManagerState)(),
     isDrafting = _useAnnotationManager.isDrafting,
@@ -69,7 +80,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
     // We want to support creation on a documentPosition if the user is only using ranges
     // but we want to prioritize draft positions if they are being used by consumers
-    var positionToAnnotate = draftDocumentPosition || documentPosition;
+    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation) {
       // TODO: EDITOR-595 - This analytic event is temporary and should be removed once the following issue
       // has been identified and fixed: https://atlassian.slack.com/archives/C08JK0WSCH5/p1745902609966999
@@ -80,15 +91,19 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
           actionSubjectId: 'inlineCommentFailureReason',
           attributes: {
             reason: 'Annotation Position invalid',
-            draftDocumentPosition: draftDocumentPosition,
+            draftDocumentPosition: (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition : draftDocumentPosition,
             documentPosition: documentPosition,
-            applyAnnotation: !!applyAnnotation
+            applyAnnotation: !!applyAnnotation,
+            isDraftPositionFixEnabled: (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')
           },
           eventType: _analytics.EVENT_TYPE.OPERATIONAL
         }).fire(_types.FabricChannel.editor);
       }
       return false;
     }
+    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+      actions._setDebugLogging(true);
+    }
 
     // Evaluate position validity when the user commits the position to be annotated
     var isCreateAllowedOnPosition = actions.isValidAnnotationPosition(positionToAnnotate);
@@ -110,8 +125,14 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         eventType: _analytics.EVENT_TYPE.TRACK
       }).fire(_types.FabricChannel.editor);
     }
-    return applyAnnotation(positionToAnnotate, annotation);
-  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, inlineNodeTypes]);
+    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+      var result = applyAnnotation(positionToAnnotate, annotation);
+      actions._setDebugLogging(false);
+      return result;
+    } else {
+      return applyAnnotation(positionToAnnotate, annotation);
+    }
+  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -137,8 +158,12 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       }
       return false;
     }
-    setDraftDocumentPosition(documentPosition);
-    applyAnnotationDraftAt(documentPosition);
+    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
+      promoteSelectionToDraft(documentPosition);
+    } else {
+      setDraftDocumentPosition(documentPosition);
+      applyAnnotationDraftAt && applyAnnotationDraftAt(documentPosition);
+    }
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = range ? actions.getAnnotationsByPosition(range) : [];
       createAnalyticsEvent({
@@ -162,7 +187,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         }
       }
     });
-    var positionToAnnotate = draftDocumentPosition || documentPosition;
+    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       return false;
     }
@@ -171,15 +196,19 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, inlineNodeTypes]);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, inlineNodeTypes, promoteSelectionToDraft, selectionDraftDocumentPosition]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
-    clearAnnotationDraft();
-    setDraftDocumentPosition(null);
+    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
+      clearSelectionDraft();
+    } else {
+      clearAnnotationDraft && clearAnnotationDraft();
+      setDraftDocumentPosition(null);
+    }
     var sel = window.getSelection();
     if (sel) {
       sel.removeAllRanges();
     }
-  }, [clearAnnotationDraft]);
+  }, [clearAnnotationDraft, clearSelectionDraft]);
   var onCloseCallback = (0, _react.useCallback)(function () {
     if (createAnalyticsEvent) {
       createAnalyticsEvent({

package/dist/cjs/ui/annotations/selection/range-validator.js

@@ -23,11 +23,13 @@ var SelectionRangeValidator = exports.SelectionRangeValidator = function Selecti
   var _useUserSelectionRang = (0, _userSelection.useUserSelectionRange)({
       rendererRef: rendererRef
     }),
-    _useUserSelectionRang2 = (0, _slicedToArray2.default)(_useUserSelectionRang, 3),
-    range = _useUserSelectionRang2[0],
-    draftRange = _useUserSelectionRang2[1],
-    clearRange = _useUserSelectionRang2[2];
-  if (!range && !draftRange) {
+    _useUserSelectionRang2 = (0, _slicedToArray2.default)(_useUserSelectionRang, 4),
+    type = _useUserSelectionRang2[0],
+    range = _useUserSelectionRang2[1],
+    draftRange = _useUserSelectionRang2[2],
+    clearRange = _useUserSelectionRang2[3];
+  var selectionRange = type === 'selection' ? range : null;
+  if (!selectionRange && !draftRange) {
     return null;
   }
   var documentPosition = actions.getPositionFromRange(range);
@@ -40,7 +42,7 @@ var SelectionRangeValidator = exports.SelectionRangeValidator = function Selecti
     isAnnotationAllowedOnRange = false;
   }
   return /*#__PURE__*/_react.default.createElement(_mounter.SelectionInlineCommentMounter, {
-    range: range,
+    range: selectionRange,
     draftRange: draftRange,
     wrapperDOM: rendererRef,
     component: selectionComponent,
@@ -53,4 +55,5 @@ var SelectionRangeValidator = exports.SelectionRangeValidator = function Selecti
     clearAnnotationDraft: clearAnnotationDraft,
     createAnalyticsEvent: createAnalyticsEvent
   });
-};
+};
+SelectionRangeValidator.displayName = 'SelectionRangeValidator';

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

@@ -4,15 +4,16 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AnnotationsContextWrapper = void 0;
+exports.AnnotationsContextWrapperOld = exports.AnnotationsContextWrapperNew = exports.AnnotationsContextWrapper = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _context = require("./context");
 var _rangeValidator = require("./hover/range-validator");
 var _rangeValidator2 = require("./selection/range-validator");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _AnnotationRangeContext = require("./contexts/AnnotationRangeContext");
 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 && {}.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 AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
+var AnnotationsContextWrapperOld = exports.AnnotationsContextWrapperOld = function AnnotationsContextWrapperOld(props) {
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
     range = _useAnnotationRangeSt.range,
@@ -66,4 +67,49 @@ var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function Ann
     clearDraftRange: clearRangeForDraft,
     isNestedRender: isNestedRender
   }, render);
+};
+var AnnotationsContextWrapperNew = exports.AnnotationsContextWrapperNew = function AnnotationsContextWrapperNew(props) {
+  var providers = (0, _react.useContext)(_context.ProvidersContext);
+  var rendererRef = props.rendererRef,
+    createAnalyticsEvent = props.createAnalyticsEvent,
+    children = props.children;
+  var inlineCommentProvider = providers && providers.inlineComment;
+  var selectionComponent = inlineCommentProvider && inlineCommentProvider.selectionComponent;
+  var hoverComponent = inlineCommentProvider && inlineCommentProvider.hoverComponent;
+  if (!selectionComponent && !hoverComponent) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
+  }
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, !!hoverComponent && /*#__PURE__*/_react.default.createElement(_rangeValidator.RangeValidator, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    rendererRef: rendererRef
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
+    component: hoverComponent
+  }), !!selectionComponent && /*#__PURE__*/_react.default.createElement(_rangeValidator2.SelectionRangeValidator, {
+    createAnalyticsEvent: createAnalyticsEvent,
+    rendererRef: rendererRef
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
+    selectionComponent: selectionComponent
+  }));
+};
+var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
+  if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
+    // IMPORTANT: Please make sure the AnnotationsDraftContextWrapper is not used anc cleaned up correctly.
+    // This code path completely removes all reliance on that wrapper. Also the applyAnnotationDraftAt & clearAnnotationDraft
+    // properties have been made optional and not used. This means when we cleanup we can also remove those properties.
+    return /*#__PURE__*/_react.default.createElement(AnnotationsContextWrapperNew, {
+      rendererRef: props.rendererRef,
+      createAnalyticsEvent: props.createAnalyticsEvent,
+      isNestedRender: props.isNestedRender
+    }, props.children);
+  } else {
+    return /*#__PURE__*/_react.default.createElement(AnnotationsContextWrapperOld, {
+      rendererRef: props.rendererRef,
+      createAnalyticsEvent: props.createAnalyticsEvent,
+      isNestedRender: props.isNestedRender
+    }, props.children);
+  }
 };

package/dist/es2019/actions/index.js

@@ -10,15 +10,12 @@ import { createAnnotationStep, getPosFromRange } from '../steps';
 import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
 import { getIndexMatch } from './matches-utils';
 export default class RendererActions {
-  // Any kind of refence is allowed
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   constructor(initFromContext = false) {
     // This is our psuedo feature flag for now
     // This module can only be used when wrapped with
     // the <RendererContext> component for now.
     _defineProperty(this, "initFromContext", false);
+    _defineProperty(this, "debugAnalyticLoggingEnabled", false);
     // TODO: EDITOR-595 - This method is temporary and should be removed once the following issue
     // has been identified and fixed: https://atlassian.slack.com/archives/C08JK0WSCH5/p1745902609966999
     // This is a copy of the original canApplyAnnotationOnRange. If that returns false this is run to figure out exactly why
@@ -97,7 +94,7 @@ export default class RendererActions {
    */
   _privateValidatePositionsForAnnotation(from, to) {
     if (!this.doc || !this.schema) {
-      if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
+      if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
         this.onAnalyticsEvent({
           // @ts-ignore
           action: 'failed',
@@ -119,7 +116,7 @@ export default class RendererActions {
     }
     const currentSelection = TextSelection.create(this.doc, from, to);
     if (isEmptyTextSelection(currentSelection, this.schema)) {
-      if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
+      if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
         this.onAnalyticsEvent({
           // @ts-ignore
           action: 'failed',
@@ -143,7 +140,7 @@ export default class RendererActions {
       from,
       to
     }, this.doc, this.schema);
-    if (!result && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
+    if (this.debugAnalyticLoggingEnabled && !result && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
       this.onAnalyticsEvent({
         // @ts-ignore
         action: 'failed',
@@ -317,7 +314,7 @@ export default class RendererActions {
   }
   isValidAnnotationPosition(pos) {
     if (!pos || !this.doc) {
-      if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
+      if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
         this.onAnalyticsEvent({
           // @ts-ignore
           action: 'failed',
@@ -526,4 +523,11 @@ export default class RendererActions {
       schema: this.schema
     }, annotationId);
   }
+
+  /**
+   * This is a temporary method used for controlling when extra analytics shoulw be logged.
+   */
+  _setDebugLogging(enabled) {
+    this.debugAnalyticLoggingEnabled = enabled;
+  }
 }

package/dist/es2019/react/nodes/media/index.js

@@ -27,6 +27,7 @@ import { injectIntl } from 'react-intl-next';
 import { useInlineCommentsFilter } from '../../../ui/annotations/hooks/use-inline-comments-filter';
 import { useInlineCommentSubscriberContext } from '../../../ui/annotations/hooks/use-inline-comment-subscriber';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
+import { useAnnotationRangeState } from '../../../ui/annotations/contexts/AnnotationRangeContext';
 const linkStyle = css({
   position: 'absolute',
   background: 'transparent',
@@ -385,7 +386,11 @@ class Media extends PureComponent {
   }
 }
 const MediaWithDraftAnnotation = props => {
-  const draftPosition = React.useContext(AnnotationsDraftContext);
+  const draftPositionOld = React.useContext(AnnotationsDraftContext);
+  const {
+    hoverDraftDocumentPosition
+  } = useAnnotationRangeState();
+  const draftPosition = fg('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition : draftPositionOld;
   const {
     dataAttributes
   } = props;

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

@@ -334,11 +334,17 @@ export class TableContainer extends React.Component {
       this.updatedLayout = layout;
     }
 
+    // defined in colgroup.tsx:
+    // appearance == comment && allowTableResizing && means it is a comment
+    // appearance == comment && !allowTableResizing && means it is a inline comment
+    // for inline comments, the table should inherit the width of the parent component rather than maintain its own size
+    const isInsideInlineComment = rendererAppearance === 'comment' && !allowTableResizing;
+
     // These styling removes extra padding for `comment` rendererAppearance.
     // This is especially relevant for Jira which only uses `comment` appearance and does not need padding.
     const resizerContainerPadding = rendererAppearance === 'comment' ? 0 : gutterPadding;
-    const resizerItemMaxWidth = rendererAppearance === 'comment' ? `min(100cqw, var(--ak-editor-table-max-width))` : `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), var(--ak-editor-table-max-width))`;
-    const resizerItemWidth = rendererAppearance === 'comment' ? `min(100cqw, ${tableWidthAttribute})` : `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), ${tableWidthAttribute})`;
+    const resizerItemMaxWidth = rendererAppearance === 'comment' ? isInsideInlineComment ? 'inherit' : `min(100cqw, var(--ak-editor-table-max-width))` : `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), var(--ak-editor-table-max-width))`;
+    const resizerItemWidth = rendererAppearance === 'comment' ? isInsideInlineComment ? 'inherit' : `min(100cqw, ${tableWidthAttribute})` : `min(calc(100cqw - var(--ak-editor-table-gutter-padding)), ${tableWidthAttribute})`;
 
     // full width tables can have either left-aligned or centered layout despite looking centered in the renderer.
     // in these cases, keep the alignment unset
@@ -360,7 +366,7 @@ export class TableContainer extends React.Component {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
       ,
       style: {
-        width: `min(calc(100cqw - ${resizerContainerPadding}px), ${tableWidthAttribute})`
+        width: isInsideInlineComment ? '100%' : `min(calc(100cqw - ${resizerContainerPadding}px), ${tableWidthAttribute})`
       }
     }, /*#__PURE__*/React.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766

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

@@ -849,6 +849,13 @@ const smartCardStylesAvatarFix = css({
     /* EDM-11991: Fix list plugin add padding to ADS AvatarGroup end */
   }
 });
+const smartCardStylesAvatarMarginFix = css({
+  [`.${SmartCardSharedCssClassName.LOADER_WRAPPER}`]: {
+    'ul, ol': {
+      marginRight: 'inherit'
+    }
+  }
+});
 const baseOtherStyles = css({
   '& .UnknownBlock': {
     fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
@@ -1777,7 +1784,7 @@ export const RendererStyleContainer = props => {
         '--ak-renderer-editor-font-heading-h6': `${editorUGCToken('editor.font.heading.h6')}`,
         '--ak-renderer-editor-font-normal-text': `${editorUGCToken('editor.font.body')}`
       },
-      css: [baseStyles, fg('platform_hide_heading_anchor_wrapper_before_hover') && hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, appearance === 'full-width' && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, telepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, fg('platform_editor_typography_ugc') ? paragraphSharedStylesWithEditorUGC : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, tasksAndDecisionsStyles, smartCardStyles, fg('platform-linking-visual-refresh-v1') && smartCardStylesAvatarFix,
+      css: [baseStyles, fg('platform_hide_heading_anchor_wrapper_before_hover') && hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, appearance === 'full-width' && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, telepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, fg('platform_editor_typography_ugc') ? paragraphSharedStylesWithEditorUGC : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, tasksAndDecisionsStyles, smartCardStyles, fg('platform-linking-visual-refresh-v1') && smartCardStylesAvatarFix, fg('smartcard_avatar_margin_fix') && smartCardStylesAvatarMarginFix,
       // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
       fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning, @atlaskit/platform/ensure-feature-flag-prefix

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

@@ -47,11 +47,10 @@ import { useMemoFromPropsDerivative } from './useMemoFromPropsDerivative';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "115.0.4";
+const packageVersion = "115.0.6";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
-  containerType: 'inline-size',
-  contain: 'layout style inline-size'
+  containerType: 'inline-size'
 });
 const handleMouseTripleClickInTables = event => {
   var _parentElement, _parentElement2;
@@ -588,10 +587,10 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
   // Only apply container-type = inline-size when having a known width in full-page/full-width/comment mode.
   // Otherwise when appearance is unspecified the renderer size is decided by the content.
   // In this case we can't set the container-type = inline-size as it will collapse width to 0.
-  return (appearance === 'full-page' || appearance === 'full-width' || appearance === 'comment') &&
+  return appearance === 'comment' &&
   // In case of having excerpt-include on page there are multiple renderers nested.
   // Make sure only the root renderer is set to be query container.
-  isTopLevelRenderer && fg('platform-fix-table-ssr-resizing') ? jsx("div", {
+  isTopLevelRenderer && fg('platform-ssr-table-resize') ? jsx("div", {
     css: setAsQueryContainerStyles
   }, renderer) : renderer;
 });

package/dist/es2019/ui/annotations/context.js

@@ -1,10 +1,23 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { createContext } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-export const AnnotationsDraftContext = /*#__PURE__*/createContext(null);
 export const ProvidersContext = /*#__PURE__*/createContext(null);
 export const InlineCommentsStateContext = /*#__PURE__*/createContext({});
 
+/**
+ * @private
+ * @deprecated The FG platform_renderer_annotation_draft_position_fix will make this context redundant as the draft position
+ * has been moved to the AnnotationRangeProvider in order to be more consistent with the hover and selection ranges.
+ * Once the FG is rolled out this context will be removed. Please ensure any changes are duplicated to the AnnotationRangeProvider.
+ */
+export const AnnotationsDraftContext = /*#__PURE__*/createContext(null);
+
+/**
+ * @private
+ * @deprecated The FG platform_renderer_annotation_draft_position_fix will make this context redundant as the draft position
+ * has been moved to the AnnotationRangeProvider in order to be more consistent with the hover and selection ranges.
+ * Once the FG is rolled out this context will be removed. Please ensure any changes are duplicated to the AnnotationRangeProvider.
+ */
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class AnnotationsDraftContextWrapper extends React.Component {