@atlaskit/editor-common 78.12.5 → 78.13.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-common
 
+## 78.13.0
+
+### Minor Changes
+
+- [#79526](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79526) [`b6f7d5f2f2e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b6f7d5f2f2e9) - ED-22326: Added support for maxFrames config to be passed from ExtensionManifest
+
+### Patch Changes
+
+- [#81104](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81104) [`64cef311908a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/64cef311908a) - ED-22229: MBE API.updateParams to overwrite macroParams with the passed values
+- [#80252](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80252) [`04842c73f81a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/04842c73f81a) - ED-22504: Adding renderer changes for annotation in kitchen sink
+
+## 78.12.6
+
+### Patch Changes
+
+- [#79543](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79543) [`8b578f7427a2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b578f7427a2) - ED-22502: updated range selection check to exempt inline card, to allow them to have annotation marks
+
 ## 78.12.5
 
 ### Patch Changes

package/dist/cjs/element-browser/components/CategoryList.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -19,7 +18,6 @@ var _colors = require("@atlaskit/theme/colors");
 var _analytics = require("../../analytics");
 var _constants = require("../constants");
 var _useFocus = _interopRequireDefault(require("../hooks/use-focus"));
-var _templateObject;
 var _excluded = ["categories"],
   _excluded2 = ["buttonStyles"];
 /** @jsx jsx */
@@ -107,7 +105,14 @@ function CategoryListItem(_ref2) {
     testId: "element-browser-category-item"
   }, category.title));
 }
-var buttonWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  height: ", "px;\n  margin: ", " ", "\n    ", " 0;\n\n  @media (min-width: ", "px) {\n    :not(:last-child) {\n      margin-bottom: 0;\n    }\n  }\n"])), _constants.GRID_SIZE * 4, "var(--ds-space-050, 4px)", "var(--ds-space-050, 4px)", "var(--ds-space-050, 4px)", _constants.DEVICE_BREAKPOINT_NUMBERS.medium);
+var buttonWrapper = (0, _react2.css)((0, _defineProperty2.default)({
+  height: "".concat(_constants.GRID_SIZE * 4, "px"),
+  margin: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " ", "var(--ds-space-050, 4px)", " 0")
+}, "@media (min-width: ".concat(_constants.DEVICE_BREAKPOINT_NUMBERS.medium, "px)"), {
+  ':not(:last-child)': {
+    marginBottom: 0
+  }
+}));
 var MemoizedCategoryListWithAnalytics = /*#__PURE__*/(0, _react.memo)((0, _analyticsNext.withAnalyticsContext)({
   component: 'CategoryList'
 })(CategoryList));

package/dist/cjs/extensibility/MultiBodiedExtension/action-api.js

@@ -8,6 +8,7 @@ exports.useMultiBodiedExtensionActions = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../analytics");
 var _utils = require("./utils");
 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; }
