@atlaskit/editor-core 161.0.0 → 163.0.0

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

@@ -1,5 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorAlignLeftIcon from '@atlaskit/icon/glyph/editor/align-left';
@@ -22,7 +25,7 @@ import debounce from 'lodash/debounce';
 import { mapContentTypeToIcon, sha1, wordCount } from './utils';
 import { hideLinkToolbar } from '../../commands';
 import { hideLinkToolbar as cardHideLinkToolbar } from '../../../card/pm-plugins/actions';
-import { ScreenReaderText } from '../../styles';
+import { visuallyHiddenStyles } from '../../styles';
 import { browser } from '@atlaskit/editor-common/utils';
 import { transformTimeStamp } from '../../../../ui/LinkSearch/transformTimeStamp';
 import Announcer from '../../../../utils/announcer/announcer';
@@ -77,7 +80,7 @@ export const messages = defineMessages({
     description: 'aria label for a link'
   }
 });
-const defaultIcon = /*#__PURE__*/React.createElement(Page16Icon, {
+const defaultIcon = jsx(Page16Icon, {
   label: 'page'
 });
 
@@ -725,24 +728,25 @@ export class HyperlinkLinkAddToolbar extends PureComponent {
     // for details: https://a11y-internal.atlassian.net/browse/AK-740
 
     const screenReaderText = browser.safari && this.getScreenReaderText();
-    return /*#__PURE__*/React.createElement("div", {
+    return jsx("div", {
       className: "recent-list"
-    }, /*#__PURE__*/React.createElement(Container, {
+    }, jsx(Container, {
       provider: !!activityProvider,
       innerRef: this.wrapperRef
-    }, /*#__PURE__*/React.createElement(UrlInputWrapper, null, /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(Tooltip, {
+    }, jsx(UrlInputWrapper, null, jsx(IconWrapper, null, jsx(Tooltip, {
       content: formatLinkAddressText
-    }, /*#__PURE__*/React.createElement(LinkIcon, {
+    }, jsx(LinkIcon, {
       label: formatLinkAddressText
-    }))), screenReaderText && /*#__PURE__*/React.createElement(Announcer, {
+    }))), screenReaderText && jsx(Announcer, {
       ariaLive: "assertive",
       text: screenReaderText,
       ariaRelevant: "additions",
       delay: 250
-    }), /*#__PURE__*/React.createElement(ScreenReaderText, {
+    }), jsx("div", {
+      css: visuallyHiddenStyles,
       "aria-hidden": "true",
       id: screenReaderDescriptionId
-    }, formatMessage(messages.searchLinkAriaDescription)), /*#__PURE__*/React.createElement(PanelTextInput, {
+    }, formatMessage(messages.searchLinkAriaDescription)), jsx(PanelTextInput, {
       role: "combobox",
       ariaExpanded: true,
       ariaActiveDescendant: ariaActiveDescendant,
@@ -760,17 +764,17 @@ export class HyperlinkLinkAddToolbar extends PureComponent {
       onCancel: this.handleCancel,
       defaultValue: displayUrl,
       onKeyDown: this.handleKeyDown
-    }), displayUrl && /*#__PURE__*/React.createElement(Tooltip, {
+    }), displayUrl && jsx(Tooltip, {
       content: formatClearLinkText
-    }, /*#__PURE__*/React.createElement(ClearText, {
+    }, jsx(ClearText, {
       onClick: this.handleClearText
-    }, /*#__PURE__*/React.createElement(CrossCircleIcon, {
+    }, jsx(CrossCircleIcon, {
       label: formatClearLinkText
-    })))), /*#__PURE__*/React.createElement(TextInputWrapper, null, /*#__PURE__*/React.createElement(IconWrapper, null, /*#__PURE__*/React.createElement(Tooltip, {
+    })))), jsx(TextInputWrapper, null, jsx(IconWrapper, null, jsx(Tooltip, {
       content: formatDisplayText
-    }, /*#__PURE__*/React.createElement(EditorAlignLeftIcon, {
+    }, jsx(EditorAlignLeftIcon, {
       label: formatDisplayText
-    }))), /*#__PURE__*/React.createElement(PanelTextInput, {
+    }))), jsx(PanelTextInput, {
       ref: ele => this.displayTextInputContainer = ele,
       placeholder: formatDisplayText,
       ariaLabel: formatMessage(messages.linkAriaLabel),
@@ -780,20 +784,21 @@ export class HyperlinkLinkAddToolbar extends PureComponent {
       defaultValue: displayText,
       onSubmit: this.handleSubmit,
       onKeyDown: this.handleKeyDown
-    }), displayText && /*#__PURE__*/React.createElement(Tooltip, {
+    }), displayText && jsx(Tooltip, {
       content: formatMessage(messages.clearText)
-    }, /*#__PURE__*/React.createElement(ClearText, {
+    }, jsx(ClearText, {
       onClick: this.handleClearDisplayText,
       onKeyDown: this.handleClearTextKeyDown
-    }, /*#__PURE__*/React.createElement(CrossCircleIcon, {
+    }, jsx(CrossCircleIcon, {
       label: formatMessage(messages.clearText)
-    })))), /*#__PURE__*/React.createElement(ScreenReaderText, {
+    })))), jsx("div", {
+      css: visuallyHiddenStyles,
       "aria-live": "polite",
       "aria-atomic": "true",
       id: "fabric.editor.hyperlink.suggested.results"
     }, displayUrl && formatMessage(messages.searchLinkResults, {
       count: items.length
-    })), /*#__PURE__*/React.createElement(LinkSearchList, {
+    })), jsx(LinkSearchList, {
       ariaControls: "fabric.editor.hyperlink.suggested.results",
       id: linkSearchListId,
       role: "listbox",

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

@@ -1,10 +1,10 @@
-import React from 'react';
-import styled from 'styled-components';
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
 import { JiraIcon } from '@atlaskit/logo/jira-icon';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { N30, N50 } from '@atlaskit/theme/colors';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
-const WrapperNode = styled.span`
+const wrapperNode = css`
   align-items: center;
   background: ${N30};
   border: 1px solid ${N50};
@@ -25,7 +25,7 @@ const WrapperNode = styled.span`
     outline: none;
   }
 `;
-const JiraChildNode = styled.span`
+const jiraChildNode = css`
   display: inline-block;
   color: #707070;
   line-height: 24px;
@@ -36,7 +36,7 @@ const JiraChildNode = styled.span`
     content: 'JIRA | ';
   }
 `;
-const SvgChildNode = styled.span`
+const svgChildNode = css`
   display: inline-block;
   height: 24px;
   vertical-align: top;
@@ -55,7 +55,14 @@ export default function JIRAIssueNode(props) {
       }
     }
   } = props;
-  return /*#__PURE__*/React.createElement(WrapperNode, null, /*#__PURE__*/React.createElement(SvgChildNode, null, /*#__PURE__*/React.createElement(JiraIcon, {
+  return jsx("span", {
+    css: wrapperNode,
+    "data-testid": "jira-issue-node"
+  }, jsx("span", {
+    css: svgChildNode
+  }, jsx(JiraIcon, {
     size: "small"
-  })), /*#__PURE__*/React.createElement(JiraChildNode, null, issueKey));
+  })), jsx("span", {
+    css: jiraChildNode
+  }, issueKey));
 }

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

@@ -1,4 +1,4 @@
-import { css } from 'styled-components';
+import { css } from '@emotion/react';
 import { gridSize } from '@atlaskit/theme/constants';
 import { N40A, N50A } from '@atlaskit/theme/colors';
 import { columnLayoutSharedStyle } from '@atlaskit/editor-common/styles';
@@ -36,6 +36,10 @@ export const layoutStyles = css`
             margin-top: 0;
           }
 
+          .rich-media-item {
+            margin-top: 0;
+          }
+
           > .mediaSingleView-content-wrap:first-child .rich-media-item {
             margin-top: 0;
           }

package/dist/es2019/plugins/list/actions/wrap-and-join-lists.js

@@ -0,0 +1,163 @@
+import { Fragment, Slice, NodeRange } from 'prosemirror-model';
+import { ReplaceAroundStep, findWrapping, canSplit, canJoin } from 'prosemirror-transform';
+/**
+ * Wraps the selection in a list with the given type. If this results in
+ * two adjacent lists of the same type, those will be joined together.
+ */
+
+export function wrapInListAndJoin(nodeType, tr) {
+  wrapInList(nodeType)(tr);
+  autoJoin(tr, (before, after) => before.type === after.type && before.type === nodeType);
+}
+/**
+ * Wraps the selection in a list with the given type and attributes.
+ *
+ * Adapted from https://github.com/ProseMirror/prosemirror-schema-list/blob/master/src/schema-list.js#L64-L89
+ */
+
+export function wrapInList(listType, attrs) {
+  return function (tr) {
+    const {
+      $from,
+      $to
+    } = tr.selection;
+    let range = $from.blockRange($to);
+    let doJoin = false;
+    let outerRange = range;
+
+    if (!range) {
+      return false;
+    } // This is at the top of an existing list item
+
+
+    if (range.depth >= 2 && // @ts-ignore - missing type for compatibleContent
+    $from.node(range.depth - 1).type.compatibleContent(listType) && range.startIndex === 0) {
+      // Don't do anything if this is the top of the list
+      if ($from.index(range.depth - 1) === 0) {
+        return false;
+      }
+
+      let $insert = tr.doc.resolve(range.start - 2);
+      outerRange = new NodeRange($insert, $insert, range.depth);
+
+      if (range.endIndex < range.parent.childCount) {
+        range = new NodeRange($from, tr.doc.resolve($to.end(range.depth)), range.depth);
+      }
+
+      doJoin = true;
+    }
+
+    let wrap = findWrapping(outerRange, listType, attrs, range);
+
+    if (!wrap) {
+      return false;
+    }
+
+    tr = doWrapInList(tr, range, wrap, doJoin, listType);
+    return true;
+  };
+}
+/**
+ * Internal function used by wrapInList
+ *
+ * Adapted from https://github.com/ProseMirror/prosemirror-schema-list/blob/master/src/schema-list.js#L91-L112
+ */
+
+function doWrapInList(tr, range, wrappers, joinBefore, listType) {
+  let content = Fragment.empty;
+
+  for (let i = wrappers.length - 1; i >= 0; i--) {
+    content = Fragment.from(wrappers[i].type.create(wrappers[i].attrs, content));
+  }
+
+  tr.step(new ReplaceAroundStep(range.start - (joinBefore ? 2 : 0), range.end, range.start, range.end, new Slice(content, 0, 0), wrappers.length, true));
+  let found = 0;
+
+  for (let i = 0; i < wrappers.length; i++) {
+    if (wrappers[i].type === listType) {
+      found = i + 1;
+    }
+  }
+
+  const splitDepth = wrappers.length - found;
+  let splitPos = range.start + wrappers.length - (joinBefore ? 2 : 0);
+  const parent = range.parent;
+
+  for (let i = range.startIndex, e = range.endIndex, first = true; i < e; i++, first = false) {
+    if (!first && canSplit(tr.doc, splitPos, splitDepth)) {
+      tr.split(splitPos, splitDepth);
+      splitPos += 2 * splitDepth;
+    }
+
+    splitPos += parent.child(i).nodeSize;
+  }
+
+  return tr;
+}
+/**
+ * Checks whether two adjacent nodes can be joined. If so, the document
+ * will be updated to join those nodes. If not, the original transaction
+ * remains untouched.
+ *
+ * Nodes are considered joinable if the `isJoinable` predicate returns true.
+ *
+ * Adapted from https://github.com/ProseMirror/prosemirror-commands/blob/master/src/commands.js#L597-L610
+ */
+
+
+export function autoJoin(tr, isJoinable) {
+  if (!tr.isGeneric) {
+    return;
+  }
+
+  const ranges = [];
+
+  for (let i = 0; i < tr.mapping.maps.length; i++) {
+    const map = tr.mapping.maps[i];
+
+    for (let j = 0; j < ranges.length; j++) {
+      ranges[j] = map.map(ranges[j]);
+    }
+
+    map.forEach((_s, _e, from, to) => ranges.push(from, to));
+  } // Figure out which joinable points exist inside those ranges,
+  // by checking all node boundaries in their parent nodes.
+
+
+  const joinable = [];
+
+  for (let i = 0; i < ranges.length; i += 2) {
+    const from = ranges[i];
+    const to = ranges[i + 1];
+    const $from = tr.doc.resolve(from);
+    const depth = $from.sharedDepth(to);
+    const parent = $from.node(depth);
+
+    for (let index = $from.indexAfter(depth), pos = $from.after(depth + 1); pos <= to; ++index) {
+      const after = parent.maybeChild(index);
+
+      if (!after) {
+        break;
+      }
+
+      if (index && joinable.indexOf(pos) === -1) {
+        const before = parent.child(index - 1);
+
+        if (before.type === after.type && isJoinable(before, after)) {
+          joinable.push(pos);
+        }
+      }
+
+      pos += after.nodeSize;
+    }
+  } // Join the joinable points
+
+
+  joinable.sort((a, b) => a - b);
+
+  for (let i = joinable.length - 1; i >= 0; i--) {
+    if (canJoin(tr.doc, joinable[i])) {
+      tr.join(joinable[i]);
+    }
+  }
+}

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

@@ -1,7 +1,6 @@
 import { Fragment, Slice } from 'prosemirror-model';
-import { ReplaceAroundStep } from 'prosemirror-transform';
+import { TextSelection } from 'prosemirror-state';
 import * as baseCommand from 'prosemirror-commands';
-import * as baseListCommand from 'prosemirror-schema-list';
 import { hasParentNodeOfType, findPositionOfNodeBefore } from 'prosemirror-utils';
 import { hasVisibleContent, isNodeEmpty } from '../../../utils/document';
 import { findCutBefore, isEmptySelectionAtStart, isFirstChildOfParent, filter } from '../../../utils/commands';
@@ -14,8 +13,10 @@ import { getCommonListAnalyticsAttributes } from '../utils/analytics';
 import { listBackspace } from './listBackspace';
 import { joinListItemForward } from './join-list-item-forward';
 import { convertListType } from '../actions/conversions';
+import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { outdentList } from './outdent-list';
 import { indentList } from './indent-list';
+import { moveTargetIntoList } from '../utils/replace-content';
 export { outdentList, indentList };
 export const enterKeyCommand = (state, dispatch) => {
   const {
@@ -91,8 +92,8 @@ function untoggleSelectedList(tr) {
 
 export function toggleList(inputMethod, listType) {
   return function (state, dispatch) {
-    let customTr = state.tr;
-    const listInsideSelection = selectionContainsList(customTr);
+    let tr = state.tr;
+    const listInsideSelection = selectionContainsList(tr);
     const listNodeType = state.schema.nodes[listType];
     const actionSubjectId = listType === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
 
@@ -126,10 +127,10 @@ export function toggleList(inputMethod, listType) {
       }
 
       convertListType({
-        tr: customTr,
+        tr,
         nextListNodeType: listNodeType
       });
-      addAnalytics(state, customTr, {
+      addAnalytics(state, tr, {
         action: ACTION.CONVERTED,
         actionSubject: ACTION_SUBJECT.LIST,
         actionSubjectId,
@@ -140,17 +141,11 @@ export function toggleList(inputMethod, listType) {
         }
       });
     } else {
-      const replaceCurrentTr = tr => {
-        customTr = tr;
-      }; // NOTE: replaceCurrentTr is supplied here instead of the usual dispatch function
-      // to 'mutate' the transaction without actually dispatching (as it is more performant
-      // if we only dispatch once at the end). This means customTr should not be modified
-      // until after wrapInList, since any changes made to it will be discarded when it
-      // gets replaced with the transaction generated by wrapInList.
-
-
-      wrapInList(listNodeType)(state, replaceCurrentTr);
-      addAnalytics(state, customTr, {
+      // Need to have this before wrapInList so the wrapping is done with valid content
+      // For example, if trying to convert centre or right aligned paragraphs to lists
+      sanitiseMarksInSelection(tr, listNodeType);
+      wrapInListAndJoin(listNodeType, tr);
+      addAnalytics(state, tr, {
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.LIST,
         actionSubjectId,
@@ -159,18 +154,16 @@ export function toggleList(inputMethod, listType) {
           inputMethod
         }
       });
-    } // if document wasn't changed, that means setNodeMarkup step didn't work, so
-    // return false from the command to indicate that the editing action failed
+    } // If document wasn't changed, return false from the command to indicate that the
+    // editing action failed
 
 
-    if (!customTr.docChanged) {
+    if (!tr.docChanged) {
       return false;
     }
 
-    sanitiseMarksInSelection(customTr, listNodeType);
-
     if (dispatch) {
-      dispatch(customTr);
+      dispatch(tr);
     }
 
     return true;
@@ -182,9 +175,6 @@ export function toggleBulletList(view, inputMethod = INPUT_METHOD.TOOLBAR) {
 export function toggleOrderedList(view, inputMethod = INPUT_METHOD.TOOLBAR) {
   return toggleList(inputMethod, 'orderedList')(view.state, view.dispatch);
 }
-export function wrapInList(nodeType) {
-  return baseCommand.autoJoin(baseListCommand.wrapInList(nodeType), (before, after) => before.type === after.type && before.type === nodeType);
-}
 /**
  * Implementation taken and modified for our needs from PM
  * @param itemType Node
@@ -326,8 +316,20 @@ const joinToPreviousListItem = (state, dispatch) => {
         const list = $cut.nodeBefore.copy($cut.nodeBefore.content.append(Fragment.from(listItem.createChecked({}, $cut.nodeAfter))));
         tr.replaceWith(nodeBeforePos, $from.pos + $cut.nodeAfter.nodeSize, list);
       } else {
-        // take the text content of the paragraph and insert after the paragraph up until before the the cut
-        tr = state.tr.step(new ReplaceAroundStep($lastNode.pos, $cut.pos + $cut.nodeAfter.nodeSize, $cut.pos + 1, $cut.pos + $cut.nodeAfter.nodeSize - 1, state.tr.doc.slice($lastNode.pos, $cut.pos), 0, true));
+        const step = moveTargetIntoList({
+          insertPosition: $lastNode.pos,
+          $target: $cut
+        }); // ED-13966: check if the step will cause an ProseMirror error
+        // if there's an error don't apply the step as it will might lead into a data loss.
+        // It doesn't play well with media being a leaf node.
+
+        const stepResult = state.tr.maybeStep(step);
+
+        if (stepResult.failed) {
+          return false;
+        } else {
+          tr = state.tr.step(step);
+        }
       } // find out if there's now another list following and join them
       // as in, [list, p, list] => [list with p, list], and we want [joined list]
 
@@ -339,6 +341,12 @@ const joinToPreviousListItem = (state, dispatch) => {
       }
 
       if (dispatch) {
+        var _tr$doc$resolve$nodeB;
+
+        if (!((_tr$doc$resolve$nodeB = tr.doc.resolve($lastNode.pos).nodeBefore) !== null && _tr$doc$resolve$nodeB !== void 0 && _tr$doc$resolve$nodeB.isBlock) || tr.doc.resolve($lastNode.pos).nodeBefore === null) {
+          tr = tr.setSelection(TextSelection.near(tr.doc.resolve(tr.mapping.map($cut.pos)), -1));
+        }
+
         dispatch(tr.scrollIntoView());
       }
 

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

@@ -45,6 +45,12 @@ export const getDecorations = doc => {
       decorations.push(Decoration.node(from, to, {
         'data-indent-level': `${depth}`
       }));
+
+      if (node.childCount >= 100) {
+        decorations.push(Decoration.node(from, to, {
+          'data-child-count': '100+'
+        }));
+      }
     }
   });
   return DecorationSet.empty.add(doc, decorations);

package/dist/es2019/plugins/list/styles.js

@@ -1,4 +1,4 @@
-import { css } from 'styled-components';
+import { css } from '@emotion/react';
 export const listsStyles = css`
   .ProseMirror li {
     position: relative;

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

@@ -116,10 +116,11 @@ export const joinSiblingLists = ({
 
   for (let i = joins.length - 1; i >= 0; i--) {
     const listNode = tr.doc.nodeAt(joins[i]);
+    const listName = listNode === null || listNode === void 0 ? void 0 : listNode.type.name;
 
-    if (listNode) {
-      const amount = result[listNode.type.name] || 0;
-      result[listNode.type.name] = amount + 1;
+    if (listName && (listName === 'orderedList' || listName === 'bulletList')) {
+      const amount = result[listName] || 0;
+      result[listName] = amount + 1;
     }
 
     tr.join(joins[i]);

package/dist/es2019/plugins/list/utils/replace-content.js

@@ -0,0 +1,22 @@
+import { ReplaceAroundStep, ReplaceStep } from 'prosemirror-transform';
+export const moveTargetIntoList = ({
+  insertPosition,
+  $target
+}) => {
+  var _$target$nodeAfter;
+
+  // take the text content of the paragraph and insert after the paragraph up until before the the cut
+  const from = insertPosition;
+  const to = $target.pos + (((_$target$nodeAfter = $target.nodeAfter) === null || _$target$nodeAfter === void 0 ? void 0 : _$target$nodeAfter.nodeSize) || 0); //$cut.pos + $cut.nodeAfter.nodeSize;
+
+  const gapFrom = $target.posAtIndex(0, $target.depth + 1); // start pos of the child
+
+  const gapTo = $target.doc.resolve(gapFrom).end(); // end pos of the paragraph
+
+  if (gapTo - gapFrom === 0) {
+    return new ReplaceStep(from, to, $target.doc.slice(insertPosition, $target.pos));
+  }
+
+  const step = new ReplaceAroundStep(from, to, gapFrom, gapTo, $target.doc.slice(insertPosition, $target.pos), 0, true);
+  return step;
+};

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

@@ -2,8 +2,6 @@ import React from 'react';
 import { media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline } from '@atlaskit/adf-schema';
 import { stateKey as pluginKey, createPlugin } from './pm-plugins/main';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import { createPlugin as createMediaEditorPlugin } from './pm-plugins/media-editor';
-import { pluginKey as mediaEditorPluginKey } from './pm-plugins/media-editor-plugin-factory';
 import { createPlugin as createMediaAltTextPlugin } from './pm-plugins/alt-text';
 import keymapMediaAltTextPlugin from './pm-plugins/alt-text/keymap';
 import keymapMediaSinglePlugin from './pm-plugins/keymap-media-single';
@@ -17,7 +15,6 @@ import { floatingToolbar } from './toolbar';
 import { addAnalytics, ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '../analytics';
 import { IconImages } from '../quick-insert/assets';
 import WithPluginState from '../../ui/WithPluginState';
-import MediaEditor from './ui/MediaEditor';
 import { MediaPickerComponents } from './ui/MediaPicker';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
@@ -109,13 +106,6 @@ const mediaPlugin = options => ({
       });
     }
 
-    if (options && options.allowAnnotation) {
-      pmPlugins.push({
-        name: 'mediaEditor',
-        plugin: createMediaEditorPlugin
-      });
-    }
-
     if (options && options.allowAltTextOnImages) {
       pmPlugins.push({
         name: 'mediaAltText',
@@ -149,24 +139,8 @@ const mediaPlugin = options => ({
 
   contentComponent({
     editorView,
-    eventDispatcher,
     appearance
   }) {
-    // render MediaEditor separately because it doesn't depend on media plugin state
-    // so we can utilise EventDispatcher-based rerendering
-    const mediaEditor = options && options.allowAnnotation ? /*#__PURE__*/React.createElement(WithPluginState, {
-      editorView: editorView,
-      plugins: {
-        mediaEditorState: mediaEditorPluginKey
-      },
-      eventDispatcher: eventDispatcher,
-      render: ({
-        mediaEditorState
-      }) => /*#__PURE__*/React.createElement(MediaEditor, {
-        mediaEditorState: mediaEditorState,
-        view: editorView
-      })
-    }) : null;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WithPluginState, {
       editorView: editorView,
       plugins: {
@@ -179,7 +153,7 @@ const mediaPlugin = options => ({
         mediaState: mediaState,
         appearance: appearance
       })
-    }), mediaEditor);
+    }));
   },
 
   secondaryToolbarComponent({
@@ -227,7 +201,6 @@ const mediaPlugin = options => ({
       allowMediaInline: options && getMediaFeatureFlag('mediaInline', options.featureFlags),
       allowResizing: options && options.allowResizing,
       allowResizingInTables: options && options.allowResizingInTables,
-      allowAnnotation: options && options.allowAnnotation,
       allowLinking: options && options.allowLinking,
       allowAdvancedToolBarOptions: options && options.allowAdvancedToolBarOptions,
       allowAltTextOnImages: options && options.allowAltTextOnImages,

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