@atlaskit/editor-plugin-media 0.11.8 → 0.11.10

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-media
 
+## 0.11.10
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.11.9
+
+### Patch Changes
+
+- [#67290](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67290) [`3029264a82c3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3029264a82c3) - [ux] Fixes the bug where, adding media to empty panel replaces the panel
+
 ## 0.11.8
 
 ### Patch Changes

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

@@ -13,7 +13,7 @@ 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);
+  return (0, _utils2.hasParentNodeOfType)([state.schema.nodes.listItem])(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) || isInSupportedInlineImageParent(state)) && (0, _mediaFiles.canInsertMediaInline)(state);

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

@@ -15,6 +15,7 @@ var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _mediaCommon = require("../utils/media-common");
@@ -54,7 +55,20 @@ function insertNodesWithOptionalParagraph(nodes) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
-    tr.replaceSelection(new _model.Slice(_model.Fragment.from(nodes), 0, openEnd));
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-extended-panel')) {
+      if (state.selection.empty) {
+        tr.insert(state.selection.from, nodes);
+        // Set the cursor position at the end of the insertion
+        var endPos = state.selection.from + nodes.reduce(function (totalSize, currNode) {
+          return totalSize + currNode.nodeSize;
+        }, 0);
+        tr.setSelection(new _state.TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      } else {
+        tr.replaceSelection(new _model.Slice(_model.Fragment.from(nodes), 0, openEnd));
+      }
+    } else {
+      tr.replaceSelection(new _model.Slice(_model.Fragment.from(nodes), 0, openEnd));
+    }
     if (inputMethod) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaAnalytics(inputMethod, fileExtension))(tr);
     }

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

@@ -7,7 +7,7 @@ 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);
+  return hasParentNodeOfType([state.schema.nodes.listItem])(state.selection);
 };
 export const getMediaNodeInsertionType = (state, mediaFeatureFlags, fileMimeType) => {
   const canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaFeatureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);

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

@@ -5,6 +5,7 @@ import { getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_
 import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
 import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
@@ -44,7 +45,18 @@ function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, edito
       nodes.push(paragraph.create());
       openEnd = 1;
     }
-    tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
+    if (getBooleanFF('platform.editor.allow-extended-panel')) {
+      if (state.selection.empty) {
+        tr.insert(state.selection.from, nodes);
+        // Set the cursor position at the end of the insertion
+        const endPos = state.selection.from + nodes.reduce((totalSize, currNode) => totalSize + currNode.nodeSize, 0);
+        tr.setSelection(new TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      } else {
+        tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
+      }
+    } else {
+      tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
+    }
     if (inputMethod) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaAnalytics(inputMethod, fileExtension))(tr);
     }

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

@@ -7,7 +7,7 @@ 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);
+  return hasParentNodeOfType([state.schema.nodes.listItem])(state.selection);
 };
 export var getMediaNodeInsertionType = function getMediaNodeInsertionType(state, mediaFeatureFlags, fileMimeType) {
   var canInsertInlineNode = getMediaFeatureFlag('mediaInline', mediaFeatureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInSupportedInlineImageParent(state)) && canInsertMediaInline(state);

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

@@ -8,6 +8,7 @@ import { getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_
 import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
 import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
@@ -45,7 +46,20 @@ function insertNodesWithOptionalParagraph(nodes) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
-    tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
+    if (getBooleanFF('platform.editor.allow-extended-panel')) {
+      if (state.selection.empty) {
+        tr.insert(state.selection.from, nodes);
+        // Set the cursor position at the end of the insertion
+        var endPos = state.selection.from + nodes.reduce(function (totalSize, currNode) {
+          return totalSize + currNode.nodeSize;
+        }, 0);
+        tr.setSelection(new TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      } else {
+        tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
+      }
+    } else {
+      tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
+    }
     if (inputMethod) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaAnalytics(inputMethod, fileExtension))(tr);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "0.11.8",
+  "version": "0.11.10",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -43,7 +43,7 @@
     "@atlaskit/editor-plugin-decorations": "^0.2.0",
     "@atlaskit/editor-plugin-editor-disabled": "^0.2.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
-    "@atlaskit/editor-plugin-floating-toolbar": "^0.7.0",
+    "@atlaskit/editor-plugin-floating-toolbar": "^0.8.0",
     "@atlaskit/editor-plugin-focus": "^0.2.0",
     "@atlaskit/editor-plugin-grid": "^0.3.0",
     "@atlaskit/editor-plugin-guideline": "^0.5.0",
@@ -147,6 +147,9 @@
     },
     "platform.editor.ally-media-file-dropdown_1kxo8": {
       "type": "boolean"
+    },
+    "platform.editor.allow-extended-panel": {
+      "type": "boolean"
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"