@atlaskit/editor-plugin-media-insert 2.1.1 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-media-insert
 
+## 2.2.0
+
+### Minor Changes
+
+- [#134463](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134463)
+  [`d20ae898369bc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d20ae898369bc) -
+  [ux] [ED-24326] Add local file upload tab to media insert popup
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.2
+
+### Patch Changes
+
+- [#134104](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134104)
+  [`18a1de35efaf0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/18a1de35efaf0) -
+  [ux] ED-24639 Make sure the editor is properly re-focused when the media insert picker is closed
+- Updated dependencies
+
 ## 2.1.1
 
 ### Patch Changes

package/dist/cjs/hooks/use-focus-editor.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFocusEditor = void 0;
+var _react = require("react");
+var useFocusEditor = exports.useFocusEditor = function useFocusEditor(_ref) {
+  var editorView = _ref.editorView;
+  var focusEditor = (0, _react.useCallback)(function () {
+    // use setTimeout to run this async after the call
+    setTimeout(function () {
+      return editorView.focus();
+    }, 0);
+  }, [editorView]);
+  return focusEditor;
+};

package/dist/cjs/plugin.js

@@ -43,8 +43,6 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
         popupsMountPoint = _ref3.popupsMountPoint,
         popupsBoundariesElement = _ref3.popupsBoundariesElement,
         popupsScrollableElement = _ref3.popupsScrollableElement;
-      var dispatch = editorView.dispatch,
-        state = editorView.state;
       return /*#__PURE__*/_react.default.createElement(_MediaInsertPicker.MediaInsertPicker, {
         api: api,
         editorView: editorView,
@@ -53,7 +51,7 @@ var mediaInsertPlugin = exports.mediaInsertPlugin = function mediaInsertPlugin(_
         popupsBoundariesElement: popupsBoundariesElement,
         popupsScrollableElement: popupsScrollableElement,
         closeMediaInsertPicker: function closeMediaInsertPicker() {
-          return dispatch((0, _actions.closeMediaInsertPicker)(state.tr));
+          editorView.dispatch((0, _actions.closeMediaInsertPicker)(editorView.state.tr));
         }
       });
     },

package/dist/cjs/ui/LocalMedia.js

@@ -0,0 +1,134 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LocalMedia = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _new = _interopRequireDefault(require("@atlaskit/button/new"));
+var _messages = require("@atlaskit/editor-common/messages");
+var _upload = _interopRequireDefault(require("@atlaskit/icon/glyph/upload"));
+var _mediaPicker = require("@atlaskit/media-picker");
+var _primitives = require("@atlaskit/primitives");
+var _sectionMessage = _interopRequireDefault(require("@atlaskit/section-message"));
+var _useAnalyticsEvents2 = require("./useAnalyticsEvents");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var INITIAL_UPLOAD_STATE = Object.freeze({
+  isOpen: false,
+  error: null
+});
+var uploadReducer = function uploadReducer(state, action) {
+  switch (action.type) {
+    case 'open':
+      return _objectSpread(_objectSpread({}, INITIAL_UPLOAD_STATE), {}, {
+        isOpen: true
+      });
+    case 'close':
+      // This is the only case where we don't reset state. This is because
+      // onClose gets called for cancel _and_ upload, so we don't want to
+      // reset any loading or error states that may have occured
+      return _objectSpread(_objectSpread({}, state), {}, {
+        isOpen: false
+      });
+    case 'error':
+      return _objectSpread(_objectSpread({}, INITIAL_UPLOAD_STATE), {}, {
+        error: action.error
+      });
+    case 'reset':
+      return INITIAL_UPLOAD_STATE;
+  }
+};
+var isImagePreview = function isImagePreview(preview) {
+  return 'dimensions' in preview;
+};
+var LocalMedia = exports.LocalMedia = function LocalMedia(_ref) {
+  var mediaProvider = _ref.mediaProvider,
+    onInsert = _ref.onInsert,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+  var intl = (0, _reactIntlNext.useIntl)();
+  var strings = {
+    upload: intl.formatMessage(_messages.mediaInsertMessages.upload),
+    networkError: intl.formatMessage(_messages.mediaInsertMessages.localFileNetworkErrorMessage),
+    genericError: intl.formatMessage(_messages.mediaInsertMessages.localFileErrorMessage)
+  };
+  var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(dispatchAnalyticsEvent),
+    onUploadButtonClickedAnalytics = _useAnalyticsEvents.onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics = _useAnalyticsEvents.onUploadCommencedAnalytics,
+    onUploadSuccessAnalytics = _useAnalyticsEvents.onUploadSuccessAnalytics,
+    onUploadFailureAnalytics = _useAnalyticsEvents.onUploadFailureAnalytics;
+  var _React$useReducer = _react.default.useReducer(uploadReducer, INITIAL_UPLOAD_STATE),
+    _React$useReducer2 = (0, _slicedToArray2.default)(_React$useReducer, 2),
+    uploadState = _React$useReducer2[0],
+    dispatch = _React$useReducer2[1];
+  var onUpload = function onUpload(_ref2) {
+    var _mediaProvider$upload;
+    var file = _ref2.file,
+      preview = _ref2.preview;
+    onUploadSuccessAnalytics('local');
+    var insertPayload = {
+      id: file.id,
+      collection: (_mediaProvider$upload = mediaProvider.uploadParams) === null || _mediaProvider$upload === void 0 ? void 0 : _mediaProvider$upload.collection,
+      occurrenceKey: file.occurrenceKey
+    };
+    if (isImagePreview(preview)) {
+      insertPayload.height = preview.dimensions.height;
+      insertPayload.width = preview.dimensions.width;
+    }
+    onInsert(insertPayload);
+
+    // Probably not needed but I guess it _could_ fail to close for some reason
+    dispatch({
+      type: 'reset'
+    });
+  };
+  var uploadParams = mediaProvider.uploadParams,
+    uploadMediaClientConfig = mediaProvider.uploadMediaClientConfig;
+  return /*#__PURE__*/_react.default.createElement(_primitives.Stack, {
+    grow: "fill",
+    space: "space.200"
+  }, uploadState.error && /*#__PURE__*/_react.default.createElement(_sectionMessage.default, {
+    appearance: "error"
+  }, uploadState.error === 'upload_fail' ? strings.networkError : strings.genericError), /*#__PURE__*/_react.default.createElement(_new.default, {
+    iconBefore: _upload.default,
+    shouldFitContainer: true,
+    isDisabled: !uploadMediaClientConfig || !uploadParams,
+    onClick: function onClick() {
+      onUploadButtonClickedAnalytics();
+      dispatch({
+        type: 'open'
+      });
+    },
+    autoFocus: true
+  }, strings.upload), uploadMediaClientConfig && uploadParams && /*#__PURE__*/_react.default.createElement(_mediaPicker.Browser, {
+    isOpen: uploadState.isOpen,
+    config: {
+      uploadParams: uploadParams
+    },
+    mediaClientConfig: uploadMediaClientConfig,
+    onUploadsStart: function onUploadsStart() {
+      onUploadCommencedAnalytics('local');
+    },
+    onPreviewUpdate: onUpload
+    // NOTE: this will fire for some errors like network failures, but not
+    // for others like empty files. Those have their own feedback toast
+    // owned by media.
+    ,
+    onError: function onError(payload) {
+      onUploadFailureAnalytics(payload.error.name, 'local');
+      dispatch({
+        type: 'error',
+        error: payload.error.name
+      });
+    },
+    onClose: function onClose() {
+      dispatch({
+        type: 'close'
+      });
+    }
+  }));
+};

package/dist/cjs/ui/{FromURL.js → MediaFromURL.js}

@@ -82,8 +82,8 @@ function MediaFromURL(_ref) {
     insert: intl.formatMessage(_messages.mediaInsertMessages.insert),
     pasteLinkToUpload: intl.formatMessage(_messages.mediaInsertMessages.pasteLinkToUpload),
     cancel: intl.formatMessage(_messages.mediaInsertMessages.cancel),
-    errorMessage: intl.formatMessage(_messages.mediaInsertMessages.errorMessage),
-    warning: intl.formatMessage(_messages.mediaInsertMessages.warning)
+    errorMessage: intl.formatMessage(_messages.mediaInsertMessages.fromUrlErrorMessage),
+    warning: intl.formatMessage(_messages.mediaInsertMessages.fromUrlWarning)
   };
   var _React$useState = _react.default.useState(''),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
@@ -95,7 +95,8 @@ function MediaFromURL(_ref) {
     dispatch = _React$useReducer2[1];
   var pasteFlag = _react.default.useRef(false);
   var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(dispatchAnalyticsEvent),
-    onUploadAnalytics = _useAnalyticsEvents.onUploadAnalytics,
+    onUploadButtonClickedAnalytics = _useAnalyticsEvents.onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics = _useAnalyticsEvents.onUploadCommencedAnalytics,
     onUploadSuccessAnalytics = _useAnalyticsEvents.onUploadSuccessAnalytics,
     onUploadFailureAnalytics = _useAnalyticsEvents.onUploadFailureAnalytics;
   var uploadExternalMedia = _react.default.useCallback( /*#__PURE__*/function () {
@@ -104,27 +105,28 @@ function MediaFromURL(_ref) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            onUploadButtonClickedAnalytics();
             dispatch({
               type: 'loading'
             });
             uploadMediaClientConfig = mediaProvider.uploadMediaClientConfig, uploadParams = mediaProvider.uploadParams;
             if (uploadMediaClientConfig) {
-              _context.next = 4;
+              _context.next = 5;
               break;
             }
             return _context.abrupt("return");
-          case 4:
+          case 5:
             mediaClient = (0, _mediaClientReact.getMediaClient)(uploadMediaClientConfig);
             collection = uploadParams === null || uploadParams === void 0 ? void 0 : uploadParams.collection;
-            onUploadAnalytics();
-            _context.prev = 7;
-            _context.next = 10;
+            onUploadCommencedAnalytics('url');
+            _context.prev = 8;
+            _context.next = 11;
             return mediaClient.file.uploadExternal(url, collection);
-          case 10:
+          case 11:
             _yield$mediaClient$fi = _context.sent;
             uploadableFileUpfrontIds = _yield$mediaClient$fi.uploadableFileUpfrontIds;
             dimensions = _yield$mediaClient$fi.dimensions;
-            onUploadSuccessAnalytics();
+            onUploadSuccessAnalytics('url');
             dispatch({
               type: 'success',
               payload: {
@@ -135,16 +137,16 @@ function MediaFromURL(_ref) {
                 occurrenceKey: uploadableFileUpfrontIds.occurrenceKey
               }
             });
-            _context.next = 20;
+            _context.next = 21;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](7);
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](8);
             if (typeof _context.t0 === 'string' && _context.t0 === 'Could not download remote file') {
               // TODO: Make sure this gets good unit test coverage with the actual
               // media plugin. This hard coded error message could be changed at any
               // point and we need a unit test to break to stop people changing it.
-              onUploadFailureAnalytics(_context.t0);
+              onUploadFailureAnalytics(_context.t0, 'url');
               dispatch({
                 type: 'warning',
                 warning: _context.t0,
@@ -152,28 +154,28 @@ function MediaFromURL(_ref) {
               });
             } else if (_context.t0 instanceof Error) {
               message = 'Image preview fetch failed';
-              onUploadFailureAnalytics(message);
+              onUploadFailureAnalytics(message, 'url');
               dispatch({
                 type: 'error',
                 error: message
               });
             } else {
-              onUploadFailureAnalytics('Unknown error');
+              onUploadFailureAnalytics('Unknown error', 'url');
               dispatch({
                 type: 'error',
                 error: 'Unknown error'
               });
             }
-          case 20:
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[7, 17]]);
+      }, _callee, null, [[8, 18]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [mediaProvider, onUploadAnalytics, onUploadFailureAnalytics, onUploadSuccessAnalytics, inputUrl]);
+  }(), [onUploadButtonClickedAnalytics, mediaProvider, onUploadCommencedAnalytics, onUploadSuccessAnalytics, onUploadFailureAnalytics, inputUrl]);
   var onURLChange = _react.default.useCallback(function (e) {
     var url = e.target.value;
     setUrl(url);

package/dist/cjs/ui/MediaInsertContent.js

@@ -11,7 +11,8 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _primitives = require("@atlaskit/primitives");
 var _tabs = _interopRequireWildcard(require("@atlaskit/tabs"));
-var _FromURL = require("./FromURL");
+var _LocalMedia = require("./LocalMedia");
+var _MediaFromURL = require("./MediaFromURL");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var MediaInsertContent = exports.MediaInsertContent = function MediaInsertContent(_ref) {
@@ -23,7 +24,12 @@ var MediaInsertContent = exports.MediaInsertContent = function MediaInsertConten
     id: "media-insert-tab-navigation"
   }, /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     paddingBlockEnd: "space.150"
-  }, /*#__PURE__*/_react.default.createElement(_tabs.TabList, null, /*#__PURE__*/_react.default.createElement(_tabs.Tab, null, intl.formatMessage(_messages.mediaInsertMessages.linkTabTitle)))), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, null, /*#__PURE__*/_react.default.createElement(_FromURL.MediaFromURL, {
+  }, /*#__PURE__*/_react.default.createElement(_tabs.TabList, null, /*#__PURE__*/_react.default.createElement(_tabs.Tab, null, intl.formatMessage(_messages.mediaInsertMessages.fileTabTitle)), /*#__PURE__*/_react.default.createElement(_tabs.Tab, null, intl.formatMessage(_messages.mediaInsertMessages.linkTabTitle)))), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, null, /*#__PURE__*/_react.default.createElement(_LocalMedia.LocalMedia, {
+    mediaProvider: mediaProvider,
+    onInsert: function onInsert() {},
+    onClose: closeMediaInsertPicker,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  })), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, null, /*#__PURE__*/_react.default.createElement(_MediaFromURL.MediaFromURL, {
     mediaProvider: mediaProvider,
     onExternalInsert: function onExternalInsert() {},
     onInsert: function onInsert() {},

package/dist/cjs/ui/MediaInsertPicker.js

@@ -13,6 +13,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _useFocusEditor = require("../hooks/use-focus-editor");
 var _MediaInsertContent = require("./MediaInsertContent");
 var _MediaInsertWrapper = require("./MediaInsertWrapper");
 var PopupWithListeners = (0, _ui.withOuterListeners)(_ui.Popup);
@@ -47,11 +48,14 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     popupsMountPoint = _ref.popupsMountPoint,
     popupsBoundariesElement = _ref.popupsBoundariesElement,
     popupsScrollableElement = _ref.popupsScrollableElement,
-    closeMediaInsertPicker = _ref.closeMediaInsertPicker;
+    _closeMediaInsertPicker = _ref.closeMediaInsertPicker;
   var targetRef = getDomRefFromSelection(editorView, dispatchAnalyticsEvent);
   var isOpen = (_useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['mediaInsert'])) === null || _useSharedPluginState === void 0 || (_useSharedPluginState = _useSharedPluginState.mediaInsertState) === null || _useSharedPluginState === void 0 ? void 0 : _useSharedPluginState.isOpen;
   var mediaProvider = (_useSharedPluginState2 = (0, _hooks.useSharedPluginState)(api, ['media'])) === null || _useSharedPluginState2 === void 0 || (_useSharedPluginState2 = _useSharedPluginState2.mediaState) === null || _useSharedPluginState2 === void 0 ? void 0 : _useSharedPluginState2.mediaProvider;
   var intl = (0, _reactIntlNext.useIntl)();
+  var focusEditor = (0, _useFocusEditor.useFocusEditor)({
+    editorView: editorView
+  });
   if (!isOpen || !mediaProvider) {
     return null;
   }
@@ -70,7 +74,8 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
         };
         dispatchAnalyticsEvent(payload);
       }
