@atlaskit/editor-plugin-hyperlink 1.3.1 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 1.5.0
+
+### Minor Changes
+
+- [#89386](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89386) [`567378286049`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/567378286049) - Adds `addToolbarItems` action to hyperlink toolbar plugin in order to support adding addition toolbar items to the end of the floating toolbar for blue links. Requires platform.editor.card.inject-settings-button platform feature flag for usage.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.4.0
+
+### Minor Changes
+
+- [#84430](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/84430) [`2981b2835973`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2981b2835973) - [ux] EDM-9111 Prevent linkification of links with suspicious tlds
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.3.1
 
 ### Patch Changes

package/dist/cjs/Toolbar.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HyperlinkAddToolbarWithState = HyperlinkAddToolbarWithState;
-exports.getToolbarConfig = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+exports.mergeAddedItems = 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"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -20,6 +20,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _settings = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("./commands");
 var _main = require("./pm-plugins/main");
 var _toolbarButtons = require("./pm-plugins/toolbar-buttons");
@@ -108,6 +109,26 @@ 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;
@@ -151,54 +172,56 @@ 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$ : []), [{
+              id: 'editor.link.edit',
+              testId: 'editor.link.edit',
+              type: 'button',
+              onClick: (0, _commands.editInsertedLink)(editorAnalyticsApi),
+              title: editLink,
+              showTitle: true,
+              metadata: metadata
+            }, {
+              type: 'separator'
+            }, {
+              id: 'editor.link.openLink',
+              testId: 'editor.link.openLink',
+              type: 'button',
+              disabled: !isValidUrl,
+              target: '_blank',
+              href: isValidUrl ? link : undefined,
+              onClick: visitHyperlink(editorAnalyticsApi),
+              title: labelOpenLink,
+              icon: _shortcut.default,
+              className: 'hyperlink-open-link',
+              metadata: metadata,
+              tabIndex: null
+            }, {
+              type: 'separator'
+            }, {
+              id: 'editor.link.unlink',
+              testId: 'editor.link.unlink',
+              type: 'button',
+              onClick: (0, _card.commandWithMetadata)((0, _commands.removeLink)(pos, editorAnalyticsApi), {
+                inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+              }),
+              title: labelUnlink,
+              icon: _unlink.default,
+              tabIndex: null
+            }, {
+              type: 'copy-button',
+              items: [{
+                type: 'separator'
+              }, {
+                state: state,
+                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;
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               height: 32,
               width: 250,
-              items: [].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$ : []), [{
-                id: 'editor.link.edit',
-                testId: 'editor.link.edit',
-                type: 'button',
-                onClick: (0, _commands.editInsertedLink)(editorAnalyticsApi),
-                title: editLink,
-                showTitle: true,
-                metadata: metadata
-              }, {
-                type: 'separator'
-              }, {
-                id: 'editor.link.openLink',
-                testId: 'editor.link.openLink',
-                type: 'button',
-                disabled: !isValidUrl,
-                target: '_blank',
-                href: isValidUrl ? link : undefined,
-                onClick: visitHyperlink(editorAnalyticsApi),
-                title: labelOpenLink,
-                icon: _shortcut.default,
-                className: 'hyperlink-open-link',
-                metadata: metadata,
-                tabIndex: null
-              }, {
-                type: 'separator'
-              }, {
-                id: 'editor.link.unlink',
-                testId: 'editor.link.unlink',
-                type: 'button',
-                onClick: (0, _card.commandWithMetadata)((0, _commands.removeLink)(pos, editorAnalyticsApi), {
-                  inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
-                }),
-                title: labelUnlink,
-                icon: _unlink.default,
-                tabIndex: null
-              }, {
-                type: 'copy-button',
-                items: [{
-                  type: 'separator'
-                }, {
-                  state: state,
-                  formatMessage: formatMessage,
-                  markType: state.schema.marks.link
-                }]
-              }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(intl, editorAnalyticsApi))),
+              items: items,
               scrollable: true
             });
           }

package/dist/cjs/plugin.js

@@ -44,6 +44,7 @@ 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;

package/dist/cjs/pm-plugins/input-rule.js

