@atlaskit/editor-core 185.6.5 → 185.8.0

package/dist/es2019/plugins/paste/handlers.js

@@ -7,7 +7,6 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
-import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
 import { linkifyContent } from '@atlaskit/editor-common/utils';
 import { runMacroAutoConvert } from '../macro';
@@ -20,7 +19,6 @@ import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { doesSelectionWhichStartsOrEndsInListContainEntireList } from '../../utils/lists';
-
 // remove text attribute from mention for copy/paste (GDPR)
 export function handleMention(slice, schema) {
   return mapSlice(slice, node => {
@@ -35,7 +33,7 @@ export function handleMention(slice, schema) {
     return node;
   });
 }
-export function handlePasteIntoTaskOrDecisionOrPanel(slice) {
+export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
     var _slice$content$firstC, _transformedSlice$con;
     const {
@@ -109,7 +107,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice) {
       // This maintains both the selection (destination) and the slice (paste content).
       safeInsert(transformedSlice.content)(tr).scrollIntoView();
     }
-    queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+    queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
       dispatch(tr);
     }
@@ -345,7 +343,7 @@ export function handlePasteAsPlainText(slice, _event) {
     return false;
   };
 }
-export function handlePastePreservingMarks(slice) {
+export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
     const {
       schema,
@@ -389,7 +387,7 @@ export function handlePastePreservingMarks(slice) {
     // special case for plainTextSlice & linkMark: merge into existing link
     if (isPlainTextSlice && linkMark.isInSet(selectionMarks) && selectionMarks.length === 1) {
       const tr = closeHistory(state.tr).replaceSelectionWith(slice.content.firstChild.firstChild, true).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
         dispatch(tr);
       }
@@ -401,7 +399,7 @@ export function handlePastePreservingMarks(slice) {
     if (hasOnlyNodesOfType(bulletList, hardBreak, heading, listItem, paragraph, text, emoji, mention, orderedList)(slice)) {
       const transformedSlice = applyTextMarksToSlice(schema, selectionMarks)(slice);
       const tr = closeHistory(state.tr).replaceSelection(transformedSlice).setStoredMarks(selectionMarks).scrollIntoView();
-      queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+      queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
       if (dispatch) {
         dispatch(tr);
       }
@@ -439,7 +437,7 @@ function insertAutoMacro(slice, macro, view, from, to) {
   }
   return false;
 }
-export function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoConverter) {
+export function handleMacroAutoConvert(text, slice, queueCardsFromChangedTr, cardsOptions, extensionAutoConverter) {
   return (state, dispatch, view) => {
     let macro = null;
 
@@ -480,7 +478,7 @@ export function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoC
             pastedMacroPositions
           } = getPastePluginState(view.state);
           if (dispatch) {
-            handleMarkdown(slice, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
+            handleMarkdown(slice, queueCardsFromChangedTr, pastedMacroPositions[trackingFrom], pastedMacroPositions[trackingTo])(view.state, dispatch);
           }
         }).catch(() => {
           const {
@@ -596,7 +594,7 @@ export function handleExpandPasteInTable(slice) {
     return false;
   };
 }
-export function handleMarkdown(markdownSlice, from, to) {
+export function handleMarkdown(markdownSlice, queueCardsFromChangedTr, from, to) {
   return (state, dispatch) => {
     const tr = closeHistory(state.tr);
     const pastesFrom = typeof from === 'number' ? from : tr.selection.from;
@@ -606,7 +604,7 @@ export function handleMarkdown(markdownSlice, from, to) {
       tr.replaceSelection(markdownSlice);
     }
     tr.setSelection(TextSelection.near(tr.doc.resolve(pastesFrom + markdownSlice.size), -1));
-    queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
+    queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
       dispatch(tr.scrollIntoView());
     }
@@ -748,7 +746,7 @@ export function flattenNestedListInSlice(slice) {
   const contentWithFlattenedList = slice.content.replaceChild(0, listToFlatten.type.createChecked(listToFlatten.attrs, leafListItems));
   return new Slice(contentWithFlattenedList, slice.openEnd, slice.openEnd);
 }
-export function handleRichText(slice) {
+export function handleRichText(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
     var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     const {
@@ -825,8 +823,9 @@ export function handleRichText(slice) {
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors
+    queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD);
     if (dispatch) {
-      dispatch(queueCardsFromChangedTr(state, tr, INPUT_METHOD.CLIPBOARD));
+      dispatch(tr);
     }
     return true;
   };

package/dist/es2019/plugins/paste/index.js

@@ -15,7 +15,7 @@ const pastePlugin = ({
           providerFactory,
           dispatchAnalyticsEvent,
           dispatch
-        }) => createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, cardOptions, sanitizePrivateContent, providerFactory)
+        }) => createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, api, cardOptions, sanitizePrivateContent, providerFactory)
       }];
     }
   };

package/dist/es2019/plugins/paste/pm-plugins/analytics.js

@@ -226,9 +226,12 @@ export const handlePasteAsPlainTextWithAnalytics = (view, event, slice) => injec
   type: PasteTypes.plain,
   asPlain: true
 }))(handlePasteAsPlainText(slice, event));