-      closeMediaInsertPicker();
+      _closeMediaInsertPicker();
+      focusEditor();
     };
   };
   return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
@@ -90,6 +95,9 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
   }, /*#__PURE__*/_react.default.createElement(_MediaInsertWrapper.MediaInsertWrapper, null, /*#__PURE__*/_react.default.createElement(_MediaInsertContent.MediaInsertContent, {
     mediaProvider: mediaProvider,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    closeMediaInsertPicker: closeMediaInsertPicker
+    closeMediaInsertPicker: function closeMediaInsertPicker() {
+      _closeMediaInsertPicker();
+      focusEditor();
+    }
   })));
 };

package/dist/cjs/ui/useAnalyticsEvents.js

@@ -8,38 +8,54 @@ exports.useAnalyticsEvents = useAnalyticsEvents;
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 function useAnalyticsEvents(dispatchAnalyticsEvent) {
-  var onUploadAnalytics = _react.default.useCallback(function () {
+  var onUploadButtonClickedAnalytics = _react.default.useCallback(function () {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
       action: _analytics.ACTION.CLICKED,
       actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA_FROM_URL,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
       eventType: _analytics.EVENT_TYPE.UI
     });
   }, [dispatchAnalyticsEvent]);
-  var onUploadSuccessAnalytics = _react.default.useCallback(function () {
+  var onUploadCommencedAnalytics = _react.default.useCallback(function (mediaUploadSource) {
+    dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
+      action: _analytics.ACTION.UPLOAD_COMMENCED,
+      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      attributes: {
+        mediaUploadSource: mediaUploadSource
+      }
+    });
+  }, [dispatchAnalyticsEvent]);
+  var onUploadSuccessAnalytics = _react.default.useCallback(function (mediaUploadSource) {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
       action: _analytics.ACTION.UPLOAD_SUCCEEDED,
       actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA_FROM_URL,
-      eventType: _analytics.EVENT_TYPE.OPERATIONAL
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+      attributes: {
+        mediaUploadSource: mediaUploadSource
+      }
     });
   }, [dispatchAnalyticsEvent]);
