@atlaskit/renderer 109.19.2 → 109.19.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/renderer
 
+## 109.19.3
+
+### Patch Changes
+
+- [#92483](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92483) [`bd8804c2b4ad`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bd8804c2b4ad) - Allow realtime comments to correctly infer position of comment on media
+
 ## 109.19.2
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -230,7 +230,7 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
 
       // If from points to a node position,
       // we need to 1 position before it for nodeAt to return the node itself
-      var beforeNodePos = Math.max(from - 1, 0);
+      var beforeNodePos = Math.max(from, 0);
       var possibleNode = this.doc.nodeAt(beforeNodePos);
       if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
         step = new _transform.AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({

package/dist/cjs/react/nodes/media/index.js

@@ -307,9 +307,9 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
     if (pos === undefined) {
       return;
     }
-    if (draftPosition !== null && draftPosition.from === pos) {
+    if (draftPosition !== null && draftPosition.from + 1 === pos) {
       setShouldApplyDraftAnnotation(true);
-      setPosition(draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from);
+      setPosition((draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) + 1);
     } else if (draftPosition === null && shouldApplyDraftAnnotation) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);

package/dist/cjs/steps/index.js

@@ -10,9 +10,6 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 function getStartPos(element) {
   return parseInt(element.dataset.rendererStartPos || '-1', 10);
 }
-var getNodeType = function getNodeType(element) {
-  return element.dataset.nodeType;
-};
 function isPositionPointer(element) {
   return getStartPos(element) > -1;
 }
@@ -26,6 +23,16 @@ function findParent(element) {
   }
   return findParent(parentElement);
 }
+function findMediaParent(element) {
+  var parentElement = element.parentElement;
+  if (!parentElement || isRoot(parentElement)) {
+    return null;
+  }
+  if (parentElement.dataset.nodeType === 'mediaSingle') {
+    return parentElement;
+  }
+  return findParent(parentElement);
+}
 function findParentBeforePointer(element) {
   var parentElement = element.parentElement;
   if (isRoot(parentElement) || !parentElement) {
@@ -135,8 +142,8 @@ function getPosFromRange(range) {
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
-  var parent = findParent(startContainer);
-  if (parent && getNodeType(parent) === 'media') {
+  var parent = findMediaParent(startContainer);
+  if (parent) {
     var pos = getStartPos(parent);
     return {
       from: pos,

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.19.2";
+var packageVersion = "109.19.3";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/es2019/actions/index.js

@@ -208,7 +208,7 @@ export default class RendererActions {
 
     // If from points to a node position,
     // we need to 1 position before it for nodeAt to return the node itself
-    const beforeNodePos = Math.max(from - 1, 0);
+    const beforeNodePos = Math.max(from, 0);
     const possibleNode = this.doc.nodeAt(beforeNodePos);
     if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
       step = new AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({

package/dist/es2019/react/nodes/media/index.js

@@ -281,9 +281,9 @@ const MediaWithDraftAnnotation = props => {
     if (pos === undefined) {
       return;
     }
-    if (draftPosition !== null && draftPosition.from === pos) {
+    if (draftPosition !== null && draftPosition.from + 1 === pos) {
       setShouldApplyDraftAnnotation(true);
-      setPosition(draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from);
+      setPosition((draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) + 1);
     } else if (draftPosition === null && shouldApplyDraftAnnotation) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);

package/dist/es2019/steps/index.js

@@ -2,7 +2,6 @@ import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 function getStartPos(element) {
   return parseInt(element.dataset.rendererStartPos || '-1', 10);
 }
-const getNodeType = element => element.dataset.nodeType;
 function isPositionPointer(element) {
   return getStartPos(element) > -1;
 }
@@ -18,6 +17,18 @@ function findParent(element) {
   }
   return findParent(parentElement);
 }
+function findMediaParent(element) {
+  const {
+    parentElement
+  } = element;
+  if (!parentElement || isRoot(parentElement)) {
+    return null;
+  }
+  if (parentElement.dataset.nodeType === 'mediaSingle') {
+    return parentElement;
+  }
+  return findParent(parentElement);
+}
 function findParentBeforePointer(element) {
   const {
     parentElement
@@ -131,8 +142,8 @@ export function getPosFromRange(range) {
     endContainer,
     endOffset
   } = range;
-  const parent = findParent(startContainer);
-  if (parent && getNodeType(parent) === 'media') {
+  const parent = findMediaParent(startContainer);
+  if (parent) {
     const pos = getStartPos(parent);
     return {
       from: pos,

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.19.2";
+const packageVersion = "109.19.3";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

package/dist/esm/actions/index.js

@@ -223,7 +223,7 @@ var RendererActions = /*#__PURE__*/function () {
 
       // If from points to a node position,
       // we need to 1 position before it for nodeAt to return the node itself
-      var beforeNodePos = Math.max(from - 1, 0);
+      var beforeNodePos = Math.max(from, 0);
       var possibleNode = this.doc.nodeAt(beforeNodePos);
       if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
         step = new AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({

package/dist/esm/react/nodes/media/index.js

@@ -298,9 +298,9 @@ var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
     if (pos === undefined) {
       return;
     }
-    if (draftPosition !== null && draftPosition.from === pos) {
+    if (draftPosition !== null && draftPosition.from + 1 === pos) {
       setShouldApplyDraftAnnotation(true);
-      setPosition(draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from);
+      setPosition((draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) + 1);
     } else if (draftPosition === null && shouldApplyDraftAnnotation) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);

package/dist/esm/steps/index.js

@@ -2,9 +2,6 @@ import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 function getStartPos(element) {
   return parseInt(element.dataset.rendererStartPos || '-1', 10);
 }
-var getNodeType = function getNodeType(element) {
-  return element.dataset.nodeType;
-};
 function isPositionPointer(element) {
   return getStartPos(element) > -1;
 }
@@ -18,6 +15,16 @@ function findParent(element) {
   }
   return findParent(parentElement);
 }
+function findMediaParent(element) {
+  var parentElement = element.parentElement;
+  if (!parentElement || isRoot(parentElement)) {
+    return null;
+  }
+  if (parentElement.dataset.nodeType === 'mediaSingle') {
+    return parentElement;
+  }
+  return findParent(parentElement);
+}
 function findParentBeforePointer(element) {
   var parentElement = element.parentElement;
   if (isRoot(parentElement) || !parentElement) {
@@ -127,8 +134,8 @@ export function getPosFromRange(range) {
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
-  var parent = findParent(startContainer);
-  if (parent && getNodeType(parent) === 'media') {
+  var parent = findMediaParent(startContainer);
+  if (parent) {
     var pos = getStartPos(parent);
     return {
       from: pos,

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.19.2";
+var packageVersion = "109.19.3";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.19.2",
+  "version": "109.19.3",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -38,7 +38,7 @@
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.1.0",
-    "@atlaskit/link-datasource": "^1.27.0",
+    "@atlaskit/link-datasource": "^1.28.0",
     "@atlaskit/media-card": "^77.11.0",
     "@atlaskit/media-client": "^26.3.0",
     "@atlaskit/media-client-react": "^2.0.0",