@@ -12,8 +12,12 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _toolbarButtons = require("./toolbar-buttons");
+/**
+ * Called when space after link, but not on enter
+ */
 function createLinkInputRule(regexp, editorAnalyticsApi) {
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return (0, _utils.createRule)(regexp, function (state, match, start, end) {
@@ -23,7 +27,27 @@ function createLinkInputRule(regexp, editorAnalyticsApi) {
       return null;
     }
     var link = match;
-    var url = (0, _utils.normalizeUrl)(link.url);
+    var url;
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.prevent-suspicious-linkification')) {
+      // Property 'url' does not exist on type 'RegExpExecArray', the type of `match`.
+      // This check is in case the match is not a Linkify match, which has a url property.
+      if (link.url === undefined) {
+        return null;
+      }
+      if (!(0, _utils.shouldAutoLinkifyMatch)(link)) {
+        return null;
+      }
+      url = (0, _utils.normalizeUrl)(link.url);
+
+      // Not previously handled; don't create a link if the URL is empty.
+      // This will only happen if the `regexp` matches more links than the normalizeUrl validation;
+      // if they both use the same linkify instance this shouldn't happen.
+      if (url === '') {
+        return null;
+      }
+    } else {
+      url = (0, _utils.normalizeUrl)(link.url);
+    }
     var markType = schema.mark('link', {
       href: url
     });
@@ -74,6 +98,10 @@ function createInputRulePlugin(schema, editorAnalyticsApi) {
       prefix = _match[1],
       linkText = _match[2],
       linkUrl = _match[3];
+
+    // We don't filter this match here by shouldAutoLinkifyMatch
+    // because the intent of creating a link is clear
+
     var url = (0, _utils.normalizeUrl)(linkUrl).trim();
     var markType = schema.mark('link', {
       href: url

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

@@ -11,6 +11,7 @@ var _card = require("@atlaskit/editor-common/card");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var _main = require("../pm-plugins/main");
 var _toolbarButtons = require("./toolbar-buttons");
@@ -32,6 +33,10 @@ function createKeymapPlugin(editorAnalyticsApi) {
   }, list);
   return (0, _keymap.keymap)(list);
 }
+
+/**
+ * Convert the last word before the selection to a hyperlink if it's a valid URL with a tld we want to linkify
+ */
 var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
     var _toolbarKey$getState$, _toolbarKey$getState;
@@ -44,6 +49,11 @@ var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(edito
     var lastWord = words[words.length - 1];
     var match = (0, _adfSchema.getLinkMatch)(lastWord);
     if (match) {
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.prevent-suspicious-linkification')) {
+        if (!(0, _utils.shouldAutoLinkifyMatch)(match)) {
+          return false;
+        }
+      }
       var hyperlinkedText = match.raw;
       var start = state.selection.$from.pos - hyperlinkedText.length;
       var end = state.selection.$from.pos;

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

@@ -1,11 +1,22 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toolbarKey = exports.toolbarButtonsPlugin = exports.prependToolbarButtons = void 0;
+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"));
 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,
@@ -23,14 +34,52 @@ var prependToolbarButtons = exports.prependToolbarButtons = function prependTool
   });
   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() {
   return new _safePlugin.SafePlugin({
     key: toolbarKey,
     state: {
-      init: function init(_, state) {
+      init: function init(_, __) {
         return undefined;
       },
-      apply: function apply(tr, pluginState) {
+      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) {
         var metaState = tr.getMeta(toolbarKey);
         if (metaState) {
           return metaState;

package/dist/es2019/Toolbar.js

@@ -10,6 +10,7 @@ import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { editInsertedLink, insertLinkWithAnalytics, onClickAwayCallback, onEscapeCallback, removeLink, updateLink } from './commands';
 import { stateKey } from './pm-plugins/main';
 import { toolbarKey } from './pm-plugins/toolbar-buttons';
@@ -91,6 +92,16 @@ 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;
   if (options.disableFloatingToolbar) {
@@ -135,55 +146,57 @@ 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$ : []), {
+            id: 'editor.link.edit',
+            testId: 'editor.link.edit',
+            type: 'button',
+            onClick: editInsertedLink(editorAnalyticsApi),
+            title: editLink,
+            showTitle: true,
+            metadata: metadata
+          }, {
+            type: 'separator'
+          }, {
+            id: 'editor.link.openLink',
+            testId: 'editor.link.openLink',
+            type: 'button',
+            disabled: !isValidUrl,
+            target: '_blank',
+            href: isValidUrl ? link : undefined,
+            onClick: visitHyperlink(editorAnalyticsApi),
+            title: labelOpenLink,
+            icon: OpenIcon,
+            className: 'hyperlink-open-link',
+            metadata: metadata,
+            tabIndex: null
+          }, {
+            type: 'separator'
+          }, {
+            id: 'editor.link.unlink',
+            testId: 'editor.link.unlink',
+            type: 'button',
+            onClick: commandWithMetadata(removeLink(pos, editorAnalyticsApi), {
+              inputMethod: INPUT_METHOD.FLOATING_TB
+            }),
+            title: labelUnlink,
+            icon: UnlinkIcon,
+            tabIndex: null
+          }, {
+            type: 'copy-button',
+            items: [{
+              type: 'separator'
+            }, {
+              state,
+              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;
           return {
             ...hyperLinkToolbar,
             height: 32,
             width: 250,
-            items: [...((_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$ : []), {
-              id: 'editor.link.edit',
-              testId: 'editor.link.edit',
-              type: 'button',
-              onClick: editInsertedLink(editorAnalyticsApi),
-              title: editLink,
-              showTitle: true,
-              metadata: metadata
-            }, {
-              type: 'separator'
-            }, {
-              id: 'editor.link.openLink',
-              testId: 'editor.link.openLink',
-              type: 'button',
-              disabled: !isValidUrl,
-              target: '_blank',
-              href: isValidUrl ? link : undefined,
-              onClick: visitHyperlink(editorAnalyticsApi),
-              title: labelOpenLink,
-              icon: OpenIcon,
-              className: 'hyperlink-open-link',
-              metadata: metadata,
-              tabIndex: null
-            }, {
-              type: 'separator'
-            }, {
-              id: 'editor.link.unlink',
-              testId: 'editor.link.unlink',
-              type: 'button',
-              onClick: commandWithMetadata(removeLink(pos, editorAnalyticsApi), {
-                inputMethod: INPUT_METHOD.FLOATING_TB
-              }),
-              title: labelUnlink,
-              icon: UnlinkIcon,
-              tabIndex: null
-            }, {
-              type: 'copy-button',
-              items: [{
-                type: 'separator'
-              }, {
-                state,
-                formatMessage: formatMessage,
-                markType: state.schema.marks.link
-              }]
-            }, ...getSettingsButtonGroup(intl, editorAnalyticsApi)],
+            items,
             scrollable: 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 { prependToolbarButtons, toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
+import { addToolbarItems, prependToolbarButtons, toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
 import { getToolbarConfig } from './Toolbar';
 /**
  * Hyperlink plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
@@ -36,6 +36,7 @@ export const hyperlinkPlugin = ({
     },
     actions: {
       prependToolbarButtons,
+      addToolbarItems,
       hideLinkToolbar: hideLinkToolbarSetMeta,
       insertLink: (inputMethod, from, to, href, title, displayText, cardsAvailable = false, sourceEvent = undefined, appearance) => {
         var _api$analytics2;

package/dist/es2019/pm-plugins/input-rule.js

@@ -1,9 +1,14 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { createRule, findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { toolbarKey } from './toolbar-buttons';
+
+/**
+ * Called when space after link, but not on enter
+ */
 export function createLinkInputRule(regexp, editorAnalyticsApi) {
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return createRule(regexp, (state, match, start, end) => {
@@ -15,7 +20,27 @@ export function createLinkInputRule(regexp, editorAnalyticsApi) {
       return null;
     }
     const link = match;
-    const url = normalizeUrl(link.url);
+    let url;
+    if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
+      // Property 'url' does not exist on type 'RegExpExecArray', the type of `match`.
+      // This check is in case the match is not a Linkify match, which has a url property.
+      if (link.url === undefined) {
+        return null;
+      }
+      if (!shouldAutoLinkifyMatch(link)) {
+        return null;
+      }
+      url = normalizeUrl(link.url);
+
+      // Not previously handled; don't create a link if the URL is empty.
+      // This will only happen if the `regexp` matches more links than the normalizeUrl validation;
+      // if they both use the same linkify instance this shouldn't happen.
+      if (url === '') {
+        return null;
+      }
+    } else {
+      url = normalizeUrl(link.url);
+    }
     const markType = schema.mark('link', {
       href: url
     });
@@ -65,6 +90,10 @@ export function createInputRulePlugin(schema, editorAnalyticsApi) {
       schema
     } = state;
     const [, prefix, linkText, linkUrl] = match;
+
+    // We don't filter this match here by shouldAutoLinkifyMatch
+    // because the intent of creating a link is clear
+
     const url = normalizeUrl(linkUrl).trim();
     const markType = schema.mark('link', {
       href: url

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

@@ -2,8 +2,9 @@ import { getLinkMatch } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { addLink, bindKeymapWithCommand, bindKeymapWithEditorCommand, enter, escape, insertNewLine } from '@atlaskit/editor-common/keymaps';
-import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@atlaskit/editor-common/utils';
+import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hideLinkToolbar, showLinkToolbar } from '../commands';
 import { stateKey } from '../pm-plugins/main';
 import { toolbarKey } from './toolbar-buttons';
@@ -25,6 +26,10 @@ export function createKeymapPlugin(editorAnalyticsApi) {
   }, list);
   return keymap(list);
 }
+
+/**
+ * Convert the last word before the selection to a hyperlink if it's a valid URL with a tld we want to linkify
+ */
 const mayConvertLastWordToHyperlink = editorAnalyticsApi => {
   return function (state, dispatch) {
     var _toolbarKey$getState$, _toolbarKey$getState;
@@ -37,6 +42,11 @@ const mayConvertLastWordToHyperlink = editorAnalyticsApi => {
     const lastWord = words[words.length - 1];
     const match = getLinkMatch(lastWord);
     if (match) {
+      if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
+        if (!shouldAutoLinkifyMatch(match)) {
+          return false;
+        }
+      }
       const hyperlinkedText = match.raw;
       const start = state.selection.$from.pos - hyperlinkedText.length;
       const end = state.selection.$from.pos;

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

@@ -1,5 +1,11 @@
 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,
@@ -22,14 +28,59 @@ export const prependToolbarButtons = ({
   });
   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 = () => {
   return new SafePlugin({
     key: toolbarKey,
     state: {
-      init: (_, state) => {
+      init: (_, __) => {
         return undefined;
       },
-      apply: (tr, pluginState) => {
+      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) => {
         const metaState = tr.getMeta(toolbarKey);
         if (metaState) {
           return metaState;

package/dist/esm/Toolbar.js

@@ -1,5 +1,5 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 React from 'react';
@@ -14,6 +14,7 @@ import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { editInsertedLink, insertLinkWithAnalytics, onClickAwayCallback, onEscapeCallback, removeLink, updateLink } from './commands';
 import { stateKey } from './pm-plugins/main';
 import { toolbarKey } from './pm-plugins/toolbar-buttons';
@@ -100,6 +101,26 @@ 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;
@@ -143,54 +164,56 @@ 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$ : []), [{
+              id: 'editor.link.edit',
+              testId: 'editor.link.edit',
+              type: 'button',
+              onClick: editInsertedLink(editorAnalyticsApi),
+              title: editLink,
+              showTitle: true,
+              metadata: metadata
+            }, {
+              type: 'separator'
+            }, {
+              id: 'editor.link.openLink',
+              testId: 'editor.link.openLink',
+              type: 'button',
+              disabled: !isValidUrl,
+              target: '_blank',
+              href: isValidUrl ? link : undefined,
+              onClick: visitHyperlink(editorAnalyticsApi),
+              title: labelOpenLink,
+              icon: OpenIcon,
+              className: 'hyperlink-open-link',
+              metadata: metadata,
+              tabIndex: null
+            }, {
+              type: 'separator'
+            }, {
+              id: 'editor.link.unlink',
+              testId: 'editor.link.unlink',
+              type: 'button',
+              onClick: commandWithMetadata(removeLink(pos, editorAnalyticsApi), {
+                inputMethod: INPUT_METHOD.FLOATING_TB
+              }),
+              title: labelUnlink,
+              icon: UnlinkIcon,
+              tabIndex: null
+            }, {
+              type: 'copy-button',
+              items: [{
+                type: 'separator'
+              }, {
+                state: state,
+                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;
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               height: 32,
               width: 250,
-              items: [].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$ : []), [{
-                id: 'editor.link.edit',
-                testId: 'editor.link.edit',
-                type: 'button',
-                onClick: editInsertedLink(editorAnalyticsApi),
-                title: editLink,
-                showTitle: true,
-                metadata: metadata
-              }, {
-                type: 'separator'
-              }, {
-                id: 'editor.link.openLink',
-                testId: 'editor.link.openLink',
-                type: 'button',
-                disabled: !isValidUrl,
-                target: '_blank',
-                href: isValidUrl ? link : undefined,
-                onClick: visitHyperlink(editorAnalyticsApi),
-                title: labelOpenLink,
-                icon: OpenIcon,
-                className: 'hyperlink-open-link',
-                metadata: metadata,
-                tabIndex: null
-              }, {
-                type: 'separator'
-              }, {
-                id: 'editor.link.unlink',
-                testId: 'editor.link.unlink',
-                type: 'button',
-                onClick: commandWithMetadata(removeLink(pos, editorAnalyticsApi), {
-                  inputMethod: INPUT_METHOD.FLOATING_TB
-                }),
-                title: labelUnlink,
-                icon: UnlinkIcon,
-                tabIndex: null
-              }, {
-                type: 'copy-button',
-                items: [{
-                  type: 'separator'
-                }, {
-                  state: state,
-                  formatMessage: formatMessage,
-                  markType: state.schema.marks.link
-                }]
-              }], _toConsumableArray(getSettingsButtonGroup(intl, editorAnalyticsApi))),
+              items: items,
               scrollable: true
             });
           }

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 { prependToolbarButtons, toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
+import { addToolbarItems, prependToolbarButtons, toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
 import { getToolbarConfig } from './Toolbar';
 /**
  * Hyperlink plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
@@ -37,6 +37,7 @@ 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;

package/dist/esm/pm-plugins/input-rule.js

@@ -2,9 +2,14 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { createRule, findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { toolbarKey } from './toolbar-buttons';
+
+/**
+ * Called when space after link, but not on enter
+ */
 export function createLinkInputRule(regexp, editorAnalyticsApi) {
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return createRule(regexp, function (state, match, start, end) {
@@ -14,7 +19,27 @@ export function createLinkInputRule(regexp, editorAnalyticsApi) {
       return null;
     }
     var link = match;
-    var url = normalizeUrl(link.url);
+    var url;
+    if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
+      // Property 'url' does not exist on type 'RegExpExecArray', the type of `match`.
+      // This check is in case the match is not a Linkify match, which has a url property.
+      if (link.url === undefined) {
+        return null;
+      }
+      if (!shouldAutoLinkifyMatch(link)) {
+        return null;
+      }
+      url = normalizeUrl(link.url);
+
+      // Not previously handled; don't create a link if the URL is empty.
+      // This will only happen if the `regexp` matches more links than the normalizeUrl validation;
+      // if they both use the same linkify instance this shouldn't happen.
+      if (url === '') {
+        return null;
+      }
+    } else {
+      url = normalizeUrl(link.url);
+    }
     var markType = schema.mark('link', {
       href: url
     });
@@ -65,6 +90,10 @@ export function createInputRulePlugin(schema, editorAnalyticsApi) {
       prefix = _match[1],
       linkText = _match[2],
       linkUrl = _match[3];
+
+    // We don't filter this match here by shouldAutoLinkifyMatch
+    // because the intent of creating a link is clear
+
     var url = normalizeUrl(linkUrl).trim();
     var markType = schema.mark('link', {
       href: url

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

@@ -2,8 +2,9 @@ import { getLinkMatch } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { addLink, bindKeymapWithCommand, bindKeymapWithEditorCommand, enter, escape, insertNewLine } from '@atlaskit/editor-common/keymaps';
-import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@atlaskit/editor-common/utils';
+import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, shouldAutoLinkifyMatch } from '@atlaskit/editor-common/utils';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hideLinkToolbar, showLinkToolbar } from '../commands';
 import { stateKey } from '../pm-plugins/main';
 import { toolbarKey } from './toolbar-buttons';
@@ -25,6 +26,10 @@ export function createKeymapPlugin(editorAnalyticsApi) {
   }, list);
   return keymap(list);
 }
+
+/**
+ * Convert the last word before the selection to a hyperlink if it's a valid URL with a tld we want to linkify
+ */
 var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
     var _toolbarKey$getState$, _toolbarKey$getState;
@@ -37,6 +42,11 @@ var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(edito
     var lastWord = words[words.length - 1];
     var match = getLinkMatch(lastWord);
     if (match) {
+      if (getBooleanFF('platform.linking-platform.prevent-suspicious-linkification')) {
+        if (!shouldAutoLinkifyMatch(match)) {
+          return false;
+        }
+      }
       var hyperlinkedText = match.raw;
       var start = state.selection.$from.pos - hyperlinkedText.length;
       var end = state.selection.$from.pos;

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

@@ -1,5 +1,16 @@
+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,
@@ -17,14 +28,52 @@ export var prependToolbarButtons = function prependToolbarButtons(_ref) {
   });
   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() {
   return new SafePlugin({
     key: toolbarKey,
     state: {
-      init: function init(_, state) {
+      init: function init(_, __) {
         return undefined;
       },
-      apply: function apply(tr, pluginState) {
+      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) {
         var metaState = tr.getMeta(toolbarKey);
         if (metaState) {
           return metaState;

package/dist/types/Toolbar.d.ts

@@ -1,8 +1,12 @@
 /// <reference types="react" />
+import type { IntlShape } from 'react-intl-next';
 import type { HyperlinkAddToolbarProps } from '@atlaskit/editor-common/link';
-import type { ExtractInjectionAPI, FloatingToolbarHandler, HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
+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 { 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/index.d.ts

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

package/dist/types/plugin.d.ts

@@ -2,7 +2,7 @@ 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 { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
-import type { PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
+import type { AddToolbarItems, PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
     dependencies: [OptionalPlugin<AnalyticsPlugin>];
@@ -16,6 +16,10 @@ export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
          * - 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/input-rule.d.ts

@@ -2,6 +2,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Called when space after link, but not on enter
+ */
 export declare function createLinkInputRule(regexp: RegExp, editorAnalyticsApi: EditorAnalyticsAPI | undefined): InputRuleWrapper;
 export declare function createInputRulePlugin(schema: Schema, editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
 export default createInputRulePlugin;

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

@@ -6,8 +6,14 @@ 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';
-type HyperlinkToolbarItemsState = {
+/**
+ * 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;
     /**
@@ -24,5 +30,12 @@ interface PrependToolbarButtonsProps extends HyperlinkToolbarItemsState {
 }
 export type PrependToolbarButtons = (props: PrependToolbarButtonsProps) => void;
 export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, skipAnalytics, view, }: PrependToolbarButtonsProps) => void;
-export declare const toolbarButtonsPlugin: () => SafePlugin<undefined>;
+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 {};

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

@@ -1,8 +1,12 @@
 /// <reference types="react" />
+import type { IntlShape } from 'react-intl-next';
 import type { HyperlinkAddToolbarProps } from '@atlaskit/editor-common/link';
-import type { ExtractInjectionAPI, FloatingToolbarHandler, HyperlinkPluginOptions } from '@atlaskit/editor-common/types';
+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 { 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/index.d.ts

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

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

@@ -2,7 +2,7 @@ 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 { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
-import type { PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
+import type { AddToolbarItems, PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
     dependencies: [
@@ -18,6 +18,10 @@ export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
          * - 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/input-rule.d.ts

@@ -2,6 +2,9 @@ import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Called when space after link, but not on enter
+ */
 export declare function createLinkInputRule(regexp: RegExp, editorAnalyticsApi: EditorAnalyticsAPI | undefined): InputRuleWrapper;
 export declare function createInputRulePlugin(schema: Schema, editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
 export default createInputRulePlugin;

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

@@ -6,8 +6,14 @@ 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';
-type HyperlinkToolbarItemsState = {
+/**
+ * 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;
     /**
@@ -24,5 +30,12 @@ interface PrependToolbarButtonsProps extends HyperlinkToolbarItemsState {
 }
 export type PrependToolbarButtons = (props: PrependToolbarButtonsProps) => void;
 export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, skipAnalytics, view, }: PrependToolbarButtonsProps) => void;
-export declare const toolbarButtonsPlugin: () => SafePlugin<undefined>;
+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 {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-hyperlink",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "description": "Hyperlink plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,10 +34,11 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.8.0",
     "@atlaskit/analytics-next": "^9.2.0",
-    "@atlaskit/editor-common": "^78.22.0",
+    "@atlaskit/editor-common": "^78.27.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/icon": "^22.1.0",
+    "@atlaskit/platform-feature-flags": "^0.2.5",
     "@atlaskit/prosemirror-input-rules": "^3.0.0",
     "@babel/runtime": "^7.0.0",
     "uuid": "^3.1.0"
@@ -91,5 +92,12 @@
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
-  "platform-feature-flags": {}
+  "platform-feature-flags": {
+    "platform.linking-platform.prevent-suspicious-linkification": {
+      "type": "boolean"
+    },
+    "platform.editor.card.inject-settings-button": {
+      "type": "boolean"
+    }
+  }
 }