@atlaskit/editor-core 180.0.0 → 181.0.0

package/dist/esm/plugins/paste/pm-plugins/analytics.js

@@ -4,8 +4,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { ACTION, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, PasteTypes, PasteContents, withAnalytics } from '../../analytics';
 import { getPasteSource } from '../util';
-import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelIntoList } from '../handlers';
-import { pipe } from '../../../utils';
+import { handlePasteAsPlainText, handlePasteIntoTaskOrDecisionOrPanel, handleCodeBlock, handleMediaSingle, handlePastePreservingMarks, handleMarkdown, handleRichText, handleExpandPasteInTable, handleSelectedTable, handlePasteLinkOnSelectedText, handlePasteIntoCaption, handlePastePanelOrDecisionContentIntoList, handlePasteNonNestableBlockNodesIntoList } from '../handlers';
 import { findParentNode } from 'prosemirror-utils';
 import { mapSlice } from '../../../utils/slice';
 import { getLinkDomain } from '../../hyperlink/utils';
@@ -54,10 +53,11 @@ var nodeToActionSubjectId = {
   tableRow: ACTION_SUBJECT_ID.PASTE_TABLE_ROW,
   taskList: ACTION_SUBJECT_ID.PASTE_TASK_LIST
 };
-export function getContent(state, slice) {
-  var _state$schema = state.schema,
-    paragraph = _state$schema.nodes.paragraph,
-    link = _state$schema.marks.link;
+export function getContent(_ref) {
+  var schema = _ref.schema,
+    slice = _ref.slice;
+  var paragraph = schema.nodes.paragraph,
+    link = schema.marks.link;
   var nodeOrMarkName = new Set();
   slice.content.forEach(function (node) {
     if (node.type === paragraph && node.content.size === 0) {
@@ -96,14 +96,14 @@ export function getMediaTraceId(slice) {
   });
   return traceId;
 }
-function getActionSubjectId(view) {
-  var _view$state = view.state,
-    selection = _view$state.selection,
-    _view$state$schema$no = _view$state.schema.nodes,
-    paragraph = _view$state$schema$no.paragraph,
-    listItem = _view$state$schema$no.listItem,
-    taskItem = _view$state$schema$no.taskItem,
-    decisionItem = _view$state$schema$no.decisionItem;
+function getActionSubjectId(_ref2) {
+  var selection = _ref2.selection,
+    schema = _ref2.schema;
+  var _schema$nodes = schema.nodes,
+    paragraph = _schema$nodes.paragraph,
+    listItem = _schema$nodes.listItem,
+    taskItem = _schema$nodes.taskItem,
+    decisionItem = _schema$nodes.decisionItem;
   var parent = findParentNode(function (node) {
     if (node.type !== paragraph && node.type !== listItem && node.type !== taskItem && node.type !== decisionItem) {
       return true;
@@ -145,51 +145,64 @@ function createPastePayload(actionSubjectId, attributes, linkDomain) {
     }
   } : {});
 }
-export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
-  var text = event.clipboardData ? event.clipboardData.getData('text/plain') || event.clipboardData.getData('text/uri-list') : '';
-  var actionSubjectId = getActionSubjectId(view);
-  var pasteSize = slice.size;
-  var content = getContent(view.state, slice);
-  var linkUrls = [];
-  var mediaTraceId = getMediaTraceId(slice);
+function createPasteAnalyticsPayloadBySelection(event, slice, pasteContext) {
+  return function (selection) {
+    var text = event.clipboardData ? event.clipboardData.getData('text/plain') || event.clipboardData.getData('text/uri-list') : '';
+    var actionSubjectId = getActionSubjectId({
+      selection: selection,
+      schema: selection.$from.doc.type.schema
+    });
+    var pasteSize = slice.size;
+    var content = getContent({
+      schema: selection.$from.doc.type.schema,
+      slice: slice
+    });
+    var linkUrls = [];
+    var mediaTraceId = getMediaTraceId(slice);
 
-  // If we have a link among the pasted content, grab the
-  // domain and send it up with the analytics event
-  if (content === PasteContents.url || content === PasteContents.mixed) {
-    mapSlice(slice, function (node) {
-      var linkMark = node.marks.find(function (mark) {
-        return mark.type.name === 'link';
+    // If we have a link among the pasted content, grab the
+    // domain and send it up with the analytics event
+    if (content === PasteContents.url || content === PasteContents.mixed) {
+      mapSlice(slice, function (node) {
+        var linkMark = node.marks.find(function (mark) {
+          return mark.type.name === 'link';
+        });
+        if (linkMark) {
+          linkUrls.push(linkMark.attrs.href);
+        }
+        return node;
       });
-      if (linkMark) {
-        linkUrls.push(linkMark.attrs.href);
-      }
-      return node;
-    });
-  }
-  if (pasteContext.asPlain) {
-    return createPasteAsPlainPayload(actionSubjectId, text, linkUrls.length);
-  }
-  var source = getPasteSource(event);
-  if (pasteContext.type === PasteTypes.plain) {
+    }
+    if (pasteContext.asPlain) {
+      return createPasteAsPlainPayload(actionSubjectId, text, linkUrls.length);
+    }
+    var source = getPasteSource(event);
+    if (pasteContext.type === PasteTypes.plain) {
+      return createPastePayload(actionSubjectId, {
+        pasteSize: text.length,
+        type: pasteContext.type,
+        content: PasteContents.text,
+        source: source,
+        hyperlinkPasteOnText: false,
+        linksInPasteCount: linkUrls.length,
+        pasteSplitList: pasteContext.pasteSplitList
+      });
+    }
+    var linkDomains = linkUrls.map(getLinkDomain);
     return createPastePayload(actionSubjectId, {
-      pasteSize: text.length,
       type: pasteContext.type,
-      content: PasteContents.text,
+      pasteSize: pasteSize,
+      content: content,
       source: source,
-      hyperlinkPasteOnText: false,
-      linksInPasteCount: linkUrls.length
-    });
-  }
-  var linkDomains = linkUrls.map(getLinkDomain);
-  return createPastePayload(actionSubjectId, {
-    type: pasteContext.type,
-    pasteSize: pasteSize,
-    content: content,
-    source: source,
-    hyperlinkPasteOnText: !!pasteContext.hyperlinkPasteOnText,
-    linksInPasteCount: linkUrls.length,
-    mediaTraceId: mediaTraceId
-  }, linkDomains);
+      hyperlinkPasteOnText: !!pasteContext.hyperlinkPasteOnText,
+      linksInPasteCount: linkUrls.length,
+      mediaTraceId: mediaTraceId,
+      pasteSplitList: pasteContext.pasteSplitList
+    }, linkDomains);
+  };
+}
+export function createPasteAnalyticsPayload(view, event, slice, pasteContext) {
+  return createPasteAnalyticsPayloadBySelection(event, slice, pasteContext)(view.state.selection);
 }
 
 // TODO: ED-6612 We should not dispatch only analytics, it's preferred to wrap each command with his own analytics.
@@ -205,73 +218,104 @@ export function pasteCommandWithAnalytics(view, event, slice, pasteContext) {
   });
 }
 export var handlePasteAsPlainTextWithAnalytics = function handlePasteAsPlainTextWithAnalytics(view, event, slice) {
-  return pipe(handlePasteAsPlainText, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.plain,
     asPlain: true
-  }))(slice, event);
+  }))(handlePasteAsPlainText(slice, event));
 };
 export var handlePasteIntoTaskAndDecisionWithAnalytics = function handlePasteIntoTaskAndDecisionWithAnalytics(view, event, slice, type) {
-  return pipe(handlePasteIntoTaskOrDecisionOrPanel, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(slice);
+  }))(handlePasteIntoTaskOrDecisionOrPanel(slice));
 };
 export var handlePasteIntoCaptionWithAnalytics = function handlePasteIntoCaptionWithAnalytics(view, event, slice, type) {
-  return pipe(handlePasteIntoCaption, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(slice);
+  }))(handlePasteIntoCaption(slice));
 };
 export var handleCodeBlockWithAnalytics = function handleCodeBlockWithAnalytics(view, event, slice, text) {
-  return pipe(handleCodeBlock, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.plain
-  }))(text);
+  }))(handleCodeBlock(text));
 };
 export var handleMediaSingleWithAnalytics = function handleMediaSingleWithAnalytics(view, event, slice, type) {
-  return pipe(handleMediaSingle(INPUT_METHOD.CLIPBOARD), pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(slice);
+  }))(handleMediaSingle(INPUT_METHOD.CLIPBOARD)(slice));
 };
 export var handlePastePreservingMarksWithAnalytics = function handlePastePreservingMarksWithAnalytics(view, event, slice, type) {
-  return pipe(handlePastePreservingMarks, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type
-  }))(slice);
+  }))(handlePastePreservingMarks(slice));
 };
 export var handleMarkdownWithAnalytics = function handleMarkdownWithAnalytics(view, event, slice) {
-  return pipe(handleMarkdown, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.markdown
-  }))(slice);
+  }))(handleMarkdown(slice));
 };
 export var handleRichTextWithAnalytics = function handleRichTextWithAnalytics(view, event, slice) {
-  return pipe(handleRichText, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }))(slice);
+  }))(handleRichText(slice));
 };
