@atlaskit/editor-core 162.0.2 → 164.0.1

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

@@ -10,7 +10,8 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
-import React from 'react';
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
 import { PureComponent } from 'react';
 import { injectIntl } from 'react-intl-next';
 import BulletListIcon from '@atlaskit/icon/glyph/editor/bullet-list';
@@ -19,7 +20,7 @@ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, tooltip, ToolTipContent } from '../../../../keymaps';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../../ui/ToolbarButton';
 import DropdownMenu from '../../../../ui/DropdownMenu';
-import { ButtonGroup, Separator, Wrapper, ExpandIconWrapper, Shortcut } from '../../../../ui/styles';
+import { buttonGroupStyle, separatorStyles, wrapperStyle, expandIconWrapperStyle, shortcutStyle } from '../../../../ui/styles';
 import { toggleBulletList, toggleOrderedList } from '../../commands';
 import { messages } from '../../messages';
 import { INPUT_METHOD } from '../../../analytics';
@@ -73,7 +74,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
         },
         isDisabled: bulletListDisabled,
         isActive: Boolean(bulletListActive),
-        elemAfter: /*#__PURE__*/React.createElement(Shortcut, null, tooltip(toggleBulletListKeymap))
+        elemAfter: jsx("div", {
+          css: shortcutStyle
+        }, tooltip(toggleBulletListKeymap))
       }, {
         key: 'orderedList',
         content: labelOrderedList,
@@ -82,7 +85,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
         },
         isDisabled: orderedListDisabled,
         isActive: Boolean(orderedListActive),
-        elemAfter: /*#__PURE__*/React.createElement(Shortcut, null, tooltip(toggleOrderedListKeymap))
+        elemAfter: jsx("div", {
+          css: shortcutStyle
+        }, tooltip(toggleOrderedListKeymap))
       }];
       return [{
         items: items
@@ -150,9 +155,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
       if (!isSmall) {
         var labelUnorderedList = formatMessage(messages.unorderedList);
         var labelOrderedList = formatMessage(messages.orderedList);
-        return /*#__PURE__*/React.createElement(ButtonGroup, {
-          width: isReducedSpacing ? 'small' : 'large'
-        }, /*#__PURE__*/React.createElement(ToolbarButton, {
+        return jsx("span", {
+          css: buttonGroupStyle
+        }, jsx(ToolbarButton, {
           buttonId: TOOLBAR_BUTTON.BULLET_LIST,
           spacing: isReducedSpacing ? 'none' : 'default',
           onClick: this.handleBulletListClick,
@@ -160,14 +165,14 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           "aria-pressed": bulletListActive,
           "aria-label": labelUnorderedList,
           disabled: bulletListDisabled || disabled,
-          title: /*#__PURE__*/React.createElement(ToolTipContent, {
+          title: jsx(ToolTipContent, {
             description: labelUnorderedList,
             keymap: toggleBulletListKeymap
           }),
-          iconBefore: /*#__PURE__*/React.createElement(BulletListIcon, {
+          iconBefore: jsx(BulletListIcon, {
             label: ""
           })
-        }), /*#__PURE__*/React.createElement(ToolbarButton, {
+        }), jsx(ToolbarButton, {
           buttonId: TOOLBAR_BUTTON.ORDERED_LIST,
           spacing: isReducedSpacing ? 'none' : 'default',
           onClick: this.handleOrderedListClick,
@@ -175,14 +180,16 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           "aria-pressed": orderedListActive,
           "aria-label": labelOrderedList,
           disabled: orderedListDisabled || disabled,
-          title: /*#__PURE__*/React.createElement(ToolTipContent, {
+          title: jsx(ToolTipContent, {
             description: labelOrderedList,
             keymap: toggleOrderedListKeymap
           }),
-          iconBefore: /*#__PURE__*/React.createElement(NumberListIcon, {
+          iconBefore: jsx(NumberListIcon, {
             label: ""
           })
-        }), isSeparator && /*#__PURE__*/React.createElement(Separator, null));
+        }), isSeparator && jsx("span", {
+          css: separatorStyles
+        }));
       } else {
         var items = this.createItems();
         var _this$props3 = this.props,
@@ -190,7 +197,9 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
             popupsBoundariesElement = _this$props3.popupsBoundariesElement,
             popupsScrollableElement = _this$props3.popupsScrollableElement;
         var labelLists = formatMessage(messages.lists);
-        return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(DropdownMenu, {
+        return jsx("span", {
+          css: wrapperStyle
+        }, jsx(DropdownMenu, {
           items: items,
           onItemActivated: this.onItemActivated,
           mountTo: popupsMountPoint,
@@ -201,7 +210,7 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           fitHeight: 188,
           fitWidth: 175,
           shouldUseDefaultRole: true
-        }, /*#__PURE__*/React.createElement(ToolbarButton, {
+        }, jsx(ToolbarButton, {
           spacing: isReducedSpacing ? 'none' : 'default',
           selected: bulletListActive || orderedListActive,
           "aria-expanded": isDropdownOpen,
@@ -210,12 +219,18 @@ var ToolbarLists = /*#__PURE__*/function (_PureComponent) {
           disabled: disabled,
           onClick: this.handleTriggerClick,
           title: labelLists,
-          iconBefore: /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(BulletListIcon, {
+          iconBefore: jsx("span", {
+            css: wrapperStyle
+          }, jsx(BulletListIcon, {
             label: labelLists
-          }), /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
+          }), jsx("span", {
+            css: expandIconWrapperStyle
+          }, jsx(ExpandIcon, {
             label: ""
           })))
-        })), isSeparator && /*#__PURE__*/React.createElement(Separator, null));
+        })), isSeparator && jsx("span", {
+          css: separatorStyles
+        }));
       }
     }
   }]);

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

@@ -106,10 +106,11 @@ export 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/esm/plugins/media/commands/helpers.js

@@ -70,34 +70,36 @@ export var updateAllMediaNodesAttrs = function updateAllMediaNodesAttrs(id, attr
     } 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 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 SetAttrsStep(getPos(), attrs));
-      });
-      tr.setMeta('addToHistory', false);
       dispatch(tr);
     }
 
@@ -113,8 +115,18 @@ export var updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs, isMed
       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 SetAttrsStep(pos, attrs)).setMeta('addToHistory', false);
+
     if (dispatch) {
-      dispatch(state.tr.step(new SetAttrsStep(mediaNodeWithPos.getPos(), attrs)).setMeta('addToHistory', false));
+      dispatch(tr);
     }
 
     return true;
@@ -122,14 +134,22 @@ export var updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs, isMed
 };
 export 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 SetAttrsStep(pos, _objectSpread({
+      type: 'file',
+      url: null
+    }, attrs))).setMeta('addToHistory', false);
+
     if (dispatch) {
-      dispatch(state.tr.step(new SetAttrsStep(pos, _objectSpread({
-        type: 'file',
-        url: null
-      }, attrs))).setMeta('addToHistory', false));
-      return true;
+      dispatch(tr);
     }
 
