@atlaskit/editor-core 153.1.1 → 153.1.5

package/dist/cjs/plugins/list/pm-plugins/input-rules/index.js

@@ -17,7 +17,10 @@ function inputRulePlugin(schema, featureFlags) {
 
   if (bulletList) {
     rules.push((0, _createListInputRule.createRuleForListType)({
-      expression: /^\s*([\*\-\•]) $/,
+      // Using UTF instead of • character
+      // because of issue where product converted the
+      // character into an escaped version.
+      expression: /^\s*([\*\-\u2022]) $/,
       listType: bulletList
     }));
   }

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

@@ -21,9 +21,9 @@ var _node = require("../utils/node");
 
 var _pluginStateFactory = require("../../../utils/plugin-state-factory");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var listPluginKey = new _prosemirrorState.PluginKey('listPlugin');
 var pluginKey = listPluginKey;

package/dist/cjs/plugins/list/ui/ToolbarLists/index.js

@@ -180,26 +180,30 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           spacing: isReducedSpacing ? 'none' : 'default',
           onClick: this.handleBulletListClick,
           selected: bulletListActive,
+          "aria-pressed": bulletListActive,
+          "aria-label": labelUnorderedList,
           disabled: bulletListDisabled || disabled,
           title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
             description: labelUnorderedList,
             keymap: _keymaps.toggleBulletList
           }),
           iconBefore: /*#__PURE__*/_react.default.createElement(_bulletList.default, {
-            label: labelUnorderedList
+            label: ""
           })
         }), /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
           buttonId: _ToolbarButton.TOOLBAR_BUTTON.ORDERED_LIST,
           spacing: isReducedSpacing ? 'none' : 'default',
           onClick: this.handleOrderedListClick,
           selected: orderedListActive,
+          "aria-pressed": orderedListActive,
+          "aria-label": labelOrderedList,
           disabled: orderedListDisabled || disabled,
           title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
             description: labelOrderedList,
             keymap: _keymaps.toggleOrderedList
           }),
           iconBefore: /*#__PURE__*/_react.default.createElement(_numberList.default, {
-            label: labelOrderedList
+            label: ""
           })
         }), isSeparator && /*#__PURE__*/_react.default.createElement(_styles.Separator, null));
       } else {
@@ -218,10 +222,14 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           isOpen: isDropdownOpen,
           onOpenChange: this.onOpenChange,
           fitHeight: 188,
-          fitWidth: 175
+          fitWidth: 175,
+          shouldUseDefaultRole: true
         }, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
           spacing: isReducedSpacing ? 'none' : 'default',
           selected: bulletListActive || orderedListActive,
+          "aria-expanded": isDropdownOpen,
+          "aria-haspopup": true,
+          "aria-label": labelLists,
           disabled: disabled,
           onClick: this.handleTriggerClick,
           title: labelLists,

package/dist/cjs/plugins/macro/actions.js

@@ -19,7 +19,7 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _validator = require("@atlaskit/editor-common/validator");
 
 var _utils = require("../../utils");
 
