@atlaskit/editor-plugin-extension 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-extension
 
+## 1.0.3
+
+### Patch Changes
+
+- [#74716](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/74716) [`e4dcc12c4f8d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e4dcc12c4f8d) - ED-22048 Disable MBE partial selection to fix unwanted extensionFrame deletion.
+- Updated dependencies
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/cjs/context-panel.js

@@ -180,7 +180,6 @@ function _onChangeAction() {
       _ref6,
       positions,
       node,
-      newAttributes,
       newNode,
       positionUpdated,
       transaction,
@@ -238,18 +237,15 @@ function _onChangeAction() {
           return _context3.abrupt("return");
         case 23:
           node = nodeWithPos.node;
-          newAttributes = _objectSpread(_objectSpread({}, node.attrs), {}, {
-            parameters: _objectSpread(_objectSpread(_objectSpread({}, oldParameters), newParameters), {}, {
-              macroParams: _objectSpread(_objectSpread({}, oldParameters === null || oldParameters === void 0 ? void 0 : oldParameters.macroParams), newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams)
-            })
-          });
-          newNode = (0, _actions.buildExtensionNode)(nodeWithPos.node.toJSON().type, editorView.state.schema, newAttributes, node.content, node.marks);
+          newNode = (0, _actions.buildExtensionNode)(nodeWithPos.node.toJSON().type, editorView.state.schema, _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread({}, oldParameters), newParameters)
+          }), node.content, node.marks);
           if (newNode) {
-            _context3.next = 28;
+            _context3.next = 27;
             break;
           }
           return _context3.abrupt("return");
-        case 28:
+        case 27:
           positionUpdated = positions[key];
           transaction = editorView.state.tr.replaceWith(positionUpdated, positionUpdated + newNode.nodeSize, newNode); // Ensure we preserve the selection, tr.replaceWith causes it to be lost in some cases
           // when replacing the node
@@ -262,13 +258,13 @@ function _onChangeAction() {
           }
           positionsLess = _objectSpread({}, (0, _main.getPluginState)(editorView.state).positions);
           delete positionsLess[key];
-          _context3.next = 36;
+          _context3.next = 35;
           return (0, _commands.updateState)({
             positions: positionsLess
           })(editorView.state, editorView.dispatch);
-        case 36:
+        case 35:
           editorView.dispatch(transaction);
-        case 37:
+        case 36:
         case "end":
           return _context3.stop();
       }

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

@@ -32,6 +32,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection2 = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var _pluginFactory = require("../plugin-factory");
 var _pluginKey = require("../plugin-key");
@@ -298,6 +299,32 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
         inlineExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
         multiBodiedExtension: (0, _extensibility.ExtensionNodeView)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
