@atlaskit/editor-core 162.0.2 → 164.0.1

package/dist/cjs/plugins/list/ui/ToolbarLists/index.js

@@ -23,7 +23,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("@emotion/react");
+
+var _react2 = require("react");
 
 var _reactIntlNext = require("react-intl-next");
 
@@ -100,7 +102,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
         },
         isDisabled: bulletListDisabled,
         isActive: Boolean(bulletListActive),
-        elemAfter: /*#__PURE__*/_react.default.createElement(_styles.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.toggleBulletList))
+        elemAfter: (0, _react.jsx)("div", {
+          css: _styles.shortcutStyle
+        }, (0, _keymaps.tooltip)(_keymaps.toggleBulletList))
       }, {
         key: 'orderedList',
         content: labelOrderedList,
@@ -109,7 +113,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
         },
         isDisabled: orderedListDisabled,
         isActive: Boolean(orderedListActive),
-        elemAfter: /*#__PURE__*/_react.default.createElement(_styles.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.toggleOrderedList))
+        elemAfter: (0, _react.jsx)("div", {
+          css: _styles.shortcutStyle
+        }, (0, _keymaps.tooltip)(_keymaps.toggleOrderedList))
       }];
       return [{
         items: items
@@ -173,9 +179,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
       if (!isSmall) {
         var labelUnorderedList = formatMessage(_messages.messages.unorderedList);
         var labelOrderedList = formatMessage(_messages.messages.orderedList);
-        return /*#__PURE__*/_react.default.createElement(_styles.ButtonGroup, {
-          width: isReducedSpacing ? 'small' : 'large'
-        }, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
+        return (0, _react.jsx)("span", {
+          css: _styles.buttonGroupStyle
+        }, (0, _react.jsx)(_ToolbarButton.default, {
           buttonId: _ToolbarButton.TOOLBAR_BUTTON.BULLET_LIST,
           spacing: isReducedSpacing ? 'none' : 'default',
           onClick: this.handleBulletListClick,
@@ -183,14 +189,14 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           "aria-pressed": bulletListActive,
           "aria-label": labelUnorderedList,
           disabled: bulletListDisabled || disabled,
-          title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+          title: (0, _react.jsx)(_keymaps.ToolTipContent, {
             description: labelUnorderedList,
             keymap: _keymaps.toggleBulletList
           }),
-          iconBefore: /*#__PURE__*/_react.default.createElement(_bulletList.default, {
+          iconBefore: (0, _react.jsx)(_bulletList.default, {
             label: ""
           })
-        }), /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
+        }), (0, _react.jsx)(_ToolbarButton.default, {
           buttonId: _ToolbarButton.TOOLBAR_BUTTON.ORDERED_LIST,
           spacing: isReducedSpacing ? 'none' : 'default',
           onClick: this.handleOrderedListClick,
@@ -198,14 +204,16 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           "aria-pressed": orderedListActive,
           "aria-label": labelOrderedList,
           disabled: orderedListDisabled || disabled,
-          title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
+          title: (0, _react.jsx)(_keymaps.ToolTipContent, {
             description: labelOrderedList,
             keymap: _keymaps.toggleOrderedList
           }),
-          iconBefore: /*#__PURE__*/_react.default.createElement(_numberList.default, {
+          iconBefore: (0, _react.jsx)(_numberList.default, {
             label: ""
           })
-        }), isSeparator && /*#__PURE__*/_react.default.createElement(_styles.Separator, null));
+        }), isSeparator && (0, _react.jsx)("span", {
+          css: _styles.separatorStyles
+        }));
       } else {
         var items = this.createItems();
         var _this$props3 = this.props,
@@ -213,7 +221,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
             popupsBoundariesElement = _this$props3.popupsBoundariesElement,
             popupsScrollableElement = _this$props3.popupsScrollableElement;
         var labelLists = formatMessage(_messages.messages.lists);
-        return /*#__PURE__*/_react.default.createElement(_styles.Wrapper, null, /*#__PURE__*/_react.default.createElement(_DropdownMenu.default, {
+        return (0, _react.jsx)("span", {
+          css: _styles.wrapperStyle
+        }, (0, _react.jsx)(_DropdownMenu.default, {
           items: items,
           onItemActivated: this.onItemActivated,
           mountTo: popupsMountPoint,
@@ -224,7 +234,7 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           fitHeight: 188,
           fitWidth: 175,
           shouldUseDefaultRole: true
-        }, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
+        }, (0, _react.jsx)(_ToolbarButton.default, {
           spacing: isReducedSpacing ? 'none' : 'default',
           selected: bulletListActive || orderedListActive,
           "aria-expanded": isDropdownOpen,
@@ -233,17 +243,23 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           disabled: disabled,
           onClick: this.handleTriggerClick,
           title: labelLists,
-          iconBefore: /*#__PURE__*/_react.default.createElement(_styles.Wrapper, null, /*#__PURE__*/_react.default.createElement(_bulletList.default, {
+          iconBefore: (0, _react.jsx)("span", {
+            css: _styles.wrapperStyle
+          }, (0, _react.jsx)(_bulletList.default, {
             label: labelLists
-          }), /*#__PURE__*/_react.default.createElement(_styles.ExpandIconWrapper, null, /*#__PURE__*/_react.default.createElement(_chevronDown.default, {
+          }), (0, _react.jsx)("span", {
+            css: _styles.expandIconWrapperStyle
+          }, (0, _react.jsx)(_chevronDown.default, {
             label: ""
           })))
-        })), isSeparator && /*#__PURE__*/_react.default.createElement(_styles.Separator, null));
+        })), isSeparator && (0, _react.jsx)("span", {
+          css: _styles.separatorStyles
+        }));
       }
     }
   }]);
   return ToolbarLists;
