@atlaskit/renderer 109.24.1 → 109.25.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/renderer
 
+## 109.25.0
+
+### Minor Changes
+
+-   [#94548](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94548)
+    [`9eacc753e6eb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9eacc753e6eb) - -
+    Update applyAnnotation action to return annotation target nodeType
+    -   Define MEDIA_CONTAINER for media node
+
+### Patch Changes
+
+-   Updated dependencies
+
+## 109.24.2
+
+### Patch Changes
+
+-   Updated dependencies
+
 ## 109.24.1
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -16,6 +16,8 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _steps = require("../steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _matchesUtils = require("./matches-utils");
+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 RendererActions = exports.default = /*#__PURE__*/function () {
   // Any kind of refence is allowed
 
@@ -227,6 +229,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       var annotationId = annotation.annotationId,
         annotationType = annotation.annotationType;
       var step;
+      var targetNodeType;
       var beforeNodePos = isCommentsOnMediaBugFixEnabled ?
       // As part of fix for RAP, `from` points to the position right before media node
       // hence, -1 is not needed
@@ -236,11 +239,13 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       Math.max(from - 1, 0);
       var possibleNode = this.doc.nodeAt(beforeNodePos);
       if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
+        targetNodeType = 'media';
         step = new _transform.AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({
           id: annotationId,
           type: annotationType
         }));
       } else {
+        targetNodeType = 'text';
         step = (0, _steps.createAnnotationStep)(from, to, {
           annotationId: annotationId,
           annotationType: annotationType,
@@ -258,14 +263,16 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         numMatches = _getIndexMatch.numMatches,
         matchIndex = _getIndexMatch.matchIndex,
         blockNodePos = _getIndexMatch.blockNodePos;
-      return {
+      return _objectSpread({
         step: step,
         doc: this.transformer.encode(doc),
         originalSelection: originalSelection,
         numMatches: numMatches,
         matchIndex: matchIndex,
         pos: blockNodePos
-      };
+      }, isCommentsOnMediaBugFixEnabled && {
+        targetNodeType: targetNodeType
+      });
     }
   }, {
     key: "generateAnnotationIndexMatch",

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.24.1";
+var packageVersion = "109.25.0";
 var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);

package/dist/es2019/actions/index.js

@@ -205,6 +205,7 @@ export default class RendererActions {
       annotationType
     } = annotation;
     let step;
+    let targetNodeType;
     const beforeNodePos = isCommentsOnMediaBugFixEnabled ?
     // As part of fix for RAP, `from` points to the position right before media node
     // hence, -1 is not needed
@@ -214,11 +215,13 @@ export default class RendererActions {
     Math.max(from - 1, 0);
     const possibleNode = this.doc.nodeAt(beforeNodePos);
     if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
+      targetNodeType = 'media';
       step = new AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({
         id: annotationId,
         type: annotationType
       }));
     } else {
+      targetNodeType = 'text';
       step = createAnnotationStep(from, to, {
         annotationId,
         annotationType,
@@ -244,7 +247,10 @@ export default class RendererActions {
       originalSelection,
       numMatches,
       matchIndex,
-      pos: blockNodePos
+      pos: blockNodePos,
+      ...(isCommentsOnMediaBugFixEnabled && {
+        targetNodeType
+      })
     };
   }
   generateAnnotationIndexMatch(pos) {

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.24.1";
+const packageVersion = "109.25.0";
 export const defaultNodeComponents = nodeToReact;
 export class Renderer extends PureComponent {
   constructor(props) {

package/dist/esm/actions/index.js

@@ -2,6 +2,8 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common/utils';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
@@ -220,6 +222,7 @@ var RendererActions = /*#__PURE__*/function () {
       var annotationId = annotation.annotationId,
         annotationType = annotation.annotationType;
       var step;
+      var targetNodeType;
       var beforeNodePos = isCommentsOnMediaBugFixEnabled ?
       // As part of fix for RAP, `from` points to the position right before media node
       // hence, -1 is not needed
@@ -229,11 +232,13 @@ var RendererActions = /*#__PURE__*/function () {
       Math.max(from - 1, 0);
       var possibleNode = this.doc.nodeAt(beforeNodePos);
       if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
+        targetNodeType = 'media';
         step = new AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({
           id: annotationId,
           type: annotationType
         }));
       } else {
+        targetNodeType = 'text';
         step = createAnnotationStep(from, to, {
           annotationId: annotationId,
           annotationType: annotationType,
@@ -251,14 +256,16 @@ var RendererActions = /*#__PURE__*/function () {
         numMatches = _getIndexMatch.numMatches,
         matchIndex = _getIndexMatch.matchIndex,
         blockNodePos = _getIndexMatch.blockNodePos;
-      return {
+      return _objectSpread({
         step: step,
         doc: this.transformer.encode(doc),
         originalSelection: originalSelection,
         numMatches: numMatches,
         matchIndex: matchIndex,
         pos: blockNodePos
-      };
+      }, isCommentsOnMediaBugFixEnabled && {
+        targetNodeType: targetNodeType
+      });
     }
   }, {
     key: "generateAnnotationIndexMatch",

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.24.1";
+var packageVersion = "109.25.0";
 export var defaultNodeComponents = nodeToReact;
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.24.1",
+  "version": "109.25.0",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,20 +31,20 @@
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/button": "^17.14.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/editor-common": "^79.0.0",
+    "@atlaskit/editor-common": "^79.1.0",
     "@atlaskit/editor-json-transformer": "^8.11.0",
     "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-prosemirror": "4.0.0",
     "@atlaskit/editor-shared-styles": "^2.10.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.1.0",
-    "@atlaskit/link-datasource": "^1.31.0",
+    "@atlaskit/link-datasource": "^2.0.0",
     "@atlaskit/media-card": "^77.11.0",
     "@atlaskit/media-client": "^26.3.0",
     "@atlaskit/media-client-react": "^2.0.0",
     "@atlaskit/media-common": "^11.2.0",
     "@atlaskit/media-filmstrip": "^47.0.0",
-    "@atlaskit/media-ui": "^25.9.0",
+    "@atlaskit/media-ui": "^25.10.0",
     "@atlaskit/media-viewer": "^48.5.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/smart-card": "^26.59.0",