@atlaskit/editor-plugin-extension 22.0.1 → 22.0.3

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @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
+
+- Updated dependencies
+
 ## 22.0.1
 
 ### Patch Changes

package/dist/cjs/extensionPlugin.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.extensionPlugin = void 0;
 var _uuid = require("uuid");
 var _extension = require("@atlaskit/adf-schema/extension");
-var _multiBodiedExtension = require("@atlaskit/adf-schema/multi-bodied-extension");
 var _inlineExtension = require("@atlaskit/adf-schema/inline-extension");
+var _multiBodiedExtension = require("@atlaskit/adf-schema/multi-bodied-extension");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _actions = require("./editor-actions/actions");
@@ -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/cjs/pm-plugins/unique-id.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _uuid = require("@atlaskit/adf-schema/uuid");
 var _setAttrs = require("@atlaskit/adf-schema/steps/set-attrs");
+var _uuid = require("@atlaskit/adf-schema/uuid");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");

package/dist/cjs/ui/ConfigPanel/ConfigPanelLoader.js

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = _interopRequireDefault(require("react"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _reactLooselyLazy = require("react-loosely-lazy");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _LoadingState = _interopRequireDefault(require("./LoadingState"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); } // oxlint-disable-next-line @atlassian/no-restricted-imports
 var loadConfigPanel = function loadConfigPanel() {

package/dist/cjs/ui/ConfigPanel/Fields/CheckboxGroup.js

@@ -11,8 +11,8 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _checkbox = require("@atlaskit/checkbox/checkbox");
-var _fieldset = require("@atlaskit/form/fieldset");
 var _field = _interopRequireDefault(require("@atlaskit/form/field"));
+var _fieldset = require("@atlaskit/form/fieldset");
 var _FieldMessages = _interopRequireDefault(require("../FieldMessages"));
 var _types = require("../types");
 var _excluded = ["onChange", "value"];

package/dist/cjs/ui/ConfigPanel/Fields/TabGroup.js

@@ -10,10 +10,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _tabs = _interopRequireDefault(require("@atlaskit/tabs/tabs"));
 var _tab = _interopRequireDefault(require("@atlaskit/tabs/tab"));
 var _tabList = _interopRequireDefault(require("@atlaskit/tabs/tab-list"));
 var _tabPanel = _interopRequireDefault(require("@atlaskit/tabs/tab-panel"));
+var _tabs = _interopRequireDefault(require("@atlaskit/tabs/tabs"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic

package/dist/es2019/entry-points/extensionPlugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { extensionPlugin } from '../extensionPlugin';

package/dist/es2019/extensionPlugin.js

@@ -1,8 +1,8 @@
 // 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 { extensionFrame, multiBodiedExtension } from '@atlaskit/adf-schema/multi-bodied-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';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createEditSelectedExtensionAction, insertOrReplaceBodiedExtension, insertOrReplaceExtension } from './editor-actions/actions';
@@ -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/es2019/pm-plugins/unique-id.js

@@ -1,5 +1,5 @@
-import { uuid } from '@atlaskit/adf-schema/uuid';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
+import { uuid } from '@atlaskit/adf-schema/uuid';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';

package/dist/es2019/ui/ConfigPanel/ConfigPanelLoader.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import Loadable from 'react-loadable';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // oxlint-disable-next-line @atlassian/no-restricted-imports
 import { lazyForPaint, LazySuspense } from 'react-loosely-lazy';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import LoadingState from './LoadingState';
 const loadConfigPanel = () => import( /* webpackChunkName: "@atlaskit-internal_editor-core-config-panel" */
 './ConfigPanelFieldsLoader').then(module => module.default);

package/dist/es2019/ui/ConfigPanel/Fields/CheckboxGroup.js

@@ -9,8 +9,8 @@ import { Fragment, useCallback } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
 import { Checkbox as AKCheckbox } from '@atlaskit/checkbox/checkbox';
-import { Fieldset as AKFieldset } from '@atlaskit/form/fieldset';
 import Field from '@atlaskit/form/field';
+import { Fieldset as AKFieldset } from '@atlaskit/form/fieldset';
 import FieldMessages from '../FieldMessages';
 import { ValidationError } from '../types';
 function validate(value, isRequired) {

package/dist/es2019/ui/ConfigPanel/Fields/TabGroup.js

@@ -7,10 +7,10 @@ import React, { useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import Tabs from '@atlaskit/tabs/tabs';
 import Tab from '@atlaskit/tabs/tab';
 import TabList from '@atlaskit/tabs/tab-list';
 import TabPanel from '@atlaskit/tabs/tab-panel';
+import Tabs from '@atlaskit/tabs/tabs';
 const panelWrapperStyles = css({
   flexGrow: 1,
   maxWidth: '100%'

package/dist/esm/entry-points/extensionPlugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { extensionPlugin } from '../extensionPlugin';

package/dist/esm/extensionPlugin.js

@@ -1,8 +1,8 @@
 // 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 { extensionFrame, multiBodiedExtension } from '@atlaskit/adf-schema/multi-bodied-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';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createEditSelectedExtensionAction, insertOrReplaceBodiedExtension as _insertOrReplaceBodiedExtension, insertOrReplaceExtension as _insertOrReplaceExtension } from './editor-actions/actions';
@@ -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/dist/esm/pm-plugins/unique-id.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { uuid } from '@atlaskit/adf-schema/uuid';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
+import { uuid } from '@atlaskit/adf-schema/uuid';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepAddsOneOf } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';

package/dist/esm/ui/ConfigPanel/ConfigPanelLoader.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import Loadable from 'react-loadable';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // oxlint-disable-next-line @atlassian/no-restricted-imports
 import { lazyForPaint, LazySuspense } from 'react-loosely-lazy';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import LoadingState from './LoadingState';
 var loadConfigPanel = function loadConfigPanel() {
   return import( /* webpackChunkName: "@atlaskit-internal_editor-core-config-panel" */

package/dist/esm/ui/ConfigPanel/Fields/CheckboxGroup.js

@@ -12,8 +12,8 @@ import { Fragment, useCallback } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
 import { Checkbox as AKCheckbox } from '@atlaskit/checkbox/checkbox';
-import { Fieldset as AKFieldset } from '@atlaskit/form/fieldset';
 import Field from '@atlaskit/form/field';
+import { Fieldset as AKFieldset } from '@atlaskit/form/fieldset';
 import FieldMessages from '../FieldMessages';
 import { ValidationError } from '../types';
 function _validate(value, isRequired) {

package/dist/esm/ui/ConfigPanel/Fields/TabGroup.js

@@ -8,10 +8,10 @@ import React, { useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import Tabs from '@atlaskit/tabs/tabs';
 import Tab from '@atlaskit/tabs/tab';
 import TabList from '@atlaskit/tabs/tab-list';
 import TabPanel from '@atlaskit/tabs/tab-panel';
+import Tabs from '@atlaskit/tabs/tabs';
 var panelWrapperStyles = css({
   flexGrow: 1,
   maxWidth: '100%'

package/dist/types/ui/ConfigPanel/ConfigPanel.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import type { WithContextProps } from '@atlaskit/analytics-next/withAnalyticsContext';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import type { ExtensionManifest, FieldDefinition, OnSaveCallback, OnSaveCallbackAsync, Parameters } from '@atlaskit/editor-common/extensions';
 import type { ExtractInjectionAPI, FeatureFlags } from '@atlaskit/editor-common/types';
 import type { ExtensionPlugin, RejectSave } from '../../extensionPluginType';

package/dist/types/ui/ConfigPanel/FormErrorBoundary.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import type { WithContextProps } from '@atlaskit/analytics-next/withAnalyticsContext';
+import type { WithAnalyticsEventsProps } from '@atlaskit/analytics-next/withAnalyticsEvents';
 import type { FieldDefinition } from '@atlaskit/editor-common/extensions';
 import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
 interface Props {

package/example-utils/config-panel/ConfigPanelWithExtensionPicker.tsx

@@ -3,6 +3,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
+
 import { useEffect, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
@@ -24,7 +25,6 @@ import TextArea from '@atlaskit/textarea/text-area';
 import { token } from '@atlaskit/tokens';
 
 import { useStateFromPromise } from '../../src/ui/ConfigPanel/use-state-from-promise';
-
 import ConfigPanelWithProviders from './ConfigPanelWithProviders';
 import type { CallbackParams } from './ExtensionNodePicker';
 import ExtensionNodePicker from './ExtensionNodePicker';

package/example-utils/config-panel/ExtensionNodePicker.tsx

@@ -1,8 +1,11 @@
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+
 import type { ReactNode } from 'react';
 import React, { useState } from 'react';
 
 import Loadable from 'react-loadable';
+// oxlint-disable-next-line @atlassian/no-restricted-imports
+import { lazyForPaint, LazySuspense } from 'react-loosely-lazy';
 
 import type {
 	ExtensionManifest,
@@ -19,8 +22,6 @@ import MenuGroup from '@atlaskit/menu/menu-group';
 import Section from '@atlaskit/menu/section';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { token } from '@atlaskit/tokens';
-// oxlint-disable-next-line @atlassian/no-restricted-imports
-import { lazyForPaint, LazySuspense } from 'react-loosely-lazy';
 
 import { useStateFromPromise } from '../../src/ui/ConfigPanel/use-state-from-promise';
 

package/example-utils/config-panel/FieldTypePicker.tsx

@@ -1,4 +1,5 @@
 /* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+
 import React, { useState } from 'react';
 
 import type { FieldDefinition } from '@atlaskit/editor-common/extensions';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "22.0.1",
+	"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",
@@ -69,7 +69,7 @@
 		"@atlaskit/tabs": "^21.2.0",
 		"@atlaskit/textarea": "^10.2.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^200.0.0",
+		"@atlaskit/tmp-editor-statsig": "^201.0.0",
 		"@atlaskit/toggle": "^17.3.0",
 		"@atlaskit/tokens": "^18.2.0",
 		"@atlaskit/tooltip": "^24.3.0",
@@ -85,7 +85,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.0.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"
 		},