@atlaskit/editor-core 185.14.2 → 185.15.0

package/dist/esm/plugins/block-type/index.js

@@ -9,7 +9,7 @@ import WithPluginState from '../../ui/WithPluginState';
 import { setBlockTypeWithAnalytics } from './commands';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import * as keymaps from '../../keymaps';
-import { IconHeading, IconQuote } from '../quick-insert/assets';
+import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
 import { messages } from './messages';
 import { ToolbarSize } from '../../ui/Toolbar/types';
 var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {

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

@@ -1,10 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { createRule, createPlugin, createJoinNodesRule, createWrappingTextBlockRule, ruleWithAnalytics } from '../../../utils/input-rules';
+import { createJoinNodesRule, createWrappingTextBlockRule, ruleWithAnalytics } from '../../../utils/input-rules';
+import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../commands/transform-to-code-block';
 import { insertBlock } from '../commands/insert-block';
 import { safeInsert } from 'prosemirror-utils';
-import { INPUT_METHOD, ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '../../analytics';
+import { INPUT_METHOD, ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 var MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
   return {

package/dist/esm/plugins/block-type/pm-plugins/main.js

@@ -7,7 +7,7 @@ import { browser } from '@atlaskit/editor-common/utils';
 import { NORMAL_TEXT, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, BLOCK_QUOTE, CODE_BLOCK, PANEL, OTHER, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, HEADINGS_BY_LEVEL } from '../types';
 import { areBlockTypesDisabled } from '../../../utils';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';
-import { INPUT_METHOD } from '../../analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { HEADING_KEYS } from '../../../keymaps/consts';
 var blockTypeForNode = function blockTypeForNode(node, schema) {
   if (node.type === schema.nodes.heading) {

package/dist/esm/plugins/card/pm-plugins/mountHyperlink.js

@@ -29,6 +29,7 @@ export var mountHyperlinkPlugin = function mountHyperlinkPlugin(pluginInjectionA
             }];
           },
           onEscapeCallback: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.card.actions.hideLinkToolbar,
+          onInsertLinkCallback: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.card.actions.queueCardsFromChangedTr,
           view: editorView
         });
       });

package/dist/esm/plugins/card/ui/EditLinkToolbar.js

@@ -10,7 +10,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { withOuterListeners } from '@atlaskit/editor-common/ui';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
-import HyperlinkToolbar from '../../hyperlink/ui/HyperlinkAddToolbar';
+import { HyperlinkAddToolbar as HyperlinkToolbar } from '@atlaskit/editor-common/link';
 import { showLinkToolbar, hideLinkToolbar as _hideLinkToolbar, showDatasourceModal } from '../pm-plugins/actions';
 import { INPUT_METHOD, ACTION, buildEditLinkPayload } from '@atlaskit/editor-common/analytics';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
@@ -19,7 +19,41 @@ import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
 import { DatasourceModal } from './DatasourceModal';
-var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkAddToolbarWithState);
+export function HyperlinkAddToolbarWithState(_ref) {
+  var _ref$linkPickerOption = _ref.linkPickerOptions,
+    linkPickerOptions = _ref$linkPickerOption === void 0 ? {} : _ref$linkPickerOption,
+    onSubmit = _ref.onSubmit,
+    displayText = _ref.displayText,
+    displayUrl = _ref.displayUrl,
+    providerFactory = _ref.providerFactory,
+    view = _ref.view,
+    onCancel = _ref.onCancel,
+    invokeMethod = _ref.invokeMethod,
+    featureFlags = _ref.featureFlags,
+    onClose = _ref.onClose,
+    onEscapeCallback = _ref.onEscapeCallback,
+    onClickAwayCallback = _ref.onClickAwayCallback,
+    pluginInjectionApi = _ref.pluginInjectionApi;
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink']),
+    hyperlinkState = _useSharedPluginState.hyperlinkState;
+  return /*#__PURE__*/React.createElement(HyperlinkToolbar, {
+    linkPickerOptions: linkPickerOptions,
+    onSubmit: onSubmit,
+    displayText: displayText,
+    displayUrl: displayUrl,
+    providerFactory: providerFactory,
+    view: view,
+    onCancel: onCancel,
+    invokeMethod: invokeMethod,
+    featureFlags: featureFlags,
+    onClose: onClose,
+    onEscapeCallback: onEscapeCallback,
+    onClickAwayCallback: onClickAwayCallback,
+    hyperlinkPluginState: hyperlinkState
+  });
+}
 export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   _inherits(EditLinkToolbar, _React$Component);
   var _super = _createSuper(EditLinkToolbar);
