@atlaskit/editor-core 187.8.13 → 187.9.2

package/dist/es2019/plugins/selection/pm-plugins/events/keydown.js

@@ -1,36 +1,68 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+
+/*
+ * The way expand was built, no browser reconize selection on it.
+ * For instance, when a selection going to a "collapsed" expand
+ * the browser will try to send the cursor to inside the expand content (wrong),
+ * this behavior is caused because the expand content is never true hidden
+ * we just set the height to 1px.
+ *
+ * So, we need to capture a possible selection event
+ * when a collapsed exxpand is the next node in the common depth.
+ * If that is true, we create a new TextSelection and stop the event bubble
+ */
 const isCollpasedExpand = node => {
   return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && !node.attrs.__expanded);
 };
-const findFixedProblematicNodePosition = ($pos, direction) => {
-  if ($pos.pos === 0 || $pos.depth === 0) {
+
+/**
+ * ED-18072 - Cannot shift + arrow past bodied extension if it is not empty
+ */
+const isBodiedExtension = node => {
+  return Boolean(node && ['bodiedExtension'].includes(node.type.name));
+};
+const isProblematicNode = node => {
+  return isCollpasedExpand(node) || isBodiedExtension(node);
+};
+const findFixedProblematicNodePosition = (doc, $head, direction) => {
+  if ($head.pos === 0 || $head.depth === 0) {
     return null;
   }
-  const pos = direction === 'up' ? $pos.before() : $pos.after();
-  const $posResolved = $pos.doc.resolve(pos);
-  const maybeExpandNode = direction === 'up' ? $posResolved.nodeBefore : $posResolved.nodeAfter;
-  if (maybeExpandNode && isCollpasedExpand(maybeExpandNode)) {
-    const nodeSize = maybeExpandNode.nodeSize;
-    const expandPosition = direction === 'up' ? pos - nodeSize : pos + nodeSize;
-    const startPosNode = Math.max(expandPosition, 0);
-    const $startPosNode = $pos.doc.resolve(Math.min(startPosNode, $pos.doc.content.size));
-    return $startPosNode;
+  if (direction === 'up') {
+    const pos = $head.before();
+    const $posResolved = $head.doc.resolve(pos);
+    const maybeProblematicNode = $posResolved.nodeBefore;
+    if (maybeProblematicNode && isProblematicNode(maybeProblematicNode)) {
+      const nodeSize = maybeProblematicNode.nodeSize;
+      const nodeStartPosition = pos - nodeSize;
+
+      // ($head.pos - 1) will correspond to (nodeStartPosition + nodeSize) when we are at the start of the text node
+      const isAtEndOfProblematicNode = $head.pos - 1 === nodeStartPosition + nodeSize;
+      if (isAtEndOfProblematicNode) {
+        const startPosNode = Math.max(nodeStartPosition, 0);
+        const $startPosNode = $head.doc.resolve(Math.min(startPosNode, $head.doc.content.size));
+        return $startPosNode;
+      }
+    }
+  }
+  if (direction === 'down') {
+    const pos = $head.after();
+    const maybeProblematicNode = doc.nodeAt(pos);
+    if (maybeProblematicNode && isProblematicNode(maybeProblematicNode) && $head.pos + 1 === pos) {
+      const nodeSize = maybeProblematicNode.nodeSize;
+      const nodePosition = pos + nodeSize;
+      const startPosNode = Math.max(nodePosition, 0);
+      const $startPosNode = $head.doc.resolve(Math.min(startPosNode, $head.doc.content.size));
+      return $startPosNode;
+    }
   }
   return null;
 };
 export const onKeydown = (view, event) => {
   /*
-   * This workaround is needed for some specific situation with collapsed expand.
-   *
-   * The way expand was built, no browser reconize selection on it.
-   * For instance, when a selection going to a "collapsed" expand
-   * the browser will try to send the cursor to inside the expand content (wrong),
-   * this behavior is caused because the expand content is never true hidden
-   * we just set the height to 1px.
-   *
-   * So, we need to capture a possible selection event
-   * when a collapsed exxpand is the next node in the common depth.
-   * If that is true, we create a new TextSelection and stop the event bubble
+   * This workaround is needed for some specific situations.
+   * - expand collapse
+   * - bodied extension
    */
   if (!(event instanceof KeyboardEvent)) {
     return false;
@@ -42,6 +74,7 @@ export const onKeydown = (view, event) => {
     return false;
   }
   const {
+    doc,
     selection: {
       $head,
       $anchor
@@ -51,9 +84,12 @@ export const onKeydown = (view, event) => {
     return false;
   }
   const direction = ['ArrowLeft', 'ArrowUp', 'Home'].includes(event.key) ? 'up' : 'down';
-  const $fixedProblematicNodePosition = findFixedProblematicNodePosition($head, direction);
+  const $fixedProblematicNodePosition = findFixedProblematicNodePosition(doc, $head, direction);
   if ($fixedProblematicNodePosition) {
-    const forcedTextSelection = TextSelection.create(view.state.doc, $anchor.pos, $fixedProblematicNodePosition.pos);
+    // an offset is used here so that left arrow selects the first character before the node (consistent with arrow right)
+    const headOffset = event.key === 'ArrowLeft' ? -1 : 0;
+    const head = $fixedProblematicNodePosition.pos + headOffset;
+    const forcedTextSelection = TextSelection.create(view.state.doc, $anchor.pos, head);
     const tr = view.state.tr;
     tr.setSelection(forcedTextSelection);
     view.dispatch(tr);

package/dist/es2019/ui/Resizer/ResizeLabel/index.js

@@ -0,0 +1,12 @@
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import { wrapper, text, smallText } from './styles';
+const ResizeLabelBreakoutWidth = 110;
+const ResizeLabel = props => {
+  return jsx("div", {
+    css: wrapper
+  }, jsx("span", {
+    css: [text, props.containerWidth < ResizeLabelBreakoutWidth && smallText]
+  }, props.label));
+};
+export default ResizeLabel;

package/dist/es2019/ui/Resizer/ResizeLabel/styles.js

@@ -0,0 +1,25 @@
+import { css } from '@emotion/react';
+import { B300 } from '@atlaskit/theme/colors';
+export const wrapper = css`
+  font-size: ${"var(--ds-font-size-100, 14px)"};
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  transform: translateY(-125%);
+  top: 0;
+`;
+export const text = css`
+  display: inline-block;
+  border-radius: 6px;
+  min-width: 75px;
+  background-color: ${`var(--ds-text-accent-blue, ${B300})`};
+  color: ${"var(--ds-text-inverse, white)"};
+  padding: ${"var(--ds-space-050, 4px)"} ${"var(--ds-space-200, 16px)"};
+  letter-spacing: 0.5px;
+`;
+export const smallText = css`
+  letter-spacing: -0.5px;
+  font-size: ${"var(--ds-font-size-050, 8px)"};
+  min-width: 27px;
+  padding: ${"var(--ds-space-0, 0px)"} ${"var(--ds-space-025, 2px)"};
+`;

package/dist/es2019/version-wrapper.js

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

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.8.13",
+	"version": "187.9.2",
 	"sideEffects": false
 }

package/dist/esm/plugins/emoji/commands/insert-emoji.js

@@ -4,33 +4,35 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { addAnalytics, EVENT_TYPE, ACTION_SUBJECT_ID, ACTION_SUBJECT, ACTION } from '../../analytics';
-export function insertEmoji(emojiId, inputMethod) {
-  return function (state, dispatch) {
-    var emoji = state.schema.nodes.emoji;
-    if (emoji && emojiId) {
-      var node = emoji.createChecked(_objectSpread(_objectSpread({}, emojiId), {}, {
-        text: emojiId.fallback || emojiId.shortName
-      }));
-      var textNode = state.schema.text(' ');
-      if (dispatch) {
-        var fragment = Fragment.fromArray([node, textNode]);
-        var tr = safeInsert(fragment)(state.tr);
-        if (inputMethod) {
-          addAnalytics(state, tr, {
-            action: ACTION.INSERTED,
-            actionSubject: ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: ACTION_SUBJECT_ID.EMOJI,
-            attributes: {
-              inputMethod: inputMethod
-            },
-            eventType: EVENT_TYPE.TRACK
-          });
+import { EVENT_TYPE, ACTION_SUBJECT_ID, ACTION_SUBJECT, ACTION } from '@atlaskit/editor-common/analytics';
+export var insertEmoji = function insertEmoji(editorAnalyticsAPI) {
+  return function (emojiId, inputMethod) {
+    return function (state, dispatch) {
+      var emoji = state.schema.nodes.emoji;
+      if (emoji && emojiId) {
+        var node = emoji.createChecked(_objectSpread(_objectSpread({}, emojiId), {}, {
+          text: emojiId.fallback || emojiId.shortName
+        }));
+        var textNode = state.schema.text(' ');
+        if (dispatch) {
+          var fragment = Fragment.fromArray([node, textNode]);
+          var tr = safeInsert(fragment)(state.tr);
+          if (inputMethod) {
+            editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+              action: ACTION.INSERTED,
+              actionSubject: ACTION_SUBJECT.DOCUMENT,
+              actionSubjectId: ACTION_SUBJECT_ID.EMOJI,
+              attributes: {
+                inputMethod: inputMethod
+              },
+              eventType: EVENT_TYPE.TRACK
+            })(tr);
+          }
+          dispatch(tr.setSelection(Selection.near(tr.doc.resolve(state.selection.$from.pos + fragment.size))));
         }
-        dispatch(tr.setSelection(Selection.near(tr.doc.resolve(state.selection.$from.pos + fragment.size))));
+        return true;
       }
-      return true;
-    }
-    return false;
+      return false;
+    };
   };
-}
+};

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

@@ -174,10 +174,11 @@ var emojiPlugin = function emojiPlugin(options, api) {
       }, {
         name: 'emojiAsciiInputRule',
         plugin: function plugin(_ref6) {
+          var _api$dependencies$ana8;
           var schema = _ref6.schema,
             providerFactory = _ref6.providerFactory,
             featureFlags = _ref6.featureFlags;
-          return asciiInputRulePlugin(schema, providerFactory, featureFlags);
+          return asciiInputRulePlugin(schema, providerFactory, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions);
         }
       }];
     },
@@ -194,13 +195,13 @@ var emojiPlugin = function emojiPlugin(options, api) {
             return /*#__PURE__*/React.createElement(IconEmoji, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana8;
+            var _api$dependencies$ana9;
             var tr = insert(undefined);
             openTypeAheadAtCursor({
               triggerHandler: typeAhead,
               inputMethod: INPUT_METHOD.QUICK_INSERT
             })(tr);
-            api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions.attachAnalyticsEvent({
+            api === null || api === void 0 ? void 0 : (_api$dependencies$ana9 = api.dependencies.analytics) === null || _api$dependencies$ana9 === void 0 ? void 0 : _api$dependencies$ana9.actions.attachAnalyticsEvent({
               action: ACTION.INVOKED,
               actionSubject: ACTION_SUBJECT.TYPEAHEAD,
               actionSubjectId: ACTION_SUBJECT_ID.TYPEAHEAD_EMOJI,

package/dist/esm/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -10,12 +10,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
 import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
-import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 var matcher;
-export function inputRulePlugin(schema, providerFactory, featureFlags) {
+export function inputRulePlugin(schema, providerFactory, featureFlags, editorAnalyticsAPI) {
   if (schema.nodes.emoji && providerFactory) {
     initMatcher(providerFactory);
-    var asciiEmojiRule = createRule(AsciiEmojiMatcher.REGEX, inputRuleHandler);
+    var asciiEmojiRule = createRule(AsciiEmojiMatcher.REGEX, inputRuleHandler(editorAnalyticsAPI));
     return createPlugin('emoji', [asciiEmojiRule]);
   }
   return;
@@ -33,17 +33,19 @@ function initMatcher(providerFactory) {
   };
   providerFactory.subscribe('emojiProvider', handleProvider);
 }
-function inputRuleHandler(state, matchParts, start, end) {
-  if (!matcher) {
+var inputRuleHandler = function inputRuleHandler(editorAnalyticsAPI) {
+  return function (state, matchParts, start, end) {
+    if (!matcher) {
+      return null;
+    }
+    var match = matcher.match(matchParts);
+    if (match) {
+      var transactionCreator = new AsciiEmojiTransactionCreator(state, match, start, end, editorAnalyticsAPI);
+      return transactionCreator.create();
+    }
     return null;
-  }
-  var match = matcher.match(matchParts);
-  if (match) {
-    var transactionCreator = new AsciiEmojiTransactionCreator(state, match, start, end);
-    return transactionCreator.create();
-  }
-  return null;
-}
+  };
+};
 var REGEX_LEADING_CAPTURE_INDEX = 1;
 var REGEX_EMOJI_LEADING_PARENTHESES = 2;
 var REGEX_EMOJI_ASCII_CAPTURE_INDEX = 3;
@@ -142,18 +144,20 @@ var RecordingAsciiEmojiMatcher = /*#__PURE__*/function (_AsciiEmojiMatcher) {
   return RecordingAsciiEmojiMatcher;
 }(AsciiEmojiMatcher);
 var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
-  function AsciiEmojiTransactionCreator(state, match, start, end) {
+  function AsciiEmojiTransactionCreator(state, match, start, end, editorAnalyticsAPI) {
     _classCallCheck(this, AsciiEmojiTransactionCreator);
     this.state = state;
     this.match = match;
     this.start = start;
     this.end = end;
+    this.editorAnalyticsAPI = editorAnalyticsAPI;
   }
   _createClass(AsciiEmojiTransactionCreator, [{
     key: "create",
     value: function create() {
+      var _this$editorAnalytics;
       var tr = this.state.tr.replaceWith(this.from, this.to, this.createNodes());
-      return addAnalytics(this.state, tr, {
+      (_this$editorAnalytics = this.editorAnalyticsAPI) === null || _this$editorAnalytics === void 0 ? void 0 : _this$editorAnalytics.attachAnalyticsEvent({
         action: ACTION.INSERTED,
         actionSubject: ACTION_SUBJECT.DOCUMENT,
         actionSubjectId: ACTION_SUBJECT_ID.EMOJI,
@@ -161,7 +165,8 @@ var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
           inputMethod: INPUT_METHOD.ASCII
         },
         eventType: EVENT_TYPE.TRACK
-      });
+      })(tr);
+      return tr;
     }
   }, {
     key: "from",
@@ -212,8 +217,8 @@ var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
   return AsciiEmojiTransactionCreator;
 }();
 export var stateKey = new PluginKey('asciiEmojiPlugin');
-var plugins = function plugins(schema, providerFactory, featureFlags) {
-  return [inputRulePlugin(schema, providerFactory, featureFlags)].filter(function (plugin) {
+var plugins = function plugins(schema, providerFactory, featureFlags, editorAnalyticsAPI) {
+  return [inputRulePlugin(schema, providerFactory, featureFlags, editorAnalyticsAPI)].filter(function (plugin) {
     return !!plugin;
   });
 };

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

@@ -1,7 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _typeof from "@babel/runtime/helpers/typeof";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { isSelectionAtStartOfNode, isSelectionAtEndOfNode } from '@atlaskit/editor-common/selection';
 import { createSelectionClickHandler } from '../../selection/utils';
 import ExtensionNodeView from '../nodeviews/extension';
 import { updateState, clearEditingContext } from '../commands';
@@ -234,6 +237,48 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
     },
     key: pluginKey,
     props: {
+      handleDOMEvents: {
+        /**
+         * ED-18072 - Cannot shift + arrow past bodied extension if it is not empty.
+         * This code is to handle the case where the selection starts inside or on the node and the user is trying to shift + arrow.
+         * For other part of the solution see code in: packages/editor/editor-core/src/plugins/selection/pm-plugins/events/keydown.ts
+         */
+        keydown: function keydown(view, event) {
+          if (event instanceof KeyboardEvent && event.shiftKey && ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(event.key)) {
+            var _view$state = view.state,
+              schema = _view$state.schema,
+              selection = _view$state.selection,
+              $head = _view$state.selection.$head,
+              doc = _view$state.doc,
+              tr = _view$state.tr;
+            var bodiedExtension = schema.nodes.bodiedExtension;
+            if (selection instanceof TextSelection || selection instanceof NodeSelection) {
+              var maybeBodiedExtension = selection instanceof TextSelection ? findParentNodeOfTypeClosestToPos($head, bodiedExtension) : findSelectedNodeOfType(bodiedExtension)(selection);
+              if (maybeBodiedExtension) {
+                var end = maybeBodiedExtension.pos + maybeBodiedExtension.node.nodeSize;
+                if (event.key === 'ArrowUp' || event.key === 'ArrowLeft' && isSelectionAtStartOfNode($head, maybeBodiedExtension)) {
+                  var anchor = end + 1;
+
+                  // an offset is used here so that left arrow selects the first character before the node (consistent with arrow right)
+                  var headOffset = event.key === 'ArrowLeft' ? -1 : 0;
+                  var head = maybeBodiedExtension.pos + headOffset;
+                  var newSelection = TextSelection.create(doc, Math.max(anchor, selection.anchor), head);
+                  view.dispatch(tr.setSelection(newSelection));
+                  return true;
+                }
+                if (event.key === 'ArrowDown' || event.key === 'ArrowRight' && isSelectionAtEndOfNode($head, maybeBodiedExtension)) {
+                  var _anchor = maybeBodiedExtension.pos - 1;
+                  var _head = end + 1;
+                  var _newSelection = TextSelection.create(doc, Math.min(_anchor, selection.anchor), _head);
+                  view.dispatch(tr.setSelection(_newSelection));
+                  return true;
+                }
+              }
+            }
+          }
+          return false;
+        }
+      },
       nodeViews: {
         // WARNING: referentiality-plugin also creates these nodeviews
         extension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),

package/dist/esm/plugins/floating-toolbar/index.js

@@ -323,9 +323,7 @@ function floatingToolbarPluginFactory(options) {
     return relevantConfig;
   };
   var apply = function apply(tr, pluginState) {
-    var newPluginState = {
-      getConfigWithNodeInfo: getConfigWithNodeInfo
-    };
+    var newPluginState = _objectSpread({}, pluginState);
     dispatch(pluginKey, newPluginState);
     return newPluginState;
   };

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -283,7 +283,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "handleSelectedEmoji", function (emojiId) {
       _this.props.editorView.focus();
-      insertEmoji(emojiId, INPUT_METHOD.PICKER)(_this.props.editorView.state, _this.props.editorView.dispatch);
+      insertEmoji(_this.editorAnalyticsAPI)(emojiId, INPUT_METHOD.PICKER)(_this.props.editorView.state, _this.props.editorView.dispatch);
       _this.toggleEmojiPicker();
       return true;
     });

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

@@ -1,5 +1,4 @@
 import _get from "@babel/runtime/helpers/get";
-import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -21,6 +20,7 @@ import { MediaSingle, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaski
 import { browser, floatingLayouts, isRichMediaInsideOfBlockNode } from '@atlaskit/editor-common/utils';
 import { isNodeSelectedOrInRange } from '../../../utils/nodes';
 import { setNodeSelection, setTextSelection } from '../../../utils';
+import ResizableMediaSingleNext from '../ui/ResizableMediaSingle/ResizableMediaSingleNext';
 import ResizableMediaSingle from '../ui/ResizableMediaSingle';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
@@ -35,6 +35,8 @@ 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 { getMediaSinglePixelWidth } from '@atlaskit/editor-common/media-single';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var MediaSingleNode = /*#__PURE__*/function (_Component) {
   _inherits(MediaSingleNode, _Component);
   var _super = _createSuper(MediaSingleNode);
@@ -199,7 +201,8 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       }
       var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, _this.props.node.attrs), {}, {
         layout: layout,
-        width: width
+        width: width,
+        widthType: 'pixel'
       }));
       tr.setMeta('scrollIntoView', false);
       /**
@@ -311,12 +314,19 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         mediaOptions = _this$props2.mediaOptions,
         fullWidthMode = _this$props2.fullWidthMode,
         state = _this$props2.view.state,
-        view = _this$props2.view;
+        view = _this$props2.view,
+        pluginInjectionApi = _this$props2.pluginInjectionApi,
+        containerWidth = _this$props2.width,
+        lineLength = _this$props2.lineLength,
+        dispatchAnalyticsEvent = _this$props2.dispatchAnalyticsEvent;
       var _ref4 = node.attrs,
         layout = _ref4.layout,
-        mediaSingleWidth = _ref4.width;
+        widthType = _ref4.widthType,
+        mediaSingleWidthAttribute = _ref4.width;
       var childNode = node.firstChild;
       var attrs = childNode.attrs;
+
+      // original width and height of child media node (scaled)
       var width = attrs.width,
         height = attrs.height;
       if (attrs.type === 'external') {
@@ -343,16 +353,29 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         width = DEFAULT_IMAGE_WIDTH;
         height = DEFAULT_IMAGE_HEIGHT;
       }
+      var isSelected = selected();
       var mediaSingleProps = {
         layout: layout,
         width: width,
         height: height,
-        containerWidth: this.props.width,
-        lineLength: this.props.lineLength,
-        pctWidth: mediaSingleWidth,
+        containerWidth: containerWidth,
+        lineLength: this.getLineLength(view, getPos()) || lineLength,
+        pctWidth: mediaSingleWidthAttribute,
         fullWidthMode: fullWidthMode,
-        hasFallbackContainer: false
+        hasFallbackContainer: false,
+        mediaSingleWidth: mediaSingleWidthAttribute && getMediaSinglePixelWidth(mediaSingleWidthAttribute, lineLength, widthType)
       };
+      var ResizableMediaSingleProps = _objectSpread({
+        view: view,
+        getPos: getPos,
+        updateSize: this.updateSize,
+        gridSize: 12,
+        viewMediaClientConfig: this.state.viewMediaClientConfig,
+        allowBreakoutSnapPoints: mediaOptions && mediaOptions.allowBreakoutSnapPoints,
+        selected: isSelected,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        pluginInjectionApi: pluginInjectionApi
+      }, mediaSingleProps);
       var canResize = !!this.props.mediaOptions.allowResizing;
       if (!this.props.mediaOptions.allowResizingInTables) {
         // If resizing not allowed in tables, check parents for tables
@@ -364,12 +387,10 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
           canResize = canResize && !disabledNode;
         }
       }
-      var lineLength = this.getLineLength(view, getPos()) || this.props.lineLength;
-      var isSelected = selected();
       var shouldShowPlaceholder = getMediaFeatureFlag('captions', mediaOptions.featureFlags) && node.childCount !== 2 && isSelected && state.selection instanceof NodeSelection;
       var MediaChildren = jsx("figure", {
         ref: this.mediaSingleWrapperRef,
-        css: figureWrapper,
+        css: [figureWrapper],
         className: MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
       }, jsx("div", {
@@ -378,18 +399,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         ref: this.captionPlaceHolderRef,
         onClick: this.clickPlaceholder
       }));
-      return canResize ? jsx(ResizableMediaSingle, _extends({}, mediaSingleProps, {
-        lineLength: lineLength,
-        view: this.props.view,
-        getPos: getPos,
-        updateSize: this.updateSize,
-        gridSize: 12,
-        viewMediaClientConfig: this.state.viewMediaClientConfig,
-        allowBreakoutSnapPoints: mediaOptions && mediaOptions.allowBreakoutSnapPoints,
-        selected: isSelected,
-        dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent,
-        pluginInjectionApi: this.props.pluginInjectionApi
-      }), MediaChildren) : jsx(MediaSingle, mediaSingleProps, MediaChildren);
+      return canResize ? getBooleanFF('platform.editor.media.extended-resize-experience') ? jsx(ResizableMediaSingleNext, ResizableMediaSingleProps, MediaChildren) : jsx(ResizableMediaSingle, ResizableMediaSingleProps, MediaChildren) : jsx(MediaSingle, mediaSingleProps, MediaChildren);
     }
   }]);
   return MediaSingleNode;

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

@@ -20,8 +20,9 @@ import { LinkToolbarAppearance } from './linking-toolbar-appearance';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { messages } from '@atlaskit/media-ui';
 import { cardMessages } from '@atlaskit/editor-common/messages';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { FilePreviewItem } from './filePreviewItem';
-import { downloadMedia, removeMediaGroupNode } from './utils';
+import { downloadMedia, getSelectedMediaSingle, removeMediaGroupNode } from './utils';
 import { changeInlineToMediaCard, changeMediaCardToInline, removeInlineCard, setBorderMark, toggleBorderMark } from './commands';
 import { MediaInlineNodeSelector, MediaSingleNodeSelector } from '../nodeviews/styles';
 import ImageBorderItem from '../ui/ImageBorder';
@@ -225,7 +226,20 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
   }
   if (allowAdvancedToolBarOptions) {
     var _pluginInjectionApi$d;
-    var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions, allowResizing, allowResizingInTables);
+    var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width;
+    var isChangingLayoutDisabled = false;
+    if (getBooleanFF('platform.editor.media.extended-resize-experience')) {
+      var _widthPlugin$sharedSt;
+      var contentWidth = widthPlugin === null || widthPlugin === void 0 ? void 0 : (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
+      var selectedNode = getSelectedMediaSingle(state);
+      if (selectedNode && contentWidth) {
+        var width = selectedNode.node.attrs.width;
+        if (width >= contentWidth) {
+          isChangingLayoutDisabled = true;
+        }
+      }
+    }
+    var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
     toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
     if (layoutButtons.length) {
       toolbarButtons.push({
@@ -327,7 +341,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
   var mediaLinkingState = getMediaLinkingState(state);
   var _ref2 = (_pluginInjectionApi$d4 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d4 !== void 0 ? _pluginInjectionApi$d4 : {},
     hoverDecoration = _ref2.hoverDecoration;
-  if (!mediaPluginState) {
+  if (!mediaPluginState || mediaPluginState.isResizing) {
     return;
   }
   var nodeType = allowMediaInline ? [mediaInline, mediaSingle, media] : [mediaSingle];

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

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getMediaClient } from '@atlaskit/media-client';
-import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export var getSelectedMediaContainerNodeAttrs = function getSelectedMediaContainerNodeAttrs(mediaPluginState) {
   var selectedNode = mediaPluginState.selectedMediaContainerNode();
   if (selectedNode && selectedNode.attrs) {
@@ -58,4 +58,8 @@ export var removeMediaGroupNode = function removeMediaGroupNode(state) {
     tr = removeSelectedNode(tr);
   }
   return tr;
+};
+export var getSelectedMediaSingle = function getSelectedMediaSingle(state) {
+  var mediaSingle = state.schema.nodes.mediaSingle;
+  return findSelectedNodeOfType(mediaSingle)(state.selection) || findParentNodeOfType(mediaSingle)(state.selection);
 };