@atlaskit/renderer 118.6.8 → 118.6.9

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/renderer
 
+## 118.6.9
+
+### Patch Changes
+
+- [#164686](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/164686)
+  [`4b2aaa6783398`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4b2aaa6783398) -
+  Removed extra debug logging which was adding behind gate
+  platform_renderer_annotations_create_debug_logging
+- Updated dependencies
+
 ## 118.6.8
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -22,6 +22,10 @@ var _matchesUtils = require("./matches-utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RendererActions = exports.default = /*#__PURE__*/function () {
+  // Any kind of refence is allowed
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   function RendererActions() {
     var initFromContext = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     (0, _classCallCheck2.default)(this, RendererActions);
@@ -29,55 +33,6 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     // This module can only be used when wrapped with
     // the <RendererContext> component for now.
     (0, _defineProperty2.default)(this, "initFromContext", false);
-    (0, _defineProperty2.default)(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
-    // the annotation cannot be applied to the range.
-    (0, _defineProperty2.default)(this, "_privateWhyCannotApplyAnnotationOnRange", function (pos, doc, schema) {
-      var from = pos.from,
-        to = pos.to;
-      if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
-        return 'position invalid';
-      }
-      var reasons = [];
-      doc.nodesBetween(from, to, function (node, _pos, parent) {
-        // Special exception for hardBreak nodes
-        if (schema.nodes.hardBreak === node.type) {
-          return false;
-        }
-
-        // For block elements or text nodes, we want to check
-        // if annotations are allowed inside this tree
-        // or if we're leaf and not text
-        if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
-          var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
-          if (node.isInline && !node.isText && !isAllowedInlineNode) {
-            reasons.push("Err 1 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isLeaf && !node.isText && !isAllowedInlineNode) {
-            reasons.push("Err 2 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-            reasons.push("Err 3 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
-            return false;
-          }
-        } else {
-          if (node.isInline && !node.isText) {
-            reasons.push("Err 4 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isLeaf && !node.isText) {
-            reasons.push("Err 5 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-            reasons.push("Err 6 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
-            return false;
-          }
-        }
-        return true;
-      });
-      return reasons.join(', ');
-    });
     this.initFromContext = initFromContext;
     this.transformer = new _editorJsonTransformer.JSONTransformer();
   }
@@ -112,82 +67,23 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "_privateValidatePositionsForAnnotation",
     value: function _privateValidatePositionsForAnnotation(from, to) {
       if (!this.doc || !this.schema) {
-        if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation Position validation failed - Missing doc or schema",
-              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
-              isDocValid: !!this.doc,
-              isSchemaValid: !!this.schema
-            }
-          });
-        }
         return false;
       }
       var currentSelection = _state.TextSelection.create(this.doc, from, to);
       if ((0, _utils.isEmptyTextSelection)(currentSelection, this.schema)) {
-        if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation Position validation - Empty Text Selection",
-              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
-              from: from,
-              to: to
-            }
-          });
-        }
         return false;
       }
       var result = (0, _utils.canApplyAnnotationOnRange)({
         from: from,
         to: to
       }, this.doc, this.schema);
-      if (this.debugAnalyticLoggingEnabled && !result && this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: "Annotation canApplyAnnotationOnRange failed",
-            details: this._privateWhyCannotApplyAnnotationOnRange({
-              from: from,
-              to: to
-            }, this.doc, this.schema),
-            commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
-            from: from,
-            to: to
-          }
-        });
-      }
       return result;
     }
+
+    //#endregion
   }, {
     key: "deleteAnnotation",
-    value:
-    //#endregion
-
-    function deleteAnnotation(annotationId, annotationType) {
+    value: function deleteAnnotation(annotationId, annotationType) {
       if (!this.doc || !this.schema || !this.schema.marks.annotation) {
         return false;
       }
@@ -338,24 +234,6 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "isValidAnnotationPosition",
     value: function isValidAnnotationPosition(pos) {
       if (!pos || !this.doc) {
-        if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation Position validation failed - Missing doc or position",
-              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
-              isPosValid: !!pos,
-              isDocValid: !!this.doc
-            }
-          });
-        }
         return false;
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
@@ -417,25 +295,6 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "applyAnnotation",
     value: function applyAnnotation(pos, annotation) {
       if (!this.doc || !pos || !this.schema) {
-        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation applyAnnotation failed - Missing doc, position or schema",
-              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
-              isPosValid: !!pos,
-              isDocValid: !!this.doc,
-              isSchemaValid: !!this.schema
-            }
-          });
-        }
         return false;
       }
       var from = pos.from,
@@ -469,22 +328,6 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         doc = _step$apply2.doc,
         failed = _step$apply2.failed;
       if (failed || !doc) {
-        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation applyAnnotation failed - ".concat(failed),
-              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')
-            }
-          });
-        }
         return false;
       }
       var originalSelection = doc.textBetween(from, to);
