@atlaskit/renderer 109.12.5 → 109.13.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/renderer
 
+## 109.13.0
+
+### Minor Changes
+
+- [#86103](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86103) [`af2544086b27`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/af2544086b27) - Changed comment create mutation to send pos if comment is added to a block node
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 109.12.5
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -231,13 +231,15 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       var originalSelection = doc.textBetween(from, to);
       var _getIndexMatch = (0, _matchesUtils.getIndexMatch)(this.doc, this.schema, originalSelection, from),
         numMatches = _getIndexMatch.numMatches,
-        matchIndex = _getIndexMatch.matchIndex;
+        matchIndex = _getIndexMatch.matchIndex,
+        blockNodePos = _getIndexMatch.blockNodePos;
       return {
         step: step,
         doc: this.transformer.encode(doc),
         originalSelection: originalSelection,
         numMatches: numMatches,
-        matchIndex: matchIndex
+        matchIndex: matchIndex,
+        pos: blockNodePos
       };
     }
   }, {
@@ -251,11 +253,13 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       var originalSelection = this.doc.textBetween(from, to);
       var _getIndexMatch2 = (0, _matchesUtils.getIndexMatch)(this.doc, this.schema, originalSelection, from),
         numMatches = _getIndexMatch2.numMatches,
-        matchIndex = _getIndexMatch2.matchIndex;
+        matchIndex = _getIndexMatch2.matchIndex,
+        blockNodePos = _getIndexMatch2.blockNodePos;
       return {
         originalSelection: originalSelection,
         numMatches: numMatches,
-        matchIndex: matchIndex
+        matchIndex: matchIndex,
+        pos: blockNodePos
       };
     }
   }]);

package/dist/cjs/actions/matches-utils.js

@@ -11,18 +11,28 @@ exports.getIndexMatch = getIndexMatch;
 function getIndexMatch(doc, schema, selectedText, startIndex) {
   var textContent = '';
   var matchIndex = 0;
+  var numMatches = 0;
+  var blockNodePos;
   doc.descendants(function (node, pos) {
+    var nodeType = node.type;
+    var media = schema.nodes.media;
+
     // Mirrors Confluence backend and doesn't construct textContent if it doesn't allow annotations
-    if (node.isText || !node.type.allowsMarkType(schema.marks.annotation)) {
+    // Don't skip media node so that block node can be defined its startIndex in within [nodeStart, nodeEnd]
+    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation)) && nodeType !== media) {
       // Note: `return true` as a parent disallowing annotations does not mean a child disallows annotations.
       // Eg: panel (invalid) > p (valid)
       return true;
     }
     var nodeStart = pos;
     var nodeEnd = nodeStart + node.nodeSize;
-
-    // If the start of the annotation selection is within the current node, we scan the document for previous occurrences
     if (startIndex >= nodeStart && startIndex <= nodeEnd) {
+      // if it's a node block, set position to pos to indicate to the backend
+      // that it's an annotation on a block node
+      if (nodeType === media) {
+        blockNodePos = pos;
+      }
+      // If the start of the annotation selection is within the current node, we scan the document for previous occurrences
       // Find the index by counting all previous instances of the selectedText in the partial textContent
       // Need to scan from start, up to `startIndex` (which includes partial of the current node)
       textContent += doc.textBetween(nodeStart, startIndex - 1);
@@ -37,11 +47,12 @@ function getIndexMatch(doc, schema, selectedText, startIndex) {
   });
 
   // Count total number of matches in final text
-  var numMatches = countMatches(textContent, selectedText);
+  numMatches = countMatches(textContent, selectedText);
   return {
     numMatches: numMatches,
     matchIndex: matchIndex,
-    textContent: textContent
+    textContent: textContent,
+    blockNodePos: blockNodePos
   };
 }
 

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

package/dist/es2019/actions/index.js

