@atlaskit/editor-plugin-annotation 2.8.1 → 2.8.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-annotation
 
+## 2.8.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.8.2
+
+### Patch Changes
+
+- [#156246](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/156246)
+  [`66ad86018032f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/66ad86018032f) -
+  Expand types for selectInlineCommentExperience tracking
+- Updated dependencies
+
 ## 2.8.1
 
 ### Patch Changes

package/dist/cjs/pm-plugins/inline-comment.js

@@ -228,25 +228,23 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       editorView.root.addEventListener('mouseup', mouseUp);
       return {
         update: function update(view, _prevState) {
-          if ((0, _platformFeatureFlags.fg)('confluence_comments_select_comment_experience')) {
-            var _prevSelectedAnnotati;
-            var _ref4 = (0, _utils.getPluginState)(view.state) || {},
-              selectedAnnotations = _ref4.selectedAnnotations,
-              annotations = _ref4.annotations;
-            var _ref5 = (0, _utils.getPluginState)(_prevState) || {},
-              prevSelectedAnnotations = _ref5.selectedAnnotations;
-            var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
-            // If the new state has an unresolved selected annotation, and it's different from
-            // the previous one then we mark the select annotation experience as complete.
-            if (
-            //This checks the selected annotation is different from the previous one
-            selectedAnnotationId && selectedAnnotationId !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 || (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id) &&
-            // This ensures that the selected annotation is unresolved
-            annotations && annotations[selectedAnnotationId] === false) {
-              var _options$selectCommen;
-              // Under the confluence_comments_select_comment_experience feature flag, the selectComponentExperience is using a simplified object, which is why it's type asserted.
-              (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
-            }
+          var _prevSelectedAnnotati;
+          var _ref4 = (0, _utils.getPluginState)(view.state) || {},
+            selectedAnnotations = _ref4.selectedAnnotations,
+            annotations = _ref4.annotations;
+          var _ref5 = (0, _utils.getPluginState)(_prevState) || {},
+            prevSelectedAnnotations = _ref5.selectedAnnotations;
+          var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
+          // If the new state has an unresolved selected annotation, and it's different from
+          // the previous one then we mark the select annotation experience as complete.
+          if (
+          //This checks the selected annotation is different from the previous one
+          selectedAnnotationId && selectedAnnotationId !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 || (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id) &&
+          // This ensures that the selected annotation is unresolved
+          annotations && annotations[selectedAnnotationId] === false) {
+            var _options$selectCommen;
+            // The selectComponentExperience is using a simplified object, which is why it's type asserted.
+            (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
           }
           var _ref6 = (0, _utils.getPluginState)(view.state) || {},
             dirtyAnnotations = _ref6.dirtyAnnotations;

package/dist/cjs/pm-plugins/toolbar.js

@@ -32,6 +32,10 @@ var getValidNodes = exports.getValidNodes = function getValidNodes(state) {
  * This only applies when the selection range exactly matches the bookmark range
  * which should be the case immediately after the comment button is clicked
  * if the user creates a different selection range, the floating toolbar should still be shown
+ * @param root0
+ * @param root0.state
+ * @param root0.bookmark
+ * @example
  */
 var shouldSuppressFloatingToolbar = exports.shouldSuppressFloatingToolbar = function shouldSuppressFloatingToolbar(_ref) {
   var state = _ref.state,

package/dist/cjs/ui/InlineCommentView.js

@@ -1,12 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineCommentView = InlineCommentView;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -19,6 +20,8 @@ var _editorCommands = require("../editor-commands");
 var _utils3 = require("../pm-plugins/utils");
 var _types = require("../types");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
+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 findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
     from = sel.from;
@@ -79,6 +82,7 @@ function InlineCommentView(_ref3) {
   var inlineCommentProvider = providers.inlineComment;
   var state = editorView.state,
     dispatch = editorView.dispatch;
+  var lastSelectedAnnotationId = (0, _react.useRef)();
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
   var _useInlineCommentView = useInlineCommentViewPluginState({
@@ -131,9 +135,17 @@ function InlineCommentView(_ref3) {
 
   // Create Component
   if (bookmark) {
+    var _selectedAnnotations$;
     if (!CreateComponent) {
       return null;
     }
+    var currentlySelectedAnnotation = selectedAnnotations === null || selectedAnnotations === void 0 || (_selectedAnnotations$ = selectedAnnotations[0]) === null || _selectedAnnotations$ === void 0 ? void 0 : _selectedAnnotations$.id;
+    var isAnnotationSelectionChanged = currentlySelectedAnnotation !== lastSelectedAnnotationId.current;
+
+    // Update the last selected annotation ID if the selection was updated
+    if (isAnnotationSelectionChanged) {
+      lastSelectedAnnotationId.current = currentlySelectedAnnotation;
+    }
     var inlineNodeTypes = (0, _utils.getRangeInlineNodeNames)({
       doc: state.doc,
       pos: selection
@@ -147,6 +159,7 @@ function InlineCommentView(_ref3) {
     }, /*#__PURE__*/_react.default.createElement(CreateComponent, {
       dom: dom,
       textSelection: textSelection,
+      wasNewAnnotationSelected: !!currentlySelectedAnnotation && isAnnotationSelectionChanged,
       onCreate: function onCreate(id) {
         if (!(0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
           var createAnnotationResult = (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);

package/dist/es2019/pm-plugins/inline-comment.js

@@ -162,27 +162,25 @@ export const inlineCommentPlugin = options => {
       editorView.root.addEventListener('mouseup', mouseUp);
       return {
         update(view, _prevState) {
-          if (fg('confluence_comments_select_comment_experience')) {
-            var _prevSelectedAnnotati;
-            const {
-              selectedAnnotations,
-              annotations
-            } = getPluginState(view.state) || {};
-            const {
-              selectedAnnotations: prevSelectedAnnotations
-            } = getPluginState(_prevState) || {};
-            const selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
-            // If the new state has an unresolved selected annotation, and it's different from
-            // the previous one then we mark the select annotation experience as complete.
-            if (
-            //This checks the selected annotation is different from the previous one
-            selectedAnnotationId && selectedAnnotationId !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 ? void 0 : (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id) &&
-            // This ensures that the selected annotation is unresolved
-            annotations && annotations[selectedAnnotationId] === false) {
-              var _options$selectCommen;
-              // Under the confluence_comments_select_comment_experience feature flag, the selectComponentExperience is using a simplified object, which is why it's type asserted.
-              (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 ? void 0 : _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
-            }
+          var _prevSelectedAnnotati;
+          const {
+            selectedAnnotations,
+            annotations
+          } = getPluginState(view.state) || {};
+          const {
+            selectedAnnotations: prevSelectedAnnotations
+          } = getPluginState(_prevState) || {};
+          const selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
+          // If the new state has an unresolved selected annotation, and it's different from
+          // the previous one then we mark the select annotation experience as complete.
+          if (
+          //This checks the selected annotation is different from the previous one
+          selectedAnnotationId && selectedAnnotationId !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 ? void 0 : (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id) &&
+          // This ensures that the selected annotation is unresolved
+          annotations && annotations[selectedAnnotationId] === false) {
+            var _options$selectCommen;
+            // The selectComponentExperience is using a simplified object, which is why it's type asserted.
+            (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 ? void 0 : _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
           }
           const {
             dirtyAnnotations

package/dist/es2019/pm-plugins/toolbar.js

@@ -29,6 +29,10 @@ export const getValidNodes = state => {
  * This only applies when the selection range exactly matches the bookmark range
  * which should be the case immediately after the comment button is clicked
  * if the user creates a different selection range, the floating toolbar should still be shown
+ * @param root0
+ * @param root0.state
+ * @param root0.bookmark
+ * @example
  */
 export const shouldSuppressFloatingToolbar = ({
   state,

package/dist/es2019/ui/InlineCommentView.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { sharedPluginStateHookMigratorFactory } from '@atlaskit/editor-common/hooks';
@@ -78,6 +78,7 @@ export function InlineCommentView({
     state,
     dispatch
   } = editorView;
+  const lastSelectedAnnotationId = useRef();
   const {
     createComponent: CreateComponent,
     viewComponent: ViewComponent
@@ -133,9 +134,17 @@ export function InlineCommentView({
 
   // Create Component
   if (bookmark) {
+    var _selectedAnnotations$;
     if (!CreateComponent) {
       return null;
     }
+    const currentlySelectedAnnotation = selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : (_selectedAnnotations$ = selectedAnnotations[0]) === null || _selectedAnnotations$ === void 0 ? void 0 : _selectedAnnotations$.id;
+    const isAnnotationSelectionChanged = currentlySelectedAnnotation !== lastSelectedAnnotationId.current;
+
+    // Update the last selected annotation ID if the selection was updated
+    if (isAnnotationSelectionChanged) {
+      lastSelectedAnnotationId.current = currentlySelectedAnnotation;
+    }
     const inlineNodeTypes = getRangeInlineNodeNames({
       doc: state.doc,
       pos: selection
@@ -149,6 +158,7 @@ export function InlineCommentView({
     }, /*#__PURE__*/React.createElement(CreateComponent, {
       dom: dom,
       textSelection: textSelection,
+      wasNewAnnotationSelected: !!currentlySelectedAnnotation && isAnnotationSelectionChanged,
       onCreate: id => {
         if (!fg('platform_editor_comments_api_manager')) {
           const createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);

package/dist/esm/pm-plugins/inline-comment.js

@@ -221,25 +221,23 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       editorView.root.addEventListener('mouseup', mouseUp);
       return {
         update: function update(view, _prevState) {
-          if (fg('confluence_comments_select_comment_experience')) {
-            var _prevSelectedAnnotati;
-            var _ref4 = getPluginState(view.state) || {},
-              selectedAnnotations = _ref4.selectedAnnotations,
-              annotations = _ref4.annotations;
-            var _ref5 = getPluginState(_prevState) || {},
-              prevSelectedAnnotations = _ref5.selectedAnnotations;
-            var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
-            // If the new state has an unresolved selected annotation, and it's different from
-            // the previous one then we mark the select annotation experience as complete.
-            if (
-            //This checks the selected annotation is different from the previous one
-            selectedAnnotationId && selectedAnnotationId !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 || (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id) &&
-            // This ensures that the selected annotation is unresolved
-            annotations && annotations[selectedAnnotationId] === false) {
-              var _options$selectCommen;
-              // Under the confluence_comments_select_comment_experience feature flag, the selectComponentExperience is using a simplified object, which is why it's type asserted.
-              (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
-            }
+          var _prevSelectedAnnotati;
+          var _ref4 = getPluginState(view.state) || {},
+            selectedAnnotations = _ref4.selectedAnnotations,
+            annotations = _ref4.annotations;
+          var _ref5 = getPluginState(_prevState) || {},
+            prevSelectedAnnotations = _ref5.selectedAnnotations;
+          var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
+          // If the new state has an unresolved selected annotation, and it's different from
+          // the previous one then we mark the select annotation experience as complete.
+          if (
+          //This checks the selected annotation is different from the previous one
+          selectedAnnotationId && selectedAnnotationId !== (prevSelectedAnnotations === null || prevSelectedAnnotations === void 0 || (_prevSelectedAnnotati = prevSelectedAnnotations[0]) === null || _prevSelectedAnnotati === void 0 ? void 0 : _prevSelectedAnnotati.id) &&
+          // This ensures that the selected annotation is unresolved
+          annotations && annotations[selectedAnnotationId] === false) {
+            var _options$selectCommen;
+            // The selectComponentExperience is using a simplified object, which is why it's type asserted.
+            (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
           }
           var _ref6 = getPluginState(view.state) || {},
             dirtyAnnotations = _ref6.dirtyAnnotations;

package/dist/esm/pm-plugins/toolbar.js

@@ -25,6 +25,10 @@ export var getValidNodes = function getValidNodes(state) {
  * This only applies when the selection range exactly matches the bookmark range
  * which should be the case immediately after the comment button is clicked
  * if the user creates a different selection range, the floating toolbar should still be shown
+ * @param root0
+ * @param root0.state
+ * @param root0.bookmark
+ * @example
  */
 export var shouldSuppressFloatingToolbar = function shouldSuppressFloatingToolbar(_ref) {
   var state = _ref.state,

package/dist/esm/ui/InlineCommentView.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React from 'react';
+import React, { useRef } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { sharedPluginStateHookMigratorFactory } from '@atlaskit/editor-common/hooks';
@@ -72,6 +72,7 @@ export function InlineCommentView(_ref3) {
   var inlineCommentProvider = providers.inlineComment;
   var state = editorView.state,
     dispatch = editorView.dispatch;
+  var lastSelectedAnnotationId = useRef();
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
   var _useInlineCommentView = useInlineCommentViewPluginState({
@@ -124,9 +125,17 @@ export function InlineCommentView(_ref3) {
 
   // Create Component
   if (bookmark) {
+    var _selectedAnnotations$;
     if (!CreateComponent) {
       return null;
     }
+    var currentlySelectedAnnotation = selectedAnnotations === null || selectedAnnotations === void 0 || (_selectedAnnotations$ = selectedAnnotations[0]) === null || _selectedAnnotations$ === void 0 ? void 0 : _selectedAnnotations$.id;
+    var isAnnotationSelectionChanged = currentlySelectedAnnotation !== lastSelectedAnnotationId.current;
+
+    // Update the last selected annotation ID if the selection was updated
+    if (isAnnotationSelectionChanged) {
+      lastSelectedAnnotationId.current = currentlySelectedAnnotation;
+    }
     var inlineNodeTypes = getRangeInlineNodeNames({
       doc: state.doc,
       pos: selection
@@ -140,6 +149,7 @@ export function InlineCommentView(_ref3) {
     }, /*#__PURE__*/React.createElement(CreateComponent, {
       dom: dom,
       textSelection: textSelection,
+      wasNewAnnotationSelected: !!currentlySelectedAnnotation && isAnnotationSelectionChanged,
       onCreate: function onCreate(id) {
         if (!fg('platform_editor_comments_api_manager')) {
           var createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export { annotationPlugin } from './annotationPlugin';
 export type { AnnotationPlugin, AnnotationPluginOptions } from './annotationPluginType';
-export type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCompoundExperience, InlineCommentCreateComponentProps, InlineCommentInputMethod, InlineCommentState, InlineCommentViewComponentProps, SelectInlineCommentCompoundExperience, SelectInlineCommentCompoundExperienceEntryPoint, SimpleSelectInlineCommentCompoundExperience, StartAttributes, TargetType, } from './types';
+export type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCompoundExperience, InlineCommentCreateComponentProps, InlineCommentInputMethod, InlineCommentState, InlineCommentViewComponentProps, SelectAbortReasons, SelectParentAbortReasons, SelectInlineCommentCompoundExperience, SelectInlineCommentCompoundExperienceEntryPoint, SimpleSelectInlineCommentCompoundExperience, StartAttributes, TargetType, } from './types';
 export type { InlineCommentMap, InlineCommentPluginState, InlineCommentPluginOptions, InlineCommentAction, } from './pm-plugins/types';

package/dist/types/pm-plugins/annotation-manager-hooks.d.ts

@@ -1,7 +1,7 @@
 import { type AnnotationId } from '@atlaskit/adf-schema';
 import type { ApplyDraftResult, ClearDraftResult, GetDraftResult, StartDraftResult } from '@atlaskit/editor-common/annotation';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
-import { InlineCommentPluginOptions } from './types';
+import type { InlineCommentPluginOptions } from './types';
 export declare const allowAnnotation: (editorView: EditorView, options: InlineCommentPluginOptions) => () => boolean;
 export declare const startDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => StartDraftResult;
 export declare const clearDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => ClearDraftResult;

package/dist/types/pm-plugins/toolbar.d.ts

@@ -3,10 +3,10 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI, FloatingToolbarButton } from '@atlaskit/editor-common/types';
 import type { PopupPosition } from '@atlaskit/editor-common/ui';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
-import { SelectionBookmark, type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { type SelectionBookmark, type EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationPlugin } from '../annotationPluginType';
-import { AnnotationProviders } from '../types';
+import { type AnnotationProviders } from '../types';
 interface BuildToolbarOptions {
     state: EditorState;
     intl: IntlShape;
@@ -28,6 +28,10 @@ type ShouldSuppressFloatingToolbarOptions = {
  * This only applies when the selection range exactly matches the bookmark range
  * which should be the case immediately after the comment button is clicked
  * if the user creates a different selection range, the floating toolbar should still be shown
+ * @param root0
+ * @param root0.state
+ * @param root0.bookmark
+ * @example
  */
 export declare const shouldSuppressFloatingToolbar: ({ state, bookmark, }: ShouldSuppressFloatingToolbarOptions) => boolean;
 export declare const buildSuppressedToolbar: (state: EditorState) => {

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

@@ -1,6 +1,6 @@
 import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema';
-import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next/types';
+import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next/types';
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter, AnnotationManager } from '@atlaskit/editor-common/annotation';
 /**
@@ -45,6 +45,7 @@ export type InlineCommentCreateComponentProps = AnnotationComponentProps & {
      * Indicates whether we're opening the media comment box from the media toolbar so we can scroll the media into view
      */
     isOpeningMediaCommentFromToolbar?: boolean;
+    wasNewAnnotationSelected?: boolean;
 };
 export type InlineCommentViewComponentProps = AnnotationComponentProps & {
     /**
@@ -171,7 +172,6 @@ export type StartAttributes = {
     blockType?: 'media';
     annotationId: string;
     entryPoint: Exclude<SelectInlineCommentCompoundExperienceEntryPoint, 'keyboard-navigation' | 'comment-navigation'>;
-    linkedCompoundTaskId?: string;
 } | {
     pageClass: 'editor' | 'renderer';
     /**
@@ -181,7 +181,6 @@ export type StartAttributes = {
     commentType?: 'block' | 'inline';
     blockType?: 'media';
     entryPoint: 'keyboard-navigation' | 'comment-navigation';
-    linkedCompoundTaskId?: string;
 };
 type ExperienceDebugFunction = (params: {
     createAnalyticsEvent: CreateUIAnalyticsEvent;
@@ -228,19 +227,22 @@ export type InlineCommentCompoundExperience = {
         debugPoint: (message: string, attributes?: ExperienceAttributes) => void;
     };
 };
+export type SelectAbortReasons = 'test abort' | 'Comment being resolved';
+export type SelectParentAbortReasons = 'Parent experience aborting with reason: test abort' | 'Parent experience aborting with reason: Comment being resolved';
 export type SelectInlineCommentCompoundExperience = {
     _start: (startAttributes: StartAttributes) => void;
     addCommonAttributes: (additionalCommonAttributes: {
-        [key: string]: string | number | boolean;
+        [key: string]: boolean | null | number | string | undefined | Array<number | string>;
     }) => void;
     abort: (params: {
-        abortReason: 'test abort';
+        abortReason: SelectAbortReasons;
+        abortSubexperiences?: boolean;
     }) => void;
     selectAnnotation: {
         debug: ExperienceDebugFunction;
         start: (startAttributes: StartAttributes) => void;
         abort: (params: {
-            abortReason: 'Comment navigation when only one comment';
+            abortReason: 'Comment navigation when only one comment' | 'Navigating to general comment' | SelectParentAbortReasons;
         }) => void;
         complete: (startAttributes: StartAttributes) => void;
     };
@@ -253,7 +255,7 @@ export type SelectInlineCommentCompoundExperience = {
             annotationId: string;
         }) => void;
         abort: (params: {
-            abortReason: 'Non inline comment being shown' | 'Comment sidebar dismissed';
+            abortReason: 'Non inline comment being shown' | 'Comment sidebar dismissed' | 'InlineComment component unmounted' | SelectParentAbortReasons;
         }) => void;
         fail: (error: Error, extraAttributes?: {
             misalignedBy: number;

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

@@ -1,4 +1,4 @@
 export { annotationPlugin } from './annotationPlugin';
 export type { AnnotationPlugin, AnnotationPluginOptions } from './annotationPluginType';
-export type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCompoundExperience, InlineCommentCreateComponentProps, InlineCommentInputMethod, InlineCommentState, InlineCommentViewComponentProps, SelectInlineCommentCompoundExperience, SelectInlineCommentCompoundExperienceEntryPoint, SimpleSelectInlineCommentCompoundExperience, StartAttributes, TargetType, } from './types';
+export type { AnnotationInfo, AnnotationProviders, AnnotationState, AnnotationTypeProvider, InlineCommentAnnotationProvider, InlineCommentCompoundExperience, InlineCommentCreateComponentProps, InlineCommentInputMethod, InlineCommentState, InlineCommentViewComponentProps, SelectAbortReasons, SelectParentAbortReasons, SelectInlineCommentCompoundExperience, SelectInlineCommentCompoundExperienceEntryPoint, SimpleSelectInlineCommentCompoundExperience, StartAttributes, TargetType, } from './types';
 export type { InlineCommentMap, InlineCommentPluginState, InlineCommentPluginOptions, InlineCommentAction, } from './pm-plugins/types';

package/dist/types-ts4.5/pm-plugins/annotation-manager-hooks.d.ts

@@ -1,7 +1,7 @@
 import { type AnnotationId } from '@atlaskit/adf-schema';
 import type { ApplyDraftResult, ClearDraftResult, GetDraftResult, StartDraftResult } from '@atlaskit/editor-common/annotation';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
-import { InlineCommentPluginOptions } from './types';
+import type { InlineCommentPluginOptions } from './types';
 export declare const allowAnnotation: (editorView: EditorView, options: InlineCommentPluginOptions) => () => boolean;
 export declare const startDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => StartDraftResult;
 export declare const clearDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => ClearDraftResult;

package/dist/types-ts4.5/pm-plugins/toolbar.d.ts

@@ -3,10 +3,10 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI, FloatingToolbarButton } from '@atlaskit/editor-common/types';
 import type { PopupPosition } from '@atlaskit/editor-common/ui';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
-import { SelectionBookmark, type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { type SelectionBookmark, type EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { AnnotationPlugin } from '../annotationPluginType';
-import { AnnotationProviders } from '../types';
+import { type AnnotationProviders } from '../types';
 interface BuildToolbarOptions {
     state: EditorState;
     intl: IntlShape;
@@ -28,6 +28,10 @@ type ShouldSuppressFloatingToolbarOptions = {
  * This only applies when the selection range exactly matches the bookmark range
  * which should be the case immediately after the comment button is clicked
  * if the user creates a different selection range, the floating toolbar should still be shown
+ * @param root0
+ * @param root0.state
+ * @param root0.bookmark
+ * @example
  */
 export declare const shouldSuppressFloatingToolbar: ({ state, bookmark, }: ShouldSuppressFloatingToolbarOptions) => boolean;
 export declare const buildSuppressedToolbar: (state: EditorState) => {

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

@@ -1,6 +1,6 @@
 import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema';
-import { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next/types';
+import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next/types';
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter, AnnotationManager } from '@atlaskit/editor-common/annotation';
 /**
@@ -45,6 +45,7 @@ export type InlineCommentCreateComponentProps = AnnotationComponentProps & {
      * Indicates whether we're opening the media comment box from the media toolbar so we can scroll the media into view
      */
     isOpeningMediaCommentFromToolbar?: boolean;
+    wasNewAnnotationSelected?: boolean;
 };
 export type InlineCommentViewComponentProps = AnnotationComponentProps & {
     /**
@@ -171,7 +172,6 @@ export type StartAttributes = {
     blockType?: 'media';
     annotationId: string;
     entryPoint: Exclude<SelectInlineCommentCompoundExperienceEntryPoint, 'keyboard-navigation' | 'comment-navigation'>;
-    linkedCompoundTaskId?: string;
 } | {
     pageClass: 'editor' | 'renderer';
     /**
@@ -181,7 +181,6 @@ export type StartAttributes = {
     commentType?: 'block' | 'inline';
     blockType?: 'media';
     entryPoint: 'keyboard-navigation' | 'comment-navigation';
-    linkedCompoundTaskId?: string;
 };
 type ExperienceDebugFunction = (params: {
     createAnalyticsEvent: CreateUIAnalyticsEvent;
@@ -228,19 +227,22 @@ export type InlineCommentCompoundExperience = {
         debugPoint: (message: string, attributes?: ExperienceAttributes) => void;
     };
 };
+export type SelectAbortReasons = 'test abort' | 'Comment being resolved';
+export type SelectParentAbortReasons = 'Parent experience aborting with reason: test abort' | 'Parent experience aborting with reason: Comment being resolved';
 export type SelectInlineCommentCompoundExperience = {
     _start: (startAttributes: StartAttributes) => void;
     addCommonAttributes: (additionalCommonAttributes: {
-        [key: string]: string | number | boolean;
+        [key: string]: boolean | null | number | string | undefined | Array<number | string>;
     }) => void;
     abort: (params: {
-        abortReason: 'test abort';
+        abortReason: SelectAbortReasons;
+        abortSubexperiences?: boolean;
     }) => void;
     selectAnnotation: {
         debug: ExperienceDebugFunction;
         start: (startAttributes: StartAttributes) => void;
         abort: (params: {
-            abortReason: 'Comment navigation when only one comment';
+            abortReason: 'Comment navigation when only one comment' | 'Navigating to general comment' | SelectParentAbortReasons;
         }) => void;
         complete: (startAttributes: StartAttributes) => void;
     };
@@ -253,7 +255,7 @@ export type SelectInlineCommentCompoundExperience = {
             annotationId: string;
         }) => void;
         abort: (params: {
-            abortReason: 'Non inline comment being shown' | 'Comment sidebar dismissed';
+            abortReason: 'Non inline comment being shown' | 'Comment sidebar dismissed' | 'InlineComment component unmounted' | SelectParentAbortReasons;
         }) => void;
         fail: (error: Error, extraAttributes?: {
             misalignedBy: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "2.8.1",
+	"version": "2.8.3",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,16 +33,16 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/editor-common": "^105.0.0",
-		"@atlaskit/editor-plugin-analytics": "^2.2.0",
+		"@atlaskit/editor-common": "^105.10.0",
+		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^2.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/icon": "^26.0.0",
-		"@atlaskit/onboarding": "^14.0.0",
+		"@atlaskit/icon": "^26.3.0",
+		"@atlaskit/onboarding": "^14.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.19.0",
+		"@atlaskit/tmp-editor-statsig": "^5.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -115,9 +115,6 @@
 		"platform_editor_listen_for_focussed_query_param": {
 			"type": "boolean"
 		},
-		"confluence_comments_select_comment_experience": {
-			"type": "boolean"
-		},
 		"confluence_frontend_handle_annotation_error": {
 			"type": "boolean"
 		},