@@ -545,14 +388,5 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         schema: this.schema
       }, annotationId);
     }
-
-    /**
-     * This is a temporary method used for controlling when extra analytics shoulw be logged.
-     */
-  }, {
-    key: "_setDebugLogging",
-    value: function _setDebugLogging(enabled) {
-      this.debugAnalyticLoggingEnabled = enabled;
-    }
   }]);
 }();

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

@@ -62,7 +62,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.6.8";
+var packageVersion = "118.6.9";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -422,7 +422,8 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
       ssr: (_props$media = props.media) === null || _props$media === void 0 ? void 0 : _props$media.ssr,
       isInsideOfInlineExtension: props.isInsideOfInlineExtension,
       isTopLevelRenderer: rendererContext.isTopLevelRenderer,
-      shouldRemoveEmptySpaceAroundContent: props.shouldRemoveEmptySpaceAroundContent
+      shouldRemoveEmptySpaceAroundContent: props.shouldRemoveEmptySpaceAroundContent,
+      allowRendererContainerStyles: props.allowRendererContainerStyles
     }, props.enableSsrInlineScripts || props.noOpSSRInlineScript ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, {
       noOpSSRInlineScript: Boolean(props.noOpSSRInlineScript)
     }) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
@@ -453,7 +454,8 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
       onClick: function onClick(event) {
         return handleWrapperOnClick(event, props, mouseDownSelection);
       },
-      isTopLevelRenderer: rendererContext.isTopLevelRenderer
+      isTopLevelRenderer: rendererContext.isTopLevelRenderer,
+      allowRendererContainerStyles: props.allowRendererContainerStyles
     }, (0, _react2.jsx)(_ui.UnsupportedBlock, null));
   }
 };
@@ -545,7 +547,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
     ssr = props.ssr,
     isInsideOfInlineExtension = props.isInsideOfInlineExtension,
     allowTableResizing = props.allowTableResizing,
-    isTopLevelRenderer = props.isTopLevelRenderer;
+    isTopLevelRenderer = props.isTopLevelRenderer,
+    allowRendererContainerStyles = props.allowRendererContainerStyles;
   var createTelepointer = function createTelepointer() {
     var telepointer = document.createElement('span');
     telepointer.textContent = "\u200B";
@@ -620,20 +623,32 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
     allowColumnSorting: !!allowColumnSorting,
     useBlockRenderForCodeBlock: useBlockRenderForCodeBlock,
     allowAnnotations: props.allowAnnotations,
-    allowTableResizing: allowTableResizing
+    allowTableResizing: allowTableResizing,
+    allowRendererContainerStyles: allowRendererContainerStyles
   }, children))));
 
   // We can only make the wrapper div query container when we have a known width.
   // This is also required for SSR to work correctly. As WidthProvider/WithConsumer will not have the correct width during SSR.
   //
+
+  // allowRendererContainerStyles is not needed for comment container styling as container should always be set for comments
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  if (appearance === 'comment' && isTopLevelRenderer && (0, _platformFeatureFlags.fg)('platform-ssr-table-resize')) {
+    return (0, _react2.jsx)("div", {
+      css: setAsQueryContainerStyles
+    }, renderer);
+  }
+
   // We are setting this wrapper div as query container conditionally.
   // 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 === 'full-page' || appearance === 'full-width') &&
   // 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 && (0, _platformFeatureFlags.fg)('platform-ssr-table-resize') ? (0, _react2.jsx)("div", {
+  isTopLevelRenderer && allowRendererContainerStyles &&
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  (0, _platformFeatureFlags.fg)('platform-ssr-table-resize') ? (0, _react2.jsx)("div", {
     css: setAsQueryContainerStyles
   }, renderer) : renderer;
 });

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

@@ -70,28 +70,8 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     // !!! at this point, the documentPosition can be the wrong position if the user select something else
     var positionToAnnotate = selectionDraftDocumentPosition || 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
-      if (createAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
-        createAnalyticsEvent({
-          action: 'failed',
-          actionSubject: 'applyAnnotation',
-          actionSubjectId: 'inlineCommentFailureReason',
-          attributes: {
-            reason: 'Annotation Position invalid',
-            draftDocumentPosition: selectionDraftDocumentPosition,
-            documentPosition: documentPosition,
-            applyAnnotation: !!applyAnnotation,
-            isDraftPositionFixEnabled: true
-          },
-          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);
@@ -113,13 +93,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         eventType: _analytics.EVENT_TYPE.TRACK
       }).fire(_types.FabricChannel.editor);
     }
