@atlaskit/editor-common 84.2.0 → 84.3.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-common
 
+## 84.3.0
+
+### Minor Changes
+
+- [#117973](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117973)
+  [`6e37bac62083f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6e37bac62083f) -
+  moved one const, added new entry point for other and deprecated
+
+### Patch Changes
+
+- [#113218](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113218)
+  [`d1b428ec29d68`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d1b428ec29d68) -
+  [ED-23765] migrate inline node commenting feature flags to statsig feature gate
+
 ## 84.2.0
 
 ### Minor Changes

package/afm-jira/tsconfig.json

@@ -47,6 +47,9 @@
     {
       "path": "../../custom-steps/afm-jira/tsconfig.json"
     },
+    {
+      "path": "../../../design-system/dropdown-menu/afm-jira/tsconfig.json"
+    },
     {
       "path": "../../editor-json-transformer/afm-jira/tsconfig.json"
     },

package/dist/cjs/extensibility/ExtensionNodeWrapper.js

@@ -8,7 +8,7 @@ exports.ExtensionNodeWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _utils = require("../utils");
+var _whitespace = require("../whitespace");
 /** @jsx jsx */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -46,6 +46,6 @@ var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNode
     (0, _react2.jsx)("span", {
       className: wrapperClassNames,
       css: styles
-    }, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE)
+    }, children, nodeType === 'inlineExtension' && _whitespace.ZERO_WIDTH_SPACE)
   );
 };

package/dist/cjs/mark/commands.js

@@ -140,22 +140,17 @@ 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) {
-    (0, _platformFeatureFlags.getBooleanFF)('platform.editor.simplify-inline-cards-in-code-blocks_jw6t1') ? transformNonTextNodesToText(from, to, tr) : transformSmartCharsMentionsAndEmojis(from, to, tr);
+    (0, _platformFeatureFlags.fg)('platform.editor.simplify-inline-cards-in-code-blocks_jw6t1') ? transformNonTextNodesToText(from, to, tr) : transformSmartCharsMentionsAndEmojis(from, to, tr);
   }
   tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), function (node, pos) {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
       if (!node.isText) {
         var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
         if (!isAllowedInlineNode) {
           return true;
         }
       }
-    } else 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;

package/dist/cjs/messages/annotation.js

@@ -11,7 +11,7 @@ var annotationMessages = exports.annotationMessages = (0, _reactIntlNext.defineM
     defaultMessage: 'Comment',
     description: 'Create/add an inline comment based on the users selection'
   },
-  // TODO: Remove this message when the platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz FF is removed
+  // TODO: Remove this message when the editor_inline_comments_on_inline_nodes FF is removed
   createCommentInvalid: {
     id: 'fabric.editor.createCommentInvalid',
     defaultMessage: 'You can only comment on text and headings',

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,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 = "84.2.0";
+var packageVersion = "84.3.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/react-node-view/getInlineNodeViewProducer.js

@@ -13,6 +13,7 @@ var _react2 = require("@emotion/react");
 var _analytics = require("../analytics");
 var _ErrorBoundary = require("../ui/ErrorBoundary");
 var _utils = require("../utils");
+var _whitespace = require("../whitespace");
 var _generateUniqueNodeKey = require("./generateUniqueNodeKey");
 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; } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -178,7 +179,7 @@ function getPortalChildren(_ref2) {
       className: "zeroWidthSpaceContainer"
     }, (0, _react2.jsx)("span", {
       className: "".concat(inlineNodeViewClassname, "AddZeroWidthSpace")
-    }), _utils.ZERO_WIDTH_SPACE), (0, _react2.jsx)(Component, (0, _extends2.default)({
+    }), _whitespace.ZERO_WIDTH_SPACE), (0, _react2.jsx)(Component, (0, _extends2.default)({
       view: nodeViewParams.view
       // TODO:  ED-13910 - Remove the boolean to fix the prosemirror view type
       ,
@@ -191,7 +192,7 @@ function getPortalChildren(_ref2) {
       contentEditable: "false"
     }, (0, _react2.jsx)("span", {
       className: "".concat(inlineNodeViewClassname, "AddZeroWidthSpace")
-    }), _utils.ZERO_WIDTH_SPACE) :
+    }), _whitespace.ZERO_WIDTH_SPACE) :
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     (0, _react2.jsx)("span", {
       className: "".concat(inlineNodeViewClassname, "AddZeroWidthSpace")

package/dist/cjs/styles/shared/annotation.js

@@ -25,7 +25,7 @@ var BlockAnnotationSharedClassNames = exports.BlockAnnotationSharedClassNames =
 var Yellow100 = 'rgb(255, 247, 214)';
 var Y200a = 'rgba(255, 196, 0, 0.82)';
 var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     // NOTE: These styles are shared between renderer and editor. Sometimes they
     // need different selectors and other times they apply the same attributes
     // in a different way. For example in renderer the focus styles are an
@@ -55,38 +55,6 @@ var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function A
         borderBottomColor: "var(--ds-border-accent-yellow, ".concat(Y200a, ")")
       })
     };
-  } else if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
-    return {
-      focus: (0, _react.css)({
-        background: "var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"),
-        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")")),
-        boxShadow: "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"),
-        cursor: 'pointer',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-        '&:has(.card)': {
-          fontSize: '1.5rem',
-          lineHeight: '1.2rem',
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-          '& > *': {
-            fontSize: '16px'
-          }
-        }
-      }),
-      blur: (0, _react.css)({
-        background: "var(--ds-background-accent-yellow-subtlest, ".concat(Yellow100, ")"),
-        borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")")),
-        cursor: 'pointer',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-        '&:has(.card)': {
-          fontSize: '1.5rem',
-          lineHeight: '1.2rem',
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-          '& > *': {
-            fontSize: '16px'
-          }
-        }
-      })
-    };
   } else {
     return {
       focus: (0, _react.css)({
@@ -107,7 +75,7 @@ var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function A
   }
 };
 var annotationSharedStyles = exports.annotationSharedStyles = function annotationSharedStyles() {
-  return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
+  return (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
   (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror {\n\t\t\t\t\t.", ",\n\t\t\t\t\t\t.", ",\n\t\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t}\n\n\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t}\n\n\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t\tcursor: initial;\n\t\t\t\t\t}\n\n\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t"])), AnnotationSharedClassNames.blur, AnnotationSharedClassNames.focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().common, AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur) : // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
   (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror {\n\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t}\n\n\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t\tcursor: initial;\n\t\t\t\t\t}\n\n\t\t\t\t\t.", " {\n\t\t\t\t\t\t", ";\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t"])), AnnotationSharedClassNames.focus, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.draft, AnnotationSharedCSSByState().focus, AnnotationSharedClassNames.blur, AnnotationSharedCSSByState().blur);
 };

package/dist/cjs/styles/shared/smartCard.js

@@ -16,4 +16,4 @@ var DATASOURCE_INNER_CONTAINER_CLASSNAME = exports.DATASOURCE_INNER_CONTAINER_CL
 var FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = exports.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = 'card-floating-toolbar--link-picker';
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-var smartCardStyles = exports.smartCardStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.", " {\n\t\tmax-width: calc(100% - 20px);\n\t\tvertical-align: top;\n\t\tword-break: break-all;\n\t\t", "\n\t\t.card {\n\t\t\tpadding-left: ", ";\n\t\t\tpadding-right: ", ";\n\t\t\tpadding-top: 0.5em;\n\t\t\tpadding-bottom: 0.5em;\n\t\t\tmargin-bottom: -0.5em;\n\n\t\t\t.", " > a:focus {\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t&.", " .", " > a {\n\t\t\t", "\n\t\t}\n\t\t.", " > a {\n\t\t\t/* EDM-1717: box-shadow Safari fix start */\n\t\t\tz-index: 1;\n\t\t\tposition: relative;\n\t\t\t/* EDM-1717: box-shadow Safari fix end */\n\t\t}\n\n\t\t&.danger {\n\t\t\t.", " > a {\n\t\t\t\tbox-shadow: 0 0 0 1px ", ";\n\t\t\t\t/* EDM-1717: box-shadow Safari fix start */\n\t\t\t\tz-index: 2;\n\t\t\t\t/* EDM-1717: box-shadow Safari fix end */\n\t\t\t}\n\t\t}\n\t}\n\n\t.", " {\n\t\t.", " > div {\n\t\t\tcursor: pointer;\n\t\t}\n\n\t\t&.", " .", " > div {\n\t\t\t", "\n\t\t\tborder-radius: ", ";\n\t\t}\n\n\t\t&.danger {\n\t\t\t.", " > div {\n\t\t\t\tbox-shadow: 0 0 0 1px ", " !important;\n\t\t\t}\n\t\t}\n\t}\n\n\t.", ".", " {\n\t\tmax-width: 100%;\n\t\tdisplay: flex;\n\t\tjustify-content: center;\n\n\t\t.", " {\n\t\t\tcursor: pointer;\n\t\t\tbackground-color: ", ";\n\t\t\tborder-radius: ", ";\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\n\t\t&.", " {\n\t\t\t.", " {\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t&.danger {\n\t\t\t.", " {\n\t\t\t\tbox-shadow: 0 0 0 1px ", ";\n\t\t\t}\n\t\t}\n\t}\n\n\t.", " {\n\t\t.", " > div {\n\t\t\tcursor: pointer;\n\t\t\t&::after {\n\t\t\t\ttransition: box-shadow 0s;\n\t\t\t}\n\t\t}\n\n\t\t&.", " .", " > div::after {\n\t\t\t", "\n\t\t}\n\n\t\t&.danger {\n\t\t\t.media-card-frame::after {\n\t\t\t\tbox-shadow: 0 0 0 1px ", " !important;\n\t\t\t\tbackground: ", " !important;\n\t\t\t}\n\t\t\t.richMedia-resize-handle-right::after,\n\t\t\t.richMedia-resize-handle-left::after {\n\t\t\t\tbackground: ", ";\n\t\t\t}\n\t\t}\n\t}\n\n\t.", " {\n\t\tpadding: 0;\n\t}\n"])), _smartCard.SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') ? ".card-with-comment {\n          background: ".concat("var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"), ";\n          border-bottom: 2px solid ", "var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")"), ";\n          box-shadow: ", "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"), ";\n        }") : '', "var(--ds-space-025, 2px)", "var(--ds-space-025, 2px)", _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _smartCard.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-radius-200, 8px)", _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _smartCard.SmartCardSharedCssClassName.DATASOURCE_CONTAINER, _smartCard.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, DATASOURCE_INNER_CONTAINER_CLASSNAME, "var(--ds-background-neutral-subtle, ".concat(_colors.N0, ")"), "var(--ds-border-radius-200, 8px)", "var(--ds-border, ".concat(_colors.N40, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, DATASOURCE_INNER_CONTAINER_CLASSNAME, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), DATASOURCE_INNER_CONTAINER_CLASSNAME, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _smartCard.SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);
+var smartCardStyles = exports.smartCardStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.", " {\n\t\tmax-width: calc(100% - 20px);\n\t\tvertical-align: top;\n\t\tword-break: break-all;\n\t\t", "\n\t\t.card {\n\t\t\tpadding-left: ", ";\n\t\t\tpadding-right: ", ";\n\t\t\tpadding-top: 0.5em;\n\t\t\tpadding-bottom: 0.5em;\n\t\t\tmargin-bottom: -0.5em;\n\n\t\t\t.", " > a:focus {\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t&.", " .", " > a {\n\t\t\t", "\n\t\t}\n\t\t.", " > a {\n\t\t\t/* EDM-1717: box-shadow Safari fix start */\n\t\t\tz-index: 1;\n\t\t\tposition: relative;\n\t\t\t/* EDM-1717: box-shadow Safari fix end */\n\t\t}\n\n\t\t&.danger {\n\t\t\t.", " > a {\n\t\t\t\tbox-shadow: 0 0 0 1px ", ";\n\t\t\t\t/* EDM-1717: box-shadow Safari fix start */\n\t\t\t\tz-index: 2;\n\t\t\t\t/* EDM-1717: box-shadow Safari fix end */\n\t\t\t}\n\t\t}\n\t}\n\n\t.", " {\n\t\t.", " > div {\n\t\t\tcursor: pointer;\n\t\t}\n\n\t\t&.", " .", " > div {\n\t\t\t", "\n\t\t\tborder-radius: ", ";\n\t\t}\n\n\t\t&.danger {\n\t\t\t.", " > div {\n\t\t\t\tbox-shadow: 0 0 0 1px ", " !important;\n\t\t\t}\n\t\t}\n\t}\n\n\t.", ".", " {\n\t\tmax-width: 100%;\n\t\tdisplay: flex;\n\t\tjustify-content: center;\n\n\t\t.", " {\n\t\t\tcursor: pointer;\n\t\t\tbackground-color: ", ";\n\t\t\tborder-radius: ", ";\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\n\t\t&.", " {\n\t\t\t.", " {\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\n\t\t&.danger {\n\t\t\t.", " {\n\t\t\t\tbox-shadow: 0 0 0 1px ", ";\n\t\t\t}\n\t\t}\n\t}\n\n\t.", " {\n\t\t.", " > div {\n\t\t\tcursor: pointer;\n\t\t\t&::after {\n\t\t\t\ttransition: box-shadow 0s;\n\t\t\t}\n\t\t}\n\n\t\t&.", " .", " > div::after {\n\t\t\t", "\n\t\t}\n\n\t\t&.danger {\n\t\t\t.media-card-frame::after {\n\t\t\t\tbox-shadow: 0 0 0 1px ", " !important;\n\t\t\t\tbackground: ", " !important;\n\t\t\t}\n\t\t\t.richMedia-resize-handle-right::after,\n\t\t\t.richMedia-resize-handle-left::after {\n\t\t\t\tbackground: ", ";\n\t\t\t}\n\t\t}\n\t}\n\n\t.", " {\n\t\tpadding: 0;\n\t}\n"])), _smartCard.SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? ".card-with-comment {\n          background: ".concat("var(--ds-background-accent-yellow-subtler, ".concat(_colors.Y75, ")"), ";\n          border-bottom: 2px solid ", "var(--ds-border-accent-yellow, ".concat(_colors.Y300, ")"), ";\n          box-shadow: ", "var(--ds-shadow-overlay, ".concat("1px 2px 3px ".concat(_colors.N60A, ", -1px 2px 3px ").concat(_colors.N60A), ")"), ";\n        }") : '', "var(--ds-space-025, 2px)", "var(--ds-space-025, 2px)", _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _smartCard.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-radius-200, 8px)", _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _smartCard.SmartCardSharedCssClassName.DATASOURCE_CONTAINER, _smartCard.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, DATASOURCE_INNER_CONTAINER_CLASSNAME, "var(--ds-background-neutral-subtle, ".concat(_colors.N0, ")"), "var(--ds-border-radius-200, 8px)", "var(--ds-border, ".concat(_colors.N40, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, DATASOURCE_INNER_CONTAINER_CLASSNAME, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), DATASOURCE_INNER_CONTAINER_CLASSNAME, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _smartCard.SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _smartCard.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);

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

@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
 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 */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "84.2.0";
+var packageVersion = "84.3.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -19,29 +19,21 @@ var canApplyAnnotationOnRange = exports.canApplyAnnotationOnRange = function can
   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 ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
-        var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
-        if (node.isInline && !node.isText && !isAllowedInlineNode || node.isLeaf && !node.isText && !isAllowedInlineNode || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-          foundInvalid = true;
-          return false;
-        }
-      } else {
-        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;
-        }
+    if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+      var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+      if (node.isInline && !node.isText && !isAllowedInlineNode || node.isLeaf && !node.isText && !isAllowedInlineNode || 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))) {
@@ -111,7 +103,7 @@ function containsAnyAnnotations(slice, state) {
 function getRangeInlineNodeNames(_ref) {
   var doc = _ref.doc,
     pos = _ref.pos;
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   var nodeNames = new Set();
@@ -129,13 +121,13 @@ function getRangeInlineNodeNames(_ref) {
 /**
  * This function returns a list of node types that are wrapped by an annotation mark.
  *
- * The `undefined` will be returned if `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is off.
+ * The `undefined` will be returned if `editor_inline_comments_on_inline_nodes` is off.
  *
  * @todo: Do not forget to remove `undefined` when the
- *        `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+ *        `editor_inline_comments_on_inline_nodes` is removed.
  */
 function getAnnotationInlineNodeTypes(state, annotationId) {
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   var mark = state.schema.marks.annotation.create({

package/dist/cjs/utils/index.js

@@ -1152,7 +1152,7 @@ var _table = require("./table");
 var _compareNodes = require("./compareNodes");
 var _compose = require("./compose");
 var _isTextInput = require("./is-text-input");
-var _whitespace = require("./whitespace");
+var _whitespace = require("../whitespace");
 var _shouldForceTracking = require("./should-force-tracking");
 var _getModeFromTheme = require("./getModeFromTheme");
 var _getPerformanceOptions = require("./get-performance-options");
@@ -1181,6 +1181,10 @@ var _insertNodeIntoOrderedList = require("./insert-node-into-ordered-list");
 var _wrapSelectionIn = require("./wrap-selection-in");
 var _calculateToolbarPosition = require("./calculate-toolbar-position");
 var _nodesByLocalIds = require("./nodes-by-localIds");
+/**
+ * @deprecated - [ED-23844] moving to own entry point @atlaskit/editor-common/whitespace
+ */
+
 // prosemirror-history does not export its plugin key
 var pmHistoryPluginKey = exports.pmHistoryPluginKey = 'history$';
 function shallowEqual() {

package/dist/cjs/utils/scroll-gutter.js

@@ -5,5 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GUTTER_SIZE_MOBILE_IN_PX = exports.GUTTER_SIZE_IN_PX = exports.GUTTER_SELECTOR = void 0;
 var GUTTER_SIZE_IN_PX = exports.GUTTER_SIZE_IN_PX = 120; // Default gutter size
+/**
+ * @deprecated - [ED-23844] only used in Editor Core
+ */
 var GUTTER_SIZE_MOBILE_IN_PX = exports.GUTTER_SIZE_MOBILE_IN_PX = 36; // Gutter size for Mobile
 var GUTTER_SELECTOR = exports.GUTTER_SELECTOR = '#editor-scroll-gutter';

package/dist/cjs/utils/validator.js

@@ -255,7 +255,7 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
             return _objectSpread({
               type: type,
               attrs: attrs
-            }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+            }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? {
               marks: marks
             } : {});
           }
@@ -267,7 +267,7 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
             return _objectSpread({
               type: type,
               attrs: attrs
-            }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+            }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? {
               marks: marks
             } : {});
           }
@@ -279,7 +279,7 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
             return _objectSpread({
               type: type,
               attrs: attrs
-            }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+            }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? {
               marks: marks
             } : {});
           }
@@ -302,7 +302,7 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
             return _objectSpread({
               type: type,
               attrs: attrs
-            }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') ? {
+            }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? {
               marks: marks
             } : {});
           }
@@ -509,7 +509,7 @@ var getValidNode = exports.getValidNode = function getValidNode(originalNode) {
                 text: mentionText,
                 accessLevel: ''
               }
-            }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ? {
+            }, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') ? {
               marks: marks
             } : {});
             if (mentionAccess) {

package/dist/cjs/whitespace/index.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "ZERO_WIDTH_JOINER", {
+  enumerable: true,
+  get: function get() {
+    return _whitespace.ZERO_WIDTH_JOINER;
+  }
+});
+Object.defineProperty(exports, "ZERO_WIDTH_SPACE", {
+  enumerable: true,
+  get: function get() {
+    return _whitespace.ZERO_WIDTH_SPACE;
+  }
+});
+var _whitespace = require("./whitespace");

package/dist/es2019/extensibility/ExtensionNodeWrapper.js

@@ -4,7 +4,7 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
-import { ZERO_WIDTH_SPACE } from '../utils';
+import { ZERO_WIDTH_SPACE } from '../whitespace';
 const styles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.inline-extension': {

package/dist/es2019/mark/commands.js

@@ -2,7 +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';
+import { fg } from '@atlaskit/platform-feature-flags';
 const SMART_TO_ASCII = {
   '…': '...',
   '→': '->',
@@ -150,24 +150,17 @@ export const applyMarkOnRange = (from, to, removeMark, mark, tr) => {
   const {
     code
   } = schema.marks;
-  const {
-    inlineCard
-  } = schema.nodes;
   if (mark.type === code) {
-    getBooleanFF('platform.editor.simplify-inline-cards-in-code-blocks_jw6t1') ? transformNonTextNodesToText(from, to, tr) : transformSmartCharsMentionsAndEmojis(from, to, tr);
+    fg('platform.editor.simplify-inline-cards-in-code-blocks_jw6t1') ? transformNonTextNodesToText(from, to, tr) : transformSmartCharsMentionsAndEmojis(from, to, tr);
   }
   tr.doc.nodesBetween(tr.mapping.map(from), tr.mapping.map(to), (node, pos) => {
-    if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+    if (fg('editor_inline_comments_on_inline_nodes')) {
       if (!node.isText) {
         const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
         if (!isAllowedInlineNode) {
           return true;
         }
       }
-    } else if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
-      if (!node.isText && node.type !== inlineCard) {
-        return true;
-      }
     } else {
       if (!node.isText) {
         return true;

package/dist/es2019/messages/annotation.js

@@ -5,7 +5,7 @@ export const annotationMessages = defineMessages({
     defaultMessage: 'Comment',
     description: 'Create/add an inline comment based on the users selection'
   },
-  // TODO: Remove this message when the platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz FF is removed
+  // TODO: Remove this message when the editor_inline_comments_on_inline_nodes FF is removed
   createCommentInvalid: {
     id: 'fabric.editor.createCommentInvalid',
     defaultMessage: 'You can only comment on text and headings',

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "84.2.0";
+const packageVersion = "84.3.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/react-node-view/getInlineNodeViewProducer.js

@@ -6,7 +6,8 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { ErrorBoundary } from '../ui/ErrorBoundary';
-import { analyticsEventKey, browser, getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered, ZERO_WIDTH_SPACE } from '../utils';
+import { analyticsEventKey, browser, getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered } from '../utils';
+import { ZERO_WIDTH_SPACE } from '../whitespace';
 import { generateUniqueNodeKey } from './generateUniqueNodeKey';
 export const inlineNodeViewClassname = 'inlineNodeView';
 function createNodeView({

package/dist/es2019/styles/shared/annotation.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N60A, Y300, Y75 } from '@atlaskit/theme/colors';
 export const annotationPrefix = 'ak-editor-annotation';
 export const AnnotationSharedClassNames = {
@@ -17,7 +17,7 @@ export const BlockAnnotationSharedClassNames = {
 const Yellow100 = 'rgb(255, 247, 214)';
 const Y200a = 'rgba(255, 196, 0, 0.82)';
 export const AnnotationSharedCSSByState = () => {
-  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (fg('editor_inline_comments_on_inline_nodes')) {
     // NOTE: These styles are shared between renderer and editor. Sometimes they
     // need different selectors and other times they apply the same attributes
     // in a different way. For example in renderer the focus styles are an
@@ -47,38 +47,6 @@ export const AnnotationSharedCSSByState = () => {
         borderBottomColor: `var(--ds-border-accent-yellow, ${Y200a})`
       })
     };
-  } else if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
-    return {
-      focus: css({
-        background: `var(--ds-background-accent-yellow-subtler, ${Y75})`,
-        borderBottom: `2px solid ${`var(--ds-border-accent-yellow, ${Y300})`}`,
-        boxShadow: `var(--ds-shadow-overlay, ${`1px 2px 3px ${N60A}, -1px 2px 3px ${N60A}`})`,
-        cursor: 'pointer',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-        '&:has(.card)': {
-          fontSize: '1.5rem',
-          lineHeight: '1.2rem',
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-          '& > *': {
-            fontSize: '16px'
-          }
-        }
-      }),
-      blur: css({
-        background: `var(--ds-background-accent-yellow-subtlest, ${Yellow100})`,
-        borderBottom: `2px solid ${`var(--ds-border-accent-yellow, ${Y200a})`}`,
-        cursor: 'pointer',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-        '&:has(.card)': {
-          fontSize: '1.5rem',
-          lineHeight: '1.2rem',
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
-          '& > *': {
-            fontSize: '16px'
-          }
-        }
-      })
-    };
   } else {
     return {
       focus: css({
@@ -98,7 +66,7 @@ export const AnnotationSharedCSSByState = () => {
     };
   }
 };
-export const annotationSharedStyles = () => getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz') ?
+export const annotationSharedStyles = () => fg('editor_inline_comments_on_inline_nodes') ?
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- `AnnotationSharedCSSByState()` is not safe in object syntax
 css`
 				.ProseMirror {

package/dist/es2019/styles/shared/smartCard.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedNodeClassName, getSelectionStyles, SelectionStyle } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N40 } from '@atlaskit/theme/colors';
 import { N60A, Y300, Y75 } from '@atlaskit/theme/colors';
 import { SmartCardSharedCssClassName } from './smart-card';
@@ -14,7 +14,7 @@ export const smartCardStyles = css`
 		max-width: calc(100% - 20px);
 		vertical-align: top;
 		word-break: break-all;
-		${getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? `.card-with-comment {
+		${fg('editor_inline_comments_on_inline_nodes') ? `.card-with-comment {
           background: ${`var(--ds-background-accent-yellow-subtler, ${Y75})`};
           border-bottom: 2px solid ${`var(--ds-border-accent-yellow, ${Y300})`};
           box-shadow: ${`var(--ds-shadow-overlay, ${`1px 2px 3px ${N60A}, -1px 2px 3px ${N60A}`})`};

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

@@ -9,7 +9,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 = "84.2.0";
+const packageVersion = "84.3.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -1,5 +1,5 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const canApplyAnnotationOnRange = (rangeSelection, doc, schema) => {
   const {
     from,
@@ -8,31 +8,21 @@ 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 (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
-      if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
-        const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
-        if (node.isInline && !node.isText && !isAllowedInlineNode || node.isLeaf && !node.isText && !isAllowedInlineNode || node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
-          foundInvalid = true;
-          return false;
-        }
-      } else {
-        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;
-        }
+    if (fg('editor_inline_comments_on_inline_nodes')) {
+      const isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+      if (node.isInline && !node.isText && !isAllowedInlineNode || node.isLeaf && !node.isText && !isAllowedInlineNode || 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))) {
@@ -111,7 +101,7 @@ export function getRangeInlineNodeNames({
   doc,
   pos
 }) {
-  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   let nodeNames = new Set();
@@ -129,13 +119,13 @@ export function getRangeInlineNodeNames({
 /**
  * This function returns a list of node types that are wrapped by an annotation mark.
  *
- * The `undefined` will be returned if `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is off.
+ * The `undefined` will be returned if `editor_inline_comments_on_inline_nodes` is off.
  *
  * @todo: Do not forget to remove `undefined` when the
- *        `platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz` is removed.
+ *        `editor_inline_comments_on_inline_nodes` is removed.
  */
 export function getAnnotationInlineNodeTypes(state, annotationId) {
-  if (!getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes-round-2_ctuxz')) {
+  if (!fg('editor_inline_comments_on_inline_nodes')) {
     return undefined;
   }
   const mark = state.schema.marks.annotation.create({