@atlaskit/renderer 111.0.1 → 111.0.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/renderer
 
+## 111.0.2
+
+### Patch Changes
+
+- [#147547](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147547)
+  [`46defc30fb9dd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/46defc30fb9dd) -
+  Cleanup of a FF for comments on media bug fix
+- Updated dependencies
+
 ## 111.0.1
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -281,7 +281,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     }
   }, {
     key: "applyAnnotation",
-    value: function applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled) {
+    value: function applyAnnotation(pos, annotation) {
       if (!this.doc || !pos || !this.schema) {
         return false;
       }
@@ -291,13 +291,10 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         annotationType = annotation.annotationType;
       var step;
       var targetNodeType;
-      var beforeNodePos = isCommentsOnMediaBugFixEnabled ?
+
       // As part of fix for RAP, `from` points to the position right before media node
       // hence, -1 is not needed
-      from :
-      // If from points to a node position,
-      // we need to 1 position before it for nodeAt to return the node itself
-      Math.max(from - 1, 0);
+      var beforeNodePos = from;
       var possibleNode = this.doc.nodeAt(beforeNodePos);
       if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
         targetNodeType = 'media';
@@ -340,7 +337,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         numMatches: numMatches,
         matchIndex: matchIndex,
         pos: blockNodePos
-      }, isCommentsOnMediaBugFixEnabled && {
+      }, {
         targetNodeType: targetNodeType
       });
     }

package/dist/cjs/react/nodes/media/index.js

@@ -407,8 +407,6 @@ var Media = /*#__PURE__*/function (_PureComponent) {
 }(_react.PureComponent);
 var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
   var draftPosition = _react.default.useContext(_context.AnnotationsDraftContext);
-  var providers = (0, _react.useContext)(_context.ProvidersContext);
-  var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var dataAttributes = props.dataAttributes;
   var pos = dataAttributes && dataAttributes['data-renderer-start-pos'];
   var _useState9 = (0, _react.useState)(),
@@ -424,7 +422,7 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
     if (pos === undefined) {
       return;
     }
-    var posToCheck = isCommentsOnMediaBugFixEnabled ? ((_draftPosition$from = draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) !== null && _draftPosition$from !== void 0 ? _draftPosition$from : 0) + 1 : draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from;
+    var posToCheck = ((_draftPosition$from = draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) !== null && _draftPosition$from !== void 0 ? _draftPosition$from : 0) + 1;
     if (draftPosition !== null && posToCheck === pos) {
       setShouldApplyDraftAnnotation(true);
       setPosition(posToCheck);
@@ -432,7 +430,7 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);
     }
-  }, [draftPosition, pos, shouldApplyDraftAnnotation, isCommentsOnMediaBugFixEnabled]);
+  }, [draftPosition, pos, shouldApplyDraftAnnotation]);
   var applyDraftAnnotation = props.allowAnnotationsDraftMode && shouldApplyDraftAnnotation && position !== undefined;
   var dataAttributesWithDraftAnnotation = (0, _react.useMemo)(function () {
     return applyDraftAnnotation ? _objectSpread(_objectSpread({}, dataAttributes), {}, {

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

@@ -63,7 +63,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "111.0.1";
+var packageVersion = "111.0.2";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);

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

@@ -13,7 +13,6 @@ var _draft = require("../draft");
 var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _RendererActionsContext = require("../../RendererActionsContext");
-var _context = require("../context");
 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 Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props) {
@@ -34,8 +33,6 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
     draftDocumentPosition = _useState2[0],
     setDraftDocumentPosition = _useState2[1];
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
-  var providers = (0, _react.useContext)(_context.ProvidersContext);
-  var isCommentsOnMediaBugFixEnabled = Boolean(providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
     if (!isAnnotationAllowed || !documentPosition || !applyAnnotation) {
       return false;
@@ -53,8 +50,8 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
         eventType: _analytics.EVENT_TYPE.TRACK
       }).fire(_types.FabricChannel.editor);
     }
-    return applyAnnotation(draftDocumentPosition || documentPosition, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled]);
+    return applyAnnotation(draftDocumentPosition || documentPosition, annotation);
+  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -110,8 +107,8 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       annotationId: options.annotationId,
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
     clearAnnotationDraft();
     setDraftDocumentPosition(null);

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

@@ -15,7 +15,6 @@ var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _getRendererRangeInlineNodeNames = require("../../../actions/get-renderer-range-inline-node-names");
 var _RendererActionsContext = require("../../RendererActionsContext");
-var _context = require("../context");
 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 SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#__PURE__*/_react.default.memo(function (props) {
@@ -36,8 +35,6 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     draftDocumentPosition = _useState2[0],
     setDraftDocumentPosition = _useState2[1];
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
-  var providers = (0, _react.useContext)(_context.ProvidersContext);
-  var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var inlineNodeTypes = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.fg)('annotations_defensive_node_name_calculations')) {
       if (!actions.isRangeAnnotatable(range)) {
@@ -89,8 +86,8 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         eventType: _analytics.EVENT_TYPE.TRACK
       }).fire(_types.FabricChannel.editor);
     }
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled, inlineNodeTypes]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, inlineNodeTypes]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -149,8 +146,8 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       annotationId: options.annotationId,
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range, inlineNodeTypes]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, inlineNodeTypes]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
     clearAnnotationDraft();
     setDraftDocumentPosition(null);

package/dist/es2019/actions/index.js

@@ -253,7 +253,7 @@ export default class RendererActions {
     }
     return getAnnotationIdsFromRange(pos, this.doc, this.schema);
   }
-  applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled) {
+  applyAnnotation(pos, annotation) {
     if (!this.doc || !pos || !this.schema) {
       return false;
     }
@@ -267,13 +267,10 @@ export default class RendererActions {
     } = annotation;
     let step;
     let targetNodeType;
-    const beforeNodePos = isCommentsOnMediaBugFixEnabled ?
+
     // As part of fix for RAP, `from` points to the position right before media node
     // hence, -1 is not needed
-    from :
-    // If from points to a node position,
-    // we need to 1 position before it for nodeAt to return the node itself
-    Math.max(from - 1, 0);
+    const beforeNodePos = from;
     const possibleNode = this.doc.nodeAt(beforeNodePos);
     if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
       targetNodeType = 'media';
@@ -318,9 +315,9 @@ export default class RendererActions {
       numMatches,
       matchIndex,
       pos: blockNodePos,
-      ...(isCommentsOnMediaBugFixEnabled && {
+      ...{
         targetNodeType
-      })
+      }
     };
   }
   generateAnnotationIndexMatch(pos) {

package/dist/es2019/react/nodes/media/index.js

@@ -6,7 +6,7 @@ import _extends from "@babel/runtime/helpers/extends";
  * @jsxFrag
  */
 
-import React, { PureComponent, Fragment, useEffect, useState, useMemo, useContext } from 'react';
+import React, { PureComponent, Fragment, useEffect, useState, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx, css } from '@emotion/react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
@@ -20,7 +20,7 @@ import { getEventHandler } from '../../../utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import { MODE, PLATFORM } from '../../../analytics/events';
 import AnnotationComponent from '../../marks/annotation';
-import { AnnotationsDraftContext, ProvidersContext } from '../../../ui/annotations/context';
+import { AnnotationsDraftContext } from '../../../ui/annotations/context';
 import { CommentBadge as CommentBadgeComponent, CommentBadgeNext, ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { injectIntl } from 'react-intl-next';
 import { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
@@ -371,8 +371,6 @@ class Media extends PureComponent {
 }
 const MediaWithDraftAnnotation = props => {
   const draftPosition = React.useContext(AnnotationsDraftContext);
-  const providers = useContext(ProvidersContext);
-  const isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   const {
     dataAttributes
   } = props;
@@ -384,7 +382,7 @@ const MediaWithDraftAnnotation = props => {
     if (pos === undefined) {
       return;
     }
-    const posToCheck = isCommentsOnMediaBugFixEnabled ? ((_draftPosition$from = draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) !== null && _draftPosition$from !== void 0 ? _draftPosition$from : 0) + 1 : draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from;
+    const posToCheck = ((_draftPosition$from = draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) !== null && _draftPosition$from !== void 0 ? _draftPosition$from : 0) + 1;
     if (draftPosition !== null && posToCheck === pos) {
       setShouldApplyDraftAnnotation(true);
       setPosition(posToCheck);
@@ -392,7 +390,7 @@ const MediaWithDraftAnnotation = props => {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);
     }
-  }, [draftPosition, pos, shouldApplyDraftAnnotation, isCommentsOnMediaBugFixEnabled]);
+  }, [draftPosition, pos, shouldApplyDraftAnnotation]);
   const applyDraftAnnotation = props.allowAnnotationsDraftMode && shouldApplyDraftAnnotation && position !== undefined;
   const dataAttributesWithDraftAnnotation = useMemo(() => applyDraftAnnotation ? {
     ...dataAttributes,

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

@@ -45,7 +45,7 @@ import { nodeToReact } from '../../react/nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "111.0.1";
+const packageVersion = "111.0.2";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {

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

@@ -4,7 +4,6 @@ import { updateWindowSelectionAroundDraft } from '../draft';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
-import { ProvidersContext } from '../context';
 export const Mounter = /*#__PURE__*/React.memo(props => {
   const {
     component: Component,
@@ -22,8 +21,6 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
   } = props;
   const [draftDocumentPosition, setDraftDocumentPosition] = useState();
   const actions = useContext(ActionsContext);
-  const providers = useContext(ProvidersContext);
-  const isCommentsOnMediaBugFixEnabled = Boolean(providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   const onCreateCallback = useCallback(annotationId => {
     if (!isAnnotationAllowed || !documentPosition || !applyAnnotation) {
       return false;
@@ -41,8 +38,8 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
-    return applyAnnotation(draftDocumentPosition || documentPosition, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled]);
+    return applyAnnotation(draftDocumentPosition || documentPosition, annotation);
+  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent]);
   const createIndexCallback = useCallback(() => {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -98,8 +95,8 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
       annotationId: options.annotationId,
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range]);
   const removeDraftModeCallback = useCallback(() => {
     clearAnnotationDraft();
     setDraftDocumentPosition(null);

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

@@ -6,7 +6,6 @@ import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getRendererRangeInlineNodeNames } from '../../../actions/get-renderer-range-inline-node-names';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
-import { ProvidersContext } from '../context';
 export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
   const {
     component: Component,
@@ -24,8 +23,6 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
   } = props;
   const [draftDocumentPosition, setDraftDocumentPosition] = useState();
   const actions = useContext(ActionsContext);
-  const providers = useContext(ProvidersContext);
-  const isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   const inlineNodeTypes = useMemo(() => {
     if (fg('annotations_defensive_node_name_calculations')) {
       if (!actions.isRangeAnnotatable(range)) {
@@ -77,8 +74,8 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled, inlineNodeTypes]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, inlineNodeTypes]);
   const createIndexCallback = useCallback(() => {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -137,8 +134,8 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
       annotationId: options.annotationId,
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range, inlineNodeTypes]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, inlineNodeTypes]);
   const removeDraftModeCallback = useCallback(() => {
     clearAnnotationDraft();
     setDraftDocumentPosition(null);

package/dist/esm/actions/index.js

@@ -274,7 +274,7 @@ var RendererActions = /*#__PURE__*/function () {
     }
   }, {
     key: "applyAnnotation",
-    value: function applyAnnotation(pos, annotation, isCommentsOnMediaBugFixEnabled) {
+    value: function applyAnnotation(pos, annotation) {
       if (!this.doc || !pos || !this.schema) {
         return false;
       }
@@ -284,13 +284,10 @@ var RendererActions = /*#__PURE__*/function () {
         annotationType = annotation.annotationType;
       var step;
       var targetNodeType;
-      var beforeNodePos = isCommentsOnMediaBugFixEnabled ?
+
       // As part of fix for RAP, `from` points to the position right before media node
       // hence, -1 is not needed
-      from :
-      // If from points to a node position,
-      // we need to 1 position before it for nodeAt to return the node itself
-      Math.max(from - 1, 0);
+      var beforeNodePos = from;
       var possibleNode = this.doc.nodeAt(beforeNodePos);
       if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
         targetNodeType = 'media';
@@ -333,7 +330,7 @@ var RendererActions = /*#__PURE__*/function () {
         numMatches: numMatches,
         matchIndex: matchIndex,
         pos: blockNodePos
-      }, isCommentsOnMediaBugFixEnabled && {
+      }, {
         targetNodeType: targetNodeType
       });
     }

package/dist/esm/react/nodes/media/index.js

@@ -22,7 +22,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsxFrag
  */
 
-import React, { PureComponent, Fragment, useEffect, useState, useMemo, useContext } from 'react';
+import React, { PureComponent, Fragment, useEffect, useState, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx, css } from '@emotion/react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
@@ -36,7 +36,7 @@ import { getEventHandler } from '../../../utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import { MODE, PLATFORM } from '../../../analytics/events';
 import AnnotationComponent from '../../marks/annotation';
-import { AnnotationsDraftContext, ProvidersContext } from '../../../ui/annotations/context';
+import { AnnotationsDraftContext } from '../../../ui/annotations/context';
 import { CommentBadge as CommentBadgeComponent, CommentBadgeNext, ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { injectIntl } from 'react-intl-next';
 import { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
@@ -398,8 +398,6 @@ var Media = /*#__PURE__*/function (_PureComponent) {
 }(PureComponent);
 var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
   var draftPosition = React.useContext(AnnotationsDraftContext);
-  var providers = useContext(ProvidersContext);
-  var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var dataAttributes = props.dataAttributes;
   var pos = dataAttributes && dataAttributes['data-renderer-start-pos'];
   var _useState9 = useState(),
@@ -415,7 +413,7 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
     if (pos === undefined) {
       return;
     }
-    var posToCheck = isCommentsOnMediaBugFixEnabled ? ((_draftPosition$from = draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) !== null && _draftPosition$from !== void 0 ? _draftPosition$from : 0) + 1 : draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from;
+    var posToCheck = ((_draftPosition$from = draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) !== null && _draftPosition$from !== void 0 ? _draftPosition$from : 0) + 1;
     if (draftPosition !== null && posToCheck === pos) {
       setShouldApplyDraftAnnotation(true);
       setPosition(posToCheck);
@@ -423,7 +421,7 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);
     }
-  }, [draftPosition, pos, shouldApplyDraftAnnotation, isCommentsOnMediaBugFixEnabled]);
+  }, [draftPosition, pos, shouldApplyDraftAnnotation]);
   var applyDraftAnnotation = props.allowAnnotationsDraftMode && shouldApplyDraftAnnotation && position !== undefined;
   var dataAttributesWithDraftAnnotation = useMemo(function () {
     return applyDraftAnnotation ? _objectSpread(_objectSpread({}, dataAttributes), {}, {

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

@@ -55,7 +55,7 @@ import { nodeToReact } from '../../react/nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "111.0.1";
+var packageVersion = "111.0.2";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);

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

@@ -5,7 +5,6 @@ import { updateWindowSelectionAroundDraft } from '../draft';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
-import { ProvidersContext } from '../context';
 export var Mounter = /*#__PURE__*/React.memo(function (props) {
   var Component = props.component,
     range = props.range,
@@ -24,8 +23,6 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
     draftDocumentPosition = _useState2[0],
     setDraftDocumentPosition = _useState2[1];
   var actions = useContext(ActionsContext);
-  var providers = useContext(ProvidersContext);
-  var isCommentsOnMediaBugFixEnabled = Boolean(providers === null || providers === void 0 ? void 0 : providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var onCreateCallback = useCallback(function (annotationId) {
     if (!isAnnotationAllowed || !documentPosition || !applyAnnotation) {
       return false;
@@ -43,8 +40,8 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
-    return applyAnnotation(draftDocumentPosition || documentPosition, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled]);
+    return applyAnnotation(draftDocumentPosition || documentPosition, annotation);
+  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent]);
   var createIndexCallback = useCallback(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -100,8 +97,8 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
       annotationId: options.annotationId,
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range]);
   var removeDraftModeCallback = useCallback(function () {
     clearAnnotationDraft();
     setDraftDocumentPosition(null);

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

@@ -7,7 +7,6 @@ import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getRendererRangeInlineNodeNames } from '../../../actions/get-renderer-range-inline-node-names';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
-import { ProvidersContext } from '../context';
 export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (props) {
   var Component = props.component,
     range = props.range,
@@ -26,8 +25,6 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
     draftDocumentPosition = _useState2[0],
     setDraftDocumentPosition = _useState2[1];
   var actions = useContext(ActionsContext);
-  var providers = useContext(ProvidersContext);
-  var isCommentsOnMediaBugFixEnabled = !!(providers !== null && providers !== void 0 && providers.inlineComment.isCommentsOnMediaBugFixEnabled);
   var inlineNodeTypes = useMemo(function () {
     if (fg('annotations_defensive_node_name_calculations')) {
       if (!actions.isRangeAnnotatable(range)) {
@@ -79,8 +76,8 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
         eventType: EVENT_TYPE.TRACK
       }).fire(FabricChannel.editor);
     }
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, isCommentsOnMediaBugFixEnabled, inlineNodeTypes]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, inlineNodeTypes]);
   var createIndexCallback = useCallback(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -139,8 +136,8 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
       annotationId: options.annotationId,
       annotationType: AnnotationTypes.INLINE_COMMENT
     };
-    return applyAnnotation(positionToAnnotate, annotation, isCommentsOnMediaBugFixEnabled);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, isCommentsOnMediaBugFixEnabled, actions, range, inlineNodeTypes]);
+    return applyAnnotation(positionToAnnotate, annotation);
+  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, inlineNodeTypes]);
   var removeDraftModeCallback = useCallback(function () {
     clearAnnotationDraft();
     setDraftDocumentPosition(null);

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

@@ -22,7 +22,7 @@ interface RendererActionsOptions {
     deleteAnnotation: (annotationId: string, annotationType: 'inlineComment') => ActionResult;
     isValidAnnotationRange: (range: Range) => boolean;
 }
-export type ApplyAnnotation = (pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean) => AnnotationActionResult;
+export type ApplyAnnotation = (pos: Position, annotation: Annotation) => AnnotationActionResult;
 interface AnnotationsRendererActionsOptions {
     isValidAnnotationPosition: (pos: Position) => boolean;
     applyAnnotation: ApplyAnnotation;
@@ -65,7 +65,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     getPositionFromRange(range: Range | null): Position | false;
     getAnnotationMarks(): Mark[];
     getAnnotationsByPosition(range: Range): string[];
-    applyAnnotation(pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean): AnnotationActionResult;
+    applyAnnotation(pos: Position, annotation: Annotation): AnnotationActionResult;
     generateAnnotationIndexMatch(pos: Position): AnnotationByMatches | false;
     getInlineNodeTypes(annotationId: string): string[] | undefined;
 }

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

@@ -22,7 +22,7 @@ interface RendererActionsOptions {
     deleteAnnotation: (annotationId: string, annotationType: 'inlineComment') => ActionResult;
     isValidAnnotationRange: (range: Range) => boolean;
 }
-export type ApplyAnnotation = (pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean) => AnnotationActionResult;
+export type ApplyAnnotation = (pos: Position, annotation: Annotation) => AnnotationActionResult;
 interface AnnotationsRendererActionsOptions {
     isValidAnnotationPosition: (pos: Position) => boolean;
     applyAnnotation: ApplyAnnotation;
@@ -65,7 +65,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
     getPositionFromRange(range: Range | null): Position | false;
     getAnnotationMarks(): Mark[];
     getAnnotationsByPosition(range: Range): string[];
-    applyAnnotation(pos: Position, annotation: Annotation, isCommentsOnMediaBugFixEnabled?: boolean): AnnotationActionResult;
+    applyAnnotation(pos: Position, annotation: Annotation): AnnotationActionResult;
     generateAnnotationIndexMatch(pos: Position): AnnotationByMatches | false;
     getInlineNodeTypes(annotationId: string): string[] | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "111.0.1",
+	"version": "111.0.2",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,15 +29,15 @@
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.2.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^92.0.0",
+		"@atlaskit/editor-common": "^92.1.0",
 		"@atlaskit/editor-json-transformer": "^8.18.0",
 		"@atlaskit/editor-palette": "1.6.1",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^3.0.0",
 		"@atlaskit/emoji": "^67.8.0",
 		"@atlaskit/feature-gate-js-client": "^4.19.0",
-		"@atlaskit/icon": "^22.19.0",
-		"@atlaskit/link-datasource": "^3.1.0",
+		"@atlaskit/icon": "^22.20.0",
+		"@atlaskit/link-datasource": "^3.2.0",
 		"@atlaskit/media-card": "^78.5.0",
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-client-react": "^2.2.0",