@atlaskit/editor-core 187.44.3 → 187.44.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/plugins/expand/pm-plugins/keymap.js +2 -2
  3. package/dist/cjs/plugins/media/nodeviews/mediaSingle.js +3 -1
  4. package/dist/cjs/plugins/media/pm-plugins/keymap-media-single.js +2 -2
  5. package/dist/cjs/plugins/media/pm-plugins/main.js +1 -2
  6. package/dist/cjs/plugins/media/toolbar/index.js +2 -2
  7. package/dist/cjs/plugins/media/ui/CaptionPlaceholder/index.js +4 -5
  8. package/dist/cjs/plugins/media/utils/media-common.js +7 -8
  9. package/dist/cjs/plugins/media/utils/media-files.js +6 -6
  10. package/dist/cjs/plugins/media/utils/media-single.js +2 -2
  11. package/dist/cjs/plugins/placeholder-text/index.js +1 -1
  12. package/dist/cjs/plugins/selection/commands.js +2 -3
  13. package/dist/cjs/plugins/selection/gap-cursor/actions.js +10 -11
  14. package/dist/cjs/plugins/selection/gap-cursor/utils.js +3 -3
  15. package/dist/cjs/plugins/selection/plugin-factory.js +5 -5
  16. package/dist/cjs/plugins/selection/pm-plugins/keymap.js +1 -1
  17. package/dist/cjs/plugins/selection/utils.js +1 -2
  18. package/dist/cjs/utils/commands.js +2 -22
  19. package/dist/cjs/utils/document.js +0 -20
  20. package/dist/cjs/utils/index.js +0 -6
  21. package/dist/cjs/version-wrapper.js +1 -1
  22. package/dist/es2019/plugins/expand/pm-plugins/keymap.js +1 -1
  23. package/dist/es2019/plugins/media/nodeviews/mediaSingle.js +4 -2
  24. package/dist/es2019/plugins/media/pm-plugins/keymap-media-single.js +1 -1
  25. package/dist/es2019/plugins/media/pm-plugins/main.js +1 -2
  26. package/dist/es2019/plugins/media/toolbar/index.js +3 -3
  27. package/dist/es2019/plugins/media/ui/CaptionPlaceholder/index.js +2 -2
  28. package/dist/es2019/plugins/media/utils/media-common.js +1 -2
  29. package/dist/es2019/plugins/media/utils/media-files.js +1 -1
  30. package/dist/es2019/plugins/media/utils/media-single.js +1 -1
  31. package/dist/es2019/plugins/placeholder-text/index.js +1 -1
  32. package/dist/es2019/plugins/selection/commands.js +1 -2
  33. package/dist/es2019/plugins/selection/gap-cursor/actions.js +2 -4
  34. package/dist/es2019/plugins/selection/gap-cursor/utils.js +2 -2
  35. package/dist/es2019/plugins/selection/plugin-factory.js +1 -1
  36. package/dist/es2019/plugins/selection/pm-plugins/keymap.js +1 -1
  37. package/dist/es2019/plugins/selection/utils.js +1 -3
  38. package/dist/es2019/utils/commands.js +1 -19
  39. package/dist/es2019/utils/document.js +0 -18
  40. package/dist/es2019/utils/index.js +1 -1
  41. package/dist/es2019/version-wrapper.js +1 -1
  42. package/dist/esm/plugins/expand/pm-plugins/keymap.js +1 -1
  43. package/dist/esm/plugins/media/nodeviews/mediaSingle.js +4 -2
  44. package/dist/esm/plugins/media/pm-plugins/keymap-media-single.js +1 -1
  45. package/dist/esm/plugins/media/pm-plugins/main.js +1 -2
  46. package/dist/esm/plugins/media/toolbar/index.js +3 -3
  47. package/dist/esm/plugins/media/ui/CaptionPlaceholder/index.js +2 -2
  48. package/dist/esm/plugins/media/utils/media-common.js +1 -2
  49. package/dist/esm/plugins/media/utils/media-files.js +1 -1
  50. package/dist/esm/plugins/media/utils/media-single.js +1 -1
  51. package/dist/esm/plugins/placeholder-text/index.js +1 -1
  52. package/dist/esm/plugins/selection/commands.js +1 -2
  53. package/dist/esm/plugins/selection/gap-cursor/actions.js +2 -4
  54. package/dist/esm/plugins/selection/gap-cursor/utils.js +2 -2
  55. package/dist/esm/plugins/selection/plugin-factory.js +1 -1
  56. package/dist/esm/plugins/selection/pm-plugins/keymap.js +1 -1
  57. package/dist/esm/plugins/selection/utils.js +1 -3
  58. package/dist/esm/utils/commands.js +1 -21
  59. package/dist/esm/utils/document.js +0 -20
  60. package/dist/esm/utils/index.js +1 -1
  61. package/dist/esm/version-wrapper.js +1 -1
  62. package/dist/types/plugins/media/ui/CaptionPlaceholder/index.d.ts +0 -1
  63. package/dist/types/plugins/media/utils/media-files.d.ts +1 -2
  64. package/dist/types/plugins/selection/commands.d.ts +2 -2
  65. package/dist/types/plugins/selection/gap-cursor/actions.d.ts +1 -1
  66. package/dist/types/plugins/selection/pm-plugins/selection-main.d.ts +1 -1
  67. package/dist/types/utils/commands.d.ts +2 -12
  68. package/dist/types/utils/document.d.ts +0 -4
  69. package/dist/types/utils/index.d.ts +1 -1
  70. package/dist/types-ts4.5/plugins/media/ui/CaptionPlaceholder/index.d.ts +0 -1
  71. package/dist/types-ts4.5/plugins/media/utils/media-files.d.ts +1 -2
  72. package/dist/types-ts4.5/plugins/selection/commands.d.ts +2 -2
  73. package/dist/types-ts4.5/plugins/selection/gap-cursor/actions.d.ts +1 -1
  74. package/dist/types-ts4.5/plugins/selection/pm-plugins/selection-main.d.ts +1 -1
  75. package/dist/types-ts4.5/utils/commands.d.ts +2 -12
  76. package/dist/types-ts4.5/utils/document.d.ts +0 -4
  77. package/dist/types-ts4.5/utils/index.d.ts +1 -1
  78. package/package.json +2 -2
  79. package/dist/cjs/utils/prosemirror/position.js +0 -42
  80. package/dist/cjs/utils/table.js +0 -28
  81. package/dist/es2019/utils/prosemirror/position.js +0 -1
  82. package/dist/es2019/utils/table.js +0 -22
  83. package/dist/esm/utils/prosemirror/position.js +0 -1
  84. package/dist/esm/utils/table.js +0 -22
  85. package/dist/types/utils/prosemirror/position.d.ts +0 -1
  86. package/dist/types/utils/table.d.ts +0 -2
  87. package/dist/types-ts4.5/utils/prosemirror/position.d.ts +0 -1
  88. package/dist/types-ts4.5/utils/table.d.ts +0 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 187.44.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [`fa39c6ce044`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fa39c6ce044) - [ED-19775] Decouple selection plugin from the editor-core code
