@atlaskit/editor-plugin-media 1.20.5 → 1.20.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-media
 
+## 1.20.7
+
+### Patch Changes
+
+- [#107716](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107716)
+  [`62ea5418666f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/62ea5418666f) -
+  ED-22554 fix selection position after updating alt text
+
+## 1.20.6
+
+### Patch Changes
+
+- [#107335](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107335)
+  [`d5457c8afe5f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d5457c8afe5f) -
+  Cleaned up FF platform.editor.media.autoselect-inserted-image_oumto
+
 ## 1.20.5
 
 ### Patch Changes

package/dist/cjs/pm-plugins/alt-text/commands.js

@@ -60,7 +60,10 @@ var updateAltTextTransform = exports.updateAltTextTransform = function updateAlt
   return function (tr, state) {
     var mediaNode = (0, _mediaCommon.getMediaSingleOrInlineNodeFromSelection)(state);
     if (mediaNode) {
-      var pos = mediaNode.type === state.schema.nodes.media ? tr.selection.from + 1 : tr.selection.from;
+      // mediaSingle or mediaInline
+      var originalSelectionPos = tr.selection.from;
+      var mediaPos = mediaNode.type === state.schema.nodes.media ? originalSelectionPos + 1 // media inside mediaSingle
+      : originalSelectionPos; // mediaInline
 
       /**
        * Any changes to attributes of a node count the node as "recreated" in Prosemirror[1]
@@ -70,9 +73,9 @@ var updateAltTextTransform = exports.updateAltTextTransform = function updateAlt
        * [1] https://discuss.prosemirror.net/t/setnodemarkup-loses-current-nodeselection/976
        * [2] https://discuss.prosemirror.net/t/setnodemarkup-and-deselect/3673
        */
-      tr.setMeta('scrollIntoView', false).setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, mediaNode.attrs), {}, {
+      tr.setMeta('scrollIntoView', false).setNodeMarkup(mediaPos, undefined, _objectSpread(_objectSpread({}, mediaNode.attrs), {}, {
         alt: newAltText
-      })).setSelection(_state.NodeSelection.create(tr.doc, pos));
+      })).setSelection(_state.NodeSelection.create(tr.doc, originalSelectionPos));
     }
     return tr;
   };

package/dist/cjs/pm-plugins/main.js

@@ -289,9 +289,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
           _this.uploadInProgressSubscriptionsNotified = false;
         }
       });
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.autoselect-inserted-image_oumto')) {
-        _this.selectLastAddedMediaNode();
-      }
+      _this.selectLastAddedMediaNode();
     });
     (0, _defineProperty2.default)(this, "addPendingTask", function (task) {
       _this.taskManager.addPendingTask(task);

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

@@ -155,7 +155,7 @@ var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMedia
     }
     dispatch(tr);
   }
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.autoselect-inserted-image_oumto') && onNodeInserted) {
+  if (onNodeInserted) {
     onNodeInserted(mediaState.id, view.state.selection.to);
   }
   return true;

package/dist/es2019/pm-plugins/alt-text/commands.js

@@ -47,7 +47,10 @@ export const openMediaAltTextMenu = createCommandWithAnalytics(ACTION.OPENED, st
 export const updateAltTextTransform = newAltText => (tr, state) => {
   const mediaNode = getMediaSingleOrInlineNodeFromSelection(state);
   if (mediaNode) {
-    const pos = mediaNode.type === state.schema.nodes.media ? tr.selection.from + 1 : tr.selection.from;
+    // mediaSingle or mediaInline
+    const originalSelectionPos = tr.selection.from;
+    const mediaPos = mediaNode.type === state.schema.nodes.media ? originalSelectionPos + 1 // media inside mediaSingle
+    : originalSelectionPos; // mediaInline
 
     /**
      * Any changes to attributes of a node count the node as "recreated" in Prosemirror[1]
@@ -57,10 +60,10 @@ export const updateAltTextTransform = newAltText => (tr, state) => {
      * [1] https://discuss.prosemirror.net/t/setnodemarkup-loses-current-nodeselection/976
      * [2] https://discuss.prosemirror.net/t/setnodemarkup-and-deselect/3673
      */
-    tr.setMeta('scrollIntoView', false).setNodeMarkup(pos, undefined, {
+    tr.setMeta('scrollIntoView', false).setNodeMarkup(mediaPos, undefined, {
       ...mediaNode.attrs,
       alt: newAltText
-    }).setSelection(NodeSelection.create(tr.doc, pos));
+    }).setSelection(NodeSelection.create(tr.doc, originalSelectionPos));
   }
   return tr;
 };

package/dist/es2019/pm-plugins/main.js

@@ -233,9 +233,7 @@ export class MediaPluginStateImplementation {
           this.uploadInProgressSubscriptionsNotified = false;
         }
       });
