@atlaskit/editor-core 153.1.5 → 157.0.0

package/dist/es2019/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -70,6 +70,11 @@ export const messages = defineMessages({
     id: 'fabric.editor.hyperlink.searchLinkResults',
     defaultMessage: '{count, plural, =0 {no results} one {# result} other {# results}} found',
     description: 'Announce search results for screen-reader users.'
+  },
+  linkAriaLabel: {
+    id: 'fabric.editor.hyperlink.linkAriaLabel',
+    defaultMessage: 'Link label',
+    description: 'aria label for a link'
   }
 });
 const defaultIcon = /*#__PURE__*/React.createElement(Page16Icon, {
@@ -768,7 +773,7 @@ export class HyperlinkLinkAddToolbar extends PureComponent {
     }))), /*#__PURE__*/React.createElement(PanelTextInput, {
       ref: ele => this.displayTextInputContainer = ele,
       placeholder: formatDisplayText,
-      ariaLabel: 'Link label',
+      ariaLabel: formatMessage(messages.linkAriaLabel),
       testId: 'link-label',
       onChange: this.updateTextInput,
       onCancel: this.handleCancel,

package/dist/es2019/plugins/hyperlink/ui/HyperlinkAddToolbar/messages.js

@@ -0,0 +1,33 @@
+import { defineMessages } from 'react-intl-next';
+export const utilMessages = defineMessages({
+  hyperlinkIconIssueLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconIssueLabel',
+    defaultMessage: 'Issue',
+    description: 'icon label for a jira issue'
+  },
+  hyperlinkIconBugLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconBugLabel',
+    defaultMessage: 'Bug',
+    description: 'icon label for a jira bug'
+  },
+  hyperlinkIconStoryLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconStoryLabel',
+    defaultMessage: 'Story',
+    description: 'icon label for a jira story'
+  },
+  hyperlinkIconTaskLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconTaskLabel',
+    defaultMessage: 'Task',
+    description: 'icon label for a jira task'
+  },
+  hyperlinkIconPageLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconPageLabel',
+    defaultMessage: 'Page',
+    description: 'icon label for a confluence page'
+  },
+  hyperlinkIconBlogLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconBlogLabel',
+    defaultMessage: 'Blog',
+    description: 'icon label for a confluence blog'
+  }
+});

package/dist/es2019/plugins/hyperlink/ui/HyperlinkAddToolbar/utils.js

@@ -6,25 +6,76 @@ import Story16Icon from '@atlaskit/icon-object/glyph/story/16';
 import Task16Icon from '@atlaskit/icon-object/glyph/task/16';
 import Page16Icon from '@atlaskit/icon-object/glyph/page/16';
 import Blog16Icon from '@atlaskit/icon-object/glyph/blog/16';
