@atlaskit/renderer 114.9.1 → 114.10.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/renderer
 
+## 114.10.0
+
+### Minor Changes
+
+- [#144384](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144384)
+  [`3a650f8970f01`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3a650f8970f01) -
+  Adding emoji load callbacks to Renderer EmojiConfig
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 114.9.1
 
 ### Patch Changes

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

@@ -63,7 +63,9 @@ var EmojiNode = /*#__PURE__*/function (_PureComponent) {
           fallback: fallback,
           shortName: shortName
         }),
-        editorEmoji: true
+        editorEmoji: true,
+        onEmojiLoadSuccess: resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.onEmojiLoadSuccess,
+        onEmojiLoadFail: resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.onEmojiLoadFail
       });
     });
     _this.providerFactory = props.providers || new _providerFactory.ProviderFactory();

package/dist/cjs/steps/index.js

@@ -110,6 +110,14 @@ function resolveNodePos(node) {
   var resolvedPos = 0;
   var prev = node.previousSibling;
   while (prev) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_annotation_position_comment_nodes')) {
+      if (prev.nodeType === Node.COMMENT_NODE) {
+        // Comment nodes should not result in the position being
+        // incremented, so we skip them.
+        prev = prev.previousSibling;
+        continue;
+      }
+    }
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {

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

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

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

@@ -13,6 +13,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -63,11 +64,24 @@ var AnnotationsDraftContextWrapper = exports.AnnotationsDraftContextWrapper = /*
   return (0, _createClass2.default)(AnnotationsDraftContextWrapper, [{
     key: "render",
     value: function render() {
-      var children = this.props.children;
+      var _this$props = this.props,
+        children = _this$props.children,
+        isNestedRender = _this$props.isNestedRender;
       var position = this.state.position;
       var applyAnnotationDraftAt = this.applyAnnotationDraftAt;
       var clearAnnotationDraft = this.clearAnnotationDraft;
-      return /*#__PURE__*/_react.default.createElement(AnnotationsDraftContext.Provider, {
+
+      /*
+       * If this is a nested render, we do not provide the draft context
+       * because it has already been provided higher up the component tree
+       * and we need the original context to create draft annotations on extensions.
+       */
+      return isNestedRender && (0, _platformFeatureFlags.fg)('confluence_frontend_fix_extension_draft_annotation') ? /*#__PURE__*/_react.default.createElement("span", {
+        "data-testid": "context-wrapper-without-provider"
+      }, children({
+        applyAnnotationDraftAt: applyAnnotationDraftAt,
+        clearAnnotationDraft: clearAnnotationDraft
+      })) : /*#__PURE__*/_react.default.createElement(AnnotationsDraftContext.Provider, {
         value: position
       }, children({
         applyAnnotationDraftAt: applyAnnotationDraftAt,

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

@@ -57,7 +57,8 @@ var AnnotationsWrapper = exports.AnnotationsWrapper = function AnnotationsWrappe
     allowCommentsOnMedia: (_annotationProvider$i = annotationProvider === null || annotationProvider === void 0 || (_annotationProvider$i2 = annotationProvider.inlineComment) === null || _annotationProvider$i2 === void 0 ? void 0 : _annotationProvider$i2.allowCommentsOnMedia) !== null && _annotationProvider$i !== void 0 ? _annotationProvider$i : false
   }, /*#__PURE__*/_react.default.createElement(_AnnotationHoverContext.AnnotationHoverContext, null, /*#__PURE__*/_react.default.createElement(_wrapper.AnnotationsContextWrapper, {
     createAnalyticsEvent: createAnalyticsEvent,
-    rendererRef: rendererRef
+    rendererRef: rendererRef,
+    isNestedRender: isNestedRender
   }, /*#__PURE__*/_react.default.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
     isNestedRender: isNestedRender,

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

@@ -22,7 +22,8 @@ var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function Ann
     clearDraftRange = _useAnnotationRangeDi.clearDraftRange;
   var rendererRef = props.rendererRef,
     createAnalyticsEvent = props.createAnalyticsEvent,
-    children = props.children;
+    children = props.children,
+    isNestedRender = props.isNestedRender;
   var inlineCommentProvider = providers && providers.inlineComment;
   var selectionComponent = inlineCommentProvider && inlineCommentProvider.selectionComponent;
   var hoverComponent = inlineCommentProvider && inlineCommentProvider.hoverComponent;
@@ -62,6 +63,7 @@ var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function Ann
   }
   return /*#__PURE__*/_react.default.createElement(_context.AnnotationsDraftContextWrapper, {
     setDraftRange: setRangeForDraft,
-    clearDraftRange: clearRangeForDraft
+    clearDraftRange: clearRangeForDraft,
+    isNestedRender: isNestedRender
   }, render);
 };

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

@@ -50,7 +50,9 @@ class EmojiNode extends PureComponent {
           fallback,
           shortName
         }),
-        editorEmoji: true
+        editorEmoji: true,
+        onEmojiLoadSuccess: resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.onEmojiLoadSuccess,
+        onEmojiLoadFail: resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.onEmojiLoadFail
       });
     });
     this.providerFactory = props.providers || new ProviderFactory();

