npm - @atlaskit/editor-plugin-hyperlink - Versions diffs - 2.3.23 → 2.4.1 - Mend

@atlaskit/editor-plugin-hyperlink 2.3.23 → 2.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/CHANGELOG.md +18 -0
package/dist/cjs/commands.js +48 -27
package/dist/cjs/plugin.js +47 -9
package/dist/cjs/pm-plugins/main.js +38 -34
package/dist/es2019/commands.js +48 -26
package/dist/es2019/plugin.js +43 -10
package/dist/es2019/pm-plugins/main.js +41 -37
package/dist/esm/commands.js +47 -28
package/dist/esm/plugin.js +48 -10
package/dist/esm/pm-plugins/main.js +38 -34
package/dist/types/commands.d.ts +2 -0
package/dist/types/plugin.d.ts +31 -2
package/dist/types/pm-plugins/main.d.ts +3 -2
package/dist/types-ts4.5/commands.d.ts +2 -0
package/dist/types-ts4.5/plugin.d.ts +28 -2
package/dist/types-ts4.5/pm-plugins/main.d.ts +3 -2
package/package.json +4 -3

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-hyperlink
+## 2.4.1
+### Patch Changes
+- [#122063](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/122063)
+  [`c136e556d086d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c136e556d086d) -
+  [ux] Apply live page and check for live view in card and hyperlink plugin
+- Updated dependencies
+## 2.4.0
+### Minor Changes
+- [#121941](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/121941)
+  [`9db19df977817`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9db19df977817) -
+  Added new commands for hyperlink plugin: removeLink and updateLink. These can be used on an active
+  link to remove the hyperlink mark or update the text/href on the link.
 ## 2.3.23
 ### Patch Changes

package/dist/cjs/commands.js CHANGED Viewed

@@ -10,31 +10,40 @@ exports.hideLinkToolbarSetMeta = void 0;
 exports.insertLink = insertLink;
 exports.onEscapeCallback = exports.onClickAwayCallback = exports.insertLinkWithAnalytics = void 0;
 exports.removeLink = removeLink;
+exports.removeLinkEditorCommand = removeLinkEditorCommand;
 exports.setLinkHref = setLinkHref;
 exports.showLinkToolbar = showLinkToolbar;
 exports.updateLink = updateLink;
+exports.updateLinkEditorCommand = updateLinkEditorCommand;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _link = require("@atlaskit/editor-common/link");
+var _preset = require("@atlaskit/editor-common/preset");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _main = require("./pm-plugins/main");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
-  return (0, _utils.filterCommand)((0, _link.isTextAtPos)(pos), function (state, dispatch) {
-    var $pos = state.doc.resolve(pos);
-    var node = state.doc.nodeAt(pos);
-    var linkMark = state.schema.marks.link;
+function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    if (!(0, _link.isTextAtPos)(pos)({
+      tr: tr
+    })) {
+      return null;
+    }
+    var $pos = tr.doc.resolve(pos);
+    var node = tr.doc.nodeAt(pos);
+    var linkMark = tr.doc.type.schema.marks.link;
     var mark = linkMark.isInSet(node.marks);
     var url = (0, _utils.normalizeUrl)(href);
     if (mark && mark.attrs.href === url) {
-      return false;
+      return null;
     }
     var rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    var tr = state.tr.removeMark(pos, rightBound, linkMark);
+    tr.removeMark(pos, rightBound, linkMark);
     if (href.trim()) {
       tr.addMark(pos, rightBound, linkMark.create(_objectSpread(_objectSpread({}, mark && mark.attrs || {}), {}, {
         href: url
@@ -47,29 +56,29 @@ function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
         type: _link.LinkAction.HIDE_TOOLBAR
       });
     }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  });
+    return tr;
+  };
 }
-function updateLink(href, text, pos, to) {
-  return function (state, dispatch) {
-    var $pos = state.doc.resolve(pos);
-    var node = state.doc.nodeAt(pos);
+function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
+  return (0, _preset.editorCommandToPMCommand)(setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed));
+}
+function updateLinkEditorCommand(href, text, pos, to) {
+  return function (_ref2) {
+    var tr = _ref2.tr;
+    var $pos = tr.doc.resolve(pos);
+    var node = tr.doc.nodeAt(pos);
     if (!node) {
-      return false;
+      return null;
     }
     var url = (0, _utils.normalizeUrl)(href);
-    var mark = state.schema.marks.link.isInSet(node.marks);
-    var linkMark = state.schema.marks.link;
+    var mark = tr.doc.type.schema.marks.link.isInSet(node.marks);
+    var linkMark = tr.doc.type.schema.marks.link;
     var rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    var tr = state.tr;
     if (!url && text) {
       tr.removeMark(pos, rightBound, linkMark);
       tr.insertText(text, pos, rightBound);
     } else if (!url) {
-      return false;
+      return null;
     } else {
       tr.insertText(text, pos, rightBound);
       // Casting to LinkAttributes to prevent wrong attributes been passed (Example ED-7951)
@@ -81,12 +90,12 @@ function updateLink(href, text, pos, to) {
         type: _link.LinkAction.HIDE_TOOLBAR
       });
     }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    return tr;
   };
 }
+function updateLink(href, text, pos, to) {
+  return (0, _preset.editorCommandToPMCommand)(updateLinkEditorCommand(href, text, pos, to));
+}
 function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   var appearance = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 'inline';
   var cardApiActions = arguments.length > 8 ? arguments[8] : undefined;
@@ -166,6 +175,18 @@ function removeLink(pos, editorAnalyticsApi) {
     action: _analytics.ACTION.UNLINK
   });
 }
+function removeLinkEditorCommand(pos, editorAnalyticsApi) {
+  return function (_ref3) {
+    var tr = _ref3.tr;
+    setLinkHrefEditorCommand('', pos, editorAnalyticsApi)({
+      tr: tr
+    });
+    (0, _card.addLinkMetadata)(tr.selection, tr, {
+      action: _analytics.ACTION.UNLINK
+    });
+    return tr;
+  };
+}
 function editInsertedLink(editorAnalyticsApi) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -181,8 +202,8 @@ function editInsertedLink(editorAnalyticsApi) {
   };
 }
 function showLinkToolbar(inputMethod, editorAnalyticsApi) {
-  return function (_ref) {
-    var tr = _ref.tr;
+  return function (_ref4) {
+    var tr = _ref4.tr;
     var newTr = tr.setMeta(_main.stateKey, {
       type: _link.LinkAction.SHOW_INSERT_TOOLBAR,
       inputMethod: inputMethod

package/dist/cjs/plugin.js CHANGED Viewed

@@ -19,6 +19,19 @@ var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
 var _toolbarButtons = require("./pm-plugins/toolbar-buttons");
 var _Toolbar = require("./Toolbar");
+var getPosFromActiveLinkMark = function getPosFromActiveLinkMark(state) {
+  if (state === undefined) {
+    return undefined;
+  }
+  switch (state.type) {
+    case 'EDIT':
+    case 'EDIT_INSERTED':
+      return state.pos;
+    case 'INSERT':
+      return undefined;
+  }
+};
 /**
  * Hyperlink plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
@@ -40,16 +53,38 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         var _api$analytics;
         var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.TOOLBAR;
         return (0, _commands.showLinkToolbar)(inputMethod, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+      },
+      updateLink: function updateLink(href, text) {
+        var _api$hyperlink;
+        var linkMark = api === null || api === void 0 || (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 || (_api$hyperlink = _api$hyperlink.sharedState.currentState()) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.activeLinkMark;
+        var pos = getPosFromActiveLinkMark(linkMark);
+        if (pos === undefined) {
+          return function () {
+            return null;
+          };
+        }
+        return (0, _commands.updateLinkEditorCommand)(href, text, pos);
+      },
+      removeLink: function removeLink() {
+        var _api$hyperlink2, _api$analytics2;
+        var linkMark = api === null || api === void 0 || (_api$hyperlink2 = api.hyperlink) === null || _api$hyperlink2 === void 0 || (_api$hyperlink2 = _api$hyperlink2.sharedState.currentState()) === null || _api$hyperlink2 === void 0 ? void 0 : _api$hyperlink2.activeLinkMark;
+        var pos = getPosFromActiveLinkMark(linkMark);
+        if (pos === undefined) {
+          return function () {
+            return null;
+          };
+        }
+        return (0, _commands.removeLinkEditorCommand)(pos, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
       }
     },
     actions: {
       hideLinkToolbar: _commands.hideLinkToolbarSetMeta,
       insertLink: function insertLink(inputMethod, from, to, href, title, displayText) {
-        var _api$card, _api$analytics2;
+        var _api$card, _api$analytics3;
         var cardsAvailable = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
         var sourceEvent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : undefined;
         var appearance = arguments.length > 8 ? arguments[8] : undefined;
-        return (0, _commands.insertLinkWithAnalytics)(inputMethod, from, to, href, api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
+        return (0, _commands.insertLinkWithAnalytics)(inputMethod, from, to, href, api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
       },
       updateLink: _commands.updateLink
     },
@@ -65,7 +100,10 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch,
             getIntl = _ref2.getIntl;
-          return (0, _main.plugin)(dispatch, getIntl(), options === null || options === void 0 ? void 0 : options.editorAppearance);
+          return (
+            // @ts-ignore Temporary solution to check for Live Page editor.
+            (0, _main.plugin)(dispatch, getIntl(), options === null || options === void 0 ? void 0 : options.editorAppearance, api, options.__livePage)
+          );
         }
       }, {
         name: 'fakeCursorToolbarPlugin',
@@ -75,15 +113,15 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
       }, {
         name: 'hyperlinkInputRule',
         plugin: function plugin(_ref3) {
-          var _api$analytics3;
+          var _api$analytics4;
           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);
+          return (0, _inputRule.createInputRulePlugin)(schema, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
         }
       }, {
         name: 'hyperlinkKeymap',
         plugin: function plugin() {
-          var _api$analytics4;
-          return (0, _keymap.createKeymapPlugin)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+          var _api$analytics5;
+          return (0, _keymap.createKeymapPlugin)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
         }
       }, {
         name: 'hyperlinkToolbarButtons',
@@ -110,13 +148,13 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconLink, null);
           },
           action: function action(insert, state) {
-            var _api$analytics5, _api$analytics5$attac;
+            var _api$analytics6, _api$analytics6$attac;
             var tr = insert(undefined);
             tr.setMeta(_main.stateKey, {
               type: _link.LinkAction.SHOW_INSERT_TOOLBAR,
               inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
             });
-            var analyticsAttached = api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || (_api$analytics5$attac = _api$analytics5.attachAnalyticsEvent) === null || _api$analytics5$attac === void 0 ? void 0 : _api$analytics5$attac.call(_api$analytics5, {
+            var analyticsAttached = api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || (_api$analytics6$attac = _api$analytics6.attachAnalyticsEvent) === null || _api$analytics6$attac === void 0 ? void 0 : _api$analytics6$attac.call(_api$analytics6, {
               action: _analytics.ACTION.INVOKED,
               actionSubject: _analytics.ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,

package/dist/cjs/pm-plugins/main.js CHANGED Viewed

@@ -158,7 +158,7 @@ var getActiveText = function getActiveText(selection) {
   return;
 };
 var stateKey = exports.stateKey = new _state.PluginKey('hyperlinkPlugin');
-var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance) {
+var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance, pluginInjectionApi, __livePage) {
   return new _safePlugin.SafePlugin({
     state: {
       init: function init(_, state) {
@@ -193,7 +193,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance)
             timesViewed: state.timesViewed,
             searchSessionId: state.searchSessionId
           };
-          state = _objectSpread(_objectSpread({}, (0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages') && state), {}, {
+          state = _objectSpread(_objectSpread({}, __livePage && (0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages') && state), {}, {
             activeText: state.activeText,
             canInsertLink: state.canInsertLink,
             inputMethod: inputMethod,
@@ -201,39 +201,43 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance)
             editorAppearance: editorAppearance
           }, stateForAnalytics);
           if ((0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages')) {
-            if (action === _link3.LinkAction.SET_CONFIGURE_DROPDOWN_OPEN) {
-              var configureDropdownOpen = tr.getMeta(stateKey).isOpen;
-              // Hide overlay when the dropdown is closed (state is updated to false)
-              var decorations = configureDropdownOpen ? {} : {
-                decorations: _view.DecorationSet.empty
-              };
-              state = _objectSpread(_objectSpread(_objectSpread({}, state), decorations), {}, {
-                configureDropdownOpen: configureDropdownOpen
-              });
-            }
-            if (action === _link3.LinkAction.SET_CONFIGURE_BUTTON_TARGET_POS) {
-              var configureButtonTargetPos = tr.getMeta(stateKey).pos;
-              var targetPosHasChanged = pluginState.configureButtonTargetPos !== configureButtonTargetPos;
-              var _decorations = pluginState.decorations;
-              if (targetPosHasChanged && state.configureDropdownOpen !== true) {
-                if (configureButtonTargetPos === undefined) {
-                  _decorations = _view.DecorationSet.empty;
-                } else {
-                  var decoration = _view.Decoration.widget(configureButtonTargetPos, function (view) {
-                    return (0, _decorations2.ButtonWrapper)({
-                      editorView: view,
-                      pos: configureButtonTargetPos,
-                      stateKey: stateKey,
-                      intl: intl
+            var _pluginInjectionApi$e;
+            var isViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) === 'view';
+            if (__livePage && !isViewMode) {
+              if (action === _link3.LinkAction.SET_CONFIGURE_DROPDOWN_OPEN) {
+                var configureDropdownOpen = tr.getMeta(stateKey).isOpen;
+                // Hide overlay when the dropdown is closed (state is updated to false)
+                var decorations = configureDropdownOpen ? {} : {
+                  decorations: _view.DecorationSet.empty
+                };
+                state = _objectSpread(_objectSpread(_objectSpread({}, state), decorations), {}, {
+                  configureDropdownOpen: configureDropdownOpen
+                });
+              }
+              if (action === _link3.LinkAction.SET_CONFIGURE_BUTTON_TARGET_POS) {
+                var configureButtonTargetPos = tr.getMeta(stateKey).pos;
+                var targetPosHasChanged = pluginState.configureButtonTargetPos !== configureButtonTargetPos;
+                var _decorations = pluginState.decorations;
+                if (targetPosHasChanged && state.configureDropdownOpen !== true) {
+                  if (configureButtonTargetPos === undefined) {
+                    _decorations = _view.DecorationSet.empty;
+                  } else {
+                    var decoration = _view.Decoration.widget(configureButtonTargetPos, function (view) {
+                      return (0, _decorations2.ButtonWrapper)({
+                        editorView: view,
+                        pos: configureButtonTargetPos,
+                        stateKey: stateKey,
+                        intl: intl
+                      });
                     });
-                  });
-                  _decorations = _view.DecorationSet.create(newState.doc, [decoration]);
+                    _decorations = _view.DecorationSet.create(newState.doc, [decoration]);
+                  }
                 }
+                state = _objectSpread(_objectSpread({}, state), {}, {
+                  configureButtonTargetPos: configureButtonTargetPos,
+                  decorations: _decorations
+                });
               }
-              state = _objectSpread(_objectSpread({}, state), {}, {
-                configureButtonTargetPos: configureButtonTargetPos,
-                decorations: _decorations
-              });
             }
           }
         }
@@ -258,7 +262,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance)
     key: stateKey,
     props: _objectSpread({
       decorations: function decorations(state) {
-        if ((0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages')) {
+        if (__livePage && (0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages')) {
           var _stateKey$getState;
           var _ref = (_stateKey$getState = stateKey.getState(state)) !== null && _stateKey$getState !== void 0 ? _stateKey$getState : {},
             decorations = _ref.decorations;
@@ -297,7 +301,7 @@ var plugin = exports.plugin = function plugin(dispatch, intl, editorAppearance)
           return false;
         }
       }
-    }, (0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages') && {
+    }, __livePage && (0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages') && {
       markViews: {
         link: function link(mark, view, inline) {
           var toDOM = mark.type.spec.toDOM;

package/dist/es2019/commands.js CHANGED Viewed

@@ -2,21 +2,29 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, buildEditLinkPayload, EVENT_
 import { addLinkMetadata, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
-import { filterCommand as filter, getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
+import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { stateKey } from './pm-plugins/main';
-export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
-  return filter(isTextAtPos(pos), (state, dispatch) => {
-    const $pos = state.doc.resolve(pos);
-    const node = state.doc.nodeAt(pos);
-    const linkMark = state.schema.marks.link;
+function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {
+  return ({
+    tr
+  }) => {
+    if (!isTextAtPos(pos)({
+      tr
+    })) {
+      return null;
+    }
+    const $pos = tr.doc.resolve(pos);
+    const node = tr.doc.nodeAt(pos);
+    const linkMark = tr.doc.type.schema.marks.link;
     const mark = linkMark.isInSet(node.marks);
     const url = normalizeUrl(href);
     if (mark && mark.attrs.href === url) {
-      return false;
+      return null;
     }
     const rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    const tr = state.tr.removeMark(pos, rightBound, linkMark);
+    tr.removeMark(pos, rightBound, linkMark);
     if (href.trim()) {
       tr.addMark(pos, rightBound, linkMark.create({
         ...(mark && mark.attrs || {}),
@@ -30,29 +38,30 @@ export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
         type: LinkAction.HIDE_TOOLBAR
       });
     }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  });
+    return tr;
+  };
 }
-export function updateLink(href, text, pos, to) {
-  return (state, dispatch) => {
-    const $pos = state.doc.resolve(pos);
-    const node = state.doc.nodeAt(pos);
+export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
+  return editorCommandToPMCommand(setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed));
+}
+export function updateLinkEditorCommand(href, text, pos, to) {
+  return ({
+    tr
+  }) => {
+    const $pos = tr.doc.resolve(pos);
+    const node = tr.doc.nodeAt(pos);
     if (!node) {
-      return false;
+      return null;
     }
     const url = normalizeUrl(href);
-    const mark = state.schema.marks.link.isInSet(node.marks);
-    const linkMark = state.schema.marks.link;
+    const mark = tr.doc.type.schema.marks.link.isInSet(node.marks);
+    const linkMark = tr.doc.type.schema.marks.link;
     const rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    const tr = state.tr;
     if (!url && text) {
       tr.removeMark(pos, rightBound, linkMark);
       tr.insertText(text, pos, rightBound);
     } else if (!url) {
-      return false;
+      return null;
     } else {
       tr.insertText(text, pos, rightBound);
       // Casting to LinkAttributes to prevent wrong attributes been passed (Example ED-7951)
@@ -65,12 +74,12 @@ export function updateLink(href, text, pos, to) {
         type: LinkAction.HIDE_TOOLBAR
       });
     }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    return tr;
   };
 }
+export function updateLink(href, text, pos, to) {
+  return editorCommandToPMCommand(updateLinkEditorCommand(href, text, pos, to));
+}
 export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent, appearance = 'inline', cardApiActions) {
   return (state, dispatch) => {
     const link = state.schema.marks.link;
@@ -147,6 +156,19 @@ export function removeLink(pos, editorAnalyticsApi) {
     action: ACTION.UNLINK
   });
 }
+export function removeLinkEditorCommand(pos, editorAnalyticsApi) {
+  return ({
+    tr
+  }) => {
+    setLinkHrefEditorCommand('', pos, editorAnalyticsApi)({
+      tr
+    });
+    addLinkMetadata(tr.selection, tr, {
+      action: ACTION.UNLINK
+    });
+    return tr;
+  };
+}
 export function editInsertedLink(editorAnalyticsApi) {
   return (state, dispatch) => {
     if (dispatch) {

package/dist/es2019/plugin.js CHANGED Viewed

@@ -5,13 +5,26 @@ import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
 import { LinkAction } from '@atlaskit/editor-common/link';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconLink } from '@atlaskit/editor-common/quick-insert';
-import { hideLinkToolbarSetMeta, insertLinkWithAnalytics, showLinkToolbar, updateLink } from './commands';
+import { hideLinkToolbarSetMeta, insertLinkWithAnalytics, removeLinkEditorCommand, showLinkToolbar, updateLink, updateLinkEditorCommand } from './commands';
 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 { toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
 import { getToolbarConfig } from './Toolbar';
+const getPosFromActiveLinkMark = state => {
+  if (state === undefined) {
+    return undefined;
+  }
+  switch (state.type) {
+    case 'EDIT':
+    case 'EDIT_INSERTED':
+      return state.pos;
+    case 'INSERT':
+      return undefined;
+  }
+};
 /**
  * Hyperlink plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
@@ -32,13 +45,31 @@ export const hyperlinkPlugin = ({
       showLinkToolbar: (inputMethod = INPUT_METHOD.TOOLBAR) => {
         var _api$analytics;
         return showLinkToolbar(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+      },
+      updateLink: (href, text) => {
+        var _api$hyperlink, _api$hyperlink$shared;
+        const linkMark = api === null || api === void 0 ? void 0 : (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 ? void 0 : (_api$hyperlink$shared = _api$hyperlink.sharedState.currentState()) === null || _api$hyperlink$shared === void 0 ? void 0 : _api$hyperlink$shared.activeLinkMark;
+        const pos = getPosFromActiveLinkMark(linkMark);
+        if (pos === undefined) {
+          return () => null;
+        }
+        return updateLinkEditorCommand(href, text, pos);
+      },
+      removeLink: () => {
+        var _api$hyperlink2, _api$hyperlink2$share, _api$analytics2;
+        const linkMark = api === null || api === void 0 ? void 0 : (_api$hyperlink2 = api.hyperlink) === null || _api$hyperlink2 === void 0 ? void 0 : (_api$hyperlink2$share = _api$hyperlink2.sharedState.currentState()) === null || _api$hyperlink2$share === void 0 ? void 0 : _api$hyperlink2$share.activeLinkMark;
+        const pos = getPosFromActiveLinkMark(linkMark);
+        if (pos === undefined) {
+          return () => null;
+        }
+        return removeLinkEditorCommand(pos, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
       }
     },
     actions: {
       hideLinkToolbar: hideLinkToolbarSetMeta,
       insertLink: (inputMethod, from, to, href, title, displayText, cardsAvailable = false, sourceEvent = undefined, appearance) => {
-        var _api$card, _api$analytics2;
-        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 ? void 0 : (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
+        var _api$card, _api$analytics3;
+        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 ? void 0 : (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
       },
       updateLink: updateLink
     },
@@ -54,7 +85,9 @@ export const hyperlinkPlugin = ({
         plugin: ({
           dispatch,
           getIntl
-        }) => plugin(dispatch, getIntl(), options === null || options === void 0 ? void 0 : options.editorAppearance)
+        }) =>
+        // @ts-ignore Temporary solution to check for Live Page editor.
+        plugin(dispatch, getIntl(), options === null || options === void 0 ? void 0 : options.editorAppearance, api, options.__livePage)
       }, {
         name: 'fakeCursorToolbarPlugin',
         plugin: () => fakeCursorToolbarPlugin
@@ -63,14 +96,14 @@ export const hyperlinkPlugin = ({
         plugin: ({
           schema
         }) => {
-          var _api$analytics3;
-          return createInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+          var _api$analytics4;
+          return createInputRulePlugin(schema, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
         }
       }, {
         name: 'hyperlinkKeymap',
         plugin: () => {
-          var _api$analytics4;
-          return createKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+          var _api$analytics5;
+          return createKeymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
         }
       }, {
         name: 'hyperlinkToolbarButtons',
@@ -95,13 +128,13 @@ export const hyperlinkPlugin = ({
         keyshortcut: tooltip(addLink),
         icon: () => /*#__PURE__*/React.createElement(IconLink, null),
         action(insert, state) {
-          var _api$analytics5, _api$analytics5$actio, _api$analytics5$actio2;
+          var _api$analytics6, _api$analytics6$actio, _api$analytics6$actio2;
           const tr = insert(undefined);
           tr.setMeta(stateKey, {
             type: LinkAction.SHOW_INSERT_TOOLBAR,
             inputMethod: INPUT_METHOD.QUICK_INSERT
           });
-          const analyticsAttached = api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : (_api$analytics5$actio = _api$analytics5.actions) === null || _api$analytics5$actio === void 0 ? void 0 : (_api$analytics5$actio2 = _api$analytics5$actio.attachAnalyticsEvent) === null || _api$analytics5$actio2 === void 0 ? void 0 : _api$analytics5$actio2.call(_api$analytics5$actio, {
+          const analyticsAttached = api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : (_api$analytics6$actio = _api$analytics6.actions) === null || _api$analytics6$actio === void 0 ? void 0 : (_api$analytics6$actio2 = _api$analytics6$actio.attachAnalyticsEvent) === null || _api$analytics6$actio2 === void 0 ? void 0 : _api$analytics6$actio2.call(_api$analytics6$actio, {
             action: ACTION.INVOKED,
             actionSubject: ACTION_SUBJECT.TYPEAHEAD,
             actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_LINK,

package/dist/es2019/pm-plugins/main.js CHANGED Viewed

@@ -159,7 +159,7 @@ const getActiveText = selection => {
   return;
 };
 export const stateKey = new PluginKey('hyperlinkPlugin');
-export const plugin = (dispatch, intl, editorAppearance) => new SafePlugin({
+export const plugin = (dispatch, intl, editorAppearance, pluginInjectionApi, __livePage) => new SafePlugin({
   state: {
     init(_, state) {
       const canInsertLink = canLinkBeCreatedInRange(state.selection.from, state.selection.to)(state);
@@ -194,7 +194,7 @@ export const plugin = (dispatch, intl, editorAppearance) => new SafePlugin({
           searchSessionId: state.searchSessionId
         };
         state = {
-          ...(fg('platform.linking-platform.smart-links-in-live-pages') && state),
+          ...(__livePage && fg('platform.linking-platform.smart-links-in-live-pages') && state),
           activeText: state.activeText,
           canInsertLink: state.canInsertLink,
           inputMethod,
@@ -203,42 +203,46 @@ export const plugin = (dispatch, intl, editorAppearance) => new SafePlugin({
           ...stateForAnalytics
         };
         if (fg('platform.linking-platform.smart-links-in-live-pages')) {
-          if (action === LinkAction.SET_CONFIGURE_DROPDOWN_OPEN) {
-            const configureDropdownOpen = tr.getMeta(stateKey).isOpen;
-            // Hide overlay when the dropdown is closed (state is updated to false)
-            const decorations = configureDropdownOpen ? {} : {
-              decorations: DecorationSet.empty
-            };
-            state = {
-              ...state,
-              ...decorations,
-              configureDropdownOpen
-            };
-          }
-          if (action === LinkAction.SET_CONFIGURE_BUTTON_TARGET_POS) {
-            const configureButtonTargetPos = tr.getMeta(stateKey).pos;
-            const targetPosHasChanged = pluginState.configureButtonTargetPos !== configureButtonTargetPos;
-            let decorations = pluginState.decorations;
-            if (targetPosHasChanged && state.configureDropdownOpen !== true) {
-              if (configureButtonTargetPos === undefined) {
-                decorations = DecorationSet.empty;
-              } else {
-                const decoration = Decoration.widget(configureButtonTargetPos, view => {
-                  return ButtonWrapper({
-                    editorView: view,
-                    pos: configureButtonTargetPos,
-                    stateKey,
-                    intl
+          var _pluginInjectionApi$e, _pluginInjectionApi$e2;
+          const isViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.mode) === 'view';
+          if (__livePage && !isViewMode) {
+            if (action === LinkAction.SET_CONFIGURE_DROPDOWN_OPEN) {
+              const configureDropdownOpen = tr.getMeta(stateKey).isOpen;
+              // Hide overlay when the dropdown is closed (state is updated to false)
+              const decorations = configureDropdownOpen ? {} : {
+                decorations: DecorationSet.empty
+              };
+              state = {
+                ...state,
+                ...decorations,
+                configureDropdownOpen
+              };
+            }
+            if (action === LinkAction.SET_CONFIGURE_BUTTON_TARGET_POS) {
+              const configureButtonTargetPos = tr.getMeta(stateKey).pos;
+              const targetPosHasChanged = pluginState.configureButtonTargetPos !== configureButtonTargetPos;
+              let decorations = pluginState.decorations;
+              if (targetPosHasChanged && state.configureDropdownOpen !== true) {
+                if (configureButtonTargetPos === undefined) {
+                  decorations = DecorationSet.empty;
+                } else {
+                  const decoration = Decoration.widget(configureButtonTargetPos, view => {
+                    return ButtonWrapper({
+                      editorView: view,
+                      pos: configureButtonTargetPos,
+                      stateKey,
+                      intl
+                    });
                   });
-                });
-                decorations = DecorationSet.create(newState.doc, [decoration]);
+                  decorations = DecorationSet.create(newState.doc, [decoration]);
+                }
               }
+              state = {
+                ...state,
+                configureButtonTargetPos,
+                decorations
+              };
             }
-            state = {
-              ...state,
-              configureButtonTargetPos,
-              decorations
-            };
           }
         }
       }
@@ -263,7 +267,7 @@ export const plugin = (dispatch, intl, editorAppearance) => new SafePlugin({
   key: stateKey,
   props: {
     decorations: state => {
-      if (fg('platform.linking-platform.smart-links-in-live-pages')) {
+      if (__livePage && fg('platform.linking-platform.smart-links-in-live-pages')) {
         var _stateKey$getState;
         const {
           decorations
@@ -309,7 +313,7 @@ export const plugin = (dispatch, intl, editorAppearance) => new SafePlugin({
         return false;
       }
     },
-    ...(fg('platform.linking-platform.smart-links-in-live-pages') && {
+    ...(__livePage && fg('platform.linking-platform.smart-links-in-live-pages') && {
       markViews: {
         link: (mark, view, inline) => {
           const toDOM = mark.type.spec.toDOM;

package/dist/esm/commands.js CHANGED Viewed

@@ -5,21 +5,28 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, buildEditLinkPayload, EVENT_
 import { addLinkMetadata, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
-import { filterCommand as filter, getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
+import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { stateKey } from './pm-plugins/main';
-export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
-  return filter(isTextAtPos(pos), function (state, dispatch) {
-    var $pos = state.doc.resolve(pos);
-    var node = state.doc.nodeAt(pos);
-    var linkMark = state.schema.marks.link;
+function setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    if (!isTextAtPos(pos)({
+      tr: tr
+    })) {
+      return null;
+    }
+    var $pos = tr.doc.resolve(pos);
+    var node = tr.doc.nodeAt(pos);
+    var linkMark = tr.doc.type.schema.marks.link;
     var mark = linkMark.isInSet(node.marks);
     var url = normalizeUrl(href);
     if (mark && mark.attrs.href === url) {
-      return false;
+      return null;
     }
     var rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    var tr = state.tr.removeMark(pos, rightBound, linkMark);
+    tr.removeMark(pos, rightBound, linkMark);
     if (href.trim()) {
       tr.addMark(pos, rightBound, linkMark.create(_objectSpread(_objectSpread({}, mark && mark.attrs || {}), {}, {
         href: url
@@ -32,29 +39,29 @@ export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
         type: LinkAction.HIDE_TOOLBAR
       });
     }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  });
+    return tr;
+  };
 }
-export function updateLink(href, text, pos, to) {
-  return function (state, dispatch) {
-    var $pos = state.doc.resolve(pos);
-    var node = state.doc.nodeAt(pos);
+export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
+  return editorCommandToPMCommand(setLinkHrefEditorCommand(href, pos, editorAnalyticsApi, to, isTabPressed));
+}
+export function updateLinkEditorCommand(href, text, pos, to) {
+  return function (_ref2) {
+    var tr = _ref2.tr;
+    var $pos = tr.doc.resolve(pos);
+    var node = tr.doc.nodeAt(pos);
     if (!node) {
-      return false;
+      return null;
     }
     var url = normalizeUrl(href);
-    var mark = state.schema.marks.link.isInSet(node.marks);
-    var linkMark = state.schema.marks.link;
+    var mark = tr.doc.type.schema.marks.link.isInSet(node.marks);
+    var linkMark = tr.doc.type.schema.marks.link;
     var rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    var tr = state.tr;
     if (!url && text) {
       tr.removeMark(pos, rightBound, linkMark);
       tr.insertText(text, pos, rightBound);
     } else if (!url) {
-      return false;
+      return null;
     } else {
       tr.insertText(text, pos, rightBound);
       // Casting to LinkAttributes to prevent wrong attributes been passed (Example ED-7951)
@@ -66,12 +73,12 @@ export function updateLink(href, text, pos, to) {
         type: LinkAction.HIDE_TOOLBAR
       });
     }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    return tr;
   };
 }
+export function updateLink(href, text, pos, to) {
+  return editorCommandToPMCommand(updateLinkEditorCommand(href, text, pos, to));
+}
 export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   var appearance = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 'inline';
   var cardApiActions = arguments.length > 8 ? arguments[8] : undefined;
@@ -151,6 +158,18 @@ export function removeLink(pos, editorAnalyticsApi) {
     action: ACTION.UNLINK
   });
 }
+export function removeLinkEditorCommand(pos, editorAnalyticsApi) {
+  return function (_ref3) {
+    var tr = _ref3.tr;
+    setLinkHrefEditorCommand('', pos, editorAnalyticsApi)({
+      tr: tr
+    });
+    addLinkMetadata(tr.selection, tr, {
+      action: ACTION.UNLINK
+    });
+    return tr;
+  };
+}
 export function editInsertedLink(editorAnalyticsApi) {
   return function (state, dispatch) {
     if (dispatch) {
@@ -166,8 +185,8 @@ export function editInsertedLink(editorAnalyticsApi) {
   };
 }
 export function showLinkToolbar(inputMethod, editorAnalyticsApi) {
-  return function (_ref) {
-    var tr = _ref.tr;
+  return function (_ref4) {
+    var tr = _ref4.tr;
     var newTr = tr.setMeta(stateKey, {
       type: LinkAction.SHOW_INSERT_TOOLBAR,
       inputMethod: inputMethod

package/dist/esm/plugin.js CHANGED Viewed

@@ -5,13 +5,26 @@ import { addLink, tooltip } from '@atlaskit/editor-common/keymaps';
 import { LinkAction } from '@atlaskit/editor-common/link';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconLink } from '@atlaskit/editor-common/quick-insert';
-import { hideLinkToolbarSetMeta, insertLinkWithAnalytics, showLinkToolbar as _showLinkToolbar, updateLink } from './commands';
+import { hideLinkToolbarSetMeta, insertLinkWithAnalytics, removeLinkEditorCommand, showLinkToolbar as _showLinkToolbar, updateLink, updateLinkEditorCommand } from './commands';
 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 { toolbarButtonsPlugin } from './pm-plugins/toolbar-buttons';
 import { getToolbarConfig } from './Toolbar';
+var getPosFromActiveLinkMark = function getPosFromActiveLinkMark(state) {
+  if (state === undefined) {
+    return undefined;
+  }
+  switch (state.type) {
+    case 'EDIT':
+    case 'EDIT_INSERTED':
+      return state.pos;
+    case 'INSERT':
+      return undefined;
+  }
+};
 /**
  * Hyperlink plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
@@ -33,16 +46,38 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         var _api$analytics;
         var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.TOOLBAR;
         return _showLinkToolbar(inputMethod, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+      },
+      updateLink: function updateLink(href, text) {
+        var _api$hyperlink;
+        var linkMark = api === null || api === void 0 || (_api$hyperlink = api.hyperlink) === null || _api$hyperlink === void 0 || (_api$hyperlink = _api$hyperlink.sharedState.currentState()) === null || _api$hyperlink === void 0 ? void 0 : _api$hyperlink.activeLinkMark;
+        var pos = getPosFromActiveLinkMark(linkMark);
+        if (pos === undefined) {
+          return function () {
+            return null;
+          };
+        }
+        return updateLinkEditorCommand(href, text, pos);
+      },
+      removeLink: function removeLink() {
+        var _api$hyperlink2, _api$analytics2;
+        var linkMark = api === null || api === void 0 || (_api$hyperlink2 = api.hyperlink) === null || _api$hyperlink2 === void 0 || (_api$hyperlink2 = _api$hyperlink2.sharedState.currentState()) === null || _api$hyperlink2 === void 0 ? void 0 : _api$hyperlink2.activeLinkMark;
+        var pos = getPosFromActiveLinkMark(linkMark);
+        if (pos === undefined) {
+          return function () {
+            return null;
+          };
+        }
+        return removeLinkEditorCommand(pos, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
       }
     },
     actions: {
       hideLinkToolbar: hideLinkToolbarSetMeta,
       insertLink: function insertLink(inputMethod, from, to, href, title, displayText) {
-        var _api$card, _api$analytics2;
+        var _api$card, _api$analytics3;
         var cardsAvailable = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
         var sourceEvent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : undefined;
         var appearance = arguments.length > 8 ? arguments[8] : undefined;
-        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
+        return insertLinkWithAnalytics(inputMethod, from, to, href, api === null || api === void 0 || (_api$card = api.card) === null || _api$card === void 0 ? void 0 : _api$card.actions, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, title, displayText, cardsAvailable, sourceEvent, appearance);
       },
       updateLink: updateLink
     },
@@ -58,7 +93,10 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch,
             getIntl = _ref2.getIntl;
-          return _plugin(dispatch, getIntl(), options === null || options === void 0 ? void 0 : options.editorAppearance);
+          return (
+            // @ts-ignore Temporary solution to check for Live Page editor.
+            _plugin(dispatch, getIntl(), options === null || options === void 0 ? void 0 : options.editorAppearance, api, options.__livePage)
+          );
         }
       }, {
         name: 'fakeCursorToolbarPlugin',
@@ -68,15 +106,15 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
       }, {
         name: 'hyperlinkInputRule',
         plugin: function plugin(_ref3) {
-          var _api$analytics3;
+          var _api$analytics4;
           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);
+          return createInputRulePlugin(schema, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
         }
       }, {
         name: 'hyperlinkKeymap',
         plugin: function plugin() {
-          var _api$analytics4;
-          return createKeymapPlugin(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+          var _api$analytics5;
+          return createKeymapPlugin(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
         }
       }, {
         name: 'hyperlinkToolbarButtons',
@@ -103,13 +141,13 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
             return /*#__PURE__*/React.createElement(IconLink, null);
           },
           action: function action(insert, state) {
-            var _api$analytics5, _api$analytics5$attac;
+            var _api$analytics6, _api$analytics6$attac;
             var tr = insert(undefined);
             tr.setMeta(stateKey, {
               type: LinkAction.SHOW_INSERT_TOOLBAR,
               inputMethod: INPUT_METHOD.QUICK_INSERT
             });
-            var analyticsAttached = api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || (_api$analytics5$attac = _api$analytics5.attachAnalyticsEvent) === null || _api$analytics5$attac === void 0 ? void 0 : _api$analytics5$attac.call(_api$analytics5, {
+            var analyticsAttached = api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || (_api$analytics6$attac = _api$analytics6.attachAnalyticsEvent) === null || _api$analytics6$attac === void 0 ? void 0 : _api$analytics6$attac.call(_api$analytics6, {
               action: ACTION.INVOKED,
               actionSubject: ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_LINK,

package/dist/esm/pm-plugins/main.js CHANGED Viewed

@@ -151,7 +151,7 @@ var getActiveText = function getActiveText(selection) {
   return;
 };
 export var stateKey = new PluginKey('hyperlinkPlugin');
-export var plugin = function plugin(dispatch, intl, editorAppearance) {
+export var plugin = function plugin(dispatch, intl, editorAppearance, pluginInjectionApi, __livePage) {
   return new SafePlugin({
     state: {
       init: function init(_, state) {
@@ -186,7 +186,7 @@ export var plugin = function plugin(dispatch, intl, editorAppearance) {
             timesViewed: state.timesViewed,
             searchSessionId: state.searchSessionId
           };
-          state = _objectSpread(_objectSpread({}, fg('platform.linking-platform.smart-links-in-live-pages') && state), {}, {
+          state = _objectSpread(_objectSpread({}, __livePage && fg('platform.linking-platform.smart-links-in-live-pages') && state), {}, {
             activeText: state.activeText,
             canInsertLink: state.canInsertLink,
             inputMethod: inputMethod,
@@ -194,39 +194,43 @@ export var plugin = function plugin(dispatch, intl, editorAppearance) {
             editorAppearance: editorAppearance
           }, stateForAnalytics);
           if (fg('platform.linking-platform.smart-links-in-live-pages')) {
-            if (action === LinkAction.SET_CONFIGURE_DROPDOWN_OPEN) {
-              var configureDropdownOpen = tr.getMeta(stateKey).isOpen;
-              // Hide overlay when the dropdown is closed (state is updated to false)
-              var decorations = configureDropdownOpen ? {} : {
-                decorations: DecorationSet.empty
-              };
-              state = _objectSpread(_objectSpread(_objectSpread({}, state), decorations), {}, {
-                configureDropdownOpen: configureDropdownOpen
-              });
-            }
-            if (action === LinkAction.SET_CONFIGURE_BUTTON_TARGET_POS) {
-              var configureButtonTargetPos = tr.getMeta(stateKey).pos;
-              var targetPosHasChanged = pluginState.configureButtonTargetPos !== configureButtonTargetPos;
-              var _decorations = pluginState.decorations;
-              if (targetPosHasChanged && state.configureDropdownOpen !== true) {
-                if (configureButtonTargetPos === undefined) {
-                  _decorations = DecorationSet.empty;
-                } else {
-                  var decoration = Decoration.widget(configureButtonTargetPos, function (view) {
-                    return ButtonWrapper({
-                      editorView: view,
-                      pos: configureButtonTargetPos,
-                      stateKey: stateKey,
-                      intl: intl
+            var _pluginInjectionApi$e;
+            var isViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) === 'view';
+            if (__livePage && !isViewMode) {
+              if (action === LinkAction.SET_CONFIGURE_DROPDOWN_OPEN) {
+                var configureDropdownOpen = tr.getMeta(stateKey).isOpen;
+                // Hide overlay when the dropdown is closed (state is updated to false)
+                var decorations = configureDropdownOpen ? {} : {
+                  decorations: DecorationSet.empty
+                };
+                state = _objectSpread(_objectSpread(_objectSpread({}, state), decorations), {}, {
+                  configureDropdownOpen: configureDropdownOpen
+                });
+              }
+              if (action === LinkAction.SET_CONFIGURE_BUTTON_TARGET_POS) {
+                var configureButtonTargetPos = tr.getMeta(stateKey).pos;
+                var targetPosHasChanged = pluginState.configureButtonTargetPos !== configureButtonTargetPos;
+                var _decorations = pluginState.decorations;
+                if (targetPosHasChanged && state.configureDropdownOpen !== true) {
+                  if (configureButtonTargetPos === undefined) {
+                    _decorations = DecorationSet.empty;
+                  } else {
+                    var decoration = Decoration.widget(configureButtonTargetPos, function (view) {
+                      return ButtonWrapper({
+                        editorView: view,
+                        pos: configureButtonTargetPos,
+                        stateKey: stateKey,
+                        intl: intl
+                      });
                     });
-                  });
-                  _decorations = DecorationSet.create(newState.doc, [decoration]);
+                    _decorations = DecorationSet.create(newState.doc, [decoration]);
+                  }
                 }
+                state = _objectSpread(_objectSpread({}, state), {}, {
+                  configureButtonTargetPos: configureButtonTargetPos,
+                  decorations: _decorations
+                });
               }
-              state = _objectSpread(_objectSpread({}, state), {}, {
-                configureButtonTargetPos: configureButtonTargetPos,
-                decorations: _decorations
-              });
             }
           }
         }
@@ -251,7 +255,7 @@ export var plugin = function plugin(dispatch, intl, editorAppearance) {
     key: stateKey,
     props: _objectSpread({
       decorations: function decorations(state) {
-        if (fg('platform.linking-platform.smart-links-in-live-pages')) {
+        if (__livePage && fg('platform.linking-platform.smart-links-in-live-pages')) {
           var _stateKey$getState;
           var _ref = (_stateKey$getState = stateKey.getState(state)) !== null && _stateKey$getState !== void 0 ? _stateKey$getState : {},
             decorations = _ref.decorations;
@@ -290,7 +294,7 @@ export var plugin = function plugin(dispatch, intl, editorAppearance) {
           return false;
         }
       }
-    }, fg('platform.linking-platform.smart-links-in-live-pages') && {
+    }, __livePage && fg('platform.linking-platform.smart-links-in-live-pages') && {
       markViews: {
         link: function link(mark, view, inline) {
           var toDOM = mark.type.spec.toDOM;

package/dist/types/commands.d.ts CHANGED Viewed

@@ -7,11 +7,13 @@ import type { Command, EditorCommand, LinkInputType } from '@atlaskit/editor-com
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function setLinkHref(href: string, pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined, to?: number, isTabPressed?: boolean): Command;
 export type UpdateLink = (href: string, text: string, pos: number, to?: number) => Command;
+export declare function updateLinkEditorCommand(href: string, text: string, pos: number, to?: number): EditorCommand;
 export declare function updateLink(href: string, text: string, pos: number, to?: number): Command;
 export declare function insertLink(from: number, to: number, incomingHref: string, incomingTitle?: string, displayText?: string, source?: LinkInputType, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance, cardApiActions?: CardPluginActions): Command;
 export type InsertLink = (inputMethod: LinkInputType, from: number, to: number, href: string, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
 export declare const insertLinkWithAnalytics: (inputMethod: LinkInputType, from: number, to: number, href: string, cardActions: CardPluginActions | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
 export declare function removeLink(pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
+export declare function removeLinkEditorCommand(pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function editInsertedLink(editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
 type InputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.SHORTCUT | INPUT_METHOD.INSERT_MENU;
 export type ShowLinkToolbar = (inputMethod: InputMethod) => EditorCommand;

package/dist/types/plugin.d.ts CHANGED Viewed

@@ -1,11 +1,16 @@
 import type { HyperlinkState } from '@atlaskit/editor-common/link';
-import type { HyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, HyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { CardPlugin } from '@atlaskit/editor-plugin-card';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
-    dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<CardPlugin>];
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<CardPlugin>,
+        OptionalPlugin<EditorViewModePlugin>
+    ];
     actions: {
         hideLinkToolbar: HideLinkToolbar;
         insertLink: InsertLink;
@@ -24,6 +29,30 @@ export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
          * ```
          */
         showLinkToolbar: ShowLinkToolbar;
+        /**
+         * EditorCommand to edit the current active link.
+         *
+         * Example:
+         *
+         * ```
+         * api.core.actions.execute(
+         *   api.hyperlink.commands.updateLink(href, text)
+         * )
+         * ```
+         */
+        updateLink: (href: string, text: string) => EditorCommand;
+        /**
+         * EditorCommand to remove the current active link.
+         *
+         * Example:
+         *
+         * ```
+         * api.core.actions.execute(
+         *   api.hyperlink.commands.removeLink()
+         * )
+         * ```
+         */
+        removeLink: () => EditorCommand;
     };
     sharedState: HyperlinkState | undefined;
 }>;

