@atlaskit/editor-plugin-hyperlink 1.7.2 → 2.0.1

package/LICENSE.md

@@ -1,13 +1,11 @@
 Copyright 2023 Atlassian Pty Ltd
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions and limitations under the
+License.

package/dist/cjs/Toolbar.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HyperlinkAddToolbarWithState = HyperlinkAddToolbarWithState;
-exports.mergeAddedItems = exports.getToolbarConfig = void 0;
+exports.getToolbarConfig = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
@@ -93,7 +93,9 @@ 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) {
@@ -109,34 +111,15 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(intl, editorAnalyti
     target: '_blank'
   }];
 };
-var mergeAddedItems = exports.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((0, _toConsumableArray2.default)(acc), (0, _toConsumableArray2.default)(fn.apply(void 0, handlerParams.concat([link]))));
-      }, []);
-    };
-    return [].concat((0, _toConsumableArray2.default)(reduceItems(start)), (0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(reduceItems(end)));
-  };
-};
 var getToolbarConfig = exports.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 = _main.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) {
@@ -153,7 +136,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
       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) {
@@ -172,7 +155,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
             if (activeLinkMark.node.text) {
               metadata.title = activeLinkMark.node.text;
             }
-            var baseItems = [].concat((0, _toConsumableArray2.default)((_toolbarKey$getState$ = (_toolbarKey$getState = _toolbarButtons.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, (0, _commands.editInsertedLink)(editorAnalyticsApi), metadata)) !== null && _cardActions$getStart !== void 0 ? _cardActions$getStart : [{
               id: 'editor.link.edit',
               testId: 'editor.link.edit',
               type: 'button',
@@ -180,7 +164,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
               title: editLink,
               showTitle: true,
               metadata: metadata
-            }, {
+            }];
+            var items = [].concat((0, _toConsumableArray2.default)(startingToolbarItems), [{
               type: 'separator'
             }, {
               id: 'editor.link.openLink',
@@ -217,8 +202,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                 formatMessage: formatMessage,
                 markType: state.schema.marks.link
               }]
-            }], (0, _toConsumableArray2.default)((0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? [] : getSettingsButtonGroup(intl, editorAnalyticsApi)));
-            var items = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? mergeAddedItems(link, state, intl, providerFactory)(baseItems, _toolbarButtons.toolbarKey.getState(state)) : baseItems;
+            }], (0, _toConsumableArray2.default)((_cardActions$getEndin = cardActions === null || cardActions === void 0 ? void 0 : cardActions.getEndingToolbarItems(intl, link)) !== null && _cardActions$getEndin !== void 0 ? _cardActions$getEndin : []), (0, _toConsumableArray2.default)((0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? [] : getSettingsButtonGroup(intl, editorAnalyticsApi)));
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               height: 32,
               width: 250,
@@ -262,22 +246,22 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                     onCancel: function onCancel() {
                       return view.focus();
                     },
-                    onEscapeCallback: _commands.onEscapeCallback,
+                    onEscapeCallback: (0, _commands.onEscapeCallback)(editorCardActions),
                     onClickAwayCallback: _commands.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 ? _analytics.ACTION.UPDATED : _analytics.ACTION.INSERTED;
-                      var skipAnalytics = (_toolbarKey$getState$2 = (_toolbarKey$getState2 = _toolbarButtons.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 = _toolbarButtons.toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.skipAnalytics) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : false;
                       var command = isEdit ? (0, _card.commandWithMetadata)((0, _commands.updateLink)(href, displayText || title, activeLinkMark.pos), {
                         action: action,
                         inputMethod: inputMethod,
                         sourceEvent: analytic
-                      }) : (0, _commands.insertLinkWithAnalytics)(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
+                      }) : (0, _commands.insertLinkWithAnalytics)(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorCardActions, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
                       command(view.state, view.dispatch, view);
                       view.focus();
                     }

package/dist/cjs/commands.js

@@ -21,7 +21,6 @@ var _link = require("@atlaskit/editor-common/link");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _main = require("./pm-plugins/main");
-var _toolbarButtons = require("./pm-plugins/toolbar-buttons");
 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 setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
@@ -90,6 +89,7 @@ function updateLink(href, text, pos, to) {
 }
 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;
@@ -114,8 +114,7 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
       }));
       tr.setSelection(_state.Selection.near(tr.doc.resolve(markEnd)));
       if (!displayText || displayText === incomingHref) {
-        var _toolbarKey$getState;
-        var queueCardsFromChangedTr = (_toolbarKey$getState = _toolbarButtons.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, _analytics.ACTION.INSERTED, false, sourceEvent, appearance);
         } else {
@@ -152,15 +151,15 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
     return false;
   };
 }