package/dist/es2019/steps/index.js

@@ -105,6 +105,14 @@ function resolveNodePos(node) {
   let resolvedPos = 0;
   let prev = node.previousSibling;
   while (prev) {
+    if (fg('platform_editor_annotation_position_comment_nodes')) {
+      if (prev.nodeType === Node.COMMENT_NODE) {
+        // Comment nodes should not result in the position being
+        // incremented, so we skip them.
+        prev = prev.previousSibling;
+        continue;
+      }
+    }
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {

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

@@ -48,7 +48,7 @@ import { removeEmptySpaceAroundContent } from './rendererHelper';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "114.9.1";
+const packageVersion = "114.10.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { createContext } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const AnnotationsDraftContext = /*#__PURE__*/createContext(null);
 export const ProvidersContext = /*#__PURE__*/createContext(null);
 export const InlineCommentsStateContext = /*#__PURE__*/createContext({});
@@ -42,14 +43,26 @@ export class AnnotationsDraftContextWrapper extends React.Component {
   }
   render() {
     const {
-      children
+      children,
+      isNestedRender
     } = this.props;
     const {
       position
     } = this.state;
     const applyAnnotationDraftAt = this.applyAnnotationDraftAt;
     const clearAnnotationDraft = this.clearAnnotationDraft;
-    return /*#__PURE__*/React.createElement(AnnotationsDraftContext.Provider, {
+
+    /*
+     * If this is a nested render, we do not provide the draft context
+     * because it has already been provided higher up the component tree
+     * and we need the original context to create draft annotations on extensions.
+     */
+    return isNestedRender && fg('confluence_frontend_fix_extension_draft_annotation') ? /*#__PURE__*/React.createElement("span", {
+      "data-testid": "context-wrapper-without-provider"
+    }, children({
+      applyAnnotationDraftAt,
+      clearAnnotationDraft
+    })) : /*#__PURE__*/React.createElement(AnnotationsDraftContext.Provider, {
       value: position
     }, children({
       applyAnnotationDraftAt,

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

@@ -54,7 +54,8 @@ export const AnnotationsWrapper = props => {
     allowCommentsOnMedia: (_annotationProvider$i = annotationProvider === null || annotationProvider === void 0 ? void 0 : (_annotationProvider$i2 = annotationProvider.inlineComment) === null || _annotationProvider$i2 === void 0 ? void 0 : _annotationProvider$i2.allowCommentsOnMedia) !== null && _annotationProvider$i !== void 0 ? _annotationProvider$i : false
   }, /*#__PURE__*/React.createElement(AnnotationHoverContext, null, /*#__PURE__*/React.createElement(AnnotationsContextWrapper, {
     createAnalyticsEvent: createAnalyticsEvent,
-    rendererRef: rendererRef
+    rendererRef: rendererRef,
+    isNestedRender: isNestedRender
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
     isNestedRender: isNestedRender,

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

@@ -16,7 +16,8 @@ export const AnnotationsContextWrapper = props => {
   const {
     rendererRef,
     createAnalyticsEvent,
-    children
+    children,
+    isNestedRender
   } = props;
   const inlineCommentProvider = providers && providers.inlineComment;
   const selectionComponent = inlineCommentProvider && inlineCommentProvider.selectionComponent;
@@ -58,6 +59,7 @@ export const AnnotationsContextWrapper = props => {
   }
   return /*#__PURE__*/React.createElement(AnnotationsDraftContextWrapper, {
     setDraftRange: setRangeForDraft,
-    clearDraftRange: clearRangeForDraft
+    clearDraftRange: clearRangeForDraft,
+    isNestedRender: isNestedRender
   }, render);
 };

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

@@ -58,7 +58,9 @@ var EmojiNode = /*#__PURE__*/function (_PureComponent) {
           fallback: fallback,
           shortName: shortName
         }),
-        editorEmoji: true
+        editorEmoji: true,
+        onEmojiLoadSuccess: resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.onEmojiLoadSuccess,
+        onEmojiLoadFail: resourceConfig === null || resourceConfig === void 0 ? void 0 : resourceConfig.onEmojiLoadFail
       });
     });
     _this.providerFactory = props.providers || new ProviderFactory();

package/dist/esm/steps/index.js

@@ -101,6 +101,14 @@ function resolveNodePos(node) {
   var resolvedPos = 0;
   var prev = node.previousSibling;
   while (prev) {
+    if (fg('platform_editor_annotation_position_comment_nodes')) {
+      if (prev.nodeType === Node.COMMENT_NODE) {
+        // Comment nodes should not result in the position being
+        // incremented, so we skip them.
+        prev = prev.previousSibling;
+        continue;
+      }
+    }
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {

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

@@ -57,7 +57,7 @@ import { removeEmptySpaceAroundContent } from './rendererHelper';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "114.9.1";
+var packageVersion = "114.10.0";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -7,6 +7,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React, { createContext } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var AnnotationsDraftContext = /*#__PURE__*/createContext(null);
 export var ProvidersContext = /*#__PURE__*/createContext(null);
 export var InlineCommentsStateContext = /*#__PURE__*/createContext({});
@@ -53,11 +54,24 @@ export var AnnotationsDraftContextWrapper = /*#__PURE__*/function (_React$Compon
   return _createClass(AnnotationsDraftContextWrapper, [{
     key: "render",
     value: function render() {
-      var children = this.props.children;
+      var _this$props = this.props,
+        children = _this$props.children,
+        isNestedRender = _this$props.isNestedRender;
       var position = this.state.position;
       var applyAnnotationDraftAt = this.applyAnnotationDraftAt;
       var clearAnnotationDraft = this.clearAnnotationDraft;
-      return /*#__PURE__*/React.createElement(AnnotationsDraftContext.Provider, {
+
+      /*
+       * If this is a nested render, we do not provide the draft context
+       * because it has already been provided higher up the component tree
+       * and we need the original context to create draft annotations on extensions.
+       */
+      return isNestedRender && fg('confluence_frontend_fix_extension_draft_annotation') ? /*#__PURE__*/React.createElement("span", {
+        "data-testid": "context-wrapper-without-provider"
+      }, children({
+        applyAnnotationDraftAt: applyAnnotationDraftAt,
+        clearAnnotationDraft: clearAnnotationDraft
+      })) : /*#__PURE__*/React.createElement(AnnotationsDraftContext.Provider, {
         value: position
       }, children({
         applyAnnotationDraftAt: applyAnnotationDraftAt,

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

@@ -50,7 +50,8 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     allowCommentsOnMedia: (_annotationProvider$i = annotationProvider === null || annotationProvider === void 0 || (_annotationProvider$i2 = annotationProvider.inlineComment) === null || _annotationProvider$i2 === void 0 ? void 0 : _annotationProvider$i2.allowCommentsOnMedia) !== null && _annotationProvider$i !== void 0 ? _annotationProvider$i : false
   }, /*#__PURE__*/React.createElement(AnnotationHoverContext, null, /*#__PURE__*/React.createElement(AnnotationsContextWrapper, {
     createAnalyticsEvent: createAnalyticsEvent,
-    rendererRef: rendererRef
+    rendererRef: rendererRef,
+    isNestedRender: isNestedRender
   }, /*#__PURE__*/React.createElement(LoadAnnotations, {
     adfDocument: adfDocument,
     isNestedRender: isNestedRender,

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

@@ -13,7 +13,8 @@ export var AnnotationsContextWrapper = function AnnotationsContextWrapper(props)
     clearDraftRange = _useAnnotationRangeDi.clearDraftRange;
   var rendererRef = props.rendererRef,
     createAnalyticsEvent = props.createAnalyticsEvent,
-    children = props.children;
+    children = props.children,
+    isNestedRender = props.isNestedRender;
   var inlineCommentProvider = providers && providers.inlineComment;
   var selectionComponent = inlineCommentProvider && inlineCommentProvider.selectionComponent;
   var hoverComponent = inlineCommentProvider && inlineCommentProvider.hoverComponent;
@@ -53,6 +54,7 @@ export var AnnotationsContextWrapper = function AnnotationsContextWrapper(props)
   }
   return /*#__PURE__*/React.createElement(AnnotationsDraftContextWrapper, {
     setDraftRange: setRangeForDraft,
-    clearDraftRange: clearRangeForDraft
+    clearDraftRange: clearRangeForDraft,
+    isNestedRender: isNestedRender
   }, render);
 };

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

@@ -11,6 +11,7 @@ type Props = {
     setDraftRange: () => void;
     clearDraftRange: () => void;
     children: RenderCallbackType;
+    isNestedRender?: boolean;
 };
 type State = {
     position: Position | null;

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

@@ -3,6 +3,7 @@ import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
 type Props = {
     rendererRef: React.RefObject<HTMLDivElement>;
     createAnalyticsEvent?: CreateUIAnalyticsEvent;
+    isNestedRender?: boolean;
 };
 export declare const AnnotationsContextWrapper: (props: React.PropsWithChildren<Props>) => JSX.Element;
 export {};

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

@@ -11,6 +11,7 @@ type Props = {
     setDraftRange: () => void;
     clearDraftRange: () => void;
     children: RenderCallbackType;
+    isNestedRender?: boolean;
 };
 type State = {
     position: Position | null;

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

@@ -3,6 +3,7 @@ import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
 type Props = {
     rendererRef: React.RefObject<HTMLDivElement>;
     createAnalyticsEvent?: CreateUIAnalyticsEvent;
+    isNestedRender?: boolean;
 };
 export declare const AnnotationsContextWrapper: (props: React.PropsWithChildren<Props>) => JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "114.9.1",
+	"version": "114.10.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,16 +31,16 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/code": "^17.0.0",
-		"@atlaskit/editor-common": "^103.8.0",
+		"@atlaskit/editor-common": "^103.14.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
-		"@atlaskit/emoji": "^69.0.0",
-		"@atlaskit/feature-gate-js-client": "^5.0.0",
+		"@atlaskit/emoji": "^69.1.0",
+		"@atlaskit/feature-gate-js-client": "^5.2.0",
 		"@atlaskit/icon": "^25.6.0",
-		"@atlaskit/link-datasource": "^4.3.0",
-		"@atlaskit/media-card": "^79.1.0",
+		"@atlaskit/link-datasource": "^4.5.0",
+		"@atlaskit/media-card": "^79.2.0",
 		"@atlaskit/media-client": "^32.0.0",
 		"@atlaskit/media-client-react": "^4.0.0",
 		"@atlaskit/media-common": "^12.0.0",
@@ -49,12 +49,12 @@
 		"@atlaskit/media-viewer": "^52.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.1.0",
-		"@atlaskit/react-ufo": "^3.5.0",
+		"@atlaskit/react-ufo": "^3.6.0",
 		"@atlaskit/smart-card": "^36.8.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.1.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.9.0",
+		"@atlaskit/tmp-editor-statsig": "^4.13.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -123,6 +123,9 @@
 		"cc_complexit_fe_improve_table_sorting": {
 			"type": "boolean"
 		},
+		"platform_editor_annotation_position_comment_nodes": {
+			"type": "boolean"
+		},
 		"platform_editor_typography_ugc": {
 			"type": "boolean"
 		},
@@ -215,6 +218,9 @@
 		},
 		"cc_complexit_fe_memoValidation_redundant_calls": {
 			"type": "boolean"
+		},
+		"confluence_frontend_fix_extension_draft_annotation": {
+			"type": "boolean"
 		}
 	},
 	"af:exports": {