-    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);
-    }
+    return applyAnnotation(positionToAnnotate, annotation);
   }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {

package/dist/es2019/actions/index.js

@@ -10,62 +10,15 @@ 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
-    // the annotation cannot be applied to the range.
-    _defineProperty(this, "_privateWhyCannotApplyAnnotationOnRange", (pos, doc, schema) => {
-      const {
-        from,
-        to
-      } = pos;
-      if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
-        return 'position invalid';
-      }
-      const reasons = [];
-      doc.nodesBetween(from, to, (node, _pos, parent) => {
-        // Special exception for hardBreak nodes
-        if (schema.nodes.hardBreak === node.type) {
-          return false;
-        }
-
-        // For block elements or text nodes, we want to check
-        // if annotations are allowed inside this tree
-        // or if we're leaf and not text
-        if (fg('editor_inline_comments_on_inline_nodes')) {
-          const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
-          if (node.isInline && !node.isText && !isAllowedInlineNode) {
-            reasons.push(`Err 1 - type: ${node.type.name}, isInline: ${node.isInline}, isText: ${node.isText}, isLeaf: ${node.isLeaf}`);
-            return false;
-          } else if (node.isLeaf && !node.isText && !isAllowedInlineNode) {
-            reasons.push(`Err 2 - type: ${node.type.name}, isInline: ${node.isInline}, isText: ${node.isText}, isLeaf: ${node.isLeaf}`);
-            return false;
-          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-            reasons.push(`Err 3 - type: ${node.type.name}, isInline: ${node.isInline}, isText: ${node.isText}, isLeaf: ${node.isLeaf}, parent: ${parent === null || parent === void 0 ? void 0 : parent.type.name}`);
-            return false;
-          }
-        } else {
-          if (node.isInline && !node.isText) {
-            reasons.push(`Err 4 - type: ${node.type.name}, isInline: ${node.isInline}, isText: ${node.isText}, isLeaf: ${node.isLeaf}`);
-            return false;
-          } else if (node.isLeaf && !node.isText) {
-            reasons.push(`Err 5 - type: ${node.type.name}, isInline: ${node.isInline}, isText: ${node.isText}, isLeaf: ${node.isLeaf}`);
-            return false;
-          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-            reasons.push(`Err 6 - type: ${node.type.name}, isInline: ${node.isInline}, isText: ${node.isText}, isLeaf: ${node.isLeaf}, parent: ${parent === null || parent === void 0 ? void 0 : parent.type.name}`);
-            return false;
-          }
-        }
-        return true;
-      });
-      return reasons.join(', ');
-    });
     this.initFromContext = initFromContext;
     this.transformer = new JSONTransformer();
   }
@@ -94,76 +47,19 @@ export default class RendererActions {
    */
   _privateValidatePositionsForAnnotation(from, to) {
     if (!this.doc || !this.schema) {
-      if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: `Annotation Position validation failed - Missing doc or schema`,
-            commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-            isDocValid: !!this.doc,
-            isSchemaValid: !!this.schema
-          }
-        });
-      }
       return false;
     }
     const currentSelection = TextSelection.create(this.doc, from, to);
     if (isEmptyTextSelection(currentSelection, this.schema)) {
-      if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: `Annotation Position validation - Empty Text Selection`,
-            commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-            from,
-            to
-          }
-        });
-      }
       return false;
     }
     const result = canApplyAnnotationOnRange({
       from,
       to
     }, this.doc, this.schema);
-    if (this.debugAnalyticLoggingEnabled && !result && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-      this.onAnalyticsEvent({
-        // @ts-ignore
-        action: 'failed',
-        // @ts-ignore
-        actionSubject: 'applyAnnotation',
-        // @ts-ignore
-        actionSubjectId: 'inlineCommentFailureReason',
-        eventType: EVENT_TYPE.OPERATIONAL,
-        attributes: {
-          // @ts-ignore
-          reason: `Annotation canApplyAnnotationOnRange failed`,
-          details: this._privateWhyCannotApplyAnnotationOnRange({
-            from,
-            to
-          }, this.doc, this.schema),
-          commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-          from,
-          to
-        }
-      });
-    }
     return result;
   }
+
   //#endregion
 
   deleteAnnotation(annotationId, annotationType) {
@@ -314,24 +210,6 @@ export default class RendererActions {
   }
   isValidAnnotationPosition(pos) {
     if (!pos || !this.doc) {
-      if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: `Annotation Position validation failed - Missing doc or position`,
-            commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-            isPosValid: !!pos,
-            isDocValid: !!this.doc
-          }
-        });
-      }
       return false;
     }
     return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
@@ -389,25 +267,6 @@ export default class RendererActions {
   }
   applyAnnotation(pos, annotation) {
     if (!this.doc || !pos || !this.schema) {
-      if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: `Annotation applyAnnotation failed - Missing doc, position or schema`,
-            commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-            isPosValid: !!pos,
-            isDocValid: !!this.doc,
-            isSchemaValid: !!this.schema
-          }
-        });
-      }
       return false;
     }
     const {
@@ -446,22 +305,6 @@ export default class RendererActions {
       failed
     } = step.apply(this.doc);
     if (failed || !doc) {
-      if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: `Annotation applyAnnotation failed - ${failed}`,
-            commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes')
-          }
-        });
-      }
       return false;
     }
     const originalSelection = doc.textBetween(from, to);
