@atlaskit/editor-plugin-media 0.10.0 → 0.10.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-media
 
+## 0.10.2
+
+### Patch Changes
+
+- [#65194](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65194) [`b17492206adc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b17492206adc) - ED-21544 able to insert inline image in panel with empty paragraph.
+
+## 0.10.1
+
+### Patch Changes
+
+- [#65562](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65562) [`857a5d841564`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/857a5d841564) - add analytics to track media single to media inline convert
+- Updated dependencies
+
 ## 0.10.0
 
 ### Minor Changes

package/dist/cjs/toolbar/commands.js

@@ -276,6 +276,7 @@ var changeMediaSingleToMediaInline = exports.changeMediaSingleToMediaInline = fu
     // 3 accounts for  paragraph 1 + mediaInline size 1 + space 1
     tr.setSelection(_state.TextSelection.create(tr.doc, from + 3));
     if (dispatch) {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent((0, _analytics2.getChangeMediaAnalytics)(_analytics.ACTION_SUBJECT_ID.MEDIA_SINGLE, _analytics.ACTION_SUBJECT_ID.MEDIA_INLINE, (0, _analytics2.findChangeFromLocation)(state.selection)))(tr);
       dispatch(tr);
     }
     return true;

package/dist/cjs/utils/media-files.js

@@ -12,6 +12,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _isType = require("./is-type");
 var _mediaCommon = require("./media-common");
+var _mediaInline2 = require("./media-inline");
 var canInsertMediaInline = exports.canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
   return (0, _utils2.canInsert)(state.selection.$to, _model.Fragment.from(node));
@@ -116,8 +117,8 @@ var insertMediaInlineNode = exports.insertMediaInlineNode = function insertMedia
     var space = state.schema.text(' ');
     var pos = state.selection.$to.pos;
 
-    // If the selection is inside an empty list item set pos inside paragraph
-    if ((0, _utils.isInListItem)(state) && (0, _mediaCommon.isInsidePotentialEmptyParagraph)(state)) {
+    // If the selection is inside an empty list item or panel set pos inside paragraph
+    if ((0, _mediaInline2.isInSupportedInlineImageParent)(state) && (0, _mediaCommon.isInsidePotentialEmptyParagraph)(state)) {
       pos = pos + 1;
     }
     var content = _model.Fragment.from([mediaInlineNode, space]);

package/dist/cjs/utils/media-inline.js

@@ -3,16 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMediaNodeInsertionType = void 0;
+exports.isInSupportedInlineImageParent = exports.getMediaNodeInsertionType = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _mediaCommon = require("@atlaskit/media-common");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _mediaFiles = require("../utils/media-files");
 var _mediaSingle = require("../utils/media-single");
 var _isType = require("./is-type");
 var _mediaCommon2 = require("./media-common");
+var isInSupportedInlineImageParent = exports.isInSupportedInlineImageParent = function isInSupportedInlineImageParent(state) {
+  return (0, _utils2.hasParentNodeOfType)([state.schema.nodes.listItem, state.schema.nodes.panel])(state.selection);
+};
 var getMediaNodeInsertionType = exports.getMediaNodeInsertionType = function getMediaNodeInsertionType(state, mediaFeatureFlags, fileMimeType) {
-  var canInsertInlineNode = (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaFeatureFlags) && !(0, _utils.isInEmptyLine)(state) && (!(0, _mediaCommon2.isInsidePotentialEmptyParagraph)(state) || (0, _utils.isInListItem)(state)) && (0, _mediaFiles.canInsertMediaInline)(state);
+  var canInsertInlineNode = (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaFeatureFlags) && !(0, _utils.isInEmptyLine)(state) && (!(0, _mediaCommon2.isInsidePotentialEmptyParagraph)(state) || isInSupportedInlineImageParent(state)) && (0, _mediaFiles.canInsertMediaInline)(state);
   if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.inline-image.base-support')) {
     if (canInsertInlineNode && !(0, _isType.isVideo)(fileMimeType)) {
       return 'inline';

package/dist/es2019/toolbar/commands.js

@@ -2,7 +2,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNodeSelection, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { getMediaInputResizeAnalyticsEvent } from '../utils/analytics';
+import { findChangeFromLocation, getChangeMediaAnalytics, getMediaInputResizeAnalyticsEvent } from '../utils/analytics';
 import { currentMediaInlineNodeWithPos, currentMediaNodeWithPos } from '../utils/current-media-node';
 import { changeFromMediaInlineToMediaSingleNode } from '../utils/media-single';
 import { getSelectedMediaSingle, removeMediaGroupNode } from './utils';
@@ -255,6 +255,7 @@ export const changeMediaSingleToMediaInline = editorAnalyticsAPI => (state, disp
   // 3 accounts for  paragraph 1 + mediaInline size 1 + space 1
   tr.setSelection(TextSelection.create(tr.doc, from + 3));
   if (dispatch) {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getChangeMediaAnalytics(ACTION_SUBJECT_ID.MEDIA_SINGLE, ACTION_SUBJECT_ID.MEDIA_INLINE, findChangeFromLocation(state.selection)))(tr);
     dispatch(tr);
   }
   return true;

package/dist/es2019/utils/media-files.js

@@ -6,6 +6,7 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { canInsert, hasParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { isImage } from './is-type';
 import { copyOptionalAttrsFromMediaState, isInsidePotentialEmptyParagraph, isSelectionNonMediaBlockNode, posOfMediaGroupNearby, posOfParentMediaGroup, posOfPrecedingMediaGroup } from './media-common';
+import { isInSupportedInlineImageParent } from './media-inline';
 export const canInsertMediaInline = state => {
   const node = state.schema.nodes.mediaInline.create({});
   return canInsert(state.selection.$to, Fragment.from(node));
@@ -125,8 +126,8 @@ export const insertMediaInlineNode = editorAnalyticsAPI => (view, mediaState, co
   const space = state.schema.text(' ');
   let pos = state.selection.$to.pos;
 
-  // If the selection is inside an empty list item set pos inside paragraph
-  if (isInListItem(state) && isInsidePotentialEmptyParagraph(state)) {
+  // If the selection is inside an empty list item or panel set pos inside paragraph
+  if (isInSupportedInlineImageParent(state) && isInsidePotentialEmptyParagraph(state)) {
     pos = pos + 1;
   }
   let content = Fragment.from([mediaInlineNode, space]);

package/dist/es2019/utils/media-inline.js

@@ -1,12 +1,16 @@
-import { isInEmptyLine, isInListItem } from '@atlaskit/editor-common/utils';
+import { isInEmptyLine } from '@atlaskit/editor-common/utils';
+import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { canInsertMediaInline } from '../utils/media-files';
 import { isMediaSingle } from '../utils/media-single';
 import { isVideo } from './is-type';
 import { isInsidePotentialEmptyParagraph } from './media-common';
+export const isInSupportedInlineImageParent = state => {
+  return hasParentNodeOfType([state.schema.nodes.listItem, state.schema.nodes.panel])(state.selection);
+};
 export const getMediaNodeInsertionType = (state, mediaFeatureFlags, fileMimeType) => {
-  const canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaFeatureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInListItem(state)) && canInsertMediaInline(state);
+  const canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaFeatureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);
   if (getBooleanFF('platform.editor.media.inline-image.base-support')) {
     if (canInsertInlineNode && !isVideo(fileMimeType)) {
       return 'inline';

package/dist/esm/toolbar/commands.js

@@ -5,7 +5,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNodeSelection, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { getMediaInputResizeAnalyticsEvent } from '../utils/analytics';
+import { findChangeFromLocation, getChangeMediaAnalytics, getMediaInputResizeAnalyticsEvent } from '../utils/analytics';
 import { currentMediaInlineNodeWithPos, currentMediaNodeWithPos } from '../utils/current-media-node';
 import { changeFromMediaInlineToMediaSingleNode } from '../utils/media-single';
 import { getSelectedMediaSingle, removeMediaGroupNode } from './utils';
@@ -269,6 +269,7 @@ export var changeMediaSingleToMediaInline = function changeMediaSingleToMediaInl
     // 3 accounts for  paragraph 1 + mediaInline size 1 + space 1
     tr.setSelection(TextSelection.create(tr.doc, from + 3));
     if (dispatch) {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(getChangeMediaAnalytics(ACTION_SUBJECT_ID.MEDIA_SINGLE, ACTION_SUBJECT_ID.MEDIA_INLINE, findChangeFromLocation(state.selection)))(tr);
       dispatch(tr);
     }
     return true;

package/dist/esm/utils/media-files.js

@@ -6,6 +6,7 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { canInsert, hasParentNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { isImage } from './is-type';
 import { copyOptionalAttrsFromMediaState, isInsidePotentialEmptyParagraph, isSelectionNonMediaBlockNode, posOfMediaGroupNearby, posOfParentMediaGroup, posOfPrecedingMediaGroup } from './media-common';
+import { isInSupportedInlineImageParent } from './media-inline';
 export var canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
   return canInsert(state.selection.$to, Fragment.from(node));
@@ -110,8 +111,8 @@ export var insertMediaInlineNode = function insertMediaInlineNode(editorAnalytic
     var space = state.schema.text(' ');
     var pos = state.selection.$to.pos;
 
-    // If the selection is inside an empty list item set pos inside paragraph
-    if (isInListItem(state) && isInsidePotentialEmptyParagraph(state)) {
+    // If the selection is inside an empty list item or panel set pos inside paragraph
+    if (isInSupportedInlineImageParent(state) && isInsidePotentialEmptyParagraph(state)) {
       pos = pos + 1;
     }
     var content = Fragment.from([mediaInlineNode, space]);

package/dist/esm/utils/media-inline.js

@@ -1,12 +1,16 @@
-import { isInEmptyLine, isInListItem } from '@atlaskit/editor-common/utils';
+import { isInEmptyLine } from '@atlaskit/editor-common/utils';
+import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { canInsertMediaInline } from '../utils/media-files';
 import { isMediaSingle } from '../utils/media-single';
 import { isVideo } from './is-type';
 import { isInsidePotentialEmptyParagraph } from './media-common';
+export var isInSupportedInlineImageParent = function isInSupportedInlineImageParent(state) {
+  return hasParentNodeOfType([state.schema.nodes.listItem, state.schema.nodes.panel])(state.selection);
+};
 export var getMediaNodeInsertionType = function getMediaNodeInsertionType(state, mediaFeatureFlags, fileMimeType) {
-  var canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaFeatureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInListItem(state)) && canInsertMediaInline(state);
+  var canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaFeatureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);
   if (getBooleanFF('platform.editor.media.inline-image.base-support')) {
     if (canInsertInlineNode && !isVideo(fileMimeType)) {
       return 'inline';

package/dist/types/utils/media-inline.d.ts

@@ -1,4 +1,5 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { MediaFeatureFlags } from '@atlaskit/media-common';
 export type MediaNodeType = 'inline' | 'block' | 'group';
+export declare const isInSupportedInlineImageParent: (state: EditorState) => boolean;
 export declare const getMediaNodeInsertionType: (state: EditorState, mediaFeatureFlags?: MediaFeatureFlags, fileMimeType?: string) => MediaNodeType;

package/dist/types-ts4.5/utils/media-inline.d.ts

@@ -1,4 +1,5 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { MediaFeatureFlags } from '@atlaskit/media-common';
 export type MediaNodeType = 'inline' | 'block' | 'group';
+export declare const isInSupportedInlineImageParent: (state: EditorState) => boolean;
 export declare const getMediaNodeInsertionType: (state: EditorState, mediaFeatureFlags?: MediaFeatureFlags, fileMimeType?: string) => MediaNodeType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.3.0",
-    "@atlaskit/analytics-namespaced-context": "^6.7.0",
+    "@atlaskit/analytics-namespaced-context": "^6.8.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/button": "^17.2.0",
     "@atlaskit/editor-common": "^76.35.0",