@atlaskit/editor-core 185.14.3 → 185.15.2

package/dist/cjs/plugins/{hyperlink → deprecated-hyperlink}/commands.js

@@ -4,71 +4,42 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.editInsertedLink = editInsertedLink;
-exports.hideLinkToolbar = hideLinkToolbar;
-exports.hideLinkToolbarSetMeta = hideLinkToolbarSetMeta;
 exports.insertLink = insertLink;
-exports.insertLinkWithAnalyticsMobileNative = exports.insertLinkWithAnalytics = void 0;
-exports.isLinkAtPos = isLinkAtPos;
-exports.isTextAtPos = isTextAtPos;
-exports.removeLink = removeLink;
-exports.setLinkHref = setLinkHref;
-exports.showLinkToolbar = showLinkToolbar;
+exports.stateKey = exports.insertLinkWithAnalyticsMobileNative = exports.insertLinkWithAnalytics = void 0;
 exports.updateLink = updateLink;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _card = require("@atlaskit/editor-common/card");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _link = require("@atlaskit/editor-common/link");
 var _utils = require("@atlaskit/editor-common/utils");
-var _main = require("./pm-plugins/main");
 var _prosemirrorState = require("prosemirror-state");
-var _commands = require("../../utils/commands");
-var _analytics = require("../analytics");
-var _analytics2 = require("@atlaskit/editor-common/analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _analytics2 = require("../analytics");
 var _doc = require("../card/pm-plugins/doc");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function isTextAtPos(pos) {
-  return function (state) {
-    var node = state.doc.nodeAt(pos);
-    return !!node && node.isText;
-  };
-}
-function isLinkAtPos(pos) {
-  return function (state) {
-    var node = state.doc.nodeAt(pos);
-    return !!node && !!state.schema.marks.link.isInSet(node.marks);
-  };
-}
-function setLinkHref(href, pos, to, isTabPressed) {
-  return (0, _commands.filter)(isTextAtPos(pos), function (state, dispatch) {
-    var $pos = state.doc.resolve(pos);
-    var node = state.doc.nodeAt(pos);
-    var linkMark = state.schema.marks.link;
-    var mark = linkMark.isInSet(node.marks);
-    var url = (0, _utils.normalizeUrl)(href);
-    if (mark && mark.attrs.href === url) {
-      return false;
-    }
-    var rightBound = to && pos !== to ? to : pos - $pos.textOffset + node.nodeSize;
-    var tr = state.tr.removeMark(pos, rightBound, linkMark);
-    if (href.trim()) {
-      tr.addMark(pos, rightBound, linkMark.create(_objectSpread(_objectSpread({}, mark && mark.attrs || {}), {}, {
-        href: url
-      })));
-    } else {
-      (0, _analytics.addAnalytics)(state, tr, (0, _analytics2.unlinkPayload)(_analytics2.ACTION_SUBJECT_ID.HYPERLINK));
-    }
-    if (!isTabPressed) {
-      tr.setMeta(_main.stateKey, {
-        type: _main.LinkAction.HIDE_TOOLBAR
-      });
-    }
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  });
-}
+// TODO: ED-17836 This workaround is used since we extracted the hyperlink plugin.
+// As soon as we deprecate the plugin we can delete this code.
+/**
+ * @deprecated
+ * Please do not use this key anymore it will be removed soon.
+ * Using plugin keys is a deprecated approach and if you need
+ * to access state use the Preset API in EditorNext.
+ */
+var stateKey = {
+  key: 'hyperlinkPlugin$',
+  getState: function getState(state) {
+    return state['hyperlinkPlugin$'];
+  }
+};
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to update the link please do it through the Preset
+ * API in EditorNext.
+ */
+exports.stateKey = stateKey;
 function updateLink(href, text, pos, to) {
   return function (state, dispatch) {
     var $pos = state.doc.resolve(pos);
@@ -93,8 +64,8 @@ function updateLink(href, text, pos, to) {
         href: url
       });
       tr.addMark(pos, pos + text.length, linkMark.create(linkAttrs));
-      tr.setMeta(_main.stateKey, {
-        type: _main.LinkAction.HIDE_TOOLBAR
+      tr.setMeta(stateKey, {
+        type: _link.LinkAction.HIDE_TOOLBAR
       });
     }
     if (dispatch) {
@@ -103,6 +74,13 @@ function updateLink(href, text, pos, to) {
     return true;
   };
 }
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to insert link please do it through the Preset
+ * API in EditorNext.
+ */
 function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   return function (state, dispatch) {
     var link = state.schema.marks.link;
@@ -112,12 +90,12 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
       var normalizedUrl = (0, _utils.normalizeUrl)(incomingHref);
       // NB: in this context, `currentText` represents text which has been
       // highlighted in the Editor, upon which a link is is being added.
-      var currentText = (_stateKey$getState = _main.stateKey.getState(state)) === null || _stateKey$getState === void 0 ? void 0 : _stateKey$getState.activeText;
+      var currentText = (_stateKey$getState = stateKey.getState(state)) === null || _stateKey$getState === void 0 ? void 0 : _stateKey$getState.activeText;
       var markEnd = to;
       var text = displayText || incomingTitle || incomingHref;
       if (!displayText || displayText !== currentText) {
         tr.insertText(text, from, to);
-        if (!isTextAtPos(from)(state)) {
+        if (!(0, _link.isTextAtPos)(from)(state)) {
           markEnd = from + text.length + 1;
         } else {
           markEnd = from + text.length;
@@ -128,27 +106,27 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
       }));
       tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(markEnd)));
       if (!displayText || displayText === incomingHref) {
-        (0, _doc.queueCardsFromChangedTr)(state, tr, source, _analytics2.ACTION.INSERTED, false, sourceEvent);
+        (0, _doc.queueCardsFromChangedTr)(state, tr, source, _analytics.ACTION.INSERTED, false, sourceEvent);
       } else if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor.fix-link-insert-analytics')) {
         /**
          * Add link metadata because queue cards would have otherwise handled this for us
          */
         (0, _card.addLinkMetadata)(state.selection, tr, {
-          action: _analytics2.ACTION.INSERTED,
+          action: _analytics.ACTION.INSERTED,
           inputMethod: source,
           sourceEvent: sourceEvent
         });
       }
-      tr.setMeta(_main.stateKey, {
-        type: _main.LinkAction.HIDE_TOOLBAR
+      tr.setMeta(stateKey, {
+        type: _link.LinkAction.HIDE_TOOLBAR
       });
       if (dispatch) {
         dispatch(tr);
       }
       return true;
     }
-    tr.setMeta(_main.stateKey, {
-      type: _main.LinkAction.HIDE_TOOLBAR
+    tr.setMeta(stateKey, {
+      type: _link.LinkAction.HIDE_TOOLBAR
     });
     if (dispatch) {
       dispatch(tr);
@@ -156,6 +134,13 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
     return false;
   };
 }
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to insert link please do it through the Preset
+ * API in EditorNext.
+ */
 var insertLinkWithAnalytics = function insertLinkWithAnalytics(inputMethod, from, to, href, title, displayText) {
   var cardsAvailable = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var sourceEvent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : undefined;
@@ -163,61 +148,17 @@ var insertLinkWithAnalytics = function insertLinkWithAnalytics(inputMethod, from
   if (cardsAvailable && !title && !displayText) {
     return insertLink(from, to, href, title, displayText, inputMethod, sourceEvent);
   }
-  return (0, _analytics.withAnalytics)((0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent));
+  return (0, _analytics2.withAnalytics)((0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod, sourceEvent));
 };
+
+/**
+ * @deprecated
+ * Please do not use this function anymore it will be removed soon.
+ * If you need to insert link please do it through the Preset
+ * API in EditorNext.
+ */
 exports.insertLinkWithAnalytics = insertLinkWithAnalytics;
 var insertLinkWithAnalyticsMobileNative = function insertLinkWithAnalyticsMobileNative(inputMethod, from, to, href, title, displayText) {
-  return (0, _analytics.withAnalytics)((0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod));
+  return (0, _analytics2.withAnalytics)((0, _utils.getLinkCreationAnalyticsEvent)(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod));
 };
-exports.insertLinkWithAnalyticsMobileNative = insertLinkWithAnalyticsMobileNative;
-function removeLink(pos) {
-  return (0, _card.commandWithMetadata)(setLinkHref('', pos), {
-    action: _analytics2.ACTION.UNLINK
-  });
-}
-function editInsertedLink() {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch((0, _analytics.addAnalytics)(state, state.tr.setMeta(_main.stateKey, {
-        type: _main.LinkAction.EDIT_INSERTED_TOOLBAR,
-        inputMethod: _analytics2.INPUT_METHOD.FLOATING_TB
-      }), (0, _analytics2.buildEditLinkPayload)(_analytics2.ACTION_SUBJECT_ID.HYPERLINK)));
-    }
-    return true;
-  };
-}
-function showLinkToolbar() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics2.INPUT_METHOD.TOOLBAR;
-  return function (state, dispatch) {
-    if (dispatch) {
-      var tr = state.tr.setMeta(_main.stateKey, {
-        type: _main.LinkAction.SHOW_INSERT_TOOLBAR,
-        inputMethod: inputMethod
-      });
-      tr = (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics2.ACTION.INVOKED,
-        actionSubject: _analytics2.ACTION_SUBJECT.TYPEAHEAD,
-        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
-        attributes: {
-          inputMethod: inputMethod
-        },
-        eventType: _analytics2.EVENT_TYPE.UI
-      });
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-function hideLinkToolbar() {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(hideLinkToolbarSetMeta(state.tr));
-    }
-    return true;
-  };
-}
-function hideLinkToolbarSetMeta(tr) {
-  return tr.setMeta(_main.stateKey, {
-    type: _main.LinkAction.HIDE_TOOLBAR
-  });
-}
+exports.insertLinkWithAnalyticsMobileNative = insertLinkWithAnalyticsMobileNative;

package/dist/cjs/plugins/emoji/index.js

@@ -21,7 +21,7 @@ var _emoji2 = require("@atlaskit/emoji");
 var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _asciiInputRules = require("./pm-plugins/ascii-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _assets = require("../quick-insert/assets");
+var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _emoji3 = require("./nodeviews/emoji");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _openTypeaheadAtCursor = require("../type-ahead/transforms/open-typeahead-at-cursor");
@@ -205,7 +205,7 @@ var emojiPlugin = function emojiPlugin(options, api) {
           priority: 500,
           keyshortcut: ':',
           icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_assets.IconEmoji, null);
+            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconEmoji, null);
           },
           action: function action(insert, state) {
             var _api$dependencies$ana8;

package/dist/cjs/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -15,7 +15,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _prosemirrorState = require("prosemirror-state");
-var _inputRules = require("../../../utils/input-rules");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("../../analytics");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -24,8 +23,8 @@ var matcher;
 function inputRulePlugin(schema, providerFactory, featureFlags) {
   if (schema.nodes.emoji && providerFactory) {
     initMatcher(providerFactory);
-    var asciiEmojiRule = (0, _inputRules.createRule)(AsciiEmojiMatcher.REGEX, inputRuleHandler);
-    return (0, _inputRules.createPlugin)('emoji', [asciiEmojiRule]);
+    var asciiEmojiRule = (0, _prosemirrorInputRules.createRule)(AsciiEmojiMatcher.REGEX, inputRuleHandler);
+    return (0, _prosemirrorInputRules.createPlugin)('emoji', [asciiEmojiRule]);
   }
   return;
 }

package/dist/cjs/plugins/expand/index.js

@@ -17,7 +17,7 @@ var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _main = require("./pm-plugins/main");
 var _keymap = require("./pm-plugins/keymap");
-var _assets = require("../quick-insert/assets");
+var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _analytics = require("../analytics");
 var _toolbar = require("./toolbar");
 var _commands = require("./commands");
@@ -67,7 +67,7 @@ var expandPlugin = function expandPlugin() {
           keywords: ['accordion', 'collapse'],
           priority: 600,
           icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_assets.IconExpand, null);
+            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconExpand, null);
           },
           action: function action(insert, state) {
             var node = (0, _commands.createExpandNode)(state);

package/dist/cjs/plugins/feedback-dialog/index.js

@@ -10,7 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
-var _assets = require("../quick-insert/assets");
+var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _versionWrapper = require("../../version-wrapper");
 var _analytics = require("../analytics");
 var _loadJiraCollectorDialogScript = _interopRequireDefault(require("./loadJiraCollectorDialogScript"));
@@ -102,7 +102,7 @@ var feedbackDialog = function feedbackDialog(feedbackInfo) {
           priority: 400,
           keywords: ['bug'],
           icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_assets.IconFeedback, null);
+            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFeedback, null);
           },
           action: function action(insert, state) {
             var tr = insert('');

package/dist/cjs/plugins/floating-toolbar/ui/Input.js

@@ -15,7 +15,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
-var _styles = require("../../../ui/PanelTextInput/styles");
+var _ui = require("@atlaskit/editor-common/ui");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -65,7 +65,7 @@ var TextField = /*#__PURE__*/function (_Component) {
       return (0, _react2.jsx)("form", {
         onSubmit: this.handleSubmit
       }, (0, _react2.jsx)("input", {
-        css: _styles.panelTextInput,
+        css: _ui.panelTextInput,
         value: this.state.text,
         onChange: this.handleChange,
         placeholder: placeholder,

package/dist/cjs/plugins/floating-toolbar/ui/Toolbar.js

@@ -33,7 +33,6 @@ var _ExtensionsPlaceholder = require("./ExtensionsPlaceholder");
 var _ColorPickerButton = _interopRequireDefault(require("../../../ui/ColorPickerButton"));
 var _ColorPalette = require("../../../ui/ColorPalette");
 var _EmojiPickerButton = require("./EmojiPickerButton");
-var _announcer = _interopRequireDefault(require("../../../utils/announcer/announcer"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = _interopRequireDefault(require("./messages"));
 var _commands2 = require("@atlaskit/editor-plugin-table/commands");
@@ -473,7 +472,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         role: "toolbar",
         "data-testid": "editor-floating-toolbar",
         className: className
-      }, (0, _react2.jsx)(_announcer.default, {
+      }, (0, _react2.jsx)(_ui.Announcer, {
         text: intl.formatMessage(_messages.default.floatingToolbarAnnouncer),
         delay: 250
       }), (0, _react2.jsx)("div", {

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.inputRulePlugin = inputRulePlugin;
-var _inputRules = require("../../../utils/input-rules");
+var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _utils = require("../utils");
 function inputRulePlugin(schema, featureFlags) {
   if (!schema.nodes.media || !schema.nodes.mediaSingle) {
@@ -13,7 +13,7 @@ function inputRulePlugin(schema, featureFlags) {
   }
 
   // ![something](link) should convert to an image
-  var imageRule = (0, _inputRules.createRule)(/!\[(.*)\]\((\S+)\)$/, function (state, match, start, end) {
+  var imageRule = (0, _prosemirrorInputRules.createRule)(/!\[(.*)\]\((\S+)\)$/, function (state, match, start, end) {
     var schema = state.schema;
     var attrs = {
       src: match[2],
@@ -25,7 +25,7 @@ function inputRulePlugin(schema, featureFlags) {
     }
     return null;
   });
-  return (0, _inputRules.createPlugin)('image-upload', [imageRule]);
+  return (0, _prosemirrorInputRules.createPlugin)('image-upload', [imageRule]);
 }
 var _default = inputRulePlugin;
 exports.default = _default;

package/dist/cjs/plugins/index.js

@@ -197,12 +197,6 @@ Object.defineProperty(exports, "historyPlugin", {
     return _history.default;
   }
 });
-Object.defineProperty(exports, "hyperlinkPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _hyperlink.default;
-  }
-});
 Object.defineProperty(exports, "imageUploadPlugin", {
   enumerable: true,
   get: function get() {
@@ -405,7 +399,6 @@ var _emoji = _interopRequireDefault(require("./emoji"));
 var _extension = _interopRequireDefault(require("./extension"));
 var _fakeTextCursor = _interopRequireDefault(require("./fake-text-cursor"));
 var _helpDialog = _interopRequireDefault(require("./help-dialog"));
-var _hyperlink = _interopRequireDefault(require("./hyperlink"));
 var _imageUpload = _interopRequireDefault(require("./image-upload"));
 var _insertBlock = _interopRequireDefault(require("./insert-block"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));

package/dist/cjs/plugins/insert-block/index.js

@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _main = require("../block-type/pm-plugins/main");
 var _pluginKey = require("../media/pm-plugins/plugin-key");
-var _main2 = require("../hyperlink/pm-plugins/main");
 var _utils = require("../type-ahead/utils");
 var _key = require("../mentions/pm-plugins/key");
 var _layout = require("../layout");
@@ -22,10 +21,10 @@ var _commands = require("../block-type/commands");
 var _commands2 = require("../image-upload/pm-plugins/commands");
 var _analytics = require("../analytics");
 var _pluginKey2 = require("../image-upload/pm-plugins/plugin-key");
-var _pluginKey3 = require("../date/pm-plugins/plugin-key");
-var _pluginKey4 = require("../placeholder-text/plugin-key");
-var _pluginKey5 = require("../macro/plugin-key");
+var _pluginKey3 = require("../placeholder-text/plugin-key");
+var _pluginKey4 = require("../macro/plugin-key");
 var _types = require("../../ui/Toolbar/types");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize) {
   switch (toolbarSize) {
     case _types.ToolbarSize.XXL:
@@ -67,76 +66,55 @@ var insertBlockPlugin = function insertBlockPlugin() {
         disabled = _ref.disabled,
         isToolbarReducedSpacing = _ref.isToolbarReducedSpacing,
         isLastItem = _ref.isLastItem;
-      var buttons = toolbarSizeToButtons(toolbarSize);
       var renderNode = function renderNode(providers) {
+        // We will slowly migrate these to use the new approach inside
+        // `ToolbarInsertBlockWithInjectionApi` and remove `WithPluginState`
         return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
           plugins: {
             typeAheadState: _key2.pluginKey,
             blockTypeState: _main.pluginKey,
             mediaState: _pluginKey.stateKey,
             mentionState: _key.mentionPluginKey,
-            macroState: _pluginKey5.pluginKey,
-            hyperlinkState: _main2.stateKey,
+            macroState: _pluginKey4.pluginKey,
             emojiState: _emoji.emojiPluginKey,
-            dateState: _pluginKey3.pluginKey,
             imageUpload: _pluginKey2.stateKey,
-            placeholderTextState: _pluginKey4.pluginKey,
+            placeholderTextState: _pluginKey3.pluginKey,
             layoutState: _layout.pluginKey
           },
           render: function render(_ref2) {
-            var _api$dependencies$ana;
             var mentionState = _ref2.mentionState,
               blockTypeState = _ref2.blockTypeState,
               mediaState = _ref2.mediaState,
               _ref2$macroState = _ref2.macroState,
               macroState = _ref2$macroState === void 0 ? {} : _ref2$macroState,
-              hyperlinkState = _ref2.hyperlinkState,
               emojiState = _ref2.emojiState,
-              dateState = _ref2.dateState,
               imageUpload = _ref2.imageUpload,
               placeholderTextState = _ref2.placeholderTextState,
               layoutState = _ref2.layoutState;
-            return /*#__PURE__*/_react.default.createElement(_ToolbarInsertBlock.default, {
+            return /*#__PURE__*/_react.default.createElement(ToolbarInsertBlockWithInjectionApi, {
               pluginInjectionApi: api,
-              buttons: buttons,
-              isReducedSpacing: isToolbarReducedSpacing,
-              isDisabled: disabled,
-              isTypeAheadAllowed: (0, _utils.isTypeAheadAllowed)(editorView.state),
               editorView: editorView,
-              tableSupported: !!editorView.state.schema.nodes.table,
-              actionSupported: !!editorView.state.schema.nodes.taskItem,
-              mentionsSupported: !!(mentionState && mentionState.mentionProvider),
-              decisionSupported: !!editorView.state.schema.nodes.decisionItem,
-              dateEnabled: !!dateState,
-              placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
-              layoutSectionEnabled: !!layoutState,
-              expandEnabled: !!options.allowExpand,
-              mediaUploadsEnabled: mediaState && mediaState.allowsUploads,
-              onShowMediaPicker: mediaState && mediaState.showMediaPicker,
-              mediaSupported: !!mediaState,
-              imageUploadSupported: !!imageUpload,
-              imageUploadEnabled: imageUpload && imageUpload.enabled,
-              handleImageUpload: _commands2.startImageUpload,
-              availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
-              linkSupported: !!hyperlinkState,
-              linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
-              emojiDisabled: !emojiState || !emojiState.emojiProvider,
-              emojiProvider: providers.emojiProvider,
-              nativeStatusSupported: options.nativeStatusSupported,
-              horizontalRuleEnabled: options.horizontalRuleEnabled,
-              onInsertBlockType: handleInsertBlockType(api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions),
-              onInsertMacroFromMacroBrowser: _macro.insertMacroFromMacroBrowser,
-              macroProvider: macroState.macroProvider,
+              editorActions: editorActions,
+              dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+              providerFactory: providerFactory,
               popupsMountPoint: popupsMountPoint,
               popupsBoundariesElement: popupsBoundariesElement,
               popupsScrollableElement: popupsScrollableElement,
-              insertMenuItems: options.insertMenuItems,
-              editorActions: editorActions,
-              dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-              replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
-              showElementBrowserLink: options.showElementBrowserLink,
-              showSeparator: !isLastItem && toolbarSize <= _types.ToolbarSize.S,
-              featureFlags: featureFlags
+              toolbarSize: toolbarSize,
+              disabled: disabled,
+              isToolbarReducedSpacing: isToolbarReducedSpacing,
+              isLastItem: isLastItem,
+              featureFlags: featureFlags,
+              mentionState: mentionState,
+              blockTypeState: blockTypeState,
+              mediaState: mediaState,
+              macroState: macroState,
+              emojiState: emojiState,
+              imageUpload: imageUpload,
+              placeholderTextState: placeholderTextState,
+              layoutState: layoutState,
+              providers: providers,
+              options: options
             });
           }
         });
@@ -149,5 +127,77 @@ var insertBlockPlugin = function insertBlockPlugin() {
     }
   };
 };
+function ToolbarInsertBlockWithInjectionApi(_ref3) {
+  var _pluginInjectionApi$d;
+  var editorView = _ref3.editorView,
+    editorActions = _ref3.editorActions,
+    dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
+    providerFactory = _ref3.providerFactory,
+    popupsMountPoint = _ref3.popupsMountPoint,
+    popupsBoundariesElement = _ref3.popupsBoundariesElement,
+    popupsScrollableElement = _ref3.popupsScrollableElement,
+    toolbarSize = _ref3.toolbarSize,
+    disabled = _ref3.disabled,
+    isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing,
+    isLastItem = _ref3.isLastItem,
+    providers = _ref3.providers,
+    pluginInjectionApi = _ref3.pluginInjectionApi,
+    options = _ref3.options,
+    mentionState = _ref3.mentionState,
+    blockTypeState = _ref3.blockTypeState,
+    mediaState = _ref3.mediaState,
+    macroState = _ref3.macroState,
+    emojiState = _ref3.emojiState,
+    imageUpload = _ref3.imageUpload,
+    placeholderTextState = _ref3.placeholderTextState,
+    layoutState = _ref3.layoutState,
+    featureFlags = _ref3.featureFlags;
+  var buttons = toolbarSizeToButtons(toolbarSize);
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['hyperlink', 'date']),
+    dateState = _useSharedPluginState.dateState,
+    hyperlinkState = _useSharedPluginState.hyperlinkState;
+  return /*#__PURE__*/_react.default.createElement(_ToolbarInsertBlock.default, {
+    pluginInjectionApi: pluginInjectionApi,
+    buttons: buttons,
+    isReducedSpacing: isToolbarReducedSpacing,
+    isDisabled: disabled,
+    isTypeAheadAllowed: (0, _utils.isTypeAheadAllowed)(editorView.state),
+    editorView: editorView,
+    tableSupported: !!editorView.state.schema.nodes.table,
+    actionSupported: !!editorView.state.schema.nodes.taskItem,
+    mentionsSupported: !!(mentionState && mentionState.mentionProvider),
+    decisionSupported: !!editorView.state.schema.nodes.decisionItem,
+    dateEnabled: !!dateState,
+    placeholderTextEnabled: placeholderTextState && placeholderTextState.allowInserting,
+    layoutSectionEnabled: !!layoutState,
+    expandEnabled: !!options.allowExpand,
+    mediaUploadsEnabled: mediaState && mediaState.allowsUploads,
+    onShowMediaPicker: mediaState && mediaState.showMediaPicker,
+    mediaSupported: !!mediaState,
+    imageUploadSupported: !!imageUpload,
+    imageUploadEnabled: imageUpload && imageUpload.enabled,
+    handleImageUpload: _commands2.startImageUpload,
+    availableWrapperBlockTypes: blockTypeState && blockTypeState.availableWrapperBlockTypes,
+    linkSupported: !!hyperlinkState,
+    linkDisabled: !hyperlinkState || !hyperlinkState.canInsertLink || !!hyperlinkState.activeLinkMark,
+    emojiDisabled: !emojiState || !emojiState.emojiProvider,
+    emojiProvider: providers.emojiProvider,
+    nativeStatusSupported: options.nativeStatusSupported,
+    horizontalRuleEnabled: options.horizontalRuleEnabled,
+    onInsertBlockType: handleInsertBlockType(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions),
+    onInsertMacroFromMacroBrowser: _macro.insertMacroFromMacroBrowser,
+    macroProvider: macroState.macroProvider,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    insertMenuItems: options.insertMenuItems,
+    editorActions: editorActions,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
+    showElementBrowserLink: options.showElementBrowserLink,
+    showSeparator: !isLastItem && toolbarSize <= _types.ToolbarSize.S,
+    featureFlags: featureFlags
+  });
+}
 var _default = insertBlockPlugin;
 exports.default = _default;