@atlaskit/editor-plugin-media-insert 1.2.1 → 1.3.0

package/dist/esm/ui/FromURL.js

@@ -82,118 +82,141 @@ export function MediaFromURL(_ref) {
   };
   var _React$useState = React.useState(placeholders[1]),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    url = _React$useState2[0],
+    inputUrl = _React$useState2[0],
     setUrl = _React$useState2[1];
   var _React$useReducer = React.useReducer(previewStateReducer, INITIAL_PREVIEW_STATE),
     _React$useReducer2 = _slicedToArray(_React$useReducer, 2),
     previewState = _React$useReducer2[0],
     dispatch = _React$useReducer2[1];
+  var pasteFlag = React.useRef(false);
   var _useAnalyticsEvents = useAnalyticsEvents(dispatchAnalyticsEvent),
     onUploadAnalytics = _useAnalyticsEvents.onUploadAnalytics,
     onUploadSuccessAnalytics = _useAnalyticsEvents.onUploadSuccessAnalytics,
     onUploadFailureAnalytics = _useAnalyticsEvents.onUploadFailureAnalytics;
-  var onURLChange = React.useCallback(function (e) {
-    setUrl(e.target.value);
-    dispatch({
-      type: 'reset'
-    });
-  }, []);
-  var uploadExternalMedia = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var _yield$mediaProvider, uploadMediaClientConfig, uploadParams, mediaClient, collection, _yield$mediaClient$fi, uploadableFileUpfrontIds, dimensions, message;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          dispatch({
-            type: 'loading'
-          });
-          _context.next = 3;
-          return mediaProvider;
-        case 3:
-          _yield$mediaProvider = _context.sent;
-          uploadMediaClientConfig = _yield$mediaProvider.uploadMediaClientConfig;
-          uploadParams = _yield$mediaProvider.uploadParams;
-          if (uploadMediaClientConfig) {
-            _context.next = 8;
-            break;
-          }
-          return _context.abrupt("return");
-        case 8:
-          mediaClient = getMediaClient(uploadMediaClientConfig);
-          collection = uploadParams === null || uploadParams === void 0 ? void 0 : uploadParams.collection;
-          onUploadAnalytics();
-          _context.prev = 11;
-          _context.next = 14;
-          return mediaClient.file.uploadExternal(url, collection);
-        case 14:
-          _yield$mediaClient$fi = _context.sent;
-          uploadableFileUpfrontIds = _yield$mediaClient$fi.uploadableFileUpfrontIds;
-          dimensions = _yield$mediaClient$fi.dimensions;
-          onUploadSuccessAnalytics();
-          dispatch({
-            type: 'success',
-            payload: {
-              id: uploadableFileUpfrontIds.id,
-              collection: collection,
-              height: dimensions.height,
-              width: dimensions.width,
-              occurrenceKey: uploadableFileUpfrontIds.occurrenceKey
-            }
-          });
-          _context.next = 24;
-          break;
-        case 21:
-          _context.prev = 21;
-          _context.t0 = _context["catch"](11);
-          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);
-            dispatch({
-              type: 'warning',
-              warning: _context.t0,
-              url: url
-            });
-          } else if (_context.t0 instanceof Error) {
-            message = 'Image preview fetch failed';
-            onUploadFailureAnalytics(message);
+  var uploadExternalMedia = React.useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(url) {
+      var _yield$mediaProvider, uploadMediaClientConfig, uploadParams, mediaClient, collection, _yield$mediaClient$fi, uploadableFileUpfrontIds, dimensions, message;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
             dispatch({
-              type: 'error',
-              error: message
+              type: 'loading'
             });
-          } else {
-            onUploadFailureAnalytics('Unknown error');
+            _context.next = 3;
+            return mediaProvider;
+          case 3:
+            _yield$mediaProvider = _context.sent;
+            uploadMediaClientConfig = _yield$mediaProvider.uploadMediaClientConfig;
+            uploadParams = _yield$mediaProvider.uploadParams;
+            if (uploadMediaClientConfig) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return");
+          case 8:
+            mediaClient = getMediaClient(uploadMediaClientConfig);
+            collection = uploadParams === null || uploadParams === void 0 ? void 0 : uploadParams.collection;
+            onUploadAnalytics();
+            _context.prev = 11;
+            _context.next = 14;
+            return mediaClient.file.uploadExternal(url, collection);
+          case 14:
+            _yield$mediaClient$fi = _context.sent;
+            uploadableFileUpfrontIds = _yield$mediaClient$fi.uploadableFileUpfrontIds;
+            dimensions = _yield$mediaClient$fi.dimensions;
+            onUploadSuccessAnalytics();
             dispatch({
-              type: 'error',
-              error: 'Unknown error'
+              type: 'success',
+              payload: {
+                id: uploadableFileUpfrontIds.id,
+                collection: collection,
+                height: dimensions.height,
+                width: dimensions.width,
+                occurrenceKey: uploadableFileUpfrontIds.occurrenceKey
+              }
             });
-          }
-        case 24:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[11, 21]]);
-  })), [mediaProvider, onUploadAnalytics, onUploadFailureAnalytics, onUploadSuccessAnalytics, url]);
+            _context.next = 24;
+            break;
+          case 21:
+            _context.prev = 21;
+            _context.t0 = _context["catch"](11);
+            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);
+              dispatch({
+                type: 'warning',
+                warning: _context.t0,
+                url: inputUrl
+              });
+            } else if (_context.t0 instanceof Error) {
+              message = 'Image preview fetch failed';
+              onUploadFailureAnalytics(message);
+              dispatch({
+                type: 'error',
+                error: message
+              });
+            } else {
+              onUploadFailureAnalytics('Unknown error');
+              dispatch({
+                type: 'error',
+                error: 'Unknown error'
+              });
+            }
+          case 24:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[11, 21]]);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [mediaProvider, onUploadAnalytics, onUploadFailureAnalytics, onUploadSuccessAnalytics, inputUrl]);
+  var onURLChange = React.useCallback(function (e) {
+    var url = e.target.value;
+    setUrl(url);
+    dispatch({
+      type: 'reset'
+    });
+    if (pasteFlag.current === true) {
+      pasteFlag.current = false;
+      uploadExternalMedia(url);
+    }
+  }, [uploadExternalMedia]);
+  var onPaste = React.useCallback(function (e) {
+    // Note: this is a little weird, but the paste event will always be
+    // fired before the change event when pasting. We don't really want to
+    // duplicate logic by handling pastes separately to changes, so we're
+    // just noting paste occured to then be handled in the onURLChange fn
+    // above. The one exception to this is where paste inputs exactly what was
+    // already in the input, in which case we want to ignore it.
+    if (e.clipboardData.getData('text') !== inputUrl) {
+      pasteFlag.current = true;
+    }
+  }, [inputUrl]);
   var onInsertClick = React.useCallback(function () {
     if (previewState.previewInfo) {
       return onInsert(previewState.previewInfo);
     }
     if (previewState.warning) {
-      return onExternalInsert(url);
+      return onExternalInsert(inputUrl);
     }
-  }, [onExternalInsert, onInsert, previewState.previewInfo, previewState.warning, url]);
+  }, [onExternalInsert, onInsert, previewState.previewInfo, previewState.warning, inputUrl]);
   return /*#__PURE__*/React.createElement("form", {
     onSubmit: function onSubmit(e) {
       e.preventDefault();
-      uploadExternalMedia();
+      uploadExternalMedia(inputUrl);
     }
   }, /*#__PURE__*/React.createElement(Stack, {
     space: "space.150"
   }, /*#__PURE__*/React.createElement(TextField, {
     autoFocus: true,
-    value: url,
+    value: inputUrl,
     placeholder: strings.pasteLinkToUpload,
-    onChange: onURLChange
+    onChange: onURLChange,
+    onPaste: onPaste
   }), previewState.previewInfo && /*#__PURE__*/React.createElement(Inline, {
     alignInline: "center",
     alignBlock: "center",
@@ -213,7 +236,7 @@ export function MediaFromURL(_ref) {
   }, /*#__PURE__*/React.createElement(Button, {
     type: "submit",
     isLoading: previewState.isLoading,
-    isDisabled: !url,
+    isDisabled: !inputUrl,
     iconBefore: EditorFilePreviewIcon
   }, strings.loadPreview)), /*#__PURE__*/React.createElement(Box, {
     xcss: ButtonGroupStyles

package/dist/esm/ui/MediaInsertContent.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import Button from '@atlaskit/button/new';
+import { Box } from '@atlaskit/primitives';
+import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
+export var MediaInsertContent = function MediaInsertContent() {
+  return /*#__PURE__*/React.createElement(Tabs, {
+    id: "media-insert-tab-navigation"
+  }, /*#__PURE__*/React.createElement(Box, {
+    paddingBlockEnd: "space.150"
+  }, /*#__PURE__*/React.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, null, /*#__PURE__*/React.createElement(Button, {
+    autoFocus: true,
+    appearance: "subtle"
+  }, "Link")))), /*#__PURE__*/React.createElement(TabPanel, null, /*#__PURE__*/React.createElement("p", null, "InsertLinkPanel here")));
+};

package/dist/esm/ui/MediaInsertPicker.js

@@ -0,0 +1,79 @@
+import React from 'react';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import { Popup, withOuterListeners } from '@atlaskit/editor-common/ui';
+import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
+import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
+import { MediaInsertContent } from './MediaInsertContent';
+import { MediaInsertWrapper } from './MediaInsertWrapper';
+var PopupWithListeners = withOuterListeners(Popup);
+var getDomRefFromSelection = function getDomRefFromSelection(view, dispatchAnalyticsEvent) {
+  try {
+    var domRef = findDomRefAtPos(view.state.selection.from, view.domAtPos.bind(view));
+    if (domRef instanceof HTMLElement) {
+      return domRef;
+    } else {
+      throw new Error('Invalid DOM reference');
+    }
+  } catch (error) {
+    if (dispatchAnalyticsEvent) {
+      var payload = {
+        action: ACTION.ERRORED,
+        actionSubject: ACTION_SUBJECT.PICKER,
+        actionSubjectId: ACTION_SUBJECT_ID.PICKER_MEDIA,
+        eventType: EVENT_TYPE.OPERATIONAL,
+        attributes: {
+          error: 'Error getting DOM reference from selection'
+        }
+      };
+      dispatchAnalyticsEvent(payload);
+    }
+  }
+};
+export var MediaInsertPicker = function MediaInsertPicker(_ref) {
+  var api = _ref.api,
+    editorView = _ref.editorView,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsScrollableElement = _ref.popupsScrollableElement,
+    closeMediaInsertPicker = _ref.closeMediaInsertPicker;
+  var targetRef = getDomRefFromSelection(editorView, dispatchAnalyticsEvent);
+  var _useSharedPluginState = useSharedPluginState(api, ['mediaInsert']),
+    mediaInsertState = _useSharedPluginState.mediaInsertState;
+  if (!mediaInsertState || !mediaInsertState.isOpen) {
+    return null;
+  }
+  var handleClose = function handleClose(exitMethod) {
+    return function (event) {
+      event.preventDefault();
+      if (dispatchAnalyticsEvent) {
+        var payload = {
+          action: ACTION.CLOSED,
+          actionSubject: ACTION_SUBJECT.PICKER,
+          actionSubjectId: ACTION_SUBJECT_ID.PICKER_MEDIA,
+          eventType: EVENT_TYPE.UI,
+          attributes: {
+            exitMethod: exitMethod
+          }
+        };
+        dispatchAnalyticsEvent(payload);
+      }
+      closeMediaInsertPicker();
+    };
+  };
+  return /*#__PURE__*/React.createElement(PopupWithListeners
+  // TODO: i18n
+  , {
+    ariaLabel: 'Media Insert',
+    offset: [0, 12],
+    target: targetRef,
+    zIndex: akEditorFloatingDialogZIndex,
+    mountTo: popupsMountPoint,
+    boundariesElement: popupsBoundariesElement,
+    handleClickOutside: handleClose(INPUT_METHOD.MOUSE),
+    handleEscapeKeydown: handleClose(INPUT_METHOD.KEYBOARD),
+    scrollableElement: popupsScrollableElement,
+    focusTrap: true
+  }, /*#__PURE__*/React.createElement(MediaInsertWrapper, null, /*#__PURE__*/React.createElement(MediaInsertContent, null)));
+};

package/dist/esm/ui/MediaInsertWrapper.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import { Box, xcss } from '@atlaskit/primitives';
+var styles = xcss({
+  boxShadow: 'elevation.shadow.overflow',
+  width: '340px',
+  padding: 'space.200',
+  borderRadius: 'border.radius'
+});
+export var MediaInsertWrapper = function MediaInsertWrapper(_ref) {
+  var children = _ref.children;
+  return /*#__PURE__*/React.createElement(Box, {
+    xcss: styles
+  }, children);
+};

package/dist/types/actions.d.ts

@@ -0,0 +1,6 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export type MediaInsertPluginAction = typeof ACTION_OPEN_POPUP | typeof ACTION_CLOSE_POPUP;
+export declare const ACTION_OPEN_POPUP = "OPEN_POPUP";
+export declare const ACTION_CLOSE_POPUP = "CLOSE_POPUP";
+export declare const showMediaInsertPopup: (tr: Transaction) => Transaction;
+export declare const closeMediaInsertPicker: (tr: Transaction) => Transaction;

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { mediaInsertPlugin } from './plugin';
-export type { MediaInsertPlugin } from './plugin';
+export type { MediaInsertPlugin, MediaInsertPluginState } from './types';
 export { MediaFromURL } from './ui/FromURL';

package/dist/types/plugin.d.ts

@@ -1,3 +1,2 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-export type MediaInsertPlugin = NextEditorPlugin<'mediaInsert', {}>;
+import type { MediaInsertPlugin } from './types';
 export declare const mediaInsertPlugin: MediaInsertPlugin;

package/dist/types/pm-plugins/main.d.ts

@@ -0,0 +1,3 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { MediaInsertPluginState } from '../types';
+export declare const createPlugin: () => SafePlugin<MediaInsertPluginState>;

package/dist/types/pm-plugins/plugin-key.d.ts

@@ -0,0 +1,3 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { MediaInsertPluginState } from '../types';
+export declare const pluginKey: PluginKey<MediaInsertPluginState>;

package/dist/types/types.d.ts

@@ -0,0 +1,14 @@
+import type { NextEditorPlugin, OptionalPlugin, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
+import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+export type MediaInsertPluginState = {
+    isOpen?: boolean;
+};
+export type MediaInsertPlugin = NextEditorPlugin<'mediaInsert', {
+    dependencies: [OptionalPlugin<AnalyticsPlugin>];
+    sharedState: MediaInsertPluginState;
+}>;
+export type MediaInsertPickerProps = Pick<UiComponentFactoryParams, 'editorView' | 'dispatchAnalyticsEvent' | 'popupsMountPoint' | 'popupsBoundariesElement' | 'popupsScrollableElement'> & {
+    api?: ExtractInjectionAPI<MediaInsertPlugin>;
+    closeMediaInsertPicker: () => void;
+};

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

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const MediaInsertContent: () => JSX.Element;

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

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import { type MediaInsertPickerProps } from '../types';
+export declare const MediaInsertPicker: ({ api, editorView, dispatchAnalyticsEvent, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, closeMediaInsertPicker, }: MediaInsertPickerProps) => JSX.Element | null;

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

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const MediaInsertWrapper: ({ children }: {
+    children?: React.ReactNode;
+}) => JSX.Element;

package/dist/types-ts4.5/actions.d.ts

@@ -0,0 +1,6 @@
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+export type MediaInsertPluginAction = typeof ACTION_OPEN_POPUP | typeof ACTION_CLOSE_POPUP;
+export declare const ACTION_OPEN_POPUP = "OPEN_POPUP";
+export declare const ACTION_CLOSE_POPUP = "CLOSE_POPUP";
+export declare const showMediaInsertPopup: (tr: Transaction) => Transaction;
+export declare const closeMediaInsertPicker: (tr: Transaction) => Transaction;

package/dist/types-ts4.5/index.d.ts

@@ -1,3 +1,3 @@
 export { mediaInsertPlugin } from './plugin';
-export type { MediaInsertPlugin } from './plugin';
+export type { MediaInsertPlugin, MediaInsertPluginState } from './types';
 export { MediaFromURL } from './ui/FromURL';

package/dist/types-ts4.5/plugin.d.ts

@@ -1,3 +1,2 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-export type MediaInsertPlugin = NextEditorPlugin<'mediaInsert', {}>;
+import type { MediaInsertPlugin } from './types';
 export declare const mediaInsertPlugin: MediaInsertPlugin;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -0,0 +1,3 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { MediaInsertPluginState } from '../types';
+export declare const createPlugin: () => SafePlugin<MediaInsertPluginState>;

package/dist/types-ts4.5/pm-plugins/plugin-key.d.ts

@@ -0,0 +1,3 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { MediaInsertPluginState } from '../types';
+export declare const pluginKey: PluginKey<MediaInsertPluginState>;

package/dist/types-ts4.5/types.d.ts

@@ -0,0 +1,16 @@
+import type { NextEditorPlugin, OptionalPlugin, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
+import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+export type MediaInsertPluginState = {
+    isOpen?: boolean;
+};
+export type MediaInsertPlugin = NextEditorPlugin<'mediaInsert', {
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>
+    ];
+    sharedState: MediaInsertPluginState;
+}>;
+export type MediaInsertPickerProps = Pick<UiComponentFactoryParams, 'editorView' | 'dispatchAnalyticsEvent' | 'popupsMountPoint' | 'popupsBoundariesElement' | 'popupsScrollableElement'> & {
+    api?: ExtractInjectionAPI<MediaInsertPlugin>;
+    closeMediaInsertPicker: () => void;
+};

package/dist/types-ts4.5/ui/MediaInsertContent.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const MediaInsertContent: () => JSX.Element;

package/dist/types-ts4.5/ui/MediaInsertPicker.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import { type MediaInsertPickerProps } from '../types';
+export declare const MediaInsertPicker: ({ api, editorView, dispatchAnalyticsEvent, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, closeMediaInsertPicker, }: MediaInsertPickerProps) => JSX.Element | null;

package/dist/types-ts4.5/ui/MediaInsertWrapper.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const MediaInsertWrapper: ({ children }: {
+    children?: React.ReactNode;
+}) => JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media-insert",
-	"version": "1.2.1",
+	"version": "1.3.0",
 	"description": "Media Insert plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,21 +24,25 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/button": "^19.1.0",
-		"@atlaskit/editor-common": "^87.6.0",
-		"@atlaskit/icon": "^22.11.0",
+		"@atlaskit/button": "^19.2.0",
+		"@atlaskit/editor-common": "^87.9.0",
+		"@atlaskit/editor-plugin-analytics": "^1.7.0",
+		"@atlaskit/editor-prosemirror": "5.0.1",
+		"@atlaskit/editor-shared-styles": "^2.13.0",
+		"@atlaskit/icon": "^22.12.0",
 		"@atlaskit/media-card": "^78.0.0",
 		"@atlaskit/media-client": "^27.3.0",
 		"@atlaskit/media-client-react": "^2.0.0",
 		"@atlaskit/primitives": "^12.0.0",
-		"@atlaskit/section-message": "^6.5.0",
-		"@atlaskit/textfield": "^6.4.0",
+		"@atlaskit/section-message": "^6.6.0",
+		"@atlaskit/tabs": "^16.4.0",
+		"@atlaskit/textfield": "^6.5.0",
 		"@babel/runtime": "^7.0.0",
 		"react": "^16.8.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/tokens": "^1.57.0"
+		"@atlaskit/tokens": "^1.58.0"
 	},
 	"devDependencies": {
 		"typescript": "~5.4.2"