@atlaskit/editor-plugin-extension 2.0.8 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-extension
 
+## 2.1.0
+
+### Minor Changes
+
+- [#181279](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181279)
+  [`2b71646184e76`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2b71646184e76) -
+  [ux] Sends in new parameter from Confluence to editor to hide default border around 1P bodied
+  extensions in live pages if the parameter is true
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.0.9
+
+### Patch Changes
+
+- [#179199](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179199)
+  [`cceabd041774c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cceabd041774c) -
+  ED-25810: refactor extension plugin to editor standards
+
 ## 2.0.8
 
 ### Patch Changes

package/dist/cjs/{actions.js → editor-actions/actions.js}

@@ -18,9 +18,9 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _transforms = require("@atlaskit/editor-common/transforms");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _extensionApi = require("./extension-api");
-var _main = require("./pm-plugins/main");
-var _utils2 = require("./utils");
+var _extensionApi = require("../pm-plugins/extension-api");
+var _main = require("../pm-plugins/main");
+var _utils2 = require("../pm-plugins/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var buildExtensionNode = exports.buildExtensionNode = function buildExtensionNode(type, schema, attrs, content, marks) {

package/dist/cjs/{commands.js → editor-commands/commands.js}

@@ -13,8 +13,8 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _pluginFactory = require("./plugin-factory");
-var _utils3 = require("./utils");
+var _pluginFactory = require("../pm-plugins/plugin-factory");
+var _utils3 = require("../pm-plugins/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // AFP-2532 TODO: Fix automatic suppressions below

package/dist/cjs/{plugin.js → extensionPlugin.js}

@@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.extensionPlugin = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _actions = require("./actions");
-var _commands = require("./commands");
-var _contextPanel = require("./context-panel");
-var _extensionApi = require("./extension-api");
+var _actions = require("./editor-actions/actions");
+var _commands = require("./editor-commands/commands");
+var _extensionApi = require("./pm-plugins/extension-api");
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _macro = require("./pm-plugins/macro");
 var _actions2 = require("./pm-plugins/macro/actions");
 var _main = require("./pm-plugins/main");
+var _bodiedExtension = require("./pm-plugins/toDOM-fixes/bodiedExtension");
+var _toolbar = require("./pm-plugins/toolbar");
 var _uniqueId = require("./pm-plugins/unique-id");
-var _bodiedExtension = require("./toDOM-fixes/bodiedExtension");
-var _toolbar = require("./toolbar");
+var _contextPanel = require("./ui/context-panel");
 var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
   var _api$featureFlags, _api$analytics2, _api$analytics3, _api$contextPanel3, _api$decorations, _api$contextPanel4, _api$analytics4;
   var _ref$config = _ref.config,

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "extensionPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.extensionPlugin;
+    return _extensionPlugin.extensionPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _extensionPlugin = require("./extensionPlugin");

package/dist/cjs/{extension-api.js → pm-plugins/extension-api.js}

@@ -14,9 +14,9 @@ var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _commands = require("./commands");
-var _actions = require("./pm-plugins/macro/actions");
-var _pluginKey = require("./pm-plugins/macro/plugin-key");
+var _commands = require("../editor-commands/commands");
+var _actions = require("./macro/actions");
+var _pluginKey = require("./macro/plugin-key");
 var _utils3 = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = keymapPlugin;
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _commands = require("../commands");
+var _commands = require("../editor-commands/commands");
 var _main = require("./main");
 function keymapPlugin(applyChange) {
   var list = {};

package/dist/cjs/pm-plugins/macro/actions.js

@@ -14,7 +14,7 @@ var _insert = require("@atlaskit/editor-common/insert");
 var _validator = require("@atlaskit/editor-common/validator");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _pluginFactory = require("../../plugin-factory");
+var _pluginFactory = require("../plugin-factory");
 var _pluginKey = require("./plugin-key");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }

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

@@ -32,12 +32,12 @@ 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 _commands = require("../editor-commands/commands");
 var _lazyExtension = require("../nodeviews/lazyExtension");
-var _pluginFactory = require("../plugin-factory");
-var _pluginKey = require("../plugin-key");
-var _utils2 = require("../utils");
-var _utils3 = require("./utils");
+var _pluginFactory = require("./plugin-factory");
+var _pluginKey = require("./plugin-key");
+var _updateEditButton = require("./update-edit-button");
+var _utils2 = require("./utils");
 var shouldShowEditButton = function shouldShowEditButton(extensionHandler, extensionProvider) {
   var usesLegacyMacroBrowser = !extensionHandler && !extensionProvider || typeof extensionHandler === 'function';
   var usesModernUpdateMethod = (0, _typeof2.default)(extensionHandler) === 'object' && typeof extensionHandler.update === 'function';
@@ -63,7 +63,7 @@ var getUpdateExtensionPromise = /*#__PURE__*/function () {
             break;
           }
           _context.next = 7;
-          return (0, _utils3.updateEditButton)(view, extensionProvider);
+          return (0, _updateEditButton.updateEditButton)(view, extensionProvider);
         case 7:
           updateMethod = _context.sent;
           if (!updateMethod) {
@@ -103,7 +103,7 @@ var createExtensionProviderHandler = exports.createExtensionProviderHandler = fu
               extensionProvider: extensionProvider
             })(view.state, view.dispatch);
             _context2.next = 8;
-            return (0, _utils3.updateEditButton)(view, extensionProvider);
+            return (0, _updateEditButton.updateEditButton)(view, extensionProvider);
           case 8:
             _context2.next = 13;
             break;
@@ -236,7 +236,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
             var source = event.target;
 
             // If the focus is going from outside to inside an area designated as an editable area of an extension, then the extension selection is reset.
-            if (currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
+            if (!!currentTarget.closest('.extension-editable-area') !== !!source.closest('.extension-editable-area')) {
               var emptySelection = new _state.TextSelection(view.state.doc.resolve(0));
               var tr = view.state.tr.setSelection(emptySelection);
               view.dispatch(tr);
@@ -316,7 +316,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
         // WARNING: referentiality-plugin also creates these nodeviews
         extension: (0, _lazyExtension.lazyExtensionNodeView)('extension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags),
         // WARNING: referentiality-plugin also creates these nodeviews
-        bodiedExtension: (0, _lazyExtension.lazyExtensionNodeView)('bodiedExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.rendererExtensionHandlers),
+        bodiedExtension: (0, _lazyExtension.lazyExtensionNodeView)('bodiedExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.showUpdated1PBodiedExtensionUI, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.rendererExtensionHandlers),
         // WARNING: referentiality-plugin also creates these nodeviews
         inlineExtension: (0, _lazyExtension.lazyExtensionNodeView)('inlineExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags),
         multiBodiedExtension: (0, _lazyExtension.lazyExtensionNodeView)('multiBodiedExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags)

package/dist/cjs/{toolbar.js → pm-plugins/toolbar.js}

@@ -22,10 +22,10 @@ var _mediaFullWidth = _interopRequireDefault(require("@atlaskit/icon/glyph/edito
 var _mediaWide = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/media-wide"));
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _actions = require("./actions");
-var _commands = require("./commands");
-var _pluginKey = require("./pm-plugins/macro/plugin-key");
-var _main = require("./pm-plugins/main");
+var _actions = require("../editor-actions/actions");
+var _commands = require("../editor-commands/commands");
+var _pluginKey = require("./macro/plugin-key");
+var _main = require("./main");
 var _utils3 = require("./utils");
 var isLayoutSupported = function isLayoutSupported(state, selectedExtNode) {
   var _state$schema$nodes = state.schema.nodes,

package/dist/cjs/pm-plugins/update-edit-button.js

@@ -0,0 +1,75 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateEditButton = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _extensions = require("@atlaskit/editor-common/extensions");
+var _commands = require("../editor-commands/commands");
+var _utils = require("./utils");
+var maybeGetUpdateMethodFromExtensionProvider = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(view, extensionProvider) {
+    var nodeWithPos, _nodeWithPos$node$att, extensionType, extensionKey, extensionModuleNode, newNodeWithPos;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          nodeWithPos = (0, _utils.getSelectedExtension)(view.state, true);
+          if (nodeWithPos) {
+            _context.next = 3;
+            break;
+          }
+          throw new Error('There is no selection');
+        case 3:
+          _nodeWithPos$node$att = nodeWithPos.node.attrs, extensionType = _nodeWithPos$node$att.extensionType, extensionKey = _nodeWithPos$node$att.extensionKey;
+          _context.next = 6;
+          return (0, _extensions.getExtensionModuleNode)(extensionProvider, extensionType, extensionKey);
+        case 6:
+          extensionModuleNode = _context.sent;
+          newNodeWithPos = (0, _utils.getSelectedExtension)(view.state, true);
+          if (!(newNodeWithPos && newNodeWithPos.node.attrs.extensionType === extensionType && newNodeWithPos.node.attrs.extensionKey === extensionKey && newNodeWithPos.pos === nodeWithPos.pos && extensionModuleNode)) {
+            _context.next = 10;
+            break;
+          }
+          return _context.abrupt("return", extensionModuleNode.update);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function maybeGetUpdateMethodFromExtensionProvider(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var updateEditButton = exports.updateEditButton = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(view, extensionProvider) {
+    var updateMethod;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return maybeGetUpdateMethodFromExtensionProvider(view, extensionProvider);
+        case 3:
+          updateMethod = _context2.sent;
+          (0, _commands.updateState)({
+            showEditButton: !!updateMethod,
+            updateExtension: updateMethod && Promise.resolve(updateMethod) || undefined
+          })(view.state, view.dispatch);
+          return _context2.abrupt("return", updateMethod);
+        case 8:
+          _context2.prev = 8;
+          _context2.t0 = _context2["catch"](0);
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 8]]);
+  }));
+  return function updateEditButton(_x3, _x4) {
+    return _ref2.apply(this, arguments);
+  };
+}();

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

@@ -1,75 +1,73 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateEditButton = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _extensions = require("@atlaskit/editor-common/extensions");
-var _commands = require("../commands");
-var _utils = require("../utils");
-var maybeGetUpdateMethodFromExtensionProvider = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(view, extensionProvider) {
-    var nodeWithPos, _nodeWithPos$node$att, extensionType, extensionKey, extensionModuleNode, newNodeWithPos;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          nodeWithPos = (0, _utils.getSelectedExtension)(view.state, true);
-          if (nodeWithPos) {
-            _context.next = 3;
-            break;
-          }
-          throw new Error('There is no selection');
-        case 3:
-          _nodeWithPos$node$att = nodeWithPos.node.attrs, extensionType = _nodeWithPos$node$att.extensionType, extensionKey = _nodeWithPos$node$att.extensionKey;
-          _context.next = 6;
-          return (0, _extensions.getExtensionModuleNode)(extensionProvider, extensionType, extensionKey);
-        case 6:
-          extensionModuleNode = _context.sent;
-          newNodeWithPos = (0, _utils.getSelectedExtension)(view.state, true);
-          if (!(newNodeWithPos && newNodeWithPos.node.attrs.extensionType === extensionType && newNodeWithPos.node.attrs.extensionKey === extensionKey && newNodeWithPos.pos === nodeWithPos.pos && extensionModuleNode)) {
-            _context.next = 10;
-            break;
-          }
-          return _context.abrupt("return", extensionModuleNode.update);
-        case 10:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function maybeGetUpdateMethodFromExtensionProvider(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var updateEditButton = exports.updateEditButton = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(view, extensionProvider) {
-    var updateMethod;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.prev = 0;
-          _context2.next = 3;
-          return maybeGetUpdateMethodFromExtensionProvider(view, extensionProvider);
-        case 3:
-          updateMethod = _context2.sent;
-          (0, _commands.updateState)({
-            showEditButton: !!updateMethod,
-            updateExtension: updateMethod && Promise.resolve(updateMethod) || undefined
-          })(view.state, view.dispatch);
-          return _context2.abrupt("return", updateMethod);
-        case 8:
-          _context2.prev = 8;
-          _context2.t0 = _context2["catch"](0);
-        case 10:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2, null, [[0, 8]]);
-  }));
-  return function updateEditButton(_x3, _x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
+exports.getSelectedExtension = exports.getSelectedDomElement = exports.getNodeTypesReferenced = exports.getDataConsumerMark = exports.findNodePosWithLocalId = exports.findExtensionWithLocalId = void 0;
+var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var getSelectedExtension = exports.getSelectedExtension = function getSelectedExtension(state) {
+  var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var _state$schema$nodes = state.schema.nodes,
+    inlineExtension = _state$schema$nodes.inlineExtension,
+    extension = _state$schema$nodes.extension,
+    bodiedExtension = _state$schema$nodes.bodiedExtension,
+    multiBodiedExtension = _state$schema$nodes.multiBodiedExtension;
+  var nodeTypes = [extension, bodiedExtension, inlineExtension, multiBodiedExtension];
+  return (0, _utils2.findSelectedNodeOfType)(nodeTypes)(state.selection) || searchParent && (0, _utils2.findParentNodeOfType)(nodeTypes)(state.selection) || undefined;
+};
+var findExtensionWithLocalId = exports.findExtensionWithLocalId = function findExtensionWithLocalId(state, localId) {
+  var selectedExtension = getSelectedExtension(state, true);
+  if (!localId) {
+    return selectedExtension;
+  }
+  if (selectedExtension && selectedExtension.node.attrs.localId === localId) {
+    return selectedExtension;
+  }
+  var _state$schema$nodes2 = state.schema.nodes,
+    inlineExtension = _state$schema$nodes2.inlineExtension,
+    extension = _state$schema$nodes2.extension,
+    bodiedExtension = _state$schema$nodes2.bodiedExtension,
+    multiBodiedExtension = _state$schema$nodes2.multiBodiedExtension;
+  var nodeTypes = [extension, bodiedExtension, inlineExtension, multiBodiedExtension];
+  var matched;
+  state.doc.descendants(function (node, pos) {
+    if (nodeTypes.includes(node.type) && node.attrs.localId === localId) {
+      matched = {
+        node: node,
+        pos: pos
+      };
+    }
+  });
+  return matched;
+};
+var getSelectedDomElement = exports.getSelectedDomElement = function getSelectedDomElement(schema, domAtPos, selectedExtensionNode) {
+  var selectedExtensionDomNode = (0, _utils2.findDomRefAtPos)(selectedExtensionNode.pos, domAtPos);
+  var isContentExtension = selectedExtensionNode.node.type !== schema.nodes.bodiedExtension;
+  return (
+    // Content extension can be nested in bodied-extension, the following check is necessary for that case
+    (isContentExtension ?
+    // Search down
+    selectedExtensionDomNode.querySelector('.extension-container') :
+    // Try searching up and then down
+    (0, _utils.closestElement)(selectedExtensionDomNode, '.extension-container') || selectedExtensionDomNode.querySelector('.extension-container')) || selectedExtensionDomNode
+  );
+};
+var getDataConsumerMark = exports.getDataConsumerMark = function getDataConsumerMark(newNode) {
+  var _newNode$marks;
+  return (_newNode$marks = newNode.marks) === null || _newNode$marks === void 0 ? void 0 : _newNode$marks.find(function (mark) {
+    return mark.type.name === 'dataConsumer';
+  });
+};
+var getNodeTypesReferenced = exports.getNodeTypesReferenced = function getNodeTypesReferenced(ids, state) {
+  return (0, _utils.findNodePosByLocalIds)(state, ids, {
+    includeDocNode: true
+  }).map(function (_ref) {
+    var node = _ref.node;
+    return node.type.name;
+  });
+};
+var findNodePosWithLocalId = exports.findNodePosWithLocalId = function findNodePosWithLocalId(state, localId) {
+  var nodes = (0, _utils.findNodePosByLocalIds)(state, [localId]);
+  return nodes.length >= 1 ? nodes[0] : undefined;
+};

package/dist/cjs/{context-panel.js → ui/context-panel.js}

@@ -16,12 +16,12 @@ var _extensions = require("@atlaskit/editor-common/extensions");
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
-var _actions = require("./actions");
-var _commands = require("./commands");
-var _main = require("./pm-plugins/main");
-var _ConfigPanelLoader = _interopRequireDefault(require("./ui/ConfigPanel/ConfigPanelLoader"));
-var _SaveIndicator = require("./ui/SaveIndicator/SaveIndicator");
-var _utils = require("./utils");
+var _actions = require("../editor-actions/actions");
+var _commands = require("../editor-commands/commands");
+var _main = require("../pm-plugins/main");
+var _utils = require("../pm-plugins/utils");
+var _ConfigPanelLoader = _interopRequireDefault(require("./ConfigPanel/ConfigPanelLoader"));
+var _SaveIndicator = require("./SaveIndicator/SaveIndicator");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var areParametersEqual = function areParametersEqual(firstParameters, secondParameters) {

package/dist/es2019/{actions.js → editor-actions/actions.js}

@@ -2,9 +2,9 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TARGET_SELECTION_SOUR
 export { transformSliceToRemoveOpenBodiedExtension } from '@atlaskit/editor-common/transforms';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, replaceParentNodeOfType, replaceSelectedNode } from '@atlaskit/editor-prosemirror/utils';
-import { createExtensionAPI, getEditInLegacyMacroBrowser } from './extension-api';
-import { getPluginState } from './pm-plugins/main';
-import { findExtensionWithLocalId } from './utils';
+import { createExtensionAPI, getEditInLegacyMacroBrowser } from '../pm-plugins/extension-api';
+import { getPluginState } from '../pm-plugins/main';
+import { findExtensionWithLocalId } from '../pm-plugins/utils';
 export const buildExtensionNode = (type, schema, attrs, content, marks) => {
   switch (type) {
     case 'extension':

package/dist/es2019/{commands.js → editor-commands/commands.js}

@@ -2,8 +2,8 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, TARGET_SELECTION
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
-import { createCommand } from './plugin-factory';
-import { getSelectedExtension } from './utils';
+import { createCommand } from '../pm-plugins/plugin-factory';
+import { getSelectedExtension } from '../pm-plugins/utils';
 
 // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points

package/dist/es2019/{plugin.js → extensionPlugin.js}

@@ -1,16 +1,16 @@
 import { extension, extensionFrame, inlineExtension, multiBodiedExtension } from '@atlaskit/adf-schema';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createEditSelectedExtensionAction, insertOrReplaceBodiedExtension, insertOrReplaceExtension } from './actions';
-import { forceAutoSave } from './commands';
-import { getContextPanel } from './context-panel';
-import { createExtensionAPI } from './extension-api';
+import { createEditSelectedExtensionAction, insertOrReplaceBodiedExtension, insertOrReplaceExtension } from './editor-actions/actions';
+import { forceAutoSave } from './editor-commands/commands';
+import { createExtensionAPI } from './pm-plugins/extension-api';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin as createMacroPlugin } from './pm-plugins/macro';
 import { insertMacroFromMacroBrowser, runMacroAutoConvert } from './pm-plugins/macro/actions';
 import { createPlugin, pluginKey } from './pm-plugins/main';
+import { bodiedExtensionSpecWithFixedToDOM } from './pm-plugins/toDOM-fixes/bodiedExtension';
+import { getToolbarConfig } from './pm-plugins/toolbar';
 import { createPlugin as createUniqueIdPlugin } from './pm-plugins/unique-id';
-import { bodiedExtensionSpecWithFixedToDOM } from './toDOM-fixes/bodiedExtension';
-import { getToolbarConfig } from './toolbar';
+import { getContextPanel } from './ui/context-panel';
 export const extensionPlugin = ({
   config: options = {},
   api

package/dist/es2019/index.js

@@ -1,4 +1,4 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 // Entry file in package.json
 
-export { extensionPlugin } from './plugin';
+export { extensionPlugin } from './extensionPlugin';

package/dist/es2019/{extension-api.js → pm-plugins/extension-api.js}

@@ -5,9 +5,9 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { setEditingContextToContextPanel } from './commands';
-import { insertMacroFromMacroBrowser } from './pm-plugins/macro/actions';
-import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
+import { setEditingContextToContextPanel } from '../editor-commands/commands';
+import { insertMacroFromMacroBrowser } from './macro/actions';
+import { pluginKey as macroPluginKey } from './macro/plugin-key';
 import { findNodePosWithLocalId, getDataConsumerMark, getNodeTypesReferenced, getSelectedExtension } from './utils';
 export const getEditInLegacyMacroBrowser = ({
   view,

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

@@ -1,6 +1,6 @@
 import { bindKeymapWithCommand, escape } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { clearEditingContext } from '../commands';
+import { clearEditingContext } from '../editor-commands/commands';
 import { getPluginState } from './main';
 export default function keymapPlugin(applyChange) {
   const list = {};

package/dist/es2019/pm-plugins/macro/actions.js

@@ -4,7 +4,7 @@ import { normaliseNestedLayout } from '@atlaskit/editor-common/insert';
 import { getValidNode } from '@atlaskit/editor-common/validator';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, replaceParentNodeOfType, replaceSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { getPluginState as getExtensionPluginState } from '../../plugin-factory';
+import { getPluginState as getExtensionPluginState } from '../plugin-factory';
 import { pluginKey } from './plugin-key';
 export const insertMacroFromMacroBrowser = editorAnalyticsAPI => (macroProvider, macroNode, isEditing) => async view => {
   if (!macroProvider) {

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

@@ -3,12 +3,12 @@ import { createSelectionClickHandler, GapCursorSelection, isSelectionAtEndOfNode
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { clearEditingContext, updateState } from '../commands';
+import { clearEditingContext, updateState } from '../editor-commands/commands';
 import { lazyExtensionNodeView } from '../nodeviews/lazyExtension';
-import { createCommand, createPluginState, getPluginState } from '../plugin-factory';
-import { pluginKey } from '../plugin-key';
-import { getSelectedDomElement, getSelectedExtension } from '../utils';
-import { updateEditButton } from './utils';
+import { createCommand, createPluginState, getPluginState } from './plugin-factory';
+import { pluginKey } from './plugin-key';
+import { updateEditButton } from './update-edit-button';
+import { getSelectedDomElement, getSelectedExtension } from './utils';
 const shouldShowEditButton = (extensionHandler, extensionProvider) => {
   const usesLegacyMacroBrowser = !extensionHandler && !extensionProvider || typeof extensionHandler === 'function';
   const usesModernUpdateMethod = typeof extensionHandler === 'object' && typeof extensionHandler.update === 'function';
@@ -160,7 +160,7 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
             const source = event.target;
 
             // If the focus is going from outside to inside an area designated as an editable area of an extension, then the extension selection is reset.
-            if (currentTarget.closest('.extension-editable-area') && !source.closest('.extension-editable-area')) {
+            if (!!currentTarget.closest('.extension-editable-area') !== !!source.closest('.extension-editable-area')) {
               const emptySelection = new TextSelection(view.state.doc.resolve(0));
               const tr = view.state.tr.setSelection(emptySelection);
               view.dispatch(tr);
@@ -249,7 +249,7 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
         // WARNING: referentiality-plugin also creates these nodeviews
         extension: lazyExtensionNodeView('extension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags),
         // WARNING: referentiality-plugin also creates these nodeviews
-        bodiedExtension: lazyExtensionNodeView('bodiedExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.rendererExtensionHandlers),
+        bodiedExtension: lazyExtensionNodeView('bodiedExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.showUpdated1PBodiedExtensionUI, __rendererExtensionOptions === null || __rendererExtensionOptions === void 0 ? void 0 : __rendererExtensionOptions.rendererExtensionHandlers),
         // WARNING: referentiality-plugin also creates these nodeviews
         inlineExtension: lazyExtensionNodeView('inlineExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags),
         multiBodiedExtension: lazyExtensionNodeView('multiBodiedExtension', portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags)

package/dist/es2019/{toolbar.js → pm-plugins/toolbar.js}

@@ -14,10 +14,10 @@ import FullWidthIcon from '@atlaskit/icon/glyph/editor/media-full-width';
 import WideIcon from '@atlaskit/icon/glyph/editor/media-wide';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editExtension } from './actions';
-import { removeDescendantNodes, removeExtension, updateExtensionLayout } from './commands';
-import { pluginKey as macroPluginKey } from './pm-plugins/macro/plugin-key';
-import { getPluginState } from './pm-plugins/main';
+import { editExtension } from '../editor-actions/actions';
+import { removeDescendantNodes, removeExtension, updateExtensionLayout } from '../editor-commands/commands';
+import { pluginKey as macroPluginKey } from './macro/plugin-key';
+import { getPluginState } from './main';
 import { getSelectedExtension } from './utils';
 const isLayoutSupported = (state, selectedExtNode) => {
   const {