@atlaskit/renderer 109.19.3 → 109.19.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/renderer
 
+## 109.19.4
+
+### Patch Changes
+
+- [#91941](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91941) [`fded4cd65773`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fded4cd65773) - [ED-22917] fixes position calculation logic for comments on commented inline cards
+- [#92745](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92745) [`0058e08c0a70`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0058e08c0a70) - Revert fix for "Allow realtime comments to correctly infer position of comment on media" (HOT-108750)
+
 ## 109.19.3
 
 ### 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, 0);
+      var beforeNodePos = Math.max(from - 1, 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 + 1 === pos) {
+    if (draftPosition !== null && draftPosition.from === pos) {
       setShouldApplyDraftAnnotation(true);
-      setPosition((draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) + 1);
+      setPosition(draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from);
     } else if (draftPosition === null && shouldApplyDraftAnnotation) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);

package/dist/cjs/steps/index.js

@@ -6,10 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.createAnnotationStep = createAnnotationStep;
 exports.getPosFromRange = getPosFromRange;
 exports.resolvePos = resolvePos;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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;
 }
@@ -23,16 +27,6 @@ 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) {
@@ -59,22 +53,39 @@ function isNodeInlineMark(node) {
 function isElementInlineMark(element) {
   return !!element && Boolean(element.dataset.rendererMark);
 }
+function isNodeInlineTextMark(node) {
+  if (node === null) {
+    return false;
+  }
+  var isInlineMark = isElementNode(node) && Boolean(node.dataset.rendererMark);
+  if (!isInlineMark) {
+    return false;
+  }
+
+  /**
+   * This checks if the element has any descendents with the data-inline-card
+   * attribute set to 'true'. If it does, we should not consider it as an
+   * inline text mark.
+   **/
+
+  if (hasInlineCardDescendant(node)) {
+    return false;
+  }
+  return true;
+}
 
 /**
- * This returns the text content of a node excluding content
- * inside inline cards (spans with data-inline-card="true").
+ * This checks all the descendents of a node and returns true if it reaches
+ * a descendant with the data-inline-card attribute set to 'true'.
  */
-function getPMTextContent(node) {
-  if (isTextNode(node)) {
-    return node.textContent;
-  }
+function hasInlineCardDescendant(node) {
   if (isElementNode(node)) {
     if (node.dataset.inlineCard === 'true') {
-      return '';
+      return true;
     }
-    return Array.from(node.childNodes).map(getPMTextContent).join('');
+    return Array.from(node.childNodes).some(hasInlineCardDescendant);
   }
-  return '';
+  return false;
 }
 function resolveNodePos(node) {
   var resolvedPos = 0;
@@ -83,10 +94,18 @@ function resolveNodePos(node) {
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {
-      if (isNodeInlineMark(prev) && prev.textContent) {
-        resolvedPos += getPMTextContent(prev).length;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+        if (isNodeInlineTextMark(prev) && prev.textContent) {
+          resolvedPos += prev.textContent.length;
+        } else {
+          resolvedPos += 1;
+        }
       } else {
-        resolvedPos += 1;
+        if (isNodeInlineMark(prev) && prev.textContent) {
+          resolvedPos += prev.textContent.length;
+        } else {
+          resolvedPos += 1;
+        }
       }
     }
     prev = prev.previousSibling;
@@ -120,9 +139,16 @@ function resolvePos(node, offset) {
     // If our range is inside an inline node
     // We need to move our pointers to parent element
     // since we don't want to count text inside inline nodes at all
-    if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
-      current = current.parentElement;
-      offset = 0;
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (!(isNodeInlineTextMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
+        current = current.parentElement;
+        offset = 0;
+      }
+    } else {
+      if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
+        current = current.parentElement;
+        offset = 0;
+      }
     }
     resolvedPos += resolveNodePos(current);
     while (current && current.parentElement !== parent) {
@@ -142,8 +168,8 @@ function getPosFromRange(range) {
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
-  var parent = findMediaParent(startContainer);
-  if (parent) {
+  var parent = findParent(startContainer);
+  if (parent && getNodeType(parent) === 'media') {
     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.3";
+var packageVersion = "109.19.4";
 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, 0);
+    const beforeNodePos = Math.max(from - 1, 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 + 1 === pos) {
+    if (draftPosition !== null && draftPosition.from === pos) {
       setShouldApplyDraftAnnotation(true);
-      setPosition((draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) + 1);
+      setPosition(draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from);
     } else if (draftPosition === null && shouldApplyDraftAnnotation) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);

package/dist/es2019/steps/index.js

@@ -1,7 +1,9 @@
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 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;
 }
@@ -17,18 +19,6 @@ 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
@@ -57,22 +47,39 @@ function isNodeInlineMark(node) {
 function isElementInlineMark(element) {
   return !!element && Boolean(element.dataset.rendererMark);
 }
+function isNodeInlineTextMark(node) {
+  if (node === null) {
+    return false;
+  }
+  const isInlineMark = isElementNode(node) && Boolean(node.dataset.rendererMark);
+  if (!isInlineMark) {
+    return false;
+  }
+
+  /**
+   * This checks if the element has any descendents with the data-inline-card
+   * attribute set to 'true'. If it does, we should not consider it as an
+   * inline text mark.
+   **/
+
+  if (hasInlineCardDescendant(node)) {
+    return false;
+  }
+  return true;
+}
 
 /**
- * This returns the text content of a node excluding content
- * inside inline cards (spans with data-inline-card="true").
+ * This checks all the descendents of a node and returns true if it reaches
+ * a descendant with the data-inline-card attribute set to 'true'.
  */
-function getPMTextContent(node) {
-  if (isTextNode(node)) {
-    return node.textContent;
-  }
+function hasInlineCardDescendant(node) {
   if (isElementNode(node)) {
     if (node.dataset.inlineCard === 'true') {
-      return '';
+      return true;
     }
-    return Array.from(node.childNodes).map(getPMTextContent).join('');
+    return Array.from(node.childNodes).some(hasInlineCardDescendant);
   }
-  return '';
+  return false;
 }
 function resolveNodePos(node) {
   let resolvedPos = 0;
@@ -81,10 +88,18 @@ function resolveNodePos(node) {
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {
-      if (isNodeInlineMark(prev) && prev.textContent) {
-        resolvedPos += getPMTextContent(prev).length;
+      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+        if (isNodeInlineTextMark(prev) && prev.textContent) {
+          resolvedPos += prev.textContent.length;
+        } else {
+          resolvedPos += 1;
+        }
       } else {
-        resolvedPos += 1;
+        if (isNodeInlineMark(prev) && prev.textContent) {
+          resolvedPos += prev.textContent.length;
+        } else {
+          resolvedPos += 1;
+        }
       }
     }
     prev = prev.previousSibling;
@@ -118,9 +133,16 @@ export function resolvePos(node, offset) {
     // If our range is inside an inline node
     // We need to move our pointers to parent element
     // since we don't want to count text inside inline nodes at all
-    if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
-      current = current.parentElement;
-      offset = 0;
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (!(isNodeInlineTextMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
+        current = current.parentElement;
+        offset = 0;
+      }
+    } else {
+      if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
+        current = current.parentElement;
+        offset = 0;
+      }
     }
     resolvedPos += resolveNodePos(current);
     while (current && current.parentElement !== parent) {
@@ -142,8 +164,8 @@ export function getPosFromRange(range) {
     endContainer,
     endOffset
   } = range;
-  const parent = findMediaParent(startContainer);
-  if (parent) {
+  const parent = findParent(startContainer);
+  if (parent && getNodeType(parent) === 'media') {
     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.3";
+const packageVersion = "109.19.4";
 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, 0);
+      var beforeNodePos = Math.max(from - 1, 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 + 1 === pos) {
+    if (draftPosition !== null && draftPosition.from === pos) {
       setShouldApplyDraftAnnotation(true);
-      setPosition((draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from) + 1);
+      setPosition(draftPosition === null || draftPosition === void 0 ? void 0 : draftPosition.from);
     } else if (draftPosition === null && shouldApplyDraftAnnotation) {
       setShouldApplyDraftAnnotation(false);
       setPosition(undefined);

package/dist/esm/steps/index.js

@@ -1,7 +1,11 @@
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 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;
 }
@@ -15,16 +19,6 @@ 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) {
@@ -51,22 +45,39 @@ function isNodeInlineMark(node) {
 function isElementInlineMark(element) {
   return !!element && Boolean(element.dataset.rendererMark);
 }
+function isNodeInlineTextMark(node) {
+  if (node === null) {
+    return false;
+  }
+  var isInlineMark = isElementNode(node) && Boolean(node.dataset.rendererMark);
+  if (!isInlineMark) {
+    return false;
+  }
+
+  /**
+   * This checks if the element has any descendents with the data-inline-card
+   * attribute set to 'true'. If it does, we should not consider it as an
+   * inline text mark.
+   **/
+
+  if (hasInlineCardDescendant(node)) {
+    return false;
+  }
+  return true;
+}
 
 /**
- * This returns the text content of a node excluding content
- * inside inline cards (spans with data-inline-card="true").
+ * This checks all the descendents of a node and returns true if it reaches
+ * a descendant with the data-inline-card attribute set to 'true'.
  */
-function getPMTextContent(node) {
-  if (isTextNode(node)) {
-    return node.textContent;
-  }
+function hasInlineCardDescendant(node) {
   if (isElementNode(node)) {
     if (node.dataset.inlineCard === 'true') {
-      return '';
+      return true;
     }
-    return Array.from(node.childNodes).map(getPMTextContent).join('');
+    return Array.from(node.childNodes).some(hasInlineCardDescendant);
   }
-  return '';
+  return false;
 }
 function resolveNodePos(node) {
   var resolvedPos = 0;
@@ -75,10 +86,18 @@ function resolveNodePos(node) {
     if (prev && (isTextNode(prev) || isHighlightTextNode(prev))) {
       resolvedPos += (prev.textContent || '').length;
     } else if (prev) {
-      if (isNodeInlineMark(prev) && prev.textContent) {
-        resolvedPos += getPMTextContent(prev).length;
+      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+        if (isNodeInlineTextMark(prev) && prev.textContent) {
+          resolvedPos += prev.textContent.length;
+        } else {
+          resolvedPos += 1;
+        }
       } else {
-        resolvedPos += 1;
+        if (isNodeInlineMark(prev) && prev.textContent) {
+          resolvedPos += prev.textContent.length;
+        } else {
+          resolvedPos += 1;
+        }
       }
     }
     prev = prev.previousSibling;
@@ -112,9 +131,16 @@ export function resolvePos(node, offset) {
     // If our range is inside an inline node
     // We need to move our pointers to parent element
     // since we don't want to count text inside inline nodes at all
-    if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
-      current = current.parentElement;
-      offset = 0;
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (!(isNodeInlineTextMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
+        current = current.parentElement;
+        offset = 0;
+      }
+    } else {
+      if (!(isElementInlineMark(preParentPointer) || isHighlightTextNode(preParentPointer))) {
+        current = current.parentElement;
+        offset = 0;
+      }
     }
     resolvedPos += resolveNodePos(current);
     while (current && current.parentElement !== parent) {
@@ -134,8 +160,8 @@ export function getPosFromRange(range) {
     startOffset = range.startOffset,
     endContainer = range.endContainer,
     endOffset = range.endOffset;
-  var parent = findMediaParent(startContainer);
-  if (parent) {
+  var parent = findParent(startContainer);
+  if (parent && getNodeType(parent) === 'media') {
     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.3";
+var packageVersion = "109.19.4";
 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.3",
+  "version": "109.19.4",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/button": "^17.12.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/editor-common": "^78.29.0",
+    "@atlaskit/editor-common": "^78.30.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-palette": "1.5.3",
     "@atlaskit/editor-prosemirror": "3.0.0",
@@ -44,7 +44,7 @@
     "@atlaskit/media-client-react": "^2.0.0",
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/media-filmstrip": "^47.0.0",
-    "@atlaskit/media-ui": "^25.7.0",
+    "@atlaskit/media-ui": "^25.8.0",
     "@atlaskit/media-viewer": "^48.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/smart-card": "^26.56.0",