@atlaskit/editor-core 187.44.3 → 187.44.6

package/dist/cjs/utils/document.js

@@ -15,32 +15,12 @@ exports.getChangedNodesIn = getChangedNodesIn;
 exports.getChildBreakoutModes = getChildBreakoutModes;
 exports.getNodesCount = getNodesCount;
 exports.isInEmptyLine = isInEmptyLine;
-exports.isNodeEmpty = isNodeEmpty;
 exports.nodesBetweenChanged = nodesBetweenChanged;
 exports.processRawFragmentValue = processRawFragmentValue;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _nodeWidth = require("./node-width");
 var _utils = require("@atlaskit/editor-common/utils");
-/**
- * Checks if a node has any content. Ignores node that only contain empty block nodes.
- */
-function isNodeEmpty(node) {
-  if (node && node.textContent) {
-    return false;
-  }
-  if (!node || !node.childCount || node.childCount === 1 && (0, _utils.isEmptyParagraph)(node.firstChild)) {
-    return true;
-  }
-  var block = [];
-  var nonBlock = [];
-  node.forEach(function (child) {
-    child.isInline ? nonBlock.push(child) : block.push(child);
-  });
-  return !nonBlock.length && !block.filter(function (childNode) {
-    return !!childNode.childCount && !(childNode.childCount === 1 && (0, _utils.isEmptyParagraph)(childNode.firstChild)) || childNode.isAtom;
-  }).length;
-}
 function isInEmptyLine(state) {
   var selection = state.selection;
   var _ref = selection,

package/dist/cjs/utils/index.js

@@ -75,12 +75,6 @@ Object.defineProperty(exports, "isLinkMark", {
   }
 });
 exports.isMarkTypeAllowedInCurrentSelection = isMarkTypeAllowedInCurrentSelection;
