@atlaskit/renderer 110.5.4 → 110.5.5

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/renderer
 
+## 110.5.5
+
+### Patch Changes
+
+- [#146981](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/146981)
+  [`1bb47674cd3df`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1bb47674cd3df) -
+  [ED-24683] clean up `confluence.frontend.fabric.editor.comments-on-media-media-inline-bug-fix`
+- [#146246](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/146246)
+  [`2a4fc73d45dfd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2a4fc73d45dfd) -
+  Reverting change to add onLoadComplete callback for useLoadAnnotations annotations hook
+
 ## 110.5.4
 
 ### Patch Changes

package/dist/cjs/react/index.js

@@ -100,7 +100,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
           isMediaLink: true
         });
       }
-      if (_this.isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
+      if (node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
         return _objectSpread(_objectSpread({}, defaultProps), {}, {
           isMediaInline: true
         });
@@ -190,7 +190,6 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
     this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
     this.isInsideOfInlineExtension = init.isInsideOfInlineExtension;
     this.textHighlighter = init.textHighlighter;
-    this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
     this.allowTableAlignment = init.allowTableAlignment;
     this.allowTableResizing = init.allowTableResizing;
   }

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 = "110.5.4";
+var packageVersion = "110.5.5";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
@@ -290,7 +290,6 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
         allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
         isInsideOfInlineExtension: (0, _platformFeatureFlags.fg)('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
         textHighlighter: props.UNSTABLE_textHighlighter,
-        isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix,
         allowTableAlignment: props.UNSTABLE_allowTableAlignment,
         allowTableResizing: props.UNSTABLE_allowTableResizing
       };

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

@@ -14,8 +14,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotations(_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   (0, _react.useEffect)(function () {
@@ -28,9 +27,6 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
     var annotations = actions.getAnnotationMarks();
     // we don't want to request integrators for state with an empty list of ids.
     if (!annotations.length) {
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: 0
-      });
       return;
     }
     var ids = annotations.map(function (mark) {
@@ -44,12 +40,7 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
         return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, value.id, value));
       }, {});
       updateSubscriberInlineComment.emit(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: data.filter(function (data) {
-          return data.state === 'active';
-        }).length
-      });
     };
     inlineCommentGetState(ids, isNestedRender).then(cb);
-  }, [actions, providers, adfDocument, isNestedRender, onLoadComplete]);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

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

@@ -31,12 +31,10 @@ var _draft = require("./draft");
 var _element = require("./element");
 var LoadAnnotations = /*#__PURE__*/_react.default.memo(function (_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   (0, _useLoadAnnotations.useLoadAnnotations)({
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   });
   return null;
 });
@@ -46,8 +44,7 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
     annotationProvider = props.annotationProvider,
     rendererRef = props.rendererRef,
     adfDocument = props.adfDocument,
-    isNestedRender = props.isNestedRender,
-    onLoadComplete = props.onLoadComplete;
+    isNestedRender = props.isNestedRender;
   var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   var inlineCommentAnnotationsState = (0, _useEvents.useAnnotationStateByTypeEvent)({
     type: _adfSchema.AnnotationTypes.INLINE_COMMENT,
@@ -66,8 +63,7 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
     rendererRef: rendererRef
   }, /*#__PURE__*/_react.default.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/_react.default.createElement(_view.AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

package/dist/es2019/react/index.js

@@ -82,7 +82,7 @@ export default class ReactSerializer {
           isMediaLink: true
         };
       }
-      if (this.isCommentsOnMediaMediaInlineBugFixEnabled && node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
+      if (node.type.name === 'mediaInline' && mark.type.name === 'annotation') {
         return {
           ...defaultProps,
           isMediaInline: true
@@ -176,7 +176,6 @@ export default class ReactSerializer {
     this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
     this.isInsideOfInlineExtension = init.isInsideOfInlineExtension;
     this.textHighlighter = init.textHighlighter;
-    this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
     this.allowTableAlignment = init.allowTableAlignment;
     this.allowTableResizing = init.allowTableResizing;
   }

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 = "110.5.4";
+const packageVersion = "110.5.5";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {
@@ -270,7 +270,6 @@ export class Renderer extends PureComponent {
       allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
       isInsideOfInlineExtension: fg('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
       textHighlighter: props.UNSTABLE_textHighlighter,
-      isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix,
       allowTableAlignment: props.UNSTABLE_allowTableAlignment,
       allowTableResizing: props.UNSTABLE_allowTableResizing
     };

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

@@ -4,8 +4,7 @@ import { ProvidersContext } from '../context';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 export const useLoadAnnotations = ({
   adfDocument,
-  isNestedRender,
-  onLoadComplete
+  isNestedRender
 }) => {
   const actions = useContext(ActionsContext);
   const providers = useContext(ProvidersContext);
@@ -22,9 +21,6 @@ export const useLoadAnnotations = ({
     const annotations = actions.getAnnotationMarks();
     // we don't want to request integrators for state with an empty list of ids.
     if (!annotations.length) {
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: 0
-      });
       return;
     }
     const ids = annotations.map(mark => mark.attrs.id);
@@ -37,10 +33,7 @@ export const useLoadAnnotations = ({
         [value.id]: value
       }), {});
       updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: data.filter(data => data.state === 'active').length
-      });
     };
     inlineCommentGetState(ids, isNestedRender).then(cb);
-  }, [actions, providers, adfDocument, isNestedRender, onLoadComplete]);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

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

@@ -10,13 +10,11 @@ import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
 import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
 const LoadAnnotations = /*#__PURE__*/React.memo(({
   adfDocument,
-  isNestedRender,
-  onLoadComplete
+  isNestedRender
 }) => {
   useLoadAnnotations({
     adfDocument,
-    isNestedRender,
-    onLoadComplete
+    isNestedRender
   });
   return null;
 });
@@ -27,8 +25,7 @@ export const AnnotationsWrapper = props => {
     annotationProvider,
     rendererRef,
     adfDocument,
-    isNestedRender,
-    onLoadComplete
+    isNestedRender
   } = props;
   const updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   const inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
@@ -49,8 +46,7 @@ export const AnnotationsWrapper = props => {
     rendererRef: rendererRef
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/React.createElement(AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

package/dist/esm/react/index.js

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

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 = "110.5.4";
+var packageVersion = "110.5.5";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
@@ -282,7 +282,6 @@ export var Renderer = /*#__PURE__*/function (_PureComponent) {
         allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
         isInsideOfInlineExtension: fg('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
         textHighlighter: props.UNSTABLE_textHighlighter,
-        isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix,
         allowTableAlignment: props.UNSTABLE_allowTableAlignment,
         allowTableResizing: props.UNSTABLE_allowTableResizing
       };

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

@@ -7,8 +7,7 @@ import { ProvidersContext } from '../context';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 export var useLoadAnnotations = function useLoadAnnotations(_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   var actions = useContext(ActionsContext);
   var providers = useContext(ProvidersContext);
   useEffect(function () {
@@ -21,9 +20,6 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
     var annotations = actions.getAnnotationMarks();
     // we don't want to request integrators for state with an empty list of ids.
     if (!annotations.length) {
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: 0
-      });
       return;
     }
     var ids = annotations.map(function (mark) {
@@ -37,12 +33,7 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
         return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, value.id, value));
       }, {});
       updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
-      onLoadComplete && onLoadComplete({
-        numberOfUnresolvedInlineComments: data.filter(function (data) {
-          return data.state === 'active';
-        }).length
-      });
     };
     inlineCommentGetState(ids, isNestedRender).then(cb);
-  }, [actions, providers, adfDocument, isNestedRender, onLoadComplete]);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

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

@@ -10,12 +10,10 @@ import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
 import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
 var LoadAnnotations = /*#__PURE__*/React.memo(function (_ref) {
   var adfDocument = _ref.adfDocument,
-    isNestedRender = _ref.isNestedRender,
-    onLoadComplete = _ref.onLoadComplete;
+    isNestedRender = _ref.isNestedRender;
   useLoadAnnotations({
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   });
   return null;
 });
@@ -25,8 +23,7 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     annotationProvider = props.annotationProvider,
     rendererRef = props.rendererRef,
     adfDocument = props.adfDocument,
-    isNestedRender = props.isNestedRender,
-    onLoadComplete = props.onLoadComplete;
+    isNestedRender = props.isNestedRender;
   var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   var inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
     type: AnnotationTypes.INLINE_COMMENT,
@@ -45,8 +42,7 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     rendererRef: rendererRef
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
-    isNestedRender: isNestedRender,
-    onLoadComplete: onLoadComplete
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/React.createElement(AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

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

@@ -41,7 +41,6 @@ export interface ReactSerializerInit {
     allowWindowedCodeBlock?: boolean;
     isInsideOfInlineExtension?: boolean;
     textHighlighter?: TextHighlighter;
-    isCommentsOnMediaMediaInlineBugFixEnabled?: boolean;
     allowTableAlignment?: boolean;
     allowTableResizing?: boolean;
 }
@@ -90,7 +89,6 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
     private nodeComponents?;
     private allowWindowedCodeBlock?;
     private isInsideOfInlineExtension?;
-    private isCommentsOnMediaMediaInlineBugFixEnabled?;
     private textHighlighter?;
     private allowTableAlignment?;
     private allowTableResizing?;

package/dist/types/ui/annotations/hooks/use-load-annotations.d.ts

@@ -2,9 +2,6 @@ import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 type Props = {
     adfDocument: JSONDocNode;
     isNestedRender: boolean;
-    onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
-        numberOfUnresolvedInlineComments: number;
-    }) => void;
 };
-export declare const useLoadAnnotations: ({ adfDocument, isNestedRender, onLoadComplete }: Props) => void;
+export declare const useLoadAnnotations: ({ adfDocument, isNestedRender }: Props) => void;
 export {};

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

@@ -16,9 +16,6 @@ export type AnnotationsWrapperProps = React.PropsWithChildren<{
     annotationProvider: AnnotationProviders | null | undefined;
     rendererRef: React.RefObject<HTMLDivElement>;
     isNestedRender: boolean;
-    onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
-        numberOfUnresolvedInlineComments: number;
-    }) => void;
 }>;
 export type TextPosition = {
     start: number;

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

@@ -41,7 +41,6 @@ export interface ReactSerializerInit {
     allowWindowedCodeBlock?: boolean;
     isInsideOfInlineExtension?: boolean;
     textHighlighter?: TextHighlighter;
-    isCommentsOnMediaMediaInlineBugFixEnabled?: boolean;
     allowTableAlignment?: boolean;
     allowTableResizing?: boolean;
 }
@@ -90,7 +89,6 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
     private nodeComponents?;
     private allowWindowedCodeBlock?;
     private isInsideOfInlineExtension?;
-    private isCommentsOnMediaMediaInlineBugFixEnabled?;
     private textHighlighter?;
     private allowTableAlignment?;
     private allowTableResizing?;

package/dist/types-ts4.5/ui/annotations/hooks/use-load-annotations.d.ts

@@ -2,9 +2,6 @@ import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 type Props = {
     adfDocument: JSONDocNode;
     isNestedRender: boolean;
-    onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
-        numberOfUnresolvedInlineComments: number;
-    }) => void;
 };
-export declare const useLoadAnnotations: ({ adfDocument, isNestedRender, onLoadComplete }: Props) => void;
+export declare const useLoadAnnotations: ({ adfDocument, isNestedRender }: Props) => void;
 export {};

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

@@ -16,9 +16,6 @@ export type AnnotationsWrapperProps = React.PropsWithChildren<{
     annotationProvider: AnnotationProviders | null | undefined;
     rendererRef: React.RefObject<HTMLDivElement>;
     isNestedRender: boolean;
-    onLoadComplete?: ({ numberOfUnresolvedInlineComments, }: {
-        numberOfUnresolvedInlineComments: number;
-    }) => void;
 }>;
 export type TextPosition = {
     start: number;

package/package.json

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