@atlaskit/editor-core 185.5.2 → 185.5.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 185.5.5
+
+### Patch Changes
+
+- [`072578e8f55`](https://bitbucket.org/atlassian/atlassian-frontend/commits/072578e8f55) - [ux] The change here enables the datasource table to be configured with varying width based on 3 layout modes.
+- [`dd532ad4f99`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dd532ad4f99) - [MEX-2457] fix wrong upload position for mediaGroup
+
 ## 185.5.2
 
 ### Patch Changes

package/dist/cjs/plugins/breakout/ui/LayoutButton.js

@@ -25,41 +25,18 @@ var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton")
 var _getBreakoutMode = require("../utils/get-breakout-mode");
 var _setBreakoutMode = require("../commands/set-breakout-mode");
 var _removeBreakout = require("../commands/remove-breakout");
-var _messages = _interopRequireDefault(require("../../../messages"));
 var _constants = require("../constants");
 var _isBreakoutMarkAllowed = require("../utils/is-breakout-mark-allowed");
 var _pluginKey = require("../plugin-key");
 var _prosemirrorState = require("prosemirror-state");
 var _isSupportedNode = require("../utils/is-supported-node");
 var _constants2 = require("@atlaskit/theme/constants");
+var _utils = require("@atlaskit/editor-common/utils");
 var _templateObject;
 /** @jsx jsx */
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var toolbarButtonWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  && button {\n    background: ", ";\n    color: ", ";\n    :hover {\n      background: ", ";\n      color: ", " !important;\n    }\n  }\n"])), "var(--ds-background-neutral, ".concat(_colors.N20A, ")"), "var(--ds-icon, ".concat(_colors.N300, ")"), "var(--ds-background-neutral-hovered, ".concat(_colors.B300, ")"), "var(--ds-icon, white)");
-var BREAKOUT_MODE = {
-  FULL_WIDTH: 'full-width',
-  CENTER: 'center',
-  WIDE: 'wide'
-};
-var getNextBreakoutMode = function getNextBreakoutMode(currentMode) {
-  if (currentMode === BREAKOUT_MODE.FULL_WIDTH) {
-    return BREAKOUT_MODE.CENTER;
-  } else if (currentMode === BREAKOUT_MODE.WIDE) {
-    return BREAKOUT_MODE.FULL_WIDTH;
-  }
-  return BREAKOUT_MODE.WIDE;
-};
-var getTitle = function getTitle(layout) {
-  switch (layout) {
-    case BREAKOUT_MODE.FULL_WIDTH:
-      return _messages.default.layoutFixedWidth;
-    case BREAKOUT_MODE.WIDE:
-      return _messages.default.layoutFullWidth;
-    default:
-      return _messages.default.layoutWide;
-  }
-};
 function getBreakoutNodeElement(pluginState, selection, editorView) {
   if (selection instanceof _prosemirrorState.NodeSelection && (0, _isSupportedNode.isSupportedNodeForBreakout)(selection.node)) {
     return (0, _prosemirrorUtils.findDomRefAtPos)(selection.from, editorView.domAtPos.bind(editorView));
@@ -81,7 +58,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         var _this$props$editorVie = _this.props.editorView,
           state = _this$props$editorVie.state,
           dispatch = _this$props$editorVie.dispatch;
-        if ([BREAKOUT_MODE.WIDE, BREAKOUT_MODE.FULL_WIDTH].indexOf(breakoutMode) !== -1) {
+        if (['wide', 'full-width'].indexOf(breakoutMode) !== -1) {
           (0, _setBreakoutMode.setBreakoutMode)(breakoutMode)(state, dispatch);
         } else {
           (0, _removeBreakout.removeBreakout)()(state, dispatch);
@@ -105,9 +82,9 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         return null;
       }
       var breakoutMode = (0, _getBreakoutMode.getBreakoutMode)(editorView.state);
-      var titleMessage = getTitle(breakoutMode);
+      var titleMessage = (0, _utils.getTitle)(breakoutMode);
       var title = formatMessage(titleMessage);
-      var nextBreakoutMode = getNextBreakoutMode(breakoutMode);
+      var nextBreakoutMode = (0, _utils.getNextBreakoutMode)(breakoutMode);
       var belowOtherPopupsZIndex = _constants2.layers.layer() - 1;
       var pluginState = (0, _pluginKey.getPluginState)(state);
       var element = getBreakoutNodeElement(pluginState, state.selection, editorView);
@@ -136,7 +113,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         title: title,
         testId: titleMessage.id,
         onClick: this.handleClick(nextBreakoutMode),
-        iconBefore: breakoutMode === BREAKOUT_MODE.FULL_WIDTH ? (0, _react2.jsx)(_collapse.default, {
+        iconBefore: breakoutMode === 'full-width' ? (0, _react2.jsx)(_collapse.default, {
           label: title
         }) : (0, _react2.jsx)(_expand.default, {
           label: title

package/dist/cjs/plugins/card/index.js

@@ -1,21 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _main = require("./pm-plugins/main");
 var _toolbar = require("./toolbar");
 var _EditorSmartCardEvents = require("./ui/EditorSmartCardEvents");
 var _keymap = require("./pm-plugins/keymap");
 var _EditorSmartCardEventsNext = require("./ui/EditorSmartCardEventsNext");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
+var _pluginKey = require("./pm-plugins/plugin-key");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var cardPlugin = function cardPlugin(options, api) {
@@ -23,6 +22,12 @@ var cardPlugin = function cardPlugin(options, api) {
   var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'card',
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return null;
+      }
+      return _pluginKey.pluginKey.getState(editorState);
+    },
     nodes: function nodes() {
       var nodes = [{
         name: 'inlineCard',
@@ -66,12 +71,21 @@ var cardPlugin = function cardPlugin(options, api) {
       return plugins;
     },
     contentComponent: function contentComponent(_ref2) {
-      var editorView = _ref2.editorView;
+      var editorView = _ref2.editorView,
+        popupsMountPoint = _ref2.popupsMountPoint,
+        popupsScrollableElement = _ref2.popupsScrollableElement,
+        popupsBoundariesElement = _ref2.popupsBoundariesElement;
       var lpAnalyticsEventsNext = featureFlags.lpAnalyticsEventsNext;
-      return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_EditorSmartCardEvents.EditorSmartCardEvents, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_EditorSmartCardEvents.EditorSmartCardEvents, {
         editorView: editorView
       }), lpAnalyticsEventsNext && /*#__PURE__*/_react.default.createElement(_EditorSmartCardEventsNext.EditorSmartCardEventsNext, {
         editorView: editorView
+      }), /*#__PURE__*/_react.default.createElement(_LayoutButton.default, {
+        api: api,
+        editorView: editorView,
+        mountPoint: popupsMountPoint,
+        scrollableElement: popupsScrollableElement,
+        boundariesElement: popupsBoundariesElement
       }));
     },
     pluginsOptions: {

package/dist/cjs/plugins/card/nodeviews/datasource.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DatasourceComponent = exports.Datasource = void 0;
+exports.DatasourceComponent = exports.Datasource = exports.DATASOURCE_INNER_CONTAINER_CLASSNAME = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -17,10 +17,14 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react2 = require("@emotion/react");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _linkDatasource = require("@atlaskit/link-datasource");
+var _styles = require("@atlaskit/editor-common/styles");
+var _utils = require("@atlaskit/editor-common/utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
+var DATASOURCE_INNER_CONTAINER_CLASSNAME = 'datasourceView-content-inner-wrap';
+exports.DATASOURCE_INNER_CONTAINER_CLASSNAME = DATASOURCE_INNER_CONTAINER_CLASSNAME;
 var containerStyles = (0, _react2.css)({
   height: '500px',
   overflow: 'auto'
@@ -118,15 +122,46 @@ exports.DatasourceComponent = DatasourceComponent;
 var Datasource = /*#__PURE__*/function (_ReactNodeView) {
   (0, _inherits2.default)(Datasource, _ReactNodeView);
   var _super2 = _createSuper(Datasource);
-  function Datasource() {
+  function Datasource(props) {
+    var _props$pluginInjectio, _props$pluginInjectio2, _props$pluginInjectio3, _sharedState$currentS;
+    var _this2;
     (0, _classCallCheck2.default)(this, Datasource);
-    return _super2.apply(this, arguments);
+    _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this2), "calcTableWidth", function (layout, containerWidth) {
+      if (layout === 'center') {
+        return 'inherit';
+      }
+      return (0, _utils.calcBreakoutWidthPx)(layout, containerWidth);
+    });
+    var sharedState = props === null || props === void 0 ? void 0 : (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 ? void 0 : (_props$pluginInjectio2 = _props$pluginInjectio.dependencies) === null || _props$pluginInjectio2 === void 0 ? void 0 : (_props$pluginInjectio3 = _props$pluginInjectio2.width) === null || _props$pluginInjectio3 === void 0 ? void 0 : _props$pluginInjectio3.sharedState;
+    _this2.tableWidth = sharedState === null || sharedState === void 0 ? void 0 : (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
+    sharedState === null || sharedState === void 0 ? void 0 : sharedState.onChange(function (_ref2) {
+      var nextSharedState = _ref2.nextSharedState;
+      if (nextSharedState !== null && nextSharedState !== void 0 && nextSharedState.width && _this2.tableWidth !== (nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.width)) {
+        _this2.tableWidth = nextSharedState === null || nextSharedState === void 0 ? void 0 : nextSharedState.width;
+        _this2.update(_this2.node, []); // required to update the width when page is resized.
+      }
+    });
+    return _this2;
   }
   (0, _createClass2.default)(Datasource, [{
+    key: "createDomRef",
+    value: function createDomRef() {
+      var domRef = document.createElement('div');
+      domRef.classList.add(_styles.SmartCardSharedCssClassName.DATASOURCE_CONTAINER);
+      return domRef;
+    }
+  }, {
     key: "render",
     value: function render() {
+      var attrs = this.node.attrs;
+      var calculatedWidth = this.calcTableWidth(attrs.layout, this.tableWidth);
       return (0, _react2.jsx)("div", {
-        css: containerStyles
+        className: DATASOURCE_INNER_CONTAINER_CLASSNAME,
+        css: containerStyles,
+        style: {
+          minWidth: calculatedWidth
+        }
       }, (0, _react2.jsx)(DatasourceComponent, {
         node: this.node,
         view: this.view,

package/dist/cjs/plugins/card/pm-plugins/actions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showLinkToolbar = exports.setProvider = exports.resolveCard = exports.registerSmartCardEventsNext = exports.registerSmartCardEvents = exports.registerCard = exports.queueCards = exports.hideLinkToolbar = exports.cardAction = void 0;
+exports.showLinkToolbar = exports.setProvider = exports.setDatasourceTableRef = exports.setCardLayoutAndDatasourceTableRef = exports.setCardLayout = exports.resolveCard = exports.registerSmartCardEventsNext = exports.registerSmartCardEvents = exports.registerCard = exports.queueCards = exports.hideLinkToolbar = exports.cardAction = void 0;
 var _pluginKey = require("./plugin-key");
 var cardAction = function cardAction(tr, action) {
   return tr.setMeta(_pluginKey.pluginKey, action);
@@ -63,6 +63,36 @@ var setProvider = function setProvider(cardProvider) {
   };
 };
 exports.setProvider = setProvider;
+var setDatasourceTableRef = function setDatasourceTableRef(datasourceTableRef) {
+  return function (tr) {
+    return cardAction(tr, {
+      type: 'SET_DATASOURCE_TABLE_REF',
+      datasourceTableRef: datasourceTableRef
+    });
+  };
+};
+exports.setDatasourceTableRef = setDatasourceTableRef;
+var setCardLayout = function setCardLayout(layout) {
+  return function (tr) {
+    return cardAction(tr, {
+      type: 'SET_CARD_LAYOUT',
+      layout: layout
+    });
+  };
+};
+exports.setCardLayout = setCardLayout;
+var setCardLayoutAndDatasourceTableRef = function setCardLayoutAndDatasourceTableRef(_ref) {
+  var layout = _ref.layout,
+    datasourceTableRef = _ref.datasourceTableRef;
+  return function (tr) {
+    return cardAction(tr, {
+      type: 'SET_CARD_LAYOUT_AND_DATASOURCE_TABLE_REF',
+      layout: layout,
+      datasourceTableRef: datasourceTableRef
+    });
+  };
+};
+exports.setCardLayoutAndDatasourceTableRef = setCardLayoutAndDatasourceTableRef;
 var showLinkToolbar = function showLinkToolbar(tr) {
   return cardAction(tr, {
     type: 'SHOW_LINK_TOOLBAR'

package/dist/cjs/plugins/card/pm-plugins/main.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "pluginKey", {
 });
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _prosemirrorState = require("prosemirror-state");
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _blockCard = require("../nodeviews/blockCard");
@@ -24,6 +25,8 @@ var _resolve = require("./util/resolve");
 var _state = require("./util/state");
 var _analytics = require("./analytics");
 var _datasource = require("../nodeviews/datasource");
+var _actions = require("./actions");
+var _prosemirrorUtils = require("prosemirror-utils");
 var createPlugin = function createPlugin(options, pluginInjectionApi) {
   return function (pmPluginFactoryParams) {
     var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
@@ -46,7 +49,9 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             smartLinkEvents: undefined,
             smartLinkEventsNext: undefined,
             createAnalyticsEvent: createAnalyticsEvent,
-            editorAppearance: editorAppearance
+            editorAppearance: editorAppearance,
+            datasourceTableRef: undefined,
+            layout: undefined
           };
         },
         apply: function apply(tr, pluginState, prevEditorState) {
@@ -72,12 +77,42 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
         var subscriptionHandler = function subscriptionHandler(name, provider) {
           return (0, _resolve.handleProvider)(name, provider, _view);
         };
+        var domAtPos = _view.domAtPos.bind(_view);
         var rafCancellationCallbacks = [];
         pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
         return {
           update: function update(view, prevState) {
+            var _selection$node;
             var currentState = (0, _state.getPluginState)(view.state);
             var oldState = (0, _state.getPluginState)(prevState);
+            var state = view.state,
+              dispatch = view.dispatch;
+            var selection = state.selection,
+              tr = state.tr,
+              schema = state.schema;
+            var isBlockCardSelected = selection instanceof _prosemirrorState.NodeSelection && ((_selection$node = selection.node) === null || _selection$node === void 0 ? void 0 : _selection$node.type) === schema.nodes.blockCard;
+            if (isBlockCardSelected) {
+              var _findDomRefAtPos, _node$attrs;
+              var datasourceTableRef = (_findDomRefAtPos = (0, _prosemirrorUtils.findDomRefAtPos)(selection.from, domAtPos)) === null || _findDomRefAtPos === void 0 ? void 0 : _findDomRefAtPos.querySelector(".".concat(_datasource.DATASOURCE_INNER_CONTAINER_CLASSNAME));
+              var node = selection.node;
+              var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
+              var shouldUpdateTableRef = datasourceTableRef && (currentState === null || currentState === void 0 ? void 0 : currentState.datasourceTableRef) !== datasourceTableRef;
+              if (isDatasource && shouldUpdateTableRef) {
+                var _node$attrs2;
+                // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
+                var layout = (node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || 'center';
+
+                // we use cardAction to set the same meta, hence, we will need to combine both layout+datasourceTableRef in one transaction
+                dispatch((0, _actions.setCardLayoutAndDatasourceTableRef)({
+                  datasourceTableRef: datasourceTableRef,
+                  layout: layout
+                })(tr));
+              }
+            } else {
+              if (currentState !== null && currentState !== void 0 && currentState.datasourceTableRef) {
+                dispatch((0, _actions.setDatasourceTableRef)(undefined)(tr));
+              }
+            }
             if (currentState && currentState.provider) {
               // Find requests in this state that weren't in the old one.
               var newRequests = (0, _state.getNewRequests)(oldState, currentState);
@@ -123,6 +158,7 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             }
           }),
           blockCard: function blockCard(node, view, getPos) {
+            var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
             var reactComponentProps = {
@@ -130,8 +166,17 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
               showServerActions: showServerActions
             };
             var hasIntlContext = true;
-            if (node.attrs.datasource) {
-              return new _datasource.Datasource(node, view, getPos, portalProviderAPI, eventDispatcher, undefined, undefined, true, undefined, hasIntlContext).init();
+            var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+            if (isDatasource) {
+              return new _datasource.Datasource({
+                node: node,
+                view: view,
+                getPos: getPos,
+                portalProviderAPI: portalProviderAPI,
+                eventDispatcher: eventDispatcher,
+                hasIntlContext: hasIntlContext,
+                pluginInjectionApi: pluginInjectionApi
+              }).init();
             }
             return new _blockCard.BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           },

package/dist/cjs/plugins/card/pm-plugins/reducers.js

@@ -36,6 +36,22 @@ var setProvider = function setProvider(state, action) {
     provider: action.provider
   });
 };
+var setCardLayout = function setCardLayout(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    layout: action.layout
+  });
+};
+var setDatasourceTableRef = function setDatasourceTableRef(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    datasourceTableRef: action.datasourceTableRef
+  });
+};
+var setCardLayoutDatasourceTableRef = function setCardLayoutDatasourceTableRef(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    datasourceTableRef: action.datasourceTableRef,
+    layout: action.layout
+  });
+};
 var registerEvents = function registerEvents(state, action) {
   return _objectSpread(_objectSpread({}, state), {}, {
     smartLinkEvents: action.smartLinkEvents
@@ -65,6 +81,12 @@ var _default = function _default(state, action) {
       return registerEvents(state, action);
     case 'REGISTER_EVENTS_NEXT':
       return registerEventsNext(state, action);
+    case 'SET_DATASOURCE_TABLE_REF':
+      return setDatasourceTableRef(state, action);
+    case 'SET_CARD_LAYOUT':
+      return setCardLayout(state, action);
+    case 'SET_CARD_LAYOUT_AND_DATASOURCE_TABLE_REF':
+      return setCardLayoutDatasourceTableRef(state, action);
     case 'SHOW_LINK_TOOLBAR':
     case 'HIDE_LINK_TOOLBAR':
       return setLinkToolbar(state, action);

package/dist/cjs/plugins/card/styles.js

@@ -13,5 +13,5 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _templateObject;
 var FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = 'card-floating-toolbar--link-picker';
 exports.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = FLOATING_TOOLBAR_LINKPICKER_CLASSNAME;
-var smartCardStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    max-width: calc(100% - 20px);\n    vertical-align: top;\n    word-break: break-all;\n\n    .card {\n      padding-left: 2px;\n      padding-right: 2px;\n      padding-top: 0.5em;\n      padding-bottom: 0.5em;\n      margin-bottom: -0.5em;\n\n      .", " > a:focus {\n        ", "\n      }\n    }\n\n    &.", "\n      .", "\n      > a {\n      ", "\n    }\n    .", " > a {\n      /* EDM-1717: box-shadow Safari fix start */\n      z-index: 1;\n      position: relative;\n      /* EDM-1717: box-shadow Safari fix end */\n    }\n\n    &.danger {\n      .", " > a {\n        box-shadow: 0 0 0 1px\n          ", ";\n        /* EDM-1717: box-shadow Safari fix start */\n        z-index: 2;\n        /* EDM-1717: box-shadow Safari fix end */\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n    }\n\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.danger {\n      .", " > div {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &::after {\n        transition: box-shadow 0s;\n      }\n    }\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.", "\n      .", "\n      > div::after {\n      ", "\n    }\n\n    &.danger {\n      .media-card-frame::after {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n        background: ", " !important;\n      }\n      .richMedia-resize-handle-right::after,\n      .richMedia-resize-handle-left::after {\n        background: ", ";\n      }\n    }\n  }\n\n  .", " {\n    padding: 0;\n  }\n"])), _styles.SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _styles.SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);
+var smartCardStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    max-width: calc(100% - 20px);\n    vertical-align: top;\n    word-break: break-all;\n\n    .card {\n      padding-left: 2px;\n      padding-right: 2px;\n      padding-top: 0.5em;\n      padding-bottom: 0.5em;\n      margin-bottom: -0.5em;\n\n      .", " > a:focus {\n        ", "\n      }\n    }\n\n    &.", "\n      .", "\n      > a {\n      ", "\n    }\n    .", " > a {\n      /* EDM-1717: box-shadow Safari fix start */\n      z-index: 1;\n      position: relative;\n      /* EDM-1717: box-shadow Safari fix end */\n    }\n\n    &.danger {\n      .", " > a {\n        box-shadow: 0 0 0 1px\n          ", ";\n        /* EDM-1717: box-shadow Safari fix start */\n        z-index: 2;\n        /* EDM-1717: box-shadow Safari fix end */\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n    }\n\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.danger {\n      .", " > div {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n      }\n    }\n  }\n\n  .", ".", " {\n    max-width: 100%;\n    display: flex;\n    justify-content: center;\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &::after {\n        transition: box-shadow 0s;\n      }\n    }\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.", "\n      .", "\n      > div::after {\n      ", "\n    }\n\n    &.danger {\n      .media-card-frame::after {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n        background: ", " !important;\n      }\n      .richMedia-resize-handle-right::after,\n      .richMedia-resize-handle-left::after {\n        background: ", ";\n      }\n    }\n  }\n\n  .", " {\n    padding: 0;\n  }\n"])), _styles.SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _styles.SmartCardSharedCssClassName.DATASOURCE_CONTAINER, _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);
 exports.smartCardStyles = smartCardStyles;

package/dist/cjs/plugins/card/ui/LayoutButton/index.js

@@ -0,0 +1,113 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.LayoutButton = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
+var _react2 = require("@emotion/react");
+var _ui = require("@atlaskit/editor-common/ui");
+var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _collapse = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/collapse"));
+var _expand = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/expand"));
+var _reactIntlNext = require("react-intl-next");
+var _styled = require("./styled");
+var _utils = require("./utils");
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _actions = require("../../pm-plugins/actions");
+var _utils2 = require("@atlaskit/editor-common/utils");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } /** @jsx jsx */
+var LayoutButton = function LayoutButton(_ref) {
+  var onLayoutChange = _ref.onLayoutChange,
+    _ref$layout = _ref.layout,
+    layout = _ref$layout === void 0 ? 'center' : _ref$layout,
+    formatMessage = _ref.intl.formatMessage,
+    mountPoint = _ref.mountPoint,
+    boundariesElement = _ref.boundariesElement,
+    scrollableElement = _ref.scrollableElement,
+    targetElement = _ref.targetElement,
+    _ref$testId = _ref.testId,
+    testId = _ref$testId === void 0 ? 'datasource-table-layout-button' : _ref$testId;
+  var handleClick = (0, _react.useCallback)(function () {
+    onLayoutChange && onLayoutChange((0, _utils2.getNextBreakoutMode)(layout));
+  }, [layout, onLayoutChange]);
+  var title = (0, _react.useMemo)(function () {
+    return formatMessage((0, _utils2.getTitle)(layout));
+  }, [formatMessage, layout]);
+  if (!targetElement) {
+    return null;
+  }
+  return (0, _react2.jsx)(_ui.Popup, {
+    mountTo: mountPoint,
+    boundariesElement: boundariesElement,
+    scrollableElement: scrollableElement,
+    target: targetElement,
+    alignY: "start",
+    alignX: "end",
+    forcePlacement: true,
+    stick: true,
+    ariaLabel: title
+  }, (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+    testId: testId,
+    css: _styled.toolbarButtonWrapper,
+    title: title,
+    onClick: handleClick,
+    iconBefore: layout === 'full-width' ? (0, _react2.jsx)(_collapse.default, {
+      label: title
+    }) : (0, _react2.jsx)(_expand.default, {
+      label: title
+    })
+  }));
+};
+exports.LayoutButton = LayoutButton;
+var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {
+  var _node$attrs, _node$attrs2;
+  var editorView = _ref2.editorView,
+    mountPoint = _ref2.mountPoint,
+    scrollableElement = _ref2.scrollableElement,
+    boundariesElement = _ref2.boundariesElement,
+    intl = _ref2.intl,
+    api = _ref2.api;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['card']),
+    cardState = _useSharedPluginState.cardState;
+  var _getDatasource = (0, _utils.getDatasource)(editorView),
+    node = _getDatasource.node,
+    pos = _getDatasource.pos;
+  var _ref3 = cardState !== null && cardState !== void 0 ? cardState : {},
+    datasourceTableRef = _ref3.datasourceTableRef,
+    _ref3$layout = _ref3.layout,
+    layout = _ref3$layout === void 0 ? (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.layout) || 'center' : _ref3$layout;
+  var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.datasource);
+  var onLayoutChange = function onLayoutChange(layout) {
+    if (pos === undefined) {
+      return;
+    }
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    var tr = state.tr.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node === null || node === void 0 ? void 0 : node.attrs), {}, {
+      layout: layout
+    }));
+    tr.setMeta('scrollIntoView', false);
+    dispatch((0, _actions.setCardLayout)(layout)(tr));
+  };
+  if (!isDatasource) {
+    return null;
+  }
+  return (0, _react2.jsx)(LayoutButton, {
+    mountPoint: mountPoint,
+    scrollableElement: scrollableElement,
+    boundariesElement: boundariesElement,
+    targetElement: datasourceTableRef,
+    layout: layout,
+    onLayoutChange: onLayoutChange,
+    intl: intl
+  });
+};
+var _default = (0, _reactIntlNext.injectIntl)(LayoutButtonWrapper);
+exports.default = _default;

package/dist/cjs/plugins/card/ui/LayoutButton/styled.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toolbarButtonWrapper = void 0;
+var _react = require("@emotion/react");
+var _colors = require("@atlaskit/theme/colors");
+var toolbarButtonWrapper = (0, _react.css)({
+  background: "".concat("var(--ds-background-neutral, ".concat(_colors.N20A, ")")),
+  color: "".concat("var(--ds-icon, ".concat(_colors.N300, ")")),
+  ':hover': {
+    background: "".concat("var(--ds-background-neutral-hovered, ".concat(_colors.B300, ")")),
+    color: "var(--ds-icon, white)".concat(" !important")
+  }
+});
+exports.toolbarButtonWrapper = toolbarButtonWrapper;

package/dist/cjs/plugins/card/ui/LayoutButton/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/plugins/card/ui/LayoutButton/utils.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDatasource = void 0;
+var _prosemirrorUtils = require("prosemirror-utils");
+var getDatasource = function getDatasource(editorView) {
+  var _findSelectedNodeOfTy;
+  var _editorView$state = editorView.state,
+    selection = _editorView$state.selection,
+    schema = _editorView$state.schema;
+  var blockCard = schema.nodes.blockCard;
+  return (_findSelectedNodeOfTy = (0, _prosemirrorUtils.findSelectedNodeOfType)([blockCard])(selection)) !== null && _findSelectedNodeOfTy !== void 0 ? _findSelectedNodeOfTy : {
+    node: undefined,
+    pos: undefined
+  };
+};
+exports.getDatasource = getDatasource;

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

@@ -452,8 +452,27 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       var _this$view = _this.view,
         dispatch = _this$view.dispatch,
         state = _this$view.state;
+      var tr = state.tr,
+        selection = state.selection,
+        doc = state.doc;
+      var _state$schema$nodes = state.schema.nodes,
+        media = _state$schema$nodes.media,
+        mediaGroup = _state$schema$nodes.mediaGroup;
+
+      // Workaround for wrong upload position
+      // @see https://product-fabric.atlassian.net/browse/MEX-2457
+      // If the media node is the last selectable item in the current cursor position and it is located within a mediaGroup,
+      // we relocate the cursor to the first child of the mediaGroup.
+      var sel = _prosemirrorState.Selection.findFrom(doc.resolve(selection.$from.pos - 1), -1);
+      if (sel && (0, _prosemirrorUtils.findSelectedNodeOfType)(media)(sel)) {
+        var parent = (0, _prosemirrorUtils.findParentNodeOfType)(mediaGroup)(sel);
+        if (parent) {
+          tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, parent.start));
+        }
+      }
+
       // Trigger state change to be able to pick it up in the decorations handler
-      dispatch(state.tr);
+      dispatch(tr);
     });
     this.options = options;
     this.mediaOptions = mediaOptions;

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 = "185.5.2";
+var version = "185.5.5";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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