@@ -523,11 +366,4 @@ 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/ui/Renderer/index.js

@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "118.6.8";
+const packageVersion = "118.6.9";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -407,7 +407,8 @@ export const RendererFunctionalComponent = props => {
       ssr: (_props$media = props.media) === null || _props$media === void 0 ? void 0 : _props$media.ssr,
       isInsideOfInlineExtension: props.isInsideOfInlineExtension,
       isTopLevelRenderer: rendererContext.isTopLevelRenderer,
-      shouldRemoveEmptySpaceAroundContent: props.shouldRemoveEmptySpaceAroundContent
+      shouldRemoveEmptySpaceAroundContent: props.shouldRemoveEmptySpaceAroundContent,
+      allowRendererContainerStyles: props.allowRendererContainerStyles
     }, props.enableSsrInlineScripts || props.noOpSSRInlineScript ? jsx(BreakoutSSRInlineScript, {
       noOpSSRInlineScript: Boolean(props.noOpSSRInlineScript)
     }) : null, jsx(RendererActionsInternalUpdater, {
@@ -436,7 +437,8 @@ export const RendererFunctionalComponent = props => {
       useBlockRenderForCodeBlock: (_rendererContext$feat2 = rendererContext.featureFlags.useBlockRenderForCodeBlock) !== null && _rendererContext$feat2 !== void 0 ? _rendererContext$feat2 : true,
       addTelepointer: props.addTelepointer,
       onClick: event => handleWrapperOnClick(event, props, mouseDownSelection),
-      isTopLevelRenderer: rendererContext.isTopLevelRenderer
+      isTopLevelRenderer: rendererContext.isTopLevelRenderer,
+      allowRendererContainerStyles: props.allowRendererContainerStyles
     }, jsx(UnsupportedBlock, null));
   }
 };
@@ -532,7 +534,8 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
     ssr,
     isInsideOfInlineExtension,
     allowTableResizing,
-    isTopLevelRenderer
+    isTopLevelRenderer,
+    allowRendererContainerStyles
   } = props;
   const createTelepointer = () => {
     const telepointer = document.createElement('span');
@@ -606,20 +609,32 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
     allowColumnSorting: !!allowColumnSorting,
     useBlockRenderForCodeBlock: useBlockRenderForCodeBlock,
     allowAnnotations: props.allowAnnotations,
-    allowTableResizing: allowTableResizing
+    allowTableResizing: allowTableResizing,
+    allowRendererContainerStyles: allowRendererContainerStyles
   }, children))));
 
   // We can only make the wrapper div query container when we have a known width.
   // This is also required for SSR to work correctly. As WidthProvider/WithConsumer will not have the correct width during SSR.
   //
+
+  // allowRendererContainerStyles is not needed for comment container styling as container should always be set for comments
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  if (appearance === 'comment' && isTopLevelRenderer && fg('platform-ssr-table-resize')) {
+    return jsx("div", {
+      css: setAsQueryContainerStyles
+    }, renderer);
+  }
+
   // We are setting this wrapper div as query container conditionally.
   // 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 === 'full-page' || appearance === 'full-width') &&
   // 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-ssr-table-resize') ? jsx("div", {
+  isTopLevelRenderer && allowRendererContainerStyles &&
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  fg('platform-ssr-table-resize') ? jsx("div", {
     css: setAsQueryContainerStyles
   }, renderer) : renderer;
 });

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

@@ -67,28 +67,8 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
     // !!! at this point, the documentPosition can be the wrong position if the user select something else
     const positionToAnnotate = selectionDraftDocumentPosition || 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
-      if (createAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        createAnalyticsEvent({
-          action: 'failed',
-          actionSubject: 'applyAnnotation',
-          actionSubjectId: 'inlineCommentFailureReason',
-          attributes: {
-            reason: 'Annotation Position invalid',
-            draftDocumentPosition: selectionDraftDocumentPosition,
-            documentPosition,
-            applyAnnotation: !!applyAnnotation,
-            isDraftPositionFixEnabled: true
-          },
-          eventType: EVENT_TYPE.OPERATIONAL
-        }).fire(FabricChannel.editor);
-      }
       return false;
     }
-    if (fg('platform_renderer_annotations_create_debug_logging')) {
-      actions._setDebugLogging(true);
-    }
 
     // Evaluate position validity when the user commits the position to be annotated
     const isCreateAllowedOnPosition = actions.isValidAnnotationPosition(positionToAnnotate);