-var insertLinkWithAnalytics = exports.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;
+var insertLinkWithAnalytics = exports.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 (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, (0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance));
+  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, (0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent, appearance, cardActions));
 };
 function removeLink(pos, editorAnalyticsApi) {
   return (0, _card.commandWithMetadata)(setLinkHref('', pos, editorAnalyticsApi), {
@@ -213,16 +212,18 @@ var hideLinkToolbarSetMeta = exports.hideLinkToolbarSetMeta = function hideLinkT
     type: _link.LinkAction.HIDE_TOOLBAR
   });
 };
-var onEscapeCallback = exports.onEscapeCallback = function onEscapeCallback(state, dispatch) {
-  var _toolbarKey$getState2, _toolbarKey$getState3;
-  var tr = state.tr;
-  hideLinkToolbarSetMeta(tr);
-  (_toolbarKey$getState2 = _toolbarButtons.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;
+var onEscapeCallback = exports.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;
+  };
 };
 var onClickAwayCallback = exports.onClickAwayCallback = function onClickAwayCallback(state, dispatch) {
   if (dispatch) {

package/dist/cjs/plugin.js

@@ -43,15 +43,13 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
       }
     },
     actions: {
-      prependToolbarButtons: _toolbarButtons.prependToolbarButtons,
-      addToolbarItems: _toolbarButtons.addToolbarItems,
       hideLinkToolbar: _commands.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 (0, _commands.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 (0, _commands.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: _commands.updateLink
     },
@@ -88,7 +86,13 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         }
       }, {
         name: 'hyperlinkToolbarButtons',
-        plugin: _toolbarButtons.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 (0, _toolbarButtons.toolbarButtonsPlugin)(hasCard ? {
+            skipAnalytics: true
+          } : undefined);
+        }
       }];
     },
     pluginsOptions: {

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

@@ -1,85 +1,20 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toolbarKey = exports.toolbarButtonsPlugin = exports.prependToolbarButtons = exports.addToolbarItems = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+exports.toolbarKey = exports.toolbarButtonsPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-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; }
-/**
- * Relative placement of an item
- */
-
 var toolbarKey = exports.toolbarKey = new _state.PluginKey('hyperlinkToolbarItems');