-export var handlePastePanelIntoListWithAnalytics = function handlePastePanelIntoListWithAnalytics(view, event, slice) {
-  return pipe(handlePastePanelIntoList, pasteCommandWithAnalytics(view, event, slice, {
+function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
+  return function (mainCommand) {
+    return function (state, dispatch, view) {
+      var originalTransaction = state.tr;
+      var fakeDispatch = function fakeDispatch(tr) {
+        originalTransaction = tr;
+      };
+      var result = mainCommand(state, fakeDispatch, view);
+      if (!result) {
+        return false;
+      }
+      if (dispatch && originalTransaction.docChanged) {
+        // it needs to know the selection before the changes
+        var payload = createPayloadByTransaction(state.selection);
+        addAnalytics(state, originalTransaction, payload);
+        dispatch(originalTransaction);
+      }
+      return true;
+    };
+  };
+}
+export var handlePastePanelOrDecisionIntoListWithAnalytics = function handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice) {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }))(slice);
+  }))(handlePastePanelOrDecisionContentIntoList(slice));
+};
+export var handlePasteNonNestableBlockNodesIntoListWithAnalytics = function handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice) {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+    type: PasteTypes.richText,
+    pasteSplitList: true
+  }))(handlePasteNonNestableBlockNodesIntoList(slice));
 };
 export var handleExpandWithAnalytics = function handleExpandWithAnalytics(view, event, slice) {
-  return pipe(handleExpandPasteInTable, pasteCommandWithAnalytics(view, event, slice, {
-    type: PasteTypes.richText
-  }))(slice);
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
+    type: PasteTypes.richText,
+    pasteSplitList: true
+  }))(handleExpandPasteInTable(slice));
 };
 export var handleSelectedTableWithAnalytics = function handleSelectedTableWithAnalytics(view, event, slice) {
-  return pipe(handleSelectedTable, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }))(slice);
+  }))(handleSelectedTable(slice));
 };
 export var handlePasteLinkOnSelectedTextWithAnalytics = function handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, type) {
-  return pipe(handlePasteLinkOnSelectedText, pasteCommandWithAnalytics(view, event, slice, {
+  return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: type,
     hyperlinkPasteOnText: true
-  }))(slice);
+  }))(handlePasteLinkOnSelectedText(slice));
 };