+      createSelectionBetween: function createSelectionBetween(view, anchor, head) {
+        if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.multi-bodied-extension_0rygg')) {
+          return null;
+        }
+        var _view$state3 = view.state,
+          schema = _view$state3.schema,
+          doc = _view$state3.doc;
+        var multiBodiedExtension = schema.nodes.multiBodiedExtension;
+        var isAnchorInMBE = (0, _utils.findParentNodeOfTypeClosestToPos)(anchor, multiBodiedExtension);
+        var isHeadInMBE = (0, _utils.findParentNodeOfTypeClosestToPos)(head, multiBodiedExtension);
+        if (isAnchorInMBE !== undefined && isHeadInMBE === undefined) {
+          // Anchor is in MBE, where user started selecting within MBE and then moved outside
+          var newSelection = _state.TextSelection.create(doc, isAnchorInMBE.pos < head.pos ? isAnchorInMBE.pos : isAnchorInMBE.pos + isAnchorInMBE.node.nodeSize,
+          // isAnchorInMBE.pos < head.pos represents downwards selection
+          head.pos);
+          return newSelection;
+        }
+        if (isAnchorInMBE === undefined && isHeadInMBE !== undefined) {
+          // Head is in MBE, where user started selecting outside MBE and then moved inside
+          var _newSelection3 = _state.TextSelection.create(doc, anchor.pos, isHeadInMBE.pos < anchor.pos ? isHeadInMBE.pos : isHeadInMBE.pos + isHeadInMBE.node.nodeSize // isHeadInMBE.pos < anchor.pos represents upwards selection
+          );
+
+          return _newSelection3;
+        }
+        return null;
+      },
       handleClickOn: (0, _selection2.createSelectionClickHandler)(['extension', 'bodiedExtension', 'multiBodiedExtension'], function (target) {
         return !target.closest('.extension-content');
       }, {

package/dist/es2019/context-panel.js

@@ -152,18 +152,13 @@ export async function onChangeAction(editorView, updatedParameters = {}, oldPara
   const {
     node
   } = nodeWithPos;
-  const newAttributes = {
+  const newNode = buildExtensionNode(nodeWithPos.node.toJSON().type, editorView.state.schema, {
     ...node.attrs,
     parameters: {
       ...oldParameters,
-      ...newParameters,
-      macroParams: {
-        ...(oldParameters === null || oldParameters === void 0 ? void 0 : oldParameters.macroParams),
-        ...(newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams)
-      }
+      ...newParameters
     }
-  };
-  const newNode = buildExtensionNode(nodeWithPos.node.toJSON().type, editorView.state.schema, newAttributes, node.content, node.marks);
+  }, node.content, node.marks);
   if (!newNode) {
     return;
   }

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

@@ -3,6 +3,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler, GapCursorSelection, isSelectionAtEndOfNode, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { clearEditingContext, updateState } from '../commands';
 import { createCommand, createPluginState, getPluginState } from '../plugin-factory';
 import { pluginKey } from '../plugin-key';
@@ -234,6 +235,35 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
         inlineExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
         multiBodiedExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
+      createSelectionBetween: function (view, anchor, head) {
+        if (!getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
+          return null;
+        }
+        const {
+          schema,
+          doc
+        } = view.state;
+        const {
+          multiBodiedExtension
+        } = schema.nodes;
+        const isAnchorInMBE = findParentNodeOfTypeClosestToPos(anchor, multiBodiedExtension);
+        const isHeadInMBE = findParentNodeOfTypeClosestToPos(head, multiBodiedExtension);
+        if (isAnchorInMBE !== undefined && isHeadInMBE === undefined) {
+          // Anchor is in MBE, where user started selecting within MBE and then moved outside
+          const newSelection = TextSelection.create(doc, isAnchorInMBE.pos < head.pos ? isAnchorInMBE.pos : isAnchorInMBE.pos + isAnchorInMBE.node.nodeSize,
+          // isAnchorInMBE.pos < head.pos represents downwards selection
+          head.pos);
+          return newSelection;
+        }
+        if (isAnchorInMBE === undefined && isHeadInMBE !== undefined) {
+          // Head is in MBE, where user started selecting outside MBE and then moved inside
+          const newSelection = TextSelection.create(doc, anchor.pos, isHeadInMBE.pos < anchor.pos ? isHeadInMBE.pos : isHeadInMBE.pos + isHeadInMBE.node.nodeSize // isHeadInMBE.pos < anchor.pos represents upwards selection
+          );
+
+          return newSelection;
+        }
+        return null;
+      },
       handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], target => !target.closest('.extension-content'), {
         useLongPressSelection
       })

package/dist/esm/context-panel.js

@@ -173,7 +173,6 @@ function _onChangeAction() {
       _ref6,
       positions,
       node,
-      newAttributes,
       newNode,
       positionUpdated,
       transaction,
@@ -231,18 +230,15 @@ function _onChangeAction() {
           return _context3.abrupt("return");
         case 23:
           node = nodeWithPos.node;
-          newAttributes = _objectSpread(_objectSpread({}, node.attrs), {}, {
-            parameters: _objectSpread(_objectSpread(_objectSpread({}, oldParameters), newParameters), {}, {
-              macroParams: _objectSpread(_objectSpread({}, oldParameters === null || oldParameters === void 0 ? void 0 : oldParameters.macroParams), newParameters === null || newParameters === void 0 ? void 0 : newParameters.macroParams)
-            })
-          });
-          newNode = buildExtensionNode(nodeWithPos.node.toJSON().type, editorView.state.schema, newAttributes, node.content, node.marks);
+          newNode = buildExtensionNode(nodeWithPos.node.toJSON().type, editorView.state.schema, _objectSpread(_objectSpread({}, node.attrs), {}, {
+            parameters: _objectSpread(_objectSpread({}, oldParameters), newParameters)
+          }), node.content, node.marks);
           if (newNode) {
-            _context3.next = 28;
+            _context3.next = 27;
             break;
           }
           return _context3.abrupt("return");
-        case 28:
+        case 27:
           positionUpdated = positions[key];
           transaction = editorView.state.tr.replaceWith(positionUpdated, positionUpdated + newNode.nodeSize, newNode); // Ensure we preserve the selection, tr.replaceWith causes it to be lost in some cases
           // when replacing the node
@@ -255,13 +251,13 @@ function _onChangeAction() {
           }
           positionsLess = _objectSpread({}, getPluginState(editorView.state).positions);
           delete positionsLess[key];
-          _context3.next = 36;
+          _context3.next = 35;
           return updateState({
             positions: positionsLess
           })(editorView.state, editorView.dispatch);
-        case 36:
+        case 35:
           editorView.dispatch(transaction);
-        case 37:
+        case 36:
         case "end":
           return _context3.stop();
       }

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

@@ -6,6 +6,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler, GapCursorSelection, isSelectionAtEndOfNode, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { clearEditingContext, updateState } from '../commands';
 import { createCommand, createPluginState, getPluginState } from '../plugin-factory';
 import { pluginKey } from '../plugin-key';
@@ -272,6 +273,32 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         inlineExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi),
         multiBodiedExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
+      createSelectionBetween: function createSelectionBetween(view, anchor, head) {
+        if (!getBooleanFF('platform.editor.multi-bodied-extension_0rygg')) {
+          return null;
+        }
+        var _view$state3 = view.state,
+          schema = _view$state3.schema,
+          doc = _view$state3.doc;
+        var multiBodiedExtension = schema.nodes.multiBodiedExtension;
+        var isAnchorInMBE = findParentNodeOfTypeClosestToPos(anchor, multiBodiedExtension);
+        var isHeadInMBE = findParentNodeOfTypeClosestToPos(head, multiBodiedExtension);
+        if (isAnchorInMBE !== undefined && isHeadInMBE === undefined) {
+          // Anchor is in MBE, where user started selecting within MBE and then moved outside
+          var newSelection = TextSelection.create(doc, isAnchorInMBE.pos < head.pos ? isAnchorInMBE.pos : isAnchorInMBE.pos + isAnchorInMBE.node.nodeSize,
+          // isAnchorInMBE.pos < head.pos represents downwards selection
+          head.pos);
+          return newSelection;
+        }
+        if (isAnchorInMBE === undefined && isHeadInMBE !== undefined) {
+          // Head is in MBE, where user started selecting outside MBE and then moved inside
+          var _newSelection3 = TextSelection.create(doc, anchor.pos, isHeadInMBE.pos < anchor.pos ? isHeadInMBE.pos : isHeadInMBE.pos + isHeadInMBE.node.nodeSize // isHeadInMBE.pos < anchor.pos represents upwards selection
+          );
+
+          return _newSelection3;
+        }
+        return null;
+      },
       handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension', 'multiBodiedExtension'], function (target) {
         return !target.closest('.extension-content');
       }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-extension",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "editor-plugin-extension plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -27,11 +27,11 @@
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/adf-utils": "^19.0.0",
     "@atlaskit/analytics-next": "^9.2.0",