@@ -210,14 +210,16 @@ export default class RendererActions {
     const originalSelection = doc.textBetween(from, to);
     const {
       numMatches,
-      matchIndex
+      matchIndex,
+      blockNodePos
     } = getIndexMatch(this.doc, this.schema, originalSelection, from);
     return {
       step,
       doc: this.transformer.encode(doc),
       originalSelection,
       numMatches,
-      matchIndex
+      matchIndex,
+      pos: blockNodePos
     };
   }
   generateAnnotationIndexMatch(pos) {
@@ -231,12 +233,14 @@ export default class RendererActions {
     const originalSelection = this.doc.textBetween(from, to);
     const {
       numMatches,
-      matchIndex
+      matchIndex,
+      blockNodePos
     } = getIndexMatch(this.doc, this.schema, originalSelection, from);
     return {
       originalSelection,
       numMatches,
-      matchIndex
+      matchIndex,
+      pos: blockNodePos
     };
   }
 }

package/dist/es2019/actions/matches-utils.js

@@ -4,18 +4,30 @@
 export function getIndexMatch(doc, schema, selectedText, startIndex) {
   let textContent = '';
   let matchIndex = 0;
+  let numMatches = 0;
+  let blockNodePos;
   doc.descendants((node, pos) => {
+    const nodeType = node.type;
+    const {
+      media
+    } = schema.nodes;
+
     // Mirrors Confluence backend and doesn't construct textContent if it doesn't allow annotations
-    if (node.isText || !node.type.allowsMarkType(schema.marks.annotation)) {
+    // Don't skip media node so that block node can be defined its startIndex in within [nodeStart, nodeEnd]
+    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation)) && nodeType !== media) {
       // Note: `return true` as a parent disallowing annotations does not mean a child disallows annotations.
       // Eg: panel (invalid) > p (valid)
       return true;
     }
     const nodeStart = pos;
     const nodeEnd = nodeStart + node.nodeSize;
-
-    // If the start of the annotation selection is within the current node, we scan the document for previous occurrences
     if (startIndex >= nodeStart && startIndex <= nodeEnd) {
+      // if it's a node block, set position to pos to indicate to the backend
+      // that it's an annotation on a block node
+      if (nodeType === media) {
+        blockNodePos = pos;
+      }
+      // If the start of the annotation selection is within the current node, we scan the document for previous occurrences
       // Find the index by counting all previous instances of the selectedText in the partial textContent
       // Need to scan from start, up to `startIndex` (which includes partial of the current node)
       textContent += doc.textBetween(nodeStart, startIndex - 1);
@@ -30,11 +42,12 @@ export function getIndexMatch(doc, schema, selectedText, startIndex) {
   });
 
   // Count total number of matches in final text
-  const numMatches = countMatches(textContent, selectedText);
+  numMatches = countMatches(textContent, selectedText);
   return {
     numMatches,
     matchIndex,
-    textContent
+    textContent,
+    blockNodePos
   };
 }
 

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

package/dist/esm/actions/index.js

@@ -224,13 +224,15 @@ var RendererActions = /*#__PURE__*/function () {
       var originalSelection = doc.textBetween(from, to);
       var _getIndexMatch = getIndexMatch(this.doc, this.schema, originalSelection, from),
         numMatches = _getIndexMatch.numMatches,
-        matchIndex = _getIndexMatch.matchIndex;
+        matchIndex = _getIndexMatch.matchIndex,
+        blockNodePos = _getIndexMatch.blockNodePos;
       return {
         step: step,
         doc: this.transformer.encode(doc),
         originalSelection: originalSelection,
         numMatches: numMatches,
-        matchIndex: matchIndex
+        matchIndex: matchIndex,
+        pos: blockNodePos
       };
     }
   }, {
@@ -244,11 +246,13 @@ var RendererActions = /*#__PURE__*/function () {
       var originalSelection = this.doc.textBetween(from, to);
       var _getIndexMatch2 = getIndexMatch(this.doc, this.schema, originalSelection, from),
         numMatches = _getIndexMatch2.numMatches,
-        matchIndex = _getIndexMatch2.matchIndex;
+        matchIndex = _getIndexMatch2.matchIndex,
+        blockNodePos = _getIndexMatch2.blockNodePos;
       return {
         originalSelection: originalSelection,
         numMatches: numMatches,
-        matchIndex: matchIndex
+        matchIndex: matchIndex,
+        pos: blockNodePos
       };
     }
   }]);

