@atlaskit/renderer 109.29.0 → 109.29.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/renderer
 
+## 109.29.1
+
+### Patch Changes
+
+-   [#97803](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97803)
+    [`4c1023ffb3d8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4c1023ffb3d8) -
+    [ED-23094] Ignore annotations on mediaInline node, including highlight styling,
+    event(onMouseEnter, onClick) listeners, update active annotations when the node is selected or
+    the cursor is right after the node
+
 ## 109.29.0
 
 ### Minor Changes

package/dist/cjs/react/index.js

@@ -100,6 +100,11 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
           isMediaLink: true
         });
       }
+      if (_this.isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
+        return _objectSpread(_objectSpread({}, defaultProps), {}, {
+          isMediaInline: true
+        });
+      }
       return defaultProps;
     });
     (0, _defineProperty2.default)(this, "getUnsupportedContentProps", function (node) {
@@ -185,6 +190,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
     this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
     this.isInsideOfInlineExtension = init.isInsideOfInlineExtension;
     this.textHighlighter = init.textHighlighter;
+    this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
   }
   (0, _createClass2.default)(ReactSerializer, [{
     key: "resetState",

package/dist/cjs/react/marks/annotation.js

@@ -23,13 +23,22 @@ var AnnotationComponent = function AnnotationComponent(_ref) {
     _ref$annotationParent = _ref.annotationParentIds,
     annotationParentIds = _ref$annotationParent === void 0 ? [] : _ref$annotationParent,
     allowAnnotations = _ref.allowAnnotations,
-    useBlockLevel = _ref.useBlockLevel;
+    useBlockLevel = _ref.useBlockLevel,
+    isMediaInline = _ref.isMediaInline;
   var data = _objectSpread(_objectSpread({}, dataAttributes), (0, _adfSchema.buildAnnotationMarkDataAttributes)({
     id: id,
     annotationType: annotationType
   }));
   if (allowAnnotations) {
-    return /*#__PURE__*/_react.default.createElement(_annotations.AnnotationMark, {
+    return isMediaInline ?
+    /*#__PURE__*/
+    // Inline comment on mediaInline is not supported as part of comments on media project,
+    // hence skip any styling/event handling for annotations on mediaInline.
+    // `id` is still needed so that comment view component can be correct positioned
+    // when using comment navigation to access comments on mediaInline
+    _react.default.createElement("span", {
+      id: id
+    }, children) : /*#__PURE__*/_react.default.createElement(_annotations.AnnotationMark, {
       id: id,
       dataAttributes: data,
       annotationParentIds: annotationParentIds,

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

@@ -56,7 +56,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 = "109.29.0";
+var packageVersion = "109.29.1";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
@@ -284,7 +284,8 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
         // does not currently support SSR, should not be enabled in environments where Renderer is SSR-ed
         allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
         isInsideOfInlineExtension: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
-        textHighlighter: props.UNSTABLE_textHighlighter
+        textHighlighter: props.UNSTABLE_textHighlighter,
+        isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix
       };
     }
   }, {

package/dist/es2019/react/index.js

@@ -82,6 +82,12 @@ export default class ReactSerializer {
           isMediaLink: true
         };
       }
+      if (this.isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
+        return {
+          ...defaultProps,
+          isMediaInline: true
+        };
+      }
       return defaultProps;
     });
     _defineProperty(this, "getUnsupportedContentProps", node => {
@@ -170,6 +176,7 @@ export default class ReactSerializer {
     this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
     this.isInsideOfInlineExtension = init.isInsideOfInlineExtension;
     this.textHighlighter = init.textHighlighter;
+    this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
   }
   resetState() {
     this.headingIds = [];

package/dist/es2019/react/marks/annotation.js

@@ -12,7 +12,8 @@ const AnnotationComponent = ({
   dataAttributes,
   annotationParentIds = [],
   allowAnnotations,
-  useBlockLevel
+  useBlockLevel,
+  isMediaInline
 }) => {
   const data = {
     ...dataAttributes,
@@ -22,7 +23,15 @@ const AnnotationComponent = ({
     })
   };
   if (allowAnnotations) {
-    return /*#__PURE__*/React.createElement(AnnotationMark, {
+    return isMediaInline ?
+    /*#__PURE__*/
+    // Inline comment on mediaInline is not supported as part of comments on media project,
+    // hence skip any styling/event handling for annotations on mediaInline.
+    // `id` is still needed so that comment view component can be correct positioned
+    // when using comment navigation to access comments on mediaInline
+    React.createElement("span", {
+      id: id
+    }, children) : /*#__PURE__*/React.createElement(AnnotationMark, {
       id: id,
       dataAttributes: data,
       annotationParentIds: annotationParentIds,

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

@@ -37,7 +37,7 @@ import { nodeToReact } from '../../react/nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.29.0";
+const packageVersion = "109.29.1";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {
@@ -263,7 +263,8 @@ export class Renderer extends PureComponent {
       // does not currently support SSR, should not be enabled in environments where Renderer is SSR-ed
       allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
       isInsideOfInlineExtension: getBooleanFF('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
-      textHighlighter: props.UNSTABLE_textHighlighter
+      textHighlighter: props.UNSTABLE_textHighlighter,
+      isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix
     };
   }
   render() {

package/dist/esm/react/index.js

@@ -93,6 +93,11 @@ var ReactSerializer = /*#__PURE__*/function () {
           isMediaLink: true
         });
       }
+      if (_this.isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
+        return _objectSpread(_objectSpread({}, defaultProps), {}, {
+          isMediaInline: true
+        });
+      }
       return defaultProps;
     });
     _defineProperty(this, "getUnsupportedContentProps", function (node) {
@@ -178,6 +183,7 @@ var ReactSerializer = /*#__PURE__*/function () {
     this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
     this.isInsideOfInlineExtension = init.isInsideOfInlineExtension;
     this.textHighlighter = init.textHighlighter;
+    this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
   }
   _createClass(ReactSerializer, [{
     key: "resetState",

package/dist/esm/react/marks/annotation.js

@@ -16,13 +16,22 @@ var AnnotationComponent = function AnnotationComponent(_ref) {
     _ref$annotationParent = _ref.annotationParentIds,
     annotationParentIds = _ref$annotationParent === void 0 ? [] : _ref$annotationParent,
     allowAnnotations = _ref.allowAnnotations,
-    useBlockLevel = _ref.useBlockLevel;
+    useBlockLevel = _ref.useBlockLevel,
+    isMediaInline = _ref.isMediaInline;
   var data = _objectSpread(_objectSpread({}, dataAttributes), buildAnnotationMarkDataAttributes({
     id: id,
     annotationType: annotationType
   }));
   if (allowAnnotations) {
-    return /*#__PURE__*/React.createElement(AnnotationMark, {
+    return isMediaInline ?
+    /*#__PURE__*/
+    // Inline comment on mediaInline is not supported as part of comments on media project,
+    // hence skip any styling/event handling for annotations on mediaInline.
+    // `id` is still needed so that comment view component can be correct positioned
+    // when using comment navigation to access comments on mediaInline
+    React.createElement("span", {
+      id: id
+    }, children) : /*#__PURE__*/React.createElement(AnnotationMark, {
       id: id,
       dataAttributes: data,
       annotationParentIds: annotationParentIds,

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

@@ -47,7 +47,7 @@ import { nodeToReact } from '../../react/nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.29.0";
+var packageVersion = "109.29.1";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
@@ -275,7 +275,8 @@ export var Renderer = /*#__PURE__*/function (_PureComponent) {
         // does not currently support SSR, should not be enabled in environments where Renderer is SSR-ed
         allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
         isInsideOfInlineExtension: getBooleanFF('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
-        textHighlighter: props.UNSTABLE_textHighlighter
+        textHighlighter: props.UNSTABLE_textHighlighter,
+        isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix
       };
     }
   }, {

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

@@ -41,6 +41,7 @@ export interface ReactSerializerInit {
     allowWindowedCodeBlock?: boolean;
     isInsideOfInlineExtension?: boolean;
     textHighlighter?: TextHighlighter;
+    isCommentsOnMediaMediaInlineBugFixEnabled?: boolean;
 }
 interface ParentInfo {
     parentIsIncompleteTask: boolean;
@@ -87,6 +88,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
     private nodeComponents?;
     private allowWindowedCodeBlock?;
     private isInsideOfInlineExtension?;
+    private isCommentsOnMediaMediaInlineBugFixEnabled?;
     private textHighlighter?;
     constructor(init: ReactSerializerInit);
     private resetState;

package/dist/types/react/marks/annotation.d.ts

@@ -2,5 +2,5 @@
 import type { MarkProps, AnnotationMarkMeta } from '../types';
 import type { Mark } from '@atlaskit/editor-prosemirror/model';
 export declare const isAnnotationMark: (mark: Mark) => boolean;
-declare const AnnotationComponent: ({ id, annotationType, children, dataAttributes, annotationParentIds, allowAnnotations, useBlockLevel, }: MarkProps<AnnotationMarkMeta>) => JSX.Element;
+declare const AnnotationComponent: ({ id, annotationType, children, dataAttributes, annotationParentIds, allowAnnotations, useBlockLevel, isMediaInline, }: MarkProps<AnnotationMarkMeta>) => JSX.Element;
 export default AnnotationComponent;

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

@@ -55,6 +55,7 @@ export interface AnnotationMarkMeta extends MarkMeta {
     annotationParentIds: string[];
     allowAnnotations: boolean;
     useBlockLevel?: boolean;
+    isMediaInline?: boolean;
 }
 export type NodeProps<NodeAttrs = {}> = NodeAttrs & PropsWithChildren<NodeMeta>;
 export type MarkProps<MarkAttrs = {}> = MarkAttrs & PropsWithChildren<MarkMeta>;

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

@@ -41,6 +41,7 @@ export interface ReactSerializerInit {
     allowWindowedCodeBlock?: boolean;
     isInsideOfInlineExtension?: boolean;
     textHighlighter?: TextHighlighter;
+    isCommentsOnMediaMediaInlineBugFixEnabled?: boolean;
 }
 interface ParentInfo {
     parentIsIncompleteTask: boolean;
@@ -87,6 +88,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
     private nodeComponents?;
     private allowWindowedCodeBlock?;
     private isInsideOfInlineExtension?;
+    private isCommentsOnMediaMediaInlineBugFixEnabled?;
     private textHighlighter?;
     constructor(init: ReactSerializerInit);
     private resetState;

package/dist/types-ts4.5/react/marks/annotation.d.ts

@@ -2,5 +2,5 @@
 import type { MarkProps, AnnotationMarkMeta } from '../types';
 import type { Mark } from '@atlaskit/editor-prosemirror/model';
 export declare const isAnnotationMark: (mark: Mark) => boolean;
-declare const AnnotationComponent: ({ id, annotationType, children, dataAttributes, annotationParentIds, allowAnnotations, useBlockLevel, }: MarkProps<AnnotationMarkMeta>) => JSX.Element;
+declare const AnnotationComponent: ({ id, annotationType, children, dataAttributes, annotationParentIds, allowAnnotations, useBlockLevel, isMediaInline, }: MarkProps<AnnotationMarkMeta>) => JSX.Element;
 export default AnnotationComponent;

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

@@ -55,6 +55,7 @@ export interface AnnotationMarkMeta extends MarkMeta {
     annotationParentIds: string[];
     allowAnnotations: boolean;
     useBlockLevel?: boolean;
+    isMediaInline?: boolean;
 }
 export type NodeProps<NodeAttrs = {}> = NodeAttrs & PropsWithChildren<NodeMeta>;
 export type MarkProps<MarkAttrs = {}> = MarkAttrs & PropsWithChildren<MarkMeta>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.29.0",
+  "version": "109.29.1",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
     "@atlaskit/editor-shared-styles": "^2.11.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.2.0",
-    "@atlaskit/link-datasource": "^2.2.0",
+    "@atlaskit/link-datasource": "^2.3.0",
     "@atlaskit/media-card": "^77.11.0",
     "@atlaskit/media-client": "^27.0.0",
     "@atlaskit/media-client-react": "^2.0.0",