-}(_react.PureComponent);
+}(_react2.PureComponent);
 
 var _default = (0, _reactIntlNext.injectIntl)(ToolbarLists);
 

package/dist/cjs/plugins/list/utils/node.js

@@ -129,10 +129,11 @@ var joinSiblingLists = function joinSiblingLists(_ref) {
 
   for (var i = joins.length - 1; i >= 0; i--) {
     var listNode = tr.doc.nodeAt(joins[i]);
+    var listName = listNode === null || listNode === void 0 ? void 0 : listNode.type.name;
 
-    if (listNode) {
-      var amount = result[listNode.type.name] || 0;
-      result[listNode.type.name] = amount + 1;
+    if (listName && (listName === 'orderedList' || listName === 'bulletList')) {
+      var amount = result[listName] || 0;
+      result[listName] = amount + 1;
     }
 
     tr.join(joins[i]);

package/dist/cjs/plugins/media/commands/helpers.js

@@ -97,34 +97,36 @@ var updateAllMediaNodesAttrs = function updateAllMediaNodesAttrs(id, attrs, isMe
     } else {
       var mediaGroupNode = findMediaNode(mediaPluginState, id, isMediaSingle);
       mediaNodes = mediaGroupNode ? [mediaGroupNode] : [];
-    } // TODO: ED-7784 Clean media plugin state from having media that were previously removed.
-    // Sanity check
+    }
 
+    var isMediaNode = function isMediaNode(pos) {
+      var node = state.doc.nodeAt(pos);
+      return node && node.type.name === 'media';
+    };
 
-    var mediaType = state.schema.nodes.media;
-    mediaNodes = mediaNodes.filter(function (nodeWithPos) {
-      var node;
+    var validMediaNodePositions = mediaNodes.reduce(function (acc, _ref) {
+      var getPos = _ref.getPos;
+      var pos = getPos();
 
-      try {
-        node = state.doc.nodeAt(nodeWithPos.getPos());
-      } catch (e) {
-        return false;
+      if (typeof pos === 'number' && !isMediaNode(pos)) {
+        return acc;
       }
 
-      return node && node.type === mediaType;
-    });
+      acc.push(pos);
+      return acc;
+    }, []);
 
-    if (mediaNodes.length === 0) {
+    if (validMediaNodePositions.length === 0) {
       return false;
     }
 
+    var tr = state.tr;
+    validMediaNodePositions.forEach(function (pos) {
+      return tr.step(new _steps.SetAttrsStep(pos, attrs));
+    });
+    tr.setMeta('addToHistory', false);
+
     if (dispatch) {
-      var tr = state.tr;
-      mediaNodes.forEach(function (_ref) {
-        var getPos = _ref.getPos;
-        return tr.step(new _steps.SetAttrsStep(getPos(), attrs));
-      });
-      tr.setMeta('addToHistory', false);
       dispatch(tr);
     }
 
@@ -144,8 +146,18 @@ var updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs, isMediaSingl
       return false;
     }
 
+    var tr = state.tr;
+    var pos = mediaNodeWithPos.getPos();
+    var node = tr.doc.nodeAt(pos);
+
+    if (!node || node.type.name !== 'media') {
+      return false;
+    }
+
+    tr.step(new _steps.SetAttrsStep(pos, attrs)).setMeta('addToHistory', false);
+
     if (dispatch) {
-      dispatch(state.tr.step(new _steps.SetAttrsStep(mediaNodeWithPos.getPos(), attrs)).setMeta('addToHistory', false));
+      dispatch(tr);
     }
 
     return true;
@@ -156,15 +168,23 @@ exports.updateMediaNodeAttrs = updateMediaNodeAttrs;
 
 var replaceExternalMedia = function replaceExternalMedia(pos, attrs) {
   return function (state, dispatch) {
+    var tr = state.tr;
+    var node = tr.doc.nodeAt(pos);
+
+    if (!node || node.type.name !== 'media') {
+      return false;
+    }
+
+    tr.step(new _steps.SetAttrsStep(pos, _objectSpread({
+      type: 'file',
+      url: null
+    }, attrs))).setMeta('addToHistory', false);
+
     if (dispatch) {
-      dispatch(state.tr.step(new _steps.SetAttrsStep(pos, _objectSpread({
-        type: 'file',
-        url: null
-      }, attrs))).setMeta('addToHistory', false));
-      return true;
+      dispatch(tr);
     }
 
-    return false;
+    return true;
   };
 };
 

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

@@ -21,10 +21,6 @@ var _main = require("./pm-plugins/main");
 
 var _mediaCommon = require("@atlaskit/media-common");
 
-var _mediaEditor = require("./pm-plugins/media-editor");
-
-var _mediaEditorPluginFactory = require("./pm-plugins/media-editor-plugin-factory");
-
 var _altText = require("./pm-plugins/alt-text");
 
 var _keymap = _interopRequireDefault(require("./pm-plugins/alt-text/keymap"));
@@ -51,8 +47,6 @@ var _assets = require("../quick-insert/assets");
 
 var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 
-var _MediaEditor = _interopRequireDefault(require("./ui/MediaEditor"));
-
 var _MediaPicker = require("./ui/MediaPicker");
 
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
@@ -151,13 +145,6 @@ var mediaPlugin = function mediaPlugin(options) {
         });
       }
 
-      if (options && options.allowAnnotation) {
-        pmPlugins.push({
-          name: 'mediaEditor',
-          plugin: _mediaEditor.createPlugin
-        });
-      }
-
       if (options && options.allowAltTextOnImages) {
         pmPlugins.push({
           name: 'mediaAltText',
@@ -193,43 +180,26 @@ var mediaPlugin = function mediaPlugin(options) {
     },
     contentComponent: function contentComponent(_ref7) {
       var editorView = _ref7.editorView,
-          eventDispatcher = _ref7.eventDispatcher,
           appearance = _ref7.appearance;
-      // render MediaEditor separately because it doesn't depend on media plugin state
-      // so we can utilise EventDispatcher-based rerendering
-      var mediaEditor = options && options.allowAnnotation ? /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
-        editorView: editorView,
-        plugins: {
-          mediaEditorState: _mediaEditorPluginFactory.pluginKey
-        },
-        eventDispatcher: eventDispatcher,
-        render: function render(_ref8) {
-          var mediaEditorState = _ref8.mediaEditorState;
-          return /*#__PURE__*/_react.default.createElement(_MediaEditor.default, {
-            mediaEditorState: mediaEditorState,
-            view: editorView
-          });
-        }
-      }) : null;
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
         editorView: editorView,
         plugins: {
           mediaState: _main.stateKey
         },
-        render: function render(_ref9) {
-          var mediaState = _ref9.mediaState;
+        render: function render(_ref8) {
+          var mediaState = _ref8.mediaState;
           return /*#__PURE__*/_react.default.createElement(_MediaPicker.MediaPickerComponents, {
             editorDomElement: editorView.dom,
             mediaState: mediaState,
             appearance: appearance
           });
         }
-      }), mediaEditor);
+      }));
     },
