@atlaskit/renderer 133.10.6 → 133.11.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/renderer
 
+## 133.11.0
+
+### Minor Changes
+
+- [`d3536d2e15575`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d3536d2e15575) -
+  Fix inline comment anchoring to wrong text when a new selection is made while a draft is active.
+  Clears stale hover/selection draft position before promoting new selection, and adds missing deps
+  to useCallback arrays.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 133.10.6
 
 ### Patch Changes

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

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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Mounter = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _dom = require("../draft/dom");
 var _types = require("@atlaskit/analytics-listeners/types");
@@ -31,7 +32,9 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
     hoverDraftDocumentPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
-    var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
+    // Always use documentPosition directly when gate is on — hoverDraftDocumentPosition
+    // in this closure may be stale (captured before state update) (COMMENTS-6594).
+    var positionToAnnotate = (0, _expValEquals.expValEquals)('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : hoverDraftDocumentPosition || documentPosition;
     if (!isAnnotationAllowed || !positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -76,6 +79,13 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       }
       return false;
     }
+
+    // Clear any stale draft position before promoting the new one.
+    // Without this, if a previous draft was not explicitly closed, hoverDraftDocumentPosition
+    // retains the old position and the comment anchors to the wrong text (COMMENTS-6594).
+    if ((0, _expValEquals.expValEquals)('confluence_inline_comments_fix_stale_selection', 'isEnabled', true)) {
+      clearHoverDraft();
+    }
     promoteHoverToDraft(documentPosition);
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = actions.getAnnotationsByPosition(range);
@@ -99,7 +109,10 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
         }
       }
     });
-    var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
+
+    // Always use documentPosition directly when gate is on — hoverDraftDocumentPosition
+    // in this closure may be stale (captured before state update) (COMMENTS-6594).
+    var positionToAnnotate = (0, _expValEquals.expValEquals)('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       if (createAnalyticsEvent) {
         createAnalyticsEvent({
@@ -121,7 +134,7 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, hoverDraftDocumentPosition]);
+  }, [documentPosition, hoverDraftDocumentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, clearHoverDraft]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
     clearHoverDraft();
     var sel = window.getSelection();

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

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SelectionInlineCommentMounter = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _v = _interopRequireDefault(require("uuid/v4"));
 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");
@@ -53,10 +54,9 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     });
   }, [documentPosition, actions, range]);
   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
-    // !!! at this point, the documentPosition can be the wrong position if the user select something else
-    var positionToAnnotate = selectionDraftDocumentPosition || documentPosition;
+    // Use documentPosition directly when gate is on — selectionDraftDocumentPosition may be stale
+    // (from a previous selection) causing the comment to anchor to the wrong text (COMMENTS-6594).
+    var positionToAnnotate = (0, _expValEquals.expValEquals)('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -82,7 +82,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       }).fire(_types.FabricChannel.editor);
     }
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
+  }, [actions, documentPosition, selectionDraftDocumentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -110,6 +110,11 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       }
       return false;
     }
+
+    // Clear any stale draft position before promoting the new one (COMMENTS-6594).
+    if ((0, _expValEquals.expValEquals)('confluence_inline_comments_fix_stale_selection', 'isEnabled', true)) {
+      clearSelectionDraft();
+    }
     promoteSelectionToDraft(documentPosition);
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = range ? actions.getAnnotationsByPosition(range) : [];
@@ -135,11 +140,11 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       }
     });
 
-    // at this point, the documentPosition is the position that the user has selected,
-    // not the selectionDraftDocumentPosition
-    // because the documentPosition is not promoted to selectionDraftDocumentPosition yet
-    // use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
-    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
+    // Use documentPosition directly when either:
+    // - platform_editor_comments_api_manager is on (existing behaviour), OR
+    // - COMMENTS-6594 experiment is on (fix: avoids stale closure value)
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager') || (0, _expValEquals.expValEquals)('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       if (createAnalyticsEvent) {
         createAnalyticsEvent({
@@ -161,7 +166,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, selectionDraftDocumentPosition]);
+  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, clearSelectionDraft, selectionDraftDocumentPosition]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
     clearSelectionDraft();
     var sel = window.getSelection();

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

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

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