@@ -110,13 +90,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
-    if (fg('platform_renderer_annotations_create_debug_logging')) {
-      const result = applyAnnotation(positionToAnnotate, annotation);
-      actions._setDebugLogging(false);
-      return result;
-    } else {
-      return applyAnnotation(positionToAnnotate, annotation);
-    }
+    return applyAnnotation(positionToAnnotate, annotation);
   }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
   const createIndexCallback = useCallback(() => {
     if (!documentPosition || !generateIndexMatch) {

package/dist/esm/actions/index.js

@@ -15,6 +15,10 @@ import { createAnnotationStep, getPosFromRange } from '../steps';
 import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
 import { getIndexMatch } from './matches-utils';
 var RendererActions = /*#__PURE__*/function () {
+  // Any kind of refence is allowed
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   function RendererActions() {
     var initFromContext = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     _classCallCheck(this, RendererActions);
@@ -22,55 +26,6 @@ var RendererActions = /*#__PURE__*/function () {
     // 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
-    // the annotation cannot be applied to the range.
-    _defineProperty(this, "_privateWhyCannotApplyAnnotationOnRange", function (pos, doc, schema) {
-      var from = pos.from,
-        to = pos.to;
-      if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
-        return 'position invalid';
-      }
-      var reasons = [];
-      doc.nodesBetween(from, to, function (node, _pos, parent) {
-        // Special exception for hardBreak nodes
-        if (schema.nodes.hardBreak === node.type) {
-          return false;
-        }
-
-        // For block elements or text nodes, we want to check
-        // if annotations are allowed inside this tree
-        // or if we're leaf and not text
-        if (fg('editor_inline_comments_on_inline_nodes')) {
-          var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
-          if (node.isInline && !node.isText && !isAllowedInlineNode) {
-            reasons.push("Err 1 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isLeaf && !node.isText && !isAllowedInlineNode) {
-            reasons.push("Err 2 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-            reasons.push("Err 3 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
-            return false;
-          }
-        } else {
-          if (node.isInline && !node.isText) {
-            reasons.push("Err 4 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isLeaf && !node.isText) {
-            reasons.push("Err 5 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
-            return false;
-          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-            reasons.push("Err 6 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
-            return false;
-          }
-        }
-        return true;
-      });
-      return reasons.join(', ');
-    });
     this.initFromContext = initFromContext;
     this.transformer = new JSONTransformer();
   }
@@ -105,82 +60,23 @@ var RendererActions = /*#__PURE__*/function () {
     key: "_privateValidatePositionsForAnnotation",
     value: function _privateValidatePositionsForAnnotation(from, to) {
       if (!this.doc || !this.schema) {
-        if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation Position validation failed - Missing doc or schema",
-              commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-              isDocValid: !!this.doc,
-              isSchemaValid: !!this.schema
-            }
-          });
-        }
         return false;
       }
       var currentSelection = TextSelection.create(this.doc, from, to);
       if (isEmptyTextSelection(currentSelection, this.schema)) {
-        if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation Position validation - Empty Text Selection",
-              commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-              from: from,
-              to: to
-            }
-          });
-        }
         return false;
       }
       var result = canApplyAnnotationOnRange({
         from: from,
         to: to
       }, this.doc, this.schema);
-      if (this.debugAnalyticLoggingEnabled && !result && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        this.onAnalyticsEvent({
-          // @ts-ignore
-          action: 'failed',
-          // @ts-ignore
-          actionSubject: 'applyAnnotation',
-          // @ts-ignore
-          actionSubjectId: 'inlineCommentFailureReason',
-          eventType: EVENT_TYPE.OPERATIONAL,
-          attributes: {
-            // @ts-ignore
-            reason: "Annotation canApplyAnnotationOnRange failed",
-            details: this._privateWhyCannotApplyAnnotationOnRange({
-              from: from,
-              to: to
-            }, this.doc, this.schema),
-            commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-            from: from,
-            to: to
-          }
-        });
-      }
       return result;
     }
+
+    //#endregion
   }, {
     key: "deleteAnnotation",
-    value:
-    //#endregion
-
-    function deleteAnnotation(annotationId, annotationType) {
+    value: function deleteAnnotation(annotationId, annotationType) {
       if (!this.doc || !this.schema || !this.schema.marks.annotation) {
         return false;
       }
@@ -331,24 +227,6 @@ var RendererActions = /*#__PURE__*/function () {
     key: "isValidAnnotationPosition",
     value: function isValidAnnotationPosition(pos) {
       if (!pos || !this.doc) {
-        if (this.debugAnalyticLoggingEnabled && this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation Position validation failed - Missing doc or position",
-              commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-              isPosValid: !!pos,
-              isDocValid: !!this.doc
-            }
-          });
-        }
         return false;
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
@@ -410,25 +288,6 @@ var RendererActions = /*#__PURE__*/function () {
     key: "applyAnnotation",
     value: function applyAnnotation(pos, annotation) {
       if (!this.doc || !pos || !this.schema) {
-        if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation applyAnnotation failed - Missing doc, position or schema",
-              commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes'),
-              isPosValid: !!pos,
-              isDocValid: !!this.doc,
-              isSchemaValid: !!this.schema
-            }
-          });
-        }
         return false;
       }
       var from = pos.from,
@@ -462,22 +321,6 @@ var RendererActions = /*#__PURE__*/function () {
         doc = _step$apply2.doc,
         failed = _step$apply2.failed;
       if (failed || !doc) {
-        if (this.onAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-          this.onAnalyticsEvent({
-            // @ts-ignore
-            action: 'failed',
-            // @ts-ignore
-            actionSubject: 'applyAnnotation',
-            // @ts-ignore
-            actionSubjectId: 'inlineCommentFailureReason',
-            eventType: EVENT_TYPE.OPERATIONAL,
-            attributes: {
-              // @ts-ignore
-              reason: "Annotation applyAnnotation failed - ".concat(failed),
-              commentsOnInlineNodesAllowed: fg('editor_inline_comments_on_inline_nodes')
-            }
-          });
-        }
         return false;
       }
       var originalSelection = doc.textBetween(from, to);
@@ -538,15 +381,6 @@ var RendererActions = /*#__PURE__*/function () {
         schema: this.schema
       }, annotationId);
     }
-
-    /**
-     * This is a temporary method used for controlling when extra analytics shoulw be logged.
-     */
-  }, {
-    key: "_setDebugLogging",
-    value: function _setDebugLogging(enabled) {
-      this.debugAnalyticLoggingEnabled = enabled;
-    }
   }]);
 }();
 export { RendererActions as default };

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