@@ -110,7 +111,6 @@ var useMultiBodiedExtensionActions = exports.useMultiBodiedExtensionActions = fu
         return true;
       },
       updateParameters: function updateParameters(parameters) {
-        var _node$attrs;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         var pos = getPos();
@@ -120,11 +120,23 @@ var useMultiBodiedExtensionActions = exports.useMultiBodiedExtensionActions = fu
         // We are retaining node.attrs to keep the node type and extension key
         // and only updating the parameters coming in from the user
         // parameters will contain only macroParams information
-        var updatedParameters = _objectSpread(_objectSpread({}, node.attrs), {}, {
-          parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
-            macroParams: _objectSpread(_objectSpread({}, (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.parameters) === null || _node$attrs === void 0 ? void 0 : _node$attrs.macroParams), parameters)
-          })
-        });
+        var updatedParameters;
+        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.mbe-update-params-change')) {
+          // With the new feature flag, we will not be de-structuring macroParams,
+          // and will directly replace/overwrite the macroParams with the parameters
+          updatedParameters = _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
+              macroParams: parameters
+            })
+          });
+        } else {
+          var _node$attrs;
+          updatedParameters = _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
+              macroParams: _objectSpread(_objectSpread({}, (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.parameters) === null || _node$attrs === void 0 ? void 0 : _node$attrs.macroParams), parameters)
+            })
+          });
+        }
         var tr = state.tr.setNodeMarkup(pos, null, updatedParameters);
         dispatch(tr);
         if (eventDispatcher) {

package/dist/cjs/extensions/manifest-helpers.js

@@ -87,6 +87,11 @@ function buildNode(action, manifest) {
       }]
     });
   } else if (node.type === 'multiBodiedExtension') {
+    var _manifest$modules;
+    if ((_manifest$modules = manifest.modules) !== null && _manifest$modules !== void 0 && (_manifest$modules = _manifest$modules.nodes[action.key]) !== null && _manifest$modules !== void 0 && _manifest$modules.maxFrames) {
+      var _manifest$modules2;
+      extension.attrs.maxFrames = (_manifest$modules2 = manifest.modules) === null || _manifest$modules2 === void 0 || (_manifest$modules2 = _manifest$modules2.nodes[action.key]) === null || _manifest$modules2 === void 0 ? void 0 : _manifest$modules2.maxFrames;
+    }
     return _objectSpread(_objectSpread({}, extension), {}, {
       content: [{
         type: 'extensionFrame',

package/dist/cjs/mark/commands.js

@@ -8,6 +8,7 @@ exports.filterChildrenBetween = filterChildrenBetween;
 exports.transformSmartCharsMentionsAndEmojis = exports.toggleMark = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 // eslint-disable-next-line no-duplicate-imports
 
 var SMART_TO_ASCII = {
@@ -90,12 +91,19 @@ var transformSmartCharsMentionsAndEmojis = exports.transformSmartCharsMentionsAn
 var applyMarkOnRange = exports.applyMarkOnRange = function applyMarkOnRange(from, to, removeMark, mark, tr) {
   var schema = tr.doc.type.schema;
   var code = schema.marks.code;
+  var inlineCard = schema.nodes.inlineCard;
   if (mark.type === code) {
     transformSmartCharsMentionsAndEmojis(from, to, tr);
   }
   tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), function (node, pos) {
-    if (!node.isText) {
-      return true;
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (!node.isText && node.type !== inlineCard) {
+        return true;
+      }
+    } else {
+      if (!node.isText) {
+        return true;
+      }
     }
 
     // This is an issue when the user selects some text.

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.12.5";
+var packageVersion = "78.13.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/types/annotation/emitter.js

@@ -38,7 +38,7 @@ var AnnotationUpdateEmitter = exports.AnnotationUpdateEmitter = /*#__PURE__*/fun
   }, {
     key: "off",
     value: function off(event, listener) {
-      return this.emitter.off(event, listener);
+      return this.emitter.removeListener(event, listener);
     }
   }, {
     key: "listeners",

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

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.12.5";
+var packageVersion = "78.13.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/utils/annotation/index.js

@@ -7,25 +7,34 @@ exports.canApplyAnnotationOnRange = void 0;
 exports.containsAnyAnnotations = containsAnyAnnotations;
 exports.getAnnotationIdsFromRange = void 0;
 exports.hasAnnotationMark = hasAnnotationMark;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var canApplyAnnotationOnRange = exports.canApplyAnnotationOnRange = function canApplyAnnotationOnRange(rangeSelection, doc, schema) {
   var from = rangeSelection.from,
     to = rangeSelection.to;
   if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
     return false;
   }
+  var inlineCard = schema.nodes.inlineCard;
   var foundInvalid = false;
   doc.nodesBetween(rangeSelection.from, rangeSelection.to, function (node, _pos, parent) {
     // Special exception for hardBreak nodes
     if (schema.nodes.hardBreak === node.type) {
       return false;
     }
-
     // For block elements or text nodes, we want to check
     // if annotations are allowed inside this tree
     // or if we're leaf and not text
-    if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-      foundInvalid = true;
-      return false;
+
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (node.isInline && !node.isText && node.type !== inlineCard || node.isLeaf && !node.isText && node.type !== inlineCard || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+        foundInvalid = true;
+        return false;
+      }
+    } else {
+      if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+        foundInvalid = true;
+        return false;
+      }
     }
     return true;
   });

package/dist/cjs/utils/validator.js

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _schemaDefault = require("@atlaskit/adf-schema/schema-default");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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) { (0, _defineProperty2.default)(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; }
 var ADFStages = exports.ADFStages = {
@@ -290,6 +291,28 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
           break;
         }
       case 'inlineCard':
+        {
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
+            var inlineCardNode = {
+              type: type
+            };
+            if (attrs && (attrs.datasource && !attrs.url || attrs.url && (0, _adfSchema.isSafeUrl)(attrs.url) || attrs.data && attrs.data.url && (0, _adfSchema.isSafeUrl)(attrs.data.url))) {
+              inlineCardNode.attrs = _objectSpread({}, attrs);
+            }
+            if (marks) {
+              inlineCardNode.marks = (0, _toConsumableArray2.default)(marks);
+            }
+            return inlineCardNode;
+          } else {
+            if (attrs && (attrs.datasource && !attrs.url || attrs.url && (0, _adfSchema.isSafeUrl)(attrs.url) || attrs.data && attrs.data.url && (0, _adfSchema.isSafeUrl)(attrs.data.url))) {
+              return {
+                type: type,
+                attrs: attrs
+              };
+            }
+            break;
+          }
+        }
       case 'blockCard':
         {
           if (attrs && (attrs.datasource && !attrs.url || attrs.url && (0, _adfSchema.isSafeUrl)(attrs.url) || attrs.data && attrs.data.url && (0, _adfSchema.isSafeUrl)(attrs.data.url))) {

package/dist/es2019/element-browser/components/CategoryList.js

@@ -89,17 +89,15 @@ function CategoryListItem({
     testId: "element-browser-category-item"
   }, category.title));
 }
-const buttonWrapper = css`
-  height: ${GRID_SIZE * 4}px;
-  margin: ${"var(--ds-space-050, 4px)"} ${"var(--ds-space-050, 4px)"}
-    ${"var(--ds-space-050, 4px)"} 0;
-
-  @media (min-width: ${DEVICE_BREAKPOINT_NUMBERS.medium}px) {
-    :not(:last-child) {
-      margin-bottom: 0;
+const buttonWrapper = css({
+  height: `${GRID_SIZE * 4}px`,
+  margin: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-050, 4px)"} ${"var(--ds-space-050, 4px)"} 0`,
+  [`@media (min-width: ${DEVICE_BREAKPOINT_NUMBERS.medium}px)`]: {
+    ':not(:last-child)': {
+      marginBottom: 0
     }
   }
-`;
+});
 const MemoizedCategoryListWithAnalytics = /*#__PURE__*/memo(withAnalyticsContext({
   component: 'CategoryList'
 })(CategoryList));

package/dist/es2019/extensibility/MultiBodiedExtension/action-api.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION } from '../../analytics';
 import { sendMBEAnalyticsEvent } from './utils';
 export const useMultiBodiedExtensionActions = ({
@@ -107,7 +108,6 @@ export const useMultiBodiedExtensionActions = ({
         return true;
       },
       updateParameters(parameters) {
-        var _node$attrs, _node$attrs$parameter;
         const {
           state,
           dispatch
@@ -119,16 +119,30 @@ export const useMultiBodiedExtensionActions = ({
         // We are retaining node.attrs to keep the node type and extension key
         // and only updating the parameters coming in from the user
         // parameters will contain only macroParams information
-        const updatedParameters = {
-          ...node.attrs,
-          parameters: {
-            ...node.attrs.parameters,
-            macroParams: {
-              ...((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$parameter = _node$attrs.parameters) === null || _node$attrs$parameter === void 0 ? void 0 : _node$attrs$parameter.macroParams),
-              ...parameters
+        let updatedParameters;
+        if (getBooleanFF('platform.editor.mbe-update-params-change')) {
+          // With the new feature flag, we will not be de-structuring macroParams,
+          // and will directly replace/overwrite the macroParams with the parameters
+          updatedParameters = {
+            ...node.attrs,
+            parameters: {
+              ...node.attrs.parameters,
+              macroParams: parameters
             }
-          }
-        };
+          };
+        } else {
+          var _node$attrs, _node$attrs$parameter;
+          updatedParameters = {
+            ...node.attrs,
+            parameters: {
+              ...node.attrs.parameters,
+              macroParams: {
+                ...((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$parameter = _node$attrs.parameters) === null || _node$attrs$parameter === void 0 ? void 0 : _node$attrs$parameter.macroParams),
+                ...parameters
+              }
+            }
+          };
+        }
         const tr = state.tr.setNodeMarkup(pos, null, updatedParameters);
         dispatch(tr);
         if (eventDispatcher) {

package/dist/es2019/extensions/manifest-helpers.js

@@ -50,6 +50,11 @@ export function buildNode(action, manifest) {
       }]
     };
   } else if (node.type === 'multiBodiedExtension') {
+    var _manifest$modules, _manifest$modules$nod;
+    if ((_manifest$modules = manifest.modules) !== null && _manifest$modules !== void 0 && (_manifest$modules$nod = _manifest$modules.nodes[action.key]) !== null && _manifest$modules$nod !== void 0 && _manifest$modules$nod.maxFrames) {
+      var _manifest$modules2, _manifest$modules2$no;
+      extension.attrs.maxFrames = (_manifest$modules2 = manifest.modules) === null || _manifest$modules2 === void 0 ? void 0 : (_manifest$modules2$no = _manifest$modules2.nodes[action.key]) === null || _manifest$modules2$no === void 0 ? void 0 : _manifest$modules2$no.maxFrames;
+    }
     return {
       ...extension,
       content: [{

package/dist/es2019/mark/commands.js

@@ -2,6 +2,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 // eslint-disable-next-line no-duplicate-imports
 
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const SMART_TO_ASCII = {
   '…': '...',
   '→': '->',
@@ -96,12 +97,21 @@ export const applyMarkOnRange = (from, to, removeMark, mark, tr) => {
   const {
     code
   } = schema.marks;
+  const {
+    inlineCard
+  } = schema.nodes;
   if (mark.type === code) {
     transformSmartCharsMentionsAndEmojis(from, to, tr);
   }
   tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), (node, pos) => {
-    if (!node.isText) {
-      return true;
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (!node.isText && node.type !== inlineCard) {
+        return true;
+      }
+    } else {
+      if (!node.isText) {
+        return true;
+      }
     }
 
     // This is an issue when the user selects some text.

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.12.5";
+const packageVersion = "78.13.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/types/annotation/emitter.js

@@ -22,7 +22,7 @@ export class AnnotationUpdateEmitter {
     return this.emitter.on(event, listener);
   }
   off(event, listener) {
-    return this.emitter.off(event, listener);
+    return this.emitter.removeListener(event, listener);
   }
   listeners(event) {
     return this.emitter.listeners(event);

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

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.12.5";
+const packageVersion = "78.13.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/utils/annotation/index.js

@@ -1,3 +1,4 @@
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const canApplyAnnotationOnRange = (rangeSelection, doc, schema) => {
   const {
     from,
@@ -6,19 +7,29 @@ export const canApplyAnnotationOnRange = (rangeSelection, doc, schema) => {
   if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
     return false;
   }
+  const {
+    inlineCard
+  } = schema.nodes;
   let foundInvalid = false;
   doc.nodesBetween(rangeSelection.from, rangeSelection.to, (node, _pos, parent) => {
     // Special exception for hardBreak nodes
     if (schema.nodes.hardBreak === node.type) {
       return false;
     }
-
     // For block elements or text nodes, we want to check
     // if annotations are allowed inside this tree
     // or if we're leaf and not text
-    if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-      foundInvalid = true;
-      return false;
+
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (node.isInline && !node.isText && node.type !== inlineCard || node.isLeaf && !node.isText && node.type !== inlineCard || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+        foundInvalid = true;
+        return false;
+      }
+    } else {
+      if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+        foundInvalid = true;
+        return false;
+      }
     }
     return true;
   });

package/dist/es2019/utils/validator.js

@@ -1,5 +1,6 @@
 import { inlineNodes, isSafeUrl, PanelType, generateUuid as uuid } from '@atlaskit/adf-schema';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const ADFStages = {
   FINAL: 'final',
   STAGE_0: 'stage0'
@@ -271,6 +272,30 @@ export const getValidNode = (originalNode, schema = defaultSchema, adfStage = 'f
           break;
         }
       case 'inlineCard':
+        {
+          if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+            let inlineCardNode = {
+              type
+            };
+            if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
+              inlineCardNode.attrs = {
+                ...attrs
+              };
+            }
+            if (marks) {
+              inlineCardNode.marks = [...marks];
+            }
+            return inlineCardNode;
+          } else {
+            if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
+              return {
+                type,
+                attrs
+              };
+            }
+            break;
+          }
+        }
       case 'blockCard':
         {
           if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {

package/dist/esm/element-browser/components/CategoryList.js

@@ -1,9 +1,7 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _templateObject;
 var _excluded = ["categories"],
   _excluded2 = ["buttonStyles"];
 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; }
@@ -98,7 +96,14 @@ function CategoryListItem(_ref2) {
     testId: "element-browser-category-item"
   }, category.title));
 }
-var buttonWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: ", "px;\n  margin: ", " ", "\n    ", " 0;\n\n  @media (min-width: ", "px) {\n    :not(:last-child) {\n      margin-bottom: 0;\n    }\n  }\n"])), GRID_SIZE * 4, "var(--ds-space-050, 4px)", "var(--ds-space-050, 4px)", "var(--ds-space-050, 4px)", DEVICE_BREAKPOINT_NUMBERS.medium);
+var buttonWrapper = css(_defineProperty({
+  height: "".concat(GRID_SIZE * 4, "px"),
+  margin: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " ", "var(--ds-space-050, 4px)", " 0")
+}, "@media (min-width: ".concat(DEVICE_BREAKPOINT_NUMBERS.medium, "px)"), {
+  ':not(:last-child)': {
+    marginBottom: 0
+  }
+}));
 var MemoizedCategoryListWithAnalytics = /*#__PURE__*/memo(withAnalyticsContext({
   component: 'CategoryList'
 })(CategoryList));

package/dist/esm/extensibility/MultiBodiedExtension/action-api.js

@@ -3,6 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 React from 'react';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION } from '../../analytics';
 import { sendMBEAnalyticsEvent } from './utils';
 export var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActions(_ref) {
@@ -103,7 +104,6 @@ export var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActi
         return true;
       },
       updateParameters: function updateParameters(parameters) {
-        var _node$attrs;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         var pos = getPos();
@@ -113,11 +113,23 @@ export var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActi
         // We are retaining node.attrs to keep the node type and extension key
         // and only updating the parameters coming in from the user
         // parameters will contain only macroParams information
-        var updatedParameters = _objectSpread(_objectSpread({}, node.attrs), {}, {
-          parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
-            macroParams: _objectSpread(_objectSpread({}, (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.parameters) === null || _node$attrs === void 0 ? void 0 : _node$attrs.macroParams), parameters)
-          })
-        });
+        var updatedParameters;
+        if (getBooleanFF('platform.editor.mbe-update-params-change')) {
+          // With the new feature flag, we will not be de-structuring macroParams,
+          // and will directly replace/overwrite the macroParams with the parameters
+          updatedParameters = _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
+              macroParams: parameters
+            })
+          });
+        } else {
+          var _node$attrs;
+          updatedParameters = _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread({}, node.attrs.parameters), {}, {
+              macroParams: _objectSpread(_objectSpread({}, (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.parameters) === null || _node$attrs === void 0 ? void 0 : _node$attrs.macroParams), parameters)
+            })
+          });
+        }
         var tr = state.tr.setNodeMarkup(pos, null, updatedParameters);
         dispatch(tr);
         if (eventDispatcher) {

package/dist/esm/extensions/manifest-helpers.js

@@ -76,6 +76,11 @@ export function buildNode(action, manifest) {
       }]
     });
   } else if (node.type === 'multiBodiedExtension') {
+    var _manifest$modules;
+    if ((_manifest$modules = manifest.modules) !== null && _manifest$modules !== void 0 && (_manifest$modules = _manifest$modules.nodes[action.key]) !== null && _manifest$modules !== void 0 && _manifest$modules.maxFrames) {
+      var _manifest$modules2;
+      extension.attrs.maxFrames = (_manifest$modules2 = manifest.modules) === null || _manifest$modules2 === void 0 || (_manifest$modules2 = _manifest$modules2.nodes[action.key]) === null || _manifest$modules2 === void 0 ? void 0 : _manifest$modules2.maxFrames;
+    }
     return _objectSpread(_objectSpread({}, extension), {}, {
       content: [{
         type: 'extensionFrame',

package/dist/esm/mark/commands.js

@@ -2,6 +2,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 // eslint-disable-next-line no-duplicate-imports
 
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var SMART_TO_ASCII = {
   '…': '...',
   '→': '->',
@@ -82,12 +83,19 @@ export var transformSmartCharsMentionsAndEmojis = function transformSmartCharsMe
 export var applyMarkOnRange = function applyMarkOnRange(from, to, removeMark, mark, tr) {
   var schema = tr.doc.type.schema;
   var code = schema.marks.code;
+  var inlineCard = schema.nodes.inlineCard;
   if (mark.type === code) {
     transformSmartCharsMentionsAndEmojis(from, to, tr);
   }
   tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), function (node, pos) {
-    if (!node.isText) {
-      return true;
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (!node.isText && node.type !== inlineCard) {
+        return true;
+      }
+    } else {
+      if (!node.isText) {
+        return true;
+      }
     }
 
     // This is an issue when the user selects some text.

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.12.5";
+var packageVersion = "78.13.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/types/annotation/emitter.js

@@ -31,7 +31,7 @@ export var AnnotationUpdateEmitter = /*#__PURE__*/function () {
   }, {
     key: "off",
     value: function off(event, listener) {
-      return this.emitter.off(event, listener);
+      return this.emitter.removeListener(event, listener);
     }
   }, {
     key: "listeners",

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

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.12.5";
+var packageVersion = "78.13.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/utils/annotation/index.js

@@ -1,22 +1,31 @@
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export var canApplyAnnotationOnRange = function canApplyAnnotationOnRange(rangeSelection, doc, schema) {
   var from = rangeSelection.from,
     to = rangeSelection.to;
   if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
     return false;
   }
+  var inlineCard = schema.nodes.inlineCard;
   var foundInvalid = false;
   doc.nodesBetween(rangeSelection.from, rangeSelection.to, function (node, _pos, parent) {
     // Special exception for hardBreak nodes
     if (schema.nodes.hardBreak === node.type) {
       return false;
     }
-
     // For block elements or text nodes, we want to check
     // if annotations are allowed inside this tree
     // or if we're leaf and not text
-    if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-      foundInvalid = true;
-      return false;
+
+    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+      if (node.isInline && !node.isText && node.type !== inlineCard || node.isLeaf && !node.isText && node.type !== inlineCard || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+        foundInvalid = true;
+        return false;
+      }
+    } else {
+      if (node.isInline && !node.isText || node.isLeaf && !node.isText || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+        foundInvalid = true;
+        return false;
+      }
     }
     return true;
   });

package/dist/esm/utils/validator.js

@@ -4,6 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { inlineNodes, isSafeUrl, PanelType, generateUuid as uuid } from '@atlaskit/adf-schema';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export var ADFStages = {
   FINAL: 'final',
   STAGE_0: 'stage0'
@@ -283,6 +284,28 @@ export var getValidNode = function getValidNode(originalNode) {
           break;
         }
       case 'inlineCard':
+        {
+          if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
+            var inlineCardNode = {
+              type: type
+            };
+            if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
+              inlineCardNode.attrs = _objectSpread({}, attrs);
+            }
+            if (marks) {
+              inlineCardNode.marks = _toConsumableArray(marks);
+            }
+            return inlineCardNode;
+          } else {
+            if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {
+              return {
+                type: type,
+                attrs: attrs
+              };
+            }
+            break;
+          }
+        }
       case 'blockCard':
         {
           if (attrs && (attrs.datasource && !attrs.url || attrs.url && isSafeUrl(attrs.url) || attrs.data && attrs.data.url && isSafeUrl(attrs.data.url))) {

package/dist/types/extensions/types/extension-manifest.d.ts

@@ -40,6 +40,10 @@ export type ExtensionModule<T extends Parameters = Parameters> = {
 export type DynamicFieldDefinitions<T> = (parameters: T) => FieldDefinition[];
 export type ExtensionModuleNode<T extends Parameters = Parameters> = {
     type: 'extension' | 'inlineExtension' | 'bodiedExtension' | 'multiBodiedExtension';
+    /**
+     * Used to set the maximum number of frames in case of a MultiBodiedExtension node.
+     */
+    maxFrames?: number;
     render: () => ExtensionComponentModule<T>;
     update?: UpdateExtension<T>;
     getFieldsDefinition?: (extensionParameters: T) => Promise<FieldDefinition[] | DynamicFieldDefinitions<T>>;

package/dist/types-ts4.5/extensions/types/extension-manifest.d.ts

@@ -40,6 +40,10 @@ export type ExtensionModule<T extends Parameters = Parameters> = {
 export type DynamicFieldDefinitions<T> = (parameters: T) => FieldDefinition[];
 export type ExtensionModuleNode<T extends Parameters = Parameters> = {
     type: 'extension' | 'inlineExtension' | 'bodiedExtension' | 'multiBodiedExtension';
+    /**
+     * Used to set the maximum number of frames in case of a MultiBodiedExtension node.
+     */
+    maxFrames?: number;
     render: () => ExtensionComponentModule<T>;
     update?: UpdateExtension<T>;
     getFieldsDefinition?: (extensionParameters: T) => Promise<FieldDefinition[] | DynamicFieldDefinitions<T>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.12.5",
+  "version": "78.13.0",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -240,6 +240,12 @@
     },
     "platform.editor.inline_extension.extended_lcqdn": {
       "type": "boolean"
+    },
+    "platform.editor.allow-inline-comments-for-inline-nodes": {
+      "type": "boolean"
+    },
+    "platform.editor.mbe-update-params-change": {
+      "type": "boolean"
     }
   }
 }