-      if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto')) {
-        this.selectLastAddedMediaNode();
-      }
+      this.selectLastAddedMediaNode();
     });
     _defineProperty(this, "addPendingTask", task => {
       this.taskManager.addPendingTask(task);

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

@@ -146,7 +146,7 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
     }
     dispatch(tr);
   }
-  if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto') && onNodeInserted) {
+  if (onNodeInserted) {
     onNodeInserted(mediaState.id, view.state.selection.to);
   }
   return true;

package/dist/esm/pm-plugins/alt-text/commands.js

@@ -53,7 +53,10 @@ export var updateAltTextTransform = function updateAltTextTransform(newAltText)
   return function (tr, state) {
     var mediaNode = getMediaSingleOrInlineNodeFromSelection(state);
     if (mediaNode) {
-      var pos = mediaNode.type === state.schema.nodes.media ? tr.selection.from + 1 : tr.selection.from;
+      // mediaSingle or mediaInline
+      var originalSelectionPos = tr.selection.from;
+      var mediaPos = mediaNode.type === state.schema.nodes.media ? originalSelectionPos + 1 // media inside mediaSingle
+      : originalSelectionPos; // mediaInline
 
       /**
        * Any changes to attributes of a node count the node as "recreated" in Prosemirror[1]
@@ -63,9 +66,9 @@ export var updateAltTextTransform = function updateAltTextTransform(newAltText)
        * [1] https://discuss.prosemirror.net/t/setnodemarkup-loses-current-nodeselection/976
        * [2] https://discuss.prosemirror.net/t/setnodemarkup-and-deselect/3673
        */
-      tr.setMeta('scrollIntoView', false).setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, mediaNode.attrs), {}, {
+      tr.setMeta('scrollIntoView', false).setNodeMarkup(mediaPos, undefined, _objectSpread(_objectSpread({}, mediaNode.attrs), {}, {
         alt: newAltText
-      })).setSelection(NodeSelection.create(tr.doc, pos));
+      })).setSelection(NodeSelection.create(tr.doc, originalSelectionPos));
     }
     return tr;
   };

package/dist/esm/pm-plugins/main.js

@@ -274,9 +274,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
           _this.uploadInProgressSubscriptionsNotified = false;
         }
       });
-      if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto')) {
-        _this.selectLastAddedMediaNode();
-      }
+      _this.selectLastAddedMediaNode();
     });
     _defineProperty(this, "addPendingTask", function (task) {
       _this.taskManager.addPendingTask(task);

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

@@ -146,7 +146,7 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
     }
     dispatch(tr);
   }
-  if (getBooleanFF('platform.editor.media.autoselect-inserted-image_oumto') && onNodeInserted) {
+  if (onNodeInserted) {
     onNodeInserted(mediaState.id, view.state.selection.to);
   }
   return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "1.20.5",
+  "version": "1.20.7",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -64,7 +64,7 @@
     "@atlaskit/media-ui": "^25.10.0",
     "@atlaskit/media-viewer": "^48.6.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^6.4.0",
+    "@atlaskit/primitives": "^6.5.0",
     "@atlaskit/textfield": "^6.3.0",
     "@atlaskit/theme": "^12.8.0",
     "@atlaskit/tokens": "^1.49.0",
@@ -144,9 +144,6 @@
     "platform.editor.media.fix-copy-paste-excel_62g4s": {
       "type": "boolean"
     },
-    "platform.editor.media.autoselect-inserted-image_oumto": {
-      "type": "boolean"
-    },
     "platform.editor.media.preview-in-full-page": {
       "type": "boolean"
     },