-    return false;
+    return true;
   };
 };

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

@@ -2,8 +2,6 @@ import React from 'react';
 import { media, mediaGroup, mediaSingle, mediaSingleWithCaption, mediaInline } from '@atlaskit/adf-schema';
 import { stateKey as pluginKey, createPlugin } from './pm-plugins/main';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
-import { createPlugin as createMediaEditorPlugin } from './pm-plugins/media-editor';
-import { pluginKey as mediaEditorPluginKey } from './pm-plugins/media-editor-plugin-factory';
 import { createPlugin as createMediaAltTextPlugin } from './pm-plugins/alt-text';
 import keymapMediaAltTextPlugin from './pm-plugins/alt-text/keymap';
 import keymapMediaSinglePlugin from './pm-plugins/keymap-media-single';
@@ -17,7 +15,6 @@ import { floatingToolbar as _floatingToolbar } from './toolbar';
 import { addAnalytics, ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, ACTION_SUBJECT_ID } from '../analytics';
 import { IconImages } from '../quick-insert/assets';
 import WithPluginState from '../../ui/WithPluginState';
-import MediaEditor from './ui/MediaEditor';
 import { MediaPickerComponents } from './ui/MediaPicker';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { ReactMediaNode } from './nodeviews/mediaNodeView';
@@ -112,13 +109,6 @@ var mediaPlugin = function mediaPlugin(options) {
         });
       }
 
