@atlaskit/editor-plugin-hyperlink 1.7.2 → 2.0.1

package/dist/esm/Toolbar.js

@@ -85,7 +85,9 @@ export function HyperlinkAddToolbarWithState(_ref) {
     onClose: onClose,
     onEscapeCallback: onEscapeCallback,
     onClickAwayCallback: onClickAwayCallback,
-    hyperlinkPluginState: hyperlinkState
+    timesViewed: hyperlinkState.timesViewed,
+    inputMethod: hyperlinkState.inputMethod,
+    searchSessionId: hyperlinkState.searchSessionId
   });
 }
 var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyticsApi) {
@@ -101,34 +103,15 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyti
     target: '_blank'
   }];
 };
-export var mergeAddedItems = function mergeAddedItems(link) {
-  for (var _len = arguments.length, handlerParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    handlerParams[_key - 1] = arguments[_key];
-  }
-  return function (items, toolbarItemsState) {
-    var positions = toolbarItemsState === null || toolbarItemsState === void 0 ? void 0 : toolbarItemsState.items_next;
-    if (!positions) {
-      return items;
-    }
-    var start = positions.start;
-    var end = positions.end;
-    var reduceItems = function reduceItems() {
-      var items = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      return items.reduce(function (acc, fn) {
-        return [].concat(_toConsumableArray(acc), _toConsumableArray(fn.apply(void 0, handlerParams.concat([link]))));
-      }, []);
-    };
-    return [].concat(_toConsumableArray(reduceItems(start)), _toConsumableArray(items), _toConsumableArray(reduceItems(end)));
-  };
-};
 export var getToolbarConfig = function getToolbarConfig(options, pluginInjectionApi) {
   return function (state, intl, providerFactory) {
-    var _pluginInjectionApi$a, _options$lpLinkPicker;
+    var _pluginInjectionApi$c, _pluginInjectionApi$a, _options$lpLinkPicker;
     if (options.disableFloatingToolbar) {
       return;
     }
     var formatMessage = intl.formatMessage;
     var linkState = stateKey.getState(state);
+    var editorCardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions;
     var editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
     var lpLinkPicker = (_options$lpLinkPicker = options.lpLinkPicker) !== null && _options$lpLinkPicker !== void 0 ? _options$lpLinkPicker : true;
     if (linkState && linkState.activeLinkMark) {
@@ -145,7 +128,7 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
       switch (activeLinkMark.type) {
         case 'EDIT':
           {
-            var _toolbarKey$getState$, _toolbarKey$getState;
+            var _pluginInjectionApi$c2, _cardActions$getStart, _cardActions$getEndin;
             var pos = activeLinkMark.pos,
               node = activeLinkMark.node;
             var linkMark = node.marks.filter(function (mark) {
@@ -164,7 +147,8 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
             if (activeLinkMark.node.text) {
               metadata.title = activeLinkMark.node.text;
             }
-            var baseItems = [].concat(_toConsumableArray((_toolbarKey$getState$ = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.items(state, intl, providerFactory, link)) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : []), [{
+            var cardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions;
+            var startingToolbarItems = (_cardActions$getStart = cardActions === null || cardActions === void 0 ? void 0 : cardActions.getStartingToolbarItems(intl, link, providerFactory, editInsertedLink(editorAnalyticsApi), metadata)) !== null && _cardActions$getStart !== void 0 ? _cardActions$getStart : [{
               id: 'editor.link.edit',
               testId: 'editor.link.edit',
               type: 'button',
@@ -172,7 +156,8 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
               title: editLink,
               showTitle: true,
               metadata: metadata
-            }, {
+            }];
+            var items = [].concat(_toConsumableArray(startingToolbarItems), [{
               type: 'separator'
             }, {
               id: 'editor.link.openLink',
@@ -209,8 +194,7 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
                 formatMessage: formatMessage,
                 markType: state.schema.marks.link
               }]
-            }], _toConsumableArray(getBooleanFF('platform.editor.card.inject-settings-button') ? [] : getSettingsButtonGroup(intl, editorAnalyticsApi)));
-            var items = getBooleanFF('platform.editor.card.inject-settings-button') ? mergeAddedItems(link, state, intl, providerFactory)(baseItems, toolbarKey.getState(state)) : baseItems;
+            }], _toConsumableArray((_cardActions$getEndin = cardActions === null || cardActions === void 0 ? void 0 : cardActions.getEndingToolbarItems(intl, link)) !== null && _cardActions$getEndin !== void 0 ? _cardActions$getEndin : []), _toConsumableArray(getBooleanFF('platform.editor.card.inject-settings-button') ? [] : getSettingsButtonGroup(intl, editorAnalyticsApi)));
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               height: 32,
               width: 250,
@@ -254,22 +238,22 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
                     onCancel: function onCancel() {
                       return view.focus();
                     },
-                    onEscapeCallback: onEscapeCallback,
+                    onEscapeCallback: onEscapeCallback(editorCardActions),
                     onClickAwayCallback: onClickAwayCallback,
                     onSubmit: function onSubmit(href) {
-                      var _toolbarKey$getState$2, _toolbarKey$getState2;
+                      var _toolbarKey$getState$, _toolbarKey$getState;
                       var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
                       var displayText = arguments.length > 2 ? arguments[2] : undefined;
                       var inputMethod = arguments.length > 3 ? arguments[3] : undefined;
                       var analytic = arguments.length > 4 ? arguments[4] : undefined;
                       var isEdit = isEditLink(activeLinkMark);
                       var action = isEdit ? ACTION.UPDATED : ACTION.INSERTED;
-                      var skipAnalytics = (_toolbarKey$getState$2 = (_toolbarKey$getState2 = toolbarKey.getState(state)) === null || _toolbarKey$getState2 === void 0 ? void 0 : _toolbarKey$getState2.skipAnalytics) !== null && _toolbarKey$getState$2 !== void 0 ? _toolbarKey$getState$2 : false;
+                      var skipAnalytics = (_toolbarKey$getState$ = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.skipAnalytics) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : false;
                       var command = isEdit ? commandWithMetadata(updateLink(href, displayText || title, activeLinkMark.pos), {
                         action: action,
                         inputMethod: inputMethod,
                         sourceEvent: analytic
-                      }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
+                      }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorCardActions, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
                       command(view.state, view.dispatch, view);
                       view.focus();
                     }

package/dist/esm/commands.js

@@ -8,7 +8,6 @@ import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
 import { filterCommand as filter, getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { stateKey } from './pm-plugins/main';
-import { toolbarKey } from './pm-plugins/toolbar-buttons';
 export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
   return filter(isTextAtPos(pos), function (state, dispatch) {
     var $pos = state.doc.resolve(pos);
@@ -75,6 +74,7 @@ export function updateLink(href, text, pos, to) {
 }
 export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   var appearance = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 'inline';
+  var cardApiActions = arguments.length > 8 ? arguments[8] : undefined;
   return function (state, dispatch) {
     var link = state.schema.marks.link;
     var tr = state.tr;
@@ -99,8 +99,7 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
       }));
       tr.setSelection(Selection.near(tr.doc.resolve(markEnd)));
       if (!displayText || displayText === incomingHref) {
-        var _toolbarKey$getState;
-        var queueCardsFromChangedTr = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.onInsertLinkCallback;
+        var queueCardsFromChangedTr = cardApiActions === null || cardApiActions === void 0 ? void 0 : cardApiActions.queueCardsFromChangedTr;
         if (queueCardsFromChangedTr) {
           queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 || queueCardsFromChangedTr(state, tr, source, ACTION.INSERTED, false, sourceEvent, appearance);
         } else {
@@ -137,15 +136,15 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
     return false;
   };
 }
-export var insertLinkWithAnalytics = function insertLinkWithAnalytics(inputMethod, from, to, href, editorAnalyticsApi, title, displayText) {
-  var cardsAvailable = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
-  var sourceEvent = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : undefined;
-  var appearance = arguments.length > 9 ? arguments[9] : undefined;
+export var insertLinkWithAnalytics = function insertLinkWithAnalytics(inputMethod, from, to, href, cardActions, editorAnalyticsApi, title, displayText) {
+  var cardsAvailable = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
+  var sourceEvent = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : undefined;
+  var appearance = arguments.length > 10 ? arguments[10] : undefined;
   // If smart cards are available, we send analytics for hyperlinks when a smart link is rejected.
   if (cardsAvailable && !title && !displayText) {
-    return insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance);
+    return insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance, cardActions);
   }
-  return withAnalytics(editorAnalyticsApi, getLinkCreationAnalyticsEvent(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance));
+  return withAnalytics(editorAnalyticsApi, getLinkCreationAnalyticsEvent(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance, cardActions));
 };
 export function removeLink(pos, editorAnalyticsApi) {
   return commandWithMetadata(setLinkHref('', pos, editorAnalyticsApi), {
@@ -198,16 +197,18 @@ export var hideLinkToolbarSetMeta = function hideLinkToolbarSetMeta(tr) {
     type: LinkAction.HIDE_TOOLBAR
   });
 };
-export var onEscapeCallback = function onEscapeCallback(state, dispatch) {
-  var _toolbarKey$getState2, _toolbarKey$getState3;
-  var tr = state.tr;
-  hideLinkToolbarSetMeta(tr);
-  (_toolbarKey$getState2 = toolbarKey.getState(state)) === null || _toolbarKey$getState2 === void 0 || (_toolbarKey$getState3 = _toolbarKey$getState2.onEscapeCallback) === null || _toolbarKey$getState3 === void 0 || _toolbarKey$getState3.call(_toolbarKey$getState2, tr);
-  if (dispatch) {
-    dispatch(tr);
-    return true;
-  }
-  return false;
+export var onEscapeCallback = function onEscapeCallback(cardActions) {
+  return function (state, dispatch) {
+    var _cardActions$hideLink;
+    var tr = state.tr;
+    hideLinkToolbarSetMeta(tr);
+    cardActions === null || cardActions === void 0 || (_cardActions$hideLink = cardActions.hideLinkToolbar) === null || _cardActions$hideLink === void 0 || _cardActions$hideLink.call(cardActions, tr);
+    if (dispatch) {
+      dispatch(tr);
+      return true;
+    }
+    return false;
+  };
 };
 export var onClickAwayCallback = function onClickAwayCallback(state, dispatch) {
   if (dispatch) {

package/dist/esm/plugin.js

@@ -10,7 +10,7 @@ import fakeCursorToolbarPlugin from './pm-plugins/fake-cursor-for-toolbar';
 import { createInputRulePlugin } from './pm-plugins/input-rule';
 import { createKeymapPlugin } from './pm-plugins/keymap';
 import { plugin as _plugin, stateKey } from './pm-plugins/main';
-import { addToolbarItems, prependToolbarButtons, toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
+import { toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
 import { getToolbarConfig } from './Toolbar';
 /**
  * Hyperlink plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
@@ -36,15 +36,13 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
       }
     },
     actions: {
-      prependToolbarButtons: prependToolbarButtons,
-      addToolbarItems: addToolbarItems,
       hideLinkToolbar: hideLinkToolbarSetMeta,
       insertLink: function insertLink(inputMethod, from, to, href, title, displayText) {
-        var _api$analytics2;
+        var _api$card, _api$analytics2;
         var cardsAvailable = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
         var sourceEvent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : undefined;
         var appearance = arguments.length > 8 ? arguments[8] : undefined;
-        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
+        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
       },
       updateLink: updateLink
     },
@@ -81,7 +79,13 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         }
       }, {
         name: 'hyperlinkToolbarButtons',
-        plugin: toolbarButtonsPlugin
+        plugin: function plugin() {
+          var _api$card2;
+          var hasCard = !!(api !== null && api !== void 0 && (_api$card2 = api.card) !== null && _api$card2 !== void 0 && _api$card2.actions);
+          return toolbarButtonsPlugin(hasCard ? {
+            skipAnalytics: true
+          } : undefined);
+        }
       }];
     },
     pluginsOptions: {

package/dist/esm/pm-plugins/toolbar-buttons.js

@@ -1,79 +1,14 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _typeof from "@babel/runtime/helpers/typeof";
-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; }
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-
-/**
- * Relative placement of an item
- */
-
 export var toolbarKey = new PluginKey('hyperlinkToolbarItems');
-export var prependToolbarButtons = function prependToolbarButtons(_ref) {
-  var items = _ref.items,
-    onEscapeCallback = _ref.onEscapeCallback,
-    onInsertLinkCallback = _ref.onInsertLinkCallback,
-    skipAnalytics = _ref.skipAnalytics,
-    view = _ref.view;
-  var tr = view.state.tr,
-    dispatch = view.dispatch;
-  tr.setMeta(toolbarKey, {
-    items: items,
-    onEscapeCallback: onEscapeCallback,
-    onInsertLinkCallback: onInsertLinkCallback,
-    skipAnalytics: skipAnalytics
-  });
-  dispatch(tr);
-};
-export var addToolbarItems = function addToolbarItems(_ref2) {
-  var items = _ref2.items,
-    placement = _ref2.placement,
-    view = _ref2.view;
-  var tr = view.state.tr,
-    dispatch = view.dispatch;
-  tr.setMeta(toolbarKey, {
-    items: items,
-    placement: placement
-  });
-  dispatch(tr);
-};
-var VALID_PLACEMENTS = ['start', 'end'];
-var isValidPlacement = function isValidPlacement(placement) {
-  return VALID_PLACEMENTS.some(function (p) {
-    return p === placement;
-  });
-};
-export var toolbarButtonsPlugin = function toolbarButtonsPlugin() {
+export var toolbarButtonsPlugin = function toolbarButtonsPlugin(initialState) {
   return new SafePlugin({
     key: toolbarKey,
     state: {
       init: function init(_, __) {
-        return undefined;
+        return initialState;
       },
-      apply: getBooleanFF('platform.editor.card.inject-settings-button') ? function (tr, pluginState) {
-        var metaState = tr.getMeta(toolbarKey);
-        if (metaState) {
-          if (_typeof(metaState) === 'object' && 'placement' in metaState) {
-            var _pluginState$items_ne;
-            var placement = metaState.placement;
-            if (!isValidPlacement(placement)) {
-              return pluginState;
-            }
-            var previous = (_pluginState$items_ne = pluginState === null || pluginState === void 0 ? void 0 : pluginState.items_next) !== null && _pluginState$items_ne !== void 0 ? _pluginState$items_ne : {
-              start: [],
-              end: []
-            };
-            return _objectSpread(_objectSpread({}, pluginState), {}, {
-              items_next: _objectSpread(_objectSpread({}, previous), {}, _defineProperty({}, placement, [].concat(_toConsumableArray(previous[placement]), [metaState.items])))
-            });
-          }
-          return metaState;
-        }
-        return pluginState;
-      } : function (tr, pluginState) {
+      apply: function apply(tr, pluginState) {
         var metaState = tr.getMeta(toolbarKey);
         if (metaState) {
           return metaState;

package/dist/types/Toolbar.d.ts

@@ -1,12 +1,8 @@
 /// <reference types="react" />
-import type { IntlShape } from 'react-intl-next';
 import type { HyperlinkAddToolbarProps } from '@atlaskit/editor-common/link';
-import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, FloatingToolbarItem, HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type HyperlinkToolbarItemsState } from './pm-plugins/toolbar-buttons';
+import type { ExtractInjectionAPI, FloatingToolbarHandler, HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
 import type { hyperlinkPlugin } from './index';
 export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubmit, displayText, displayUrl, providerFactory, view, onCancel, invokeMethod, lpLinkPicker, onClose, onEscapeCallback, onClickAwayCallback, pluginInjectionApi, }: HyperlinkAddToolbarProps & {
     pluginInjectionApi: any;
 }): JSX.Element;
-export declare const mergeAddedItems: (link: string, state: EditorState, intl: IntlShape, providerFactory: import("@atlaskit/editor-common/provider-factory").ProviderFactory) => (items: Array<FloatingToolbarItem<Command>>, toolbarItemsState: HyperlinkToolbarItemsState | undefined) => Array<FloatingToolbarItem<Command>>;
 export declare const getToolbarConfig: (options: HyperlinkPluginOptions, pluginInjectionApi: ExtractInjectionAPI<typeof hyperlinkPlugin> | undefined) => FloatingToolbarHandler;

package/dist/types/commands.d.ts

@@ -1,15 +1,16 @@
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { type CardPluginActions } from '@atlaskit/editor-common/card';
 import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
 import type { Command, EditorCommand, LinkInputType } from '@atlaskit/editor-common/types';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function setLinkHref(href: string, pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined, to?: number, isTabPressed?: boolean): Command;
 export type UpdateLink = (href: string, text: string, pos: number, to?: number) => Command;
 export declare function updateLink(href: string, text: string, pos: number, to?: number): Command;
-export declare function insertLink(from: number, to: number, incomingHref: string, incomingTitle?: string, displayText?: string, source?: LinkInputType, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance): Command;
+export declare function insertLink(from: number, to: number, incomingHref: string, incomingTitle?: string, displayText?: string, source?: LinkInputType, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance, cardApiActions?: CardPluginActions): Command;
 export type InsertLink = (inputMethod: LinkInputType, from: number, to: number, href: string, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
-export declare const insertLinkWithAnalytics: (inputMethod: LinkInputType, from: number, to: number, href: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
+export declare const insertLinkWithAnalytics: (inputMethod: LinkInputType, from: number, to: number, href: string, cardActions: CardPluginActions | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
 export declare function removeLink(pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
 export declare function editInsertedLink(editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
 type InputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.SHORTCUT | INPUT_METHOD.INSERT_MENU;
@@ -18,6 +19,6 @@ export declare function showLinkToolbar(inputMethod: InputMethod, editorAnalytic
 export declare function hideLinkToolbar(): Command;
 export type HideLinkToolbar = (tr: Transaction) => Transaction;
 export declare const hideLinkToolbarSetMeta: HideLinkToolbar;
-export declare const onEscapeCallback: Command;
+export declare const onEscapeCallback: (cardActions?: CardPluginActions) => Command;
 export declare const onClickAwayCallback: Command;
 export {};

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
 export { hyperlinkPlugin } from './plugin';
 export type { HyperlinkPlugin } from './plugin';
 export type { HideLinkToolbar, ShowLinkToolbar, InsertLink, UpdateLink, } from './commands';
-export type { PrependToolbarButtons, AddToolbarItems, } from './pm-plugins/toolbar-buttons';

package/dist/types/plugin.d.ts

@@ -1,25 +1,12 @@
 import type { HyperlinkState } from '@atlaskit/editor-common/link';
 import type { HyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { CardPlugin } from '@atlaskit/editor-plugin-card';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
-import type { AddToolbarItems, PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
-    dependencies: [OptionalPlugin<AnalyticsPlugin>];
+    dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<CardPlugin>];
     actions: {
-        /**
-         * Add items to the left of the hyperlink floating toolbar
-         * @param props
-         * -
-         * - items: Retrieve floating toolbar items to add
-         * - onEscapeCallback (optional): To be called when the link picker is escaped.
-         * - onInsertLinkCallback (optional): To be called when a link is inserted and it can be changed into a card.
-         */
-        prependToolbarButtons: PrependToolbarButtons;
-        /**
-         * Add items before or after any default hyperlink floating toolbar items
-         */
-        addToolbarItems: AddToolbarItems;
         hideLinkToolbar: HideLinkToolbar;
         insertLink: InsertLink;
         updateLink: UpdateLink;

package/dist/types/pm-plugins/toolbar-buttons.d.ts

@@ -1,21 +1,6 @@
-import type { IntlShape } from 'react-intl-next';
-import type { QueueCardsFromTransactionAction } from '@atlaskit/editor-common/card';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-/**
- * Relative placement of an item
- */
-type PlacementType = 'start' | 'end';
-type AdditionalToolbarItems = Record<PlacementType, GetToolbarItems[]>;
 export type HyperlinkToolbarItemsState = {
-    items: GetToolbarItems;
-    items_next?: AdditionalToolbarItems;
-    onEscapeCallback: ((tr: Transaction) => Transaction) | undefined;
-    onInsertLinkCallback: QueueCardsFromTransactionAction | undefined;
     /**
      * If you are mounting your own items to the hyperlink toolbar you may decide
      * you want to replace the hyperlink analytics with your own
@@ -24,18 +9,6 @@ export type HyperlinkToolbarItemsState = {
     skipAnalytics?: boolean;
 };
 export declare const toolbarKey: PluginKey<HyperlinkToolbarItemsState | undefined>;
-type GetToolbarItems = (state: EditorState, intl: IntlShape, providerFactory: ProviderFactory, link: string) => FloatingToolbarItem<any>[];
-interface PrependToolbarButtonsProps extends HyperlinkToolbarItemsState {
-    view: EditorView;
-}
-export type PrependToolbarButtons = (props: PrependToolbarButtonsProps) => void;
-export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, skipAnalytics, view, }: PrependToolbarButtonsProps) => void;
-type AddToolbarItemsProps = {
-    items: GetToolbarItems;
-    placement: PlacementType;
-    view: EditorView;
-};
-export type AddToolbarItems = (props: AddToolbarItemsProps) => void;
-export declare const addToolbarItems: ({ items, placement, view, }: AddToolbarItemsProps) => void;
-export declare const toolbarButtonsPlugin: () => SafePlugin<HyperlinkToolbarItemsState | undefined>;
-export {};
+export declare const toolbarButtonsPlugin: (initialState?: {
+    skipAnalytics: boolean;
+}) => SafePlugin<HyperlinkToolbarItemsState | undefined>;

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

@@ -1,12 +1,8 @@
 /// <reference types="react" />
-import type { IntlShape } from 'react-intl-next';
 import type { HyperlinkAddToolbarProps } from '@atlaskit/editor-common/link';
-import type { Command, ExtractInjectionAPI, FloatingToolbarHandler, FloatingToolbarItem, HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { type HyperlinkToolbarItemsState } from './pm-plugins/toolbar-buttons';
+import type { ExtractInjectionAPI, FloatingToolbarHandler, HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
 import type { hyperlinkPlugin } from './index';
 export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubmit, displayText, displayUrl, providerFactory, view, onCancel, invokeMethod, lpLinkPicker, onClose, onEscapeCallback, onClickAwayCallback, pluginInjectionApi, }: HyperlinkAddToolbarProps & {
     pluginInjectionApi: any;
 }): JSX.Element;
-export declare const mergeAddedItems: (link: string, state: EditorState, intl: IntlShape, providerFactory: import("@atlaskit/editor-common/provider-factory").ProviderFactory) => (items: Array<FloatingToolbarItem<Command>>, toolbarItemsState: HyperlinkToolbarItemsState | undefined) => Array<FloatingToolbarItem<Command>>;
 export declare const getToolbarConfig: (options: HyperlinkPluginOptions, pluginInjectionApi: ExtractInjectionAPI<typeof hyperlinkPlugin> | undefined) => FloatingToolbarHandler;

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

@@ -1,15 +1,16 @@
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { type CardPluginActions } from '@atlaskit/editor-common/card';
 import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
 import type { Command, EditorCommand, LinkInputType } from '@atlaskit/editor-common/types';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function setLinkHref(href: string, pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined, to?: number, isTabPressed?: boolean): Command;
 export type UpdateLink = (href: string, text: string, pos: number, to?: number) => Command;
 export declare function updateLink(href: string, text: string, pos: number, to?: number): Command;
-export declare function insertLink(from: number, to: number, incomingHref: string, incomingTitle?: string, displayText?: string, source?: LinkInputType, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance): Command;
+export declare function insertLink(from: number, to: number, incomingHref: string, incomingTitle?: string, displayText?: string, source?: LinkInputType, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance, cardApiActions?: CardPluginActions): Command;
 export type InsertLink = (inputMethod: LinkInputType, from: number, to: number, href: string, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
-export declare const insertLinkWithAnalytics: (inputMethod: LinkInputType, from: number, to: number, href: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
+export declare const insertLinkWithAnalytics: (inputMethod: LinkInputType, from: number, to: number, href: string, cardActions: CardPluginActions | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
 export declare function removeLink(pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
 export declare function editInsertedLink(editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
 type InputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.SHORTCUT | INPUT_METHOD.INSERT_MENU;
@@ -18,6 +19,6 @@ export declare function showLinkToolbar(inputMethod: InputMethod, editorAnalytic
 export declare function hideLinkToolbar(): Command;
 export type HideLinkToolbar = (tr: Transaction) => Transaction;
 export declare const hideLinkToolbarSetMeta: HideLinkToolbar;
-export declare const onEscapeCallback: Command;
+export declare const onEscapeCallback: (cardActions?: CardPluginActions) => Command;
 export declare const onClickAwayCallback: Command;
 export {};

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

@@ -1,4 +1,3 @@
 export { hyperlinkPlugin } from './plugin';
 export type { HyperlinkPlugin } from './plugin';
 export type { HideLinkToolbar, ShowLinkToolbar, InsertLink, UpdateLink, } from './commands';
-export type { PrependToolbarButtons, AddToolbarItems, } from './pm-plugins/toolbar-buttons';

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

@@ -1,27 +1,15 @@
 import type { HyperlinkState } from '@atlaskit/editor-common/link';
 import type { HyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { CardPlugin } from '@atlaskit/editor-plugin-card';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
-import type { AddToolbarItems, PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
     dependencies: [
-        OptionalPlugin<AnalyticsPlugin>
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<CardPlugin>
     ];
     actions: {
-        /**
-         * Add items to the left of the hyperlink floating toolbar
-         * @param props
-         * -
-         * - items: Retrieve floating toolbar items to add
-         * - onEscapeCallback (optional): To be called when the link picker is escaped.
-         * - onInsertLinkCallback (optional): To be called when a link is inserted and it can be changed into a card.
-         */
-        prependToolbarButtons: PrependToolbarButtons;
-        /**
-         * Add items before or after any default hyperlink floating toolbar items
-         */
-        addToolbarItems: AddToolbarItems;
         hideLinkToolbar: HideLinkToolbar;
         insertLink: InsertLink;
         updateLink: UpdateLink;

package/dist/types-ts4.5/pm-plugins/toolbar-buttons.d.ts

@@ -1,21 +1,6 @@
-import type { IntlShape } from 'react-intl-next';
-import type { QueueCardsFromTransactionAction } from '@atlaskit/editor-common/card';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-/**
- * Relative placement of an item
- */
-type PlacementType = 'start' | 'end';
-type AdditionalToolbarItems = Record<PlacementType, GetToolbarItems[]>;
 export type HyperlinkToolbarItemsState = {
-    items: GetToolbarItems;
-    items_next?: AdditionalToolbarItems;
-    onEscapeCallback: ((tr: Transaction) => Transaction) | undefined;
-    onInsertLinkCallback: QueueCardsFromTransactionAction | undefined;
     /**
      * If you are mounting your own items to the hyperlink toolbar you may decide
      * you want to replace the hyperlink analytics with your own
@@ -24,18 +9,6 @@ export type HyperlinkToolbarItemsState = {
     skipAnalytics?: boolean;
 };
 export declare const toolbarKey: PluginKey<HyperlinkToolbarItemsState | undefined>;
-type GetToolbarItems = (state: EditorState, intl: IntlShape, providerFactory: ProviderFactory, link: string) => FloatingToolbarItem<any>[];
-interface PrependToolbarButtonsProps extends HyperlinkToolbarItemsState {
-    view: EditorView;
-}
-export type PrependToolbarButtons = (props: PrependToolbarButtonsProps) => void;
-export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, skipAnalytics, view, }: PrependToolbarButtonsProps) => void;
-type AddToolbarItemsProps = {
-    items: GetToolbarItems;
-    placement: PlacementType;
-    view: EditorView;
-};
-export type AddToolbarItems = (props: AddToolbarItemsProps) => void;
-export declare const addToolbarItems: ({ items, placement, view, }: AddToolbarItemsProps) => void;
-export declare const toolbarButtonsPlugin: () => SafePlugin<HyperlinkToolbarItemsState | undefined>;
-export {};
+export declare const toolbarButtonsPlugin: (initialState?: {
+    skipAnalytics: boolean;
+}) => SafePlugin<HyperlinkToolbarItemsState | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-hyperlink",
-  "version": "1.7.2",
+  "version": "2.0.1",
   "description": "Hyperlink plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,8 +34,9 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^36.10.7",
     "@atlaskit/analytics-next": "^9.3.0",
-    "@atlaskit/editor-common": "^81.0.0",
+    "@atlaskit/editor-common": "^82.0.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
+    "@atlaskit/editor-plugin-card": "2.0.1",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/icon": "^22.3.0",
     "@atlaskit/platform-feature-flags": "^0.2.5",
@@ -54,7 +55,6 @@
     "@atlaskit/ssr": "*",
     "@atlaskit/util-data-test": "^17.9.0",
     "@atlaskit/visual-regression": "*",
-    "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "@testing-library/react": "^12.1.5",
     "raf-stub": "^2.0.1",
     "react-dom": "^16.8.0",
@@ -91,7 +91,6 @@
       ]
     }
   },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
   "platform-feature-flags": {
     "platform.linking-platform.prevent-suspicious-linkification": {
       "type": "boolean"