@@ -68,8 +102,10 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
         text = _this$props2.text,
         view = _this$props2.view,
         featureFlags = _this$props2.featureFlags,
-        _onSubmit = _this$props2.onSubmit;
+        _onSubmit = _this$props2.onSubmit,
+        pluginInjectionApi = _this$props2.pluginInjectionApi;
       return /*#__PURE__*/React.createElement(HyperLinkToolbarWithListeners, {
+        pluginInjectionApi: pluginInjectionApi,
         view: view,
         linkPickerOptions: linkPickerOptions,
         providerFactory: providerFactory,
@@ -86,6 +122,25 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
           if (_onSubmit) {
             _onSubmit(href, displayText || title, inputMethod, analytic);
           }
+        },
+        onEscapeCallback: function onEscapeCallback(state, dispatch) {
+          var tr = state.tr;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.hyperlink.actions.hideLinkToolbar(tr);
+          _hideLinkToolbar(tr);
+          if (dispatch) {
+            dispatch(tr);
+            return true;
+          }
+          return false;
+        },
+        onClickAwayCallback: function onClickAwayCallback(state, dispatch) {
+          var tr = state.tr;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.hyperlink.actions.hideLinkToolbar(tr);
+          if (dispatch) {
+            dispatch(tr);
+            return true;
+          }
+          return false;
         }
       });
     }
@@ -108,12 +163,12 @@ export var editLink = function editLink(editorAnalyticsApi) {
     return false;
   };
 };
