@atlaskit/editor-plugin-hyperlink 0.7.0 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 0.8.0
+
+### Minor Changes
+
+- [#66364](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66364) [`212c782cb7a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/212c782cb7a6) - No longer require `cardOptions` to be passed to the hyperlink plugin configuration, it exposes a new optional way to skip analytics via the prependToolbarButtons action.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.7.0
 
 ### Minor Changes

package/dist/cjs/Toolbar.js

@@ -238,18 +238,19 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                     onEscapeCallback: _commands.onEscapeCallback,
                     onClickAwayCallback: _commands.onClickAwayCallback,
                     onSubmit: function onSubmit(href) {
-                      var _options$cardOptions;
+                      var _toolbarKey$getState$2, _toolbarKey$getState2;
                       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 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, !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider), analytic);
+                      }) : (0, _commands.insertLinkWithAnalytics)(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
                       command(view.state, view.dispatch, view);
                       view.focus();
                     }

package/dist/cjs/plugin.js

@@ -61,10 +61,6 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
       return _main.stateKey.getState(editorState);
     },
     pmPlugins: function pmPlugins() {
-      var _options$cardOptions;
-      // Skip analytics if card provider is available, as they will be
-      // sent on handleRejected upon attempting to resolve smart link.
-      var skipAnalytics = !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider);
       return [{
         name: 'hyperlink',
         plugin: function plugin(_ref2) {
@@ -80,15 +76,14 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         name: 'hyperlinkInputRule',
         plugin: function plugin(_ref3) {
           var _api$analytics3;
-          var schema = _ref3.schema,
-            featureFlags = _ref3.featureFlags;
-          return (0, _inputRule.createInputRulePlugin)(schema, skipAnalytics, featureFlags, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+          var schema = _ref3.schema;
+          return (0, _inputRule.createInputRulePlugin)(schema, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
       }, {
         name: 'hyperlinkKeymap',
         plugin: function plugin() {
           var _api$analytics4;
-          return (0, _keymap.createKeymapPlugin)(skipAnalytics, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+          return (0, _keymap.createKeymapPlugin)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
         }
       }, {
         name: 'hyperlinkToolbarButtons',

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

@@ -12,11 +12,11 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
-function createLinkInputRule(regexp) {
-  var skipAnalytics = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var editorAnalyticsApi = arguments.length > 2 ? arguments[2] : undefined;
+var _toolbarButtons = require("./toolbar-buttons");
+function createLinkInputRule(regexp, editorAnalyticsApi) {
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return (0, _prosemirrorInputRules.createRule)(regexp, function (state, match, start, end) {
+    var _toolbarKey$getState$, _toolbarKey$getState;
     var schema = state.schema;
     if (state.doc.rangeHasMark(start, end, schema.marks.link)) {
       return null;
@@ -52,6 +52,7 @@ function createLinkInputRule(regexp) {
     (0, _card.addLinkMetadata)(state.selection, tr, {
       inputMethod: _analytics.INPUT_METHOD.AUTO_DETECT
     });
+    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;
     if (skipAnalytics) {
       return tr;
     }
@@ -59,17 +60,15 @@ function createLinkInputRule(regexp) {
     return tr;
   });
 }
-function createInputRulePlugin(schema) {
-  var skipAnalytics = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var featureFlags = arguments.length > 2 ? arguments[2] : undefined;
-  var editorAnalyticsApi = arguments.length > 3 ? arguments[3] : undefined;
+function createInputRulePlugin(schema, editorAnalyticsApi) {
   if (!schema.marks.link) {
     return;
   }
-  var urlWithASpaceRule = createLinkInputRule(_utils.LinkMatcher.create(), skipAnalytics, editorAnalyticsApi);
+  var urlWithASpaceRule = createLinkInputRule(_utils.LinkMatcher.create(), editorAnalyticsApi);
 
   // [something](link) should convert to a hyperlink
   var markdownLinkRule = (0, _prosemirrorInputRules.createRule)(/(^|[^!])\[(.*?)\]\((\S+)\)$/, function (state, match, start, end) {
+    var _toolbarKey$getState$2, _toolbarKey$getState2;
     var schema = state.schema;
     var _match = (0, _slicedToArray2.default)(match, 4),
       prefix = _match[1],
@@ -83,6 +82,7 @@ function createInputRulePlugin(schema) {
     (0, _card.addLinkMetadata)(state.selection, tr, {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     });
+    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;
     if (skipAnalytics) {
       return tr;
     }

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

@@ -13,13 +13,12 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _commands = require("../commands");
 var _main = require("../pm-plugins/main");
-function createKeymapPlugin() {
-  var skipAnalytics = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var editorAnalyticsApi = arguments.length > 1 ? arguments[1] : undefined;
+var _toolbarButtons = require("./toolbar-buttons");
+function createKeymapPlugin(editorAnalyticsApi) {
   var list = {};
   (0, _keymaps.bindKeymapWithEditorCommand)(_keymaps.addLink.common, (0, _commands.showLinkToolbar)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi), list);
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.enter.common, mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi), list);
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertNewLine.common, mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.enter.common, mayConvertLastWordToHyperlink(editorAnalyticsApi), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertNewLine.common, mayConvertLastWordToHyperlink(editorAnalyticsApi), list);
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.escape.common, function (state, dispatch, view) {
     var hyperlinkPlugin = _main.stateKey.getState(state);
     if (hyperlinkPlugin.activeLinkMark) {
@@ -33,8 +32,10 @@ function createKeymapPlugin() {
   }, list);
   return (0, _keymap.keymap)(list);
 }
-var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi) {
+var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
+    var _toolbarKey$getState$, _toolbarKey$getState;
+    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 nodeBefore = state.selection.$from.nodeBefore;
     if (!nodeBefore || !nodeBefore.isText || !nodeBefore.text) {
       return false;

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

@@ -11,13 +11,15 @@ var prependToolbarButtons = exports.prependToolbarButtons = function prependTool
   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
+    onInsertLinkCallback: onInsertLinkCallback,
+    skipAnalytics: skipAnalytics
   });
   dispatch(tr);
 };

package/dist/es2019/Toolbar.js

@@ -220,14 +220,15 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
                   onEscapeCallback: onEscapeCallback,
                   onClickAwayCallback: onClickAwayCallback,
                   onSubmit: (href, title = '', displayText, inputMethod, analytic) => {
-                    var _options$cardOptions;
+                    var _toolbarKey$getState$2, _toolbarKey$getState2;
                     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 command = isEdit ? commandWithMetadata(updateLink(href, displayText || title, activeLinkMark.pos), {
                       action,
                       inputMethod,
                       sourceEvent: analytic
-                    }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider), analytic);
+                    }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
                     command(view.state, view.dispatch, view);
                     view.focus();
                   }

package/dist/es2019/plugin.js

@@ -50,10 +50,6 @@ export const hyperlinkPlugin = ({
       return stateKey.getState(editorState);
     },
     pmPlugins() {
-      var _options$cardOptions;
-      // Skip analytics if card provider is available, as they will be
-      // sent on handleRejected upon attempting to resolve smart link.
-      const skipAnalytics = !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider);
       return [{
         name: 'hyperlink',
         plugin: ({
@@ -65,17 +61,16 @@ export const hyperlinkPlugin = ({
       }, {
         name: 'hyperlinkInputRule',
         plugin: ({
-          schema,
-          featureFlags
+          schema
         }) => {
           var _api$analytics3;
-          return createInputRulePlugin(schema, skipAnalytics, featureFlags, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+          return createInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
       }, {
         name: 'hyperlinkKeymap',
         plugin: () => {
           var _api$analytics4;
-          return createKeymapPlugin(skipAnalytics, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+          return createKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
         }
       }, {
         name: 'hyperlinkToolbarButtons',

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

@@ -2,9 +2,11 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { createPlugin, createRule } from '@atlaskit/prosemirror-input-rules';
-export function createLinkInputRule(regexp, skipAnalytics = false, editorAnalyticsApi) {
+import { toolbarKey } from './toolbar-buttons';
+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) => {
+    var _toolbarKey$getState$, _toolbarKey$getState;
     const {
       schema
     } = state;
@@ -42,6 +44,7 @@ export function createLinkInputRule(regexp, skipAnalytics = false, editorAnalyti
     addLinkMetadata(state.selection, tr, {
       inputMethod: INPUT_METHOD.AUTO_DETECT
     });
+    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;
     if (skipAnalytics) {
       return tr;
     }
@@ -49,14 +52,15 @@ export function createLinkInputRule(regexp, skipAnalytics = false, editorAnalyti
     return tr;
   });
 }
-export function createInputRulePlugin(schema, skipAnalytics = false, featureFlags, editorAnalyticsApi) {
+export function createInputRulePlugin(schema, editorAnalyticsApi) {
   if (!schema.marks.link) {
     return;
   }
-  const urlWithASpaceRule = createLinkInputRule(LinkMatcher.create(), skipAnalytics, editorAnalyticsApi);
+  const urlWithASpaceRule = createLinkInputRule(LinkMatcher.create(), editorAnalyticsApi);
 
   // [something](link) should convert to a hyperlink
   const markdownLinkRule = createRule(/(^|[^!])\[(.*?)\]\((\S+)\)$/, (state, match, start, end) => {
+    var _toolbarKey$getState$2, _toolbarKey$getState2;
     const {
       schema
     } = state;
@@ -69,6 +73,7 @@ export function createInputRulePlugin(schema, skipAnalytics = false, featureFlag
     addLinkMetadata(state.selection, tr, {
       inputMethod: INPUT_METHOD.FORMATTING
     });
+    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;
     if (skipAnalytics) {
       return tr;
     }

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

@@ -6,11 +6,12 @@ import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { hideLinkToolbar, showLinkToolbar } from '../commands';
 import { stateKey } from '../pm-plugins/main';
-export function createKeymapPlugin(skipAnalytics = false, editorAnalyticsApi) {
+import { toolbarKey } from './toolbar-buttons';
+export function createKeymapPlugin(editorAnalyticsApi) {
   const list = {};
   bindKeymapWithEditorCommand(addLink.common, showLinkToolbar(INPUT_METHOD.SHORTCUT, editorAnalyticsApi), list);
-  bindKeymapWithCommand(enter.common, mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi), list);
-  bindKeymapWithCommand(insertNewLine.common, mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi), list);
+  bindKeymapWithCommand(enter.common, mayConvertLastWordToHyperlink(editorAnalyticsApi), list);
+  bindKeymapWithCommand(insertNewLine.common, mayConvertLastWordToHyperlink(editorAnalyticsApi), list);
   bindKeymapWithCommand(escape.common, (state, dispatch, view) => {
     const hyperlinkPlugin = stateKey.getState(state);
     if (hyperlinkPlugin.activeLinkMark) {
@@ -24,8 +25,10 @@ export function createKeymapPlugin(skipAnalytics = false, editorAnalyticsApi) {
   }, list);
   return keymap(list);
 }
-const mayConvertLastWordToHyperlink = (skipAnalytics, editorAnalyticsApi) => {
+const mayConvertLastWordToHyperlink = editorAnalyticsApi => {
   return function (state, dispatch) {
+    var _toolbarKey$getState$, _toolbarKey$getState;
+    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 nodeBefore = state.selection.$from.nodeBefore;
     if (!nodeBefore || !nodeBefore.isText || !nodeBefore.text) {
       return false;

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

@@ -5,6 +5,7 @@ export const prependToolbarButtons = ({
   items,
   onEscapeCallback,
   onInsertLinkCallback,
+  skipAnalytics,
   view
 }) => {
   const {
@@ -16,7 +17,8 @@ export const prependToolbarButtons = ({
   tr.setMeta(toolbarKey, {
     items,
     onEscapeCallback,
-    onInsertLinkCallback
+    onInsertLinkCallback,
+    skipAnalytics
   });
   dispatch(tr);
 };

package/dist/esm/Toolbar.js

@@ -230,18 +230,19 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
                     onEscapeCallback: onEscapeCallback,
                     onClickAwayCallback: onClickAwayCallback,
                     onSubmit: function onSubmit(href) {
-                      var _options$cardOptions;
+                      var _toolbarKey$getState$2, _toolbarKey$getState2;
                       var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
                       var displayText = arguments.length > 2 ? arguments[2] : undefined;
                       var inputMethod = arguments.length > 3 ? arguments[3] : undefined;
                       var analytic = arguments.length > 4 ? arguments[4] : undefined;
                       var isEdit = isEditLink(activeLinkMark);
                       var action = isEdit ? ACTION.UPDATED : ACTION.INSERTED;
+                      var skipAnalytics = (_toolbarKey$getState$2 = (_toolbarKey$getState2 = toolbarKey.getState(state)) === null || _toolbarKey$getState2 === void 0 ? void 0 : _toolbarKey$getState2.skipAnalytics) !== null && _toolbarKey$getState$2 !== void 0 ? _toolbarKey$getState$2 : false;
                       var command = isEdit ? commandWithMetadata(updateLink(href, displayText || title, activeLinkMark.pos), {
                         action: action,
                         inputMethod: inputMethod,
                         sourceEvent: analytic
-                      }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider), analytic);
+                      }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, skipAnalytics, analytic);
                       command(view.state, view.dispatch, view);
                       view.focus();
                     }

package/dist/esm/plugin.js

@@ -54,10 +54,6 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
       return stateKey.getState(editorState);
     },
     pmPlugins: function pmPlugins() {
-      var _options$cardOptions;
-      // Skip analytics if card provider is available, as they will be
-      // sent on handleRejected upon attempting to resolve smart link.
-      var skipAnalytics = !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider);
       return [{
         name: 'hyperlink',
         plugin: function plugin(_ref2) {
@@ -73,15 +69,14 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         name: 'hyperlinkInputRule',
         plugin: function plugin(_ref3) {
           var _api$analytics3;
-          var schema = _ref3.schema,
-            featureFlags = _ref3.featureFlags;
-          return createInputRulePlugin(schema, skipAnalytics, featureFlags, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+          var schema = _ref3.schema;
+          return createInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
       }, {
         name: 'hyperlinkKeymap',
         plugin: function plugin() {
           var _api$analytics4;
-          return createKeymapPlugin(skipAnalytics, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+          return createKeymapPlugin(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
         }
       }, {
         name: 'hyperlinkToolbarButtons',

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

@@ -3,11 +3,11 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches, LinkMatcher, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { createPlugin, createRule } from '@atlaskit/prosemirror-input-rules';
-export function createLinkInputRule(regexp) {
-  var skipAnalytics = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var editorAnalyticsApi = arguments.length > 2 ? arguments[2] : undefined;
+import { toolbarKey } from './toolbar-buttons';
+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) {
+    var _toolbarKey$getState$, _toolbarKey$getState;
     var schema = state.schema;
     if (state.doc.rangeHasMark(start, end, schema.marks.link)) {
       return null;
@@ -43,6 +43,7 @@ export function createLinkInputRule(regexp) {
     addLinkMetadata(state.selection, tr, {
       inputMethod: INPUT_METHOD.AUTO_DETECT
     });
+    var skipAnalytics = (_toolbarKey$getState$ = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.skipAnalytics) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : false;
     if (skipAnalytics) {
       return tr;
     }
@@ -50,17 +51,15 @@ export function createLinkInputRule(regexp) {
     return tr;
   });
 }
-export function createInputRulePlugin(schema) {
-  var skipAnalytics = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var featureFlags = arguments.length > 2 ? arguments[2] : undefined;
-  var editorAnalyticsApi = arguments.length > 3 ? arguments[3] : undefined;
+export function createInputRulePlugin(schema, editorAnalyticsApi) {
   if (!schema.marks.link) {
     return;
   }
-  var urlWithASpaceRule = createLinkInputRule(LinkMatcher.create(), skipAnalytics, editorAnalyticsApi);
+  var urlWithASpaceRule = createLinkInputRule(LinkMatcher.create(), editorAnalyticsApi);
 
   // [something](link) should convert to a hyperlink
   var markdownLinkRule = createRule(/(^|[^!])\[(.*?)\]\((\S+)\)$/, function (state, match, start, end) {
+    var _toolbarKey$getState$2, _toolbarKey$getState2;
     var schema = state.schema;
     var _match = _slicedToArray(match, 4),
       prefix = _match[1],
@@ -74,6 +73,7 @@ export function createInputRulePlugin(schema) {
     addLinkMetadata(state.selection, tr, {
       inputMethod: INPUT_METHOD.FORMATTING
     });
+    var skipAnalytics = (_toolbarKey$getState$2 = (_toolbarKey$getState2 = toolbarKey.getState(state)) === null || _toolbarKey$getState2 === void 0 ? void 0 : _toolbarKey$getState2.skipAnalytics) !== null && _toolbarKey$getState$2 !== void 0 ? _toolbarKey$getState$2 : false;
     if (skipAnalytics) {
       return tr;
     }

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

@@ -6,13 +6,12 @@ import { findFilepaths, getLinkCreationAnalyticsEvent, isLinkInMatches } from '@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { hideLinkToolbar, showLinkToolbar } from '../commands';
 import { stateKey } from '../pm-plugins/main';
-export function createKeymapPlugin() {
-  var skipAnalytics = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  var editorAnalyticsApi = arguments.length > 1 ? arguments[1] : undefined;
+import { toolbarKey } from './toolbar-buttons';
+export function createKeymapPlugin(editorAnalyticsApi) {
   var list = {};
   bindKeymapWithEditorCommand(addLink.common, showLinkToolbar(INPUT_METHOD.SHORTCUT, editorAnalyticsApi), list);
-  bindKeymapWithCommand(enter.common, mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi), list);
-  bindKeymapWithCommand(insertNewLine.common, mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi), list);
+  bindKeymapWithCommand(enter.common, mayConvertLastWordToHyperlink(editorAnalyticsApi), list);
+  bindKeymapWithCommand(insertNewLine.common, mayConvertLastWordToHyperlink(editorAnalyticsApi), list);
   bindKeymapWithCommand(escape.common, function (state, dispatch, view) {
     var hyperlinkPlugin = stateKey.getState(state);
     if (hyperlinkPlugin.activeLinkMark) {
@@ -26,8 +25,10 @@ export function createKeymapPlugin() {
   }, list);
   return keymap(list);
 }
-var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(skipAnalytics, editorAnalyticsApi) {
+var mayConvertLastWordToHyperlink = function mayConvertLastWordToHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
+    var _toolbarKey$getState$, _toolbarKey$getState;
+    var skipAnalytics = (_toolbarKey$getState$ = (_toolbarKey$getState = toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.skipAnalytics) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : false;
     var nodeBefore = state.selection.$from.nodeBefore;
     if (!nodeBefore || !nodeBefore.isText || !nodeBefore.text) {
       return false;

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

@@ -5,13 +5,15 @@ export var prependToolbarButtons = function prependToolbarButtons(_ref) {
   var items = _ref.items,
     onEscapeCallback = _ref.onEscapeCallback,
     onInsertLinkCallback = _ref.onInsertLinkCallback,
+    skipAnalytics = _ref.skipAnalytics,
     view = _ref.view;
   var tr = view.state.tr,
     dispatch = view.dispatch;
   tr.setMeta(toolbarKey, {
     items: items,
     onEscapeCallback: onEscapeCallback,
-    onInsertLinkCallback: onInsertLinkCallback
+    onInsertLinkCallback: onInsertLinkCallback,
+    skipAnalytics: skipAnalytics
   });
   dispatch(tr);
 };

package/dist/types/plugin.d.ts

@@ -1,15 +1,11 @@
 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 { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
 import type { PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
-    dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<AnalyticsPlugin>
-    ];
+    dependencies: [OptionalPlugin<AnalyticsPlugin>];
     actions: {
         /**
          * Add items to the left of the hyperlink floating toolbar

package/dist/types/pm-plugins/input-rule.d.ts

@@ -1,8 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { InputRuleWrapper } from '@atlaskit/prosemirror-input-rules';
-export declare function createLinkInputRule(regexp: RegExp, skipAnalytics: boolean | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined): InputRuleWrapper;
-export declare function createInputRulePlugin(schema: Schema, skipAnalytics: boolean | undefined, featureFlags: FeatureFlags, editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
+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/keymap.d.ts

@@ -1,4 +1,4 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare function createKeymapPlugin(skipAnalytics: boolean | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
+export declare function createKeymapPlugin(editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
 export default createKeymapPlugin;

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

@@ -10,6 +10,12 @@ type HyperlinkToolbarItemsState = {
     items: GetToolbarItems;
     onEscapeCallback: ((tr: Transaction) => Transaction) | undefined;
     onInsertLinkCallback: QueueCardsFromTransactionAction | undefined;
+    /**
+     * If you are mounting your own items to the hyperlink toolbar you may decide
+     * you want to replace the hyperlink analytics with your own
+     * Defaults to false.
+     */
+    skipAnalytics?: boolean;
 };
 export declare const toolbarKey: PluginKey<HyperlinkToolbarItemsState | undefined>;
 type GetToolbarItems = (state: EditorState, intl: IntlShape, providerFactory: ProviderFactory, link: string) => FloatingToolbarItem<any>[];
@@ -17,6 +23,6 @@ interface PrependToolbarButtonsProps extends HyperlinkToolbarItemsState {
     view: EditorView;
 }
 export type PrependToolbarButtons = (props: PrependToolbarButtonsProps) => void;
-export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, view, }: PrependToolbarButtonsProps) => void;
+export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, skipAnalytics, view, }: PrependToolbarButtonsProps) => void;
 export declare const toolbarButtonsPlugin: () => SafePlugin<undefined>;
 export {};

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

@@ -1,13 +1,11 @@
 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 { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
 import type { PrependToolbarButtons } from './pm-plugins/toolbar-buttons';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
     dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
         OptionalPlugin<AnalyticsPlugin>
     ];
     actions: {

package/dist/types-ts4.5/pm-plugins/input-rule.d.ts

@@ -1,8 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { InputRuleWrapper } from '@atlaskit/prosemirror-input-rules';
-export declare function createLinkInputRule(regexp: RegExp, skipAnalytics: boolean | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined): InputRuleWrapper;
-export declare function createInputRulePlugin(schema: Schema, skipAnalytics: boolean | undefined, featureFlags: FeatureFlags, editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
+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/keymap.d.ts

@@ -1,4 +1,4 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare function createKeymapPlugin(skipAnalytics: boolean | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
+export declare function createKeymapPlugin(editorAnalyticsApi: EditorAnalyticsAPI | undefined): SafePlugin | undefined;
 export default createKeymapPlugin;

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

@@ -10,6 +10,12 @@ type HyperlinkToolbarItemsState = {
     items: GetToolbarItems;
     onEscapeCallback: ((tr: Transaction) => Transaction) | undefined;
     onInsertLinkCallback: QueueCardsFromTransactionAction | undefined;
+    /**
+     * If you are mounting your own items to the hyperlink toolbar you may decide
+     * you want to replace the hyperlink analytics with your own
+     * Defaults to false.
+     */
+    skipAnalytics?: boolean;
 };
 export declare const toolbarKey: PluginKey<HyperlinkToolbarItemsState | undefined>;
 type GetToolbarItems = (state: EditorState, intl: IntlShape, providerFactory: ProviderFactory, link: string) => FloatingToolbarItem<any>[];
@@ -17,6 +23,6 @@ interface PrependToolbarButtonsProps extends HyperlinkToolbarItemsState {
     view: EditorView;
 }
 export type PrependToolbarButtons = (props: PrependToolbarButtonsProps) => void;
-export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, view, }: PrependToolbarButtonsProps) => void;
+export declare const prependToolbarButtons: ({ items, onEscapeCallback, onInsertLinkCallback, skipAnalytics, view, }: PrependToolbarButtonsProps) => void;
 export declare const toolbarButtonsPlugin: () => SafePlugin<undefined>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-hyperlink",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Hyperlink plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,9 +34,8 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.3.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^76.36.0",
+    "@atlaskit/editor-common": "^76.37.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
-    "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/prosemirror-input-rules": "^2.4.0",