package/dist/esm/actions/matches-utils.js

@@ -4,18 +4,28 @@
 export function getIndexMatch(doc, schema, selectedText, startIndex) {
   var textContent = '';
   var matchIndex = 0;
+  var numMatches = 0;
+  var blockNodePos;
   doc.descendants(function (node, pos) {
+    var nodeType = node.type;
+    var media = schema.nodes.media;
+
     // Mirrors Confluence backend and doesn't construct textContent if it doesn't allow annotations
-    if (node.isText || !node.type.allowsMarkType(schema.marks.annotation)) {
+    // Don't skip media node so that block node can be defined its startIndex in within [nodeStart, nodeEnd]
+    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation)) && nodeType !== media) {
       // Note: `return true` as a parent disallowing annotations does not mean a child disallows annotations.
       // Eg: panel (invalid) > p (valid)
       return true;
     }
     var nodeStart = pos;
     var nodeEnd = nodeStart + node.nodeSize;
-
-    // If the start of the annotation selection is within the current node, we scan the document for previous occurrences
     if (startIndex >= nodeStart && startIndex <= nodeEnd) {
+      // if it's a node block, set position to pos to indicate to the backend
+      // that it's an annotation on a block node
+      if (nodeType === media) {
+        blockNodePos = pos;
+      }
+      // If the start of the annotation selection is within the current node, we scan the document for previous occurrences
       // Find the index by counting all previous instances of the selectedText in the partial textContent
       // Need to scan from start, up to `startIndex` (which includes partial of the current node)
       textContent += doc.textBetween(nodeStart, startIndex - 1);
@@ -30,11 +40,12 @@ export function getIndexMatch(doc, schema, selectedText, startIndex) {
   });
 
   // Count total number of matches in final text
-  var numMatches = countMatches(textContent, selectedText);
+  numMatches = countMatches(textContent, selectedText);
   return {
     numMatches: numMatches,
     matchIndex: matchIndex,
-    textContent: textContent
+    textContent: textContent,
+    blockNodePos: blockNodePos
   };
 }
 

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

package/dist/types/actions/matches-utils.d.ts

@@ -1,7 +1,8 @@
-import { Node, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
 export declare function getIndexMatch(doc: Node, schema: Schema, selectedText: string, startIndex: number): {
     numMatches: number;
     matchIndex: number;
     textContent: string;
+    blockNodePos?: number;
 };
 export declare function countMatches(searchString: string, query: string): number;

package/dist/types-ts4.5/actions/matches-utils.d.ts

@@ -1,7 +1,8 @@
-import { Node, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
 export declare function getIndexMatch(doc: Node, schema: Schema, selectedText: string, startIndex: number): {
     numMatches: number;
     matchIndex: number;
     textContent: string;
+    blockNodePos?: number;
 };
 export declare function countMatches(searchString: string, query: string): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.12.5",
+  "version": "109.13.0",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/button": "^17.8.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/editor-common": "^78.22.0",
+    "@atlaskit/editor-common": "^78.23.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-palette": "1.5.3",
     "@atlaskit/editor-prosemirror": "3.0.0",
@@ -47,7 +47,7 @@
     "@atlaskit/media-ui": "^25.4.0",
     "@atlaskit/media-viewer": "^48.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/smart-card": "^26.50.0",
+    "@atlaskit/smart-card": "^26.51.0",
     "@atlaskit/status": "^1.4.0",
     "@atlaskit/task-decision": "^17.9.0",
     "@atlaskit/theme": "^12.7.0",