@atlaskit/renderer 109.22.4 → 109.23.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/renderer
 
+## 109.23.0
+
+### Minor Changes
+
+-   [#94933](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94933)
+    [`7ff4fe1eecfa`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7ff4fe1eecfa) -
+    Added isNestedRenderer to check for macros
+
 ## 109.22.4
 
 ### Patch Changes

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

@@ -55,7 +55,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.22.4";
+var packageVersion = "109.23.0";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);
@@ -581,7 +581,8 @@ var RendererWithAnnotationSelection = function RendererWithAnnotationSelection(p
   return (0, _react2.jsx)(_RendererActionsContext.RendererActionsContext, null, (0, _react2.jsx)(_annotations.AnnotationsWrapper, {
     rendererRef: innerRef,
     adfDocument: adfDocument,
-    annotationProvider: props.annotationProvider
+    annotationProvider: props.annotationProvider,
+    isNestedRender: true
   }, (0, _react2.jsx)(RendererWithAnalytics, (0, _extends2.default)({
     innerRef: innerRef
   }, props, {

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

@@ -13,7 +13,8 @@ var _RendererActionsContext = require("../../RendererActionsContext");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotations(_ref) {
-  var adfDocument = _ref.adfDocument;
+  var adfDocument = _ref.adfDocument,
+    isNestedRender = _ref.isNestedRender;
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   (0, _react.useEffect)(function () {
@@ -40,6 +41,6 @@ var useLoadAnnotations = exports.useLoadAnnotations = function useLoadAnnotation
       }, {});
       updateSubscriberInlineComment.emit(_types.AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
     };
-    inlineCommentGetState(ids).then(cb);
-  }, [actions, providers, adfDocument]);
+    inlineCommentGetState(ids, isNestedRender).then(cb);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

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

@@ -30,9 +30,11 @@ var _AnnotationHoverContext = require("./contexts/AnnotationHoverContext");
 var _draft = require("./draft");
 var _element = require("./element");
 var LoadAnnotations = /*#__PURE__*/_react.default.memo(function (_ref) {
-  var adfDocument = _ref.adfDocument;
+  var adfDocument = _ref.adfDocument,
+    isNestedRender = _ref.isNestedRender;
   (0, _useLoadAnnotations.useLoadAnnotations)({
-    adfDocument: adfDocument
+    adfDocument: adfDocument,
+    isNestedRender: isNestedRender
   });
   return null;
 });
@@ -41,7 +43,8 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
   var children = props.children,
     annotationProvider = props.annotationProvider,
     rendererRef = props.rendererRef,
-    adfDocument = props.adfDocument;
+    adfDocument = props.adfDocument,
+    isNestedRender = props.isNestedRender;
   var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   var inlineCommentAnnotationsState = (0, _useEvents.useAnnotationStateByTypeEvent)({
     type: _adfSchema.AnnotationTypes.INLINE_COMMENT,
@@ -59,7 +62,8 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
     createAnalyticsEvent: createAnalyticsEvent,
     rendererRef: rendererRef
   }, /*#__PURE__*/_react.default.createElement(LoadAnnotations, {
-    adfDocument: adfDocument
+    adfDocument: adfDocument,
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/_react.default.createElement(_view.AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

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

@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.22.4";
+const packageVersion = "109.23.0";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);
@@ -554,7 +554,8 @@ const RendererWithAnnotationSelection = props => {
   return jsx(RendererActionsContext, null, jsx(AnnotationsWrapper, {
     rendererRef: innerRef,
     adfDocument: adfDocument,
-    annotationProvider: props.annotationProvider
+    annotationProvider: props.annotationProvider,
+    isNestedRender: true
   }, jsx(RendererWithAnalytics, _extends({
     innerRef: innerRef
   }, props, {

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

@@ -3,7 +3,8 @@ import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 import { ProvidersContext } from '../context';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 export const useLoadAnnotations = ({
-  adfDocument
+  adfDocument,
+  isNestedRender
 }) => {
   const actions = useContext(ActionsContext);
   const providers = useContext(ProvidersContext);
@@ -33,6 +34,6 @@ export const useLoadAnnotations = ({
       }), {});
       updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
     };
-    inlineCommentGetState(ids).then(cb);
-  }, [actions, providers, adfDocument]);
+    inlineCommentGetState(ids, isNestedRender).then(cb);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

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

@@ -9,10 +9,12 @@ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
 import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
 const LoadAnnotations = /*#__PURE__*/React.memo(({
-  adfDocument
+  adfDocument,
+  isNestedRender
 }) => {
   useLoadAnnotations({
-    adfDocument
+    adfDocument,
+    isNestedRender
   });
   return null;
 });
@@ -22,7 +24,8 @@ export const AnnotationsWrapper = props => {
     children,
     annotationProvider,
     rendererRef,
-    adfDocument
+    adfDocument,
+    isNestedRender
   } = props;
   const updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   const inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
@@ -42,7 +45,8 @@ export const AnnotationsWrapper = props => {
     createAnalyticsEvent: createAnalyticsEvent,
     rendererRef: rendererRef
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
-    adfDocument: adfDocument
+    adfDocument: adfDocument,
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/React.createElement(AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

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

@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.22.4";
+var packageVersion = "109.23.0";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);
@@ -572,7 +572,8 @@ var RendererWithAnnotationSelection = function RendererWithAnnotationSelection(p
   return jsx(RendererActionsContext, null, jsx(AnnotationsWrapper, {
     rendererRef: innerRef,
     adfDocument: adfDocument,
-    annotationProvider: props.annotationProvider
+    annotationProvider: props.annotationProvider,
+    isNestedRender: true
   }, jsx(RendererWithAnalytics, _extends({
     innerRef: innerRef
   }, props, {

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

@@ -6,7 +6,8 @@ import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 import { ProvidersContext } from '../context';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';
 export var useLoadAnnotations = function useLoadAnnotations(_ref) {
-  var adfDocument = _ref.adfDocument;
+  var adfDocument = _ref.adfDocument,
+    isNestedRender = _ref.isNestedRender;
   var actions = useContext(ActionsContext);
   var providers = useContext(ProvidersContext);
   useEffect(function () {
@@ -33,6 +34,6 @@ export var useLoadAnnotations = function useLoadAnnotations(_ref) {
       }, {});
       updateSubscriberInlineComment.emit(AnnotationUpdateEvent.SET_ANNOTATION_STATE, payload);
     };
-    inlineCommentGetState(ids).then(cb);
-  }, [actions, providers, adfDocument]);
+    inlineCommentGetState(ids, isNestedRender).then(cb);
+  }, [actions, providers, adfDocument, isNestedRender]);
 };

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

@@ -9,9 +9,11 @@ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { AnnotationRangeProvider } from './contexts/AnnotationRangeContext';
 import { AnnotationHoverContext } from './contexts/AnnotationHoverContext';
 var LoadAnnotations = /*#__PURE__*/React.memo(function (_ref) {
-  var adfDocument = _ref.adfDocument;
+  var adfDocument = _ref.adfDocument,
+    isNestedRender = _ref.isNestedRender;
   useLoadAnnotations({
-    adfDocument: adfDocument
+    adfDocument: adfDocument,
+    isNestedRender: isNestedRender
   });
   return null;
 });
@@ -20,7 +22,8 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
   var children = props.children,
     annotationProvider = props.annotationProvider,
     rendererRef = props.rendererRef,
-    adfDocument = props.adfDocument;
+    adfDocument = props.adfDocument,
+    isNestedRender = props.isNestedRender;
   var updateSubscriber = annotationProvider && annotationProvider.inlineComment && annotationProvider.inlineComment.updateSubscriber;
   var inlineCommentAnnotationsState = useAnnotationStateByTypeEvent({
     type: AnnotationTypes.INLINE_COMMENT,
@@ -38,7 +41,8 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     createAnalyticsEvent: createAnalyticsEvent,
     rendererRef: rendererRef
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
-    adfDocument: adfDocument
+    adfDocument: adfDocument,
+    isNestedRender: isNestedRender
   }), /*#__PURE__*/React.createElement(AnnotationView, {
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { JSONDocNode } from '@atlaskit/editor-json-transformer';
+import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { AnnotationProviders } from '@atlaskit/editor-common/types';
 export declare enum InsertDraftPosition {
     AROUND_TEXT = "AROUND_TEXT",
@@ -15,6 +15,7 @@ export type AnnotationsWrapperProps = React.PropsWithChildren<{
     adfDocument: JSONDocNode;
     annotationProvider: AnnotationProviders | null | undefined;
     rendererRef: React.RefObject<HTMLDivElement>;
+    isNestedRender: boolean;
 }>;
 export type TextPosition = {
     start: number;

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { JSONDocNode } from '@atlaskit/editor-json-transformer';
+import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { AnnotationProviders } from '@atlaskit/editor-common/types';
 export declare enum InsertDraftPosition {
     AROUND_TEXT = "AROUND_TEXT",
@@ -15,6 +15,7 @@ export type AnnotationsWrapperProps = React.PropsWithChildren<{
     adfDocument: JSONDocNode;
     annotationProvider: AnnotationProviders | null | undefined;
     rendererRef: React.RefObject<HTMLDivElement>;
+    isNestedRender: boolean;
 }>;
 export type TextPosition = {
     start: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.22.4",
+  "version": "109.23.0",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -49,9 +49,9 @@
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/smart-card": "^26.59.0",
     "@atlaskit/status": "^1.4.0",
-    "@atlaskit/task-decision": "^17.9.0",
+    "@atlaskit/task-decision": "^17.10.0",
     "@atlaskit/theme": "^12.7.0",
-    "@atlaskit/tokens": "^1.44.0",
+    "@atlaskit/tokens": "^1.45.0",
     "@atlaskit/tooltip": "^18.3.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",