@atlaskit/editor-plugin-card 2.6.4 → 2.6.5

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-card
 
+## 2.6.5
+
+### Patch Changes
+
+- [#122612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122612)
+  [`01a85ce0a88ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01a85ce0a88ec) -
+  [ux] ED-23705 Add logic to handle annotations on inline nodes when they are inserted or pasted.
+  Covers the following inline nodes: emoji, status, mention, date, inlineCard
+- Updated dependencies
+
 ## 2.6.4
 
 ### Patch Changes

package/dist/cjs/nodeviews/datasource.js

@@ -29,7 +29,10 @@ var _EditorAnalyticsContext = require("../ui/EditorAnalyticsContext");
 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; }
 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
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var getPosSafely = function getPosSafely(pos) {
   if (!pos || typeof pos === 'boolean') {
     return;

package/dist/cjs/pm-plugins/doc.js

@@ -34,6 +34,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   // replace all the outstanding links with their cards
   var pos = tr.mapping.map(request.pos);
   var $pos = tr.doc.resolve(pos);
+  var $head = tr.selection.$head;
   var node = tr.doc.nodeAt(pos);
   if (!node || !node.type.isText) {
     return;
@@ -49,6 +50,15 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
     nodes.push(schema.text(' '));
   }
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
+  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_paste_insert_nodes')) {
+    var annotationMarksForPos = (0, _utils.getAnnotationMarksForPos)($head);
+    if (annotationMarksForPos && annotationMarksForPos.length > 0) {
+      annotationMarksForPos.forEach(function (annotationMark) {
+        // Add the annotation mark on to the inlineCard node and the trailing space node.
+        tr.addMark(pos, pos + nodes[0].nodeSize + nodes[1].nodeSize, annotationMark);
+      });
+    }
+  }
   return $pos.node($pos.depth - 1).type.name;
 }
 var replaceQueuedUrlWithCard = exports.replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi, createAnalyticsEvent) {
@@ -371,7 +381,7 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
       return false;
     }
     var attrs;
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
       if ((0, _utils2.appearanceForNodeType)(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
         return false;
       }
@@ -461,7 +471,7 @@ var updateCardViaDatasource = exports.updateCardViaDatasource = function updateC
       if (isColumnChange || isUrlChange) {
         tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, oldAttrs), newAdf.attrs));
       }
-    } else if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
+    } else if (node.type.isText && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
       // url to datasource
       var link;
       state.doc.nodesBetween(from, to, function (node, pos) {
@@ -533,7 +543,7 @@ var getAttrsForAppearance = exports.getAttrsForAppearance = function getAttrsFor
       layout: 'center'
     });
   }
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor-datasource-typeguards')) {
+  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards')) {
     if ((0, _utils2.isDatasourceNode)(selectedNode)) {
       return {
         url: selectedNode.attrs.url
@@ -549,8 +559,8 @@ var getAttrsForAppearance = exports.getAttrsForAppearance = function getAttrsFor
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor-datasource-typeguards')) {
+  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards')) {
       if ((0, _utils2.isDatasourceNode)(selectedNode) && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
         (0, _actions.setDatasourceStash)(tr, {
           url: selectedNode.attrs.url,

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

@@ -14,7 +14,10 @@ var _localStorage = require("../../common/local-storage");
 var _utils = require("../../utils");
 var _InlineCardOverlay = _interopRequireDefault(require("../InlineCardOverlay"));
 var _Pulse = require("../Pulse");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

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

@@ -9,7 +9,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _link = require("@atlaskit/editor-common/link");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // not permitted to migrate atlaskit packages to compiled yet, see https://hello.atlassian.net/wiki/spaces/UAF/pages/3006969423/Migrating+AFM+platform+components+to+Compiled+a+guide
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled

package/dist/cjs/ui/DatasourceAppearanceButton.js

@@ -18,7 +18,10 @@ var _pluginKey = require("../pm-plugins/plugin-key");
 var _CardContextProvider = require("./CardContextProvider");
 var _DatasourceIcon = require("./DatasourceIcon");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

package/dist/cjs/ui/EditDatasourceButton.js

@@ -15,7 +15,10 @@ var _actions = require("../pm-plugins/actions");
 var _utils2 = require("../utils");
 var _CardContextProvider = require("./CardContextProvider");
 var _useFetchDatasourceInfo = require("./useFetchDatasourceInfo");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

package/dist/cjs/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -17,7 +17,10 @@ var _menu = require("@atlaskit/menu");
 var _primitives = require("@atlaskit/primitives");
 var _utils = require("../../utils");
 var _EditDatasourceButton = require("../EditDatasourceButton");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 

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

@@ -24,7 +24,10 @@ var _useFetchDatasourceDataInfo = require("../useFetchDatasourceDataInfo");
 var _useFetchDatasourceInfo = require("../useFetchDatasourceInfo");
 var _EditToolbarButtonPresentation = _interopRequireDefault(require("./EditToolbarButtonPresentation"));
 var _excluded = ["extensionKey"];
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var dropdownExpandContainer = (0, _react2.css)({
   margin: "0px ".concat("var(--ds-space-negative-050, -4px)")

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

@@ -23,7 +23,10 @@ var _excluded = ["children", "isSelected", "isVisible", "testId", "url"];
 var _active;
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 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; }

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

@@ -22,7 +22,10 @@ var _actions = require("../../pm-plugins/actions");
 var _utils2 = require("../../utils");
 var _utils3 = 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; } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+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; } /**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var toolbarButtonWrapperStyles = (0, _react2.css)({
   background: "".concat("var(--ds-background-neutral, ".concat(_colors.N20A, ")")),
   color: "".concat("var(--ds-icon, ".concat(_colors.N300, ")")),

package/dist/cjs/ui/ResizableEmbedCard.js

@@ -22,7 +22,10 @@ var _smartCard = require("@atlaskit/smart-card");
 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; }
 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
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var ResizableEmbedCard = exports.default = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(ResizableEmbedCard, _React$Component);

package/dist/cjs/ui/useFetchDatasourceDataInfo.js

@@ -10,7 +10,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _linkClientExtension = require("@atlaskit/link-client-extension");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 var useFetchDatasourceDataInfo = exports.useFetchDatasourceDataInfo = function useFetchDatasourceDataInfo(_ref) {
   var datasourceId = _ref.datasourceId,

package/dist/cjs/ui/useFetchDatasourceInfo.js

@@ -9,7 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 
 var useFetchDatasourceInfo = exports.useFetchDatasourceInfo = function useFetchDatasourceInfo(_ref) {
   var isRegularCardNode = _ref.isRegularCardNode,

package/dist/es2019/nodeviews/datasource.js

@@ -1,5 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/pm-plugins/doc.js

@@ -2,10 +2,10 @@ import isEqual from 'lodash/isEqual';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE, unlinkPayload } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
+import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { appearanceForNodeType, isDatasourceConfigEditable, isDatasourceNode, selectedCardAppearance } from '../utils';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
@@ -28,6 +28,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   // replace all the outstanding links with their cards
   const pos = tr.mapping.map(request.pos);
   const $pos = tr.doc.resolve(pos);
+  const $head = tr.selection.$head;
   const node = tr.doc.nodeAt(pos);
   if (!node || !node.type.isText) {
     return;
@@ -43,6 +44,15 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
     nodes.push(schema.text(' '));
   }
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
+  if (fg('editor_inline_comments_paste_insert_nodes')) {
+    const annotationMarksForPos = getAnnotationMarksForPos($head);
+    if (annotationMarksForPos && annotationMarksForPos.length > 0) {
+      annotationMarksForPos.forEach(annotationMark => {
+        // Add the annotation mark on to the inlineCard node and the trailing space node.
+        tr.addMark(pos, pos + nodes[0].nodeSize + nodes[1].nodeSize, annotationMark);
+      });
+    }
+  }
   return $pos.node($pos.depth - 1).type.name;
 }
 export const replaceQueuedUrlWithCard = (url, cardData, analyticsAction, editorAnalyticsApi, createAnalyticsEvent) => (editorState, dispatch) => {
@@ -345,7 +355,7 @@ export const setSelectedCardAppearance = (appearance, editorAnalyticsApi) => (st
     return false;
   }
   let attrs;
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+  if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
     if (appearanceForNodeType(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
       return false;
     }
@@ -442,7 +452,7 @@ export const updateCardViaDatasource = args => {
           ...newAdf.attrs
         });
       }
-    } else if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
+    } else if (node.type.isText && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
       // url to datasource
       let link;
       state.doc.nodesBetween(from, to, (node, pos) => {
@@ -521,7 +531,7 @@ export const getAttrsForAppearance = (appearance, selectedNode) => {
       layout: 'center'
     };
   }
-  if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
+  if (fg('platform.linking-platform.editor-datasource-typeguards')) {
     if (isDatasourceNode(selectedNode)) {
       return {
         url: selectedNode.attrs.url
@@ -537,8 +547,8 @@ export const getAttrsForAppearance = (appearance, selectedNode) => {
   return selectedNode.attrs;
 };
 const updateDatasourceStash = (tr, selectedNode) => {
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
+  if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    if (fg('platform.linking-platform.editor-datasource-typeguards')) {
       if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
         setDatasourceStash(tr, {
           url: selectedNode.attrs.url,

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useState } from 'react';
 
 // not permitted to migrate atlaskit packages to compiled yet, see https://hello.atlassian.net/wiki/spaces/UAF/pages/3006969423/Migrating+AFM+platform+components+to+Compiled+a+guide

package/dist/es2019/ui/DatasourceAppearanceButton.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/ui/EditDatasourceButton.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,7 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/ui/ResizableEmbedCard.js

@@ -1,6 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/es2019/ui/useFetchDatasourceDataInfo.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useEffect, useState } from 'react';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 export const useFetchDatasourceDataInfo = ({

package/dist/es2019/ui/useFetchDatasourceInfo.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useEffect, useState } from 'react';
 export const useFetchDatasourceInfo = ({
   isRegularCardNode,

package/dist/esm/nodeviews/datasource.js

@@ -11,7 +11,10 @@ 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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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 */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/pm-plugins/doc.js

@@ -6,10 +6,10 @@ import isEqual from 'lodash/isEqual';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SMART_LINK_TYPE, unlinkPayload } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
-import { getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
+import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentDomain, nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { appearanceForNodeType, isDatasourceConfigEditable, isDatasourceNode, selectedCardAppearance } from '../utils';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
@@ -28,6 +28,7 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
   // replace all the outstanding links with their cards
   var pos = tr.mapping.map(request.pos);
   var $pos = tr.doc.resolve(pos);
+  var $head = tr.selection.$head;
   var node = tr.doc.nodeAt(pos);
   if (!node || !node.type.isText) {
     return;
@@ -43,6 +44,15 @@ function replaceLinksToCards(tr, cardAdf, schema, request) {
     nodes.push(schema.text(' '));
   }
   tr.replaceWith(pos, pos + (node.text || url).length, nodes);
+  if (fg('editor_inline_comments_paste_insert_nodes')) {
+    var annotationMarksForPos = getAnnotationMarksForPos($head);
+    if (annotationMarksForPos && annotationMarksForPos.length > 0) {
+      annotationMarksForPos.forEach(function (annotationMark) {
+        // Add the annotation mark on to the inlineCard node and the trailing space node.
+        tr.addMark(pos, pos + nodes[0].nodeSize + nodes[1].nodeSize, annotationMark);
+      });
+    }
+  }
   return $pos.node($pos.depth - 1).type.name;
 }
 export var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData, analyticsAction, editorAnalyticsApi, createAnalyticsEvent) {
@@ -365,7 +375,7 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
       return false;
     }
     var attrs;
-    if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
       if (appearanceForNodeType(selectedNode.type) === appearance && !selectedNode.attrs.datasource) {
         return false;
       }
@@ -455,7 +465,7 @@ export var updateCardViaDatasource = function updateCardViaDatasource(args) {
       if (isColumnChange || isUrlChange) {
         tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, oldAttrs), newAdf.attrs));
       }
-    } else if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && node.type.isText) {
+    } else if (node.type.isText && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
       // url to datasource
       var link;
       state.doc.nodesBetween(from, to, function (node, pos) {
@@ -527,7 +537,7 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
       layout: 'center'
     });
   }
-  if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
+  if (fg('platform.linking-platform.editor-datasource-typeguards')) {
     if (isDatasourceNode(selectedNode)) {
       return {
         url: selectedNode.attrs.url
@@ -543,8 +553,8 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
   return selectedNode.attrs;
 };
 var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar')) {
-    if (getBooleanFF('platform.linking-platform.editor-datasource-typeguards')) {
+  if (fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
+    if (fg('platform.linking-platform.editor-datasource-typeguards')) {
       if (isDatasourceNode(selectedNode) && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id) && selectedNode.attrs.url) {
         setDatasourceStash(tr, {
           url: selectedNode.attrs.url,

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

@@ -1,5 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,5 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useState } from 'react';
 
 // not permitted to migrate atlaskit packages to compiled yet, see https://hello.atlassian.net/wiki/spaces/UAF/pages/3006969423/Migrating+AFM+platform+components+to+Compiled+a+guide

package/dist/esm/ui/DatasourceAppearanceButton.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/ui/EditDatasourceButton.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/ui/EditToolbarButton/EditToolbarButtonPresentation.js

@@ -1,5 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,7 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["extensionKey"];
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useMemo, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -6,7 +6,10 @@ var _excluded = ["children", "isSelected", "isVisible", "testId", "url"];
 var _active;
 /* eslint-disable @atlaskit/design-system/no-nested-styles */
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -1,7 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useCallback, useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/ui/ResizableEmbedCard.js

@@ -10,7 +10,10 @@ 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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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 */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

package/dist/esm/ui/useFetchDatasourceDataInfo.js

@@ -1,7 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useEffect, useState } from 'react';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 export var useFetchDatasourceDataInfo = function useFetchDatasourceDataInfo(_ref) {

package/dist/esm/ui/useFetchDatasourceInfo.js

@@ -1,7 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { useEffect, useState } from 'react';
 export var useFetchDatasourceInfo = function useFetchDatasourceInfo(_ref) {
   var isRegularCardNode = _ref.isRegularCardNode,

package/dist/types/nodeviews/datasource.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';

package/dist/types/ui/InlineCardOverlay/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { InlineCardOverlayProps } from './types';

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { RichMediaLayout } from '@atlaskit/adf-schema';

package/dist/types-ts4.5/nodeviews/datasource.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';

package/dist/types-ts4.5/ui/InlineCardOverlay/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { InlineCardOverlayProps } from './types';

package/dist/types-ts4.5/ui/ResizableEmbedCard.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React from 'react';
 import { jsx } from '@emotion/react';
 import type { RichMediaLayout } from '@atlaskit/adf-schema';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "2.6.4",
+	"version": "2.6.5",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^86.3.0",
+		"@atlaskit/editor-common": "^86.4.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-decorations": "^1.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.1.0",
@@ -47,7 +47,7 @@
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/frontend-utilities": "^2.7.0",
-		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/icon": "^22.7.0",
 		"@atlaskit/link-analytics": "^8.3.0",
 		"@atlaskit/link-client-extension": "^1.9.0",
 		"@atlaskit/link-datasource": "^2.5.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/menu": "2.8.1",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^11.0.0",
-		"@atlaskit/smart-card": "^27.9.0",
+		"@atlaskit/smart-card": "^27.10.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/tokens": "^1.56.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 		"raf-schd": "^4.0.3"
 	},
 	"peerDependencies": {
-		"@atlaskit/link-provider": "^1.12.0",
+		"@atlaskit/link-provider": "^1.13.0",
 		"react": "^16.8.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -139,6 +139,9 @@
 		},
 		"linking-platform-contenteditable-false-live-view": {
 			"type": "boolean"
+		},
+		"editor_inline_comments_paste_insert_nodes": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {