@atlaskit/editor-core 172.0.5 → 172.1.2

package/dist/cjs/plugins/code-block/ui/class-names.js

@@ -8,6 +8,8 @@ exports.codeBlockClassNames = void 0;
 var _styles = require("@atlaskit/editor-common/styles");
 
 var codeBlockClassNames = {
+  start: _styles.CodeBlockSharedCssClassName.CODEBLOCK_START,
+  end: _styles.CodeBlockSharedCssClassName.CODEBLOCK_END,
   gutter: _styles.CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER,
   content: _styles.CodeBlockSharedCssClassName.CODEBLOCK_CONTENT
 };

package/dist/cjs/plugins/feature-flags-context/feature-flags-from-props.js

@@ -43,7 +43,7 @@ function getSpellCheck(featureFlags) {
 
 
 function createFeatureFlagsFromProps(props) {
-  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$featureFlags9, _props$featureFlags10, _props$allowTables5, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$collabEdit, _props$collabEdit2, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38;
+  var _props$allowTextColor, _props$allowLayouts, _props$performanceTra, _props$performanceTra2, _props$featureFlags, _props$featureFlags2, _props$allowTables, _props$featureFlags3, _props$featureFlags4, _props$allowTables2, _props$featureFlags5, _props$featureFlags6, _props$allowTables3, _props$featureFlags7, _props$featureFlags8, _props$allowTables4, _props$allowTables5, _props$featureFlags9, _props$featureFlags10, _props$allowTables6, _props$allowExtension, _props$featureFlags11, _props$featureFlags12, _props$featureFlags13, _props$featureFlags14, _props$featureFlags15, _props$featureFlags16, _props$featureFlags17, _props$featureFlags18, _props$featureFlags19, _props$featureFlags20, _props$featureFlags21, _props$featureFlags22, _props$featureFlags23, _props$featureFlags24, _props$featureFlags25, _props$featureFlags26, _props$featureFlags27, _props$featureFlags28, _props$featureFlags29, _props$featureFlags30, _props$collabEdit, _props$collabEdit2, _props$featureFlags31, _props$featureFlags32, _props$featureFlags33, _props$featureFlags34, _props$featureFlags35, _props$featureFlags36, _props$featureFlags37, _props$featureFlags38, _props$featureFlags39;
 
   var normalizedFeatureFlags = (0, _normalizeFeatureFlags.normalizeFeatureFlags)(props.featureFlags);
   return _objectSpread(_objectSpread({}, normalizedFeatureFlags), {}, {
@@ -62,8 +62,8 @@ function createFeatureFlagsFromProps(props) {
     stickyHeadersOptimization: typeof ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.stickyHeadersOptimization) === 'boolean' ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.stickyHeadersOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables = props.allowTables) !== null && _props$allowTables !== void 0 && _props$allowTables.stickyHeadersOptimization),
     initialRenderOptimization: typeof ((_props$featureFlags3 = props.featureFlags) === null || _props$featureFlags3 === void 0 ? void 0 : _props$featureFlags3.initialRenderOptimization) === 'boolean' ? !!((_props$featureFlags4 = props.featureFlags) !== null && _props$featureFlags4 !== void 0 && _props$featureFlags4.initialRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables2 = props.allowTables) !== null && _props$allowTables2 !== void 0 && _props$allowTables2.initialRenderOptimization),
     mouseMoveOptimization: typeof ((_props$featureFlags5 = props.featureFlags) === null || _props$featureFlags5 === void 0 ? void 0 : _props$featureFlags5.mouseMoveOptimization) === 'boolean' ? !!((_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.mouseMoveOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables3 = props.allowTables) !== null && _props$allowTables3 !== void 0 && _props$allowTables3.mouseMoveOptimization),
-    tableRenderOptimization: typeof ((_props$featureFlags7 = props.featureFlags) === null || _props$featureFlags7 === void 0 ? void 0 : _props$featureFlags7.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.tableRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables4 = props.allowTables) !== null && _props$allowTables4 !== void 0 && _props$allowTables4.tableRenderOptimization),
-    tableOverflowShadowsOptimization: typeof ((_props$featureFlags9 = props.featureFlags) === null || _props$featureFlags9 === void 0 ? void 0 : _props$featureFlags9.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.tableOverflowShadowsOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables5 = props.allowTables) !== null && _props$allowTables5 !== void 0 && _props$allowTables5.tableOverflowShadowsOptimization),
+    tableRenderOptimization: typeof ((_props$featureFlags7 = props.featureFlags) === null || _props$featureFlags7 === void 0 ? void 0 : _props$featureFlags7.tableRenderOptimization) === 'boolean' ? !!((_props$featureFlags8 = props.featureFlags) !== null && _props$featureFlags8 !== void 0 && _props$featureFlags8.tableRenderOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && typeof ((_props$allowTables4 = props.allowTables) === null || _props$allowTables4 === void 0 ? void 0 : _props$allowTables4.tableRenderOptimization) === 'boolean' ? (_props$allowTables5 = props.allowTables) === null || _props$allowTables5 === void 0 ? void 0 : _props$allowTables5.tableRenderOptimization : true,
+    tableOverflowShadowsOptimization: typeof ((_props$featureFlags9 = props.featureFlags) === null || _props$featureFlags9 === void 0 ? void 0 : _props$featureFlags9.tableOverflowShadowsOptimization) === 'boolean' ? !!((_props$featureFlags10 = props.featureFlags) !== null && _props$featureFlags10 !== void 0 && _props$featureFlags10.tableOverflowShadowsOptimization) : (0, _typeof2.default)(props.allowTables) === 'object' && !!((_props$allowTables6 = props.allowTables) !== null && _props$allowTables6 !== void 0 && _props$allowTables6.tableOverflowShadowsOptimization),
     extendFloatingToolbar: Boolean((0, _typeof2.default)(props.allowExtension) === 'object' && ((_props$allowExtension = props.allowExtension) === null || _props$allowExtension === void 0 ? void 0 : _props$allowExtension.allowExtendFloatingToolbars)),
     useUnpredictableInputRule: Boolean(typeof ((_props$featureFlags11 = props.featureFlags) === null || _props$featureFlags11 === void 0 ? void 0 : _props$featureFlags11.useUnpredictableInputRule) === 'boolean' ? !!((_props$featureFlags12 = props.featureFlags) !== null && _props$featureFlags12 !== void 0 && _props$featureFlags12.useUnpredictableInputRule) : props.UNSAFE_allowUndoRedoButtons ? false : true),
     showAvatarGroupAsPlugin: Boolean(typeof ((_props$featureFlags13 = props.featureFlags) === null || _props$featureFlags13 === void 0 ? void 0 : _props$featureFlags13.showAvatarGroupAsPlugin) === 'boolean' ? !!((_props$featureFlags14 = props.featureFlags) !== null && _props$featureFlags14 !== void 0 && _props$featureFlags14.showAvatarGroupAsPlugin) : false),
@@ -81,6 +81,7 @@ function createFeatureFlagsFromProps(props) {
     showHoverPreview: Boolean(typeof ((_props$featureFlags33 = props.featureFlags) === null || _props$featureFlags33 === void 0 ? void 0 : _props$featureFlags33.showHoverPreview) === 'boolean' ? !!((_props$featureFlags34 = props.featureFlags) !== null && _props$featureFlags34 !== void 0 && _props$featureFlags34.showHoverPreview) : false),
     indentationButtonsInTheToolbar: Boolean(typeof normalizedFeatureFlags.indentationButtonsInTheToolbar === 'boolean' && !!normalizedFeatureFlags.indentationButtonsInTheToolbar || (typeof ((_props$featureFlags35 = props.featureFlags) === null || _props$featureFlags35 === void 0 ? void 0 : _props$featureFlags35.indentationButtonsInTheToolbar) === 'boolean' ? !!((_props$featureFlags36 = props.featureFlags) !== null && _props$featureFlags36 !== void 0 && _props$featureFlags36.indentationButtonsInTheToolbar) : false)),
     floatingToolbarCopyButton: Boolean(typeof normalizedFeatureFlags.floatingToolbarCopyButton === 'boolean' && !!normalizedFeatureFlags.floatingToolbarCopyButton || (typeof ((_props$featureFlags37 = props.featureFlags) === null || _props$featureFlags37 === void 0 ? void 0 : _props$featureFlags37.floatingToolbarCopyButton) === 'boolean' ? !!((_props$featureFlags38 = props.featureFlags) !== null && _props$featureFlags38 !== void 0 && _props$featureFlags38.floatingToolbarCopyButton) : false)),
+    floatingToolbarLinkSettingsButton: typeof ((_props$featureFlags39 = props.featureFlags) === null || _props$featureFlags39 === void 0 ? void 0 : _props$featureFlags39['floating-toolbar-link-settings-button']) === 'string' ? props.featureFlags['floating-toolbar-link-settings-button'] || undefined : undefined,
     disableSpellcheckByBrowser: getSpellCheck(props.featureFlags)
   });
 }

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

@@ -27,6 +27,8 @@ var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 
 var _EditorEmojiAddIcon = _interopRequireDefault(require("./EditorEmojiAddIcon"));
 
+var _withOuterListeners = _interopRequireDefault(require("../../../ui/with-outer-listeners"));
+
 var _templateObject, _templateObject2;
 
 // helps adjusts position of popup
@@ -44,7 +46,7 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
       isPopupOpen = _React$useState2[0],
       setIsPopupOpen = _React$useState2[1];
 
-  var EmojiPickerWithListener = (0, _ui.withOuterListeners)(_emoji.EmojiPicker);
+  var EmojiPickerWithListener = (0, _withOuterListeners.default)(_emoji.EmojiPicker);
 
   var togglePopup = function togglePopup() {
     setIsPopupOpen(!isPopupOpen);

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

@@ -63,6 +63,8 @@ var _messages = _interopRequireDefault(require("./messages"));
 
 var _tokens = require("@atlaskit/tokens");
 
+var _decoration = require("../../base/pm-plugins/decoration");
+
 var _templateObject, _templateObject2;
 
 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); }
@@ -175,6 +177,44 @@ var Toolbar = /*#__PURE__*/function (_Component) {
   }
 
   (0, _createClass2.default)(Toolbar, [{
+    key: "resetStyling",
+    value: // remove any decorations added by toolbar buttons i.e danger and selected styling
+    // this prevents https://product-fabric.atlassian.net/browse/ED-10207
+    function resetStyling(_ref) {
+      var table = _ref.table;
+
+      if (this.props.editorView) {
+        var _this$props$editorVie = this.props.editorView,
+            state = _this$props$editorVie.state,
+            dispatch = _this$props$editorVie.dispatch; // tables use their own decorations
+        // TODO fix for tables https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-617
+
+        if (table) {
+          return null;
+        }
+
+        dispatch(state.tr.setMeta(_decoration.decorationStateKey, {
+          action: _decoration.ACTIONS.DECORATION_REMOVE
+        }));
+      }
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (this.props.node !== prevProps.node) {
+        this.resetStyling({
+          table: (prevProps === null || prevProps === void 0 ? void 0 : prevProps.node.type.name) === 'table'
+        });
+      }
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.resetStyling({
+        table: this.props.node.type.name === 'table'
+      });
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -345,8 +385,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
               return null;
             }
 
-            var _ref = (0, _featureFlagsContext.getFeatureFlags)(editorView.state) || {},
-                extendFloatingToolbar = _ref.extendFloatingToolbar;
+            var _ref2 = (0, _featureFlagsContext.getFeatureFlags)(editorView.state) || {},
+                extendFloatingToolbar = _ref2.extendFloatingToolbar;
 
             if (!extendFloatingToolbar) {
               return null;

package/dist/cjs/plugins/hyperlink/Toolbar.js

@@ -21,6 +21,8 @@ var _HyperlinkAddToolbar = _interopRequireDefault(require("./ui/HyperlinkAddTool
 
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 
+var _settings = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
+
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
 
 var _utils = require("./utils");
@@ -39,6 +41,8 @@ var _linkingUtils = require("../../utils/linking-utils");
 
 var _toolbar = require("../copy-button/toolbar");
 
+var _featureFlagsContext = require("../feature-flags-context");
+
 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; }
@@ -48,12 +52,22 @@ function isEditLink(linkMark) {
   return linkMark.pos !== undefined;
 }
 
+var dispatchAnalytics = function dispatchAnalytics(dispatch, state, analyticsBuilder) {
+  if (dispatch) {
+    dispatch((0, _analytics.addAnalytics)(state, state.tr, analyticsBuilder(_analytics.ACTION_SUBJECT_ID.HYPERLINK)));
+  }
+};
+
 var visitHyperlink = function visitHyperlink() {
   return function (state, dispatch) {
-    if (dispatch) {
-      dispatch((0, _analytics.addAnalytics)(state, state.tr, (0, _linkingUtils.buildVisitedLinkPayload)(_analytics.ACTION_SUBJECT_ID.HYPERLINK)));
-    }
+    dispatchAnalytics(dispatch, state, _linkingUtils.buildVisitedLinkPayload);
+    return true;
+  };
+};
 
+var openLinkSettings = function openLinkSettings() {
+  return function (state, dispatch) {
+    dispatchAnalytics(dispatch, state, _linkingUtils.buildOpenedSettingsPayload);
     return true;
   };
 };
@@ -76,6 +90,29 @@ function getLinkText(activeLinkMark, state) {
   return activeLinkMark.node.text;
 }
 
+var getCopyButtonGroup = function getCopyButtonGroup(state, intl, nodeType) {
+  return state && (0, _toolbar.showCopyButton)(state) ? [{
+    type: 'separator'
+  }, (0, _toolbar.getCopyButtonConfig)(state, intl.formatMessage, nodeType)] : [];
+};
+
+var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
+  var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
+      floatingToolbarLinkSettingsButton = _getFeatureFlags.floatingToolbarLinkSettingsButton;
+
+  return floatingToolbarLinkSettingsButton === 'true' ? [{
+    type: 'separator'
+  }, {
+    id: 'editor.link.settings',
+    type: 'button',
+    icon: _settings.default,
+    title: intl.formatMessage(_messages.linkToolbarMessages.settingsLink),
+    onClick: openLinkSettings(),
+    href: 'https://id.atlassian.com/manage-profile/link-preferences',
+    target: '_blank'
+  }] : [];
+};
+
 var getToolbarConfig = function getToolbarConfig(options) {
   return function (state, intl, providerFactory) {
     var formatMessage = intl.formatMessage;
@@ -131,8 +168,8 @@ var getToolbarConfig = function getToolbarConfig(options) {
                     editorView: editorView,
                     editorState: state,
                     cardOptions: options === null || options === void 0 ? void 0 : options.cardOptions,
-                    providerFactory: providerFactory // platform={} // TODO: pass platform
-
+                    providerFactory: providerFactory,
+                    platform: options === null || options === void 0 ? void 0 : options.platform
                   });
                 }
               }, {
@@ -168,9 +205,7 @@ var getToolbarConfig = function getToolbarConfig(options) {
                 title: labelUnlink,
                 icon: _unlink.default,
                 tabIndex: null
-              }].concat((0, _toConsumableArray2.default)(state && (0, _toolbar.showCopyButton)(state) ? [{
-                type: 'separator'
-              }, (0, _toolbar.getCopyButtonConfig)(state, intl.formatMessage, hyperLinkToolbar.nodeType)] : []))
+              }].concat((0, _toConsumableArray2.default)(getCopyButtonGroup(state, intl, hyperLinkToolbar.nodeType)), (0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl)))
             });
           }
 