-var prependToolbarButtons = exports.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);
-};
-var addToolbarItems = exports.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;
-  });
-};
-var toolbarButtonsPlugin = exports.toolbarButtonsPlugin = function toolbarButtonsPlugin() {
+var toolbarButtonsPlugin = exports.toolbarButtonsPlugin = function toolbarButtonsPlugin(initialState) {
   return new _safePlugin.SafePlugin({
     key: toolbarKey,
     state: {
       init: function init(_, __) {
-        return undefined;
+        return initialState;
       },
-      apply: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.card.inject-settings-button') ? function (tr, pluginState) {
-        var metaState = tr.getMeta(toolbarKey);
-        if (metaState) {
-          if ((0, _typeof2.default)(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), {}, (0, _defineProperty2.default)({}, placement, [].concat((0, _toConsumableArray2.default)(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/es2019/Toolbar.js

@@ -78,7 +78,9 @@ export function HyperlinkAddToolbarWithState({
     onClose: onClose,
     onEscapeCallback: onEscapeCallback,
     onClickAwayCallback: onClickAwayCallback,
-    hyperlinkPluginState: hyperlinkState
+    timesViewed: hyperlinkState.timesViewed,
+    inputMethod: hyperlinkState.inputMethod,
+    searchSessionId: hyperlinkState.searchSessionId
   });
 }
 const getSettingsButtonGroup = (intl, editorAnalyticsApi) => [{
@@ -92,18 +94,8 @@ const getSettingsButtonGroup = (intl, editorAnalyticsApi) => [{
   href: getLinkPreferencesURLFromENV(),
   target: '_blank'
 }];
-export const mergeAddedItems = (link, ...handlerParams) => (items, toolbarItemsState) => {
-  const positions = toolbarItemsState === null || toolbarItemsState === void 0 ? void 0 : toolbarItemsState.items_next;
-  if (!positions) {
-    return items;
-  }
-  const start = positions.start;
-  const end = positions.end;
-  const reduceItems = (items = []) => items.reduce((acc, fn) => [...acc, ...fn(...handlerParams, link)], []);
-  return [...reduceItems(start), ...items, ...reduceItems(end)];
-};
 export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, providerFactory) => {
-  var _pluginInjectionApi$a, _options$lpLinkPicker;
+  var _pluginInjectionApi$c, _pluginInjectionApi$a, _options$lpLinkPicker;
   if (options.disableFloatingToolbar) {
     return;
   }
@@ -111,6 +103,7 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
     formatMessage
   } = intl;
   const linkState = stateKey.getState(state);
+  const editorCardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c = pluginInjectionApi.card) === null || _pluginInjectionApi$c === void 0 ? void 0 : _pluginInjectionApi$c.actions;
   const editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
   const lpLinkPicker = (_options$lpLinkPicker = options.lpLinkPicker) !== null && _options$lpLinkPicker !== void 0 ? _options$lpLinkPicker : true;
   if (linkState && linkState.activeLinkMark) {
@@ -127,7 +120,7 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
     switch (activeLinkMark.type) {
       case 'EDIT':
         {
-          var _toolbarKey$getState$, _toolbarKey$getState;
+          var _pluginInjectionApi$c2, _cardActions$getStart, _cardActions$getEndin;
           const {
             pos,
             node
@@ -146,7 +139,8 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
           if (activeLinkMark.node.text) {
             metadata.title = activeLinkMark.node.text;
           }
-          const baseItems = [...((_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$ : []), {
+          const cardActions = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c2 = pluginInjectionApi.card) === null || _pluginInjectionApi$c2 === void 0 ? void 0 : _pluginInjectionApi$c2.actions;
+          const 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',
@@ -154,7 +148,8 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
             title: editLink,
             showTitle: true,
             metadata: metadata
-          }, {
+          }];
+          const items = [...startingToolbarItems, {
             type: 'separator'
           }, {
             id: 'editor.link.openLink',
@@ -191,8 +186,7 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
               formatMessage: formatMessage,
               markType: state.schema.marks.link
             }]
-          }, ...(getBooleanFF('platform.editor.card.inject-settings-button') ? [] : getSettingsButtonGroup(intl, editorAnalyticsApi))];
-          const items = getBooleanFF('platform.editor.card.inject-settings-button') ? mergeAddedItems(link, state, intl, providerFactory)(baseItems, toolbarKey.getState(state)) : baseItems;
+          }, ...((_cardActions$getEndin = cardActions === null || cardActions === void 0 ? void 0 : cardActions.getEndingToolbarItems(intl, link)) !== null && _cardActions$getEndin !== void 0 ? _cardActions$getEndin : []), ...(getBooleanFF('platform.editor.card.inject-settings-button') ? [] : getSettingsButtonGroup(intl, editorAnalyticsApi))];
           return {
             ...hyperLinkToolbar,
             height: 32,
@@ -234,18 +228,18 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
                   displayText: displayText || '',
                   providerFactory: providerFactory,
                   onCancel: () => view.focus(),
-                  onEscapeCallback: onEscapeCallback,
+                  onEscapeCallback: onEscapeCallback(editorCardActions),
                   onClickAwayCallback: onClickAwayCallback,
                   onSubmit: (href, title = '', displayText, inputMethod, analytic) => {
-                    var _toolbarKey$getState$2, _toolbarKey$getState2;
+                    var _toolbarKey$getState$, _toolbarKey$getState;
                     const isEdit = isEditLink(activeLinkMark);
                     const action = isEdit ? ACTION.UPDATED : ACTION.INSERTED;
-                    const 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;
+                    const 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;
                     const command = isEdit ? commandWithMetadata(updateLink(href, displayText || title, activeLinkMark.pos), {
                       action,
                       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/es2019/commands.js

@@ -5,7 +5,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), (state, dispatch) => {
     const $pos = state.doc.resolve(pos);
@@ -72,7 +71,7 @@ export function updateLink(href, text, pos, to) {
     return true;
   };
 }
-export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent, appearance = 'inline') {
+export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent, appearance = 'inline', cardApiActions) {
   return (state, dispatch) => {
     const link = state.schema.marks.link;
     const {
@@ -99,8 +98,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;
-        const queueCardsFromChangedTr = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.onInsertLinkCallback;
+        const queueCardsFromChangedTr = cardApiActions === null || cardApiActions === void 0 ? void 0 : cardApiActions.queueCardsFromChangedTr;
         if (queueCardsFromChangedTr) {
           queueCardsFromChangedTr === null || queueCardsFromChangedTr === void 0 ? void 0 : queueCardsFromChangedTr(state, tr, source, ACTION.INSERTED, false, sourceEvent, appearance);
         } else {
@@ -137,12 +135,12 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
     return false;
   };
 }
-export const insertLinkWithAnalytics = (inputMethod, from, to, href, editorAnalyticsApi, title, displayText, cardsAvailable = false, sourceEvent = undefined, appearance) => {
+export const insertLinkWithAnalytics = (inputMethod, from, to, href, cardActions, editorAnalyticsApi, title, displayText, cardsAvailable = false, sourceEvent = undefined, appearance) => {
   // 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,13 +196,13 @@ export const hideLinkToolbarSetMeta = tr => {
     type: LinkAction.HIDE_TOOLBAR
   });
 };
-export const onEscapeCallback = (state, dispatch) => {
-  var _toolbarKey$getState2, _toolbarKey$getState3;
+export const onEscapeCallback = cardActions => (state, dispatch) => {
+  var _cardActions$hideLink;
   const {
     tr
   } = state;
   hideLinkToolbarSetMeta(tr);
-  (_toolbarKey$getState2 = toolbarKey.getState(state)) === null || _toolbarKey$getState2 === void 0 ? void 0 : (_toolbarKey$getState3 = _toolbarKey$getState2.onEscapeCallback) === null || _toolbarKey$getState3 === void 0 ? void 0 : _toolbarKey$getState3.call(_toolbarKey$getState2, tr);
+  cardActions === null || cardActions === void 0 ? void 0 : (_cardActions$hideLink = cardActions.hideLinkToolbar) === null || _cardActions$hideLink === void 0 ? void 0 : _cardActions$hideLink.call(cardActions, tr);
   if (dispatch) {
     dispatch(tr);
     return true;

package/dist/es2019/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, 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`
@@ -35,12 +35,10 @@ export const hyperlinkPlugin = ({
       }
     },
     actions: {
-      prependToolbarButtons,
-      addToolbarItems,
       hideLinkToolbar: hideLinkToolbarSetMeta,
       insertLink: (inputMethod, from, to, href, title, displayText, cardsAvailable = false, sourceEvent = undefined, appearance) => {
-        var _api$analytics2;
-        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
+        var _api$card, _api$analytics2;
+        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 ? void 0 : (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
       },
       updateLink: updateLink
     },
@@ -75,7 +73,13 @@ export const hyperlinkPlugin = ({
         }
       }, {
         name: 'hyperlinkToolbarButtons',
-        plugin: toolbarButtonsPlugin
+        plugin: () => {
+          var _api$card2;
+          const 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/es2019/pm-plugins/toolbar-buttons.js

@@ -1,86 +1,14 @@
 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 const toolbarKey = new PluginKey('hyperlinkToolbarItems');
-export const prependToolbarButtons = ({
-  items,
-  onEscapeCallback,
-  onInsertLinkCallback,
-  skipAnalytics,
-  view
-}) => {
-  const {
-    state: {
-      tr
-    },
-    dispatch
-  } = view;
-  tr.setMeta(toolbarKey, {
-    items,
-    onEscapeCallback,
-    onInsertLinkCallback,
-    skipAnalytics
-  });
-  dispatch(tr);
-};
-export const addToolbarItems = ({
-  items,
-  placement,
-  view
-}) => {
-  const {
-    state: {
-      tr
-    },
-    dispatch
-  } = view;
-  tr.setMeta(toolbarKey, {
-    items,
-    placement
-  });
-  dispatch(tr);
-};
-const VALID_PLACEMENTS = ['start', 'end'];
-const isValidPlacement = placement => {
-  return VALID_PLACEMENTS.some(p => p === placement);
-};
-export const toolbarButtonsPlugin = () => {
+export const toolbarButtonsPlugin = initialState => {
   return new SafePlugin({
     key: toolbarKey,
     state: {
       init: (_, __) => {
-        return undefined;
+        return initialState;
       },
-      apply: getBooleanFF('platform.editor.card.inject-settings-button') ? (tr, pluginState) => {
-        const metaState = tr.getMeta(toolbarKey);
-        if (metaState) {
-          if (typeof metaState === 'object' && 'placement' in metaState) {
-            var _pluginState$items_ne;
-            const placement = metaState.placement;
-            if (!isValidPlacement(placement)) {
-              return pluginState;
-            }
-            const 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 {
-              ...pluginState,
-              items_next: {
-                ...previous,
-                [placement]: [...previous[placement], metaState.items]
-              }
-            };
-          }
-          return metaState;
-        }
-        return pluginState;
-      } : (tr, pluginState) => {
+      apply: (tr, pluginState) => {
         const metaState = tr.getMeta(toolbarKey);
         if (metaState) {
           return metaState;