@atlaskit/renderer 145.0.2 → 145.0.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/renderer
 
+## 145.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 145.0.3
+
+### Patch Changes
+
+- [`df04549a2c45c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df04549a2c45c) -
+  Update renderer annotation actions to produce `AddNodeMarkStep` results for eligible extension
+  nodes behind the `cc_maui_annotations_on_extensions` feature gate, while preserving existing text
+  and media annotation behavior.
+- [`a13383c3c99b2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a13383c3c99b2) -
+  [FFCLEANUP-192944] clean up code references to patch gates
+  `platform_editor_lovability_text_bg_color_patch_1` and
+  `platform_editor_lovability_text_bg_color_patch_2`.
+- Updated dependencies
+
 ## 145.0.2
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -362,8 +362,9 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       // hence, -1 is not needed
       var beforeNodePos = from;
       var possibleNode = this.doc.nodeAt(beforeNodePos);
-      if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
-        targetNodeType = 'media';
+      var isBlockTarget = possibleNode ? (0, _matchesUtils.isBlockAnnotationTarget)(possibleNode, this.schema) : false;
+      if (possibleNode && isBlockTarget) {
+        targetNodeType = possibleNode.type.name;
         step = new _transform.AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({
           id: annotationId,
           type: annotationType

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

@@ -5,6 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.countMatches = countMatches;
 exports.getIndexMatch = getIndexMatch;
+exports.isBlockAnnotationTarget = isBlockAnnotationTarget;
+var _fg = require("@atlaskit/platform-feature-flags/fg");
+/** Returns whether renderer annotations should use node-mark steps for this node. */
+function isBlockAnnotationTarget(node, schema) {
+  var _schema$nodes = schema.nodes,
+    extension = _schema$nodes.extension,
+    media = _schema$nodes.media;
+  return node.type === media || node.type === extension && (0, _fg.fg)('cc_maui_annotations_on_extensions') && node.type.allowsMarkType(schema.marks.annotation);
+}
+
 // Finds a string position using the Confluence annotation backend's serialisation rules.
 function getIndexMatch(doc, schema, selectedText, startIndex) {
   var textContent = '';
@@ -13,18 +23,17 @@ function getIndexMatch(doc, schema, selectedText, startIndex) {
   var blockNodePos;
   doc.descendants(function (node, pos) {
     var nodeType = node.type;
-    var media = schema.nodes.media;
+    var isBlockTarget = isBlockAnnotationTarget(node, schema);
     var isBlockContainer = nodeType.isBlock && !nodeType.isLeaf && !nodeType.inlineContent;
 
     // Containers may allow annotations for their children; skip their own text to avoid double-counting.
-    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation) || isBlockContainer) && nodeType !== media) {
+    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation) || isBlockContainer) && !isBlockTarget) {
       return true;
     }
     var nodeStart = pos;
     var nodeEnd = nodeStart + node.nodeSize;
     if (startIndex >= nodeStart && startIndex <= nodeEnd) {
-      // MAUI-1255 will add eligible extensions as block annotation targets.
-      if (nodeType === media) {
+      if (isBlockTarget) {
         blockNodePos = pos;
       }
       // If the start of the annotation selection is within the current node, we scan the document for previous occurrences

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

@@ -71,7 +71,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "145.0.1";
+var packageVersion = "145.0.4";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/actions/index.js

@@ -8,7 +8,7 @@ import { AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/e
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createAnnotationStep, getPosFromRange } from '../steps';
 import { getRendererRangeInlineNodeNames, getRendererRangeAncestorNodeNames } from './get-renderer-range-inline-node-names';
-import { getIndexMatch } from './matches-utils';
+import { getIndexMatch, isBlockAnnotationTarget } from './matches-utils';
 import { getSelectionContext } from './selection';
 export default class RendererActions {
   // Any kind of refence is allowed
@@ -328,8 +328,9 @@ export default class RendererActions {
     // hence, -1 is not needed
     const beforeNodePos = from;
     const possibleNode = this.doc.nodeAt(beforeNodePos);
-    if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
-      targetNodeType = 'media';
+    const isBlockTarget = possibleNode ? isBlockAnnotationTarget(possibleNode, this.schema) : false;
+    if (possibleNode && isBlockTarget) {
+      targetNodeType = possibleNode.type.name;
       step = new AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({
         id: annotationId,
         type: annotationType

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

@@ -1,3 +1,14 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+
+/** Returns whether renderer annotations should use node-mark steps for this node. */
+export function isBlockAnnotationTarget(node, schema) {
+  const {
+    extension,
+    media
+  } = schema.nodes;
+  return node.type === media || node.type === extension && fg('cc_maui_annotations_on_extensions') && node.type.allowsMarkType(schema.marks.annotation);
+}
+
 // Finds a string position using the Confluence annotation backend's serialisation rules.
 export function getIndexMatch(doc, schema, selectedText, startIndex) {
   let textContent = '';
@@ -6,20 +17,17 @@ export function getIndexMatch(doc, schema, selectedText, startIndex) {
   let blockNodePos;
   doc.descendants((node, pos) => {
     const nodeType = node.type;
-    const {
-      media
-    } = schema.nodes;
+    const isBlockTarget = isBlockAnnotationTarget(node, schema);
     const isBlockContainer = nodeType.isBlock && !nodeType.isLeaf && !nodeType.inlineContent;
 
     // Containers may allow annotations for their children; skip their own text to avoid double-counting.
-    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation) || isBlockContainer) && nodeType !== media) {
+    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation) || isBlockContainer) && !isBlockTarget) {
       return true;
     }
     const nodeStart = pos;
     const nodeEnd = nodeStart + node.nodeSize;
     if (startIndex >= nodeStart && startIndex <= nodeEnd) {
-      // MAUI-1255 will add eligible extensions as block annotation targets.
-      if (nodeType === media) {
+      if (isBlockTarget) {
         blockNodePos = pos;
       }
       // If the start of the annotation selection is within the current node, we scan the document for previous occurrences

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

@@ -56,7 +56,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.1;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "145.0.1";
+const packageVersion = "145.0.4";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/actions/index.js

@@ -11,7 +11,7 @@ import { AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/e
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createAnnotationStep, getPosFromRange } from '../steps';
 import { getRendererRangeInlineNodeNames, getRendererRangeAncestorNodeNames } from './get-renderer-range-inline-node-names';
-import { getIndexMatch } from './matches-utils';
+import { getIndexMatch, isBlockAnnotationTarget } from './matches-utils';
 import { getSelectionContext as _getSelectionContext } from './selection';
 var RendererActions = /*#__PURE__*/function () {
   // Any kind of refence is allowed
@@ -355,8 +355,9 @@ var RendererActions = /*#__PURE__*/function () {
       // hence, -1 is not needed
       var beforeNodePos = from;
       var possibleNode = this.doc.nodeAt(beforeNodePos);
-      if ((possibleNode === null || possibleNode === void 0 ? void 0 : possibleNode.type.name) === 'media') {
-        targetNodeType = 'media';
+      var isBlockTarget = possibleNode ? isBlockAnnotationTarget(possibleNode, this.schema) : false;
+      if (possibleNode && isBlockTarget) {
+        targetNodeType = possibleNode.type.name;
         step = new AddNodeMarkStep(beforeNodePos, this.schema.marks.annotation.create({
           id: annotationId,
           type: annotationType

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

@@ -1,3 +1,13 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+
+/** Returns whether renderer annotations should use node-mark steps for this node. */
+export function isBlockAnnotationTarget(node, schema) {
+  var _schema$nodes = schema.nodes,
+    extension = _schema$nodes.extension,
+    media = _schema$nodes.media;
+  return node.type === media || node.type === extension && fg('cc_maui_annotations_on_extensions') && node.type.allowsMarkType(schema.marks.annotation);
+}
+
 // Finds a string position using the Confluence annotation backend's serialisation rules.
 export function getIndexMatch(doc, schema, selectedText, startIndex) {
   var textContent = '';
@@ -6,18 +16,17 @@ export function getIndexMatch(doc, schema, selectedText, startIndex) {
   var blockNodePos;
   doc.descendants(function (node, pos) {
     var nodeType = node.type;
-    var media = schema.nodes.media;
+    var isBlockTarget = isBlockAnnotationTarget(node, schema);
     var isBlockContainer = nodeType.isBlock && !nodeType.isLeaf && !nodeType.inlineContent;
 
     // Containers may allow annotations for their children; skip their own text to avoid double-counting.
-    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation) || isBlockContainer) && nodeType !== media) {
+    if ((node.isText || !nodeType.allowsMarkType(schema.marks.annotation) || isBlockContainer) && !isBlockTarget) {
       return true;
     }
     var nodeStart = pos;
     var nodeEnd = nodeStart + node.nodeSize;
     if (startIndex >= nodeStart && startIndex <= nodeEnd) {
-      // MAUI-1255 will add eligible extensions as block annotation targets.
-      if (nodeType === media) {
+      if (isBlockTarget) {
         blockNodePos = pos;
       }
       // If the start of the annotation selection is within the current node, we scan the document for previous occurrences

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

@@ -61,7 +61,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.1;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "145.0.1";
+var packageVersion = "145.0.4";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -1,4 +1,6 @@
 import type { Node, Schema } from '@atlaskit/editor-prosemirror/model';
+/** Returns whether renderer annotations should use node-mark steps for this node. */
+export declare function isBlockAnnotationTarget(node: Node, schema: Schema): boolean;
 export declare function getIndexMatch(doc: Node, schema: Schema, selectedText: string, startIndex: number): {
     blockNodePos?: number;
     matchIndex: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "145.0.2",
+	"version": "145.0.4",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -73,7 +73,7 @@
 		"@atlaskit/status": "^5.12.0",
 		"@atlaskit/task-decision": "^21.11.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^211.0.0",
+		"@atlaskit/tmp-editor-statsig": "^212.0.0",
 		"@atlaskit/tokens": "^20.1.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
@@ -162,6 +162,10 @@
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
+		"cc_maui_annotations_on_extensions": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_querySelector_fix_table_renderer": {
 			"type": "boolean"
 		},