-export const handlePasteIntoTaskAndDecisionWithAnalytics = (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-  type
-}))(handlePasteIntoTaskOrDecisionOrPanel(slice));
+export const handlePasteIntoTaskAndDecisionWithAnalytics = (view, event, slice, type, pluginInjectionApi) => {
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+    type
+  }))(handlePasteIntoTaskOrDecisionOrPanel(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.actions) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.queueCardsFromChangedTr));
+};
 export const handlePasteIntoCaptionWithAnalytics = (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
   type
 }))(handlePasteIntoCaption(slice));
@@ -238,15 +241,24 @@ export const handleCodeBlockWithAnalytics = (view, event, slice, text) => inject
 export const handleMediaSingleWithAnalytics = (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
   type
 }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD)(slice));
-export const handlePastePreservingMarksWithAnalytics = (view, event, slice, type) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-  type
-}))(handlePastePreservingMarks(slice));
-export const handleMarkdownWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-  type: PasteTypes.markdown
-}))(handleMarkdown(slice));
-export const handleRichTextWithAnalytics = (view, event, slice) => injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
-  type: PasteTypes.richText
-}))(handleRichText(slice));
+export const handlePastePreservingMarksWithAnalytics = (view, event, slice, type, pluginInjectionApi) => {
+  var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+    type
+  }))(handlePastePreservingMarks(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.actions) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.queueCardsFromChangedTr));
+};
+export const handleMarkdownWithAnalytics = (view, event, slice, pluginInjectionApi) => {
+  var _pluginInjectionApi$d5, _pluginInjectionApi$d6;
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+    type: PasteTypes.markdown
+  }))(handleMarkdown(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : (_pluginInjectionApi$d6 = _pluginInjectionApi$d5.actions) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.queueCardsFromChangedTr));
+};
+export const handleRichTextWithAnalytics = (view, event, slice, pluginInjectionApi) => {
+  var _pluginInjectionApi$d7, _pluginInjectionApi$d8;
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+    type: PasteTypes.richText
+  }))(handleRichText(slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d7 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d7 === void 0 ? void 0 : (_pluginInjectionApi$d8 = _pluginInjectionApi$d7.actions) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.queueCardsFromChangedTr));
+};
 function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
   return mainCommand => {
     return (state, dispatch, view) => {

package/dist/es2019/plugins/paste/pm-plugins/main.js

@@ -7,7 +7,7 @@ import { mapChildren } from '../../../utils/slice';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
 import * as clipboard from '../../../utils/clipboard';
 import { transformSliceForMedia } from '../../media/utils/media-single';
-import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks } from '../util';
+import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from '../util';
 import { linkifyContent } from '@atlaskit/editor-common/utils';
 import { transformSliceNestedExpandToExpand } from '../../expand/utils';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
@@ -19,7 +19,6 @@ import { measureRender } from '@atlaskit/editor-common/utils';
 import { transformSliceToCorrectMediaWrapper, unwrapNestedMediaElements } from '../../media/utils/media-common';
 import { upgradeTextToLists, splitParagraphs } from '../../list/transforms';
 import { md } from '@atlaskit/editor-common/paste';
-import { transformUnsupportedBlockCardToInline } from '../../card/utils';
 import { transformSliceToDecisionList } from '../../tasks-and-decisions/utils';
 import { containsAnyAnnotations, stripNonExistingAnnotations } from '../../annotation/utils';
 import { pluginKey as betterTypePluginKey } from '../../base/pm-plugins/better-type-history';
@@ -30,7 +29,7 @@ import { extractSliceFromStep } from '../../../utils/step';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 import { hasParentNodeOfType } from 'prosemirror-utils';
-export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, cardOptions, sanitizePrivateContent, providerFactory) {
+export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pluginInjectionApi, cardOptions, sanitizePrivateContent, providerFactory) {
   const atlassianMarkDownParser = new MarkdownTransformer(schema, md);
   function getMarkdownSlice(text, openStart, openEnd) {
     let textInput = text;
@@ -208,13 +207,14 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // force a "paste as plain text" action by clearing the markdownSlice.
           markdownSlice = !((_markdownSlice = markdownSlice) !== null && _markdownSlice !== void 0 && _markdownSlice.size) ? undefined : markdownSlice;
           if (markdownSlice) {
+            var _pluginInjectionApi$d, _pluginInjectionApi$d2;
             // linkify text prior to converting to macro
             if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
               return true;
             }
 
             // run macro autoconvert prior to other conversions
-            if (handleMacroAutoConvert(text, markdownSlice, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+            if (handleMacroAutoConvert(text, markdownSlice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.actions) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
               // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
               sendPasteAnalyticsEvent(view, event, markdownSlice, {
                 type: PasteTypes.markdown
@@ -237,7 +237,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (slice.openStart === 0 && selectionParentNode && edgeCaseNodeTypes.includes(selectionParentType)) {
           slice.openStart = 1;
         }
-        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText)(state, dispatch)) {
+        if (handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, isPlainText ? PasteTypes.plain : PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
           return true;
         }
 
@@ -254,10 +254,10 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // If the clipboard only contains plain text, attempt to parse it as Markdown
         if (isPlainText && markdownSlice) {
-          if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown)(state, dispatch)) {
+          if (handlePastePreservingMarksWithAnalytics(view, event, markdownSlice, PasteTypes.markdown, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
-          return handleMarkdownWithAnalytics(view, event, markdownSlice)(state, dispatch);
+          return handleMarkdownWithAnalytics(view, event, markdownSlice, pluginInjectionApi)(state, dispatch);
         }
         if (isRichText && isInsideBlockQuote(state)) {
           //If pasting inside blockquote
@@ -280,6 +280,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText) {
+          var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -287,7 +288,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           }
 
           // run macro autoconvert prior to other conversions
-          if (handleMacroAutoConvert(text, slice, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
+          if (handleMacroAutoConvert(text, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.actions) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.queueCardsFromChangedTr, cardOptions, extensionAutoConverter)(state, dispatch, view)) {
             // TODO: handleMacroAutoConvert dispatch twice, so we can't use the helper
             sendPasteAnalyticsEvent(view, event, slice, {
               type: PasteTypes.richText
@@ -311,7 +312,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           }
 
           // ED-4732
-          if (handlePastePreservingMarksWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
+          if (handlePastePreservingMarksWithAnalytics(view, event, slice, PasteTypes.richText, pluginInjectionApi)(state, dispatch)) {
             return true;
           }
 
@@ -347,7 +348,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
             return true;
           }
-          return handleRichTextWithAnalytics(view, event, slice)(state, dispatch);
+          return handleRichTextWithAnalytics(view, event, slice, pluginInjectionApi)(state, dispatch);
         }
         return false;
       },

package/dist/es2019/plugins/paste/util/index.js

@@ -1,10 +1,11 @@
-import { Slice, Mark } from 'prosemirror-model';
+import { Slice, Mark, Fragment } from 'prosemirror-model';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 import { ACTION_SUBJECT, addAnalytics, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '../../analytics';
 import { TextSelection, NodeSelection } from 'prosemirror-state';
 import { findParentNodeOfType } from 'prosemirror-utils';
 import { getSelectedTableInfo, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { sortByOrderWithTypeName } from '../../../create-editor/sort-by-order';
+import { isSupportedInParent, mapChildren } from '@atlaskit/editor-common/utils';
 export function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -179,4 +180,30 @@ export const addReplaceSelectedTableAnalytics = (state, tr) => {
     return tr;
   }
   return state.tr;
+};
+export const transformUnsupportedBlockCardToInline = (slice, state, cardOptions) => {
+  const {
+    blockCard,
+    inlineCard
+  } = state.schema.nodes;
+  const children = [];
+  mapChildren(slice.content, (node, i, frag) => {
+    var _cardOptions$allowBlo;
+    if (node.type === blockCard && !isBlockCardSupported(state, frag, (_cardOptions$allowBlo = cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards) !== null && _cardOptions$allowBlo !== void 0 ? _cardOptions$allowBlo : false)) {
+      children.push(inlineCard.createChecked(node.attrs, node.content, node.marks));
+    } else {
+      children.push(node);
+    }
+  });
+  return new Slice(Fragment.fromArray(children), slice.openStart, slice.openEnd);
+};
+/**
+ * Function to determine if a block card is supported by the editor
+ * @param state
+ * @param frag
+ * @param allowBlockCards
+ * @returns
+ */
+const isBlockCardSupported = (state, frag, allowBlockCards) => {
+  return allowBlockCards && isSupportedInParent(state, frag);
 };

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

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import React, { useMemo } from 'react';
 import { jsx, css, useTheme } from '@emotion/react';
-import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles, textColorStyles, resizerStyles, gridStyles } from '@atlaskit/editor-common/styles';
+import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles, textColorStyles, resizerStyles, gridStyles, smartCardStyles, embedCardStyles } from '@atlaskit/editor-common/styles';
 import { editorFontSize } from '@atlaskit/editor-shared-styles';
 import { unsupportedStyles } from '../../plugins/unsupported-content/styles';
 import { telepointerStyle } from '../../plugins/collab-edit/styles';
@@ -27,9 +27,7 @@ import { ClassNames } from '../../plugins/media/pm-plugins/alt-text/style';
 import { findReplaceStyles } from '../../plugins/find-replace/styles';
 import { taskDecisionStyles } from '../../plugins/tasks-and-decisions/styles';
 import { statusStyles } from '../../plugins/status/styles';
-import { smartCardStyles } from '../../plugins/card/styles';
 import { dateStyles } from '../../plugins/date/styles';
-import { embedCardStyles } from '../../plugins/card/ui/styled';
 import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
 const contentStyles = props => css`
   .ProseMirror {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.6.5";
+export const version = "185.8.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.6.5",
+	"version": "185.8.0",
 	"sideEffects": false
 }

package/dist/esm/plugins/card/index.js

@@ -7,9 +7,12 @@ import { createPlugin } from './pm-plugins/main';
 import { floatingToolbar } from './toolbar';
 import { EditorSmartCardEvents } from './ui/EditorSmartCardEvents';
 import { cardKeymap } from './pm-plugins/keymap';
+import { queueCardsFromChangedTr, changeSelectedCardToLink, setSelectedCardAppearance } from './pm-plugins/doc';
+import { hideLinkToolbar } from './pm-plugins/actions';
 import { EditorSmartCardEventsNext } from './ui/EditorSmartCardEventsNext';
 import LayoutButton from './ui/LayoutButton';
 import { pluginKey } from './pm-plugins/plugin-key';
+import { mountHyperlinkPlugin } from './pm-plugins/mountHyperlink';
 var cardPlugin = function cardPlugin(options, api) {
   var _api$dependencies, _api$dependencies$fea;
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
@@ -53,6 +56,11 @@ var cardPlugin = function cardPlugin(options, api) {
           allowWrapping: allowWrapping,
           allowAlignment: allowAlignment
         }), api)
+      }, {
+        name: 'cardHyperlink',
+        plugin: function plugin() {
+          return mountHyperlinkPlugin(api, options);
+        }
       }];
       plugins.push({
         name: 'cardKeymap',
@@ -81,6 +89,12 @@ var cardPlugin = function cardPlugin(options, api) {
         boundariesElement: popupsBoundariesElement
       }));
     },
+    actions: {
+      hideLinkToolbar: hideLinkToolbar,
+      queueCardsFromChangedTr: queueCardsFromChangedTr,
+      changeSelectedCardToLink: changeSelectedCardToLink,
+      setSelectedCardAppearance: setSelectedCardAppearance
+    },
     pluginsOptions: {
       floatingToolbar: floatingToolbar(options, featureFlags, options.platform, options.linkPicker, api)
     }

package/dist/esm/plugins/card/nodeviews/datasource.js

@@ -15,9 +15,8 @@ import PropTypes from 'prop-types';
 import { css, jsx } from '@emotion/react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { DatasourceTableView } from '@atlaskit/link-datasource';
-import { SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { SmartCardSharedCssClassName, DATASOURCE_INNER_CONTAINER_CLASSNAME } from '@atlaskit/editor-common/styles';
 import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
-export var DATASOURCE_INNER_CONTAINER_CLASSNAME = 'datasourceView-content-inner-wrap';
 var containerStyles = css({
   height: '500px',
   overflow: 'auto'

package/dist/esm/plugins/card/pm-plugins/main.js

@@ -11,7 +11,8 @@ import reducer from './reducers';
 import { handleProvider, resolveWithProvider } from './util/resolve';
 import { getNewRequests, getPluginState, getPluginStateWithUpdatedPos } from './util/state';
 import { createAnalyticsQueue, eventsFromTransaction } from './analytics';
-import { DATASOURCE_INNER_CONTAINER_CLASSNAME, Datasource } from '../nodeviews/datasource';
+import { Datasource } from '../nodeviews/datasource';
+import { DATASOURCE_INNER_CONTAINER_CLASSNAME } from '@atlaskit/editor-common/styles';
 import { setDatasourceTableRef, setCardLayoutAndDatasourceTableRef } from './actions';
 import { findDomRefAtPos } from 'prosemirror-utils';
 export { pluginKey } from './plugin-key';

package/dist/esm/plugins/card/pm-plugins/mountHyperlink.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { HyperlinkToolbarAppearance } from '../ui/HyperlinkToolbarAppearance';
+export var mountHyperlinkPlugin = function mountHyperlinkPlugin(pluginInjectionApi, options) {
+  return new SafePlugin({
+    view: function view(editorView) {
+      requestAnimationFrame(function () {
+        var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.hyperlink) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.actions) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.prependToolbarButtons({
+          items: function items(state, intl, providerFactory, link) {
+            return [{
+              type: 'custom',
+              fallback: [],
+              render: function render(editorView) {
+                var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+                return /*#__PURE__*/React.createElement(HyperlinkToolbarAppearance, {
+                  key: "link-appearance",
+                  url: link,
+                  intl: intl,
+                  editorView: editorView,
+                  editorState: state,
+                  cardOptions: options,
+                  providerFactory: providerFactory,
+                  platform: options === null || options === void 0 ? void 0 : options.platform,
+                  editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.actions,
+                  cardActions: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions
+                });
+              }
+            }];
+          },
+          onEscapeCallback: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.card.actions.hideLinkToolbar,
+          view: editorView
+        });
+      });
+      return {};
+    }
+  });
+};

package/dist/esm/plugins/card/toolbar.js

@@ -19,8 +19,8 @@ import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig,
 import { displayInfoForCard, findCardInfo, titleUrlPairFromNode, appearanceForNodeType } from './utils';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
-import { messages } from './messages';
-import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from './styles';
+import { cardMessages as messages } from '@atlaskit/editor-common/messages';
+import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from '@atlaskit/editor-common/styles';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
 import { SmallerEditIcon } from './ui/SmallerEditIcon';
 export var removeCard = function removeCard(editorAnalyticsApi) {
@@ -277,7 +277,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
               allowEmbeds: allowEmbeds,
               allowBlockCards: allowBlockCards,
               platform: platform,
-              editorAnalyticsApi: editorAnalyticsApi
+              editorAnalyticsApi: editorAnalyticsApi,
+              cardActions: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.card.actions
             });
           }
         }, {

package/dist/esm/plugins/{hyperlink → card/ui}/HyperlinkToolbarAppearance.js

@@ -11,7 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
 import { Component } from 'react';
-import { LinkToolbarAppearance } from '../card/ui/LinkToolbarAppearance';
+import { LinkToolbarAppearance } from './LinkToolbarAppearance';
 export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
   _inherits(HyperlinkToolbarAppearance, _Component);
   var _super = _createSuper(HyperlinkToolbarAppearance);
@@ -139,7 +139,8 @@ export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
         editorState = _this$props.editorState,
         cardOptions = _this$props.cardOptions,
         platform = _this$props.platform,
-        editorAnalyticsApi = _this$props.editorAnalyticsApi;
+        editorAnalyticsApi = _this$props.editorAnalyticsApi,
+        cardActions = _this$props.cardActions;
       var supportedUrlsMap = this.state.supportedUrlsMap;
       if (!supportedUrlsMap.get(url)) {
         return null;
@@ -153,7 +154,8 @@ export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
         allowEmbeds: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowEmbeds,
         allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
         platform: platform,
-        editorAnalyticsApi: editorAnalyticsApi
+        editorAnalyticsApi: editorAnalyticsApi,
+        cardActions: cardActions
       });
     }
   }]);

package/dist/esm/plugins/card/ui/LinkToolbarAppearance.js

@@ -9,17 +9,13 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { Fragment } from 'prosemirror-model';
-import React from 'react';
-import nodeNames from '@atlaskit/editor-common/messages';
+import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import nodeNames, { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { isSupportedInParent } from '@atlaskit/editor-common/utils';
-import { messages } from '../messages';
-import { commandWithMetadata } from '@atlaskit/editor-common/card';
-import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugins/doc';
-import { getButtonGroupOption } from './link-toolbar-button-group-options';
-import { LinkToolbarButtonGroup } from './LinkToolbarButtonGroup';
+import { getButtonGroupOption, LinkToolbarButtonGroup, commandWithMetadata } from '@atlaskit/editor-common/card';
 export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
   _inherits(LinkToolbarAppearance, _React$Component);
   var _super = _createSuper(LinkToolbarAppearance);
@@ -31,6 +27,7 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "renderDropdown", function (view, cardContext) {
+      var _cardActions$setSelec, _cardActions$setSelec2, _cardActions$changeSe, _cardActions$setSelec3;
       var _this$props = _this.props,
         url = _this$props.url,
         intl = _this$props.intl,
@@ -40,8 +37,12 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         _this$props$allowBloc = _this$props.allowBlockCards,
         allowBlockCards = _this$props$allowBloc === void 0 ? true : _this$props$allowBloc,
         platform = _this$props.platform,
-        editorAnalyticsApi = _this$props.editorAnalyticsApi;
+        editorAnalyticsApi = _this$props.editorAnalyticsApi,
+        cardActions = _this$props.cardActions;
       var preview = allowEmbeds && cardContext && url && cardContext.extractors.getPreview(url, platform);
+      var defaultCommand = function defaultCommand() {
+        return false;
+      };
       if (url) {
         var _cardContext$store, _urlState$error;
         var urlState = cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$store = cardContext.store) === null || _cardContext$store === void 0 ? void 0 : _cardContext$store.getState()[url];
@@ -54,7 +55,7 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       var embedOption = allowEmbeds && preview && {
         appearance: 'embed',
         title: intl.formatMessage(messages.embed),
-        onClick: setSelectedCardAppearance('embed', editorAnalyticsApi),
+        onClick: (_cardActions$setSelec = cardActions === null || cardActions === void 0 ? void 0 : cardActions.setSelectedCardAppearance('embed', editorAnalyticsApi)) !== null && _cardActions$setSelec !== void 0 ? _cardActions$setSelec : defaultCommand,
         selected: currentAppearance === 'embed',
         hidden: false,
         testId: 'embed-appearance',
@@ -64,7 +65,7 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       var blockCardOption = allowBlockCards && {
         appearance: 'block',
         title: intl.formatMessage(messages.block),
-        onClick: setSelectedCardAppearance('block', editorAnalyticsApi),
+        onClick: (_cardActions$setSelec2 = cardActions === null || cardActions === void 0 ? void 0 : cardActions.setSelectedCardAppearance('block', editorAnalyticsApi)) !== null && _cardActions$setSelec2 !== void 0 ? _cardActions$setSelec2 : defaultCommand,
         selected: currentAppearance === 'block',
         testId: 'block-appearance',
         disabled: !isBlockCardLinkSupportedInParent,
@@ -72,7 +73,7 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       };
       var options = [{
         title: intl.formatMessage(messages.url),
-        onClick: commandWithMetadata(changeSelectedCardToLink(url, url, true, undefined, undefined, editorAnalyticsApi), {
+        onClick: commandWithMetadata((_cardActions$changeSe = cardActions === null || cardActions === void 0 ? void 0 : cardActions.changeSelectedCardToLink(url, url, true, undefined, undefined, editorAnalyticsApi)) !== null && _cardActions$changeSe !== void 0 ? _cardActions$changeSe : defaultCommand, {
           action: ACTION.CHANGED_TYPE
         }),
         selected: !currentAppearance,
@@ -80,7 +81,7 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       }, {
         appearance: 'inline',
         title: intl.formatMessage(messages.inline),
-        onClick: setSelectedCardAppearance('inline', editorAnalyticsApi),
+        onClick: (_cardActions$setSelec3 = cardActions === null || cardActions === void 0 ? void 0 : cardActions.setSelectedCardAppearance('inline', editorAnalyticsApi)) !== null && _cardActions$setSelec3 !== void 0 ? _cardActions$setSelec3 : defaultCommand,
         selected: currentAppearance === 'inline',
         testId: 'inline-appearance'
       }];

package/dist/esm/plugins/card/ui/ResizableEmbedCard.js

@@ -18,7 +18,7 @@ import { calcColumnsFromPx, calcPctFromPx, calcPxFromColumns, wrappedLayouts } f
 import { akEditorMediaResizeHandlerPaddingWide, akEditorBreakoutPadding, akEditorWideLayoutWidth, breakoutWideScaleRatio, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { embedHeaderHeight } from '@atlaskit/smart-card';
 import { wrapperStyle, Resizer, handleSides, imageAlignmentMap, snapTo, calcMediaPxWidth } from '@atlaskit/editor-common/ui';
-import { embedSpacingStyles } from './styled';
+import { embedSpacingStyles } from '@atlaskit/editor-common/styles';
 var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
   _inherits(ResizableEmbedCard, _React$Component);
   var _super = _createSuper(ResizableEmbedCard);

package/dist/esm/plugins/card/ui/SmallerEditIcon.js

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import EditIcon from '@atlaskit/icon/glyph/edit';
-import { editIconStyles } from './styled';
+import { editIconStyles } from '@atlaskit/editor-common/styles';
 export var SmallerEditIcon = function SmallerEditIcon() {
   return jsx("div", {
     css: editIconStyles