@@ -1,4 +1,5 @@
 import React, { useCallback, useContext } from 'react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
@@ -27,7 +28,9 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
   } = useAnnotationRangeState();
   const actions = useContext(ActionsContext);
   const onCreateCallback = useCallback(annotationId => {
-    const positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
+    // Always use documentPosition directly when gate is on — hoverDraftDocumentPosition
+    // in this closure may be stale (captured before state update) (COMMENTS-6594).
+    const positionToAnnotate = expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : hoverDraftDocumentPosition || documentPosition;
     if (!isAnnotationAllowed || !positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -72,6 +75,13 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
       }
       return false;
     }
+
+    // Clear any stale draft position before promoting the new one.
+    // Without this, if a previous draft was not explicitly closed, hoverDraftDocumentPosition
+    // retains the old position and the comment anchors to the wrong text (COMMENTS-6594).
+    if (expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true)) {
+      clearHoverDraft();
+    }
     promoteHoverToDraft(documentPosition);
     if (createAnalyticsEvent) {
       const uniqueAnnotationsInRange = actions.getAnnotationsByPosition(range);
@@ -95,7 +105,10 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
         }
       }
     });
-    const positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
+
+    // Always use documentPosition directly when gate is on — hoverDraftDocumentPosition
+    // in this closure may be stale (captured before state update) (COMMENTS-6594).
+    const positionToAnnotate = expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       if (createAnalyticsEvent) {
         createAnalyticsEvent({
@@ -117,7 +130,7 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, hoverDraftDocumentPosition]);
+  }, [documentPosition, hoverDraftDocumentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, clearHoverDraft]);
   const removeDraftModeCallback = useCallback(() => {
     clearHoverDraft();
     const sel = window.getSelection();

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

@@ -1,9 +1,10 @@
 import React, { useCallback, useContext, useMemo, useEffect } from 'react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { AnnotationTypes, AnnotationMarkStates } from '@atlaskit/adf-schema';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
@@ -50,10 +51,9 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
     });
   }, [documentPosition, actions, range]);
   const onCreateCallback = useCallback(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
-    // !!! at this point, the documentPosition can be the wrong position if the user select something else
-    const positionToAnnotate = selectionDraftDocumentPosition || documentPosition;
+    // Use documentPosition directly when gate is on — selectionDraftDocumentPosition may be stale
+    // (from a previous selection) causing the comment to anchor to the wrong text (COMMENTS-6594).
+    const positionToAnnotate = expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -79,7 +79,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
       }).fire(FabricChannel.editor);
     }
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
+  }, [actions, documentPosition, selectionDraftDocumentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes]);
   const createIndexCallback = useCallback(() => {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -107,6 +107,11 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
       }
       return false;
     }
+
+    // Clear any stale draft position before promoting the new one (COMMENTS-6594).
+    if (expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true)) {
+      clearSelectionDraft();
+    }
     promoteSelectionToDraft(documentPosition);
     if (createAnalyticsEvent) {
       const uniqueAnnotationsInRange = range ? actions.getAnnotationsByPosition(range) : [];
@@ -132,11 +137,11 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
       }
     });
 
-    // at this point, the documentPosition is the position that the user has selected,
-    // not the selectionDraftDocumentPosition
-    // because the documentPosition is not promoted to selectionDraftDocumentPosition yet
-    // use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
-    const positionToAnnotate = fg('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
+    // Use documentPosition directly when either:
+    // - platform_editor_comments_api_manager is on (existing behaviour), OR
+    // - COMMENTS-6594 experiment is on (fix: avoids stale closure value)
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    const positionToAnnotate = fg('platform_editor_comments_api_manager') || expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       if (createAnalyticsEvent) {
         createAnalyticsEvent({
@@ -158,7 +163,7 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, selectionDraftDocumentPosition]);
+  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, clearSelectionDraft, selectionDraftDocumentPosition]);
   const removeDraftModeCallback = useCallback(() => {
     clearSelectionDraft();
     const sel = window.getSelection();

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

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

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

@@ -1,4 +1,5 @@
 import React, { useCallback, useContext } from 'react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
@@ -23,7 +24,9 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
     hoverDraftDocumentPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
   var actions = useContext(ActionsContext);
   var onCreateCallback = useCallback(function (annotationId) {
-    var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
+    // Always use documentPosition directly when gate is on — hoverDraftDocumentPosition
+    // in this closure may be stale (captured before state update) (COMMENTS-6594).
+    var positionToAnnotate = expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : hoverDraftDocumentPosition || documentPosition;
     if (!isAnnotationAllowed || !positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -68,6 +71,13 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
       }
       return false;
     }
+
+    // Clear any stale draft position before promoting the new one.
+    // Without this, if a previous draft was not explicitly closed, hoverDraftDocumentPosition
+    // retains the old position and the comment anchors to the wrong text (COMMENTS-6594).
+    if (expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true)) {
+      clearHoverDraft();
+    }
     promoteHoverToDraft(documentPosition);
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = actions.getAnnotationsByPosition(range);
@@ -91,7 +101,10 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
         }
       }
     });