package/dist/types/pm-plugins/main.d.ts CHANGED Viewed

@@ -2,7 +2,8 @@ import { type IntlShape } from 'react-intl-next';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { HyperlinkState } from '@atlaskit/editor-common/link';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { HyperlinkPlugin } from '../plugin';
 export declare const stateKey: PluginKey<HyperlinkState>;
-export declare const plugin: (dispatch: Dispatch, intl: IntlShape, editorAppearance?: EditorAppearance) => SafePlugin<HyperlinkState>;
+export declare const plugin: (dispatch: Dispatch, intl: IntlShape, editorAppearance?: EditorAppearance, pluginInjectionApi?: ExtractInjectionAPI<HyperlinkPlugin> | undefined, __livePage?: boolean) => SafePlugin<HyperlinkState>;

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

@@ -7,11 +7,13 @@ import type { Command, EditorCommand, LinkInputType } from '@atlaskit/editor-com
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare function setLinkHref(href: string, pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined, to?: number, isTabPressed?: boolean): Command;
 export type UpdateLink = (href: string, text: string, pos: number, to?: number) => Command;
+export declare function updateLinkEditorCommand(href: string, text: string, pos: number, to?: number): EditorCommand;
 export declare function updateLink(href: string, text: string, pos: number, to?: number): Command;
 export declare function insertLink(from: number, to: number, incomingHref: string, incomingTitle?: string, displayText?: string, source?: LinkInputType, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance, cardApiActions?: CardPluginActions): Command;
 export type InsertLink = (inputMethod: LinkInputType, from: number, to: number, href: string, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
 export declare const insertLinkWithAnalytics: (inputMethod: LinkInputType, from: number, to: number, href: string, cardActions: CardPluginActions | undefined, editorAnalyticsApi: EditorAnalyticsAPI | undefined, title?: string, displayText?: string, cardsAvailable?: boolean, sourceEvent?: UIAnalyticsEvent | null | undefined, appearance?: CardAppearance) => Command;
 export declare function removeLink(pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
+export declare function removeLinkEditorCommand(pos: number, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function editInsertedLink(editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
 type InputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.SHORTCUT | INPUT_METHOD.INSERT_MENU;
 export type ShowLinkToolbar = (inputMethod: InputMethod) => EditorCommand;

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

@@ -1,13 +1,15 @@
 import type { HyperlinkState } from '@atlaskit/editor-common/link';
-import type { HyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, HyperlinkPluginOptions, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { CardPlugin } from '@atlaskit/editor-plugin-card';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './commands';
 export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
     pluginConfiguration: HyperlinkPluginOptions | undefined;
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<CardPlugin>
+        OptionalPlugin<CardPlugin>,
+        OptionalPlugin<EditorViewModePlugin>
     ];
     actions: {
         hideLinkToolbar: HideLinkToolbar;
@@ -27,6 +29,30 @@ export type HyperlinkPlugin = NextEditorPlugin<'hyperlink', {
          * ```
          */
         showLinkToolbar: ShowLinkToolbar;
+        /**
+         * EditorCommand to edit the current active link.
+         *
+         * Example:
+         *
+         * ```
+         * api.core.actions.execute(
+         *   api.hyperlink.commands.updateLink(href, text)
+         * )
+         * ```
+         */
+        updateLink: (href: string, text: string) => EditorCommand;
+        /**
+         * EditorCommand to remove the current active link.
+         *
+         * Example:
+         *
+         * ```
+         * api.core.actions.execute(
+         *   api.hyperlink.commands.removeLink()
+         * )
+         * ```
+         */
+        removeLink: () => EditorCommand;
     };
     sharedState: HyperlinkState | undefined;
 }>;

package/dist/types-ts4.5/pm-plugins/main.d.ts CHANGED Viewed

@@ -2,7 +2,8 @@ import { type IntlShape } from 'react-intl-next';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { HyperlinkState } from '@atlaskit/editor-common/link';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { HyperlinkPlugin } from '../plugin';
 export declare const stateKey: PluginKey<HyperlinkState>;
-export declare const plugin: (dispatch: Dispatch, intl: IntlShape, editorAppearance?: EditorAppearance) => SafePlugin<HyperlinkState>;
+export declare const plugin: (dispatch: Dispatch, intl: IntlShape, editorAppearance?: EditorAppearance, pluginInjectionApi?: ExtractInjectionAPI<HyperlinkPlugin> | undefined, __livePage?: boolean) => SafePlugin<HyperlinkState>;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-hyperlink",
-	"version": "2.3.23",
+	"version": "2.4.1",
 	"description": "Hyperlink plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,9 +34,10 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/editor-common": "^86.2.0",
+		"@atlaskit/editor-common": "^86.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
-		"@atlaskit/editor-plugin-card": "2.6.3",
+		"@atlaskit/editor-plugin-card": "2.6.4",
+		"@atlaskit/editor-plugin-editor-viewmode": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/icon": "^22.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",