@atlaskit/editor-plugin-media 1.31.3 → 1.31.5

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-media
 
+## 1.31.5
+
+### Patch Changes
+
+- [#140146](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140146)
+  [`1d9fce7fc2523`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1d9fce7fc2523) -
+  [ux] [ED-24912] **@atlaskit/editor-plugin-media-insert**: Makes sure that users can upload
+  non-media files, users can also select multiple files from their local media browser to upload at
+  once **@atlaskit/editor-plugin-media**: Adds a type export for `MediaStateEventListener` &
+  `MediaStateEventSubscriber`
+- [#139475](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139475)
+  [`6402db241c334`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6402db241c334) -
+  ED-24899 fix media disappears after dnd
+
+## 1.31.4
+
+### Patch Changes
+
+- [#139334](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139334)
+  [`30793649657c0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/30793649657c0) -
+  [HOT-111629] We had an incident where the last character disappears when hitting the enter key on
+  windows OS for Korean characters. Bumping to prosemirror-view@1.34.2 for the fix.
+- Updated dependencies
+
 ## 1.31.3
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaSingle.js

@@ -454,7 +454,8 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
       var isInsideTable = pos !== undefined && (0, _utils2.findParentNodeOfTypeClosestToPos)(state.doc.resolve(pos), [state.schema.nodes.table]);
       var currentMediaElement = function currentMediaElement() {
         if (pos !== undefined) {
-          return view.domAtPos(pos + 1).node;
+          var mediaNode = view.domAtPos(pos + 1).node;
+          return mediaNode instanceof HTMLElement ? mediaNode : null;
         }
         return null;
       };

package/dist/cjs/ui/CommentBadge/index.js

@@ -57,7 +57,14 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-  var mediaSingleElement = view.domAtPos(pos + 1).node;
+
+  /**
+   * After performing certain operations like drag and drop,
+   * the position may momentarily shift. It will NOT always be an HTML element;
+   * it could also be plain text.
+   */
+  var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
+  var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/_react.default.createElement(_mediaSingle.CommentBadge, {
     commentsOnMediaBugFixEnabled: commentsOnMediaBugFixEnabled,
     badgeOffsetRight: badgeOffsetRight,
@@ -124,7 +131,8 @@ var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function Comment
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-  var mediaSingleElement = view.domAtPos(pos + 1).node;
+  var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
+  var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/_react.default.createElement(_mediaSingle.CommentBadgeNext, {
     onClick: onClick,
     mediaSingleElement: mediaSingleElement,

package/dist/es2019/nodeviews/mediaSingle.js

@@ -372,7 +372,8 @@ export default class MediaSingleNode extends Component {
     const isInsideTable = pos !== undefined && findParentNodeOfTypeClosestToPos(state.doc.resolve(pos), [state.schema.nodes.table]);
     const currentMediaElement = () => {
       if (pos !== undefined) {
-        return view.domAtPos(pos + 1).node;
+        const mediaNode = view.domAtPos(pos + 1).node;
+        return mediaNode instanceof HTMLElement ? mediaNode : null;
       }
       return null;
     };

package/dist/es2019/ui/CommentBadge/index.js

@@ -50,7 +50,14 @@ const CommentBadgeWrapper = ({
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-  const mediaSingleElement = view.domAtPos(pos + 1).node;
+
+  /**
+   * After performing certain operations like drag and drop,
+   * the position may momentarily shift. It will NOT always be an HTML element;
+   * it could also be plain text.
+   */
+  const maybeMediaSingleElement = view.domAtPos(pos + 1).node;
+  const mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/React.createElement(CommentBadgeComponent, {
     commentsOnMediaBugFixEnabled: commentsOnMediaBugFixEnabled,
     badgeOffsetRight: badgeOffsetRight,
@@ -117,7 +124,8 @@ export const CommentBadgeNextWrapper = ({
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-  const mediaSingleElement = view.domAtPos(pos + 1).node;
+  const maybeMediaSingleElement = view.domAtPos(pos + 1).node;
+  const mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/React.createElement(CommentBadgeNext, {
     onClick: onClick,
     mediaSingleElement: mediaSingleElement,

package/dist/esm/nodeviews/mediaSingle.js

@@ -449,7 +449,8 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       var isInsideTable = pos !== undefined && findParentNodeOfTypeClosestToPos(state.doc.resolve(pos), [state.schema.nodes.table]);
       var currentMediaElement = function currentMediaElement() {
         if (pos !== undefined) {
-          return view.domAtPos(pos + 1).node;
+          var mediaNode = view.domAtPos(pos + 1).node;
+          return mediaNode instanceof HTMLElement ? mediaNode : null;
         }
         return null;
       };

package/dist/esm/ui/CommentBadge/index.js

@@ -47,7 +47,14 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref) {
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-  var mediaSingleElement = view.domAtPos(pos + 1).node;
+
+  /**
+   * After performing certain operations like drag and drop,
+   * the position may momentarily shift. It will NOT always be an HTML element;
+   * it could also be plain text.
+   */
+  var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
+  var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/React.createElement(CommentBadgeComponent, {
     commentsOnMediaBugFixEnabled: commentsOnMediaBugFixEnabled,
     badgeOffsetRight: badgeOffsetRight,
@@ -114,7 +121,8 @@ export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {
   if (!isDrafting && hasNoComments || !mediaNode) {
     return null;
   }
-  var mediaSingleElement = view.domAtPos(pos + 1).node;
+  var maybeMediaSingleElement = view.domAtPos(pos + 1).node;
+  var mediaSingleElement = maybeMediaSingleElement instanceof HTMLElement ? maybeMediaSingleElement : null;
   return /*#__PURE__*/React.createElement(CommentBadgeNext, {
     onClick: onClick,
     mediaSingleElement: mediaSingleElement,

package/dist/types/picker-facade.d.ts

@@ -2,16 +2,13 @@ import type { ErrorReportingHandler } from '@atlaskit/editor-common/utils';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { UploadEndEventPayload, UploadErrorEventPayload, UploadParams, UploadPreviewUpdateEventPayload } from '@atlaskit/media-picker/types';
-import type { CustomMediaPicker, MediaState, MobileUploadEndEventPayload } from './types';
+import type { CustomMediaPicker, MediaState, MediaStateEventSubscriber, MobileUploadEndEventPayload } from './types';
 type PickerType = 'clipboard' | 'dropzone' | 'customMediaPicker';
 export type PickerFacadeConfig = {
     mediaClientConfig: MediaClientConfig;
     errorReporter: ErrorReportingHandler;
     featureFlags?: MediaFeatureFlags;
 };
-type MediaStateEvent = MediaState;
-export type MediaStateEventListener = (evt: MediaStateEvent) => void;
-export type MediaStateEventSubscriber = (listener: MediaStateEventListener) => void;
 type NewMediaEvent = (state: MediaState, onStateChanged: MediaStateEventSubscriber, pickerType?: string) => void;
 export default class PickerFacade {
     readonly config: PickerFacadeConfig;

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

@@ -10,9 +10,8 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaPluginOptions } from '../media-plugin-options';
 import type { MediaNextEditorPluginType } from '../next-plugin-type';
-import type { MediaStateEventSubscriber } from '../picker-facade';
 import PickerFacade from '../picker-facade';
-import type { MediaOptions, MediaState, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
+import type { MediaOptions, MediaState, MediaStateEventSubscriber, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
 import type { MediaNodeWithPosHandler, MediaPluginState } from './types';
 export type { MediaState };
 export { stateKey } from './plugin-key';

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

@@ -5,9 +5,8 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaPluginOptions } from '../media-plugin-options';
-import type { MediaStateEventSubscriber } from '../picker-facade';
 import type PickerFacade from '../picker-facade';
-import type { MediaOptions, MediaState, ProsemirrorGetPosHandler } from '../types';
+import type { MediaOptions, MediaState, MediaStateEventSubscriber, ProsemirrorGetPosHandler } from '../types';
 export interface MediaNodeWithPosHandler {
     node: PMNode;
     getPos: ProsemirrorGetPosHandler;

package/dist/types/types.d.ts

@@ -131,3 +131,6 @@ export interface ReactNodeProps {
 export type ForwardRef = (node: HTMLElement | null) => void;
 export type { InsertMediaAsMediaSingle } from './utils/media-single';
 export type { MediaPluginState } from './pm-plugins/types';
+type MediaStateEvent = MediaState;
+export type MediaStateEventListener = (evt: MediaStateEvent) => void;
+export type MediaStateEventSubscriber = (listener: MediaStateEventListener) => void;

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

@@ -2,16 +2,13 @@ import type { ErrorReportingHandler } from '@atlaskit/editor-common/utils';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { UploadEndEventPayload, UploadErrorEventPayload, UploadParams, UploadPreviewUpdateEventPayload } from '@atlaskit/media-picker/types';
-import type { CustomMediaPicker, MediaState, MobileUploadEndEventPayload } from './types';
+import type { CustomMediaPicker, MediaState, MediaStateEventSubscriber, MobileUploadEndEventPayload } from './types';
 type PickerType = 'clipboard' | 'dropzone' | 'customMediaPicker';
 export type PickerFacadeConfig = {
     mediaClientConfig: MediaClientConfig;
     errorReporter: ErrorReportingHandler;
     featureFlags?: MediaFeatureFlags;
 };
-type MediaStateEvent = MediaState;
-export type MediaStateEventListener = (evt: MediaStateEvent) => void;
-export type MediaStateEventSubscriber = (listener: MediaStateEventListener) => void;
 type NewMediaEvent = (state: MediaState, onStateChanged: MediaStateEventSubscriber, pickerType?: string) => void;
 export default class PickerFacade {
     readonly config: PickerFacadeConfig;

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

@@ -10,9 +10,8 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaPluginOptions } from '../media-plugin-options';
 import type { MediaNextEditorPluginType } from '../next-plugin-type';
-import type { MediaStateEventSubscriber } from '../picker-facade';
 import PickerFacade from '../picker-facade';
-import type { MediaOptions, MediaState, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
+import type { MediaOptions, MediaState, MediaStateEventSubscriber, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
 import type { MediaNodeWithPosHandler, MediaPluginState } from './types';
 export type { MediaState };
 export { stateKey } from './plugin-key';

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

@@ -5,9 +5,8 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaPluginOptions } from '../media-plugin-options';
-import type { MediaStateEventSubscriber } from '../picker-facade';
 import type PickerFacade from '../picker-facade';
-import type { MediaOptions, MediaState, ProsemirrorGetPosHandler } from '../types';
+import type { MediaOptions, MediaState, MediaStateEventSubscriber, ProsemirrorGetPosHandler } from '../types';
 export interface MediaNodeWithPosHandler {
     node: PMNode;
     getPos: ProsemirrorGetPosHandler;

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

@@ -131,3 +131,6 @@ export interface ReactNodeProps {
 export type ForwardRef = (node: HTMLElement | null) => void;
 export type { InsertMediaAsMediaSingle } from './utils/media-single';
 export type { MediaPluginState } from './pm-plugins/types';
+type MediaStateEvent = MediaState;
+export type MediaStateEventListener = (evt: MediaStateEvent) => void;
+export type MediaStateEventSubscriber = (listener: MediaStateEventListener) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.31.3",
+	"version": "1.31.5",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-common": "^89.0.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
-		"@atlaskit/editor-plugin-annotation": "1.19.5",
+		"@atlaskit/editor-plugin-annotation": "1.19.6",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
@@ -49,11 +49,11 @@
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",
 		"@atlaskit/editor-plugin-selection": "^1.4.0",
 		"@atlaskit/editor-plugin-width": "^1.3.0",
-		"@atlaskit/editor-prosemirror": "5.0.1",
+		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/form": "^10.5.0",
-		"@atlaskit/icon": "^22.16.0",
+		"@atlaskit/icon": "^22.17.0",
 		"@atlaskit/media-card": "^78.2.0",
 		"@atlaskit/media-client": "^27.6.0",
 		"@atlaskit/media-client-react": "^2.2.0",