@atlaskit/renderer 149.0.1 → 149.0.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/renderer
 
+## 149.0.2
+
+### Patch Changes
+
+- [`8fe99b7e9d198`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8fe99b7e9d198) -
+  Add `resolveAnnotatableTargetFromLocalId`, which resolves a `localId` to the node an annotation
+  can be applied to — the node itself when it accepts the annotation mark or is a supported block
+  node, otherwise its closest accepting ancestor. Mirrors the editor implementation so both sides
+  resolve the same node. Internal helper, not yet used by any code path.
+- [`06e85e54427d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/06e85e54427d1) -
+  Correct Forge named viewport height reservation in View and Editor behind
+  confluence_forge_early_render_reserve_height while preserving numeric Connect heights.
+- Updated dependencies
+
 ## 149.0.1
 
 ### Patch Changes

package/dist/cjs/react/nodes/extension.js

@@ -112,6 +112,8 @@ var renderExtension = exports.renderExtension = function renderExtension(content
    */
   var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   var extensionHeight = nodeHeight || viewportSize;
+  // Forge manifest heights already include px; Connect node heights are numeric strings.
+  var extensionMinHeight = extensionHeight !== null && extensionHeight !== void 0 && extensionHeight.endsWith('px') && (0, _fg.fg)('confluence_forge_early_render_reserve_height') ? extensionHeight : extensionHeight && "".concat(extensionHeight, "px");
   /**
    * Scoped to nodes inserted by an app declaring `layout: inline-bodied`, which is what writes
    * `atlassianForgeInlineBodied`. The output-type marker alone would also match migrated Connect
@@ -165,7 +167,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       (0, _breakout.calcBreakoutWidthCss)(layout) : (0, _expValEquals.expValEquals)('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? undefined : '100%',
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      minHeight: isInline ? undefined : extensionHeight && "".concat(extensionHeight, "px")
+      minHeight: isInline ? undefined : extensionMinHeight
     },
     "data-layout": layout,
     "data-local-id": localId,

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

@@ -72,7 +72,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 = "149.0.0";
+var packageVersion = "149.0.1";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/cjs/ui/annotations/contexts/resolve-annotatable-target.js

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveAnnotatableTargetFromLocalId = void 0;
+/** The node to annotate, with the position immediately before it (`doc.nodeAt(pos) === node`). */
+
+/** Renderer copy of the editor's `isSupportedBlockNode`, kept identical so both resolve alike. */
+var isSupportedBlockNode = function isSupportedBlockNode(node) {
+  var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;
+};
+
+/**
+ * Renderer equivalent of the editor's `resolveAnnotatableTargetFromLocalId`: resolves the node to
+ * annotate for a `localId`, climbing to the closest accepting ancestor when the node itself does
+ * not accept an annotation. Returns undefined when nothing in the chain accepts one.
+ *
+ * Kept in sync with the editor implementation so both sides resolve the same node.
+ */
+var resolveAnnotatableTargetFromLocalId = exports.resolveAnnotatableTargetFromLocalId = function resolveAnnotatableTargetFromLocalId(doc, localId) {
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var supportedBlockNodes = opts.supportedBlockNodes;
+
+  // No `EditorState` here, so walk the doc directly like `findNodePosByLocalIds` does.
+  var match;
+  doc.descendants(function (node, pos) {
+    var _node$attrs;
+    if (match) {
+      return false;
+    }
+    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) === localId) {
+      match = {
+        node: node,
+        pos: pos
+      };
+      return false;
+    }
+    return true;
+  });
+  if (!match) {
+    return undefined;
+  }
+  var annotationMarkType = doc.type.schema.marks.annotation;
+  var nodeAcceptsAnnotation = function nodeAcceptsAnnotation(node) {
+    return !!annotationMarkType && node.type.allowsMarkType(annotationMarkType) || isSupportedBlockNode(node, supportedBlockNodes);
+  };
+  if (nodeAcceptsAnnotation(match.node)) {
+    return match;
+  }
+
+  // Ancestors only — never descendants.
+  var $pos = doc.resolve(match.pos);
+  for (var depth = $pos.depth; depth >= 0; depth--) {
+    var ancestor = $pos.node(depth);
+    if (nodeAcceptsAnnotation(ancestor)) {
+      return {
+        node: ancestor,
+        pos: depth === 0 ? 0 : $pos.before(depth)
+      };
+    }
+  }
+  return undefined;
+};

package/dist/es2019/react/nodes/extension.js

@@ -94,6 +94,8 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
    */
   const viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   const extensionHeight = nodeHeight || viewportSize;
+  // Forge manifest heights already include px; Connect node heights are numeric strings.
+  const extensionMinHeight = extensionHeight !== null && extensionHeight !== void 0 && extensionHeight.endsWith('px') && fg('confluence_forge_early_render_reserve_height') ? extensionHeight : extensionHeight && `${extensionHeight}px`;
   /**
    * Scoped to nodes inserted by an app declaring `layout: inline-bodied`, which is what writes
    * `atlassianForgeInlineBodied`. The output-type marker alone would also match migrated Connect
@@ -147,7 +149,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       calcBreakoutWidthCss(layout) : expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? undefined : '100%',
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      minHeight: isInline ? undefined : extensionHeight && `${extensionHeight}px`
+      minHeight: isInline ? undefined : extensionMinHeight
     },
     "data-layout": layout,
     "data-local-id": localId,

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

@@ -57,7 +57,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 = "149.0.0";
+const packageVersion = "149.0.1";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/ui/annotations/contexts/resolve-annotatable-target.js

@@ -0,0 +1,57 @@
+/** The node to annotate, with the position immediately before it (`doc.nodeAt(pos) === node`). */
+
+/** Renderer copy of the editor's `isSupportedBlockNode`, kept identical so both resolve alike. */
+const isSupportedBlockNode = (node, supportedBlockNodes = []) => {
+  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;
+};
+
+/**
+ * Renderer equivalent of the editor's `resolveAnnotatableTargetFromLocalId`: resolves the node to
+ * annotate for a `localId`, climbing to the closest accepting ancestor when the node itself does
+ * not accept an annotation. Returns undefined when nothing in the chain accepts one.
+ *
+ * Kept in sync with the editor implementation so both sides resolve the same node.
+ */
+export const resolveAnnotatableTargetFromLocalId = (doc, localId, opts = {}) => {
+  const {
+    supportedBlockNodes
+  } = opts;
+
+  // No `EditorState` here, so walk the doc directly like `findNodePosByLocalIds` does.
+  let match;
+  doc.descendants((node, pos) => {
+    var _node$attrs;
+    if (match) {
+      return false;
+    }
+    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) === localId) {
+      match = {
+        node,
+        pos
+      };
+      return false;
+    }
+    return true;
+  });
+  if (!match) {
+    return undefined;
+  }
+  const annotationMarkType = doc.type.schema.marks.annotation;
+  const nodeAcceptsAnnotation = node => !!annotationMarkType && node.type.allowsMarkType(annotationMarkType) || isSupportedBlockNode(node, supportedBlockNodes);
+  if (nodeAcceptsAnnotation(match.node)) {
+    return match;
+  }
+
+  // Ancestors only — never descendants.
+  const $pos = doc.resolve(match.pos);
+  for (let depth = $pos.depth; depth >= 0; depth--) {
+    const ancestor = $pos.node(depth);
+    if (nodeAcceptsAnnotation(ancestor)) {
+      return {
+        node: ancestor,
+        pos: depth === 0 ? 0 : $pos.before(depth)
+      };
+    }
+  }
+  return undefined;
+};

package/dist/esm/react/nodes/extension.js

@@ -107,6 +107,8 @@ export var renderExtension = function renderExtension(content, layout) {
    */
   var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   var extensionHeight = nodeHeight || viewportSize;
+  // Forge manifest heights already include px; Connect node heights are numeric strings.
+  var extensionMinHeight = extensionHeight !== null && extensionHeight !== void 0 && extensionHeight.endsWith('px') && fg('confluence_forge_early_render_reserve_height') ? extensionHeight : extensionHeight && "".concat(extensionHeight, "px");
   /**
    * Scoped to nodes inserted by an app declaring `layout: inline-bodied`, which is what writes
    * `atlassianForgeInlineBodied`. The output-type marker alone would also match migrated Connect
@@ -160,7 +162,7 @@ export var renderExtension = function renderExtension(content, layout) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
       calcBreakoutWidthCss(layout) : expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? undefined : '100%',
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-      minHeight: isInline ? undefined : extensionHeight && "".concat(extensionHeight, "px")
+      minHeight: isInline ? undefined : extensionMinHeight
     },
     "data-layout": layout,
     "data-local-id": localId,

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

@@ -62,7 +62,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 = "149.0.0";
+var packageVersion = "149.0.1";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/ui/annotations/contexts/resolve-annotatable-target.js

@@ -0,0 +1,59 @@
+/** The node to annotate, with the position immediately before it (`doc.nodeAt(pos) === node`). */
+
+/** Renderer copy of the editor's `isSupportedBlockNode`, kept identical so both resolve alike. */
+var isSupportedBlockNode = function isSupportedBlockNode(node) {
+  var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;
+};
+
+/**
+ * Renderer equivalent of the editor's `resolveAnnotatableTargetFromLocalId`: resolves the node to
+ * annotate for a `localId`, climbing to the closest accepting ancestor when the node itself does
+ * not accept an annotation. Returns undefined when nothing in the chain accepts one.
+ *
+ * Kept in sync with the editor implementation so both sides resolve the same node.
+ */
+export var resolveAnnotatableTargetFromLocalId = function resolveAnnotatableTargetFromLocalId(doc, localId) {
+  var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var supportedBlockNodes = opts.supportedBlockNodes;
+
+  // No `EditorState` here, so walk the doc directly like `findNodePosByLocalIds` does.
+  var match;
+  doc.descendants(function (node, pos) {
+    var _node$attrs;
+    if (match) {
+      return false;
+    }
+    if (((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) === localId) {
+      match = {
+        node: node,
+        pos: pos
+      };
+      return false;
+    }
+    return true;
+  });
+  if (!match) {
+    return undefined;
+  }
+  var annotationMarkType = doc.type.schema.marks.annotation;
+  var nodeAcceptsAnnotation = function nodeAcceptsAnnotation(node) {
+    return !!annotationMarkType && node.type.allowsMarkType(annotationMarkType) || isSupportedBlockNode(node, supportedBlockNodes);
+  };
+  if (nodeAcceptsAnnotation(match.node)) {
+    return match;
+  }
+
+  // Ancestors only — never descendants.
+  var $pos = doc.resolve(match.pos);
+  for (var depth = $pos.depth; depth >= 0; depth--) {
+    var ancestor = $pos.node(depth);
+    if (nodeAcceptsAnnotation(ancestor)) {
+      return {
+        node: ancestor,
+        pos: depth === 0 ? 0 : $pos.before(depth)
+      };
+    }
+  }
+  return undefined;
+};

package/dist/types/ui/annotations/contexts/resolve-annotatable-target.d.ts

@@ -0,0 +1,17 @@
+import type { Node } from '@atlaskit/editor-prosemirror/model';
+/** The node to annotate, with the position immediately before it (`doc.nodeAt(pos) === node`). */
+type ResolvedAnnotatableTarget = {
+    node: Node;
+    pos: number;
+};
+/**
+ * Renderer equivalent of the editor's `resolveAnnotatableTargetFromLocalId`: resolves the node to
+ * annotate for a `localId`, climbing to the closest accepting ancestor when the node itself does
+ * not accept an annotation. Returns undefined when nothing in the chain accepts one.
+ *
+ * Kept in sync with the editor implementation so both sides resolve the same node.
+ */
+export declare const resolveAnnotatableTargetFromLocalId: (doc: Node, localId: string, opts?: {
+    supportedBlockNodes?: string[];
+}) => ResolvedAnnotatableTarget | undefined;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "149.0.1",
+	"version": "149.0.2",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -47,7 +47,7 @@
 		"@atlaskit/editor-json-transformer": "^10.0.0",
 		"@atlaskit/editor-palette": "^3.5.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
-		"@atlaskit/editor-shared-styles": "^4.3.0",
+		"@atlaskit/editor-shared-styles": "^4.4.0",
 		"@atlaskit/editor-smart-link-draggable": "^1.2.0",
 		"@atlaskit/emoji": "^72.5.0",
 		"@atlaskit/feature-gate-js-client": "^7.0.0",
@@ -69,11 +69,11 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^4.0.0",
 		"@atlaskit/react-compiler-gating": "^0.2.0",
 		"@atlaskit/react-ufo": "^8.1.0",
-		"@atlaskit/smart-card": "^46.5.0",
+		"@atlaskit/smart-card": "^46.6.0",
 		"@atlaskit/status": "^5.13.0",
 		"@atlaskit/task-decision": "^21.12.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^228.0.0",
+		"@atlaskit/tmp-editor-statsig": "^229.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
@@ -88,7 +88,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.1.0",
+		"@atlaskit/editor-common": "^130.3.0",
 		"@atlaskit/link-provider": "^6.0.0",
 		"@atlaskit/media-core": "^39.0.0",
 		"react": "^18.2.0 || ^19.2.0",
@@ -149,6 +149,10 @@
 		"worker-plugin": "^4.0.2"
 	},
 	"platform-feature-flags": {
+		"confluence_forge_early_render_reserve_height": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_a11y_codeblock_haspopup": {
 			"type": "boolean"
 		},