-  var onUploadFailureAnalytics = _react.default.useCallback(function (reason) {
+  var onUploadFailureAnalytics = _react.default.useCallback(function (reason, mediaUploadSource) {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
       action: _analytics.ACTION.UPLOAD_FAILED,
       actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA_FROM_URL,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.UPLOAD_MEDIA,
       eventType: _analytics.EVENT_TYPE.OPERATIONAL,
       attributes: {
-        reason: reason
+        reason: reason,
+        mediaUploadSource: mediaUploadSource
       }
     });
   }, [dispatchAnalyticsEvent]);
   return _react.default.useMemo(function () {
     return {
-      onUploadAnalytics: onUploadAnalytics,
+      onUploadButtonClickedAnalytics: onUploadButtonClickedAnalytics,
+      onUploadCommencedAnalytics: onUploadCommencedAnalytics,
       onUploadSuccessAnalytics: onUploadSuccessAnalytics,
       onUploadFailureAnalytics: onUploadFailureAnalytics
     };
-  }, [onUploadAnalytics, onUploadSuccessAnalytics, onUploadFailureAnalytics]);
+  }, [onUploadButtonClickedAnalytics, onUploadCommencedAnalytics, onUploadSuccessAnalytics, onUploadFailureAnalytics]);
 }

package/dist/es2019/hooks/use-focus-editor.js