package/dist/cjs/plugins/media/commands/helpers.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateMediaNodeAttrs = exports.updateAllMediaNodesAttrs = exports.replaceExternalMedia = exports.isMobileUploadCompleted = exports.isMediaNode = exports.findMediaSingleNode = exports.findMediaNode = exports.findMediaInlineNode = exports.findAllMediaSingleNodes = void 0;
+exports.updateMediaNodeAttrs = exports.updateAllMediaNodesAttrs = exports.replaceExternalMedia = exports.isMediaNode = exports.findMediaSingleNode = exports.findMediaNode = exports.findMediaInlineNode = exports.findAllMediaSingleNodes = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -79,13 +79,6 @@ var findMediaNode = function findMediaNode(mediaPluginState, id, isMediaSingle)
 
 exports.findMediaNode = findMediaNode;
 
-var isMobileUploadCompleted = function isMobileUploadCompleted(mediaPluginState, mediaId) {
-  return !!mediaPluginState.mediaOptions && // This flag tells us that it's a 'mobile' env.
-  !!mediaPluginState.mediaOptions.allowMarkingUploadsAsIncomplete && typeof mediaPluginState.mobileUploadComplete[mediaId] === 'boolean' ? mediaPluginState.mobileUploadComplete[mediaId] : undefined;
-};
-
-exports.isMobileUploadCompleted = isMobileUploadCompleted;
-
 var isMediaNode = function isMediaNode(pos, state) {
   var node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);

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

@@ -216,7 +216,7 @@ var mediaPlugin = function mediaPlugin(options) {
           title: formatMessage(_messages.messages.filesAndImages),
           description: formatMessage(_messages.messages.filesAndImagesDescription),
           priority: 400,
-          keywords: ['attachment', 'gif', 'media', 'picture'],
+          keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video'],
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_assets.IconImages, null);
           },

package/dist/cjs/plugins/media/nodeviews/mediaNodeView/index.js

@@ -39,10 +39,6 @@ var _WithPluginState = _interopRequireDefault(require("../../../../ui/WithPlugin
 
 var _width = require("../../../width");
 
-var _helpers = require("../../commands/helpers");
-
-var _pluginKey = require("../../pm-plugins/plugin-key");
-
 var _media = _interopRequireDefault(require("./media"));
 
 var _mediaClient = require("@atlaskit/media-client");
@@ -116,7 +112,6 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
           url: url,
           mediaProvider: mediaProvider,
           contextIdentifierProvider: contextIdentifierProvider,
-          uploadComplete: _this.uploadComplete(),
           mediaOptions: mediaOptions
         });
       };
@@ -183,11 +178,6 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       var attrs = this.getAttrs();
       return (0, _mediaCommon.isMediaBlobUrlFromAttrs)(attrs);
     }
-  }, {
-    key: "uploadComplete",
-    value: function uploadComplete() {
-      return (0, _helpers.isMobileUploadCompleted)(_pluginKey.stateKey.getState(this.view.state), this.node.attrs.id);
-    }
   }, {
     key: "render",
     value: function render() {

package/dist/cjs/plugins/media/nodeviews/mediaNodeView/media.js

@@ -141,7 +141,7 @@ var MediaNode = /*#__PURE__*/function (_Component) {
     value: function shouldComponentUpdate(nextProps, nextState) {
       var hasNewViewMediaClientConfig = !this.state.viewMediaClientConfig && nextState.viewMediaClientConfig;
 
-      if (this.props.selected !== nextProps.selected || this.props.uploadComplete !== nextProps.uploadComplete || this.props.node.attrs.id !== nextProps.node.attrs.id || this.props.node.attrs.collection !== nextProps.node.attrs.collection || this.props.maxDimensions.height !== nextProps.maxDimensions.height || this.props.maxDimensions.width !== nextProps.maxDimensions.width || this.props.contextIdentifierProvider !== nextProps.contextIdentifierProvider || this.props.isLoading !== nextProps.isLoading || this.props.mediaProvider !== nextProps.mediaProvider || hasNewViewMediaClientConfig) {
+      if (this.props.selected !== nextProps.selected || this.props.node.attrs.id !== nextProps.node.attrs.id || this.props.node.attrs.collection !== nextProps.node.attrs.collection || this.props.maxDimensions.height !== nextProps.maxDimensions.height || this.props.maxDimensions.width !== nextProps.maxDimensions.width || this.props.contextIdentifierProvider !== nextProps.contextIdentifierProvider || this.props.isLoading !== nextProps.isLoading || this.props.mediaProvider !== nextProps.mediaProvider || hasNewViewMediaClientConfig) {
         return true;
       }
 
@@ -210,7 +210,6 @@ var MediaNode = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
           node = _this$props.node,
           selected = _this$props.selected,
-          uploadComplete = _this$props.uploadComplete,
           originalDimensions = _this$props.originalDimensions,
           isLoading = _this$props.isLoading,
           maxDimensions = _this$props.maxDimensions,
@@ -225,7 +224,7 @@ var MediaNode = /*#__PURE__*/function (_Component) {
           url = _node$attrs.url,
           alt = _node$attrs.alt;
 
-      if (isLoading || type !== 'external' && (!viewMediaClientConfig || typeof uploadComplete === 'boolean' && !uploadComplete)) {
+      if (isLoading || type !== 'external' && !viewMediaClientConfig) {
         return /*#__PURE__*/_react.default.createElement(_styles.MediaCardWrapper, {
           dimensions: originalDimensions
         }, /*#__PURE__*/_react.default.createElement(_mediaCard.CardLoading, null));

package/dist/cjs/plugins/media/nodeviews/mediaSingle.js

@@ -286,6 +286,16 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         width: width
       }));
       tr.setMeta('scrollIntoView', false);
+      /**
+       * Any changes to attributes of a node count the node as "recreated" in Prosemirror[1]
+       * This makes it so Prosemirror resets the selection to the child i.e. "media" instead of "media-single"
+       * The recommended fix is to reset the selection.[2]
+       *
+       * [1] https://discuss.prosemirror.net/t/setnodemarkup-loses-current-nodeselection/976
+       * [2] https://discuss.prosemirror.net/t/setnodemarkup-and-deselect/3673
+       */
+
+      tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, pos));
       return dispatch(tr);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clickPlaceholder", function () {

package/dist/cjs/plugins/media/picker-facade.js

@@ -45,6 +45,7 @@ var PickerFacade = /*#__PURE__*/function () {
         fileName: file.name,
         fileSize: file.size,
         fileMimeType: file.type,
+        collection: file.collectionName,
         dimensions: dimensions,
         scaleFactor: scaleFactor,
         status: isErroredFile ? 'error' : undefined

package/dist/cjs/plugins/media/pm-plugins/main.js

@@ -120,7 +120,6 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "layout", 'center');
     (0, _defineProperty2.default)(this, "mediaNodes", []);
     (0, _defineProperty2.default)(this, "mediaGroupNodes", {});
-    (0, _defineProperty2.default)(this, "mobileUploadComplete", {});
     (0, _defineProperty2.default)(this, "pendingTask", Promise.resolve(null));
     (0, _defineProperty2.default)(this, "destroyed", false);
     (0, _defineProperty2.default)(this, "removeOnCloseListener", function () {});
@@ -294,7 +293,7 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       return type === mediaSingle;
     });
     (0, _defineProperty2.default)(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType) {
-      var _this$mediaOptions2;
+      var _mediaState$collectio, _this$mediaOptions2;
 
       var state = _this.view.state;
 
@@ -302,14 +301,10 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
         contextId: _this.contextIdentifierProvider ? _this.contextIdentifierProvider.objectId : undefined
       });
 
