@atlaskit/editor-plugin-card 4.4.12 → 4.5.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-card
 
+## 4.5.0
+
+### Minor Changes
+
+- [#175540](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/175540)
+  [`fa908f67c5dba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fa908f67c5dba) -
+  [ux] ED-25903 support comment on smart links floating toolbar
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.4.13
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.4.12
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -30,6 +30,10 @@ var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _utils2 = 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; }
 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; }
+// Dummpy type of AnnotationPlugin
+// This is used to avoid editor universal preset's inferred type maximum length error
+// TODO: Remove this when the issue is fixed
+
 var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
   var _options$lpLinkPicker;
   var _ref$config = _ref.config,

package/dist/cjs/toolbar.js

@@ -18,10 +18,12 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
 var _linkExternal = _interopRequireDefault(require("@atlaskit/icon/core/link-external"));
 var _settings = _interopRequireDefault(require("@atlaskit/icon/core/settings"));
+var _comment2 = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _settings2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
@@ -189,7 +191,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs;
     var _titleUrlPairFromNode2 = (0, _utils3.titleUrlPairFromNode)(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -210,6 +212,19 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = (0, _utils3.isDatasourceNode)(node);
     var pluginState = _main.pluginKey.getState(state);
+    var annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
+    var activeCommentMark = node.marks.find(function (mark) {
+      return mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false;
+    });
+    var isCommentEnabled = annotationApiState && annotationApiState.isVisible && !annotationApiState.bookmark && !annotationApiState.mouseData.isSelecting && !activeCommentMark && node.type === state.schema.nodes.inlineCard && (0, _platformFeatureFlags.fg)('platform_inline_node_as_valid_annotation_selection');
+    var onCommentButtonClick = function onCommentButtonClick(state, dispatch) {
+      if (!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.annotation) || !isCommentEnabled) {
+        return false;
+      }
+      var setInlineCommentDraftState = pluginInjectionApi.annotation.actions.setInlineCommentDraftState;
+      var command = setInlineCommentDraftState(true, _analytics.INPUT_METHOD.FLOATING_TB);
+      return command(state, dispatch);
+    };
     var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [(0, _EditLinkToolbar.buildEditLinkToolbar)({
@@ -249,7 +264,18 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, {
         type: 'separator'
       }];
-      var toolbarItems = [].concat(editItems, [{
+      var commentItems = isCommentEnabled ? [{
+        id: 'editor.link.commentLink',
+        type: 'button',
+        icon: _comment.default,
+        testId: 'inline-card-toolbar-comment-button',
+        iconFallback: _comment2.default,
+        title: intl.formatMessage(_messages.annotationMessages.createComment),
+        onClick: onCommentButtonClick
+      }, {
+        type: 'separator'
+      }] : [];
+      var toolbarItems = [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -287,8 +313,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$a2;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, cardOptions);
+        var _pluginInjectionApi$a3;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'

package/dist/es2019/plugin.js

@@ -18,6 +18,11 @@ import { EditorLinkingPlatformAnalytics } from './ui/EditorLinkingPlatformAnalyt
 import { EditorSmartCardEvents } from './ui/EditorSmartCardEvents';
 import LayoutButton from './ui/LayoutButton';
 import { isDatasourceConfigEditable } from './utils';
+
+// Dummpy type of AnnotationPlugin
+// This is used to avoid editor universal preset's inferred type maximum length error
+// TODO: Remove this when the issue is fixed
+
 export const cardPlugin = ({
   config: options = {},
   api

package/dist/es2019/toolbar.js

@@ -3,15 +3,17 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
-import commonMessages, { linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
+import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import CommentIcon from '@atlaskit/icon/core/comment';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import SettingsIcon from '@atlaskit/icon/core/settings';
+import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
@@ -177,7 +179,7 @@ const getToolbarViewedItem = (url, display) => {
   }];
 };
 const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs$datasourc;
+  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs, _node$attrs$datasourc;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -202,6 +204,19 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
   } = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {};
   const isDatasource = isDatasourceNode(node);
   const pluginState = pluginKey.getState(state);
+  const annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
+  const activeCommentMark = node.marks.find(mark => mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false);
+  const isCommentEnabled = annotationApiState && annotationApiState.isVisible && !annotationApiState.bookmark && !annotationApiState.mouseData.isSelecting && !activeCommentMark && node.type === state.schema.nodes.inlineCard && fg('platform_inline_node_as_valid_annotation_selection');
+  const onCommentButtonClick = (state, dispatch) => {
+    if (!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.annotation) || !isCommentEnabled) {
+      return false;
+    }
+    const {
+      setInlineCommentDraftState
+    } = pluginInjectionApi.annotation.actions;
+    const command = setInlineCommentDraftState(true, INPUT_METHOD.FLOATING_TB);
+    return command(state, dispatch);
+  };
   const shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$datasourc = _node$attrs.datasource) === null || _node$attrs$datasourc === void 0 ? void 0 : _node$attrs$datasourc.id);
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
     return [buildEditLinkToolbar({
@@ -241,7 +256,18 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     }, {
       type: 'separator'
     }];
-    const toolbarItems = [...editItems, {
+    const commentItems = isCommentEnabled ? [{
+      id: 'editor.link.commentLink',
+      type: 'button',
+      icon: CommentIcon,
+      testId: 'inline-card-toolbar-comment-button',
+      iconFallback: LegacyCommentIcon,
+      title: intl.formatMessage(annotationMessages.createComment),
+      onClick: onCommentButtonClick
+    }, {
+      type: 'separator'
+    }] : [];
+    const toolbarItems = [...editItems, ...commentItems, {
       id: 'editor.link.openLink',
       type: 'button',
       icon: LinkExternalIcon,
@@ -279,8 +305,8 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
     }];
     if (currentAppearance === 'embed') {
-      var _pluginInjectionApi$a2;
-      const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, cardOptions);
+      var _pluginInjectionApi$a3;
+      const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, cardOptions);
       if (alignmentOptions.length) {
         alignmentOptions.push({
           type: 'separator'

package/dist/esm/plugin.js

@@ -23,6 +23,11 @@ import { EditorLinkingPlatformAnalytics } from './ui/EditorLinkingPlatformAnalyt
 import { EditorSmartCardEvents } from './ui/EditorSmartCardEvents';
 import LayoutButton from './ui/LayoutButton';
 import { isDatasourceConfigEditable } from './utils';
+
+// Dummpy type of AnnotationPlugin
+// This is used to avoid editor universal preset's inferred type maximum length error
+// TODO: Remove this when the issue is fixed
+
 export var cardPlugin = function cardPlugin(_ref) {
   var _options$lpLinkPicker;
   var _ref$config = _ref.config,

package/dist/esm/toolbar.js

@@ -7,15 +7,17 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
-import commonMessages, { linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
+import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import CommentIcon from '@atlaskit/icon/core/comment';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import SettingsIcon from '@atlaskit/icon/core/settings';
+import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
@@ -179,7 +181,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -200,6 +202,19 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = isDatasourceNode(node);
     var pluginState = pluginKey.getState(state);
+    var annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
+    var activeCommentMark = node.marks.find(function (mark) {
+      return mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false;
+    });
+    var isCommentEnabled = annotationApiState && annotationApiState.isVisible && !annotationApiState.bookmark && !annotationApiState.mouseData.isSelecting && !activeCommentMark && node.type === state.schema.nodes.inlineCard && fg('platform_inline_node_as_valid_annotation_selection');
+    var onCommentButtonClick = function onCommentButtonClick(state, dispatch) {
+      if (!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.annotation) || !isCommentEnabled) {
+        return false;
+      }
+      var setInlineCommentDraftState = pluginInjectionApi.annotation.actions.setInlineCommentDraftState;
+      var command = setInlineCommentDraftState(true, INPUT_METHOD.FLOATING_TB);
+      return command(state, dispatch);
+    };
     var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [buildEditLinkToolbar({
@@ -239,7 +254,18 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, {
         type: 'separator'
       }];
-      var toolbarItems = [].concat(editItems, [{
+      var commentItems = isCommentEnabled ? [{
+        id: 'editor.link.commentLink',
+        type: 'button',
+        icon: CommentIcon,
+        testId: 'inline-card-toolbar-comment-button',
+        iconFallback: LegacyCommentIcon,
+        title: intl.formatMessage(annotationMessages.createComment),
+        onClick: onCommentButtonClick
+      }, {
+        type: 'separator'
+      }] : [];
+      var toolbarItems = [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -277,8 +303,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$a2;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, cardOptions);
+        var _pluginInjectionApi$a3;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'

package/dist/types/plugin.d.ts

@@ -1,6 +1,8 @@
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { CardPluginActions } from '@atlaskit/editor-common/card';
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin, Command } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { InlineCommentPluginState } from '@atlaskit/editor-plugin-annotation';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
@@ -10,6 +12,12 @@ import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { CardPluginOptions, CardPluginState } from './types';
+type DummyAnnotationPlugin = NextEditorPlugin<'annotation', {
+    sharedState: InlineCommentPluginState;
+    actions: {
+        setInlineCommentDraftState: (isDraft: boolean, inputMethod: INPUT_METHOD) => Command;
+    };
+}>;
 export type CardPlugin = NextEditorPlugin<'card', {
     pluginConfiguration: CardPluginOptions | undefined;
     dependencies: [
@@ -21,9 +29,11 @@ export type CardPlugin = NextEditorPlugin<'card', {
         GridPlugin,
         FloatingToolbarPlugin,
         OptionalPlugin<EditorDisabledPlugin>,
-        OptionalPlugin<SelectionPlugin>
+        OptionalPlugin<SelectionPlugin>,
+        OptionalPlugin<DummyAnnotationPlugin>
     ];
     sharedState: CardPluginState | null;
     actions: CardPluginActions;
 }>;
 export declare const cardPlugin: CardPlugin;
+export {};

package/dist/types-ts4.5/plugin.d.ts

@@ -1,6 +1,8 @@
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { CardPluginActions } from '@atlaskit/editor-common/card';
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin, Command } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { InlineCommentPluginState } from '@atlaskit/editor-plugin-annotation';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
@@ -10,6 +12,12 @@ import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { CardPluginOptions, CardPluginState } from './types';
+type DummyAnnotationPlugin = NextEditorPlugin<'annotation', {
+    sharedState: InlineCommentPluginState;
+    actions: {
+        setInlineCommentDraftState: (isDraft: boolean, inputMethod: INPUT_METHOD) => Command;
+    };
+}>;
 export type CardPlugin = NextEditorPlugin<'card', {
     pluginConfiguration: CardPluginOptions | undefined;
     dependencies: [
@@ -21,9 +29,11 @@ export type CardPlugin = NextEditorPlugin<'card', {
         GridPlugin,
         FloatingToolbarPlugin,
         OptionalPlugin<EditorDisabledPlugin>,
-        OptionalPlugin<SelectionPlugin>
+        OptionalPlugin<SelectionPlugin>,
+        OptionalPlugin<DummyAnnotationPlugin>
     ];
     sharedState: CardPluginState | null;
     actions: CardPluginActions;
 }>;
 export declare const cardPlugin: CardPlugin;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "4.4.12",
+	"version": "4.5.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^95.10.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -46,8 +46,8 @@
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/frontend-utilities": "^2.7.0",
-		"@atlaskit/icon": "^23.0.0",
-		"@atlaskit/link-analytics": "^8.5.0",
+		"@atlaskit/icon": "^23.1.0",
+		"@atlaskit/link-analytics": "^8.6.0",
 		"@atlaskit/link-client-extension": "^3.0.0",
 		"@atlaskit/link-datasource": "^3.13.0",
 		"@atlaskit/linking-common": "^6.0.0",
@@ -55,9 +55,9 @@
 		"@atlaskit/menu": "2.13.6",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
-		"@atlaskit/smart-card": "^32.5.0",
+		"@atlaskit/smart-card": "^32.6.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.23.0",
 		"@atlaskit/tokens": "^2.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -131,6 +131,9 @@
 		},
 		"platform_editor_remove_copy_button_from_view_mode": {
 			"type": "boolean"
+		},
+		"platform_inline_node_as_valid_annotation_selection": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {