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

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

@@ -74,18 +74,20 @@ export function MediaFromURL({
     insert: intl.formatMessage(mediaInsertMessages.insert),
     pasteLinkToUpload: intl.formatMessage(mediaInsertMessages.pasteLinkToUpload),
     cancel: intl.formatMessage(mediaInsertMessages.cancel),
-    errorMessage: intl.formatMessage(mediaInsertMessages.errorMessage),
-    warning: intl.formatMessage(mediaInsertMessages.warning)
+    errorMessage: intl.formatMessage(mediaInsertMessages.fromUrlErrorMessage),
+    warning: intl.formatMessage(mediaInsertMessages.fromUrlWarning)
   };
   const [inputUrl, setUrl] = React.useState('');
   const [previewState, dispatch] = React.useReducer(previewStateReducer, INITIAL_PREVIEW_STATE);
   const pasteFlag = React.useRef(false);
   const {
-    onUploadAnalytics,
+    onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics,
     onUploadSuccessAnalytics,
     onUploadFailureAnalytics
   } = useAnalyticsEvents(dispatchAnalyticsEvent);
   const uploadExternalMedia = React.useCallback(async url => {
+    onUploadButtonClickedAnalytics();
     dispatch({
       type: 'loading'
     });
@@ -98,13 +100,13 @@ export function MediaFromURL({
     }
     const mediaClient = getMediaClient(uploadMediaClientConfig);
     const collection = uploadParams === null || uploadParams === void 0 ? void 0 : uploadParams.collection;
-    onUploadAnalytics();
+    onUploadCommencedAnalytics('url');
     try {
       const {
         uploadableFileUpfrontIds,
         dimensions
       } = await mediaClient.file.uploadExternal(url, collection);
-      onUploadSuccessAnalytics();
+      onUploadSuccessAnalytics('url');
       dispatch({
         type: 'success',
         payload: {
@@ -120,7 +122,7 @@ export function MediaFromURL({
         // 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(e);
+        onUploadFailureAnalytics(e, 'url');
         dispatch({
           type: 'warning',
           warning: e,
@@ -128,20 +130,20 @@ export function MediaFromURL({
         });
       } else if (e instanceof Error) {
         const 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'
         });
       }
     }
-  }, [mediaProvider, onUploadAnalytics, onUploadFailureAnalytics, onUploadSuccessAnalytics, inputUrl]);
+  }, [onUploadButtonClickedAnalytics, mediaProvider, onUploadCommencedAnalytics, onUploadSuccessAnalytics, onUploadFailureAnalytics, inputUrl]);
   const onURLChange = React.useCallback(e => {
     const url = e.target.value;
     setUrl(url);

package/dist/es2019/ui/MediaInsertContent.js

@@ -3,7 +3,8 @@ import { useIntl } from 'react-intl-next';
 import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
 import { Box } from '@atlaskit/primitives';
 import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
-import { MediaFromURL } from './FromURL';
+import { LocalMedia } from './LocalMedia';
+import { MediaFromURL } from './MediaFromURL';
 export const MediaInsertContent = ({
   mediaProvider,
   dispatchAnalyticsEvent,
@@ -14,7 +15,12 @@ export const MediaInsertContent = ({
     id: "media-insert-tab-navigation"
   }, /*#__PURE__*/React.createElement(Box, {
     paddingBlockEnd: "space.150"
-  }, /*#__PURE__*/React.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, null, intl.formatMessage(mediaInsertMessages.linkTabTitle)))), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(MediaFromURL, {
+  }, /*#__PURE__*/React.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, null, intl.formatMessage(mediaInsertMessages.fileTabTitle)), /*#__PURE__*/React.createElement(Tab, null, intl.formatMessage(mediaInsertMessages.linkTabTitle)))), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(LocalMedia, {
+    mediaProvider: mediaProvider,
+    onInsert: () => {},
+    onClose: closeMediaInsertPicker,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  })), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(MediaFromURL, {
     mediaProvider: mediaProvider,
     onExternalInsert: () => {},
     onInsert: () => {},

package/dist/es2019/ui/MediaInsertPicker.js

@@ -6,6 +6,7 @@ import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
 import { Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
+import { useFocusEditor } from '../hooks/use-focus-editor';
 import { MediaInsertContent } from './MediaInsertContent';
 import { MediaInsertWrapper } from './MediaInsertWrapper';
 const PopupWithListeners = withOuterListeners(Popup);
@@ -46,6 +47,9 @@ export const MediaInsertPicker = ({
   const isOpen = (_useSharedPluginState = useSharedPluginState(api, ['mediaInsert'])) === null || _useSharedPluginState === void 0 ? void 0 : (_useSharedPluginState2 = _useSharedPluginState.mediaInsertState) === null || _useSharedPluginState2 === void 0 ? void 0 : _useSharedPluginState2.isOpen;
   const mediaProvider = (_useSharedPluginState3 = useSharedPluginState(api, ['media'])) === null || _useSharedPluginState3 === void 0 ? void 0 : (_useSharedPluginState4 = _useSharedPluginState3.mediaState) === null || _useSharedPluginState4 === void 0 ? void 0 : _useSharedPluginState4.mediaProvider;
   const intl = useIntl();
+  const focusEditor = useFocusEditor({
+    editorView
+  });
   if (!isOpen || !mediaProvider) {
     return null;
   }
@@ -64,6 +68,7 @@ export const MediaInsertPicker = ({
       dispatchAnalyticsEvent(payload);
     }
     closeMediaInsertPicker();
+    focusEditor();
   };
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     ariaLabel: intl.formatMessage(mediaInsertMessages.mediaPickerPopupAriaLabel),
@@ -82,6 +87,9 @@ export const MediaInsertPicker = ({
   }, /*#__PURE__*/React.createElement(MediaInsertWrapper, null, /*#__PURE__*/React.createElement(MediaInsertContent, {
     mediaProvider: mediaProvider,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    closeMediaInsertPicker: closeMediaInsertPicker
+    closeMediaInsertPicker: () => {
+      closeMediaInsertPicker();
+      focusEditor();
+    }
   })));
 };

package/dist/es2019/ui/useAnalyticsEvents.js

@@ -1,36 +1,52 @@
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 export function useAnalyticsEvents(dispatchAnalyticsEvent) {
-  const onUploadAnalytics = React.useCallback(() => {
+  const onUploadButtonClickedAnalytics = React.useCallback(() => {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
       action: ACTION.CLICKED,
       actionSubject: ACTION_SUBJECT.BUTTON,
-      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA_FROM_URL,
+      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA,
       eventType: EVENT_TYPE.UI
     });
   }, [dispatchAnalyticsEvent]);
-  const onUploadSuccessAnalytics = React.useCallback(() => {
+  const onUploadCommencedAnalytics = React.useCallback(mediaUploadSource => {
+    dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
+      action: ACTION.UPLOAD_COMMENCED,
+      actionSubject: ACTION_SUBJECT.MEDIA,
+      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: EVENT_TYPE.OPERATIONAL,
+      attributes: {
+        mediaUploadSource
+      }
+    });
+  }, [dispatchAnalyticsEvent]);
+  const onUploadSuccessAnalytics = React.useCallback(mediaUploadSource => {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
       action: ACTION.UPLOAD_SUCCEEDED,
       actionSubject: ACTION_SUBJECT.MEDIA,
-      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA_FROM_URL,
-      eventType: EVENT_TYPE.OPERATIONAL
+      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA,
+      eventType: EVENT_TYPE.OPERATIONAL,
+      attributes: {
+        mediaUploadSource
+      }
     });
   }, [dispatchAnalyticsEvent]);
-  const onUploadFailureAnalytics = React.useCallback(reason => {
+  const onUploadFailureAnalytics = React.useCallback((reason, mediaUploadSource) => {
     dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
       action: ACTION.UPLOAD_FAILED,
       actionSubject: ACTION_SUBJECT.MEDIA,
-      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA_FROM_URL,
+      actionSubjectId: ACTION_SUBJECT_ID.UPLOAD_MEDIA,
       eventType: EVENT_TYPE.OPERATIONAL,
       attributes: {
-        reason
+        reason,
+        mediaUploadSource
       }
     });
   }, [dispatchAnalyticsEvent]);
   return React.useMemo(() => ({
-    onUploadAnalytics,
+    onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics,
     onUploadSuccessAnalytics,
     onUploadFailureAnalytics
-  }), [onUploadAnalytics, onUploadSuccessAnalytics, onUploadFailureAnalytics]);
+  }), [onUploadButtonClickedAnalytics, onUploadCommencedAnalytics, onUploadSuccessAnalytics, onUploadFailureAnalytics]);
 }

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

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

package/dist/esm/plugin.js

@@ -36,8 +36,6 @@ export var mediaInsertPlugin = function mediaInsertPlugin(_ref) {
         popupsMountPoint = _ref3.popupsMountPoint,
         popupsBoundariesElement = _ref3.popupsBoundariesElement,
         popupsScrollableElement = _ref3.popupsScrollableElement;
-      var dispatch = editorView.dispatch,
-        state = editorView.state;
       return /*#__PURE__*/React.createElement(MediaInsertPicker, {
         api: api,
         editorView: editorView,
@@ -46,7 +44,7 @@ export var mediaInsertPlugin = function mediaInsertPlugin(_ref) {
         popupsBoundariesElement: popupsBoundariesElement,
         popupsScrollableElement: popupsScrollableElement,
         closeMediaInsertPicker: function closeMediaInsertPicker() {
-          return dispatch(_closeMediaInsertPicker(state.tr));
+          editorView.dispatch(_closeMediaInsertPicker(editorView.state.tr));
         }
       });
     },

package/dist/esm/ui/LocalMedia.js

@@ -0,0 +1,127 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
+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';
+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;
+};
+export var LocalMedia = function LocalMedia(_ref) {
+  var mediaProvider = _ref.mediaProvider,
+    onInsert = _ref.onInsert,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
+  var intl = useIntl();
+  var strings = {
+    upload: intl.formatMessage(mediaInsertMessages.upload),
+    networkError: intl.formatMessage(mediaInsertMessages.localFileNetworkErrorMessage),
+    genericError: intl.formatMessage(mediaInsertMessages.localFileErrorMessage)
+  };
+  var _useAnalyticsEvents = useAnalyticsEvents(dispatchAnalyticsEvent),
+    onUploadButtonClickedAnalytics = _useAnalyticsEvents.onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics = _useAnalyticsEvents.onUploadCommencedAnalytics,
+    onUploadSuccessAnalytics = _useAnalyticsEvents.onUploadSuccessAnalytics,
+    onUploadFailureAnalytics = _useAnalyticsEvents.onUploadFailureAnalytics;
+  var _React$useReducer = React.useReducer(uploadReducer, INITIAL_UPLOAD_STATE),
+    _React$useReducer2 = _slicedToArray(_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.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: function onClick() {
+      onUploadButtonClickedAnalytics();
+      dispatch({
+        type: 'open'
+      });
+    },
+    autoFocus: true
+  }, strings.upload), uploadMediaClientConfig && uploadParams && /*#__PURE__*/React.createElement(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/esm/ui/{FromURL.js → MediaFromURL.js}

@@ -75,8 +75,8 @@ export function MediaFromURL(_ref) {
     insert: intl.formatMessage(mediaInsertMessages.insert),
     pasteLinkToUpload: intl.formatMessage(mediaInsertMessages.pasteLinkToUpload),
     cancel: intl.formatMessage(mediaInsertMessages.cancel),
-    errorMessage: intl.formatMessage(mediaInsertMessages.errorMessage),
-    warning: intl.formatMessage(mediaInsertMessages.warning)
+    errorMessage: intl.formatMessage(mediaInsertMessages.fromUrlErrorMessage),
+    warning: intl.formatMessage(mediaInsertMessages.fromUrlWarning)
   };
   var _React$useState = React.useState(''),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -88,7 +88,8 @@ export function MediaFromURL(_ref) {
     dispatch = _React$useReducer2[1];
   var pasteFlag = React.useRef(false);
   var _useAnalyticsEvents = useAnalyticsEvents(dispatchAnalyticsEvent),
-    onUploadAnalytics = _useAnalyticsEvents.onUploadAnalytics,
+    onUploadButtonClickedAnalytics = _useAnalyticsEvents.onUploadButtonClickedAnalytics,
+    onUploadCommencedAnalytics = _useAnalyticsEvents.onUploadCommencedAnalytics,
     onUploadSuccessAnalytics = _useAnalyticsEvents.onUploadSuccessAnalytics,
     onUploadFailureAnalytics = _useAnalyticsEvents.onUploadFailureAnalytics;
   var uploadExternalMedia = React.useCallback( /*#__PURE__*/function () {
@@ -97,27 +98,28 @@ export function MediaFromURL(_ref) {
       return _regeneratorRuntime.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 = 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: {
@@ -128,16 +130,16 @@ export 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,
@@ -145,28 +147,28 @@ export 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.useCallback(function (e) {
     var url = e.target.value;
     setUrl(url);

package/dist/esm/ui/MediaInsertContent.js

@@ -3,7 +3,8 @@ import { useIntl } from 'react-intl-next';
 import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
 import { Box } from '@atlaskit/primitives';
 import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
-import { MediaFromURL } from './FromURL';
+import { LocalMedia } from './LocalMedia';
+import { MediaFromURL } from './MediaFromURL';
 export var MediaInsertContent = function MediaInsertContent(_ref) {
   var mediaProvider = _ref.mediaProvider,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
@@ -13,7 +14,12 @@ export var MediaInsertContent = function MediaInsertContent(_ref) {
     id: "media-insert-tab-navigation"
   }, /*#__PURE__*/React.createElement(Box, {
     paddingBlockEnd: "space.150"
-  }, /*#__PURE__*/React.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, null, intl.formatMessage(mediaInsertMessages.linkTabTitle)))), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(MediaFromURL, {
+  }, /*#__PURE__*/React.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, null, intl.formatMessage(mediaInsertMessages.fileTabTitle)), /*#__PURE__*/React.createElement(Tab, null, intl.formatMessage(mediaInsertMessages.linkTabTitle)))), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(LocalMedia, {
+    mediaProvider: mediaProvider,
+    onInsert: function onInsert() {},
+    onClose: closeMediaInsertPicker,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  })), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement(MediaFromURL, {
     mediaProvider: mediaProvider,
     onExternalInsert: function onExternalInsert() {},
     onInsert: function onInsert() {},

package/dist/esm/ui/MediaInsertPicker.js

@@ -6,6 +6,7 @@ import { mediaInsertMessages } from '@atlaskit/editor-common/messages';
 import { Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
+import { useFocusEditor } from '../hooks/use-focus-editor';
 import { MediaInsertContent } from './MediaInsertContent';
 import { MediaInsertWrapper } from './MediaInsertWrapper';
 var PopupWithListeners = withOuterListeners(Popup);
@@ -40,11 +41,14 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref) {
     popupsMountPoint = _ref.popupsMountPoint,
     popupsBoundariesElement = _ref.popupsBoundariesElement,
     popupsScrollableElement = _ref.popupsScrollableElement,
-    closeMediaInsertPicker = _ref.closeMediaInsertPicker;
+    _closeMediaInsertPicker = _ref.closeMediaInsertPicker;
   var targetRef = getDomRefFromSelection(editorView, dispatchAnalyticsEvent);
   var isOpen = (_useSharedPluginState = useSharedPluginState(api, ['mediaInsert'])) === null || _useSharedPluginState === void 0 || (_useSharedPluginState = _useSharedPluginState.mediaInsertState) === null || _useSharedPluginState === void 0 ? void 0 : _useSharedPluginState.isOpen;
   var mediaProvider = (_useSharedPluginState2 = useSharedPluginState(api, ['media'])) === null || _useSharedPluginState2 === void 0 || (_useSharedPluginState2 = _useSharedPluginState2.mediaState) === null || _useSharedPluginState2 === void 0 ? void 0 : _useSharedPluginState2.mediaProvider;
   var intl = useIntl();
+  var focusEditor = useFocusEditor({
+    editorView: editorView
+  });
   if (!isOpen || !mediaProvider) {
     return null;
   }
@@ -63,7 +67,8 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref) {
         };
         dispatchAnalyticsEvent(payload);
       }
-      closeMediaInsertPicker();
+      _closeMediaInsertPicker();
+      focusEditor();
     };
   };
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
@@ -83,6 +88,9 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref) {
   }, /*#__PURE__*/React.createElement(MediaInsertWrapper, null, /*#__PURE__*/React.createElement(MediaInsertContent, {
     mediaProvider: mediaProvider,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    closeMediaInsertPicker: closeMediaInsertPicker
+    closeMediaInsertPicker: function closeMediaInsertPicker() {
+      _closeMediaInsertPicker();
+      focusEditor();
+    }
   })));
 };

package/dist/esm/ui/useAnalyticsEvents.js

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

package/dist/types/hooks/use-focus-editor.d.ts

@@ -0,0 +1,4 @@
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+export declare const useFocusEditor: ({ editorView }: {
+    editorView: EditorView;
+}) => () => void;

package/dist/types/ui/LocalMedia.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import { type DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
+import { type OnInsertAttrs } from './types';
+type Props = {
+    mediaProvider: MediaProvider;
+    onInsert: (attrs: OnInsertAttrs) => void;
+    onClose: () => void;
+    dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
+};
+export declare const LocalMedia: ({ mediaProvider, onInsert, dispatchAnalyticsEvent }: Props) => JSX.Element;
+export {};

package/dist/types/ui/MediaCard.d.ts

@@ -2,7 +2,7 @@
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import { type OnInsertAttrs } from './types';
 type Props = {
-    attrs: OnInsertAttrs;
+    attrs: Required<OnInsertAttrs>;
     mediaProvider: MediaProvider;
 };
 export declare const MediaCard: ({ attrs, mediaProvider }: Props) => JSX.Element;

package/dist/types/ui/types.d.ts

@@ -1,7 +1,7 @@
 export type OnInsertAttrs = {
     id: string;
     collection: string | undefined;
-    height: number;
-    width: number;
+    height?: number;
+    width?: number;
     occurrenceKey: string | undefined;
 };