-      var collection = _this.collectionFromProvider();
+      var collection = (_mediaState$collectio = mediaState.collection) !== null && _mediaState$collectio !== void 0 ? _mediaState$collectio : _this.collectionFromProvider();
 
       if (collection === undefined) {
         return;
-      }
-
-      if (_this.mediaOptions && _this.mediaOptions.allowMarkingUploadsAsIncomplete) {
-        _this.mobileUploadComplete[mediaStateWithContext.id] = false;
       } // We need to dispatch the change to event dispatcher only for successful files
 
 
@@ -501,17 +496,12 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
             attrs.collection = state.collection;
           }
 
-          _this.updateMediaNodeAttrs(state.id, attrs, (0, _mediaSingle.isMediaSingle)(_this.view.state.schema, state.fileMimeType)); // mark mobile upload as complete
+          _this.updateMediaNodeAttrs(state.id, attrs, (0, _mediaSingle.isMediaSingle)(_this.view.state.schema, state.fileMimeType));
 
-
-          _this.mobileUploadComplete[attrs.id] = true;
           delete _this.mediaGroupNodes[state.id];
           break;
       }
     });
-    (0, _defineProperty2.default)(this, "isMobileUploadCompleted", function (mediaId) {
-      return helpers.isMobileUploadCompleted(_this, mediaId);
-    });
     (0, _defineProperty2.default)(this, "removeNodeById", function (state) {
       var id = state.id;
       var mediaNodeWithPos = helpers.findMediaNode(_this, id, (0, _isImage.isImage)(state.fileMimeType));

package/dist/cjs/plugins/panel/pm-plugins/keymaps.js

@@ -60,7 +60,7 @@ function keymapPlugin() {
 
       if (isPreviousNodeAPanel && !isParentNodeAPanel || isInsideAnEmptyNode(selection, panel, state.schema) || isInsideAnEmptyNode(selection, blockquote, state.schema)) {
         var content = $from.node($from.depth).content;
-        var insertPos = previousPos.pos - 1;
+        var insertPos = previousPos.pos;
         deleteCurrentItem($from, tr).insert(insertPos, content);
 
         if (dispatch) {

package/dist/cjs/plugins/paste/handlers.js

@@ -334,12 +334,12 @@ function handlePastePreservingMarks(slice) {
   };
 }
 
-function isLinkSmart(_x, _x2, _x3) {
-  return _isLinkSmart.apply(this, arguments);
+function getSmartLinkAdf(_x, _x2, _x3) {
+  return _getSmartLinkAdf.apply(this, arguments);
 }
 
-function _isLinkSmart() {
-  _isLinkSmart = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(text, type, cardOptions) {
+function _getSmartLinkAdf() {
+  _getSmartLinkAdf = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(text, type, cardOptions) {
     var provider;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -371,7 +371,7 @@ function _isLinkSmart() {
       }
     }, _callee);
   }));
-  return _isLinkSmart.apply(this, arguments);
+  return _getSmartLinkAdf.apply(this, arguments);
 }
 
 function insertAutoMacro(slice, macro, view) {
@@ -391,7 +391,7 @@ function insertAutoMacro(slice, macro, view) {
 }
 
 function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoConverter) {
-  return function (state, _dispatch, view) {
+  return function (state, dispatch, view) {
     var macro = null; // try to use auto convert from extension provider first
 
     if (extensionAutoConverter) {
@@ -416,21 +416,10 @@ function handleMacroAutoConvert(text, slice, cardsOptions, extensionAutoConverte
           return insertAutoMacro(slice, macro, view);
         }
 
-        isLinkSmart(text, 'inline', cardsOptions).then(function (cardData) {
-          if (!view) {
-            throw new Error('Missing view');
-          }
-
-          var _view$state = view.state,
-              schema = _view$state.schema,
-              tr = _view$state.tr;
-          var cardAdf = (0, _utils.processRawValue)(schema, cardData);
-
-          if (!cardAdf) {
-            throw new Error('Received invalid ADF from CardProvider');
+        getSmartLinkAdf(text, 'inline', cardsOptions).then(function () {
+          if (dispatch) {
+            handleMarkdown(slice)(state, dispatch);
           }
-
-          view.dispatch((0, _doc.insertCard)(tr, cardAdf, schema));
         }).catch(function () {
           return insertAutoMacro(slice, macro, view);
         });

package/dist/cjs/plugins/paste/md.js

@@ -11,13 +11,19 @@ var _markdownIt = _interopRequireDefault(require("markdown-it"));
 
 var _linkifyMdPlugin = _interopRequireDefault(require("./linkify-md-plugin"));
 
+var _newlineMdPlugin = _interopRequireDefault(require("./newline-md-plugin"));
+
+var _paragraphMdPlugin = _interopRequireDefault(require("./paragraph-md-plugin"));
+
 var md = (0, _markdownIt.default)('zero', {
   html: false
 });
 exports.md = md;
 md.enable([// Process html entity - {, ¯, ", ...
 'entity', // Process escaped chars and hardbreaks
-'escape', 'newline']); // enable modified version of linkify plugin
+'escape', 'newline']);
+md.use(_paragraphMdPlugin.default); // enable modified version of linkify plugin
 // @see https://product-fabric.atlassian.net/browse/ED-3097
 
-md.use(_linkifyMdPlugin.default);
+md.use(_linkifyMdPlugin.default);
+md.use(_newlineMdPlugin.default);

package/dist/cjs/plugins/paste/newline-md-plugin.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+// ED-15363: modified version of the original newline plugin
+// https://github.com/markdown-it/markdown-it/blob/master/lib/rules_inline/newline.js
+var newline = function newline(state, silent) {
+  var pmax,
+      // ED-15363: unread variables
+  // max,
+  // ws,
+  pos = state.pos;
+
+  if (state.src.charCodeAt(pos) !== 0x0a
+  /* \n */
+  ) {
+    return false;
+  }
+
+  pmax = state.pending.length - 1; // ED-15363: unread variable
+  // max = state.posMax;
+  // '  \n' -> hardbreak
+  // Lookup in pending chars is bad practice! Don't copy to other rules!
+  // Pending string is stored in concat mode, indexed lookups will cause
+  // convertion to flat mode.
+
+  if (!silent) {
+    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {
+      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {
+        // ED-15363: We commented out this logic to preserve trailing whitespaces
+        // for each line of text when pasting plain text
+        // // Find whitespaces tail of pending chars.
+        // ws = pmax - 1;
+        // while (ws >= 1 && state.pending.charCodeAt(ws - 1) === 0x20) {
+        //   ws--;
+        // }
+        // state.pending = state.pending.slice(0, ws);
+        state.push('hardbreak', 'br', 0);
+      } else {
+        state.pending = state.pending.slice(0, -1);
+        state.push('softbreak', 'br', 0);
+      }
+    } else {
+      state.push('softbreak', 'br', 0);
+    }
+  }
+
+  pos++; // ED-15363: We commented out this logic from the original library to
+  // preserve leading whitespaces for each line of text when pasting plain
+  // text (to preserve whitespace-based indentation).
+  // // skip heading spaces for next line
+  // while (pos < max && isSpace(state.src.charCodeAt(pos))) {
+  //   pos++;
+  // }
+
+  state.pos = pos;
+  return true;
+};
+
+var _default = function _default(md) {
+  return md.inline.ruler.at('newline', newline);
+};
+
+exports.default = _default;

package/dist/cjs/plugins/paste/paragraph-md-plugin.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+// ED-15363: modified version of the original paragraph plugin
+// https://github.com/markdown-it/markdown-it/blob/master/lib/rules_block/paragraph.js
+var paragraph = function paragraph(state, startLine) {
+  var content,
+      terminate,
+      i,
+      l,
+      token,
+      oldParentType,
+      nextLine = startLine + 1,
+      terminatorRules = state.md.block.ruler.getRules('paragraph'),
+      endLine = state.lineMax;
+  oldParentType = state.parentType;
+  state.parentType = 'paragraph'; // jump line-by-line until empty one or EOF
+
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) {
+      continue;
+    } // quirk for blockquotes, this line should already be checked by that rule
+
+
+    if (state.sCount[nextLine] < 0) {
+      continue;
+    } // Some tags can terminate paragraph without empty line.
+
+
+    terminate = false;
+
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+
+    if (terminate) {
+      break;
+    }
+  } // ED-15363: We removed .trim() from this logic from the original library to
+  // preserve leading whitespaces at the beginning and end of paragraph blocks
+  // when pasting plain text (to preserve whitespace-based indentation, at the
+  // beginning and end of paragraphs).
+  // content = state.getLines(startLine, nextLine, state.blkIndent, false) .trim()
+
+
+  content = state.getLines(startLine, nextLine, state.blkIndent, false);
+  state.line = nextLine;
+  token = state.push('paragraph_open', 'p', 1);
+  token.map = [startLine, state.line];
+  token = state.push('inline', '', 0);
+  token.content = content;
+  token.map = [startLine, state.line];
+  token.children = [];
+  token = state.push('paragraph_close', 'p', -1);
+  state.parentType = oldParentType;
+  return true;
+};
+
+var _default = function _default(md) {
+  return md.block.ruler.at('paragraph', paragraph);
+};
+
+exports.default = _default;