-    var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
+
+    // Always use documentPosition directly when gate is on — hoverDraftDocumentPosition
+    // in this closure may be stale (captured before state update) (COMMENTS-6594).
+    var positionToAnnotate = expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       if (createAnalyticsEvent) {
         createAnalyticsEvent({
@@ -113,7 +126,7 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, hoverDraftDocumentPosition]);
+  }, [documentPosition, hoverDraftDocumentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, clearHoverDraft]);
   var removeDraftModeCallback = useCallback(function () {
     clearHoverDraft();
     var sel = window.getSelection();

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

@@ -1,9 +1,10 @@
 import React, { useCallback, useContext, useMemo, useEffect } from 'react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { fg } from '@atlaskit/platform-feature-flags';
 
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid/v4';
 import { AnnotationTypes, AnnotationMarkStates } from '@atlaskit/adf-schema';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
@@ -44,10 +45,9 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
     });
   }, [documentPosition, actions, range]);
   var onCreateCallback = 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
-    // !!! at this point, the documentPosition can be the wrong position if the user select something else
-    var positionToAnnotate = selectionDraftDocumentPosition || documentPosition;
+    // Use documentPosition directly when gate is on — selectionDraftDocumentPosition may be stale
+    // (from a previous selection) causing the comment to anchor to the wrong text (COMMENTS-6594).
+    var positionToAnnotate = expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -73,7 +73,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
       }).fire(FabricChannel.editor);
     }
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
+  }, [actions, documentPosition, selectionDraftDocumentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes]);
   var createIndexCallback = useCallback(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -101,6 +101,11 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
       }
       return false;
     }
+
+    // Clear any stale draft position before promoting the new one (COMMENTS-6594).
+    if (expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true)) {
+      clearSelectionDraft();
+    }
     promoteSelectionToDraft(documentPosition);
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = range ? actions.getAnnotationsByPosition(range) : [];
@@ -126,11 +131,11 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
       }
     });
 
-    // at this point, the documentPosition is the position that the user has selected,
-    // not the selectionDraftDocumentPosition
-    // because the documentPosition is not promoted to selectionDraftDocumentPosition yet
-    // use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
-    var positionToAnnotate = fg('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
+    // Use documentPosition directly when either:
+    // - platform_editor_comments_api_manager is on (existing behaviour), OR
+    // - COMMENTS-6594 experiment is on (fix: avoids stale closure value)
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    var positionToAnnotate = fg('platform_editor_comments_api_manager') || expValEquals('confluence_inline_comments_fix_stale_selection', 'isEnabled', true) ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       if (createAnalyticsEvent) {
         createAnalyticsEvent({
@@ -152,7 +157,7 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, selectionDraftDocumentPosition]);
+  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, clearSelectionDraft, selectionDraftDocumentPosition]);
   var removeDraftModeCallback = useCallback(function () {
     clearSelectionDraft();
     var sel = window.getSelection();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "133.10.6",
+	"version": "133.11.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -67,7 +67,7 @@
 		"@atlaskit/status": "^5.4.0",
 		"@atlaskit/task-decision": "^21.4.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tmp-editor-statsig": "^126.0.0",
+		"@atlaskit/tmp-editor-statsig": "^126.1.0",
 		"@atlaskit/tokens": "^15.8.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@atlaskit/visually-hidden": "^4.1.0",