@atlaskit/editor-plugin-extension 22.0.2 → 22.0.3

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-extension
 
+## 22.0.3
+
+### Patch Changes
+
+- [`8e4fd6774f6ec`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8e4fd6774f6ec) -
+  Add Stage-0 ADF schema support for the `annotation` mark on `extension` nodes (ADF Change 111).
+  Adds the `with_annotation` and `root_only_with_annotation` Stage-0 variants and wires them into
+  the approved root and nested placements (doc root, panel, blockquote, expand, nestedExpand,
+  listItem, blockTaskItem, table cells), registers the matching validator specs, and adds
+  valid/invalid reference fixtures, with regenerated PM/JSON/validator artifacts. Scoped to
+  `extension` only (not `bodiedExtension`/`multiBodiedExtension`); the full schema is unchanged.
+  Editor/renderer acceptance of the mark is gated by `cc_maui_annotations_on_extensions`.
+
+  Allowing the `annotation` mark on `extension` requires its container nodes (panel, table cells,
+  list items, etc.) to permit the mark too, so they can hold an annotated extension child. This made
+  the renderer's `getIndexMatch` double-count text inside those containers, corrupting inline
+  text-comment anchoring. Fixed by skipping block containers during serialisation (they are still
+  walked through so their inner text is counted once); leaf nodes and media are unaffected.
+
+- Updated dependencies
+
 ## 22.0.2
 
 ### Patch Changes

package/dist/cjs/extensionPlugin.js

@@ -49,7 +49,7 @@ var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
     nodes: function nodes() {
       var extensionNodes = [{
         name: 'extension',
-        node: _extension.extension
+        node: (0, _fg.fg)('cc_maui_annotations_on_extensions') ? _extension.extensionWithAnnotationStage0 : _extension.extension
       }, {
         name: 'bodiedExtension',
         node: (0, _bodiedExtension.bodiedExtensionSpecWithFixedToDOM)()

package/dist/es2019/extensionPlugin.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
-import { extension } from '@atlaskit/adf-schema/extension';
+import { extension, extensionWithAnnotationStage0 } from '@atlaskit/adf-schema/extension';
 import { inlineExtension } from '@atlaskit/adf-schema/inline-extension';
 import { extensionFrame, multiBodiedExtension } from '@atlaskit/adf-schema/multi-bodied-extension';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -40,7 +40,7 @@ export const extensionPlugin = ({
     nodes() {
       const extensionNodes = [{
         name: 'extension',
-        node: extension
+        node: fg('cc_maui_annotations_on_extensions') ? extensionWithAnnotationStage0 : extension
       }, {
         name: 'bodiedExtension',
         node: bodiedExtensionSpecWithFixedToDOM()

package/dist/esm/extensionPlugin.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import { v4 as uuid } from 'uuid';
-import { extension } from '@atlaskit/adf-schema/extension';
+import { extension, extensionWithAnnotationStage0 } from '@atlaskit/adf-schema/extension';
 import { inlineExtension } from '@atlaskit/adf-schema/inline-extension';
 import { extensionFrame, multiBodiedExtension } from '@atlaskit/adf-schema/multi-bodied-extension';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -40,7 +40,7 @@ export var extensionPlugin = function extensionPlugin(_ref) {
     nodes: function nodes() {
       var extensionNodes = [{
         name: 'extension',
-        node: extension
+        node: fg('cc_maui_annotations_on_extensions') ? extensionWithAnnotationStage0 : extension
       }, {
         name: 'bodiedExtension',
         node: bodiedExtensionSpecWithFixedToDOM()

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "22.0.2",
+	"version": "22.0.3",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -26,12 +26,12 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.5.0",
+		"@atlaskit/adf-schema": "^57.6.0",
 		"@atlaskit/adf-utils": "^20.9.0",
 		"@atlaskit/analytics-next": "^12.5.0",
 		"@atlaskit/avatar": "^28.0.0",
 		"@atlaskit/browser-apis": "^1.2.0",
-		"@atlaskit/button": "^25.3.0",
+		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/checkbox": "^19.2.0",
 		"@atlaskit/code": "^19.2.0",
 		"@atlaskit/datetime-picker": "^18.7.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/editor-plugin-copy-button": "^19.0.0",
 		"@atlaskit/editor-plugin-decorations": "^19.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^18.0.0",
-		"@atlaskit/editor-plugin-mentions": "^21.0.0",
+		"@atlaskit/editor-plugin-mentions": "^21.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^16.0.0",
 		"@atlaskit/editor-plugin-width": "^20.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
@@ -85,7 +85,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.2.0",
+		"@atlaskit/editor-common": "^123.4.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -97,6 +97,9 @@
 		"react-select": "^5.4.0"
 	},
 	"platform-feature-flags": {
+		"cc_maui_annotations_on_extensions": {
+			"type": "boolean"
+		},
 		"platform_editor_adf_validator_stage0": {
 			"type": "boolean"
 		},