@@ -53,7 +53,7 @@ import { PortalContext } from './PortalContext';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.6.8";
+var packageVersion = "118.6.9";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'
@@ -413,7 +413,8 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
       ssr: (_props$media = props.media) === null || _props$media === void 0 ? void 0 : _props$media.ssr,
       isInsideOfInlineExtension: props.isInsideOfInlineExtension,
       isTopLevelRenderer: rendererContext.isTopLevelRenderer,
-      shouldRemoveEmptySpaceAroundContent: props.shouldRemoveEmptySpaceAroundContent
+      shouldRemoveEmptySpaceAroundContent: props.shouldRemoveEmptySpaceAroundContent,
+      allowRendererContainerStyles: props.allowRendererContainerStyles
     }, props.enableSsrInlineScripts || props.noOpSSRInlineScript ? jsx(BreakoutSSRInlineScript, {
       noOpSSRInlineScript: Boolean(props.noOpSSRInlineScript)
     }) : null, jsx(RendererActionsInternalUpdater, {
@@ -444,7 +445,8 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
       onClick: function onClick(event) {
         return handleWrapperOnClick(event, props, mouseDownSelection);
       },
-      isTopLevelRenderer: rendererContext.isTopLevelRenderer
+      isTopLevelRenderer: rendererContext.isTopLevelRenderer,
+      allowRendererContainerStyles: props.allowRendererContainerStyles
     }, jsx(UnsupportedBlock, null));
   }
 };
@@ -536,7 +538,8 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
     ssr = props.ssr,
     isInsideOfInlineExtension = props.isInsideOfInlineExtension,
     allowTableResizing = props.allowTableResizing,
-    isTopLevelRenderer = props.isTopLevelRenderer;
+    isTopLevelRenderer = props.isTopLevelRenderer,
+    allowRendererContainerStyles = props.allowRendererContainerStyles;
   var createTelepointer = function createTelepointer() {
     var telepointer = document.createElement('span');
     telepointer.textContent = "\u200B";
@@ -611,20 +614,32 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
     allowColumnSorting: !!allowColumnSorting,
     useBlockRenderForCodeBlock: useBlockRenderForCodeBlock,
     allowAnnotations: props.allowAnnotations,
-    allowTableResizing: allowTableResizing
+    allowTableResizing: allowTableResizing,
+    allowRendererContainerStyles: allowRendererContainerStyles
   }, children))));
 
   // We can only make the wrapper div query container when we have a known width.
   // This is also required for SSR to work correctly. As WidthProvider/WithConsumer will not have the correct width during SSR.
   //
+
+  // allowRendererContainerStyles is not needed for comment container styling as container should always be set for comments
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  if (appearance === 'comment' && isTopLevelRenderer && fg('platform-ssr-table-resize')) {
+    return jsx("div", {
+      css: setAsQueryContainerStyles
+    }, renderer);
+  }
+
   // We are setting this wrapper div as query container conditionally.
   // 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 === 'full-page' || appearance === 'full-width') &&
   // 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-ssr-table-resize') ? jsx("div", {