@@ -31,9 +31,9 @@ var _extensionEvents = require("../analytics/types/extension-events");
 
 var _pluginKey = require("./plugin-key");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(macroProvider, macroNode, isEditing) {
   return /*#__PURE__*/function () {
@@ -155,7 +155,7 @@ var resolveMacro = function resolveMacro(macro, state, optionalAttrs) {
 
   var schema = state.schema;
 
-  var _getValidNode = (0, _editorCommon.getValidNode)(macro, schema),
+  var _getValidNode = (0, _validator.getValidNode)(macro, schema),
       type = _getValidNode.type,
       attrs = _getValidNode.attrs;
 

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

@@ -39,9 +39,9 @@ var _actions = require("./actions");
 
 var _pluginKey = require("./plugin-key");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var createPlugin = function createPlugin(dispatch, providerFactory) {
   return new _prosemirrorState.Plugin({

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.findMediaSingleNode = exports.findMediaNode = exports.findAllMediaSingleNodes = void 0;
+exports.updateMediaNodeAttrs = exports.updateAllMediaNodesAttrs = exports.replaceExternalMedia = exports.isMobileUploadCompleted = exports.findMediaSingleNode = exports.findMediaNode = exports.findMediaInlineNode = exports.findAllMediaSingleNodes = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -13,9 +13,9 @@ var _pluginKey = require("../pm-plugins/plugin-key");
 
 var _steps = require("@atlaskit/adf-schema/steps");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var findMediaSingleNode = function findMediaSingleNode(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes; // Array#find... no IE support
@@ -34,9 +34,30 @@ var findMediaSingleNode = function findMediaSingleNode(mediaPluginState, id) {
     return memo;
   }, null);
 };
+/**
+ * Finds the media inline node with the given id.
+ * Media Inline is inserted like a media single node into the media plugin state.
+ * However it is not of type mediaSingle.
+ *
+ * @param mediaPluginState
+ * @param id
+ * @param isMediaSingle
+ * @returns {MediaNodeWithPosHandler | null}
+ */
+
 
 exports.findMediaSingleNode = findMediaSingleNode;
 
+var findMediaInlineNode = function findMediaInlineNode(mediaPluginState, id, isMediaSingle) {
+  if (!isMediaSingle) {
+    return findMediaSingleNode(mediaPluginState, id);
+  }
+
+  return null;
+};
+
+exports.findMediaInlineNode = findMediaInlineNode;
+
 var findAllMediaSingleNodes = function findAllMediaSingleNodes(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
   return mediaNodes.filter(function (nodeWithHandler) {
@@ -47,7 +68,12 @@ var findAllMediaSingleNodes = function findAllMediaSingleNodes(mediaPluginState,
 exports.findAllMediaSingleNodes = findAllMediaSingleNodes;
 
 var findMediaNode = function findMediaNode(mediaPluginState, id, isMediaSingle) {
-  var mediaNodeWithPos = isMediaSingle ? findMediaSingleNode(mediaPluginState, id) : mediaPluginState.mediaGroupNodes[id];
+  var mediaNodeWithPos = isMediaSingle ? findMediaSingleNode(mediaPluginState, id) : mediaPluginState.mediaGroupNodes[id]; // Should attempt to find media inline node if media single node or media group node is not found
+
+  if (!mediaNodeWithPos) {
+    return findMediaInlineNode(mediaPluginState, id, isMediaSingle);
+  }
+
   return mediaNodeWithPos;
 };
 

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

@@ -25,9 +25,9 @@ var _checkMediaType = require("../utils/check-media-type");
 
 var _main = require("../pm-plugins/main");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var showLinkingToolbar = (0, _linking.createMediaLinkingCommand)(function (state) {
   var mediaLinkingState = (0, _linking.getMediaLinkingState)(state);

package/dist/cjs/plugins/media/commands/media-editor.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _mediaEditorPluginFactory = require("../pm-plugins/media-editor-plugin-factory");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var openMediaEditor = function openMediaEditor(pos, identifier) {
   return (0, _mediaEditorPluginFactory.createCommand)({

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

@@ -25,7 +25,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 
 var _close = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/close"));
 
@@ -51,9 +51,9 @@ var _mediaNodeUpdater = require("./mediaNodeUpdater");
 
 var _mediaCommon = require("@atlaskit/media-common");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 _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); }; }
 
@@ -332,7 +332,7 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
       var providerFactory = props.providerFactory,
           mediaOptions = props.mediaOptions;
       var getPos = this.getPos;
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
         providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref2) {

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

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ReactMediaInlineNode = exports.MediaInlineNodeView = exports.MediaInline = void 0;
+exports.updateMediaNodeAttributes = exports.handleNewNode = exports.createMediaNodeUpdater = exports.ReactMediaInlineNode = exports.MediaInlineNodeView = exports.MediaInline = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -21,22 +21,30 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _nodeviews = require("../../../nodeviews/");
 
+var _WithPluginState = _interopRequireDefault(require("../../../ui/WithPluginState"));
+
 var _mediaCard = require("@atlaskit/media-card");
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 
 var _styles = require("./styles");
 
+var _pluginKey = require("../pm-plugins/plugin-key");
+
+var _mediaNodeUpdater = require("./mediaNodeUpdater");
+
 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; }
@@ -45,6 +53,110 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
+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; }
+
+var createMediaNodeUpdater = function createMediaNodeUpdater(props) {
+  var node = props.node.firstChild;
+  return new _mediaNodeUpdater.MediaNodeUpdater(_objectSpread(_objectSpread({}, props), {}, {
+    isMediaSingle: true,
+    node: node ? node : props.node,
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
+  }));
+};
+/**
+ * Handles updating the media inline node attributes
+ * but also handling copy-paste for cross-editor of the same instance
+ * using the contextid
+ *
+ */
+
+
+exports.createMediaNodeUpdater = createMediaNodeUpdater;
+
+var updateMediaNodeAttributes = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(props) {
+    var mediaNodeUpdater, addPendingTask, node, contextId, hasDifferentContextId, copyNode;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            mediaNodeUpdater = createMediaNodeUpdater(props);
+            addPendingTask = props.mediaPluginState.addPendingTask;
+            node = props.node;
+
+            if (node) {
+              _context.next = 5;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 5:
+            contextId = mediaNodeUpdater.getNodeContextId();
+
+            if (contextId) {
+              _context.next = 9;
+              break;
+            }
+
+            _context.next = 9;
+            return mediaNodeUpdater.updateContextId();
+
+          case 9:
+            _context.next = 11;
+            return mediaNodeUpdater.hasDifferentContextId();
+
+          case 11:
+            hasDifferentContextId = _context.sent;
+
+            if (!hasDifferentContextId) {
+              _context.next = 23;
+              break;
+            }
+
+            _context.prev = 13;
+            copyNode = mediaNodeUpdater.copyNode();
+            addPendingTask(copyNode);
+            _context.next = 18;
+            return copyNode;
+
+          case 18:
+            _context.next = 23;
+            break;
+
+          case 20:
+            _context.prev = 20;
+            _context.t0 = _context["catch"](13);
+            return _context.abrupt("return");
+
+          case 23:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[13, 20]]);
+  }));
+
+  return function updateMediaNodeAttributes(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.updateMediaNodeAttributes = updateMediaNodeAttributes;
+
+var handleNewNode = function handleNewNode(props) {
+  var node = props.node,
+      mediaPluginState = props.mediaPluginState,
+      getPos = props.getPos;
+  mediaPluginState.handleMediaNodeMount(node, function () {
+    return getPos();
+  });
+};
+
+exports.handleNewNode = handleNewNode;
+
 var MediaInline = function MediaInline(props) {
   var _useState = (0, _react.useState)({}),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -52,22 +164,28 @@ var MediaInline = function MediaInline(props) {
       setViewMediaClientConfig = _useState2[1];
 
   (0, _react.useEffect)(function () {
+    handleNewNode(props);
+    updateMediaNodeAttributes(props);
     updateViewMediaClientConfig(props);
+    return function () {
+      var mediaPluginState = props.mediaPluginState;
+      mediaPluginState.handleMediaNodeUnmount(props.node);
+    };
   }, [props]);
 
   var updateViewMediaClientConfig = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(props) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(props) {
       var mediaProvider, _viewMediaClientConfig;
 
-      return _regenerator.default.wrap(function _callee$(_context) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _context.next = 2;
+              _context2.next = 2;
               return props.mediaProvider;
 
             case 2:
-              mediaProvider = _context.sent;
+              mediaProvider = _context2.sent;
 
               if (mediaProvider) {
                 _viewMediaClientConfig = mediaProvider.viewMediaClientConfig;
@@ -76,14 +194,14 @@ var MediaInline = function MediaInline(props) {
 
             case 4:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function updateViewMediaClientConfig(_x) {
-      return _ref.apply(this, arguments);
+    return function updateViewMediaClientConfig(_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -150,21 +268,41 @@ var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       var _this = this;
 
       var providerFactory = props.providerFactory;
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
-        providers: ['mediaProvider'],
+      var getPos = this.getPos;
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+        providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
-        renderNode: function renderNode(_ref2) {
-          var mediaProvider = _ref2.mediaProvider;
+        renderNode: function renderNode(_ref3) {
+          var mediaProvider = _ref3.mediaProvider,
+              contextIdentifierProvider = _ref3.contextIdentifierProvider;
 
           if (!mediaProvider) {
             return null;
           }
 
-          return /*#__PURE__*/_react.default.createElement(MediaInline, {
-            identifier: _this.node.attrs.id,
-            mediaProvider: mediaProvider,
-            node: _this.node,
-            isSelected: _this.nodeInsideSelection()
+          return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+            editorView: _this.view,
+            plugins: {
+              mediaPluginState: _pluginKey.stateKey
+            },
+            render: function render(_ref4) {
+              var mediaPluginState = _ref4.mediaPluginState;
+
+              if (!mediaPluginState) {
+                return null;
+              }
+
+              return /*#__PURE__*/_react.default.createElement(MediaInline, {
+                identifier: _this.node.attrs.id,
+                mediaProvider: mediaProvider,
+                mediaPluginState: mediaPluginState,
+                node: _this.node,
+                isSelected: _this.nodeInsideSelection(),
+                view: _this.view,
+                getPos: getPos,
+                contextIdentifierProvider: contextIdentifierProvider
+              });
+            }
           });
         }
       });
@@ -175,10 +313,11 @@ var MediaInlineNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
 
 exports.MediaInlineNodeView = MediaInlineNodeView;
 
-var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory) {
+var ReactMediaInlineNode = function ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, dispatchAnalyticsEvent) {
   return function (node, view, getPos) {
     return new MediaInlineNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {
-      providerFactory: providerFactory
+      providerFactory: providerFactory,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent
     }).init();
   };
 };

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

@@ -19,7 +19,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _v = _interopRequireDefault(require("uuid/v4"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _ui = require("@atlaskit/editor-common/ui");
 
 var _mediaClient = require("@atlaskit/media-client");
 
@@ -192,7 +192,7 @@ var MediaNodeUpdater = /*#__PURE__*/function () {
 
             case 2:
               contextIdentifierProvider = _context3.sent;
-              return _context3.abrupt("return", contextIdentifierProvider && contextIdentifierProvider.objectId);
+              return _context3.abrupt("return", (contextIdentifierProvider === null || contextIdentifierProvider === void 0 ? void 0 : contextIdentifierProvider.objectId) || null);
 
             case 4:
             case "end":
@@ -278,10 +278,10 @@ var MediaNodeUpdater = /*#__PURE__*/function () {
       var attrs = _this.getAttrs();
 
       if (!attrs || attrs.type !== 'file') {
-        return undefined;
+        return null;
       }
 
-      return attrs.__contextId;
+      return attrs.__contextId || null;
     });
     (0, _defineProperty2.default)(this, "updateDimensions", function (dimensions) {
       (0, _helpers.updateAllMediaNodesAttrs)(dimensions.id, {
@@ -621,8 +621,8 @@ var MediaNodeUpdater = /*#__PURE__*/function () {
 
                 return _context9.abrupt("return", {
                   id: id,
-                  height: _editorCommon.DEFAULT_IMAGE_HEIGHT,
-                  width: _editorCommon.DEFAULT_IMAGE_WIDTH
+                  height: _ui.DEFAULT_IMAGE_HEIGHT,
+                  width: _ui.DEFAULT_IMAGE_WIDTH
                 });
 
               case 15:
@@ -662,8 +662,8 @@ var MediaNodeUpdater = /*#__PURE__*/function () {
               case 27:
                 return _context9.abrupt("return", {
                   id: id,
-                  height: imageMetadata.original.height || _editorCommon.DEFAULT_IMAGE_HEIGHT,
-                  width: imageMetadata.original.width || _editorCommon.DEFAULT_IMAGE_WIDTH
+                  height: imageMetadata.original.height || _ui.DEFAULT_IMAGE_HEIGHT,
+                  width: imageMetadata.original.width || _ui.DEFAULT_IMAGE_WIDTH
                 });
 
               case 28:

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

@@ -23,7 +23,11 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _editorCommon = require("@atlaskit/editor-common");
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
+
+var _ui = require("@atlaskit/editor-common/ui");
+
+var _utils = require("@atlaskit/editor-common/utils");
 
 var _prosemirrorState = require("prosemirror-state");
 
@@ -92,8 +96,8 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
           }
         }
 
-        width = width || _editorCommon.DEFAULT_IMAGE_WIDTH;
-        height = height || _editorCommon.DEFAULT_IMAGE_HEIGHT;
+        width = width || _ui.DEFAULT_IMAGE_WIDTH;
+        height = height || _ui.DEFAULT_IMAGE_HEIGHT;
         var maxDimensions = {
           width: "".concat(editorWidth.width, "px"),
           height: "".concat(height / width * editorWidth.width, "px")
@@ -136,7 +140,7 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     value: function createDomRef() {
       var domRef = document.createElement('div');
 
-      if (_editorCommon.browser.chrome && this.reactComponentProps.mediaOptions && this.reactComponentProps.mediaOptions.allowMediaSingleEditable) {
+      if (_utils.browser.chrome && this.reactComponentProps.mediaOptions && this.reactComponentProps.mediaOptions.allowMediaSingleEditable) {
         // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
         // see also: https://github.com/ProseMirror/prosemirror/issues/884
         domRef.contentEditable = 'true';
@@ -188,7 +192,7 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
     key: "render",
     value: function render() {
       var providerFactory = this.reactComponentProps.providerFactory;
-      return /*#__PURE__*/_react.default.createElement(_editorCommon.WithProviders, {
+      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
         providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: this.renderMediaNodeWithProviders