-Object.defineProperty(exports, "isNodeEmpty", {
-  enumerable: true,
-  get: function get() {
-    return _document.isNodeEmpty;
-  }
-});
 Object.defineProperty(exports, "isParagraph", {
   enumerable: true,
   get: function get() {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.44.3";
+var version = "187.44.6";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/plugins/expand/pm-plugins/keymap.js

@@ -8,7 +8,7 @@ import { expandClassNames } from '../ui/class-names';
 import { deleteExpand, focusTitle } from '../commands';
 import { getPluginState as getSelectionPluginState } from '../../selection/plugin-factory';
 import { RelativeSelectionPos } from '../../selection/types';
-import { isPositionNearTableRow } from '../../../utils/table';
+import { isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
 };

package/dist/es2019/plugins/floating-toolbar/ui/Dropdown.js

@@ -8,7 +8,7 @@ import UiDropdown from '../../../ui/Dropdown';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';
 const dropdownExpandContainer = css`
-  margin: 0px -4px;
+  margin: 0px ${"var(--ds-space-negative-050, -4px)"};
 `;
 const iconGroup = css`
   display: flex;
@@ -97,7 +97,8 @@ export default class Dropdown extends Component {
       buttonTestId,
       dropdownWidth,
       editorView,
-      dropdownListId
+      dropdownListId,
+      alignDropdownWithToolbar
     } = this.props;
     let trigger;
     if (icon) {
@@ -152,7 +153,8 @@ export default class Dropdown extends Component {
       fitHeight: fitHeight + fitTolerance,
       trigger: trigger,
       editorView: editorView,
-      dropdownListId: dropdownListId
+      dropdownListId: dropdownListId,
+      alignDropdownWithParentElement: alignDropdownWithToolbar
     }, Array.isArray(options) ? this.renderArrayOptions(options) : options.render({
       hide: this.hide,
       dispatchCommand

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

@@ -116,7 +116,8 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           buttonTestId: item.testId,
           editorView: editorView,
           setDisableParentScroll: scrollable ? setDisableScroll : undefined,
-          dropdownListId: (item === null || item === void 0 ? void 0 : item.id) && `${item.id}-dropdownList`
+          dropdownListId: (item === null || item === void 0 ? void 0 : item.id) && `${item.id}-dropdownList`,
+          alignDropdownWithToolbar: items.length === 1
         });
       case 'select':
         if (item.selectType === 'list') {

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

@@ -23,7 +23,7 @@ import CaptionPlaceholder from '../ui/CaptionPlaceholder';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { calcMediaSinglePixelWidth, MEDIA_SINGLE_GUTTER_SIZE, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
+import { calcMediaSinglePixelWidth, MEDIA_SINGLE_GUTTER_SIZE, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode } from '@atlaskit/editor-common/media-single';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export default class MediaSingleNode extends Component {
   constructor(...args) {
@@ -201,6 +201,7 @@ export default class MediaSingleNode extends Component {
     });
   }
   render() {
+    var _pluginInjectionApi$m;
     const {
       selected,
       getPos,
@@ -257,8 +258,9 @@ export default class MediaSingleNode extends Component {
       height = DEFAULT_IMAGE_HEIGHT;
     }
     const isSelected = selected();
+    const currentMaxWidth = isSelected ? pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth : undefined;
     const contentWidthForLegacyExperience = getMaxWidthForNestedNode(view, getPos()) || lineLength;
-    const contentWidth = getMaxWidthForNestedNodeNext(view, getPos()) || lineLength;
+    const contentWidth = currentMaxWidth || lineLength;
     const mediaSingleProps = {
       layout,
       width,

package/dist/es2019/plugins/media/pm-plugins/keymap-media-single.js

@@ -3,7 +3,7 @@ import { bindKeymapWithCommand, backspace } from '@atlaskit/editor-common/keymap
 import { isEmptyNode, isSelectionInsideLastNodeInDocument } from '../../../utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { selectNodeBackward } from '@atlaskit/editor-prosemirror/commands';
-import { atTheEndOfDoc } from '../../../utils/prosemirror/position';
+import { atTheEndOfDoc } from '@atlaskit/editor-common/selection';
 
 /**
  * Check if is an empty selection at the start of the node

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

@@ -20,11 +20,10 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 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';
 import { MediaTaskManager } from './mediaTaskManager';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
+import { getMaxWidthForNestedNodeNext, CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 export { stateKey } from './plugin-key';
 export const MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 export const MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';

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

@@ -26,7 +26,7 @@ import ImageBorderItem from '../ui/ImageBorder';
 import { currentMediaNodeBorderMark } from '../utils/current-media-node';
 import { shouldShowImageBorder } from './imageBorder';
 import { PixelEntry, FullWidthDisplay } from '../ui/PixelEntry';
-import { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, calcMinWidth, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
+import { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, calcMinWidth } from '@atlaskit/editor-common/media-single';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 const remove = (state, dispatch) => {
   if (dispatch) {
@@ -266,7 +266,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         type: 'custom',
         fallback: [],
         render: editorView => {
-          var _widthPlugin$sharedSt2;
+          var _widthPlugin$sharedSt2, _pluginInjectionApi$m;
           if (!editorView || !selectedMediaSingleNode) {
             return null;
           }
@@ -288,7 +288,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             width: mediaWidth,
             height: mediaHeight
           } = selectedMediaNode.attrs;
-          const maxWidthForNestedNode = getMaxWidthForNestedNodeNext(editorView, selectedMediaSingleNode.pos);
+          const maxWidthForNestedNode = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth;
           const maxWidth = maxWidthForNestedNode || akEditorFullWidthLayoutWidth;
           const isVideoFile = isVideo(selectedMediaNode.attrs.__fileMimeType);
           const minWidth = calcMinWidth(isVideoFile, maxWidthForNestedNode || contentWidth);

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

@@ -4,14 +4,14 @@ import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { N200 } from '@atlaskit/theme/colors';
 import { messages } from './messages';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 const placeholder = css`
   color: ${`var(--ds-text-subtlest, ${N200})`};
   width: 100%;
   text-align: center;
-  margin-top: 8px !important;
+  margin-top: ${"var(--ds-space-100, 8px)"} !important;
   display: block;
 `;
-export const CAPTION_PLACEHOLDER_ID = 'caption-placeholder';
 export default /*#__PURE__*/React.forwardRef(({
   onClick
 }, ref) => {

package/dist/es2019/plugins/media/utils/media-common.js

@@ -6,8 +6,7 @@ import { isTemporary } from '../../../utils';
 import { mapSlice } from '../../../utils/slice';
 import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '../../../utils/dom';
 import { isImage } from './is-image';
-import { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, startPositionOfParent, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 export const isMediaBlobUrlFromAttrs = attrs => {
   return !!(attrs && attrs.type === 'external' && isMediaBlobUrl(attrs.url));

package/dist/es2019/plugins/media/utils/media-files.js

@@ -3,7 +3,7 @@ import { setNodeSelection, setTextSelection, insideTableCell, isInListItem, find
 import { isInLayoutColumn, isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { posOfPrecedingMediaGroup, posOfMediaGroupNearby, posOfParentMediaGroup, isSelectionNonMediaBlockNode, isInsidePotentialEmptyParagraph, copyOptionalAttrsFromMediaState } from './media-common';
 import { canInsert, safeInsert, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
-import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
+import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '@atlaskit/editor-common/selection';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 export const canInsertMediaInline = state => {
   const node = state.schema.nodes.mediaInline.create({});

package/dist/es2019/plugins/media/utils/media-single.js

@@ -8,7 +8,7 @@ import { mapSlice } from '../../../utils/slice';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { safeInsert, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { isImage } from './is-image';
-import { atTheBeginningOfBlock } from '../../../utils/prosemirror/position';
+import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
 import { getRandomHex } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const getInsertMediaAnalytics = (inputMethod, fileExtension) => ({

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

@@ -4,7 +4,7 @@ import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state
 import { placeholder } from '@atlaskit/adf-schema';
 import MediaServicesTextIcon from '@atlaskit/icon/glyph/media-services/text';
 import WithPluginState from '../../ui/WithPluginState';
-import { isNodeEmpty } from '../../utils';
+import { isNodeEmpty } from '@atlaskit/editor-common/utils';
 import { FakeTextCursorSelection } from '../fake-text-cursor/cursor';
 import PlaceholderFloatingToolbar from './ui/PlaceholderFloatingToolbar';
 import { hidePlaceholderFloatingToolbar, insertPlaceholderTextAtSelection } from './actions';

package/dist/es2019/plugins/selection/commands.js

@@ -1,8 +1,7 @@
 import { NodeSelection, TextSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { GapCursorSelection, Side } from './gap-cursor-selection';
 import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
-import { isNodeEmpty } from '../../utils/document';
-import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
+import { isNodeEmpty, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { SelectionActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { isSelectableContainerNode, isSelectionAtEndOfParentNode, findSelectableContainerParent, isSelectionAtStartOfParentNode, findSelectableContainerBefore, findSelectableContainerAfter, findFirstChildNodeToSelect, findLastChildNodeToSelect } from './utils';

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

@@ -1,14 +1,12 @@
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findPositionOfNodeBefore, removeNodeBefore } from '@atlaskit/editor-prosemirror/utils';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { Direction, isBackward, isForward } from './direction';
 import { GapCursorSelection, Side } from './selection';
 import { isTextBlockNearPos } from './utils';
 import { isValidTargetNode } from './utils/is-valid-target-node';
-import { atTheBeginningOfDoc, atTheEndOfDoc } from '../../../utils/prosemirror/position';
+import { atTheBeginningOfDoc, atTheEndOfDoc } from '@atlaskit/editor-common/selection';
 import { gapCursorPluginKey } from '../pm-plugins/gap-cursor-plugin-key';
-import { isPositionNearTableRow } from '../../../utils/table';
-import { isMediaNode, isNodeBeforeMediaNode } from '@atlaskit/editor-common/utils';
+import { ZERO_WIDTH_SPACE, isMediaNode, isNodeBeforeMediaNode, isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 export const shouldSkipGapCursor = (direction, state, $pos) => {
   var _$pos$nodeBefore;
   const {

package/dist/es2019/plugins/selection/gap-cursor/utils.js

@@ -1,6 +1,6 @@
 import { TableSharedCssClassName, UnsupportedSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { Side } from './selection';
-import { CAPTION_PLACEHOLDER_ID } from '../../media/ui/CaptionPlaceholder';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 export const isLeftCursor = side => side === Side.LEFT;
 export function getMediaNearPos(doc, $pos, schema, dir = -1) {
   let $currentPos = $pos;
@@ -109,7 +109,7 @@ export const isIgnoredClick = elem => {
   return false;
 };
 
-/* 
+/*
   Calculates custom style for breakout mode
   Mainly to handle table width to include the numbered column width as well
 */

package/dist/es2019/plugins/selection/plugin-factory.js

@@ -1,7 +1,7 @@
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { pluginFactory } from '../../utils/plugin-state-factory';
+import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { reducer } from './reducer';
 import { selectionPluginKey } from './types';
 import { getDecorations, isSelectableContainerNode } from './utils';

package/dist/es2019/plugins/selection/pm-plugins/events/create-selection-between.js

@@ -1,4 +1,7 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+function isNodeContentEmpty(maybeNode) {
+  return (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.content.size) === 0 || (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.textContent) === '';
+}
 function findEmptySelectableParentNodePosition($pos, isValidPosition) {
   const {
     doc
@@ -38,8 +41,7 @@ const checkPositionNode = $pos => {
   if (maybeNode.isAtom) {
     return true;
   }
-  const isParentEmpty = maybeNode.content.size === 0 || maybeNode.textContent === '';
-  return isParentEmpty && NodeSelection.isSelectable(maybeNode);
+  return isNodeContentEmpty(maybeNode) && NodeSelection.isSelectable(maybeNode);
 };
 function findNextSelectionPosition({
   $targetHead,
@@ -57,7 +59,7 @@ function findNextSelectionPosition({
   return null;
 }
 export const onCreateSelectionBetween = (view, $anchor, $head) => {
-  var _$head$parent;
+  var _$head$parent, _$head$parent2;
   if ($anchor.pos === $head.pos) {
     return null;
   }
@@ -69,6 +71,11 @@ export const onCreateSelectionBetween = (view, $anchor, $head) => {
   if ($head.depth === 1 && ((_$head$parent = $head.parent) === null || _$head$parent === void 0 ? void 0 : _$head$parent.type.name) === 'paragraph') {
     return null;
   }
+
+  // If head is at the beginning of a non-empty textblock, let ProseMirror handle the text selection
+  if ((_$head$parent2 = $head.parent) !== null && _$head$parent2 !== void 0 && _$head$parent2.isTextblock && !isNodeContentEmpty($head.parent) && $head.parentOffset === 0) {
+    return null;
+  }
   const $nextHeadPosition = findNextSelectionPosition({
     $targetHead: $head,
     $anchor,

package/dist/es2019/plugins/selection/pm-plugins/keymap.js

@@ -1,5 +1,5 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { bindKeymapWithCommand, moveRight, moveLeft } from '../../../keymaps';
+import { bindKeymapWithCommand, moveRight, moveLeft } from '@atlaskit/editor-common/keymaps';
 import { arrowRight, arrowLeft } from '../commands';
 function keymapPlugin() {
   const list = {};

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

@@ -2,12 +2,10 @@ import { NodeSelection, TextSelection, Selection, AllSelection } from '@atlaskit
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { flatten, findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-import { isSelectionAtStartOfNode, isSelectionAtEndOfNode } from '@atlaskit/editor-common/selection';
-import { selectNode } from '../../utils/commands';
+import { isSelectionAtStartOfNode, isSelectionAtEndOfNode, getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, selectNode } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
 import { selectionPluginKey } from './types';
-import { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload } from '@atlaskit/editor-common/selection';
 export function createSelectionClickHandler(nodes, isValidTarget, options) {
   return function handleClickOn(view, pos, node, nodePos, event, direct) {
     if (options.useLongPressSelection) {

package/dist/es2019/utils/commands.js

@@ -1,4 +1,3 @@
-import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 /**
  * Creates a filter that checks if the node at a given number of parents above the current
  * selection is of the correct node type.
@@ -22,21 +21,4 @@ const withScrollIntoView = command => (state, dispatch, view) => command(state,
     dispatch(tr);
   }
 }, view);
-
-/**
- * Insert content, delete a range and create a new selection
- * This function automatically handles the mapping of positions for insertion and deletion.
- * The new selection is handled as a function since it may not always be necessary to resolve a position to the transactions mapping
- *
- * @param getSelectionResolvedPos get the resolved position to create a new selection
- * @param insertions content to insert at the specified position
- * @param deletions the ranges to delete
- */
-
-const selectNode = pos => (state, dispatch) => {
-  if (dispatch) {
-    dispatch(state.tr.setSelection(new NodeSelection(state.doc.resolve(pos))));
-  }
-  return true;
-};
-export { isNthParentOfType, withScrollIntoView, selectNode };
+export { isNthParentOfType, withScrollIntoView };

package/dist/es2019/utils/document.js

@@ -2,24 +2,6 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { getBreakoutMode } from './node-width';
 import { processRawValue, hasDocAsParent, getStepRange, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 export { findFarthestParentNode } from '@atlaskit/editor-common/utils';
-
-/**
- * Checks if a node has any content. Ignores node that only contain empty block nodes.
- */
-export function isNodeEmpty(node) {
-  if (node && node.textContent) {
-    return false;
-  }
-  if (!node || !node.childCount || node.childCount === 1 && isEmptyParagraph(node.firstChild)) {
-    return true;
-  }
-  const block = [];
-  const nonBlock = [];
-  node.forEach(child => {
-    child.isInline ? nonBlock.push(child) : block.push(child);
-  });
-  return !nonBlock.length && !block.filter(childNode => !!childNode.childCount && !(childNode.childCount === 1 && isEmptyParagraph(childNode.firstChild)) || childNode.isAtom).length;
-}
 export function isInEmptyLine(state) {
   const {
     selection

package/dist/es2019/utils/index.js

@@ -4,7 +4,7 @@ import { FakeTextCursorSelection } from '../plugins/fake-text-cursor/cursor';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export { isEmptyNode, isSelectionInsideLastNodeInDocument, checkNodeDown, insideTableCell, isInListItem } from '@atlaskit/editor-common/utils';
 export { insideTable } from '@atlaskit/editor-common/core-utils';
-export { isNodeEmpty, findFarthestParentNode, nodesBetweenChanged, getNodesCount } from './document';
+export { findFarthestParentNode, nodesBetweenChanged, getNodesCount } from './document';
 export { isParagraph, isText, isLinkMark } from './nodes';
 export { setNodeSelection, setTextSelection } from './selection';
 export { default as measurements } from './performance/measure-enum';

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.44.3";
+export const version = "187.44.6";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/expand/pm-plugins/keymap.js

@@ -8,7 +8,7 @@ import { expandClassNames } from '../ui/class-names';
 import { deleteExpand, focusTitle } from '../commands';
 import { getPluginState as getSelectionPluginState } from '../../selection/plugin-factory';
 import { RelativeSelectionPos } from '../../selection/types';
-import { isPositionNearTableRow } from '../../../utils/table';
+import { isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 var isExpandNode = function isExpandNode(node) {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
 };

package/dist/esm/plugins/floating-toolbar/ui/Dropdown.js

@@ -19,7 +19,7 @@ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import UiDropdown from '../../../ui/Dropdown';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';
-var dropdownExpandContainer = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin: 0px -4px;\n"])));
+var dropdownExpandContainer = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin: 0px ", ";\n"])), "var(--ds-space-negative-050, -4px)");
 var iconGroup = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n"])));
 var CompositeIcon = function CompositeIcon(_ref) {
   var icon = _ref.icon;
@@ -112,7 +112,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         buttonTestId = _this$props2.buttonTestId,
         dropdownWidth = _this$props2.dropdownWidth,
         editorView = _this$props2.editorView,
-        dropdownListId = _this$props2.dropdownListId;
+        dropdownListId = _this$props2.dropdownListId,
+        alignDropdownWithToolbar = _this$props2.alignDropdownWithToolbar;
       var trigger;
       if (icon) {
         var TriggerIcon = hideExpandIcon ? icon : jsx(CompositeIcon, {
@@ -166,7 +167,8 @@ var Dropdown = /*#__PURE__*/function (_Component) {
         fitHeight: fitHeight + fitTolerance,
         trigger: trigger,
         editorView: editorView,
-        dropdownListId: dropdownListId
+        dropdownListId: dropdownListId,
+        alignDropdownWithParentElement: alignDropdownWithToolbar
       }, Array.isArray(options) ? this.renderArrayOptions(options) : options.render({
         hide: this.hide,
         dispatchCommand: dispatchCommand

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

@@ -139,7 +139,8 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           buttonTestId: item.testId,
           editorView: editorView,
           setDisableParentScroll: scrollable ? setDisableScroll : undefined,
-          dropdownListId: (item === null || item === void 0 ? void 0 : item.id) && "".concat(item.id, "-dropdownList")
+          dropdownListId: (item === null || item === void 0 ? void 0 : item.id) && "".concat(item.id, "-dropdownList"),
+          alignDropdownWithToolbar: items.length === 1
         });
       case 'select':
         if (item.selectType === 'list') {

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

@@ -36,7 +36,7 @@ import CaptionPlaceholder from '../ui/CaptionPlaceholder';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { calcMediaSinglePixelWidth, MEDIA_SINGLE_GUTTER_SIZE, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
+import { calcMediaSinglePixelWidth, MEDIA_SINGLE_GUTTER_SIZE, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode } from '@atlaskit/editor-common/media-single';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var MediaSingleNode = /*#__PURE__*/function (_Component) {
   _inherits(MediaSingleNode, _Component);
@@ -294,6 +294,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
+      var _pluginInjectionApi$m;
       var _this$props2 = this.props,
         selected = _this$props2.selected,
         getPos = _this$props2.getPos,
@@ -341,8 +342,9 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         height = DEFAULT_IMAGE_HEIGHT;
       }
       var isSelected = selected();
+      var currentMaxWidth = isSelected ? pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth : undefined;
       var contentWidthForLegacyExperience = getMaxWidthForNestedNode(view, getPos()) || lineLength;
-      var contentWidth = getMaxWidthForNestedNodeNext(view, getPos()) || lineLength;
+      var contentWidth = currentMaxWidth || lineLength;
       var mediaSingleProps = {
         layout: layout,
         width: width,

package/dist/esm/plugins/media/pm-plugins/keymap-media-single.js

@@ -3,7 +3,7 @@ import { bindKeymapWithCommand, backspace } from '@atlaskit/editor-common/keymap
 import { isEmptyNode, isSelectionInsideLastNodeInDocument } from '../../../utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { selectNodeBackward } from '@atlaskit/editor-prosemirror/commands';
-import { atTheEndOfDoc } from '../../../utils/prosemirror/position';
+import { atTheEndOfDoc } from '@atlaskit/editor-common/selection';
 
 /**
  * Check if is an empty selection at the start of the node

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

@@ -29,11 +29,10 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 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';
 import { MediaTaskManager } from './mediaTaskManager';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
+import { getMaxWidthForNestedNodeNext, CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 export { stateKey } from './plugin-key';
 export var MEDIA_CONTENT_WRAP_CLASS_NAME = 'media-content-wrap';
 export var MEDIA_PLUGIN_IS_RESIZING_KEY = 'mediaSinglePlugin.isResizing';

package/dist/esm/plugins/media/toolbar/index.js

@@ -30,7 +30,7 @@ import ImageBorderItem from '../ui/ImageBorder';
 import { currentMediaNodeBorderMark } from '../utils/current-media-node';
 import { shouldShowImageBorder } from './imageBorder';
 import { PixelEntry, FullWidthDisplay } from '../ui/PixelEntry';
-import { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, calcMinWidth, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
+import { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, calcMinWidth } from '@atlaskit/editor-common/media-single';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
 var remove = function remove(state, dispatch) {
   if (dispatch) {
@@ -259,7 +259,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         type: 'custom',
         fallback: [],
         render: function render(editorView) {
-          var _widthPlugin$sharedSt2;
+          var _widthPlugin$sharedSt2, _pluginInjectionApi$m;
           if (!editorView || !selectedMediaSingleNode) {
             return null;
           }
@@ -277,7 +277,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           var _selectedMediaNode$at = selectedMediaNode.attrs,
             mediaWidth = _selectedMediaNode$at.width,
             mediaHeight = _selectedMediaNode$at.height;
-          var maxWidthForNestedNode = getMaxWidthForNestedNodeNext(editorView, selectedMediaSingleNode.pos);
+          var maxWidthForNestedNode = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$m = pluginInjectionApi.media.sharedState.currentState()) === null || _pluginInjectionApi$m === void 0 ? void 0 : _pluginInjectionApi$m.currentMaxWidth;
           var maxWidth = maxWidthForNestedNode || akEditorFullWidthLayoutWidth;
           var isVideoFile = isVideo(selectedMediaNode.attrs.__fileMimeType);
           var minWidth = calcMinWidth(isVideoFile, maxWidthForNestedNode || contentWidth);

package/dist/esm/plugins/media/ui/CaptionPlaceholder/index.js

@@ -6,8 +6,8 @@ import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { N200 } from '@atlaskit/theme/colors';
 import { messages } from './messages';
-var placeholder = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: ", ";\n  width: 100%;\n  text-align: center;\n  margin-top: 8px !important;\n  display: block;\n"])), "var(--ds-text-subtlest, ".concat(N200, ")"));
-export var CAPTION_PLACEHOLDER_ID = 'caption-placeholder';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
+var placeholder = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: ", ";\n  width: 100%;\n  text-align: center;\n  margin-top: ", " !important;\n  display: block;\n"])), "var(--ds-text-subtlest, ".concat(N200, ")"), "var(--ds-space-100, 8px)");
 export default /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var onClick = _ref.onClick;
   return jsx("span", {

package/dist/esm/plugins/media/utils/media-common.js

@@ -6,8 +6,7 @@ import { isTemporary } from '../../../utils';
 import { mapSlice } from '../../../utils/slice';
 import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '../../../utils/dom';
 import { isImage } from './is-image';
-import { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { atTheBeginningOfBlock, atTheBeginningOfDoc, atTheEndOfBlock, endPositionOfParent, startPositionOfParent, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { isMediaBlobUrl } from '@atlaskit/media-client';
 export var isMediaBlobUrlFromAttrs = function isMediaBlobUrlFromAttrs(attrs) {
   return !!(attrs && attrs.type === 'external' && isMediaBlobUrl(attrs.url));

package/dist/esm/plugins/media/utils/media-files.js

@@ -3,7 +3,7 @@ import { setNodeSelection, setTextSelection, insideTableCell, isInListItem, find
 import { isInLayoutColumn, isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { posOfPrecedingMediaGroup, posOfMediaGroupNearby, posOfParentMediaGroup, isSelectionNonMediaBlockNode, isInsidePotentialEmptyParagraph, copyOptionalAttrsFromMediaState } from './media-common';
 import { canInsert, safeInsert, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
-import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
+import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '@atlaskit/editor-common/selection';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 export var canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});