@atlaskit/renderer 115.0.3 → 115.0.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/renderer
 
+## 115.0.4
+
+### Patch Changes
+
+- [#142925](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/142925)
+  [`e013698350bef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e013698350bef) -
+  This updates the renderer to use the new annotation manager create comment APIs and disables the
+  use of the old create hooks. This should be backward compatible and can be controled by a FG
+- Updated dependencies
+
 ## 115.0.3
 
 ### Patch Changes

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

@@ -60,7 +60,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 = "115.0.3";
+var packageVersion = "115.0.4";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -0,0 +1,421 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useAnnotationManagerState = exports.useAnnotationManagerDispatch = exports.AnnotationManagerProvider = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
+var _adfSchema = require("@atlaskit/adf-schema");
+var _types = require("@atlaskit/editor-common/types");
+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; }
+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 initState = {
+  isDrafting: false,
+  draftId: undefined,
+  draftMarkRef: undefined,
+  draftActionResult: undefined,
+  annotations: {},
+  currentSelectedAnnotationId: undefined,
+  currentSelectedMarkRef: undefined,
+  currentHoveredAnnotationId: undefined
+};
+var AnnotationManagerStateContext = /*#__PURE__*/(0, _react.createContext)(initState);
+var AnnotationManagerDispatchContext = /*#__PURE__*/(0, _react.createContext)({
+  annotationManager: undefined,
+  dispatch: function dispatch() {}
+});
+function reducer(state, action) {
+  switch (action.type) {
+    case 'reset':
+      {
+        return _objectSpread(_objectSpread({}, state), initState);
+      }
+    case 'loadAnnotation':
+      {
+        var currentIds = Object.keys(state.annotations);
+        var uids = Array.from(new Set(currentIds.concat(action.data.map(function (a) {
+          return a.id;
+        }))));
+        var updates = [];
+        var _loop = function _loop() {
+            var _state$annotations$id, _state$annotations$id2;
+            var id = _uids[_i];
+            var loadedAnnotation = action.data.find(function (a) {
+              return a.id === id;
+            });
+            if (!loadedAnnotation && ((_state$annotations$id = state.annotations[id]) === null || _state$annotations$id === void 0 ? void 0 : _state$annotations$id.markState) === _adfSchema.AnnotationMarkStates.ACTIVE) {
+              // If the annotation is not in the loaded data, we need to remove it from the state. However,
+              // rather then removing it, we will set the mark state to resolved. This is to align it better with
+              // how the editor works.
+              updates.push({
+                id: id,
+                markState: _adfSchema.AnnotationMarkStates.RESOLVED
+              });
+              return 0; // continue
+            }
+            if (!!(loadedAnnotation !== null && loadedAnnotation !== void 0 && loadedAnnotation.markState) && ((_state$annotations$id2 = state.annotations[id]) === null || _state$annotations$id2 === void 0 ? void 0 : _state$annotations$id2.markState) !== loadedAnnotation.markState) {
+              updates.push({
+                id: id,
+                markState: loadedAnnotation.markState
+              });
+              return 0; // continue
+            }
+          },
+          _ret;
+        for (var _i = 0, _uids = uids; _i < _uids.length; _i++) {
+          _ret = _loop();
+          if (_ret === 0) continue;
+        }
+        if (updates.length > 0) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            annotations: updates.reduce(function (nextAnnotations, update) {
+              return _objectSpread(_objectSpread({}, nextAnnotations), {}, (0, _defineProperty2.default)({}, update.id, _objectSpread(_objectSpread({}, nextAnnotations[update.id]), update)));
+            }, state.annotations)
+          });
+        }
+        return state;
+      }
+    case 'updateAnnotation':
+      {
+        var current = state.annotations[action.data.id];
+        var _action$data = action.data,
+          id = _action$data.id,
+          selected = _action$data.selected,
+          hovered = _action$data.hovered,
+          _action$data$markStat = _action$data.markState,
+          markState = _action$data$markStat === void 0 ? current === null || current === void 0 ? void 0 : current.markState : _action$data$markStat;
+        var _updates = [];
+
+        // If the annotation is not currently in the state, we need to add it to the state.
+        if (!current) {
+          _updates.push({
+            id: id,
+            markState: markState !== null && markState !== void 0 ? markState : _adfSchema.AnnotationMarkStates.ACTIVE
+          });
+        }
+
+        // The goal of the following is to enforce a single selection and a single hover state across all annotations.
+        var nextSelectedId = state.currentSelectedAnnotationId;
+        if (selected && nextSelectedId !== id) {
+          nextSelectedId = id;
+        }
+        // If the annotation is currently selected and it's being unselected, we need to remove it from the
+        // current selected annotation id.
+        if (selected === false && nextSelectedId === id) {
+          nextSelectedId = undefined;
+        }
+        var nextHoveredId = state.currentHoveredAnnotationId;
+        if (hovered && nextHoveredId !== id) {
+          nextHoveredId = id;
+        }
+        // If the annotation is currently hovered and it's being unhovered, we need to remove it from the
+        // current hovered annotation id.
+        if (hovered === false && nextHoveredId === id) {
+          nextHoveredId = undefined;
+        }
+
+        // If the annotations mark state is not the same as the current mark state, we need to update it.
+        if ((current === null || current === void 0 ? void 0 : current.markState) !== markState) {
+          _updates.push({
+            id: id,
+            markState: markState !== null && markState !== void 0 ? markState : _adfSchema.AnnotationMarkStates.ACTIVE
+          });
+
+          // If the annotation is currently selected and it's being resolved, then we need to remove it from the
+          // current selected annotation id also.
+          if (markState === _adfSchema.AnnotationMarkStates.RESOLVED && nextSelectedId === id) {
+            nextSelectedId = undefined;
+          }
+        }
+        if (_updates.length > 0 || nextSelectedId !== state.currentSelectedAnnotationId || nextHoveredId !== state.currentHoveredAnnotationId) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            currentSelectedAnnotationId: nextSelectedId,
+            currentHoveredAnnotationId: nextHoveredId,
+            annotations: _updates.reduce(function (nextAnnotations, update) {
+              return _objectSpread(_objectSpread({}, nextAnnotations), {}, (0, _defineProperty2.default)({}, update.id, _objectSpread(_objectSpread({}, nextAnnotations[update.id]), update)));
+            }, state.annotations)
+          });
+        }
+        return state;
+      }
+    case 'resetSelectedAnnotation':
+      {
+        if (state.currentSelectedAnnotationId !== undefined) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            currentSelectedAnnotationId: undefined,
+            currentSelectedMarkRef: undefined
+          });
+        }
+        return state;
+      }
+    case 'resetHoveredAnnotation':
+      {
+        if (state.currentHoveredAnnotationId !== undefined) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            currentHoveredAnnotationId: undefined
+          });
+        }
+        return state;
+      }
+    case 'setDrafting':
+      {
+        if (state.isDrafting !== action.data.isDrafting || state.draftId !== action.data.draftId || state.draftActionResult !== action.data.draftActionResult) {
+          // XXX: When a draft is open the current selected annotation should no longer be selected. We need
+          // to decide what is better UX,
+          // 1 - do we want to deselct the selected annotation on draft open, if so then when draft is closed the s
+          // selected annotation will not come back
+          // 2 - do we want to still allow the selected annotation to be selected when draft is open, however the underlying
+          // mark style just shows the annotation as not selected when a draft is active. Then when a draft closes
+          // we can reopen the previous selected annotation.
+          return _objectSpread(_objectSpread({}, state), {}, {
+            isDrafting: action.data.isDrafting,
+            draftId: action.data.draftId,
+            draftActionResult: action.data.draftActionResult
+          });
+        }
+        return state;
+      }
+    case 'setDraftMarkRef':
+      {
+        if (state.draftMarkRef !== action.data.draftMarkRef) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            draftMarkRef: action.data.draftMarkRef
+          });
+        }
+        return state;
+      }
+    case 'setSelectedMarkRef':
+      {
+        if (state.currentSelectedMarkRef !== action.data.markRef) {
+          return _objectSpread(_objectSpread({}, state), {}, {
+            currentSelectedMarkRef: action.data.markRef
+          });
+        }
+        return state;
+      }
+  }
+}
+var AnnotationManagerProvider = exports.AnnotationManagerProvider = function AnnotationManagerProvider(_ref) {
+  var children = _ref.children,
+    annotationManager = _ref.annotationManager,
+    updateSubscriber = _ref.updateSubscriber;
+  var _useReducer = (0, _react.useReducer)(reducer, initState),
+    _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
+    state = _useReducer2[0],
+    dispatch = _useReducer2[1];
+  (0, _react.useEffect)(function () {
+    var getDraft = function getDraft() {
+      var _state$draftActionRes;
+      if (!state.isDrafting || !state.draftActionResult || !state.draftMarkRef || !state.draftId) {
+        return {
+          success: false,
+          reason: 'draft-not-started'
+        };
+      }
+      return {
+        success: true,
+        inlineNodeTypes: (_state$draftActionRes = state.draftActionResult.inlineNodeTypes) !== null && _state$draftActionRes !== void 0 ? _state$draftActionRes : [],
+        targetElement: state.draftMarkRef,
+        actionResult: {
+          step: state.draftActionResult.step,
+          doc: state.draftActionResult.doc,
+          inlineNodeTypes: state.draftActionResult.inlineNodeTypes,
+          targetNodeType: state.draftActionResult.targetNodeType,
+          originalSelection: state.draftActionResult.originalSelection,
+          numMatches: state.draftActionResult.numMatches,
+          matchIndex: state.draftActionResult.matchIndex,
+          pos: state.draftActionResult.pos
+        }
+      };
+    };
+    annotationManager === null || annotationManager === void 0 || annotationManager.hook('getDraft', getDraft);
+    return function () {
+      annotationManager === null || annotationManager === void 0 || annotationManager.unhook('getDraft', getDraft);
+    };
+  }, [annotationManager, state.draftId, state.isDrafting, state.draftMarkRef, state.draftActionResult]);
+
+  // We need to watch for the draft mark element to exist, so we can inform any listeners that the draft has been started
+  // and give them a reference to the element
+  (0, _react.useEffect)(function () {
+    if (state.isDrafting && state.draftId && state.draftMarkRef && state.draftActionResult) {
+      var _state$draftActionRes2;
+      annotationManager === null || annotationManager === void 0 || annotationManager.emit({
+        name: 'draftAnnotationStarted',
+        data: {
+          inlineNodeTypes: (_state$draftActionRes2 = state.draftActionResult.inlineNodeTypes) !== null && _state$draftActionRes2 !== void 0 ? _state$draftActionRes2 : [],
+          targetElement: state.draftMarkRef,
+          actionResult: {
+            step: state.draftActionResult.step,
+            doc: state.draftActionResult.doc,
+            inlineNodeTypes: state.draftActionResult.inlineNodeTypes,
+            targetNodeType: state.draftActionResult.targetNodeType,
+            originalSelection: state.draftActionResult.originalSelection,
+            numMatches: state.draftActionResult.numMatches,
+            matchIndex: state.draftActionResult.matchIndex,
+            pos: state.draftActionResult.pos
+          }
+        }
+      });
+    }
+  }, [annotationManager, state.draftId, state.isDrafting, state.draftMarkRef, state.draftActionResult]);
+
+  // 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]);
+
+  /**
+   * This is a temporary solution to ensure that the annotation manager state is in sync with the
+   * old updateSubscriber. The updateSubscriber will eventually be deprecated and the state will be managed
+   * by the annotation manager itself.
+   */
+  (0, _react.useEffect)(function () {
+    var onSetAnnotationState = function onSetAnnotationState(payload) {
+      if (!payload) {
+        return;
+      }
+      Object.values(payload).forEach(function (annotation) {
+        if (annotation.id && annotation.annotationType === _adfSchema.AnnotationTypes.INLINE_COMMENT && !annotation.state) {
+          var _annotation$state;
+          dispatch({
+            type: 'updateAnnotation',
+            data: {
+              id: annotation.id,
+              markState: (_annotation$state = annotation.state) !== null && _annotation$state !== void 0 ? _annotation$state : undefined
+            }
+          });
+        }
+      });
+    };
+    var onAnnotationSelected = function onAnnotationSelected(payload) {
+      dispatch({
+        type: 'updateAnnotation',
+        data: {
+          id: payload.annotationId,
+          selected: true
+        }
+      });
+    };
+    var onAnnotationHovered = function onAnnotationHovered(payload) {
+      dispatch({
+        type: 'updateAnnotation',
+        data: {
+          id: payload.annotationId,
+          hovered: true
+        }
+      });
+    };
+    var onAnnotationSelectedRemoved = function onAnnotationSelectedRemoved() {
+      dispatch({
+        type: 'resetSelectedAnnotation'
+      });
+    };
+    var onAnnotationHoveredRemoved = function onAnnotationHoveredRemoved() {
+      dispatch({
+        type: 'resetHoveredAnnotation'
+      });
+    };
+    var onAnnotationClick = function onAnnotationClick(_ref2) {
+      var annotationIds = _ref2.annotationIds,
+        eventTarget = _ref2.eventTarget,
+        eventTargetType = _ref2.eventTargetType,
+        viewMethod = _ref2.viewMethod;
+      dispatch({
+        type: 'updateAnnotation',
+        data: {
+          id: annotationIds[0],
+          selected: true
+        }
+      });
+      dispatch({
+        type: 'setSelectedMarkRef',
+        data: {
+          markRef: eventTarget
+        }
+      });
+    };
+    var onAnnotationDeselect = function onAnnotationDeselect() {
+      dispatch({
+        type: 'resetSelectedAnnotation'
+      });
+    };
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, onSetAnnotationState);
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, onAnnotationSelected);
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_HOVERED, onAnnotationHovered);
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, onAnnotationSelectedRemoved);
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_HOVERED, onAnnotationHoveredRemoved);
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, onAnnotationClick);
+    updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.on(_types.AnnotationUpdateEvent.DESELECT_ANNOTATIONS, onAnnotationDeselect);
+    return function () {
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, onSetAnnotationState);
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, onAnnotationSelected);
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.SET_ANNOTATION_HOVERED, onAnnotationHovered);
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_FOCUS, onAnnotationSelectedRemoved);
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.REMOVE_ANNOTATION_HOVERED, onAnnotationHoveredRemoved);
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, onAnnotationClick);
+      updateSubscriber === null || updateSubscriber === void 0 || updateSubscriber.off(_types.AnnotationUpdateEvent.DESELECT_ANNOTATIONS, onAnnotationDeselect);
+    };
+  }, [updateSubscriber]);
+  var dispatchData = (0, _react.useMemo)(function () {
+    return {
+      annotationManager: annotationManager,
+      dispatch: dispatch
+    };
+  }, [annotationManager, dispatch]);
+  return /*#__PURE__*/_react.default.createElement(AnnotationManagerStateContext.Provider, {
+    value: state
+  }, /*#__PURE__*/_react.default.createElement(AnnotationManagerDispatchContext.Provider, {
+    value: dispatchData
+  }, children));
+};
+var useAnnotationManagerState = exports.useAnnotationManagerState = function useAnnotationManagerState() {
+  return (0, _react.useContext)(AnnotationManagerStateContext);
+};
+var useAnnotationManagerDispatch = exports.useAnnotationManagerDispatch = function useAnnotationManagerDispatch() {
+  return (0, _react.useContext)(AnnotationManagerDispatchContext);
+};

package/dist/cjs/ui/annotations/draft/component.js

@@ -16,6 +16,7 @@ var _position = require("./position");
 var _dom = require("./dom");
 var _segmentText = require("../../../react/utils/segment-text");
 var _renderTextSegments = require("../../../react/utils/render-text-segments");
+var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
 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; }
 /**
@@ -48,12 +49,23 @@ var markStyles = (0, _react2.css)({
 var AnnotationDraft = exports.AnnotationDraft = function AnnotationDraft(_ref) {
   var draftPosition = _ref.draftPosition,
     children = _ref.children;
+  var _useAnnotationManager = (0, _AnnotationManagerContext.useAnnotationManagerDispatch)(),
+    dispatch = _useAnnotationManager.dispatch;
+  var markRef = (0, _react.useCallback)(function (node) {
+    dispatch({
+      type: 'setDraftMarkRef',
+      data: {
+        draftMarkRef: node !== null && node !== void 0 ? node : undefined
+      }
+    });
+  }, [dispatch]);
   return (0, _react2.jsx)("mark", (0, _extends2.default)({
     "data-renderer-mark": true
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, (0, _dom.dataAttributes)(draftPosition), {
-    css: markStyles
+    css: markStyles,
+    ref: markRef
   }), children);
 };
 var getAnnotationIndex = exports.getAnnotationIndex = function getAnnotationIndex(annotationPosition, fragmentCount) {

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

@@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.MarkElement = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _types = require("@atlaskit/editor-common/types");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _mark = require("./mark");
 var _useInlineCommentsFilter = require("../hooks/use-inline-comments-filter");
 var _useInlineCommentSubscriber = require("../hooks/use-inline-comment-subscriber");
 var _useEvents = require("../hooks/use-events");
 var _context = require("../context");
-var _types = require("@atlaskit/editor-common/types");
+var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
 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 MarkElement = exports.MarkElement = function MarkElement(_ref) {
@@ -32,6 +34,9 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
   var dataAttributesMemorized = (0, _react.useMemo)(function () {
     return dataAttributes;
   }, [dataAttributes]);
+  var _useAnnotationManager = (0, _AnnotationManagerContext.useAnnotationManagerDispatch)(),
+    dispatch = _useAnnotationManager.dispatch,
+    annotationManager = _useAnnotationManager.annotationManager;
   var onClick = (0, _react.useCallback)(function (props) {
     if (!updateSubscriber) {
       return;
@@ -41,11 +46,38 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
     }
     var eventTarget = props.eventTarget,
       annotationIds = props.annotationIds;
-    updateSubscriber.emit(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
-      annotationIds: annotationIds,
-      eventTarget: eventTarget
-    });
-  }, [updateSubscriber, useBlockLevel]);
+    if ((0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
+      if (hasFocus) {
+        return;
+      }
+      annotationManager === null || annotationManager === void 0 || annotationManager.checkPreemptiveGate().then(function (canSelect) {
+        if (canSelect) {
+          dispatch({
+            type: 'updateAnnotation',
+            data: {
+              id: annotationIds[0],
+              selected: true
+            }
+          });
+          dispatch({
+            type: 'setSelectedMarkRef',
+            data: {
+              markRef: eventTarget
+            }
+          });
+        } else {
+          // TODO: EDITOR-595 - If the preemptive gate returns false, should we track the analytics event?
+        }
+      }).catch(function (error) {
+        // TODO: EDITOR-595 - An error occurred while checking the preemptive gate. We should report this error.
+      });
+    } else {
+      updateSubscriber.emit(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
+        annotationIds: annotationIds,
+        eventTarget: eventTarget
+      });
+    }
+  }, [updateSubscriber, useBlockLevel, dispatch, annotationManager, hasFocus]);
   var activeParentIds = (0, _useInlineCommentsFilter.useInlineCommentsFilter)({
     annotationIds: annotationParentIds,
     filter: {

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

@@ -13,6 +13,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("../../../messages");
+var _AnnotationManagerContext = require("../contexts/AnnotationManagerContext");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /**
  * @jsxRuntime classic
@@ -126,6 +127,20 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
   var annotationIds = (0, _react.useMemo)(function () {
     return (0, _toConsumableArray2.default)(new Set([].concat((0, _toConsumableArray2.default)(annotationParentIds), [id])));
   }, [id, annotationParentIds]);
+  var _useAnnotationManager = (0, _AnnotationManagerContext.useAnnotationManagerDispatch)(),
+    dispatch = _useAnnotationManager.dispatch;
+  var _useAnnotationManager2 = (0, _AnnotationManagerContext.useAnnotationManagerState)(),
+    currentSelectedAnnotationId = _useAnnotationManager2.currentSelectedAnnotationId;
+  var markRef = (0, _react.useCallback)(function (node) {
+    if (id === currentSelectedAnnotationId && node) {
+      dispatch({
+        type: 'setSelectedMarkRef',
+        data: {
+          markRef: node
+        }
+      });
+    }
+  }, [dispatch, id, currentSelectedAnnotationId]);
   var onMarkClick = (0, _react.useCallback)(function (event) {
     // prevent inline mark logic for media block marks
     if (event.currentTarget instanceof HTMLElement && event.currentTarget.getAttribute('data-block-mark')) {
@@ -184,6 +199,7 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
     'aria-details': annotationIds.join(', ')
   }, desktopAccessibilityAttributes);
   return (0, _react2.jsx)(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)({
+    ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id: id
   }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
     css: [markStyles, (0, _platformFeatureFlags.fg)('platform_renderer_nested_annotation_styling') && markStylesLayeringFix, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && markStylesWithInlineComments, (0, _platformFeatureFlags.fg)('confluence-frontend-comments-panel') && markStylesWithCommentsPanel, !isMobile() && accessibilityStyles, markStylesWithUpdatedShadow],