+  isTopLevelRenderer && allowRendererContainerStyles &&
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  fg('platform-ssr-table-resize') ? jsx("div", {
     css: setAsQueryContainerStyles
   }, renderer) : renderer;
 });

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

@@ -61,28 +61,8 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
     // !!! at this point, the documentPosition can be the wrong position if the user select something else
     var positionToAnnotate = selectionDraftDocumentPosition || 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
-      if (createAnalyticsEvent && fg('platform_renderer_annotations_create_debug_logging')) {
-        createAnalyticsEvent({
-          action: 'failed',
-          actionSubject: 'applyAnnotation',
-          actionSubjectId: 'inlineCommentFailureReason',
-          attributes: {
-            reason: 'Annotation Position invalid',
-            draftDocumentPosition: selectionDraftDocumentPosition,
-            documentPosition: documentPosition,
-            applyAnnotation: !!applyAnnotation,
-            isDraftPositionFixEnabled: true
-          },
-          eventType: EVENT_TYPE.OPERATIONAL
-        }).fire(FabricChannel.editor);
-      }
       return false;
     }
-    if (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);
@@ -104,13 +84,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
-    if (fg('platform_renderer_annotations_create_debug_logging')) {
-      var result = applyAnnotation(positionToAnnotate, annotation);
-      actions._setDebugLogging(false);
-      return result;
-    } else {
-      return applyAnnotation(positionToAnnotate, annotation);
-    }
+    return applyAnnotation(positionToAnnotate, annotation);
   }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
   var createIndexCallback = useCallback(function () {
     if (!documentPosition || !generateIndexMatch) {

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

@@ -39,7 +39,6 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     private schema?;
     private ref?;
     private onAnalyticsEvent?;
-    private debugAnalyticLoggingEnabled;
     constructor(initFromContext?: boolean);
     _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void): void;
     _privateUnregisterRenderer(): void;
@@ -47,7 +46,6 @@ export default class RendererActions implements RendererActionsOptions, Annotati
      * Validate whether we can create an annotation between two positions
      */
     _privateValidatePositionsForAnnotation(from: number, to: number): boolean;
-    _privateWhyCannotApplyAnnotationOnRange: (pos: Position, doc: Node, schema: Schema) => string;
     deleteAnnotation(annotationId: string, annotationType: 'inlineComment'): false | {
         step: RemoveNodeMarkStep | RemoveMarkStep;
         doc: JSONDocNode;
@@ -71,9 +69,5 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     applyAnnotation(pos: Position, annotation: Annotation): AnnotationActionResult;
     generateAnnotationIndexMatch(pos: Position): AnnotationByMatches | false;
     getInlineNodeTypes(annotationId: string): string[] | undefined;
-    /**
-     * This is a temporary method used for controlling when extra analytics shoulw be logged.
-     */
-    _setDebugLogging(enabled: boolean): void;
 }
 export {};

package/dist/types/ui/Renderer/RendererStyleContainer.d.ts

@@ -4,7 +4,7 @@
  */
 import { jsx } from '@emotion/react';
 import { type RendererWrapperProps } from './index';
-type RendererStyleContainerProps = Pick<RendererWrapperProps, 'onClick' | 'onMouseDown' | 'appearance' | 'allowNestedHeaderLinks' | 'allowColumnSorting' | 'useBlockRenderForCodeBlock' | 'allowAnnotations' | 'allowTableResizing' | 'innerRef' | 'children'> & {
+type RendererStyleContainerProps = Pick<RendererWrapperProps, 'onClick' | 'onMouseDown' | 'appearance' | 'allowNestedHeaderLinks' | 'allowColumnSorting' | 'useBlockRenderForCodeBlock' | 'allowAnnotations' | 'allowTableResizing' | 'innerRef' | 'children' | 'allowRendererContainerStyles'> & {
     testId?: string;
 };
 export declare const RendererStyleContainer: (props: RendererStyleContainerProps) => jsx.JSX.Element;

package/dist/types/ui/Renderer/index.d.ts

@@ -42,6 +42,7 @@ export type RendererWrapperProps = {
     allowTableResizing?: boolean;
     isTopLevelRenderer?: boolean;
     shouldRemoveEmptySpaceAroundContent?: boolean;
+    allowRendererContainerStyles?: boolean;
 } & {
     children?: React.ReactNode;
 };

package/dist/types/ui/renderer-props.d.ts

@@ -68,6 +68,7 @@ export interface RendererProps {
     isInsideOfInlineExtension?: boolean;
     isTopLevelRenderer?: boolean;
     includeNodesCountInStats?: boolean;
+    allowRendererContainerStyles?: boolean;
     shouldRemoveEmptySpaceAroundContent?: boolean;
     /**
      * When enabled a trailing telepointer will be added to the rendered document

package/dist/types-ts4.5/actions/index.d.ts

@@ -39,7 +39,6 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     private schema?;
     private ref?;
     private onAnalyticsEvent?;
-    private debugAnalyticLoggingEnabled;
     constructor(initFromContext?: boolean);
     _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void): void;
     _privateUnregisterRenderer(): void;
@@ -47,7 +46,6 @@ export default class RendererActions implements RendererActionsOptions, Annotati
      * Validate whether we can create an annotation between two positions
      */
     _privateValidatePositionsForAnnotation(from: number, to: number): boolean;
-    _privateWhyCannotApplyAnnotationOnRange: (pos: Position, doc: Node, schema: Schema) => string;
     deleteAnnotation(annotationId: string, annotationType: 'inlineComment'): false | {
         step: RemoveNodeMarkStep | RemoveMarkStep;
         doc: JSONDocNode;
@@ -71,9 +69,5 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     applyAnnotation(pos: Position, annotation: Annotation): AnnotationActionResult;
     generateAnnotationIndexMatch(pos: Position): AnnotationByMatches | false;
     getInlineNodeTypes(annotationId: string): string[] | undefined;
-    /**
-     * This is a temporary method used for controlling when extra analytics shoulw be logged.
-     */
-    _setDebugLogging(enabled: boolean): void;
 }
 export {};

package/dist/types-ts4.5/ui/Renderer/RendererStyleContainer.d.ts

@@ -4,7 +4,7 @@
  */
 import { jsx } from '@emotion/react';
 import { type RendererWrapperProps } from './index';
-type RendererStyleContainerProps = Pick<RendererWrapperProps, 'onClick' | 'onMouseDown' | 'appearance' | 'allowNestedHeaderLinks' | 'allowColumnSorting' | 'useBlockRenderForCodeBlock' | 'allowAnnotations' | 'allowTableResizing' | 'innerRef' | 'children'> & {
+type RendererStyleContainerProps = Pick<RendererWrapperProps, 'onClick' | 'onMouseDown' | 'appearance' | 'allowNestedHeaderLinks' | 'allowColumnSorting' | 'useBlockRenderForCodeBlock' | 'allowAnnotations' | 'allowTableResizing' | 'innerRef' | 'children' | 'allowRendererContainerStyles'> & {
     testId?: string;
 };
 export declare const RendererStyleContainer: (props: RendererStyleContainerProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/Renderer/index.d.ts

@@ -42,6 +42,7 @@ export type RendererWrapperProps = {
     allowTableResizing?: boolean;
     isTopLevelRenderer?: boolean;
     shouldRemoveEmptySpaceAroundContent?: boolean;
+    allowRendererContainerStyles?: boolean;
 } & {
     children?: React.ReactNode;
 };

package/dist/types-ts4.5/ui/renderer-props.d.ts

@@ -68,6 +68,7 @@ export interface RendererProps {
     isInsideOfInlineExtension?: boolean;
     isTopLevelRenderer?: boolean;
     includeNodesCountInStats?: boolean;
+    allowRendererContainerStyles?: boolean;
     shouldRemoveEmptySpaceAroundContent?: boolean;
     /**
      * When enabled a trailing telepointer will be added to the rendered document

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "118.6.8",
+	"version": "118.6.9",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/code": "^17.2.0",
-		"@atlaskit/editor-common": "^106.2.0",
+		"@atlaskit/editor-common": "^106.3.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -52,12 +52,12 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.2.0",
 		"@atlaskit/react-ufo": "^3.13.0",
-		"@atlaskit/smart-card": "^38.7.0",
+		"@atlaskit/smart-card": "^38.8.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^5.12.0",
-		"@atlaskit/tokens": "^5.0.0",
+		"@atlaskit/tmp-editor-statsig": "^5.13.0",
+		"@atlaskit/tokens": "^5.1.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -86,7 +86,7 @@
 		"@atlaskit/linking-common": "^9.0.0",
 		"@atlaskit/media-core": "^36.1.0",
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
-		"@atlaskit/media-test-helpers": "^36.0.0",
+		"@atlaskit/media-test-helpers": "^36.1.0",
 		"@atlaskit/mention": "^24.2.0",
 		"@atlaskit/modal-dialog": "^14.2.0",
 		"@atlaskit/navigation-next": "patch:@atlaskit/navigation-next@npm%3A9.0.17#~/.yarn/patches/@atlaskit-navigation-next-npm-9.0.17-d1445f2f74.patch",
@@ -139,9 +139,6 @@
 		"cc_complexit_fe_reduce_fragment_serialization": {
 			"type": "boolean"
 		},
-		"platform_renderer_annotations_create_debug_logging": {
-			"type": "boolean"
-		},
 		"platform_editor_annotation_position_comment_nodes": {
 			"type": "boolean"
 		},