@atlaskit/renderer 118.5.1 → 118.6.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/renderer
 
+## 118.6.0
+
+### Minor Changes
+
+- [#158451](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/158451)
+  [`b1235f9180ac5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b1235f9180ac5) -
+  EDITOR-586 - Implement Select Annotation APIs for Renderer and integrate with CCFE
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 118.5.1
 
 ### Patch Changes

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

@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.5.1";
+var packageVersion = "118.6.0";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/cjs/ui/annotations/contexts/AnnotationManagerContext.js

@@ -11,6 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _types = require("@atlaskit/editor-common/types");
+var _RendererActionsContext = require("../../../ui/RendererActionsContext");
 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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -209,6 +210,7 @@ var AnnotationManagerProvider = exports.AnnotationManagerProvider = function Ann
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
+  var actionContext = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   (0, _react.useEffect)(function () {
     var getDraft = function getDraft() {
       var _state$draftActionRes;
@@ -264,50 +266,137 @@ var AnnotationManagerProvider = exports.AnnotationManagerProvider = function Ann
       });
     }
   }, [annotationManager, state.draftId, state.isDrafting, state.draftMarkRef, state.draftActionResult]);
+  (0, _react.useEffect)(function () {
+    var setIsAnnotationSelected = function setIsAnnotationSelected(id, isSelected) {
+      var _state$annotations;
+      if (state.isDrafting) {
+        return {
+          success: false,
+          reason: 'draft-in-progress'
+        };
+      }
+      if (!((_state$annotations = state.annotations) !== null && _state$annotations !== void 0 && _state$annotations[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
 
-  // useEffect(() => {
-  // 	const setIsAnnotationSelected = (id: AnnotationId, isSelected: boolean): SelectAnnotationResult => {
-  // 		if (!state.annotations?.[id]) {
-  // 			return {
-  // 				success: false,
-  // 				reason: 'id-not-valid',
-  // 			};
-  // 		}
-
-  // 		dispatch({
-  // 			type: 'updateAnnotation',
-  // 			data: {
-  // 				id,
-  // 				selected: isSelected,
-  // 			},
-  // 		})
-
-  // 		return {
-  // 			success: true,
-  // 			isSelected,
-  // 		};
-  // 	};
-
-  // 	annotationManager?.hook('setIsAnnotationSelected', setIsAnnotationSelected);
-  // 	return () => {
-  // 		annotationManager?.unhook('setIsAnnotationSelected', setIsAnnotationSelected);
-  // 	};
-  // }, [state.annotations]);
-
-  // useEffect(() => {
-  // 	console.log('annotationsSelectedChanged', state.annotationsSelectedChanged);
-
-  // 	// if (state.isDrafting && state.currentDraftId && state.draftMarkRef) {
-  // 	// 	annotationManager?.emit({
-  // 	// 		name: 'annotationSelectionChanged',
-  // 	// 		data: {
-  // 	// 			annotationId: state.currentDraftId,
-  // 	// 			inlineNodeTypes: [],
-  // 	// 			isSelected: true,
-  // 	// 		},
-  // 	// 	});
-  // 	// }
-  // }, [annotationManager, state.annotationsSelectedChanged]);
+      // the annotation is currently not selected and is being selected
+      if (id !== state.currentSelectedAnnotationId && isSelected) {
+        dispatch({
+          type: 'updateAnnotation',
+          data: {
+            id: id,
+            selected: true
+          }
+        });
+        dispatch({
+          type: 'setSelectedMarkRef',
+          data: {
+            markRef: document.getElementById(id) || undefined
+          }
+        });
+      }
+      // the annotation is currently selected and is being unselected
+      else if (id === state.currentSelectedAnnotationId && !isSelected) {
+        dispatch({
+          type: 'resetSelectedAnnotation'
+        });
+      }
+      return {
+        success: true,
+        isSelected: isSelected
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelected);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('setIsAnnotationSelected', setIsAnnotationSelected);
+    };
+  }, [annotationManager, state.isDrafting, state.annotations, state.currentSelectedAnnotationId, state.currentSelectedMarkRef]);
+  var prevSelectedAnnotationId = (0, _react.useRef)(undefined);
+  (0, _react.useEffect)(function () {
+    if (prevSelectedAnnotationId.current) {
+      annotationManager === null || annotationManager === void 0 || annotationManager.emit({
+        name: 'annotationSelectionChanged',
+        data: {
+          annotationId: prevSelectedAnnotationId.current,
+          isSelected: false,
+          inlineNodeTypes: []
+        }
+      });
+    }
+    prevSelectedAnnotationId.current = state.currentSelectedAnnotationId;
+  }, [state.currentSelectedAnnotationId, annotationManager]);
+  (0, _react.useEffect)(function () {
+    if (state.currentSelectedAnnotationId && state.currentSelectedMarkRef && state.currentSelectedMarkRef.id === state.currentSelectedAnnotationId) {
+      annotationManager === null || annotationManager === void 0 || annotationManager.emit({
+        name: 'annotationSelectionChanged',
+        data: {
+          annotationId: state.currentSelectedAnnotationId,
+          isSelected: true,
+          inlineNodeTypes: []
+        }
+      });
+    }
+  }, [annotationManager, state.currentSelectedAnnotationId, state.currentSelectedMarkRef]);
+  (0, _react.useEffect)(function () {
+    var setIsAnnotationHovered = function setIsAnnotationHovered(id, isHovered) {
+      var _state$annotations2;
+      if (!((_state$annotations2 = state.annotations) !== null && _state$annotations2 !== void 0 && _state$annotations2[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
+      dispatch({
+        type: 'updateAnnotation',
+        data: {
+          id: id,
+          hovered: isHovered
+        }
+      });
+      return {
+        success: true,
+        isHovered: isHovered
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHovered);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('setIsAnnotationHovered', setIsAnnotationHovered);
+    };
+  }, [annotationManager, state.annotations]);
+  (0, _react.useEffect)(function () {
+    var clearAnnotation = function clearAnnotation(id) {
+      var _state$annotations3;
+      if (!((_state$annotations3 = state.annotations) !== null && _state$annotations3 !== void 0 && _state$annotations3[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
+      var result = actionContext.deleteAnnotation(id, _adfSchema.AnnotationTypes.INLINE_COMMENT);
+      if (!result) {
+        return {
+          success: false,
+          reason: 'clear-failed'
+        };
+      }
+      var step = result.step,
+        doc = result.doc;
+      return {
+        success: true,
+        actionResult: {
+          step: step,
+          doc: doc
+        }
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('clearAnnotation', clearAnnotation);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('clearAnnotation', clearAnnotation);
+    };
+  }, [annotationManager, state.annotations, actionContext]);
 
   /**
    * This is a temporary solution to ensure that the annotation manager state is in sync with the
@@ -320,7 +409,7 @@ var AnnotationManagerProvider = exports.AnnotationManagerProvider = function Ann
         return;
       }
       Object.values(payload).forEach(function (annotation) {
-        if (annotation.id && annotation.annotationType === _adfSchema.AnnotationTypes.INLINE_COMMENT && !annotation.state) {
+        if (annotation.id && annotation.annotationType === _adfSchema.AnnotationTypes.INLINE_COMMENT) {
           var _annotation$state;
           dispatch({
             type: 'updateAnnotation',

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

@@ -46,12 +46,17 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
     }
     var eventTarget = props.eventTarget,
       annotationIds = props.annotationIds;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager_select')) {
       if (hasFocus) {
         return;
       }
       annotationManager === null || annotationManager === void 0 || annotationManager.checkPreemptiveGate().then(function (canSelect) {
         if (canSelect) {
+          // if there is a draft, clear it first
+          annotationManager === null || annotationManager === void 0 || annotationManager.clearDraft();
+
+          // use setIsAnnotationSelected won't work here if there is a draft in progress
+          // so we need to use dispatch to update the state directly
           dispatch({
             type: 'updateAnnotation',
             data: {

package/dist/cjs/ui/annotations/hooks/use-events.js

@@ -140,7 +140,7 @@ var useAnnotationClickEvent = exports.useAnnotationClickEvent = function useAnno
     currentSelectedAnnotationId = _useAnnotationManager4.currentSelectedAnnotationId,
     currentSelectedMarkRef = _useAnnotationManager4.currentSelectedMarkRef;
   var selectedAnnotation = (0, _react.useMemo)(function () {
-    return currentSelectedAnnotationId && currentSelectedMarkRef ? {
+    return currentSelectedAnnotationId && currentSelectedMarkRef && currentSelectedMarkRef.id === currentSelectedAnnotationId ? {
       annotations: [{
         id: currentSelectedAnnotationId,
         type: _adfSchema.AnnotationTypes.INLINE_COMMENT

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

@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "118.5.1";
+const packageVersion = "118.6.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/ui/annotations/contexts/AnnotationManagerContext.js

@@ -1,6 +1,7 @@
-import React, { createContext, useContext, useEffect, useMemo, useReducer } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useReducer, useRef } from 'react';
 import { AnnotationMarkStates, AnnotationTypes } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
+import { RendererContext } from '../../../ui/RendererActionsContext';
 const initState = {
   isDrafting: false,
   draftId: undefined,
@@ -205,6 +206,7 @@ export const AnnotationManagerProvider = ({
   updateSubscriber
 }) => {
   const [state, dispatch] = useReducer(reducer, initState);
+  const actionContext = useContext(RendererContext);
   useEffect(() => {
     const getDraft = () => {
       var _state$draftActionRes;
@@ -260,50 +262,139 @@ export const AnnotationManagerProvider = ({
       });
     }
   }, [annotationManager, state.draftId, state.isDrafting, state.draftMarkRef, state.draftActionResult]);
+  useEffect(() => {
+    const setIsAnnotationSelected = (id, isSelected) => {
+      var _state$annotations;
+      if (state.isDrafting) {
+        return {
+          success: false,
+          reason: 'draft-in-progress'
+        };
+      }
+      if (!((_state$annotations = state.annotations) !== null && _state$annotations !== void 0 && _state$annotations[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
 
-  // useEffect(() => {
-  // 	const setIsAnnotationSelected = (id: AnnotationId, isSelected: boolean): SelectAnnotationResult => {
-  // 		if (!state.annotations?.[id]) {
-  // 			return {
-  // 				success: false,
-  // 				reason: 'id-not-valid',
-  // 			};
-  // 		}
-
-  // 		dispatch({
-  // 			type: 'updateAnnotation',
-  // 			data: {
-  // 				id,
-  // 				selected: isSelected,
-  // 			},
-  // 		})
-
-  // 		return {
-  // 			success: true,
-  // 			isSelected,
-  // 		};
-  // 	};
-
-  // 	annotationManager?.hook('setIsAnnotationSelected', setIsAnnotationSelected);
-  // 	return () => {
-  // 		annotationManager?.unhook('setIsAnnotationSelected', setIsAnnotationSelected);
-  // 	};
-  // }, [state.annotations]);
-
-  // useEffect(() => {
-  // 	console.log('annotationsSelectedChanged', state.annotationsSelectedChanged);
-
-  // 	// if (state.isDrafting && state.currentDraftId && state.draftMarkRef) {
-  // 	// 	annotationManager?.emit({
-  // 	// 		name: 'annotationSelectionChanged',
-  // 	// 		data: {
-  // 	// 			annotationId: state.currentDraftId,
-  // 	// 			inlineNodeTypes: [],
-  // 	// 			isSelected: true,
-  // 	// 		},
-  // 	// 	});
-  // 	// }
-  // }, [annotationManager, state.annotationsSelectedChanged]);
+      // the annotation is currently not selected and is being selected
+      if (id !== state.currentSelectedAnnotationId && isSelected) {
+        dispatch({
+          type: 'updateAnnotation',
+          data: {
+            id,
+            selected: true
+          }
+        });
+        dispatch({
+          type: 'setSelectedMarkRef',
+          data: {
+            markRef: document.getElementById(id) || undefined
+          }
+        });
+      }
+      // the annotation is currently selected and is being unselected
+      else if (id === state.currentSelectedAnnotationId && !isSelected) {
+        dispatch({
+          type: 'resetSelectedAnnotation'
+        });
+      }
+      return {
+        success: true,
+        isSelected
+      };
+    };
+    annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelected);
+    return () => {
+      annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.unhook('setIsAnnotationSelected', setIsAnnotationSelected);
+    };
+  }, [annotationManager, state.isDrafting, state.annotations, state.currentSelectedAnnotationId, state.currentSelectedMarkRef]);
+  const prevSelectedAnnotationId = useRef(undefined);
+  useEffect(() => {
+    if (prevSelectedAnnotationId.current) {
+      annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.emit({
+        name: 'annotationSelectionChanged',
+        data: {
+          annotationId: prevSelectedAnnotationId.current,
+          isSelected: false,
+          inlineNodeTypes: []
+        }
+      });
+    }
+    prevSelectedAnnotationId.current = state.currentSelectedAnnotationId;
+  }, [state.currentSelectedAnnotationId, annotationManager]);
+  useEffect(() => {
+    if (state.currentSelectedAnnotationId && state.currentSelectedMarkRef && state.currentSelectedMarkRef.id === state.currentSelectedAnnotationId) {
+      annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.emit({
+        name: 'annotationSelectionChanged',
+        data: {
+          annotationId: state.currentSelectedAnnotationId,
+          isSelected: true,
+          inlineNodeTypes: []
+        }
+      });
+    }
+  }, [annotationManager, state.currentSelectedAnnotationId, state.currentSelectedMarkRef]);
+  useEffect(() => {
+    const setIsAnnotationHovered = (id, isHovered) => {
+      var _state$annotations2;
+      if (!((_state$annotations2 = state.annotations) !== null && _state$annotations2 !== void 0 && _state$annotations2[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
+      dispatch({
+        type: 'updateAnnotation',
+        data: {
+          id,
+          hovered: isHovered
+        }
+      });
+      return {
+        success: true,
+        isHovered
+      };
+    };
+    annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHovered);
+    return () => {
+      annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.unhook('setIsAnnotationHovered', setIsAnnotationHovered);
+    };
+  }, [annotationManager, state.annotations]);
+  useEffect(() => {
+    const clearAnnotation = id => {
+      var _state$annotations3;
+      if (!((_state$annotations3 = state.annotations) !== null && _state$annotations3 !== void 0 && _state$annotations3[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
+      const result = actionContext.deleteAnnotation(id, AnnotationTypes.INLINE_COMMENT);
+      if (!result) {
+        return {
+          success: false,
+          reason: 'clear-failed'
+        };
+      }
+      const {
+        step,
+        doc
+      } = result;
+      return {
+        success: true,
+        actionResult: {
+          step,
+          doc
+        }
+      };
+    };
+    annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.hook('clearAnnotation', clearAnnotation);
+    return () => {
+      annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.unhook('clearAnnotation', clearAnnotation);
+    };
+  }, [annotationManager, state.annotations, actionContext]);
 
   /**
    * This is a temporary solution to ensure that the annotation manager state is in sync with the
@@ -316,7 +407,7 @@ export const AnnotationManagerProvider = ({
         return;
       }
       Object.values(payload).forEach(annotation => {
-        if (annotation.id && annotation.annotationType === AnnotationTypes.INLINE_COMMENT && !annotation.state) {
+        if (annotation.id && annotation.annotationType === AnnotationTypes.INLINE_COMMENT) {
           var _annotation$state;
           dispatch({
             type: 'updateAnnotation',

package/dist/es2019/ui/annotations/element/index.js

@@ -40,12 +40,17 @@ const MarkElement = ({
       eventTarget,
       annotationIds
     } = props;
-    if (fg('platform_editor_comments_api_manager')) {
+    if (fg('platform_editor_comments_api_manager_select')) {
       if (hasFocus) {
         return;
       }
       annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.checkPreemptiveGate().then(canSelect => {
         if (canSelect) {
+          // if there is a draft, clear it first
+          annotationManager === null || annotationManager === void 0 ? void 0 : annotationManager.clearDraft();
+
+          // use setIsAnnotationSelected won't work here if there is a draft in progress
+          // so we need to use dispatch to update the state directly
           dispatch({
             type: 'updateAnnotation',
             data: {

package/dist/es2019/ui/annotations/hooks/use-events.js

@@ -134,7 +134,7 @@ export const useAnnotationClickEvent = props => {
     currentSelectedMarkRef
   } = useAnnotationManagerState();
   const selectedAnnotation = useMemo(() => {
-    return currentSelectedAnnotationId && currentSelectedMarkRef ? {
+    return currentSelectedAnnotationId && currentSelectedMarkRef && currentSelectedMarkRef.id === currentSelectedAnnotationId ? {
       annotations: [{
         id: currentSelectedAnnotationId,
         type: AnnotationTypes.INLINE_COMMENT

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

@@ -53,7 +53,7 @@ import { PortalContext } from './PortalContext';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.5.1";
+var packageVersion = "118.6.0";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/ui/annotations/contexts/AnnotationManagerContext.js

@@ -2,9 +2,10 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(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; }
-import React, { createContext, useContext, useEffect, useMemo, useReducer } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useReducer, useRef } from 'react';
 import { AnnotationMarkStates, AnnotationTypes } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
+import { RendererContext } from '../../../ui/RendererActionsContext';
 var initState = {
   isDrafting: false,
   draftId: undefined,
@@ -199,6 +200,7 @@ export var AnnotationManagerProvider = function AnnotationManagerProvider(_ref)
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
+  var actionContext = useContext(RendererContext);
   useEffect(function () {
     var getDraft = function getDraft() {
       var _state$draftActionRes;
@@ -254,50 +256,137 @@ export var AnnotationManagerProvider = function AnnotationManagerProvider(_ref)
       });
     }
   }, [annotationManager, state.draftId, state.isDrafting, state.draftMarkRef, state.draftActionResult]);
+  useEffect(function () {
+    var setIsAnnotationSelected = function setIsAnnotationSelected(id, isSelected) {
+      var _state$annotations;
+      if (state.isDrafting) {
+        return {
+          success: false,
+          reason: 'draft-in-progress'
+        };
+      }
+      if (!((_state$annotations = state.annotations) !== null && _state$annotations !== void 0 && _state$annotations[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
 
-  // useEffect(() => {
-  // 	const setIsAnnotationSelected = (id: AnnotationId, isSelected: boolean): SelectAnnotationResult => {
-  // 		if (!state.annotations?.[id]) {
-  // 			return {
-  // 				success: false,
-  // 				reason: 'id-not-valid',
-  // 			};
-  // 		}
-
-  // 		dispatch({
-  // 			type: 'updateAnnotation',
-  // 			data: {
-  // 				id,
-  // 				selected: isSelected,
-  // 			},
-  // 		})
-
-  // 		return {
-  // 			success: true,
-  // 			isSelected,
-  // 		};
-  // 	};
-
-  // 	annotationManager?.hook('setIsAnnotationSelected', setIsAnnotationSelected);
-  // 	return () => {
-  // 		annotationManager?.unhook('setIsAnnotationSelected', setIsAnnotationSelected);
-  // 	};
-  // }, [state.annotations]);
-
-  // useEffect(() => {
-  // 	console.log('annotationsSelectedChanged', state.annotationsSelectedChanged);
-
-  // 	// if (state.isDrafting && state.currentDraftId && state.draftMarkRef) {
-  // 	// 	annotationManager?.emit({
-  // 	// 		name: 'annotationSelectionChanged',
-  // 	// 		data: {
-  // 	// 			annotationId: state.currentDraftId,
-  // 	// 			inlineNodeTypes: [],
-  // 	// 			isSelected: true,
-  // 	// 		},
-  // 	// 	});
-  // 	// }
-  // }, [annotationManager, state.annotationsSelectedChanged]);
+      // the annotation is currently not selected and is being selected
+      if (id !== state.currentSelectedAnnotationId && isSelected) {
+        dispatch({
+          type: 'updateAnnotation',
+          data: {
+            id: id,
+            selected: true
+          }
+        });
+        dispatch({
+          type: 'setSelectedMarkRef',
+          data: {
+            markRef: document.getElementById(id) || undefined
+          }
+        });
+      }
+      // the annotation is currently selected and is being unselected
+      else if (id === state.currentSelectedAnnotationId && !isSelected) {
+        dispatch({
+          type: 'resetSelectedAnnotation'
+        });
+      }
+      return {
+        success: true,
+        isSelected: isSelected
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelected);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('setIsAnnotationSelected', setIsAnnotationSelected);
+    };
+  }, [annotationManager, state.isDrafting, state.annotations, state.currentSelectedAnnotationId, state.currentSelectedMarkRef]);
+  var prevSelectedAnnotationId = useRef(undefined);
+  useEffect(function () {
+    if (prevSelectedAnnotationId.current) {
+      annotationManager === null || annotationManager === void 0 || annotationManager.emit({
+        name: 'annotationSelectionChanged',
+        data: {
+          annotationId: prevSelectedAnnotationId.current,
+          isSelected: false,
+          inlineNodeTypes: []
+        }
+      });
+    }
+    prevSelectedAnnotationId.current = state.currentSelectedAnnotationId;
+  }, [state.currentSelectedAnnotationId, annotationManager]);
+  useEffect(function () {
+    if (state.currentSelectedAnnotationId && state.currentSelectedMarkRef && state.currentSelectedMarkRef.id === state.currentSelectedAnnotationId) {
+      annotationManager === null || annotationManager === void 0 || annotationManager.emit({
+        name: 'annotationSelectionChanged',
+        data: {
+          annotationId: state.currentSelectedAnnotationId,
+          isSelected: true,
+          inlineNodeTypes: []
+        }
+      });
+    }
+  }, [annotationManager, state.currentSelectedAnnotationId, state.currentSelectedMarkRef]);
+  useEffect(function () {
+    var setIsAnnotationHovered = function setIsAnnotationHovered(id, isHovered) {
+      var _state$annotations2;
+      if (!((_state$annotations2 = state.annotations) !== null && _state$annotations2 !== void 0 && _state$annotations2[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
+      dispatch({
+        type: 'updateAnnotation',
+        data: {
+          id: id,
+          hovered: isHovered
+        }
+      });
+      return {
+        success: true,
+        isHovered: isHovered
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHovered);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('setIsAnnotationHovered', setIsAnnotationHovered);
+    };
+  }, [annotationManager, state.annotations]);
+  useEffect(function () {
+    var clearAnnotation = function clearAnnotation(id) {
+      var _state$annotations3;
+      if (!((_state$annotations3 = state.annotations) !== null && _state$annotations3 !== void 0 && _state$annotations3[id])) {
+        return {
+          success: false,
+          reason: 'id-not-valid'
+        };
+      }
+      var result = actionContext.deleteAnnotation(id, AnnotationTypes.INLINE_COMMENT);
+      if (!result) {
+        return {
+          success: false,
+          reason: 'clear-failed'
+        };
+      }
+      var step = result.step,
+        doc = result.doc;
+      return {
+        success: true,
+        actionResult: {
+          step: step,
+          doc: doc
+        }
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('clearAnnotation', clearAnnotation);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('clearAnnotation', clearAnnotation);
+    };
+  }, [annotationManager, state.annotations, actionContext]);
 
   /**
    * This is a temporary solution to ensure that the annotation manager state is in sync with the
@@ -310,7 +399,7 @@ export var AnnotationManagerProvider = function AnnotationManagerProvider(_ref)
         return;
       }
       Object.values(payload).forEach(function (annotation) {
-        if (annotation.id && annotation.annotationType === AnnotationTypes.INLINE_COMMENT && !annotation.state) {
+        if (annotation.id && annotation.annotationType === AnnotationTypes.INLINE_COMMENT) {
           var _annotation$state;
           dispatch({
             type: 'updateAnnotation',

package/dist/esm/ui/annotations/element/index.js

@@ -37,12 +37,17 @@ var MarkElement = function MarkElement(_ref) {
     }
     var eventTarget = props.eventTarget,
       annotationIds = props.annotationIds;
-    if (fg('platform_editor_comments_api_manager')) {
+    if (fg('platform_editor_comments_api_manager_select')) {
       if (hasFocus) {
         return;
       }
       annotationManager === null || annotationManager === void 0 || annotationManager.checkPreemptiveGate().then(function (canSelect) {
         if (canSelect) {
+          // if there is a draft, clear it first
+          annotationManager === null || annotationManager === void 0 || annotationManager.clearDraft();
+
+          // use setIsAnnotationSelected won't work here if there is a draft in progress
+          // so we need to use dispatch to update the state directly
           dispatch({
             type: 'updateAnnotation',
             data: {

package/dist/esm/ui/annotations/hooks/use-events.js

@@ -133,7 +133,7 @@ export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
     currentSelectedAnnotationId = _useAnnotationManager4.currentSelectedAnnotationId,
     currentSelectedMarkRef = _useAnnotationManager4.currentSelectedMarkRef;
   var selectedAnnotation = useMemo(function () {
-    return currentSelectedAnnotationId && currentSelectedMarkRef ? {
+    return currentSelectedAnnotationId && currentSelectedMarkRef && currentSelectedMarkRef.id === currentSelectedAnnotationId ? {
       annotations: [{
         id: currentSelectedAnnotationId,
         type: AnnotationTypes.INLINE_COMMENT

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

@@ -4,6 +4,7 @@ import type { AnnotationActionResult, AnnotationByMatches } from '@atlaskit/edit
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { Mark, Node, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
+import { RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import type { AnalyticsEventPayload } from '../analytics/events';
 type ActionResult = {
     step: Step;
@@ -48,7 +49,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     _privateValidatePositionsForAnnotation(from: number, to: number): boolean;
     _privateWhyCannotApplyAnnotationOnRange: (pos: Position, doc: Node, schema: Schema) => string;
     deleteAnnotation(annotationId: string, annotationType: 'inlineComment'): false | {
-        step: Step;
+        step: RemoveNodeMarkStep | RemoveMarkStep;
         doc: JSONDocNode;
     };
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;

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

@@ -4,6 +4,7 @@ import type { AnnotationActionResult, AnnotationByMatches } from '@atlaskit/edit
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { Mark, Node, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
+import { RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import type { AnalyticsEventPayload } from '../analytics/events';
 type ActionResult = {
     step: Step;
@@ -48,7 +49,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     _privateValidatePositionsForAnnotation(from: number, to: number): boolean;
     _privateWhyCannotApplyAnnotationOnRange: (pos: Position, doc: Node, schema: Schema) => string;
     deleteAnnotation(annotationId: string, annotationType: 'inlineComment'): false | {
-        step: Step;
+        step: RemoveNodeMarkStep | RemoveMarkStep;
         doc: JSONDocNode;
     };
     annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "118.5.1",
+	"version": "118.6.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"