-export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
-  var providerFactory = _ref.providerFactory,
-    node = _ref.node,
-    linkPicker = _ref.linkPicker,
-    featureFlags = _ref.featureFlags,
-    pluginInjectionApi = _ref.pluginInjectionApi;
+export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref2) {
+  var providerFactory = _ref2.providerFactory,
+    node = _ref2.node,
+    linkPicker = _ref2.linkPicker,
+    featureFlags = _ref2.featureFlags,
+    pluginInjectionApi = _ref2.pluginInjectionApi;
   return {
     type: 'custom',
     disableArrowNavigation: true,
@@ -125,6 +180,7 @@ export var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
       }
       var displayInfo = displayInfoForCard(node, findCardInfo(view.state));
       return /*#__PURE__*/React.createElement(EditLinkToolbar, {
+        pluginInjectionApi: pluginInjectionApi,
         key: idx,
         view: view,
         linkPickerOptions: linkPicker,
@@ -183,10 +239,10 @@ export var editDatasource = function editDatasource(editorAnalyticsApi) {
     return false;
   };
 };
-export var openDatasourceModal = function openDatasourceModal(_ref2) {
-  var state = _ref2.state,
-    node = _ref2.node,
-    editorAnalyticsApi = _ref2.editorAnalyticsApi;
+export var openDatasourceModal = function openDatasourceModal(_ref3) {
+  var state = _ref3.state,
+    node = _ref3.node,
+    editorAnalyticsApi = _ref3.editorAnalyticsApi;
   return {
     type: 'custom',
     disableArrowNavigation: true,

package/dist/esm/plugins/code-block/index.js

@@ -9,7 +9,7 @@ import keymap from './pm-plugins/keymaps';
 import ideUX from './pm-plugins/ide-ux';
 import { codeBlockCopySelectionPlugin } from './pm-plugins/codeBlockCopySelectionPlugin';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { IconCode } from '../quick-insert/assets';
+import { IconCode } from '@atlaskit/editor-common/quick-insert';
 import { messages } from '../block-type/messages';
 import refreshBrowserSelectionOnChange from './refresh-browser-selection';
 // Theres an existing interelationship between these files, where the imported function is being called for code-block

package/dist/esm/plugins/code-block/pm-plugins/ide-ux.js

@@ -3,7 +3,7 @@ import { TextSelection } from 'prosemirror-state';
 import { keydownHandler } from 'prosemirror-keymap';
 import { setTextSelection } from 'prosemirror-utils';
 import { getCursor } from '../../../utils';
-import { filter } from '../../../utils/commands';
+import { filterCommands as filter } from '@atlaskit/editor-common/utils';
 import { isCursorBeforeClosingCharacter, isClosingCharacter } from '../ide-ux/paired-character-handling';
 import { getAutoClosingBracketInfo, shouldAutoCloseBracket } from '../ide-ux/bracket-handling';
 import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-handling';

package/dist/esm/plugins/date/index.js

@@ -5,7 +5,7 @@ import { date } from '@atlaskit/adf-schema';
 import { insertDate, closeDatePicker as _closeDatePicker, closeDatePickerWithAnalytics as _closeDatePickerWithAnalytics, createDate, deleteDate } from './actions';
 import createDatePlugin from './pm-plugins/main';
 import keymap from './pm-plugins/keymap';
-import { IconDate } from '../quick-insert/assets';
+import { IconDate } from '@atlaskit/editor-common/quick-insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { pluginKey as datePluginKey } from './pm-plugins/plugin-key';

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

@@ -1,57 +1,35 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
-import { addLinkMetadata, commandWithMetadata } from '@atlaskit/editor-common/card';
+import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { normalizeUrl, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
-import { stateKey, LinkAction } from './pm-plugins/main';
+import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
+import { getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from 'prosemirror-state';
-import { filter } from '../../utils/commands';
-import { addAnalytics, withAnalytics } from '../analytics';
-import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID, buildEditLinkPayload, unlinkPayload } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '../analytics';
 import { queueCardsFromChangedTr } from '../card/pm-plugins/doc';
-export function isTextAtPos(pos) {
-  return function (state) {
-    var node = state.doc.nodeAt(pos);
-    return !!node && node.isText;
-  };
-}
-export function isLinkAtPos(pos) {
-  return function (state) {
-    var node = state.doc.nodeAt(pos);
-    return !!node && !!state.schema.marks.link.isInSet(node.marks);
-  };
-}
-export function setLinkHref(href, pos, 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;
-    var mark = linkMark.isInSet(node.marks);
-    var url = 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 {
-      addAnalytics(state, tr, unlinkPayload(ACTION_SUBJECT_ID.HYPERLINK));
-    }
-    if (!isTabPressed) {
-      tr.setMeta(stateKey, {
-        type: 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.
+ */
+export 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.
+ */
 export function updateLink(href, text, pos, to) {
   return function (state, dispatch) {
     var $pos = state.doc.resolve(pos);
@@ -86,6 +64,13 @@ export 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.
+ */
 export function insertLink(from, to, incomingHref, incomingTitle, displayText, source, sourceEvent) {
   return function (state, dispatch) {
     var link = state.schema.marks.link;
@@ -139,6 +124,13 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
     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.
+ */
 export 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;
@@ -148,57 +140,13 @@ export var insertLinkWithAnalytics = function insertLinkWithAnalytics(inputMetho
   }
   return withAnalytics(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.
+ */
 export var insertLinkWithAnalyticsMobileNative = function insertLinkWithAnalyticsMobileNative(inputMethod, from, to, href, title, displayText) {
   return withAnalytics(getLinkCreationAnalyticsEvent(inputMethod, href))(insertLink(from, to, href, title, displayText, inputMethod));
-};
-export function removeLink(pos) {
-  return commandWithMetadata(setLinkHref('', pos), {
-    action: ACTION.UNLINK
-  });
-}
-export function editInsertedLink() {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(addAnalytics(state, state.tr.setMeta(stateKey, {
-        type: LinkAction.EDIT_INSERTED_TOOLBAR,
-        inputMethod: INPUT_METHOD.FLOATING_TB
-      }), buildEditLinkPayload(ACTION_SUBJECT_ID.HYPERLINK)));
-    }
-    return true;
-  };
-}
-export function showLinkToolbar() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.TOOLBAR;
-  return function (state, dispatch) {
-    if (dispatch) {
-      var tr = state.tr.setMeta(stateKey, {
-        type: LinkAction.SHOW_INSERT_TOOLBAR,
-        inputMethod: inputMethod
-      });
-      tr = addAnalytics(state, tr, {
-        action: ACTION.INVOKED,
-        actionSubject: ACTION_SUBJECT.TYPEAHEAD,
-        actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_LINK,
-        attributes: {
-          inputMethod: inputMethod
-        },
-        eventType: EVENT_TYPE.UI
-      });
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-export function hideLinkToolbar() {
-  return function (state, dispatch) {
-    if (dispatch) {
-      dispatch(hideLinkToolbarSetMeta(state.tr));
-    }
-    return true;
-  };
-}
-export function hideLinkToolbarSetMeta(tr) {
-  return tr.setMeta(stateKey, {
-    type: LinkAction.HIDE_TOOLBAR
-  });
-}
+};

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

@@ -11,7 +11,7 @@ import { EmojiTypeAheadItem, SearchSort, recordSelectionSucceededSli, recordSele
 import { getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import { inputRulePlugin as asciiInputRulePlugin } from './pm-plugins/ascii-input-rules';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { IconEmoji } from '../quick-insert/assets';
+import { IconEmoji } from '@atlaskit/editor-common/quick-insert';
 import { EmojiNodeView } from './nodeviews/emoji';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { openTypeAheadAtCursor } from '../type-ahead/transforms/open-typeahead-at-cursor';

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

@@ -8,7 +8,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import { PluginKey } from 'prosemirror-state';
-import { createRule, createPlugin } from '../../../utils/input-rules';
+import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../../analytics';
 var matcher;

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

@@ -3,7 +3,7 @@ import React from 'react';
 import { expand, nestedExpand } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
 import { expandKeymap } from './pm-plugins/keymap';
-import { IconExpand } from '../quick-insert/assets';
+import { IconExpand } from '@atlaskit/editor-common/quick-insert';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../analytics';
 import { getToolbarConfig } from './toolbar';
 import { createExpandNode } from './commands';

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

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
 import React from 'react';
-import { IconFeedback } from '../quick-insert/assets';
+import { IconFeedback } from '@atlaskit/editor-common/quick-insert';
 import { version as coreVersion } from '../../version-wrapper';
 import { addAnalytics, ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE } from '../analytics';
 import loadJiraCollectorDialogScript from './loadJiraCollectorDialogScript';

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

@@ -11,7 +11,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { jsx } from '@emotion/react';
 import { Component } from 'react';
-import { panelTextInput } from '../../../ui/PanelTextInput/styles';
+import { panelTextInput } from '@atlaskit/editor-common/ui';
 var TextField = /*#__PURE__*/function (_Component) {
   _inherits(TextField, _Component);
   var _super = _createSuper(TextField);

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

@@ -30,7 +30,7 @@ import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
 import ColorPickerButton from '../../../ui/ColorPickerButton';
 import { backgroundPaletteTooltipMessages } from '../../../ui/ColorPalette';
 import { EmojiPickerButton } from './EmojiPickerButton';
-import Announcer from '../../../utils/announcer/announcer';
+import { Announcer } from '@atlaskit/editor-common/ui';
 import { injectIntl } from 'react-intl-next';
 import messages from './messages';
 import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';

package/dist/esm/plugins/image-upload/pm-plugins/commands.js

@@ -21,7 +21,7 @@ export var insertExternalImage = function insertExternalImage(options) {
 export var startImageUpload = function startImageUpload(event) {
   return function (state, dispatch) {
     var pluginState = stateKey.getState(state);
-    if (!(pluginState !== null && pluginState !== void 0 && pluginState.enabled)) {
+    if (pluginState && !pluginState.enabled) {
       return false;
     }
     if (dispatch) {

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

@@ -1,4 +1,4 @@
-import { createRule, createPlugin } from '../../../utils/input-rules';
+import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { createExternalMediaNode } from '../utils';
 export function inputRulePlugin(schema, featureFlags) {
   if (!schema.nodes.media || !schema.nodes.mediaSingle) {

package/dist/esm/plugins/image-upload/pm-plugins/main.js

@@ -4,12 +4,11 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isPastedFile } from '../../../utils/clipboard';
-import { isDroppedFile } from '../../../utils/drag-drop';
+import { isClipboardEvent, isPastedFile } from '../../../utils/clipboard';
+import { isDragEvent, isDroppedFile } from '../../../utils/drag-drop';
 import { canInsertMedia, isMediaSelected } from '../utils';
 import { insertExternalImage, startImageUpload } from './commands';
 import { stateKey } from './plugin-key';
-
 /**
  * Microsoft Office includes a screenshot image when copying text content.
  *
@@ -42,16 +41,54 @@ var hasScreenshotImageFromMSOffice = function hasScreenshotImageFromMSOffice(ev)
   var isImagePNG = file.type === 'image/png' && file.name === 'image.png';
   return isImagePNG && textPlain && isOfficeXMLNamespace;
 };
-var createDOMHandler = function createDOMHandler(pred, eventName) {
+var createReferenceEventFromEvent = function createReferenceEventFromEvent(event) {
+  var _event$dataTransfer, _event$clipboardData;
+  if (!isDragEvent(event) && !isClipboardEvent(event)) {
+    return null;
+  }
+
+  // Get files list and early exit if files is undefined
+  var files = isDragEvent(event) ? (_event$dataTransfer = event.dataTransfer) === null || _event$dataTransfer === void 0 ? void 0 : _event$dataTransfer.files : (_event$clipboardData = event.clipboardData) === null || _event$clipboardData === void 0 ? void 0 : _event$clipboardData.files;
+  if (!files) {
+    return null;
+  }
+
+  // Convert filelist into an array
+  var filesArray = Array.from(files);
+
+  // Creating a new DataTransfer object should remove any mutation that could be possible from the original event
+  var dataTransfer = filesArray.reduce(function (acc, value) {
+    acc.items.add(value);
+    return acc;
+  }, new DataTransfer());
+  return _objectSpread(_objectSpread({
+    type: isDragEvent(event) ? 'drop' : 'paste'
+  }, isDragEvent(event) && {
+    dataTransfer: dataTransfer
+  }), isClipboardEvent(event) && {
+    clipboardData: dataTransfer
+  });
+};
+var createDOMHandler = function createDOMHandler(pred, _eventName, uploadHandlerReference) {
   return function (view, event) {
     if (!pred(event)) {
       return false;
     }
     var shouldUpload = !hasScreenshotImageFromMSOffice(event);
-    if (shouldUpload) {
+    var referenceEvent = createReferenceEventFromEvent(event);
+    if (shouldUpload && referenceEvent) {
       event.preventDefault();
       event.stopPropagation();
-      startImageUpload(event)(view.state, view.dispatch);
+
+      // Insert external image into document
+      if (uploadHandlerReference.current) {
+        uploadHandlerReference.current(referenceEvent, function (options) {
+          insertExternalImage(options)(view.state, view.dispatch);
+        });
+      }
+
+      // Start image upload
+      startImageUpload(referenceEvent)(view.state, view.dispatch);
     }
     return shouldUpload;
   };
@@ -68,7 +105,9 @@ var getNewActiveUpload = function getNewActiveUpload(tr, pluginState) {
 export var createPlugin = function createPlugin(_ref2) {
   var dispatch = _ref2.dispatch,
     providerFactory = _ref2.providerFactory;
-  var uploadHandler;
+  var uploadHandlerReference = {
+    current: null
+  };
   return new SafePlugin({
     state: {
       init: function init(_config, state) {
@@ -98,6 +137,7 @@ export var createPlugin = function createPlugin(_ref2) {
     view: function view() {
       var handleProvider = /*#__PURE__*/function () {
         var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(name, provider) {
+          var imageUploadProvider;
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -111,18 +151,19 @@ export var createPlugin = function createPlugin(_ref2) {
                 _context.next = 5;
                 return provider;
               case 5:
-                uploadHandler = _context.sent;
-                _context.next = 11;
+                imageUploadProvider = _context.sent;
+                uploadHandlerReference.current = imageUploadProvider;
+                _context.next = 12;
                 break;
-              case 8:
-                _context.prev = 8;
+              case 9:
+                _context.prev = 9;
                 _context.t0 = _context["catch"](2);
-                uploadHandler = undefined;
-              case 11:
+                uploadHandlerReference.current = null;
+              case 12:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[2, 8]]);
+          }, _callee, null, [[2, 9]]);
         }));
         return function handleProvider(_x, _x2) {
           return _ref3.apply(this, arguments);
@@ -130,30 +171,16 @@ export var createPlugin = function createPlugin(_ref2) {
       }();
       providerFactory.subscribe('imageUploadProvider', handleProvider);
       return {
-        update: function update(view, prevState) {
-          var editorState = view.state;
-          var currentState = stateKey.getState(editorState);
-
-          // if we've add a new upload to the state, execute the uploadHandler
-          var oldState = stateKey.getState(prevState);
-          if (currentState.activeUpload !== oldState.activeUpload && currentState.activeUpload && uploadHandler) {
-            var event = currentState.activeUpload.event;
-            if (!event || !hasScreenshotImageFromMSOffice(event)) {
-              uploadHandler(event, function (options) {
-                return insertExternalImage(options)(view.state, view.dispatch);
-              });
-            }
-          }
-        },
         destroy: function destroy() {
+          uploadHandlerReference.current = null;
           providerFactory.unsubscribe('imageUploadProvider', handleProvider);
         }
       };
     },
     props: {
       handleDOMEvents: {
-        drop: createDOMHandler(isDroppedFile, 'atlassian.editor.image.drop'),
-        paste: createDOMHandler(isPastedFile, 'atlassian.editor.image.paste')
+        drop: createDOMHandler(isDroppedFile, 'atlassian.editor.image.drop', uploadHandlerReference),
+        paste: createDOMHandler(isPastedFile, 'atlassian.editor.image.paste', uploadHandlerReference)
       }
     }
   });

package/dist/esm/plugins/index.js

@@ -9,7 +9,6 @@ export { default as emojiPlugin } from './emoji';
 export { default as extensionPlugin } from './extension';
 export { default as fakeTextCursorPlugin } from './fake-text-cursor';
 export { default as helpDialogPlugin } from './help-dialog';
-export { default as hyperlinkPlugin } from './hyperlink';
 export { default as imageUploadPlugin } from './image-upload';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';