@@ -0,0 +1,10 @@
+import { useCallback } from 'react';
+export const useFocusEditor = ({
+  editorView
+}) => {
+  const focusEditor = useCallback(() => {
+    // use setTimeout to run this async after the call
+    setTimeout(() => editorView.focus(), 0);
+  }, [editorView]);
+  return focusEditor;
+};

package/dist/es2019/plugin.js

@@ -37,10 +37,6 @@ export const mediaInsertPlugin = ({
       popupsBoundariesElement,
       popupsScrollableElement
     }) => {
-      const {
-        dispatch,
-        state
-      } = editorView;
       return /*#__PURE__*/React.createElement(MediaInsertPicker, {
         api: api,
         editorView: editorView,
@@ -48,7 +44,9 @@ export const mediaInsertPlugin = ({
         popupsMountPoint: popupsMountPoint,
         popupsBoundariesElement: popupsBoundariesElement,
         popupsScrollableElement: popupsScrollableElement,
-        closeMediaInsertPicker: () => dispatch(closeMediaInsertPicker(state.tr))
+        closeMediaInsertPicker: () => {
+          editorView.dispatch(closeMediaInsertPicker(editorView.state.tr));
+        }
       });
     },
     pluginsOptions: {

package/dist/es2019/ui/LocalMedia.js

@@ -0,0 +1,128 @@
+import React from 'react';
+import { useIntl } from 'react-intl-next';
+import Button from '@atlaskit/button/new';
+import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
+import UploadIcon from '@atlaskit/icon/glyph/upload';
+import { Browser } from '@atlaskit/media-picker';
+import { Stack } from '@atlaskit/primitives';
+import SectionMessage from '@atlaskit/section-message';
+import { useAnalyticsEvents } from './useAnalyticsEvents';
+const INITIAL_UPLOAD_STATE = Object.freeze({
+  isOpen: false,
+  error: null
+});
+const uploadReducer = (state, action) => {
+  switch (action.type) {
+    case 'open':
+      return {
+        ...INITIAL_UPLOAD_STATE,
+        isOpen: true
+      };
+    case 'close':
+      // This is the only case where we don't reset state. This is because
+      // onClose gets called for cancel _and_ upload, so we don't want to
+      // reset any loading or error states that may have occured
+      return {
+        ...state,
+        isOpen: false
+      };
+    case 'error':
+      return {
+        ...INITIAL_UPLOAD_STATE,
+        error: action.error
+      };
+    case 'reset':
+      return INITIAL_UPLOAD_STATE;
+  }
+};
+const isImagePreview = preview => {
+  return 'dimensions' in preview;
+};
+export const LocalMedia = ({
+  mediaProvider,
+  onInsert,
+  dispatchAnalyticsEvent
+}) => {
+  const intl = useIntl();
+  const strings = {
+    upload: intl.formatMessage(mediaInsertMessages.upload),
+    networkError: intl.formatMessage(mediaInsertMessages.localFileNetworkErrorMessage),
+    genericError: intl.formatMessage(mediaInsertMessages.localFileErrorMessage)
+  };
+  const {
+    onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics,
+    onUploadSuccessAnalytics,
+    onUploadFailureAnalytics
+  } = useAnalyticsEvents(dispatchAnalyticsEvent);
+  const [uploadState, dispatch] = React.useReducer(uploadReducer, INITIAL_UPLOAD_STATE);
+  const onUpload = ({
+    file,
+    preview
+  }) => {
+    var _mediaProvider$upload;
+    onUploadSuccessAnalytics('local');
+    const insertPayload = {
+      id: file.id,
+      collection: (_mediaProvider$upload = mediaProvider.uploadParams) === null || _mediaProvider$upload === void 0 ? void 0 : _mediaProvider$upload.collection,
+      occurrenceKey: file.occurrenceKey
+    };
+    if (isImagePreview(preview)) {
+      insertPayload.height = preview.dimensions.height;
+      insertPayload.width = preview.dimensions.width;
+    }
+    onInsert(insertPayload);
+
+    // Probably not needed but I guess it _could_ fail to close for some reason
+    dispatch({
+      type: 'reset'
+    });
+  };
+  const {
+    uploadParams,
+    uploadMediaClientConfig
+  } = mediaProvider;
+  return /*#__PURE__*/React.createElement(Stack, {
+    grow: "fill",
+    space: "space.200"
+  }, uploadState.error && /*#__PURE__*/React.createElement(SectionMessage, {
+    appearance: "error"
+  }, uploadState.error === 'upload_fail' ? strings.networkError : strings.genericError), /*#__PURE__*/React.createElement(Button, {
+    iconBefore: UploadIcon,
+    shouldFitContainer: true,
+    isDisabled: !uploadMediaClientConfig || !uploadParams,
+    onClick: () => {
+      onUploadButtonClickedAnalytics();
+      dispatch({
+        type: 'open'
+      });
+    },
+    autoFocus: true
+  }, strings.upload), uploadMediaClientConfig && uploadParams && /*#__PURE__*/React.createElement(Browser, {
+    isOpen: uploadState.isOpen,
+    config: {
+      uploadParams: uploadParams
+    },
+    mediaClientConfig: uploadMediaClientConfig,
+    onUploadsStart: () => {
+      onUploadCommencedAnalytics('local');
+    },
+    onPreviewUpdate: onUpload
+    // NOTE: this will fire for some errors like network failures, but not
+    // for others like empty files. Those have their own feedback toast
+    // owned by media.
+    ,
+    onError: payload => {
+      onUploadFailureAnalytics(payload.error.name, 'local');
+      dispatch({
+        type: 'error',
+        error: payload.error.name
+      });
+    },
+    onClose: () => {
+      dispatch({
+        type: 'close'
+      });
+    }
+  }));
+};