@atlaskit/editor-plugin-annotation 6.0.0 → 6.1.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-annotation
 
+## 6.1.0
+
+### Minor Changes
+
+- [`daf58795e19b8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/daf58795e19b8) -
+  Add a new property (annotationsLoaded: boolean) to the Editor Plugin Annotation state. This
+  property is used to indicate whether inline comments have been fetched.
+
+## 6.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.0.0
 
 ### Patch Changes

package/dist/cjs/editor-commands/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateMouseState = exports.updateInlineCommentResolvedState = exports.showInlineCommentForBlockNode = exports.setSelectedAnnotation = exports.setPendingSelectedAnnotation = exports.setInlineCommentsVisibility = exports.setInlineCommentDraftState = exports.setHoveredAnnotation = exports.removeInlineCommentNearSelection = exports.removeInlineCommentFromDoc = exports.flushPendingSelections = exports.createAnnotation = exports.closeComponent = exports.clearDirtyMark = exports.addInlineComment = void 0;
+exports.updateMouseState = exports.updateInlineCommentResolvedState = exports.showInlineCommentForBlockNode = exports.setSelectedAnnotation = exports.setPendingSelectedAnnotation = exports.setInlineCommentsVisibility = exports.setInlineCommentsFetched = exports.setInlineCommentDraftState = exports.setHoveredAnnotation = exports.removeInlineCommentNearSelection = exports.removeInlineCommentFromDoc = exports.flushPendingSelections = exports.createAnnotation = exports.closeComponent = exports.clearDirtyMark = exports.addInlineComment = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -54,6 +54,11 @@ var clearDirtyMark = exports.clearDirtyMark = function clearDirtyMark() {
     type: _types.ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK
   });
 };
+var setInlineCommentsFetched = exports.setInlineCommentsFetched = function setInlineCommentsFetched() {
+  return (0, _pluginFactory.createCommand)({
+    type: _types.ACTIONS.SET_INLINE_COMMENTS_FETCHED
+  });
+};
 var flushPendingSelections = exports.flushPendingSelections = function flushPendingSelections(editorAnalyticsAPI) {
   return function (canSetAsSelectedAnnotations, errorReason) {
     var command = {

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

@@ -61,7 +61,7 @@ var fetchProviderStates = /*#__PURE__*/function () {
 // Requires `editorView` instead of the decomposition as the async means state may end up stale
 var fetchState = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(provider, annotationIds, editorView, editorAnalyticsAPI) {
-    var inlineCommentStates;
+    var inlineCommentStates, _ref3, annotationsLoaded;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -70,15 +70,19 @@ var fetchState = /*#__PURE__*/function () {
         case 2:
           inlineCommentStates = _context2.sent;
           if (!(Object.keys(inlineCommentStates).length === 0)) {
-            _context2.next = 5;
+            _context2.next = 7;
             break;
           }
+          _ref3 = (0, _utils3.getPluginState)(editorView.state) || {}, annotationsLoaded = _ref3.annotationsLoaded;
+          if (!annotationsLoaded && (0, _platformFeatureFlags.fg)('confluence_frontend_new_dangling_comments_ux')) {
+            (0, _editorCommands.setInlineCommentsFetched)()(editorView.state, editorView.dispatch);
+          }
           return _context2.abrupt("return");
-        case 5:
+        case 7:
           if (editorView.dispatch) {
             (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
           }
-        case 6:
+        case 8:
         case "end":
           return _context2.stop();
       }
@@ -93,6 +97,7 @@ var initialState = function initialState() {
   var featureFlagsPluginState = arguments.length > 1 ? arguments[1] : undefined;
   var isAnnotationManagerEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return {
+    annotationsLoaded: false,
     annotations: {},
     selectedAnnotations: [],
     hoveredAnnotations: [],
@@ -135,8 +140,8 @@ var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
 };
 var onMouseUp = function onMouseUp(state, dispatch) {
   return function (e) {
-    var _ref3 = (0, _utils3.getPluginState)(state) || {},
-      mouseData = _ref3.mouseData;
+    var _ref4 = (0, _utils3.getPluginState)(state) || {},
+      mouseData = _ref4.mouseData;
     if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
       (0, _editorCommands.updateMouseState)({
         isSelecting: false
@@ -244,13 +249,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       return {
         update: function update(view, _prevState) {
           var _prevSelectedAnnotati;
-          var _ref4 = (0, _utils3.getPluginState)(view.state) || {},
-            selectedAnnotations = _ref4.selectedAnnotations,
-            annotations = _ref4.annotations,
-            isDrafting = _ref4.isDrafting,
-            bookmark = _ref4.bookmark;
-          var _ref5 = (0, _utils3.getPluginState)(_prevState) || {},
-            prevSelectedAnnotations = _ref5.selectedAnnotations;
+          var _ref5 = (0, _utils3.getPluginState)(view.state) || {},
+            selectedAnnotations = _ref5.selectedAnnotations,
+            annotations = _ref5.annotations,
+            isDrafting = _ref5.isDrafting,
+            bookmark = _ref5.bookmark;
+          var _ref6 = (0, _utils3.getPluginState)(_prevState) || {},
+            prevSelectedAnnotations = _ref6.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
@@ -272,8 +277,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (isDrafting && !view.state.selection.eq(_prevState.selection) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
             // It is possible that user update selection while having a active draft,
             // so we need to reset the user intent to allow inline text toolbar to be visible
-            api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
-              var tr = _ref6.tr;
+            api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
+              var tr = _ref7.tr;
               if ((0, _toolbar.shouldSuppressFloatingToolbar)({
                 state: view.state,
                 bookmark: bookmark
@@ -294,20 +299,20 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
             // at a time when changing the selection could cause data loss.
             // The following preemptive check is designed to cover these items.
 
-            var _ref7 = (0, _utils3.getPluginState)(view.state) || {},
-              pendingSelectedAnnotations = _ref7.pendingSelectedAnnotations,
-              pendingSelectedAnnotationsUpdateCount = _ref7.pendingSelectedAnnotationsUpdateCount;
-            var _ref8 = (0, _utils3.getPluginState)(_prevState) || {},
-              prevPendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
+            var _ref8 = (0, _utils3.getPluginState)(view.state) || {},
+              pendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
+              pendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
+            var _ref9 = (0, _utils3.getPluginState)(_prevState) || {},
+              prevPendingSelectedAnnotationsUpdateCount = _ref9.pendingSelectedAnnotationsUpdateCount;
             if (!isPreemptiveGateActive && pendingSelectedAnnotationsUpdateCount !== prevPendingSelectedAnnotationsUpdateCount && !!(pendingSelectedAnnotations !== null && pendingSelectedAnnotations !== void 0 && pendingSelectedAnnotations.length)) {
               // Need to set a lock to avoid calling gate multiple times. The lock will be released
               // when the preemptive gate is complete.
               isPreemptiveGateActive = true;
               annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
-                var _ref9 = (0, _utils3.getPluginState)(view.state) || {},
-                  isDrafting = _ref9.isDrafting,
-                  latestPendingSelectedAnnotations = _ref9.pendingSelectedAnnotations,
-                  latestSelectedAnnotations = _ref9.selectedAnnotations;
+                var _ref0 = (0, _utils3.getPluginState)(view.state) || {},
+                  isDrafting = _ref0.isDrafting,
+                  latestPendingSelectedAnnotations = _ref0.pendingSelectedAnnotations,
+                  latestSelectedAnnotations = _ref0.selectedAnnotations;
                 if (canSelectAnnotation) {
                   if (isDrafting) {
                     // The user must have chosen to discard there draft. So before we flush the pending selections
@@ -334,9 +339,9 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                   });
 
                   // Notify the annotation manager that the pending selection has changed.
-                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref0) {
+                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref1) {
                     var _getAnnotationInlineN2;
-                    var id = _ref0.id;
+                    var id = _ref1.id;
                     annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
@@ -360,8 +365,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               });
             }
           }
-          var _ref1 = (0, _utils3.getPluginState)(view.state) || {},
-            dirtyAnnotations = _ref1.dirtyAnnotations;
+          var _ref10 = (0, _utils3.getPluginState)(view.state) || {},
+            dirtyAnnotations = _ref10.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -424,8 +429,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref10 = pluginState || {},
-            annotations = _ref10.annotations;
+          var _ref11 = pluginState || {},
+            annotations = _ref11.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
@@ -453,13 +458,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref11 = (0, _utils3.getPluginState)(state) || {},
-          draftDecorationSet = _ref11.draftDecorationSet,
-          annotations = _ref11.annotations,
-          selectedAnnotations = _ref11.selectedAnnotations,
-          isVisible = _ref11.isVisible,
-          isInlineCommentViewClosed = _ref11.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref11.hoveredAnnotations;
+        var _ref12 = (0, _utils3.getPluginState)(state) || {},
+          draftDecorationSet = _ref12.draftDecorationSet,
+          annotations = _ref12.annotations,
+          selectedAnnotations = _ref12.selectedAnnotations,
+          isVisible = _ref12.isVisible,
+          isInlineCommentViewClosed = _ref12.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref12.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
 

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

@@ -15,8 +15,13 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 _default = exports.default = function _default(pluginState, action) {
   switch (action.type) {
+    case _types.ACTIONS.SET_INLINE_COMMENTS_FETCHED:
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        annotationsLoaded: true
+      });
     case _types.ACTIONS.UPDATE_INLINE_COMMENT_STATE:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
+        annotationsLoaded: true,
         annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data)
       });
     case _types.ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE:

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

@@ -16,5 +16,6 @@ var ACTIONS = exports.ACTIONS = /*#__PURE__*/function (ACTIONS) {
   ACTIONS[ACTIONS["SET_HOVERED_ANNOTATION"] = 8] = "SET_HOVERED_ANNOTATION";
   ACTIONS[ACTIONS["FLUSH_PENDING_SELECTIONS"] = 9] = "FLUSH_PENDING_SELECTIONS";
   ACTIONS[ACTIONS["SET_PENDING_SELECTIONS"] = 10] = "SET_PENDING_SELECTIONS";
+  ACTIONS[ACTIONS["SET_INLINE_COMMENTS_FETCHED"] = 11] = "SET_INLINE_COMMENTS_FETCHED";
   return ACTIONS;
 }({});

package/dist/es2019/editor-commands/index.js

@@ -34,6 +34,9 @@ export const closeComponent = () => createCommand({
 export const clearDirtyMark = () => createCommand({
   type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK
 });
+export const setInlineCommentsFetched = () => createCommand({
+  type: ACTIONS.SET_INLINE_COMMENTS_FETCHED
+});
 export const flushPendingSelections = editorAnalyticsAPI => (canSetAsSelectedAnnotations, errorReason) => {
   const command = {
     type: ACTIONS.FLUSH_PENDING_SELECTIONS,

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

@@ -6,7 +6,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState } from '../editor-commands';
+import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState, setInlineCommentsFetched } from '../editor-commands';
 import { resetUserIntent, setUserIntent } from '../editor-commands/utils';
 import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
@@ -32,6 +32,12 @@ const fetchProviderStates = async (provider, annotationIds) => {
 const fetchState = async (provider, annotationIds, editorView, editorAnalyticsAPI) => {
   const inlineCommentStates = await fetchProviderStates(provider, annotationIds);
   if (Object.keys(inlineCommentStates).length === 0) {
+    const {
+      annotationsLoaded
+    } = getPluginState(editorView.state) || {};
+    if (!annotationsLoaded && fg('confluence_frontend_new_dangling_comments_ux')) {
+      setInlineCommentsFetched()(editorView.state, editorView.dispatch);
+    }
     return;
   }
   if (editorView.dispatch) {
@@ -40,6 +46,7 @@ const fetchState = async (provider, annotationIds, editorView, editorAnalyticsAP
 };
 const initialState = (disallowOnWhitespace = false, featureFlagsPluginState, isAnnotationManagerEnabled = false) => {
   return {
+    annotationsLoaded: false,
     annotations: {},
     selectedAnnotations: [],
     hoveredAnnotations: [],

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

@@ -4,9 +4,15 @@ import { ACTIONS } from './types';
 import { addDraftDecoration, resolveDraftBookmark } from './utils';
 export default ((pluginState, action) => {
   switch (action.type) {
+    case ACTIONS.SET_INLINE_COMMENTS_FETCHED:
+      return {
+        ...pluginState,
+        annotationsLoaded: true
+      };
     case ACTIONS.UPDATE_INLINE_COMMENT_STATE:
       return {
         ...pluginState,
+        annotationsLoaded: true,
         annotations: {
           ...pluginState.annotations,
           ...action.data

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

@@ -10,5 +10,6 @@ export let ACTIONS = /*#__PURE__*/function (ACTIONS) {
   ACTIONS[ACTIONS["SET_HOVERED_ANNOTATION"] = 8] = "SET_HOVERED_ANNOTATION";
   ACTIONS[ACTIONS["FLUSH_PENDING_SELECTIONS"] = 9] = "FLUSH_PENDING_SELECTIONS";
   ACTIONS[ACTIONS["SET_PENDING_SELECTIONS"] = 10] = "SET_PENDING_SELECTIONS";
+  ACTIONS[ACTIONS["SET_INLINE_COMMENTS_FETCHED"] = 11] = "SET_INLINE_COMMENTS_FETCHED";
   return ACTIONS;
 }({});

package/dist/esm/editor-commands/index.js

@@ -47,6 +47,11 @@ export var clearDirtyMark = function clearDirtyMark() {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK
   });
 };
+export var setInlineCommentsFetched = function setInlineCommentsFetched() {
+  return createCommand({
+    type: ACTIONS.SET_INLINE_COMMENTS_FETCHED
+  });
+};
 export var flushPendingSelections = function flushPendingSelections(editorAnalyticsAPI) {
   return function (canSetAsSelectedAnnotations, errorReason) {
     var command = {

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

@@ -9,7 +9,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState } from '../editor-commands';
+import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, flushPendingSelections, updateInlineCommentResolvedState, updateMouseState, setPendingSelectedAnnotation, setInlineCommentDraftState, setInlineCommentsFetched } from '../editor-commands';
 import { resetUserIntent, setUserIntent } from '../editor-commands/utils';
 import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
@@ -54,7 +54,7 @@ var fetchProviderStates = /*#__PURE__*/function () {
 // Requires `editorView` instead of the decomposition as the async means state may end up stale
 var fetchState = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(provider, annotationIds, editorView, editorAnalyticsAPI) {
-    var inlineCommentStates;
+    var inlineCommentStates, _ref3, annotationsLoaded;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -63,15 +63,19 @@ var fetchState = /*#__PURE__*/function () {
         case 2:
           inlineCommentStates = _context2.sent;
           if (!(Object.keys(inlineCommentStates).length === 0)) {
-            _context2.next = 5;
+            _context2.next = 7;
             break;
           }
+          _ref3 = getPluginState(editorView.state) || {}, annotationsLoaded = _ref3.annotationsLoaded;
+          if (!annotationsLoaded && fg('confluence_frontend_new_dangling_comments_ux')) {
+            setInlineCommentsFetched()(editorView.state, editorView.dispatch);
+          }
           return _context2.abrupt("return");
-        case 5:
+        case 7:
           if (editorView.dispatch) {
             updateInlineCommentResolvedState(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
           }
-        case 6:
+        case 8:
         case "end":
           return _context2.stop();
       }
@@ -86,6 +90,7 @@ var initialState = function initialState() {
   var featureFlagsPluginState = arguments.length > 1 ? arguments[1] : undefined;
   var isAnnotationManagerEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return {
+    annotationsLoaded: false,
     annotations: {},
     selectedAnnotations: [],
     hoveredAnnotations: [],
@@ -128,8 +133,8 @@ var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
 };
 var onMouseUp = function onMouseUp(state, dispatch) {
   return function (e) {
-    var _ref3 = getPluginState(state) || {},
-      mouseData = _ref3.mouseData;
+    var _ref4 = getPluginState(state) || {},
+      mouseData = _ref4.mouseData;
     if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
       updateMouseState({
         isSelecting: false
@@ -237,13 +242,13 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       return {
         update: function update(view, _prevState) {
           var _prevSelectedAnnotati;
-          var _ref4 = getPluginState(view.state) || {},
-            selectedAnnotations = _ref4.selectedAnnotations,
-            annotations = _ref4.annotations,
-            isDrafting = _ref4.isDrafting,
-            bookmark = _ref4.bookmark;
-          var _ref5 = getPluginState(_prevState) || {},
-            prevSelectedAnnotations = _ref5.selectedAnnotations;
+          var _ref5 = getPluginState(view.state) || {},
+            selectedAnnotations = _ref5.selectedAnnotations,
+            annotations = _ref5.annotations,
+            isDrafting = _ref5.isDrafting,
+            bookmark = _ref5.bookmark;
+          var _ref6 = getPluginState(_prevState) || {},
+            prevSelectedAnnotations = _ref6.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
@@ -265,8 +270,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           if (isDrafting && !view.state.selection.eq(_prevState.selection) && editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
             // It is possible that user update selection while having a active draft,
             // so we need to reset the user intent to allow inline text toolbar to be visible
-            api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
-              var tr = _ref6.tr;
+            api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
+              var tr = _ref7.tr;
               if (shouldSuppressFloatingToolbar({
                 state: view.state,
                 bookmark: bookmark
@@ -287,20 +292,20 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
             // at a time when changing the selection could cause data loss.
             // The following preemptive check is designed to cover these items.
 
-            var _ref7 = getPluginState(view.state) || {},
-              pendingSelectedAnnotations = _ref7.pendingSelectedAnnotations,
-              pendingSelectedAnnotationsUpdateCount = _ref7.pendingSelectedAnnotationsUpdateCount;
-            var _ref8 = getPluginState(_prevState) || {},
-              prevPendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
+            var _ref8 = getPluginState(view.state) || {},
+              pendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
+              pendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
+            var _ref9 = getPluginState(_prevState) || {},
+              prevPendingSelectedAnnotationsUpdateCount = _ref9.pendingSelectedAnnotationsUpdateCount;
             if (!isPreemptiveGateActive && pendingSelectedAnnotationsUpdateCount !== prevPendingSelectedAnnotationsUpdateCount && !!(pendingSelectedAnnotations !== null && pendingSelectedAnnotations !== void 0 && pendingSelectedAnnotations.length)) {
               // Need to set a lock to avoid calling gate multiple times. The lock will be released
               // when the preemptive gate is complete.
               isPreemptiveGateActive = true;
               annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
-                var _ref9 = getPluginState(view.state) || {},
-                  isDrafting = _ref9.isDrafting,
-                  latestPendingSelectedAnnotations = _ref9.pendingSelectedAnnotations,
-                  latestSelectedAnnotations = _ref9.selectedAnnotations;
+                var _ref0 = getPluginState(view.state) || {},
+                  isDrafting = _ref0.isDrafting,
+                  latestPendingSelectedAnnotations = _ref0.pendingSelectedAnnotations,
+                  latestSelectedAnnotations = _ref0.selectedAnnotations;
                 if (canSelectAnnotation) {
                   if (isDrafting) {
                     // The user must have chosen to discard there draft. So before we flush the pending selections
@@ -327,9 +332,9 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                   });
 
                   // Notify the annotation manager that the pending selection has changed.
-                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref0) {
+                  latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref1) {
                     var _getAnnotationInlineN2;
-                    var id = _ref0.id;
+                    var id = _ref1.id;
                     annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
@@ -353,8 +358,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               });
             }
           }
-          var _ref1 = getPluginState(view.state) || {},
-            dirtyAnnotations = _ref1.dirtyAnnotations;
+          var _ref10 = getPluginState(view.state) || {},
+            dirtyAnnotations = _ref10.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -417,8 +422,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref10 = pluginState || {},
-            annotations = _ref10.annotations;
+          var _ref11 = pluginState || {},
+            annotations = _ref11.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
@@ -446,13 +451,13 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref11 = getPluginState(state) || {},
-          draftDecorationSet = _ref11.draftDecorationSet,
-          annotations = _ref11.annotations,
-          selectedAnnotations = _ref11.selectedAnnotations,
-          isVisible = _ref11.isVisible,
-          isInlineCommentViewClosed = _ref11.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref11.hoveredAnnotations;
+        var _ref12 = getPluginState(state) || {},
+          draftDecorationSet = _ref12.draftDecorationSet,
+          annotations = _ref12.annotations,
+          selectedAnnotations = _ref12.selectedAnnotations,
+          isVisible = _ref12.isVisible,
+          isInlineCommentViewClosed = _ref12.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref12.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
 

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

@@ -8,8 +8,13 @@ import { ACTIONS } from './types';
 import { addDraftDecoration, resolveDraftBookmark } from './utils';
 export default (function (pluginState, action) {
   switch (action.type) {
+    case ACTIONS.SET_INLINE_COMMENTS_FETCHED:
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        annotationsLoaded: true
+      });
     case ACTIONS.UPDATE_INLINE_COMMENT_STATE:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
+        annotationsLoaded: true,
         annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data)
       });
     case ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE:

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

@@ -10,5 +10,6 @@ export var ACTIONS = /*#__PURE__*/function (ACTIONS) {
   ACTIONS[ACTIONS["SET_HOVERED_ANNOTATION"] = 8] = "SET_HOVERED_ANNOTATION";
   ACTIONS[ACTIONS["FLUSH_PENDING_SELECTIONS"] = 9] = "FLUSH_PENDING_SELECTIONS";
   ACTIONS[ACTIONS["SET_PENDING_SELECTIONS"] = 10] = "SET_PENDING_SELECTIONS";
+  ACTIONS[ACTIONS["SET_INLINE_COMMENTS_FETCHED"] = 11] = "SET_INLINE_COMMENTS_FETCHED";
   return ACTIONS;
 }({});

package/dist/types/editor-commands/index.d.ts

@@ -9,6 +9,7 @@ import type { InlineCommentInputMethod, TargetType } from '../types';
 export declare const updateInlineCommentResolvedState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
 export declare const closeComponent: () => Command;
 export declare const clearDirtyMark: () => Command;
+export declare const setInlineCommentsFetched: () => Command;
 export declare const flushPendingSelections: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (canSetAsSelectedAnnotations: boolean, errorReason?: string) => Command;
 export declare const setPendingSelectedAnnotation: (id: string) => Command;
 export declare const removeInlineCommentNearSelection: (id: string, supportedNodes?: string[]) => Command;

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

@@ -17,7 +17,8 @@ export declare enum ACTIONS {
     SET_SELECTED_ANNOTATION = 7,
     SET_HOVERED_ANNOTATION = 8,
     FLUSH_PENDING_SELECTIONS = 9,
-    SET_PENDING_SELECTIONS = 10
+    SET_PENDING_SELECTIONS = 10,
+    SET_INLINE_COMMENTS_FETCHED = 11
 }
 export interface InlineCommentPluginOptions {
     annotationManager?: AnnotationManager;
@@ -93,8 +94,11 @@ export type InlineCommentAction = {
         selectedAnnotations: AnnotationInfo[];
     };
     type: ACTIONS.SET_PENDING_SELECTIONS;
+} | {
+    type: ACTIONS.SET_INLINE_COMMENTS_FETCHED;
 };
 export type InlineCommentPluginState = {
+    annotationsLoaded: boolean;
     /**
      * The resolved state of the annotations.
      *

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

@@ -9,6 +9,7 @@ import type { InlineCommentInputMethod, TargetType } from '../types';
 export declare const updateInlineCommentResolvedState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
 export declare const closeComponent: () => Command;
 export declare const clearDirtyMark: () => Command;
+export declare const setInlineCommentsFetched: () => Command;
 export declare const flushPendingSelections: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (canSetAsSelectedAnnotations: boolean, errorReason?: string) => Command;
 export declare const setPendingSelectedAnnotation: (id: string) => Command;
 export declare const removeInlineCommentNearSelection: (id: string, supportedNodes?: string[]) => Command;

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

@@ -17,7 +17,8 @@ export declare enum ACTIONS {
     SET_SELECTED_ANNOTATION = 7,
     SET_HOVERED_ANNOTATION = 8,
     FLUSH_PENDING_SELECTIONS = 9,
-    SET_PENDING_SELECTIONS = 10
+    SET_PENDING_SELECTIONS = 10,
+    SET_INLINE_COMMENTS_FETCHED = 11
 }
 export interface InlineCommentPluginOptions {
     annotationManager?: AnnotationManager;
@@ -93,8 +94,11 @@ export type InlineCommentAction = {
         selectedAnnotations: AnnotationInfo[];
     };
     type: ACTIONS.SET_PENDING_SELECTIONS;
+} | {
+    type: ACTIONS.SET_INLINE_COMMENTS_FETCHED;
 };
 export type InlineCommentPluginState = {
+    annotationsLoaded: boolean;
     /**
      * The resolved state of the annotations.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "6.0.0",
+	"version": "6.1.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,24 +29,24 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^51.2.0",
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/editor-plugin-analytics": "^6.0.0",
+		"@atlaskit/editor-plugin-analytics": "^6.1.0",
 		"@atlaskit/editor-plugin-connectivity": "^6.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^6.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-toolbar": "^0.9.0",
+		"@atlaskit/editor-toolbar": "^0.10.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/icon": "^28.3.0",
 		"@atlaskit/onboarding": "^14.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^12.31.0",
+		"@atlaskit/tmp-editor-statsig": "^12.32.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.0.0",
+		"@atlaskit/editor-common": "^110.3.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -108,6 +108,9 @@
 		},
 		"confluence_frontend_preload_inline_comment_editor": {
 			"type": "boolean"
+		},
+		"confluence_frontend_new_dangling_comments_ux": {
+			"type": "boolean"
 		}
 	}
 }