@atlaskit/renderer 123.1.0 → 123.2.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/renderer
 
+## 123.2.0
+
+### Minor Changes
+
+- [`7d5ceec8d7064`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7d5ceec8d7064) -
+  Removed feature gates for cleanup
+
+## 123.1.1
+
+### Patch Changes
+
+- [`0b31405e5ec3b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b31405e5ec3b) -
+  Add local-id data attribute on nodes
+- Updated dependencies
+
 ## 123.1.0
 
 ### Minor Changes

package/dist/cjs/react/nodes/extension.js

@@ -38,6 +38,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
   var extensionId = arguments.length > 4 ? arguments[4] : undefined;
   var extensionViewportSizes = arguments.length > 5 ? arguments[5] : undefined;
   var nodeHeight = arguments.length > 6 ? arguments[6] : undefined;
+  var localId = arguments.length > 7 ? arguments[7] : undefined;
   var overflowContainerClass = !removeOverflow ? _consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -66,7 +67,8 @@ var renderExtension = exports.renderExtension = function renderExtension(content
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
         minHeight: "".concat(extensionHeight, "px")
       },
-      "data-layout": layout
+      "data-layout": layout,
+      "data-local-id": localId
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: overflowContainerClass
     }, content));
@@ -82,7 +84,8 @@ var Extension = function Extension(props) {
     path = _props$path === void 0 ? [] : _props$path,
     extensionViewportSizes = props.extensionViewportSizes,
     parameters = props.parameters,
-    nodeHeight = props.nodeHeight;
+    nodeHeight = props.nodeHeight,
+    localId = props.localId;
   return /*#__PURE__*/_react.default.createElement(_ExtensionRenderer.default
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -97,7 +100,7 @@ var Extension = function Extension(props) {
           isTopLevel: path.length < 1,
           handleRef: handleRef,
           shadowClassNames: shadowClassNames
-        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight);
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId);
       }
     } catch (e) {
       /** We don't want this error to block renderer */
@@ -108,7 +111,7 @@ var Extension = function Extension(props) {
       isTopLevel: path.length < 1,
       handleRef: handleRef,
       shadowClassNames: shadowClassNames
-    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight);
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId);
   });
 };
 var _default = exports.default = (0, _ui.overflowShadow)(Extension, {

package/dist/cjs/ui/Expand.js

@@ -184,6 +184,7 @@ function Expand(_ref) {
     nodeType = _ref.nodeType,
     intl = _ref.intl,
     fireAnalyticsEvent = _ref.fireAnalyticsEvent,
+    localId = _ref.localId,
     nestedHeaderIds = _ref.nestedHeaderIds,
     rendererAppearance = _ref.rendererAppearance;
   var _React$useState = _react2.default.useState(false),
@@ -209,6 +210,7 @@ function Expand(_ref) {
     "data-node-type": nodeType,
     "data-title": title,
     "data-expanded": expanded,
+    "data-local-id": localId,
     expanded: expanded,
     focused: focused
   }, nestedHeaderIds && nestedHeaderIds.length > 0 ? (0, _react.jsx)(_activeHeaderIdProvider.ActiveHeaderIdConsumer, {

package/dist/cjs/ui/MediaCard.js

@@ -218,7 +218,8 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
         ssr = _this$props4.ssr,
         mediaClient = _this$props4.mediaClient,
         dataAttributes = _this$props4.dataAttributes,
-        enableSyncMediaCard = _this$props4.enableSyncMediaCard;
+        enableSyncMediaCard = _this$props4.enableSyncMediaCard,
+        localId = _this$props4.localId;
       if (imageStatus === 'loading' || !url) {
         return this.renderLoadingCard();
       }
@@ -236,7 +237,8 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         _react.default.createElement("div", (0, _extends2.default)({}, dataAttributes, {
-          "data-node-type": "media"
+          "data-node-type": "media",
+          "data-local-id": localId
         }), /*#__PURE__*/_react.default.createElement(Card
         // TODO: MPT-315 - clean up after we move mediaClientConfig into FileIdentifier
         // context is not really used when the type is external and we want to render the component asap
@@ -281,7 +283,8 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
         ssr = _this$props5.ssr,
         mediaClient = _this$props5.mediaClient,
         dataAttributes = _this$props5.dataAttributes,
-        enableSyncMediaCard = _this$props5.enableSyncMediaCard;
+        enableSyncMediaCard = _this$props5.enableSyncMediaCard,
+        localId = _this$props5.localId;
       var isMobile = false;
       var shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
       var isInlinePlayer = isMobile ? false : shouldPlayInline;
@@ -317,7 +320,9 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
         contextIdentifierProvider: contextIdentifierProvider,
         originalDimensions: originalDimensions,
         fileState: fileState
-      }), dataAttributes), /*#__PURE__*/_react.default.createElement(Card, {
+      }), dataAttributes, {
+        "data-local-id": localId
+      }), /*#__PURE__*/_react.default.createElement(Card, {
         identifier: identifier,
         alt: alt,
         contextId: contextId,

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

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

@@ -12,7 +12,6 @@ var _types = require("@atlaskit/editor-common/types");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _types2 = require("@atlaskit/analytics-listeners/types");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
@@ -97,9 +96,6 @@ var useHasFocusEvent = exports.useHasFocusEvent = function useHasFocusEvent(_ref
     };
     var removeHoverEffect = function removeHoverEffect() {
       setIsHovered(false);
-      if (document.activeElement instanceof HTMLElement && !(0, _platformFeatureFlags.fg)('confluence_frontend_comments_panel_editor_focus')) {
-        document.activeElement.blur();
-      }
     };
     if (!isAnnotationManagerEnabled) {
       updateSubscriber.on(_types.AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);

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

@@ -12,7 +12,6 @@ var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _RendererActionsContext = require("../../RendererActionsContext");
 var _AnnotationRangeContext = require("../contexts/AnnotationRangeContext");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props) {
   var Component = props.component,
@@ -102,20 +101,18 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
     });
     var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
-      if ((0, _platformFeatureFlags.fg)('cc_comments_improve_apply_draft_errors')) {
-        if (createAnalyticsEvent) {
-          createAnalyticsEvent({
-            action: _analytics.ACTION.CREATE_NOT_ALLOWED,
-            actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-            attributes: {
-              positionToAnnotate: positionToAnnotate,
-              applyAnnotationMissing: !applyAnnotation,
-              annotationId: options.annotationId
-            },
-            eventType: _analytics.EVENT_TYPE.TRACK
-          }).fire(_types.FabricChannel.editor);
-        }
+      if (createAnalyticsEvent) {
+        createAnalyticsEvent({
+          action: _analytics.ACTION.CREATE_NOT_ALLOWED,
+          actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
+          attributes: {
+            positionToAnnotate: positionToAnnotate,
+            applyAnnotationMissing: !applyAnnotation,
+            annotationId: options.annotationId
+          },
+          eventType: _analytics.EVENT_TYPE.TRACK
+        }).fire(_types.FabricChannel.editor);
       }
       return false;
     }

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

@@ -153,20 +153,18 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     // use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
     var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
-      if ((0, _platformFeatureFlags.fg)('cc_comments_improve_apply_draft_errors')) {
-        if (createAnalyticsEvent) {
-          createAnalyticsEvent({
-            action: _analytics.ACTION.CREATE_NOT_ALLOWED,
-            actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-            attributes: {
-              positionToAnnotate: positionToAnnotate,
-              applyAnnotationMissing: !applyAnnotation,
-              annotationId: options.annotationId
-            },
-            eventType: _analytics.EVENT_TYPE.TRACK
-          }).fire(_types.FabricChannel.editor);
-        }
+      if (createAnalyticsEvent) {
+        createAnalyticsEvent({
+          action: _analytics.ACTION.CREATE_NOT_ALLOWED,
+          actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
+          attributes: {
+            positionToAnnotate: positionToAnnotate,
+            applyAnnotationMissing: !applyAnnotation,
+            annotationId: options.annotationId
+          },
+          eventType: _analytics.EVENT_TYPE.TRACK
+        }).fire(_types.FabricChannel.editor);
       }
       return false;
     }

package/dist/es2019/react/nodes/extension.js

@@ -23,7 +23,7 @@ const getViewportSize = (extensionId, extensionViewportSizes) => {
     return macroHeights[viewportSize];
   }
 };
-export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight) => {
+export const renderExtension = (content, layout, options = {}, removeOverflow, extensionId, extensionViewportSizes, nodeHeight, localId) => {
   const overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -52,7 +52,8 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
       minHeight: `${extensionHeight}px`
     },
-    "data-layout": layout
+    "data-layout": layout,
+    "data-local-id": localId
   }, /*#__PURE__*/React.createElement("div", {
     className: overflowContainerClass
   }, content)));
@@ -66,7 +67,8 @@ const Extension = props => {
     path = [],
     extensionViewportSizes,
     parameters,
-    nodeHeight
+    nodeHeight,
+    localId
   } = props;
   return /*#__PURE__*/React.createElement(ExtensionRenderer
   // Ignored via go/ees005
@@ -83,7 +85,7 @@ const Extension = props => {
           isTopLevel: path.length < 1,
           handleRef,
           shadowClassNames
-        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight);
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId);
       }
     } catch (e) {
       /** We don't want this error to block renderer */
@@ -94,7 +96,7 @@ const Extension = props => {
       isTopLevel: path.length < 1,
       handleRef,
       shadowClassNames
-    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight);
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId);
   });
 };
 export default overflowShadow(Extension, {

package/dist/es2019/ui/Expand.js

@@ -174,6 +174,7 @@ function Expand({
   nodeType,
   intl,
   fireAnalyticsEvent,
+  localId,
   nestedHeaderIds,
   rendererAppearance
 }) {
@@ -191,6 +192,7 @@ function Expand({
     "data-node-type": nodeType,
     "data-title": title,
     "data-expanded": expanded,
+    "data-local-id": localId,
     expanded: expanded,
     focused: focused
   }, nestedHeaderIds && nestedHeaderIds.length > 0 ? jsx(ActiveHeaderIdConsumer, {

package/dist/es2019/ui/MediaCard.js

@@ -153,7 +153,8 @@ export class MediaCardView extends Component {
       ssr,
       mediaClient,
       dataAttributes,
-      enableSyncMediaCard
+      enableSyncMediaCard,
+      localId
     } = this.props;
     if (imageStatus === 'loading' || !url) {
       return this.renderLoadingCard();
@@ -172,7 +173,8 @@ export class MediaCardView extends Component {
       // Ignored via go/ees005
       // eslint-disable-next-line react/jsx-props-no-spreading
       React.createElement("div", _extends({}, dataAttributes, {
-        "data-node-type": "media"
+        "data-node-type": "media",
+        "data-local-id": localId
       }), /*#__PURE__*/React.createElement(Card
       // TODO: MPT-315 - clean up after we move mediaClientConfig into FileIdentifier
       // context is not really used when the type is external and we want to render the component asap
@@ -216,7 +218,8 @@ export class MediaCardView extends Component {
       ssr,
       mediaClient,
       dataAttributes,
-      enableSyncMediaCard
+      enableSyncMediaCard,
+      localId
     } = this.props;
     const isMobile = false;
     const shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
@@ -253,7 +256,9 @@ export class MediaCardView extends Component {
       contextIdentifierProvider,
       originalDimensions,
       fileState
-    }), dataAttributes), /*#__PURE__*/React.createElement(Card, {
+    }), dataAttributes, {
+      "data-local-id": localId
+    }), /*#__PURE__*/React.createElement(Card, {
       identifier: identifier,
       alt: alt,
       contextId: contextId,

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

@@ -49,7 +49,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "123.0.0";
+const packageVersion = "123.1.1";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -3,7 +3,6 @@ import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
 export const useAnnotationStateByTypeEvent = ({
   type,
@@ -92,9 +91,6 @@ export const useHasFocusEvent = ({
     };
     const removeHoverEffect = () => {
       setIsHovered(false);
-      if (document.activeElement instanceof HTMLElement && !fg('confluence_frontend_comments_panel_editor_focus')) {
-        document.activeElement.blur();
-      }
     };
     if (!isAnnotationManagerEnabled) {
       updateSubscriber.on(AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);

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

@@ -5,7 +5,6 @@ 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 { useAnnotationRangeDispatch, useAnnotationRangeState } from '../contexts/AnnotationRangeContext';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const Mounter = /*#__PURE__*/React.memo(props => {
   const {
     component: Component,
@@ -98,20 +97,18 @@ export const Mounter = /*#__PURE__*/React.memo(props => {
     });
     const positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
-      if (fg('cc_comments_improve_apply_draft_errors')) {
-        if (createAnalyticsEvent) {
-          createAnalyticsEvent({
-            action: ACTION.CREATE_NOT_ALLOWED,
-            actionSubject: ACTION_SUBJECT.ANNOTATION,
-            actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-            attributes: {
-              positionToAnnotate,
-              applyAnnotationMissing: !applyAnnotation,
-              annotationId: options.annotationId
-            },
-            eventType: EVENT_TYPE.TRACK
-          }).fire(FabricChannel.editor);
-        }
+      if (createAnalyticsEvent) {
+        createAnalyticsEvent({
+          action: ACTION.CREATE_NOT_ALLOWED,
+          actionSubject: ACTION_SUBJECT.ANNOTATION,
+          actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+          attributes: {
+            positionToAnnotate,
+            applyAnnotationMissing: !applyAnnotation,
+            annotationId: options.annotationId
+          },
+          eventType: EVENT_TYPE.TRACK
+        }).fire(FabricChannel.editor);
       }
       return false;
     }

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

@@ -150,20 +150,18 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
     // use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
     const positionToAnnotate = fg('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
-      if (fg('cc_comments_improve_apply_draft_errors')) {
-        if (createAnalyticsEvent) {
-          createAnalyticsEvent({
-            action: ACTION.CREATE_NOT_ALLOWED,
-            actionSubject: ACTION_SUBJECT.ANNOTATION,
-            actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-            attributes: {
-              positionToAnnotate,
-              applyAnnotationMissing: !applyAnnotation,
-              annotationId: options.annotationId
-            },
-            eventType: EVENT_TYPE.TRACK
-          }).fire(FabricChannel.editor);
-        }
+      if (createAnalyticsEvent) {
+        createAnalyticsEvent({
+          action: ACTION.CREATE_NOT_ALLOWED,
+          actionSubject: ACTION_SUBJECT.ANNOTATION,
+          actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+          attributes: {
+            positionToAnnotate,
+            applyAnnotationMissing: !applyAnnotation,
+            annotationId: options.annotationId
+          },
+          eventType: EVENT_TYPE.TRACK
+        }).fire(FabricChannel.editor);
       }
       return false;
     }

package/dist/esm/react/nodes/extension.js

@@ -31,6 +31,7 @@ export var renderExtension = function renderExtension(content, layout) {
   var extensionId = arguments.length > 4 ? arguments[4] : undefined;
   var extensionViewportSizes = arguments.length > 5 ? arguments[5] : undefined;
   var nodeHeight = arguments.length > 6 ? arguments[6] : undefined;
+  var localId = arguments.length > 7 ? arguments[7] : undefined;
   var overflowContainerClass = !removeOverflow ? RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -59,7 +60,8 @@ export var renderExtension = function renderExtension(content, layout) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
         minHeight: "".concat(extensionHeight, "px")
       },
-      "data-layout": layout
+      "data-layout": layout,
+      "data-local-id": localId
     }, /*#__PURE__*/React.createElement("div", {
       className: overflowContainerClass
     }, content));
@@ -75,7 +77,8 @@ var Extension = function Extension(props) {
     path = _props$path === void 0 ? [] : _props$path,
     extensionViewportSizes = props.extensionViewportSizes,
     parameters = props.parameters,
-    nodeHeight = props.nodeHeight;
+    nodeHeight = props.nodeHeight,
+    localId = props.localId;
   return /*#__PURE__*/React.createElement(ExtensionRenderer
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -90,7 +93,7 @@ var Extension = function Extension(props) {
           isTopLevel: path.length < 1,
           handleRef: handleRef,
           shadowClassNames: shadowClassNames
-        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight);
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId);
       }
     } catch (e) {
       /** We don't want this error to block renderer */
@@ -101,7 +104,7 @@ var Extension = function Extension(props) {
       isTopLevel: path.length < 1,
       handleRef: handleRef,
       shadowClassNames: shadowClassNames
-    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight);
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes, nodeHeight, localId);
   });
 };
 export default overflowShadow(Extension, {

package/dist/esm/ui/Expand.js

@@ -175,6 +175,7 @@ function Expand(_ref) {
     nodeType = _ref.nodeType,
     intl = _ref.intl,
     fireAnalyticsEvent = _ref.fireAnalyticsEvent,
+    localId = _ref.localId,
     nestedHeaderIds = _ref.nestedHeaderIds,
     rendererAppearance = _ref.rendererAppearance;
   var _React$useState = React.useState(false),
@@ -200,6 +201,7 @@ function Expand(_ref) {
     "data-node-type": nodeType,
     "data-title": title,
     "data-expanded": expanded,
+    "data-local-id": localId,
     expanded: expanded,
     focused: focused
   }, nestedHeaderIds && nestedHeaderIds.length > 0 ? jsx(ActiveHeaderIdConsumer, {

package/dist/esm/ui/MediaCard.js

@@ -209,7 +209,8 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
         ssr = _this$props4.ssr,
         mediaClient = _this$props4.mediaClient,
         dataAttributes = _this$props4.dataAttributes,
-        enableSyncMediaCard = _this$props4.enableSyncMediaCard;
+        enableSyncMediaCard = _this$props4.enableSyncMediaCard,
+        localId = _this$props4.localId;
       if (imageStatus === 'loading' || !url) {
         return this.renderLoadingCard();
       }
@@ -227,7 +228,8 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
         React.createElement("div", _extends({}, dataAttributes, {
-          "data-node-type": "media"
+          "data-node-type": "media",
+          "data-local-id": localId
         }), /*#__PURE__*/React.createElement(Card
         // TODO: MPT-315 - clean up after we move mediaClientConfig into FileIdentifier
         // context is not really used when the type is external and we want to render the component asap
@@ -272,7 +274,8 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
         ssr = _this$props5.ssr,
         mediaClient = _this$props5.mediaClient,
         dataAttributes = _this$props5.dataAttributes,
-        enableSyncMediaCard = _this$props5.enableSyncMediaCard;
+        enableSyncMediaCard = _this$props5.enableSyncMediaCard,
+        localId = _this$props5.localId;
       var isMobile = false;
       var shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
       var isInlinePlayer = isMobile ? false : shouldPlayInline;
@@ -308,7 +311,9 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
         contextIdentifierProvider: contextIdentifierProvider,
         originalDimensions: originalDimensions,
         fileState: fileState
-      }), dataAttributes), /*#__PURE__*/React.createElement(Card, {
+      }), dataAttributes, {
+        "data-local-id": localId
+      }), /*#__PURE__*/React.createElement(Card, {
         identifier: identifier,
         alt: alt,
         contextId: contextId,

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

@@ -54,7 +54,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "123.0.0";
+var packageVersion = "123.1.1";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -7,7 +7,6 @@ import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
 export var useAnnotationStateByTypeEvent = function useAnnotationStateByTypeEvent(_ref) {
   var type = _ref.type,
@@ -90,9 +89,6 @@ export var useHasFocusEvent = function useHasFocusEvent(_ref2) {
     };
     var removeHoverEffect = function removeHoverEffect() {
       setIsHovered(false);
-      if (document.activeElement instanceof HTMLElement && !fg('confluence_frontend_comments_panel_editor_focus')) {
-        document.activeElement.blur();
-      }
     };
     if (!isAnnotationManagerEnabled) {
       updateSubscriber.on(AnnotationUpdateEvent.SET_ANNOTATION_FOCUS, cb);

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

@@ -5,7 +5,6 @@ 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 { useAnnotationRangeDispatch, useAnnotationRangeState } from '../contexts/AnnotationRangeContext';
-import { fg } from '@atlaskit/platform-feature-flags';
 export var Mounter = /*#__PURE__*/React.memo(function (props) {
   var Component = props.component,
     range = props.range,
@@ -94,20 +93,18 @@ export var Mounter = /*#__PURE__*/React.memo(function (props) {
     });
     var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
-      if (fg('cc_comments_improve_apply_draft_errors')) {
-        if (createAnalyticsEvent) {
-          createAnalyticsEvent({
-            action: ACTION.CREATE_NOT_ALLOWED,
-            actionSubject: ACTION_SUBJECT.ANNOTATION,
-            actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-            attributes: {
-              positionToAnnotate: positionToAnnotate,
-              applyAnnotationMissing: !applyAnnotation,
-              annotationId: options.annotationId
-            },
-            eventType: EVENT_TYPE.TRACK
-          }).fire(FabricChannel.editor);
-        }
+      if (createAnalyticsEvent) {
+        createAnalyticsEvent({
+          action: ACTION.CREATE_NOT_ALLOWED,
+          actionSubject: ACTION_SUBJECT.ANNOTATION,
+          actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+          attributes: {
+            positionToAnnotate: positionToAnnotate,
+            applyAnnotationMissing: !applyAnnotation,
+            annotationId: options.annotationId
+          },
+          eventType: EVENT_TYPE.TRACK
+        }).fire(FabricChannel.editor);
       }
       return false;
     }

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

@@ -144,20 +144,18 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
     // use platform_editor_comments_api_manager here so we can clear the code path when the flag is removed
     var positionToAnnotate = fg('platform_editor_comments_api_manager') ? documentPosition : selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
-      if (fg('cc_comments_improve_apply_draft_errors')) {
-        if (createAnalyticsEvent) {
-          createAnalyticsEvent({
-            action: ACTION.CREATE_NOT_ALLOWED,
-            actionSubject: ACTION_SUBJECT.ANNOTATION,
-            actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
-            attributes: {
-              positionToAnnotate: positionToAnnotate,
-              applyAnnotationMissing: !applyAnnotation,
-              annotationId: options.annotationId
-            },
-            eventType: EVENT_TYPE.TRACK
-          }).fire(FabricChannel.editor);
-        }
+      if (createAnalyticsEvent) {
+        createAnalyticsEvent({
+          action: ACTION.CREATE_NOT_ALLOWED,
+          actionSubject: ACTION_SUBJECT.ANNOTATION,
+          actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+          attributes: {
+            positionToAnnotate: positionToAnnotate,
+            applyAnnotationMissing: !applyAnnotation,
+            annotationId: options.annotationId
+          },
+          eventType: EVENT_TYPE.TRACK
+        }).fire(FabricChannel.editor);
       }
       return false;
     }

package/dist/types/react/nodes/extension.d.ts

@@ -26,7 +26,7 @@ type AllOrNone<T> = T | {
 type RenderExtensionOptions = {
     isTopLevel?: boolean;
 } & AllOrNone<OverflowShadowProps>;
-export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string) => React.JSX.Element;
+export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string) => React.JSX.Element;
 declare const _default: {
     new (props: (Props & OverflowShadowProps) | Readonly<Props & OverflowShadowProps>): {
         overflowContainer?: HTMLElement | null;

package/dist/types/ui/Expand.d.ts

@@ -5,6 +5,7 @@ import type { RendererAppearance } from './Renderer/types';
 export interface ExpandProps {
     children: React.ReactNode;
     fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
+    localId?: string;
     nestedHeaderIds?: Array<string>;
     nodeType: 'expand' | 'nestedExpand';
     rendererAppearance?: RendererAppearance;

package/dist/types/ui/MediaCard.d.ts

@@ -30,6 +30,7 @@ export interface MediaCardProps {
     featureFlags?: MediaFeatureFlags;
     id?: string;
     imageStatus?: ImageStatus;
+    localId?: string;
     occurrenceKey?: string;
     originalDimensions?: NumericalCardDimensions;
     rendererAppearance?: RendererAppearance;

package/dist/types-ts4.5/react/nodes/extension.d.ts

@@ -26,7 +26,7 @@ type AllOrNone<T> = T | {
 type RenderExtensionOptions = {
     isTopLevel?: boolean;
 } & AllOrNone<OverflowShadowProps>;
-export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string) => React.JSX.Element;
+export declare const renderExtension: (content: any, layout: string, options?: RenderExtensionOptions, removeOverflow?: boolean, extensionId?: string, extensionViewportSizes?: ExtensionViewportSize[], nodeHeight?: string, localId?: string) => React.JSX.Element;
 declare const _default: {
     new (props: (Props & OverflowShadowProps) | Readonly<Props & OverflowShadowProps>): {
         overflowContainer?: HTMLElement | null;

package/dist/types-ts4.5/ui/Expand.d.ts

@@ -5,6 +5,7 @@ import type { RendererAppearance } from './Renderer/types';
 export interface ExpandProps {
     children: React.ReactNode;
     fireAnalyticsEvent?: (event: AnalyticsEventPayload) => void;
+    localId?: string;
     nestedHeaderIds?: Array<string>;
     nodeType: 'expand' | 'nestedExpand';
     rendererAppearance?: RendererAppearance;

package/dist/types-ts4.5/ui/MediaCard.d.ts

@@ -30,6 +30,7 @@ export interface MediaCardProps {
     featureFlags?: MediaFeatureFlags;
     id?: string;
     imageStatus?: ImageStatus;
+    localId?: string;
     occurrenceKey?: string;
     originalDimensions?: NumericalCardDimensions;
     rendererAppearance?: RendererAppearance;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "123.1.0",
+	"version": "123.2.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/emoji": "^69.5.0",
 		"@atlaskit/feature-gate-js-client": "^5.5.0",
-		"@atlaskit/icon": "^28.1.0",
+		"@atlaskit/icon": "^28.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-datasource": "^4.23.0",
 		"@atlaskit/media-card": "^79.5.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.18.0",
+		"@atlaskit/tmp-editor-statsig": "^12.22.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -68,7 +68,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.5.0",
+		"@atlaskit/editor-common": "^109.7.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -82,7 +82,7 @@
 		"@atlaskit/css-reset": "^7.3.0",
 		"@atlaskit/link-provider": "^4.0.0",
 		"@atlaskit/link-test-helpers": "^8.3.0",
-		"@atlaskit/linking-common": "^9.5.0",
+		"@atlaskit/linking-common": "^9.6.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
 		"@atlaskit/media-test-helpers": "^39.0.0",
@@ -125,9 +125,6 @@
 		"confluence_frontend_table_scrollbar_ttvc_fix": {
 			"type": "boolean"
 		},
-		"cc_comments_improve_apply_draft_errors": {
-			"type": "boolean"
-		},
 		"cc_comments_create_inline_experience_entry_point": {
 			"type": "boolean"
 		},
@@ -242,9 +239,6 @@
 		"issue_table_single_line_row_height_fast_follows": {
 			"type": "boolean"
 		},
-		"confluence_frontend_comments_panel_editor_focus": {
-			"type": "boolean"
-		},
 		"platform_custom_number_column": {
 			"type": "boolean"
 		},