+import { injectIntl } from 'react-intl-next';
+import { utilMessages } from './messages';
+
+const Issue16 = props => {
+  const {
+    intl
+  } = props;
+  return /*#__PURE__*/React.createElement(Issue16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconIssueLabel)
+  });
+};
+
+const Bug16 = props => {
+  const {
+    intl
+  } = props;
+  return /*#__PURE__*/React.createElement(Bug16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconBugLabel)
+  });
+};
+
+const Story16 = props => {
+  const {
+    intl
+  } = props;
+  return /*#__PURE__*/React.createElement(Story16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconStoryLabel)
+  });
+};
+
+const Task16 = props => {
+  const {
+    intl
+  } = props;
+  return /*#__PURE__*/React.createElement(Task16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconTaskLabel)
+  });
+};
+
+const Page16 = props => {
+  const {
+    intl
+  } = props;
+  return /*#__PURE__*/React.createElement(Page16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconPageLabel)
+  });
+};
+
+const Blog16 = props => {
+  const {
+    intl
+  } = props;
+  return /*#__PURE__*/React.createElement(Blog16Icon, {
+    label: intl.formatMessage(utilMessages.hyperlinkIconBlogLabel)
+  });
+};
+
+const IntlIssue16Icon = injectIntl(Issue16);
+const IntlBug16Icon = injectIntl(Bug16);
+const IntlStory16Icon = injectIntl(Story16);
+const IntlTask16Icon = injectIntl(Task16);
+const IntlPage16Icon = injectIntl(Page16);
+const IntlBlog16Icon = injectIntl(Blog16);
 export const mapContentTypeToIcon = {
-  'jira.issue': /*#__PURE__*/React.createElement(Issue16Icon, {
-    label: "Issue"
-  }),
-  'jira.issue.bug': /*#__PURE__*/React.createElement(Bug16Icon, {
-    label: "Bug"
-  }),
-  'jira.issue.story': /*#__PURE__*/React.createElement(Story16Icon, {
-    label: "Story"
-  }),
-  'jira.issue.task': /*#__PURE__*/React.createElement(Task16Icon, {
-    label: "Task"
-  }),
-  'confluence.page': /*#__PURE__*/React.createElement(Page16Icon, {
-    label: "Page"
-  }),
-  'confluence.blogpost': /*#__PURE__*/React.createElement(Blog16Icon, {
-    label: "Blog"
-  })
+  'jira.issue': /*#__PURE__*/React.createElement(IntlIssue16Icon, null),
+  'jira.issue.bug': /*#__PURE__*/React.createElement(IntlBug16Icon, null),
+  'jira.issue.story': /*#__PURE__*/React.createElement(IntlStory16Icon, null),
+  'jira.issue.task': /*#__PURE__*/React.createElement(IntlTask16Icon, null),
+  'confluence.page': /*#__PURE__*/React.createElement(IntlPage16Icon, null),
+  'confluence.blogpost': /*#__PURE__*/React.createElement(IntlBlog16Icon, null)
 };
 export const sha1 = input => {
   return Rusha.createHash().update(input).digest('hex');

package/dist/es2019/plugins/hyperlink/utils.js

@@ -67,6 +67,10 @@ export function linkifyContent(schema) {
     const isAllowedInParent = !parent || parent.type !== schema.nodes.codeBlock;
     const link = node.type.schema.marks.link;
 
+    if (link === undefined) {
+      throw new Error('Link not in schema - unable to linkify content');
+    }
+
     if (isAllowedInParent && node.isText && !link.isInSet(node.marks)) {
       const linkified = [];
       const text = node.text;

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

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { isPastedFile } from '../../../utils/clipboard';
 import { isDroppedFile } from '../../../utils/drag-drop';
 import { canInsertMedia, isMediaSelected } from '../utils';
@@ -33,7 +33,7 @@ export const createPlugin = ({
   providerFactory
 }) => {
   let uploadHandler;
-  return new Plugin({
+  return new SafePlugin({
     state: {
       init(_config, state) {
         return {

package/dist/es2019/plugins/jira-issue/index.js

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { confluenceJiraIssue } from '@atlaskit/adf-schema';
 import { ReactNodeView } from '../../nodeviews';
 import ReactJIRAIssueNode from './nodeviews/jira-issue';
@@ -8,7 +9,7 @@ const createPlugin = ({
   portalProviderAPI,
   eventDispatcher
 }) => {
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     props: {
       nodeViews: {

package/dist/es2019/plugins/layout/pm-plugins/main.js

@@ -1,4 +1,5 @@
-import { Plugin, TextSelection, Selection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { TextSelection, Selection } from 'prosemirror-state';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { keydownHandler } from 'prosemirror-keymap';
 import { findParentNodeOfType, findSelectedNodeOfType } from 'prosemirror-utils';
@@ -68,7 +69,7 @@ const getInitialPluginState = (options, state) => {
   };
 };
 
-export default (options => new Plugin({
+export default (options => new SafePlugin({
   key: pluginKey,
   state: {
     init: (_, state) => getInitialPluginState(options, state),

package/dist/es2019/plugins/layout/toolbar.js

@@ -51,7 +51,8 @@ const buildLayoutButton = (intl, item, currentLayout) => ({
   testId: item.title.id,
   title: intl.formatMessage(item.title),
   onClick: setPresetLayout(item.type),
-  selected: !!currentLayout && currentLayout === item.type
+  selected: !!currentLayout && currentLayout === item.type,
+  tabIndex: null
 });
 
 export const layoutToolbarTitle = 'Layout floating controls';
@@ -75,7 +76,8 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       onMouseEnter: hoverDecoration(nodeType, true),
       onMouseLeave: hoverDecoration(nodeType, false),
       onFocus: hoverDecoration(nodeType, true),
-      onBlur: hoverDecoration(nodeType, false)
+      onBlur: hoverDecoration(nodeType, false),
+      tabIndex: null
     };
     const layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
     return {

package/dist/es2019/plugins/list/commands/indent-list.js

@@ -1,12 +1,10 @@
-import { findParentNodeOfType } from 'prosemirror-utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, addAnalytics } from '../../analytics';
 import { hasValidListIndentationLevel } from '../utils/indentation';
 import { indentListItemsSelected as indentListAction } from '../actions/indent-list-items-selected';
 import { isBulletList } from '../utils/node';
 import { findFirstParentListNode } from '../utils/find';
 import { MAX_NESTED_LIST_INDENTATION } from '../types';
-import { isInsideListItem } from '../utils/selection';
-import { getListItemAttributes } from '../utils/selection';
+import { isInsideListItem, isInsideTableCell, getListItemAttributes } from '../utils/selection';
 import { getCommonListAnalyticsAttributes } from '../utils/analytics';
 export function indentList(inputMethod = INPUT_METHOD.KEYBOARD) {
   return function (state, dispatch) {
@@ -21,16 +19,11 @@ export function indentList(inputMethod = INPUT_METHOD.KEYBOARD) {
       return false;
     }
 
-    const {
-      tableCell,
-      tableHeader
-    } = state.schema.nodes;
-    const cell = findParentNodeOfType([tableCell, tableHeader])(state.selection);
     const firstListItemSelectedAttributes = getListItemAttributes($from);
     const parentListNode = findFirstParentListNode($from);
 
     if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {
-      if (cell) {
+      if (isInsideTableCell(state)) {
         // dont consume tab, as table-keymap should move cursor to next cell
         return false;
       } else {

package/dist/es2019/plugins/list/commands/index.js

@@ -104,7 +104,7 @@ export function toggleList(inputMethod, listType) {
       const toNode = selection.$to.node(selection.$to.depth - 2);
       const transformedFrom = listInsideSelection.type.name === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
 
-      if (fromNode.type.name === listType && toNode.type.name === listType) {
+      if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type.name) === listType && (toNode === null || toNode === void 0 ? void 0 : toNode.type.name) === listType) {
         let tr = state.tr;
         untoggleSelectedList(tr);
         addAnalytics(state, tr, {

package/dist/es2019/plugins/list/commands/outdent-list.js

@@ -1,5 +1,5 @@
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
-import { isInsideListItem } from '../utils/selection';
+import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 import { isBulletList } from '../utils/node';
 import { findFirstParentListNode } from '../utils/find';
 import { getCommonListAnalyticsAttributes } from '../utils/analytics';
@@ -26,7 +26,8 @@ export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD) {
 
     if (!customTr || !customTr.docChanged) {
       // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
-      return true;
+      // If inside table cell and can't outdent list, then let it handle by table keymap
+      return !isInsideTableCell(state);
     }
 
     addAnalytics(state, customTr, {

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

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { DecorationSet, Decoration } from 'prosemirror-view';
 import { findParentNodeOfType } from 'prosemirror-utils';
 import { isWrappingPossible } from '../utils/selection';
@@ -99,7 +100,7 @@ const createInitialState = state => {
   };
 };
 
-export const createPlugin = eventDispatch => new Plugin({
+export const createPlugin = eventDispatch => new SafePlugin({
   state: createPluginState(eventDispatch, createInitialState),
   key: listPluginKey,
   props: {

package/dist/es2019/plugins/list/utils/node.js

@@ -79,10 +79,16 @@ export const joinSiblingLists = ({
 
     const index = resolvedPos.index();
     const positionPreviousNode = resolvedPos.posAtIndex(index - 1);
-    const positionCurrentNode = resolvedPos.posAtIndex(index);
+    const positionCurrentNode = resolvedPos.posAtIndex(index); // If the previous node is part of the selection, OR
+    // If the previous node is not part of the selection and the previous node has the same list type that we’re converting to
+
+    const joinBefore = positionPreviousNode >= from || nodeBefore.type === forceListType;
 
     if (forceListType) {
-      tr.setNodeMarkup(positionPreviousNode, forceListType);
+      if (joinBefore) {
+        tr.setNodeMarkup(positionPreviousNode, forceListType);
+      }
+
       tr.setNodeMarkup(positionCurrentNode, forceListType);
     }
 
@@ -91,7 +97,9 @@ export const joinSiblingLists = ({
       tr.setNodeMarkup(positionPreviousNode, nodeType);
     }
 
-    joins.push(pos);
+    if (joinBefore) {
+      joins.push(pos);
+    }
   });
 
   if (selection.empty && rootListNode && isListNode(rootListNode)) {

package/dist/es2019/plugins/list/utils/selection.js

@@ -1,6 +1,6 @@
 import { findWrapping } from 'prosemirror-transform';
 import { Selection, TextSelection, NodeSelection } from 'prosemirror-state';
-import { findParentNodeClosestToPos, hasParentNodeOfType } from 'prosemirror-utils';
+import { findParentNodeClosestToPos, findParentNodeOfType, hasParentNodeOfType } from 'prosemirror-utils';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 import { isListItemNode, isListNode, isParagraphNode } from './node';
 export const isPosInsideParagraph = $pos => {
@@ -44,6 +44,13 @@ export const isInsideListItem = state => {
 
   return hasParentNodeOfType(listItem)(state.selection) && isParagraphNode(parent);
 };
+export const isInsideTableCell = state => {
+  const {
+    tableCell,
+    tableHeader
+  } = state.schema.nodes;
+  return !!findParentNodeOfType([tableCell, tableHeader])(state.selection);
+};
 export const canJoinToPreviousListItem = state => {
   const {
     $from

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

@@ -1,8 +1,8 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { setMacroProvider } from './actions';
 import { pluginKey } from './plugin-key';
 export { insertMacroFromMacroBrowser, resolveMacro, runMacroAutoConvert, setMacroProvider } from './actions';
-export const createPlugin = (dispatch, providerFactory) => new Plugin({
+export const createPlugin = (dispatch, providerFactory) => new SafePlugin({
   state: {
     init: () => ({
       macroProvider: null

package/dist/es2019/plugins/max-content-size/index.js

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 export const pluginKey = new PluginKey('maxContentSizePlugin');
 export function createPlugin(dispatch, maxContentSize) {
   if (!maxContentSize) {
@@ -6,7 +7,7 @@ export function createPlugin(dispatch, maxContentSize) {
   }
 
   let maxContentSizeReached = false;
-  return new Plugin({
+  return new SafePlugin({
     filterTransaction(tr) {
       const result = tr.doc && tr.doc.nodeSize > maxContentSize;
 

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

@@ -71,6 +71,7 @@ const mediaPlugin = options => ({
       plugin: ({
         schema,
         dispatch,
+        getIntl,
         eventDispatcher,
         providerFactory,
         errorReporter,
@@ -92,7 +93,7 @@ const mediaPlugin = options => ({
           customDropzoneContainer: options && options.customDropzoneContainer,
           customMediaPicker: options && options.customMediaPicker,
           allowResizing: !!(options && options.allowResizing)
-        }, reactContext, dispatch, options);
+        }, reactContext, getIntl, dispatch, options);
       }
     }, {
       name: 'mediaKeymap',

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

@@ -12,6 +12,8 @@ import { pluginKey as editorDisabledPluginKey } from '../../editor-disabled';
 import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { injectIntl } from 'react-intl-next';
+import { messages } from './messages';
 
 const isMediaGroupSelectedFromProps = props => {
   return isNodeSelectedOrInRange(props.anchorPos, props.headPos, props.getPos(), props.node.nodeSize);
@@ -29,7 +31,7 @@ const hasSelectionChanged = (oldProps, newProps) => {
   return false;
 };
 
-export default class MediaGroup extends React.Component {
+class MediaGroup extends React.Component {
   constructor(_props) {
     super(_props);
 
@@ -122,7 +124,7 @@ export default class MediaGroup extends React.Component {
               actions: [{
                 handler: disabled ? () => {} : this.mediaPluginState.handleMediaNodeRemoval.bind(null, undefined, getNodePos),
                 icon: /*#__PURE__*/React.createElement(EditorCloseIcon, {
-                  label: "delete"
+                  label: this.props.intl.formatMessage(messages.mediaGroupDeleteLabel)
                 })
               }]
             };
@@ -227,6 +229,9 @@ export default class MediaGroup extends React.Component {
 
 _defineProperty(MediaGroup, "displayName", 'MediaGroup');
 
+const IntlMediaGroup = injectIntl(MediaGroup);
+export default IntlMediaGroup;
+
 class MediaGroupNodeView extends ReactNodeView {
   render(props, forwardRef) {
     const {
@@ -248,7 +253,7 @@ class MediaGroupNodeView extends ReactNodeView {
             return null;
           }
 
-          return /*#__PURE__*/React.createElement(MediaGroup, {
+          return /*#__PURE__*/React.createElement(IntlMediaGroup, {
             node: this.node,
             getPos: getPos,
             view: this.view,

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

@@ -86,7 +86,7 @@ export class MediaNodeUpdater {
 
     _defineProperty(this, "getObjectId", async () => {
       const contextIdentifierProvider = await this.props.contextIdentifierProvider;
-      return (contextIdentifierProvider === null || contextIdentifierProvider === void 0 ? void 0 : contextIdentifierProvider.objectId) || null;
+      return contextIdentifierProvider && contextIdentifierProvider.objectId;
     });
 
     _defineProperty(this, "uploadExternalMedia", async getPos => {
@@ -135,10 +135,10 @@ export class MediaNodeUpdater {
       const attrs = this.getAttrs();
 
       if (!attrs || attrs.type !== 'file') {
-        return null;
+        return undefined;
       }
 
-      return attrs.__contextId || null;
+      return attrs.__contextId;
     });
 
     _defineProperty(this, "updateDimensions", dimensions => {

package/dist/es2019/plugins/media/nodeviews/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export const messages = defineMessages({
+  mediaGroupDeleteLabel: {
+    id: 'fabric.editor.mediaGroupDeleteLabel',
+    defaultMessage: 'delete',
+    description: 'a label for an icon that deletes media'
+  }
+});

package/dist/es2019/plugins/media/pm-plugins/alt-text/index.js

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { pluginFactory } from '../../../../utils/plugin-state-factory';
 import reducer from './reducer';
 import { pmHistoryPluginKey } from '../../../history/pm-history-types';
@@ -23,7 +24,7 @@ export const createPlugin = ({
   dispatch,
   providerFactory
 }) => {
-  return new Plugin({
+  return new SafePlugin({
     state: createPluginState(dispatch, {
       isAltTextEditorOpen: false
     }),

package/dist/es2019/plugins/media/pm-plugins/linking/index.js

@@ -1,5 +1,6 @@
 import { pluginFactory } from '../../../../utils/plugin-state-factory';
-import { PluginKey, Plugin, NodeSelection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey, NodeSelection } from 'prosemirror-state';
 import reducer from './reducer';
 export const mediaLinkingPluginKey = new PluginKey('mediaLinking');
 const initialState = {
@@ -56,7 +57,7 @@ export const {
   createCommand: createMediaLinkingCommand,
   getPluginState: getMediaLinkingState
 } = mediaLinkingPluginFactory;
-export default (dispatch => new Plugin({
+export default (dispatch => new SafePlugin({
   key: mediaLinkingPluginKey,
   state: mediaLinkingPluginFactory.createPluginState(dispatch, initialState)
 }));

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

@@ -1,7 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { NodeSelection, Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { NodeSelection } from 'prosemirror-state';
 import { insertPoint } from 'prosemirror-transform';
 import { Decoration, DecorationSet } from 'prosemirror-view';
 import { ErrorReporter, browser } from '@atlaskit/editor-common/utils';
@@ -21,17 +22,23 @@ import { isInEmptyLine } from '../../../utils/document';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { isInListItem } from '../../../utils';
 import { CAPTION_PLACEHOLDER_ID } from '../ui/CaptionPlaceholder';
+import { RawIntlProvider } from 'react-intl-next';
 export { stateKey } from './plugin-key';
 
-const createDropPlaceholder = allowDropLine => {
+const createDropPlaceholder = (intl, allowDropLine) => {
   const dropPlaceholder = document.createElement('div');
+  const createElement = React.createElement;
 
   if (allowDropLine) {
-    ReactDOM.render( /*#__PURE__*/React.createElement(DropPlaceholder, {
+    ReactDOM.render(createElement(RawIntlProvider, {
+      value: intl
+    }, createElement(DropPlaceholder, {
       type: 'single'
-    }), dropPlaceholder);
+    })), dropPlaceholder);
   } else {
-    ReactDOM.render( /*#__PURE__*/React.createElement(DropPlaceholder), dropPlaceholder);
+    ReactDOM.render(createElement(RawIntlProvider, {
+      value: intl
+    }, createElement(DropPlaceholder)), dropPlaceholder);
   }
 
   return dropPlaceholder;
@@ -614,9 +621,10 @@ export class MediaPluginStateImplementation {
 
 }
 export const getMediaPluginState = state => stateKey.getState(state);
-export const createPlugin = (_schema, options, reactContext, dispatch, mediaOptions) => {
-  const dropPlaceholder = createDropPlaceholder(mediaOptions && mediaOptions.allowDropzoneDropLine);
-  return new Plugin({
+export const createPlugin = (_schema, options, reactContext, getIntl, dispatch, mediaOptions) => {
+  const intl = getIntl();
+  const dropPlaceholder = createDropPlaceholder(intl, mediaOptions && mediaOptions.allowDropzoneDropLine);
+  return new SafePlugin({
     state: {
       init(_config, state) {
         return new MediaPluginStateImplementation(state, options, reactContext, mediaOptions, dispatch);

package/dist/es2019/plugins/media/pm-plugins/media-editor.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { setMediaClientConfig } from '../commands/media-editor';
 import { createPluginState, pluginKey } from './media-editor-plugin-factory'; // handle mapping changes to providers -> plugin state
 
@@ -35,7 +35,7 @@ export const createPlugin = ({
   dispatch,
   providerFactory
 }) => {
-  return new Plugin({
+  return new SafePlugin({
     state: createPluginState(dispatch, {}),
     key: pluginKey,
     view: pluginView(providerFactory)

package/dist/es2019/plugins/media/toolbar/commands.js

@@ -1,5 +1,8 @@
+import { Fragment } from 'prosemirror-model';
 import { NodeSelection } from 'prosemirror-state';
 import { isNodeSelection, removeSelectedNode, safeInsert } from 'prosemirror-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE } from '../../analytics';
+import { removeMediaGroupNode } from './utils';
 export const changeInlineToMediaCard = (state, dispatch) => {
   const {
     media,
@@ -29,6 +32,53 @@ export const changeInlineToMediaCard = (state, dispatch) => {
   tr = safeInsert(group, nodePos, true)(tr);
 
   if (dispatch) {
+    addAnalytics(state, tr, {
+      action: ACTION.CHANGED_TYPE,
+      actionSubject: ACTION_SUBJECT.MEDIA,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {
+        newType: ACTION_SUBJECT_ID.MEDIA_GROUP,
+        previousType: ACTION_SUBJECT_ID.MEDIA_INLINE
+      }
+    });
+    dispatch(tr);
+  }
+
+  return true;
+};
+export const changeMediaCardToInline = (state, dispatch) => {
+  const {
+    media,
+    mediaInline,
+    paragraph
+  } = state.schema.nodes;
+  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+
+  if (!selectedNode || !selectedNode.type === media) {
+    return false;
+  }
+
+  const mediaInlineNode = mediaInline.create({
+    id: selectedNode.attrs.id,
+    collection: selectedNode.attrs.collection
+  });
+  const space = state.schema.text(' ');
+  let content = Fragment.from([mediaInlineNode, space]);
+  const node = paragraph.createChecked({}, content);
+  const nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
+  let tr = removeMediaGroupNode(state);
+  tr = safeInsert(node, nodePos, true)(tr);
+
+  if (dispatch) {
+    addAnalytics(state, tr, {
+      action: ACTION.CHANGED_TYPE,
+      actionSubject: ACTION_SUBJECT.MEDIA,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {
+        newType: ACTION_SUBJECT_ID.MEDIA_INLINE,
+        previousType: ACTION_SUBJECT_ID.MEDIA_GROUP
+      }
+    });
     dispatch(tr);
   }