-    "@atlaskit/avatar": "^21.4.0",
+    "@atlaskit/avatar": "^21.5.0",
     "@atlaskit/button": "^17.4.0",
     "@atlaskit/checkbox": "^13.0.0",
     "@atlaskit/datetime-picker": "^13.0.3",
-    "@atlaskit/editor-common": "^78.1.0",
+    "@atlaskit/editor-common": "^78.4.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-context-identifier": "^1.0.0",
@@ -44,20 +44,20 @@
     "@atlaskit/editor-tables": "^2.5.0",
     "@atlaskit/empty-state": "^7.7.0",
     "@atlaskit/form": "^9.0.3",
-    "@atlaskit/icon": "^22.0.0",
+    "@atlaskit/icon": "^22.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^2.0.0",
+    "@atlaskit/primitives": "^2.1.0",
     "@atlaskit/radio": "^6.0.0",
     "@atlaskit/section-message": "^6.4.0",
     "@atlaskit/select": "^17.1.0",
-    "@atlaskit/smart-user-picker": "^6.7.0",
+    "@atlaskit/smart-user-picker": "^6.8.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/tabs": "^14.0.0",
     "@atlaskit/textarea": "^5.0.0",
     "@atlaskit/textfield": "^6.0.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/toggle": "^13.0.0",
-    "@atlaskit/tokens": "^1.37.0",
+    "@atlaskit/tokens": "^1.38.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",