8
+ - [`6b0dd092ac1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6b0dd092ac1) - ED-19729 media single performance optimization
9
+ - Updated dependencies
10
+
3
11
  ## 187.44.3
4
12
 
5
13
  ### Patch Changes
@@ -14,7 +14,7 @@ var _classNames = require("../ui/class-names");
14
14
  var _commands = require("../commands");
15
15
  var _pluginFactory = require("../../selection/plugin-factory");
16
16
  var _types = require("../../selection/types");
17
- var _table = require("../../../utils/table");
17
+ var _utils3 = require("@atlaskit/editor-common/utils");
18
18
  var isExpandNode = function isExpandNode(node) {
19
19
  return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
20
20
  };
@@ -88,7 +88,7 @@ function expandKeymap() {
88
88
  // however when an expand is in a table cell to the left of the
89
89
  // current table cell, arrow UP moves the cursor to the left
90
90
  // see ED-15425
91
- if ((0, _table.isPositionNearTableRow)($from, schema, 'before') && !expand) {
91
+ if ((0, _utils3.isPositionNearTableRow)($from, schema, 'before') && !expand) {
92
92
  return false;
93
93
  }
94
94
  var prevCursorPos = Math.max($from.pos - $from.parentOffset - 1, 0);
@@ -303,6 +303,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
303
303
  }, {
304
304
  key: "render",
305
305
  value: function render() {
306
+ var _pluginInjectionApi$m;
306
307
  var _this$props2 = this.props,
307
308
  selected = _this$props2.selected,
308
309
  getPos = _this$props2.getPos,
@@ -350,8 +351,9 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
350
351
  height = _mediaSingle.DEFAULT_IMAGE_HEIGHT;
351
352
  }
352
353
  var isSelected = selected();
354
+ 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;
353
355
  var contentWidthForLegacyExperience = (0, _mediaSingle.getMaxWidthForNestedNode)(view, getPos()) || lineLength;
354
- var contentWidth = (0, _mediaSingle.getMaxWidthForNestedNodeNext)(view, getPos()) || lineLength;
356
+ var contentWidth = currentMaxWidth || lineLength;
355
357
  var mediaSingleProps = {
356
358
  layout: layout,
357
359
  width: width,
@@ -9,7 +9,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
9
9
  var _utils = require("../../../utils");
10
10
  var _utils2 = require("@atlaskit/editor-prosemirror/utils");
11
11
  var _commands = require("@atlaskit/editor-prosemirror/commands");
12
- var _position = require("../../../utils/prosemirror/position");
12
+ var _selection = require("@atlaskit/editor-common/selection");
13
13
  /**
14
14
  * Check if is an empty selection at the start of the node
15
15
  */
@@ -145,7 +145,7 @@ var maybeRemoveMediaSingleNode = function maybeRemoveMediaSingleNode(schema) {
145
145
  if (dispatch) {
146
146
  // Select media single, and remove paragraph if it's empty.
147
147
  (0, _commands.selectNodeBackward)(state, function (tr) {
148
- if (isEmptyNodeInSchema($from.parent) && !(0, _position.atTheEndOfDoc)(state)) {
148
+ if (isEmptyNodeInSchema($from.parent) && !(0, _selection.atTheEndOfDoc)(state)) {
149
149
  tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
150
150
  }
151
151
 
@@ -37,7 +37,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
37
37
  var _document = require("../../../utils/document");
38
38
  var _mediaCommon2 = require("@atlaskit/media-common");
39
39
  var _utils3 = require("../../../utils");
40
- var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
41
40
  var _reactIntlNext = require("react-intl-next");
42
41
  var _mediaTaskManager = require("./mediaTaskManager");
43
42
  var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
@@ -775,7 +774,7 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
775
774
  },
776
775
  handleClick: function handleClick(_editorView, _pos, event) {
777
776
  var _event$target;
778
- var clickedInsideCaptionPlaceholder = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest("[data-id=\"".concat(_CaptionPlaceholder.CAPTION_PLACEHOLDER_ID, "\"]"));
777
+ var clickedInsideCaptionPlaceholder = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.closest("[data-id=\"".concat(_mediaSingle2.CAPTION_PLACEHOLDER_ID, "\"]"));
779
778
 
780
779
  // Workaround for Chrome given a regression introduced in prosemirror-view@1.18.6
781
780
  // Returning true prevents that updateSelection() is getting called in the commit below:
@@ -266,7 +266,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
266
266
  type: 'custom',
267
267
  fallback: [],
268
268
  render: function render(editorView) {
269
- var _widthPlugin$sharedSt2;
269
+ var _widthPlugin$sharedSt2, _pluginInjectionApi$m;
270
270
  if (!editorView || !selectedMediaSingleNode) {
271
271
  return null;
272
272
  }
@@ -284,7 +284,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
284
284
  var _selectedMediaNode$at = selectedMediaNode.attrs,
285
285
  mediaWidth = _selectedMediaNode$at.width,
286
286
  mediaHeight = _selectedMediaNode$at.height;
287
- var maxWidthForNestedNode = (0, _mediaSingle2.getMaxWidthForNestedNodeNext)(editorView, selectedMediaSingleNode.pos);
287
+ 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;
288
288
  var maxWidth = maxWidthForNestedNode || _editorSharedStyles.akEditorFullWidthLayoutWidth;
289
289
  var isVideoFile = (0, _mediaSingle.isVideo)(selectedMediaNode.attrs.__fileMimeType);
290
290
  var minWidth = (0, _mediaSingle2.calcMinWidth)(isVideoFile, maxWidthForNestedNode || contentWidth);
@@ -4,25 +4,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.default = exports.CAPTION_PLACEHOLDER_ID = void 0;
7
+ exports.default = void 0;
8
8
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
9
9
  var _react = _interopRequireDefault(require("react"));
10
10
  var _react2 = require("@emotion/react");
11
11
  var _reactIntlNext = require("react-intl-next");
12
12
  var _colors = require("@atlaskit/theme/colors");
13
13
  var _messages = require("./messages");
14
+ var _mediaSingle = require("@atlaskit/editor-common/media-single");
14
15
  var _templateObject;
15
16
  /** @jsx jsx */
16
- var placeholder = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n width: 100%;\n text-align: center;\n margin-top: 8px !important;\n display: block;\n"])), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"));
17
- var CAPTION_PLACEHOLDER_ID = 'caption-placeholder';
18
- exports.CAPTION_PLACEHOLDER_ID = CAPTION_PLACEHOLDER_ID;
17
+ var placeholder = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n width: 100%;\n text-align: center;\n margin-top: ", " !important;\n display: block;\n"])), "var(--ds-text-subtlest, ".concat(_colors.N200, ")"), "var(--ds-space-100, 8px)");
19
18
  var _default = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
20
19
  var onClick = _ref.onClick;
21
20
  return (0, _react2.jsx)("span", {
22
21
  ref: ref,
23
22
  css: placeholder,
24
23
  onClick: onClick,
25
- "data-id": CAPTION_PLACEHOLDER_ID,
24
+ "data-id": _mediaSingle.CAPTION_PLACEHOLDER_ID,
26
25
  "data-testid": "caption-placeholder"
27
26
  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.messages.placeholder));
28
27
  });
@@ -12,7 +12,6 @@ var _utils3 = require("../../../utils");
12
12
  var _slice = require("../../../utils/slice");
13
13
  var _dom = require("../../../utils/dom");
14
14
  var _isImage = require("./is-image");
15
- var _position = require("../../../utils/prosemirror/position");
16
15
  var _selection = require("@atlaskit/editor-common/selection");
17
16
  var _mediaClient = require("@atlaskit/media-client");
18
17
  var isMediaBlobUrlFromAttrs = function isMediaBlobUrlFromAttrs(attrs) {
@@ -36,7 +35,7 @@ var isSelectionMediaSingleNode = function isSelectionMediaSingleNode(state) {
36
35
  };
37
36
  exports.isSelectionMediaSingleNode = isSelectionMediaSingleNode;
38
37
  var posOfPrecedingMediaGroup = function posOfPrecedingMediaGroup(state) {
39
- if (!(0, _position.atTheBeginningOfBlock)(state)) {
38
+ if (!(0, _selection.atTheBeginningOfBlock)(state)) {
40
39
  return;
41
40
  }
42
41
  return posOfMediaGroupAbove(state, state.selection.$from);
@@ -61,7 +60,7 @@ var posOfImmediateFollowingMediaGroup = function posOfImmediateFollowingMediaGro
61
60
  }
62
61
  };
63
62
  var posOfFollowingMediaGroup = function posOfFollowingMediaGroup(state) {
64
- if (!(0, _position.atTheEndOfBlock)(state)) {
63
+ if (!(0, _selection.atTheEndOfBlock)(state)) {
65
64
  return;
66
65
  }
67
66
  return posOfMediaGroupBelow(state, state.selection.$to);
@@ -73,7 +72,7 @@ var posOfMediaGroupAbove = function posOfMediaGroupAbove(state, $pos) {
73
72
  adjacentPos = $pos.pos;
74
73
  adjacentNode = $pos.nodeBefore;
75
74
  } else {
76
- adjacentPos = (0, _position.startPositionOfParent)($pos) - 1;
75
+ adjacentPos = (0, _selection.startPositionOfParent)($pos) - 1;
77
76
  adjacentNode = state.doc.resolve(adjacentPos).nodeBefore;
78
77
  }
79
78
  if (adjacentNode && adjacentNode.type === state.schema.nodes.mediaGroup) {
@@ -88,7 +87,7 @@ var posOfMediaGroupAbove = function posOfMediaGroupAbove(state, $pos) {
88
87
  */
89
88
  var isInsidePotentialEmptyParagraph = function isInsidePotentialEmptyParagraph(state) {
90
89
  var $from = state.selection.$from;
91
- return $from.parent.type === state.schema.nodes.paragraph && (0, _position.atTheBeginningOfBlock)(state) && (0, _position.atTheEndOfBlock)(state);
90
+ return $from.parent.type === state.schema.nodes.paragraph && (0, _selection.atTheBeginningOfBlock)(state) && (0, _selection.atTheEndOfBlock)(state);
92
91
  };
93
92
  exports.isInsidePotentialEmptyParagraph = isInsidePotentialEmptyParagraph;
94
93
  var posOfMediaGroupBelow = function posOfMediaGroupBelow(state, $pos) {
@@ -99,7 +98,7 @@ var posOfMediaGroupBelow = function posOfMediaGroupBelow(state, $pos) {
99
98
  adjacentPos = $pos.pos;
100
99
  adjacentNode = $pos.nodeAfter;
101
100
  } else {
102
- adjacentPos = (0, _position.endPositionOfParent)($pos);
101
+ adjacentPos = (0, _selection.endPositionOfParent)($pos);
103
102
  adjacentNode = state.doc.nodeAt(adjacentPos);
104
103
  }
105
104
  if (adjacentNode && adjacentNode.type === state.schema.nodes.mediaGroup) {
@@ -112,7 +111,7 @@ var posOfParentMediaGroup = function posOfParentMediaGroup(state, $pos) {
112
111
  var $from = state.selection.$from;
113
112
  $pos = $pos || $from;
114
113
  if ($pos.parent.type === state.schema.nodes.mediaGroup) {
115
- return prepend ? (0, _position.startPositionOfParent)($pos) : (0, _position.endPositionOfParent)($pos) - 1;
114
+ return prepend ? (0, _selection.startPositionOfParent)($pos) : (0, _selection.endPositionOfParent)($pos) - 1;
116
115
  }
117
116
  return;
118
117
  };
@@ -139,7 +138,7 @@ var removeMediaNode = function removeMediaNode(view, node, getPos) {
139
138
  // If deleting a selected media node, we need to tell where the cursor to go next.
140
139
  // Prosemirror didn't gave us the behaviour of moving left if the media node is not the last one.
141
140
  // So we handle it ourselves.
142
- if (selection.from === currentMediaNodePos && !isLastMediaNode && !(0, _position.atTheBeginningOfDoc)(state) && nodeBefore && nodeBefore.type.name === 'media') {
141
+ if (selection.from === currentMediaNodePos && !isLastMediaNode && !(0, _selection.atTheBeginningOfDoc)(state) && nodeBefore && nodeBefore.type.name === 'media') {
143
142
  var _nodeBefore = (0, _utils.findPositionOfNodeBefore)(tr.selection);
144
143
  if (_nodeBefore) {
145
144
  tr.setSelection(_state.NodeSelection.create(tr.doc, _nodeBefore));
@@ -9,7 +9,7 @@ var _utils = require("../../../utils");
9
9
  var _utils2 = require("@atlaskit/editor-common/utils");
10
10
  var _mediaCommon = require("./media-common");
11
11
  var _utils3 = require("@atlaskit/editor-prosemirror/utils");
12
- var _position = require("../../../utils/prosemirror/position");
12
+ var _selection = require("@atlaskit/editor-common/selection");
13
13
  var _analytics = require("@atlaskit/editor-common/analytics");
14
14
  var canInsertMediaInline = function canInsertMediaInline(state) {
15
15
  var node = state.schema.nodes.mediaInline.create({});
@@ -69,7 +69,7 @@ function isSelectionMediaGroup(state) {
69
69
  function shouldAppendParagraph(state, node) {
70
70
  var media = state.schema.nodes.media;
71
71
  var wasMediaNode = node && node.type === media;
72
- return ((0, _utils.insideTableCell)(state) || (0, _utils.isInListItem)(state) || (0, _utils2.isInLayoutColumn)(state) || (0, _position.atTheEndOfDoc)(state) && (!(0, _mediaCommon.posOfPrecedingMediaGroup)(state) || (0, _mediaCommon.isSelectionNonMediaBlockNode)(state))) && !wasMediaNode;
72
+ return ((0, _utils.insideTableCell)(state) || (0, _utils.isInListItem)(state) || (0, _utils2.isInLayoutColumn)(state) || (0, _selection.atTheEndOfDoc)(state) && (!(0, _mediaCommon.posOfPrecedingMediaGroup)(state) || (0, _mediaCommon.isSelectionNonMediaBlockNode)(state))) && !wasMediaNode;
73
73
  }
74
74
 
75
75
  /**
@@ -257,10 +257,10 @@ var findMediaInsertPos = function findMediaInsertPos(state) {
257
257
  if ((0, _mediaCommon.isSelectionNonMediaBlockNode)(state)) {
258
258
  return $to.pos;
259
259
  }
260
- if ((0, _position.atTheEndOfBlock)(state)) {
260
+ if ((0, _selection.atTheEndOfBlock)(state)) {
261
261
  return $to.pos + 1;
262
262
  }
263
- if ((0, _position.atTheBeginningOfBlock)(state)) {
263
+ if ((0, _selection.atTheBeginningOfBlock)(state)) {
264
264
  return $from.pos - 1;
265
265
  }
266
266
  return $to.pos;
@@ -275,7 +275,7 @@ var findDeleteRange = function findDeleteRange(state) {
275
275
  if (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _mediaCommon.posOfMediaGroupNearby)(state)) {
276
276
  return range($from.pos, $to.pos);
277
277
  }
278
- return range((0, _position.startPositionOfParent)($from) - 1, (0, _position.endPositionOfParent)($to));
278
+ return range((0, _selection.startPositionOfParent)($from) - 1, (0, _selection.endPositionOfParent)($to));
279
279
  };
280
280
  var range = function range(start) {
281
281
  var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : start;
@@ -292,7 +292,7 @@ var setSelectionAfterMediaInsertion = function setSelectionAfterMediaInsertion(v
292
292
  return;
293
293
  }
294
294
  var $mediaPos = doc.resolve(mediaPos);
295
- var endOfMediaGroup = (0, _position.endPositionOfParent)($mediaPos);
295
+ var endOfMediaGroup = (0, _selection.endPositionOfParent)($mediaPos);
296
296
  if (endOfMediaGroup + 1 >= doc.nodeSize - 1) {
297
297
  // if nothing after the media group, fallback to select the newest uploaded media item
298
298
  (0, _utils.setNodeSelection)(view, mediaPos);
@@ -19,7 +19,7 @@ var _slice = require("../../../utils/slice");
19
19
  var _analytics = require("@atlaskit/editor-common/analytics");
20
20
  var _insert = require("@atlaskit/editor-common/insert");
21
21
  var _isImage = require("./is-image");
22
- var _position = require("../../../utils/prosemirror/position");
22
+ var _selection = require("@atlaskit/editor-common/selection");
23
23
  var _mediaCommon2 = require("@atlaskit/media-common");
24
24
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
25
25
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -38,7 +38,7 @@ var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, file
38
38
  };
39
39
  };
40
40
  function shouldAddParagraph(state) {
41
- return (0, _position.atTheBeginningOfBlock)(state) && !(0, _utils2.checkNodeDown)(state.selection, state.doc, _utils3.isEmptyParagraph);
41
+ return (0, _selection.atTheBeginningOfBlock)(state) && !(0, _utils2.checkNodeDown)(state.selection, state.doc, _utils3.isEmptyParagraph);
42
42
  }
43
43
  function insertNodesWithOptionalParagraph(nodes) {
44
44
  var analyticsAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -12,7 +12,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
12
12
  var _adfSchema = require("@atlaskit/adf-schema");
13
13
  var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
14
14
  var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
15
- var _utils = require("../../utils");
15
+ var _utils = require("@atlaskit/editor-common/utils");
16
16
  var _cursor = require("../fake-text-cursor/cursor");
17
17
  var _PlaceholderFloatingToolbar = _interopRequireDefault(require("./ui/PlaceholderFloatingToolbar"));
18
18
  var _actions = require("./actions");
@@ -7,7 +7,6 @@ exports.setSelectionRelativeToNode = exports.setSelectionInsideAtNodeEnd = expor
7
7
  var _state = require("@atlaskit/editor-prosemirror/state");
8
8
  var _gapCursorSelection = require("./gap-cursor-selection");
9
9
  var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");
10
- var _document = require("../../utils/document");
11
10
  var _utils = require("@atlaskit/editor-common/utils");
12
11
  var _actions = require("./actions");
13
12
  var _pluginFactory = require("./plugin-factory");
@@ -203,7 +202,7 @@ var findAndSetTextSelection = function findAndSetTextSelection(selectionRelative
203
202
  };
204
203
  var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selectionRelativeToNode, node, pos) {
205
204
  return function (state, dispatch) {
206
- if ((0, _document.isNodeEmpty)(node)) {
205
+ if ((0, _utils.isNodeEmpty)(node)) {
207
206
  return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(pos), _types.SelectionDirection.After)(state, dispatch);
208
207
  }
209
208
  var selectableNode = (0, _utils2.findFirstChildNodeToSelect)(node);
@@ -226,7 +225,7 @@ var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selec
226
225
  };
227
226
  var setSelectionInsideAtNodeEnd = function setSelectionInsideAtNodeEnd(selectionRelativeToNode, node, from, to) {
228
227
  return function (state, dispatch) {
229
- if ((0, _document.isNodeEmpty)(node)) {
228
+ if ((0, _utils.isNodeEmpty)(node)) {
230
229
  return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(to), _types.SelectionDirection.Before)(state, dispatch);
231
230
  }
232
231
  var selectableNode = (0, _utils2.findLastChildNodeToSelect)(node);
@@ -6,26 +6,25 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.shouldSkipGapCursor = exports.setSelectionTopLevelBlocks = exports.setGapCursorAtPos = exports.setCursorForTopLevelBlocks = exports.hasGapCursorPlugin = exports.deleteNode = exports.arrow = void 0;
7
7
  var _state = require("@atlaskit/editor-prosemirror/state");
8
8
  var _utils = require("@atlaskit/editor-prosemirror/utils");
9
- var _utils2 = require("@atlaskit/editor-common/utils");
10
9
  var _direction = require("./direction");
11
10
  var _selection = require("./selection");
12
- var _utils3 = require("./utils");
11
+ var _utils2 = require("./utils");
13
12
  var _isValidTargetNode = require("./utils/is-valid-target-node");
14
- var _position = require("../../../utils/prosemirror/position");
13
+ var _selection2 = require("@atlaskit/editor-common/selection");
15
14
  var _gapCursorPluginKey = require("../pm-plugins/gap-cursor-plugin-key");
16
- var _table = require("../../../utils/table");
15
+ var _utils3 = require("@atlaskit/editor-common/utils");
17
16
  var shouldSkipGapCursor = function shouldSkipGapCursor(direction, state, $pos) {
18
17
  var _$pos$nodeBefore;
19
18
  var doc = state.doc,
20
19
  schema = state.schema;
21
20
  switch (direction) {
22
21
  case _direction.Direction.UP:
23
- if ((0, _position.atTheBeginningOfDoc)(state)) {
22
+ if ((0, _selection2.atTheBeginningOfDoc)(state)) {
24
23
  return false;
25
24
  }
26
- return (0, _table.isPositionNearTableRow)($pos, schema, 'before') || (0, _utils3.isTextBlockNearPos)(doc, schema, $pos, -1) || (0, _utils2.isNodeBeforeMediaNode)($pos, state);
25
+ return (0, _utils3.isPositionNearTableRow)($pos, schema, 'before') || (0, _utils2.isTextBlockNearPos)(doc, schema, $pos, -1) || (0, _utils3.isNodeBeforeMediaNode)($pos, state);
27
26
  case _direction.Direction.DOWN:
28
- return (0, _position.atTheEndOfDoc)(state) || (0, _utils3.isTextBlockNearPos)(doc, schema, $pos, 1) || (0, _table.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
27
+ return (0, _selection2.atTheEndOfDoc)(state) || (0, _utils2.isTextBlockNearPos)(doc, schema, $pos, 1) || (0, _utils3.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
29
28
  ;
30
29
 
31
30
  default:
@@ -38,7 +37,7 @@ exports.shouldSkipGapCursor = shouldSkipGapCursor;
38
37
  function shouldHandleMediaGapCursor(dir, state) {
39
38
  var _selection$$from$node;
40
39
  var selection = state.selection;
41
- var upArrowFromGapCursorIntoMedia = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils2.isMediaNode)(selection.$from.nodeBefore);
40
+ var upArrowFromGapCursorIntoMedia = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils3.isMediaNode)(selection.$from.nodeBefore);
42
41
  var downArrowFromGapCursorIntoMediaGroup = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.DOWN && ((_selection$$from$node = selection.$from.nodeAfter) === null || _selection$$from$node === void 0 ? void 0 : _selection$$from$node.type.name) === 'mediaGroup';
43
42
  return upArrowFromGapCursorIntoMedia || downArrowFromGapCursorIntoMediaGroup;
44
43
  }
@@ -49,7 +48,7 @@ function handleMediaGapCursor(dir, state) {
49
48
  var selection = state.selection,
50
49
  tr = state.tr;
51
50
  var $pos = (0, _direction.isBackward)(dir) ? selection.$from : selection.$to;
52
- if (dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils2.isMediaNode)(selection.$from.nodeBefore)) {
51
+ if (dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils3.isMediaNode)(selection.$from.nodeBefore)) {
53
52
  var _tr$doc$nodeAt;
54
53
  var nodeBeforePos = (0, _utils.findPositionOfNodeBefore)(tr.selection);
55
54
  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') {
@@ -94,7 +93,7 @@ var arrow = function arrow(dir, endOfTextblock) {
94
93
  if (selection.node.isInline) {
95
94
  return false;
96
95
  }
97
- if (dir === _direction.Direction.UP && !(0, _position.atTheBeginningOfDoc)(state) && !(0, _utils2.isNodeBeforeMediaNode)($pos, state) || dir === _direction.Direction.DOWN) {
96
+ if (dir === _direction.Direction.UP && !(0, _selection2.atTheBeginningOfDoc)(state) && !(0, _utils3.isNodeBeforeMediaNode)($pos, state) || dir === _direction.Direction.DOWN) {
98
97
  // We dont add gap cursor on node selections going up and down
99
98
  // Except we do if we're going up for a block node which is the
100
99
  // first node in the document OR the node before is a media node
@@ -126,7 +125,7 @@ var arrow = function arrow(dir, endOfTextblock) {
126
125
  if (view) {
127
126
  var domAtPos = view.domAtPos.bind(view);
128
127
  var target = (0, _utils.findDomRefAtPos)($pos.pos, domAtPos);
129
- if (target && target.textContent === _utils2.ZERO_WIDTH_SPACE) {
128
+ if (target && target.textContent === _utils3.ZERO_WIDTH_SPACE) {
130
129
  return false;
131
130
  }
132
131
  }
@@ -9,7 +9,7 @@ exports.getMediaNearPos = getMediaNearPos;
9
9
  exports.isTextBlockNearPos = exports.isLeftCursor = exports.isIgnoredClick = void 0;
10
10
  var _styles = require("@atlaskit/editor-common/styles");
11
11
  var _selection = require("./selection");
12
- var _CaptionPlaceholder = require("../../media/ui/CaptionPlaceholder");
12
+ var _mediaSingle = require("@atlaskit/editor-common/media-single");
13
13
  var isLeftCursor = function isLeftCursor(side) {
14
14
  return side === _selection.Side.LEFT;
15
15
  };
@@ -96,7 +96,7 @@ var isIgnoredClick = function isIgnoredClick(elem) {
96
96
  }
97
97
 
98
98
  // check if we're clicking an image caption placeholder
99
- if (elem.closest("[data-id=\"".concat(_CaptionPlaceholder.CAPTION_PLACEHOLDER_ID, "\"]"))) {
99
+ if (elem.closest("[data-id=\"".concat(_mediaSingle.CAPTION_PLACEHOLDER_ID, "\"]"))) {
100
100
  return true;
101
101
  }
102
102
 
@@ -124,7 +124,7 @@ var isIgnoredClick = function isIgnoredClick(elem) {
124
124
  return false;
125
125
  };
126
126
 
127
- /*
127
+ /*
128
128
  Calculates custom style for breakout mode
129
129
  Mainly to handle table width to include the numbered column width as well
130
130
  */
@@ -9,16 +9,16 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
9
9
  var _state = require("@atlaskit/editor-prosemirror/state");
10
10
  var _view = require("@atlaskit/editor-prosemirror/view");
11
11
  var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
12
- var _pluginStateFactory = require("../../utils/plugin-state-factory");
12
+ var _utils = require("@atlaskit/editor-common/utils");
13
13
  var _reducer = require("./reducer");
14
14
  var _types = require("./types");
15
- var _utils = require("./utils");
15
+ var _utils2 = require("./utils");
16
16
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
17
17
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
18
18
  var handleDocChanged = function handleDocChanged(tr, pluginState) {
19
19
  // in some collab edge cases mapping decorations could throw an error
20
20
  try {
21
- if (pluginState.decorationSet.find().length === 0 && (!tr.selectionSet || (0, _utils.getDecorations)(tr).find().length === 0)) {
21
+ if (pluginState.decorationSet.find().length === 0 && (!tr.selectionSet || (0, _utils2.getDecorations)(tr).find().length === 0)) {
22
22
  return pluginState;
23
23
  }
24
24
  var decorationSet = pluginState.decorationSet.map(tr.mapping, tr.doc);
@@ -33,14 +33,14 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
33
33
  };
34
34
  var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
35
35
  // Reset relative selection pos when user clicks to select a node
36
- if ((tr.selection instanceof _state.NodeSelection && (0, _utils.isSelectableContainerNode)(tr.selection.node) || tr.selection instanceof _cellSelection.CellSelection) && !tr.getMeta(_types.selectionPluginKey)) {
36
+ if ((tr.selection instanceof _state.NodeSelection && (0, _utils2.isSelectableContainerNode)(tr.selection.node) || tr.selection instanceof _cellSelection.CellSelection) && !tr.getMeta(_types.selectionPluginKey)) {
37
37
  return _objectSpread(_objectSpread({}, pluginState), {}, {
38
38
  selectionRelativeToNode: undefined
39
39
  });
40
40
  }
41
41
  return pluginState;
42
42
  };
43
- var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(_types.selectionPluginKey, _reducer.reducer, {
43
+ var _pluginFactory = (0, _utils.pluginFactory)(_types.selectionPluginKey, _reducer.reducer, {
44
44
  onDocChanged: handleDocChanged,
45
45
  onSelectionChanged: handleSelectionChanged
46
46
  }),
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _keymap = require("@atlaskit/editor-prosemirror/keymap");
8
- var _keymaps = require("../../../keymaps");
8
+ var _keymaps = require("@atlaskit/editor-common/keymaps");
9
9
  var _commands = require("../commands");
10
10
  function keymapPlugin() {
11
11
  var list = {};
@@ -38,7 +38,6 @@ var _view = require("@atlaskit/editor-prosemirror/view");
38
38
  var _utils = require("@atlaskit/editor-prosemirror/utils");
39
39
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
40
40
  var _selection = require("@atlaskit/editor-common/selection");
41
- var _commands = require("../../utils/commands");
42
41
  var _utils2 = require("@atlaskit/editor-common/utils");
43
42
  var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");
44
43
  var _types = require("./types");
@@ -52,7 +51,7 @@ function createSelectionClickHandler(nodes, isValidTarget, options) {
52
51
  var _target = event.target;
53
52
  if (isValidTarget(_target)) {
54
53
  var selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
55
- (0, _commands.selectNode)(selectionPos)(view.state, view.dispatch);
54
+ (0, _selection.selectNode)(selectionPos)(view.state, view.dispatch);
56
55
  return true;
57
56
  }
58
57
  }
@@ -3,8 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.withScrollIntoView = exports.selectNode = exports.isNthParentOfType = void 0;
7
- var _state = require("@atlaskit/editor-prosemirror/state");
6
+ exports.withScrollIntoView = exports.isNthParentOfType = void 0;
8
7
  /**
9
8
  * Creates a filter that checks if the node at a given number of parents above the current
10
9
  * selection is of the correct node type.
@@ -31,23 +30,4 @@ var withScrollIntoView = function withScrollIntoView(command) {
31
30
  }, view);
32
31
  };
33
32
  };
34
-
35
- /**
36
- * Insert content, delete a range and create a new selection
37
- * This function automatically handles the mapping of positions for insertion and deletion.
38
- * The new selection is handled as a function since it may not always be necessary to resolve a position to the transactions mapping
39
- *
40
- * @param getSelectionResolvedPos get the resolved position to create a new selection
41
- * @param insertions content to insert at the specified position
42
- * @param deletions the ranges to delete
43
- */
44
- exports.withScrollIntoView = withScrollIntoView;
45
- var selectNode = function selectNode(pos) {
46
- return function (state, dispatch) {
47
- if (dispatch) {
48
- dispatch(state.tr.setSelection(new _state.NodeSelection(state.doc.resolve(pos))));
49
- }
50
- return true;
51
- };
52
- };
53
- exports.selectNode = selectNode;
33
+ exports.withScrollIntoView = withScrollIntoView;
@@ -15,32 +15,12 @@ exports.getChangedNodesIn = getChangedNodesIn;
15
15
  exports.getChildBreakoutModes = getChildBreakoutModes;
16
16
  exports.getNodesCount = getNodesCount;
17
17
  exports.isInEmptyLine = isInEmptyLine;
18
- exports.isNodeEmpty = isNodeEmpty;
19
18
  exports.nodesBetweenChanged = nodesBetweenChanged;
20
19
  exports.processRawFragmentValue = processRawFragmentValue;
21
20
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
22
21
  var _model = require("@atlaskit/editor-prosemirror/model");
23
22
  var _nodeWidth = require("./node-width");
24
23
  var _utils = require("@atlaskit/editor-common/utils");
25
- /**
26
- * Checks if a node has any content. Ignores node that only contain empty block nodes.
27
- */
28
- function isNodeEmpty(node) {
29
- if (node && node.textContent) {
30
- return false;
31
- }
32
- if (!node || !node.childCount || node.childCount === 1 && (0, _utils.isEmptyParagraph)(node.firstChild)) {
33
- return true;
34
- }
35
- var block = [];
36
- var nonBlock = [];
37
- node.forEach(function (child) {
38
- child.isInline ? nonBlock.push(child) : block.push(child);
39
- });
40
- return !nonBlock.length && !block.filter(function (childNode) {
41
- return !!childNode.childCount && !(childNode.childCount === 1 && (0, _utils.isEmptyParagraph)(childNode.firstChild)) || childNode.isAtom;
42
- }).length;
43
- }
44
24
  function isInEmptyLine(state) {
45
25
  var selection = state.selection;
46
26
  var _ref = selection,
@@ -75,12 +75,6 @@ Object.defineProperty(exports, "isLinkMark", {
75
75
  }
76
76
  });
77
77
  exports.isMarkTypeAllowedInCurrentSelection = isMarkTypeAllowedInCurrentSelection;
78
- Object.defineProperty(exports, "isNodeEmpty", {
79
- enumerable: true,
80
- get: function get() {
81
- return _document.isNodeEmpty;
82
- }
83
- });
84
78
  Object.defineProperty(exports, "isParagraph", {
85
79
  enumerable: true,
86
80
  get: function get() {
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.version = exports.nextMajorVersion = exports.name = void 0;
7
7
  var name = "@atlaskit/editor-core";
8
8
  exports.name = name;
9
- var version = "187.44.3";
9
+ var version = "187.44.4";
10
10
  exports.version = version;
11
11
  var nextMajorVersion = function nextMajorVersion() {
12
12
  return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
@@ -8,7 +8,7 @@ import { expandClassNames } from '../ui/class-names';
8
8
  import { deleteExpand, focusTitle } from '../commands';
9
9
  import { getPluginState as getSelectionPluginState } from '../../selection/plugin-factory';
10
10
  import { RelativeSelectionPos } from '../../selection/types';
11
- import { isPositionNearTableRow } from '../../../utils/table';
11
+ import { isPositionNearTableRow } from '@atlaskit/editor-common/utils';
12
12
  const isExpandNode = node => {
13
13
  return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
14
14
  };
@@ -23,7 +23,7 @@ import CaptionPlaceholder from '../ui/CaptionPlaceholder';
23
23
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
24
24
  import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
25
25
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
26
- import { calcMediaSinglePixelWidth, MEDIA_SINGLE_GUTTER_SIZE, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
26
+ import { calcMediaSinglePixelWidth, MEDIA_SINGLE_GUTTER_SIZE, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode } from '@atlaskit/editor-common/media-single';
27
27
  import { getBooleanFF } from '@atlaskit/platform-feature-flags';
28
28
  export default class MediaSingleNode extends Component {
29
29
  constructor(...args) {
@@ -201,6 +201,7 @@ export default class MediaSingleNode extends Component {
201
201
  });
202
202
  }
203
203
  render() {
204
+ var _pluginInjectionApi$m;
204
205
  const {
205
206
  selected,
206
207
  getPos,
@@ -257,8 +258,9 @@ export default class MediaSingleNode extends Component {
257
258
  height = DEFAULT_IMAGE_HEIGHT;
258
259
  }
259
260
  const isSelected = selected();
261
+ 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;
260
262
  const contentWidthForLegacyExperience = getMaxWidthForNestedNode(view, getPos()) || lineLength;
261
- const contentWidth = getMaxWidthForNestedNodeNext(view, getPos()) || lineLength;
263
+ const contentWidth = currentMaxWidth || lineLength;
262
264
  const mediaSingleProps = {
263
265
  layout,
264
266
  width,
@@ -3,7 +3,7 @@ import { bindKeymapWithCommand, backspace } from '@atlaskit/editor-common/keymap
3
3
  import { isEmptyNode, isSelectionInsideLastNodeInDocument } from '../../../utils';
4
4
  import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
5
5
  import { selectNodeBackward } from '@atlaskit/editor-prosemirror/commands';
6
- import { atTheEndOfDoc } from '../../../utils/prosemirror/position';
6
+ import { atTheEndOfDoc } from '@atlaskit/editor-common/selection';
7
7
 
8
8
  /**
9
9
  * Check if is an empty selection at the start of the node