-    secondaryToolbarComponent: function secondaryToolbarComponent(_ref10) {
-      var editorView = _ref10.editorView,
-          eventDispatcher = _ref10.eventDispatcher,
-          disabled = _ref10.disabled;
+    secondaryToolbarComponent: function secondaryToolbarComponent(_ref9) {
+      var editorView = _ref9.editorView,
+          eventDispatcher = _ref9.eventDispatcher,
+          disabled = _ref9.disabled;
       return /*#__PURE__*/_react.default.createElement(_ToolbarMedia.default, {
         editorView: editorView,
         eventDispatcher: eventDispatcher,
@@ -239,8 +209,8 @@ var mediaPlugin = function mediaPlugin(options) {
       });
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref11) {
-        var formatMessage = _ref11.formatMessage;
+      quickInsert: function quickInsert(_ref10) {
+        var formatMessage = _ref10.formatMessage;
         return [{
           id: 'media',
           title: formatMessage(_messages.messages.filesAndImages),
@@ -272,7 +242,6 @@ var mediaPlugin = function mediaPlugin(options) {
           allowMediaInline: options && (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', options.featureFlags),
           allowResizing: options && options.allowResizing,
           allowResizingInTables: options && options.allowResizingInTables,
-          allowAnnotation: options && options.allowAnnotation,
           allowLinking: options && options.allowLinking,
           allowAdvancedToolBarOptions: options && options.allowAdvancedToolBarOptions,
           allowAltTextOnImages: options && options.allowAltTextOnImages,

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

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -31,7 +29,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("@emotion/react");
+
+var _react2 = require("react");
 
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 
@@ -77,10 +77,6 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _captions = require("../commands/captions");
 
-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; }
@@ -457,15 +453,15 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
 
       var shouldShowPlaceholder = (0, _mediaCommon2.getMediaFeatureFlag)('captions', mediaOptions.featureFlags) && node.childCount !== 2 && isSelected && state.selection instanceof _prosemirrorState.NodeSelection;
 
-      var MediaChildren = /*#__PURE__*/_react.default.createElement(_styles.FigureWrapper, {
+      var MediaChildren = (0, _react.jsx)("figure", {
+        css: _styles.figureWrapper,
         className: _styles.MediaSingleNodeSelector
-      }, /*#__PURE__*/_react.default.createElement("div", {
+      }, (0, _react.jsx)("div", {
         ref: this.props.forwardRef
-      }), shouldShowPlaceholder && /*#__PURE__*/_react.default.createElement(_CaptionPlaceholder.default, {
+      }), shouldShowPlaceholder && (0, _react.jsx)(_CaptionPlaceholder.default, {
         onClick: this.clickPlaceholder
       }));
-
-      return canResize ? /*#__PURE__*/_react.default.createElement(_ResizableMediaSingle.default, (0, _extends2.default)({}, mediaSingleProps, {
+      return canResize ? (0, _react.jsx)(_ResizableMediaSingle.default, (0, _extends2.default)({}, mediaSingleProps, {
         lineLength: lineLength,
         view: this.props.view,
         getPos: getPos,
@@ -476,11 +472,11 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         allowBreakoutSnapPoints: mediaOptions && mediaOptions.allowBreakoutSnapPoints,
         selected: isSelected,
         dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent
-      }), MediaChildren) : /*#__PURE__*/_react.default.createElement(_ui.MediaSingle, mediaSingleProps, MediaChildren);
+      }), MediaChildren) : (0, _react.jsx)(_ui.MediaSingle, mediaSingleProps, MediaChildren);
     }
   }]);
   return MediaSingleNode;
-}(_react.Component);
+}(_react2.Component);
 
 exports.default = MediaSingleNode;
 (0, _defineProperty2.default)(MediaSingleNode, "defaultProps", {
@@ -600,13 +596,13 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
           dispatchAnalyticsEvent = _this$reactComponentP.dispatchAnalyticsEvent; // getPos is a boolean for marks, since this is a node we know it must be a function
 
       var getPos = this.getPos;
-      return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+      return (0, _react.jsx)(_providerFactory.WithProviders, {
         providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref5) {
           var mediaProvider = _ref5.mediaProvider,
               contextIdentifierProvider = _ref5.contextIdentifierProvider;
-          return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+          return (0, _react.jsx)(_WithPluginState.default, {
             editorView: _this4.view,
             plugins: {
               width: _width.pluginKey,
@@ -615,7 +611,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
             render: function render(_ref6) {
               var width = _ref6.width,
                   mediaPluginState = _ref6.mediaPluginState;
-              return /*#__PURE__*/_react.default.createElement(MediaSingleNode, {
+              return (0, _react.jsx)(MediaSingleNode, {
                 width: width.width,
                 lineLength: width.lineLength,
                 node: _this4.node,

package/dist/cjs/plugins/media/nodeviews/styles.js

@@ -5,13 +5,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MediaSingleNodeSelector = exports.MediaInlineNodeSelector = exports.MediaCardWrapper = exports.FigureWrapper = void 0;
+exports.figureWrapper = exports.MediaSingleNodeSelector = exports.MediaInlineNodeSelector = exports.MediaCardWrapper = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _react2 = require("@emotion/react");
 
 var _templateObject, _templateObject2, _templateObject3;
 
@@ -19,26 +19,24 @@ var MediaInlineNodeSelector = 'media-inline-node';
 exports.MediaInlineNodeSelector = MediaInlineNodeSelector;
 var MediaSingleNodeSelector = 'media-single-node';
 exports.MediaSingleNodeSelector = MediaSingleNodeSelector;
-
-var FigureWrapper = _styledComponents.default.figure(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin: 0;\n"])));
-
-exports.FigureWrapper = FigureWrapper;
-FigureWrapper.displayName = 'FigureWrapper';
-
-var AbsoluteDiv = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: absolute;\n  width: 100%;\n  height: 100%;\n"])));
-
-var ForcedDimensions = _styledComponents.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  width: 100%;\n  position: relative;\n  padding-bottom: ", "%;\n"])), function (props) {
-  return props.dimensions.height / props.dimensions.width * 100;
-});
+var figureWrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin: 0;\n"])));
+exports.figureWrapper = figureWrapper;
+var absoluteDiv = (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: absolute;\n  width: 100%;\n  height: 100%;\n"])));
+var forcedDimensions = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  width: 100%;\n  position: relative;\n"])));
 
 var MediaCardWrapper = function MediaCardWrapper(_ref) {
   var dimensions = _ref.dimensions,
       children = _ref.children,
       onContextMenu = _ref.onContextMenu;
-  return /*#__PURE__*/_react.default.createElement(ForcedDimensions, {
-    dimensions: dimensions,
+  return (0, _react2.jsx)("div", {
+    css: forcedDimensions,
+    style: {
+      paddingBottom: "".concat(dimensions.height / dimensions.width * 100, "%")
+    },
     onContextMenuCapture: onContextMenu
-  }, /*#__PURE__*/_react.default.createElement(AbsoluteDiv, null, children));
+  }, (0, _react2.jsx)("div", {
+    css: absoluteDiv
+  }, children));
 };
 
 exports.MediaCardWrapper = MediaCardWrapper;

package/dist/cjs/plugins/media/picker-facade.js

@@ -20,11 +20,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _mediaPicker = require("@atlaskit/media-picker");
 
 var PickerFacade = /*#__PURE__*/function () {
-  function PickerFacade(pickerType, config, pickerConfig) {
+  function PickerFacade(pickerType, config, pickerConfig, analyticsName) {
     var _this = this;
 
-    var mediaPickerFactoryClass = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _mediaPicker.MediaPicker;
-    var analyticsName = arguments.length > 4 ? arguments[4] : undefined;
     (0, _classCallCheck2.default)(this, PickerFacade);
     (0, _defineProperty2.default)(this, "onDragListeners", []);
     (0, _defineProperty2.default)(this, "onStartListeners", []);
@@ -129,9 +127,7 @@ var PickerFacade = /*#__PURE__*/function () {
     });
     this.config = config;
     this.pickerConfig = pickerConfig;
-    this.mediaPickerFactoryClass = mediaPickerFactoryClass;
     this.pickerType = pickerType;
-    this.errorReporter = config.errorReporter;
     this.analyticsName = analyticsName;
     this.erroredFiles = new Set();
   }
@@ -145,43 +141,25 @@ var PickerFacade = /*#__PURE__*/function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!(this.pickerType === 'customMediaPicker')) {
-                  _context.next = 4;
-                  break;
-                }
-
-                picker = this.picker = this.pickerConfig;
-                _context.next = 8;
-                break;
-
-              case 4:
-                if (!(this.pickerType === 'popup')) {
-                  _context.next = 8;
-                  break;
+                if (this.pickerType === 'customMediaPicker') {
+                  picker = this.picker = this.pickerConfig;
                 }
 
-                _context.next = 7;
-                return this.mediaPickerFactoryClass(this.config.mediaClientConfig, this.pickerConfig);
-
-              case 7:
-                picker = this.picker = _context.sent;
-
-              case 8:
                 if (picker) {
-                  _context.next = 10;
+                  _context.next = 3;
                   break;
                 }
 
                 return _context.abrupt("return", this);
 
-              case 10:
+              case 3:
                 picker.on('upload-preview-update', this.handleUploadPreviewUpdate);
                 picker.on('upload-end', this.handleReady);
                 picker.on('upload-error', this.handleUploadError);
                 picker.on('mobile-upload-end', this.handleMobileUploadEnd);
                 return _context.abrupt("return", this);
 
-              case 15:
+              case 8:
               case "end":
                 return _context.stop();
             }
@@ -219,14 +197,6 @@ var PickerFacade = /*#__PURE__*/function () {
       picker.removeAllListeners('upload-error');
       this.onStartListeners = [];
       this.onDragListeners = [];
-
-      try {
-        if (this.pickerType === 'popup') {
-          picker.teardown();
-        }
-      } catch (ex) {
-        this.errorReporter.captureException(ex);
-      }
     }
   }, {
     key: "setUploadParams",
@@ -235,39 +205,6 @@ var PickerFacade = /*#__PURE__*/function () {
         this.picker.setUploadParams(params);
       }
     }
-  }, {
-    key: "onClose",
-    value: function onClose(cb) {
-      var picker = this.picker;
-
-      if (this.pickerType === 'popup') {
-        var popupPicker = picker;
-        popupPicker.on('closed', cb);
-        return function () {
-          return popupPicker.off('closed', cb);
-        };
-      }
-
-      return function () {};
-    }
-  }, {
-    key: "show",
-    value: function show() {
-      if (this.pickerType === 'popup') {
-        try {
-          this.picker.show();
-        } catch (ex) {
-          this.errorReporter.captureException(ex);
-        }
-      }
-    }
-  }, {
-    key: "hide",
-    value: function hide() {
-      if (this.pickerType === 'popup') {
-        this.picker.hide();
-      }
-    }
   }, {
     key: "onNewMedia",
     value: function onNewMedia(cb) {