-export var createPasteMeasurePayload = function createPasteMeasurePayload(_ref) {
-  var view = _ref.view,
-    duration = _ref.duration,
-    content = _ref.content,
-    distortedDuration = _ref.distortedDuration;
-  var pasteIntoNode = getActionSubjectId(view);
+export var createPasteMeasurePayload = function createPasteMeasurePayload(_ref3) {
+  var view = _ref3.view,
+    duration = _ref3.duration,
+    content = _ref3.content,
+    distortedDuration = _ref3.distortedDuration;
+  var pasteIntoNode = getActionSubjectId({
+    selection: view.state.selection,
+    schema: view.state.schema
+  });
   return {
     action: ACTION.PASTED_TIMED,
     actionSubject: ACTION_SUBJECT.EDITOR,

package/dist/esm/plugins/paste/pm-plugins/main.js

@@ -14,7 +14,7 @@ import { linkifyContent } from '../../hyperlink/utils';
 import { transformSliceNestedExpandToExpand } from '../../expand/utils';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
 import { transformSliceToJoinAdjacentCodeBlocks, transformSingleLineCodeBlockToCodeMark } from '../../code-block/utils';
-import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelIntoListWithAnalytics } from './analytics';
+import { createPasteMeasurePayload, getContentNodeTypes, handlePasteAsPlainTextWithAnalytics, handlePasteIntoTaskAndDecisionWithAnalytics, handleCodeBlockWithAnalytics, handleMediaSingleWithAnalytics, handlePastePreservingMarksWithAnalytics, handleMarkdownWithAnalytics, handleRichTextWithAnalytics, handleExpandWithAnalytics, handleSelectedTableWithAnalytics, handlePasteLinkOnSelectedTextWithAnalytics, sendPasteAnalyticsEvent, handlePasteIntoCaptionWithAnalytics, handlePastePanelOrDecisionIntoListWithAnalytics, handlePasteNonNestableBlockNodesIntoListWithAnalytics } from './analytics';
 import { analyticsPluginKey, PasteTypes } from '../../analytics';
 import { isInsideBlockQuote, insideTable, measurements } from '../../../utils';
 import { measureRender } from '@atlaskit/editor-common/utils';
@@ -32,13 +32,18 @@ import { extractSliceFromStep } from '../../../utils/step';
 import { pluginKey as stateKey, createPluginState } from './plugin-factory';
 export { pluginKey as stateKey } from './plugin-factory';
 export { md } from '../md';
+import { getFeatureFlags } from '../../feature-flags-context';
 export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, cardOptions, sanitizePrivateContent, providerFactory) {
   var atlassianMarkDownParser = new MarkdownTransformer(schema, md);
   function getMarkdownSlice(text, openStart, openEnd) {
     var textInput = text;
-    if (textInput.includes('\\')) {
-      textInput = textInput.replace(/\\/g, '\\\\');
+    var textSplitByCodeBlock = textInput.split(/```/);
+    for (var i = 0; i < textSplitByCodeBlock.length; i++) {
+      if (i % 2 === 0) {
+        textSplitByCodeBlock[i] = textSplitByCodeBlock[i].replace(/\\/g, '\\\\');
+      }
     }
+    textInput = textSplitByCodeBlock.join('```');
     var doc = atlassianMarkDownParser.parse(escapeLinks(textInput));
     if (doc && doc.content) {
       return new Slice(doc.content, openStart, openEnd);
@@ -350,7 +355,11 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, cardOptio
           if (handlePasteIntoCaptionWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
             return true;
           }
-          if (handlePastePanelIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+          var featureFlags = getFeatureFlags(state);
+          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+            return true;
+          }
+          if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
             return true;
           }
           return handleRichTextWithAnalytics(view, event, slice)(state, dispatch);

package/dist/esm/plugins/paste/util/index.js

@@ -11,19 +11,19 @@ export function isPastedFromWord(html) {
 export function isPastedFromExcel(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:excel') >= 0;
 }
-export function isPastedFromDropboxPaper(html) {
+function isPastedFromDropboxPaper(html) {
   return !!html && !!html.match(/class=\"\s?author-d-.+"/gim);
 }
-export function isPastedFromGoogleDocs(html) {
+function isPastedFromGoogleDocs(html) {
   return !!html && !!html.match(/id=\"docs-internal-guid-.+"/gim);
 }
-export function isPastedFromGoogleSpreadSheets(html) {
+function isPastedFromGoogleSpreadSheets(html) {
   return !!html && !!html.match(/data-sheets-.+=/gim);
 }
-export function isPastedFromPages(html) {
+function isPastedFromPages(html) {
   return !!html && html.indexOf('content="Cocoa HTML Writer"') >= 0;
 }
-export function isPastedFromFabricEditor(html) {
+function isPastedFromFabricEditor(html) {
   return !!html && html.indexOf('data-pm-slice="') >= 0;
 }
 export var isSingleLine = function isSingleLine(text) {
@@ -52,46 +52,6 @@ export function getPasteSource(event) {
   return 'uncategorized';
 }
 
-// TODO: Write JEST tests for this part
-export function isCode(str) {
-  var lines = str.split(/\r?\n|\r/);
-  if (3 > lines.length) {
-    return false;
-  }
-  var weight = 0;
-  lines.forEach(function (line) {
-    // Ends with : or ;
-    if (/[:;]$/.test(line)) {
-      weight++;
-    }
-    // Contains second and third braces
-    if (/[{}\[\]]/.test(line)) {
-      weight++;
-    }
-    // Contains <tag> or </
-    if (/<\w+>/.test(line) || /<\//.test(line)) {
-      weight++;
-    }
-    // Contains () <- function calls
-    if (/\(\)/.test(line)) {
-      weight++;
-    }
-    // Contains a link
-    if (/(^|[^!])\[(.*?)\]\((\S+)\)$/.test(line)) {
-      weight--;
-    }
-    // New line starts with less than two chars. e.g- if, {, <, etc
-    var token = /^(\s+)[a-zA-Z<{]{2,}/.exec(line);
-    if (token && 2 <= token[1].length) {
-      weight++;
-    }
-    if (/&&/.test(line)) {
-      weight++;
-    }
-  });
-  return 4 <= weight && weight >= 0.5 * lines.length;
-}
-
 // @see https://product-fabric.atlassian.net/browse/ED-3159
 // @see https://github.com/markdown-it/markdown-it/issues/38
 export function escapeLinks(text) {

package/dist/esm/plugins/placeholder-text/index.js

@@ -224,7 +224,7 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
   };
   return plugin;
 };
-var placeholderTextPlugin = function placeholderTextPlugin(options) {
-  return decorateWithPluginOptions(basePlaceholderTextPlugin(options), options);
+var placeholderTextPlugin = function placeholderTextPlugin(options, api) {
+  return decorateWithPluginOptions(basePlaceholderTextPlugin(options, api), options);
 };
 export default placeholderTextPlugin;

package/dist/esm/plugins/quick-insert/assets/index.js

@@ -172,16 +172,6 @@ export var IconPanel = Loadable({
     return null;
   }
 });
-export var IconCustomPanel = Loadable({
-  loader: function loader() {
-    return import( /* webpackChunkName: "@atlaskit-internal_editor-icon-custon-panel" */'./custom-panel').then(function (module) {
-      return module.default;
-    });
-  },
-  loading: function loading() {
-    return null;
-  }
-});
 export var IconQuote = Loadable({
   loader: function loader() {
     return import( /* webpackChunkName: "@atlaskit-internal_editor-icon-quote" */'./quote').then(function (module) {
@@ -202,16 +192,6 @@ export var IconStatus = Loadable({
     return null;
   }
 });
-export var IconFallback = Loadable({
-  loader: function loader() {
-    return import( /* webpackChunkName: "@atlaskit-internal_editor-icon-fallback" */'./fallback').then(function (module) {
-      return module.default;
-    });
-  },
-  loading: function loading() {
-    return null;
-  }
-});
 function importHeading(level) {
   switch (level) {
     case 1:

package/dist/esm/plugins/selection/gap-cursor/actions.js

@@ -1,52 +1,16 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _mapDirection;
 import { NodeSelection, Selection, TextSelection } from 'prosemirror-state';
-import { findDomRefAtPos, removeNodeBefore } from 'prosemirror-utils';
+import { findDomRefAtPos, findPositionOfNodeBefore, removeNodeBefore } from 'prosemirror-utils';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { Direction, isBackward, isForward } from './direction';
 import { GapCursorSelection, Side } from './selection';
-import { getMediaNearPos, isTextBlockNearPos } from './utils';
+import { isTextBlockNearPos } from './utils';
 import { isValidTargetNode } from './utils/is-valid-target-node';
 import { atTheBeginningOfDoc, atTheEndOfDoc } from '../../../utils/prosemirror/position';
 import { gapCursorPluginKey } from '../pm-plugins/gap-cursor-plugin-key';
 import { isPositionNearTableRow } from '../../../utils/table';
-var mapDirection = (_mapDirection = {}, _defineProperty(_mapDirection, Direction.LEFT, -1), _defineProperty(_mapDirection, Direction.RIGHT, 1), _defineProperty(_mapDirection, Direction.UP, -1), _defineProperty(_mapDirection, Direction.DOWN, 1), _defineProperty(_mapDirection, Direction.BACKWARD, -1), _defineProperty(_mapDirection, Direction.FORWARD, 1), _mapDirection);
-function shouldHandleMediaGapCursor(dir, state) {
-  var doc = state.doc,
-    schema = state.schema,
-    selection = state.selection;
-  var $pos = isBackward(dir) ? selection.$from : selection.$to;
-  if (selection instanceof TextSelection) {
-    // Should not use gap cursor if I am moving from a text selection into a media node
-    if (dir === Direction.UP && !atTheBeginningOfDoc(state) || dir === Direction.DOWN && !atTheEndOfDoc(state)) {
-      var media = getMediaNearPos(doc, $pos, schema, mapDirection[dir]);
-      if (media) {
-        return false;
-      }
-    }
-
-    // Should not use gap cursor if I am moving from a text selection into a media node with layout wrap-right or wrap-left
-    if (dir === Direction.LEFT || dir === Direction.RIGHT) {
-      var _media = getMediaNearPos(doc, $pos, schema, mapDirection[dir]);
-      var mediaSingle = schema.nodes.mediaSingle;
-      if (_media && _media.type === mediaSingle && (_media.attrs.layout === 'wrap-right' || _media.attrs.layout === 'wrap-left')) {
-        return false;
-      }
-    }
-  }
-  if (selection instanceof NodeSelection) {
-    // Should not use gap cursor if I am moving left/right from media node with layout wrap right or wrap-left
-    if (dir === Direction.LEFT || dir === Direction.RIGHT) {
-      var maybeMedia = doc.nodeAt(selection.$from.pos);
-      var _mediaSingle = schema.nodes.mediaSingle;
-      if (maybeMedia && maybeMedia.type === _mediaSingle && (maybeMedia.attrs.layout === 'wrap-right' || maybeMedia.attrs.layout === 'wrap-left')) {
-        return false;
-      }
-    }
-  }
-  return true;
-}
+import { isMediaNode, isNodeBeforeMediaNode } from '@atlaskit/editor-common/utils';
 export var shouldSkipGapCursor = function shouldSkipGapCursor(direction, state, $pos) {
+  var _$pos$nodeBefore;
   var doc = state.doc,
     schema = state.schema;
   switch (direction) {
@@ -54,13 +18,48 @@ export var shouldSkipGapCursor = function shouldSkipGapCursor(direction, state,
       if (atTheBeginningOfDoc(state)) {
         return false;
       }
-      return isPositionNearTableRow($pos, schema, 'before') || isTextBlockNearPos(doc, schema, $pos, -1);
+      return isPositionNearTableRow($pos, schema, 'before') || isTextBlockNearPos(doc, schema, $pos, -1) || isNodeBeforeMediaNode($pos, state);
     case Direction.DOWN:
-      return atTheEndOfDoc(state) || isTextBlockNearPos(doc, schema, $pos, 1) || isPositionNearTableRow($pos, schema, 'after');
+      return atTheEndOfDoc(state) || isTextBlockNearPos(doc, schema, $pos, 1) || isPositionNearTableRow($pos, schema, 'after') || ((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.type.name) === 'text' && !$pos.nodeAfter // end of a paragraph
+      ;
+
     default:
       return false;
   }
 };
+
+// These cases should be handled using the handleMediaGapCursor function
+function shouldHandleMediaGapCursor(dir, state) {
+  var _selection$$from$node;
+  var selection = state.selection;
+  var upArrowFromGapCursorIntoMedia = selection instanceof GapCursorSelection && dir === Direction.UP && selection.$from.nodeBefore && isMediaNode(selection.$from.nodeBefore);
+  var downArrowFromGapCursorIntoMediaGroup = selection instanceof GapCursorSelection && dir === Direction.DOWN && ((_selection$$from$node = selection.$from.nodeAfter) === null || _selection$$from$node === void 0 ? void 0 : _selection$$from$node.type.name) === 'mediaGroup';
+  return upArrowFromGapCursorIntoMedia || downArrowFromGapCursorIntoMediaGroup;
+}
+
+// Handle media gap cursor for up/down arrow into media nodes
+// Should check this case by using shouldHandleMediaGapCursor first
+function handleMediaGapCursor(dir, state) {
+  var selection = state.selection,
+    tr = state.tr;
+  var $pos = isBackward(dir) ? selection.$from : selection.$to;
+  if (dir === Direction.UP && selection.$from.nodeBefore && isMediaNode(selection.$from.nodeBefore)) {
+    var _tr$doc$nodeAt;
+    var nodeBeforePos = findPositionOfNodeBefore(tr.selection);
+    if (nodeBeforePos && selection.side === 'right' && ((_tr$doc$nodeAt = tr.doc.nodeAt(nodeBeforePos)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type.name) === 'mediaSingle') {
+      tr.setSelection(new NodeSelection(tr.doc.resolve(nodeBeforePos))).scrollIntoView();
+    } else if (nodeBeforePos || nodeBeforePos === 0) {
+      tr.setSelection(new GapCursorSelection(tr.doc.resolve(nodeBeforePos), Side.LEFT)).scrollIntoView();
+    }
+  }
+  if (dir === Direction.DOWN && selection.$from.nodeAfter) {
+    var nodeAfterPos = selection.side === 'right' ? $pos.pos : $pos.pos + selection.$from.nodeAfter.nodeSize;
+    if (nodeAfterPos) {
+      tr.setSelection(new GapCursorSelection(tr.doc.resolve(nodeAfterPos), Side.LEFT)).scrollIntoView();
+    }
+  }
+  return tr;
+}
 export var arrow = function arrow(dir, endOfTextblock) {
   return function (state, dispatch, view) {
     var doc = state.doc,
@@ -89,13 +88,21 @@ export var arrow = function arrow(dir, endOfTextblock) {
       if (selection.node.isInline) {
         return false;
       }
-      if (dir === Direction.UP || dir === Direction.DOWN) {
+      if (dir === Direction.UP && !atTheBeginningOfDoc(state) && !isNodeBeforeMediaNode($pos, state) || dir === Direction.DOWN) {
         // We dont add gap cursor on node selections going up and down
+        // Except we do if we're going up for a block node which is the
+        // first node in the document OR the node before is a media node
         return false;
       }
     }
-    if (!shouldHandleMediaGapCursor(dir, state)) {
-      return false;
+
+    // Handle media gap cursor for up/down arrow into media nodes
+    if (shouldHandleMediaGapCursor(dir, state)) {
+      var updatedTr = handleMediaGapCursor(dir, state);
+      if (dispatch) {
+        dispatch(updatedTr);
+      }
+      return true;
     }
 
     // when jumping between block nodes at the same depth, we need to reverse cursor without changing ProseMirror position

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

@@ -31,7 +31,10 @@ var baseStatusPlugin = function baseStatusPlugin(options) {
       }];
     },
     contentComponent: function contentComponent(_ref) {
-      var editorView = _ref.editorView;
+      var editorView = _ref.editorView,
+        popupsMountPoint = _ref.popupsMountPoint,
+        popupsBoundariesElement = _ref.popupsBoundariesElement,
+        popupsScrollableElement = _ref.popupsScrollableElement;
       var domAtPos = editorView.domAtPos.bind(editorView);
       return /*#__PURE__*/React.createElement(WithPluginState, {
         plugins: {
@@ -59,6 +62,9 @@ var baseStatusPlugin = function baseStatusPlugin(options) {
             defaultText: text,
             defaultColor: color,
             defaultLocalId: localId,
+            mountTo: popupsMountPoint,
+            boundariesElement: popupsBoundariesElement,
+            scrollableElement: popupsScrollableElement,
             onSelect: function onSelect(status) {
               updateStatus(status)(editorView.state, editorView.dispatch);
             },
@@ -109,7 +115,7 @@ var decorateWithPluginOptions = function decorateWithPluginOptions(plugin, optio
   };
   return plugin;
 };
-var statusPlugin = function statusPlugin(options) {
-  return decorateWithPluginOptions(baseStatusPlugin(options), options);
+var statusPlugin = function statusPlugin(options, api) {
+  return decorateWithPluginOptions(baseStatusPlugin(options, api), options);
 };
 export default statusPlugin;

package/dist/esm/plugins/status/ui/statusPicker.js

@@ -199,7 +199,10 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
     value: function render() {
       var _this$props = this.props,
         isNew = _this$props.isNew,
-        target = _this$props.target;
+        target = _this$props.target,
+        mountTo = _this$props.mountTo,
+        boundariesElement = _this$props.boundariesElement,
+        scrollableElement = _this$props.scrollableElement;
       var _this$state3 = this.state,
         color = _this$state3.color,
         text = _this$state3.text;
@@ -209,7 +212,10 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
         handleClickOutside: this.handleClickOutside,
         handleEscapeKeydown: this.handleEscapeKeydown,
         zIndex: akEditorFloatingDialogZIndex,
-        fitHeight: 40
+        fitHeight: 40,
+        mountTo: mountTo,
+        boundariesElement: boundariesElement,
+        scrollableElement: scrollableElement
       }, jsx("div", {
         css: pickerContainer,
         onClick: this.handlePopupClick