-      if (options && options.allowAnnotation) {
-        pmPlugins.push({
-          name: 'mediaEditor',
-          plugin: createMediaEditorPlugin
-        });
-      }
-
       if (options && options.allowAltTextOnImages) {
         pmPlugins.push({
           name: 'mediaAltText',
@@ -154,43 +144,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.createElement(WithPluginState, {
-        editorView: editorView,
-        plugins: {
-          mediaEditorState: mediaEditorPluginKey
-        },
-        eventDispatcher: eventDispatcher,
-        render: function render(_ref8) {
-          var mediaEditorState = _ref8.mediaEditorState;
-          return /*#__PURE__*/React.createElement(MediaEditor, {
-            mediaEditorState: mediaEditorState,
-            view: editorView
-          });
-        }
-      }) : null;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WithPluginState, {
         editorView: editorView,
         plugins: {
           mediaState: pluginKey
         },
-        render: function render(_ref9) {
-          var mediaState = _ref9.mediaState;
+        render: function render(_ref8) {
+          var mediaState = _ref8.mediaState;
           return /*#__PURE__*/React.createElement(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.createElement(ToolbarMedia, {
         editorView: editorView,
         eventDispatcher: eventDispatcher,
@@ -200,8 +173,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.filesAndImages),
@@ -232,7 +205,6 @@ var mediaPlugin = function mediaPlugin(options) {
           allowMediaInline: options && 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/esm/plugins/media/nodeviews/mediaSingle.js

@@ -18,7 +18,8 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
-import React from 'react';
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
 import { Component } from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { MediaSingle, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
@@ -33,7 +34,7 @@ import { stateKey as mediaPluginKey } from '../pm-plugins/main';
 import { MediaNodeUpdater } from './mediaNodeUpdater';
 import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { FigureWrapper, MediaSingleNodeSelector } from './styles';
+import { figureWrapper, MediaSingleNodeSelector } from './styles';
 import { floatingLayouts, isRichMediaInsideOfBlockNode } from '../../../utils/rich-media-utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { isMediaBlobUrlFromAttrs } from '../utils/media-common';
@@ -418,14 +419,15 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       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 = /*#__PURE__*/React.createElement(FigureWrapper, {
+      var MediaChildren = jsx("figure", {
+        css: figureWrapper,
         className: MediaSingleNodeSelector
-      }, /*#__PURE__*/React.createElement("div", {
+      }, jsx("div", {
         ref: this.props.forwardRef
-      }), shouldShowPlaceholder && /*#__PURE__*/React.createElement(CaptionPlaceholder, {
+      }), shouldShowPlaceholder && jsx(CaptionPlaceholder, {
         onClick: this.clickPlaceholder
       }));
-      return canResize ? /*#__PURE__*/React.createElement(ResizableMediaSingle, _extends({}, mediaSingleProps, {
+      return canResize ? jsx(ResizableMediaSingle, _extends({}, mediaSingleProps, {
         lineLength: lineLength,
         view: this.props.view,
         getPos: getPos,
@@ -436,7 +438,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         allowBreakoutSnapPoints: mediaOptions && mediaOptions.allowBreakoutSnapPoints,
         selected: isSelected,
         dispatchAnalyticsEvent: this.props.dispatchAnalyticsEvent
-      }), MediaChildren) : /*#__PURE__*/React.createElement(MediaSingle, mediaSingleProps, MediaChildren);
+      }), MediaChildren) : jsx(MediaSingle, mediaSingleProps, MediaChildren);
     }
   }]);
 
@@ -569,13 +571,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.createElement(WithProviders, {
+      return jsx(WithProviders, {
         providers: ['mediaProvider', 'contextIdentifierProvider'],
         providerFactory: providerFactory,
         renderNode: function renderNode(_ref5) {
           var mediaProvider = _ref5.mediaProvider,
               contextIdentifierProvider = _ref5.contextIdentifierProvider;
-          return /*#__PURE__*/React.createElement(WithPluginState, {
+          return jsx(WithPluginState, {
             editorView: _this4.view,
             plugins: {
               width: widthPluginKey,
@@ -584,7 +586,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
             render: function render(_ref6) {
               var width = _ref6.width,
                   mediaPluginState = _ref6.mediaPluginState;
-              return /*#__PURE__*/React.createElement(MediaSingleNode, {
+              return jsx(MediaSingleNode, {
                 width: width.width,
                 lineLength: width.lineLength,
                 node: _this4.node,

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

@@ -2,22 +2,25 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3;
 
+/** @jsx jsx */
 import React from 'react';
-import styled from 'styled-components';
+import { css, jsx } from '@emotion/react';
 export var MediaInlineNodeSelector = 'media-inline-node';
 export var MediaSingleNodeSelector = 'media-single-node';
-export var FigureWrapper = styled.figure(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin: 0;\n"])));
-FigureWrapper.displayName = 'FigureWrapper';
-var AbsoluteDiv = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: absolute;\n  width: 100%;\n  height: 100%;\n"])));
-var ForcedDimensions = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: 100%;\n  position: relative;\n  padding-bottom: ", "%;\n"])), function (props) {
-  return props.dimensions.height / props.dimensions.width * 100;
-});
+export var figureWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  margin: 0;\n"])));
+var absoluteDiv = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: absolute;\n  width: 100%;\n  height: 100%;\n"])));
+var forcedDimensions = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: 100%;\n  position: relative;\n"])));
 export var MediaCardWrapper = function MediaCardWrapper(_ref) {
   var dimensions = _ref.dimensions,
       children = _ref.children,
       onContextMenu = _ref.onContextMenu;
-  return /*#__PURE__*/React.createElement(ForcedDimensions, {
-    dimensions: dimensions,
+  return jsx("div", {
+    css: forcedDimensions,
+    style: {
+      paddingBottom: "".concat(dimensions.height / dimensions.width * 100, "%")
+    },
     onContextMenuCapture: onContextMenu
-  }, /*#__PURE__*/React.createElement(AbsoluteDiv, null, children));
+  }, jsx("div", {
+    css: absoluteDiv
+  }, children));
 };

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

@@ -3,15 +3,12 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { MediaPicker, isImagePreview } from '@atlaskit/media-picker';
+import { isImagePreview } from '@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;
-    var analyticsName = arguments.length > 4 ? arguments[4] : undefined;
-
     _classCallCheck(this, PickerFacade);
 
     _defineProperty(this, "onDragListeners", []);
@@ -125,9 +122,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();
   }
@@ -141,43 +136,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();
             }
@@ -215,14 +192,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",
@@ -231,39 +200,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) {