@atlaskit/editor-core 181.0.0 → 182.0.0

package/dist/cjs/plugins/expand/index.js

@@ -24,7 +24,10 @@ var _commands = require("./commands");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var expandPlugin = function expandPlugin() {
+  var _api$dependencies, _api$dependencies$fea;
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var api = arguments.length > 1 ? arguments[1] : undefined;
+  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'expand',
     nodes: function nodes() {
@@ -42,7 +45,7 @@ var expandPlugin = function expandPlugin() {
         plugin: function plugin(_ref) {
           var dispatch = _ref.dispatch,
             getIntl = _ref.getIntl;
-          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection);
+          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags);
         }
       }, {
         name: 'expandKeymap',

package/dist/cjs/plugins/expand/nodeviews/index.js

@@ -20,7 +20,6 @@ var _utils = require("../../../utils");
 var _commands = require("../commands");
 var _classNames = require("../ui/class-names");
 var _gapCursorSelection = require("../../../plugins/selection/gap-cursor-selection");
-var _featureFlagsContext = require("../../feature-flags-context");
 var _dom = require("../../../utils/dom");
 var _types = require("../../selection/types");
 var _commands2 = require("../../selection/commands");
@@ -62,7 +61,7 @@ var toDOM = function toDOM(node, intl) {
   }, 0]];
 };
 var ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl, isMobile) {
+  function ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags) {
     var _this = this;
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
@@ -90,9 +89,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     (0, _defineProperty2.default)(this, "isAllowInteractiveExpandEnabled", function () {
-      var state = _this.view.state;
-      var featureFlags = (0, _featureFlagsContext.getFeatureFlags)(state);
-      return featureFlags && !!featureFlags.interactiveExpand;
+      return _this.featureFlags && !!_this.featureFlags.interactiveExpand;
     });
     (0, _defineProperty2.default)(this, "handleClick", function (event) {
       var target = event.target;
@@ -294,6 +291,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
     this.dom = dom;
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
+    this.featureFlags = featureFlags;
     this.icon = this.dom.querySelector(".".concat(_classNames.expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(_classNames.expandClassNames.titleInput));
     this.titleContainer = this.dom.querySelector(".".concat(_classNames.expandClassNames.titleContainer));
@@ -414,8 +412,9 @@ var ExpandNodeView = /*#__PURE__*/function () {
 exports.ExpandNodeView = ExpandNodeView;
 function _default(_ref2) {
   var getIntl = _ref2.getIntl,
-    isMobile = _ref2.isMobile;
+    isMobile = _ref2.isMobile,
+    featureFlags = _ref2.featureFlags;
   return function (node, view, getPos) {
-    return new ExpandNodeView(node, view, getPos, getIntl, isMobile);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags);
   };
 }

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

@@ -21,6 +21,7 @@ function containsClass(element, className) {
 var createPlugin = function createPlugin(dispatch, getIntl) {
   var appearance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'full-page';
   var useLongPressSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var featureFlags = arguments.length > 4 ? arguments[4] : undefined;
   var state = (0, _pluginFactory.createPluginState)(dispatch, {});
   var isMobile = appearance === 'mobile';
   return new _safePlugin.SafePlugin({
@@ -30,11 +31,13 @@ var createPlugin = function createPlugin(dispatch, getIntl) {
       nodeViews: {
         expand: (0, _nodeviews.default)({
           getIntl: getIntl,
-          isMobile: isMobile
+          isMobile: isMobile,
+          featureFlags: featureFlags
         }),
         nestedExpand: (0, _nodeviews.default)({
           getIntl: getIntl,
-          isMobile: isMobile
+          isMobile: isMobile,
+          featureFlags: featureFlags
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {

package/dist/cjs/plugins/extension/extension-api.js

@@ -12,8 +12,9 @@ var _prosemirrorModel = require("prosemirror-model");
 var _prosemirrorState = require("prosemirror-state");
 var _macro = require("../macro");
 var _pluginKey = require("../macro/plugin-key");
+var _utils = require("../../utils");
 var _commands = require("./commands");
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 var _analytics = require("../analytics");
 var _prosemirrorUtils = require("prosemirror-utils");
 var getEditInLegacyMacroBrowser = function getEditInLegacyMacroBrowser(_ref) {
@@ -26,7 +27,7 @@ var getEditInLegacyMacroBrowser = function getEditInLegacyMacroBrowser(_ref) {
     if (!macroProvider) {
       throw new Error("Missing macroProvider. Can't use the macro browser for updates");
     }
-    var nodeWithPos = (0, _utils.getSelectedExtension)(view.state, true);
+    var nodeWithPos = (0, _utils2.getSelectedExtension)(view.state, true);
     if (!nodeWithPos) {
       throw new Error("Missing nodeWithPos. Can't determine position of node");
     }
@@ -46,7 +47,12 @@ var extensionAPICallPayload = function extensionAPICallPayload(functionName) {
   };
 };
 var createExtensionAPI = function createExtensionAPI(options) {
-  var validate = (0, _validator.validator)();
+  var schema = options.editorView.state.schema;
+  var nodes = Object.keys(schema.nodes);
+  var marks = Object.keys(schema.marks);
+  var validate = (0, _validator.validator)(nodes, marks, {
+    allowPrivateAttributes: true
+  });
 
   /**
    * Finds the node and its position by `localId`. Throws if the node could not be found.
@@ -62,7 +68,7 @@ var createExtensionAPI = function createExtensionAPI(options) {
 
     // Find the node + position matching the given ID
     var state = options.editorView.state;
-    var nodePos = (0, _utils.findNodePosWithLocalId)(state, localId);
+    var nodePos = (0, _utils2.findNodePosWithLocalId)(state, localId);
     if (!nodePos) {
       throw new Error("".concat(opName, "(): Could not find node with ID '").concat(localId, "'."));
     }
@@ -121,12 +127,12 @@ var createExtensionAPI = function createExtensionAPI(options) {
         var _node$attrs = node.attrs,
           extensionKey = _node$attrs.extensionKey,
           extensionType = _node$attrs.extensionType;
-        var dataConsumerMark = (0, _utils.getDataConsumerMark)(node);
+        var dataConsumerMark = (0, _utils2.getDataConsumerMark)(node);
         var stringIds = (dataConsumerMark === null || dataConsumerMark === void 0 ? void 0 : dataConsumerMark.attrs.sources.map(function (sourceId) {
           return sourceId;
         })) || [];
         var hasReferentiality = !!dataConsumerMark;
-        var nodeTypesReferenced = hasReferentiality ? (0, _utils.getNodeTypesReferenced)(stringIds, state) : undefined;
+        var nodeTypesReferenced = hasReferentiality ? (0, _utils2.getNodeTypesReferenced)(stringIds, state) : undefined;
 
         // fire off analytics for this ADF
         var payload = {
@@ -179,6 +185,7 @@ var createExtensionAPI = function createExtensionAPI(options) {
       var tr = state.tr,
         schema = state.schema;
       var changedValues = mutationCallback({
+        content: (0, _utils.nodeToJSON)(node).content,
         attrs: node.attrs,
         marks: node.marks.map(function (pmMark) {
           return {
@@ -187,13 +194,12 @@ var createExtensionAPI = function createExtensionAPI(options) {
           };
         })
       });
-      var _state$doc$resolve = state.doc.resolve(pos),
-        parent = _state$doc$resolve.parent;
       var ensureValidMark = function ensureValidMark(mark) {
         if ((0, _typeof2.default)(mark) !== 'object' || Array.isArray(mark)) {
           throw new Error("update(): Invalid mark given.");
         }
-
+        var _state$doc$resolve = state.doc.resolve(pos),
+          parent = _state$doc$resolve.parent;
         // Ensure that the given mark is present in the schema
         var markType = schema.marks[mark.type];
         if (!markType) {
@@ -207,21 +213,28 @@ var createExtensionAPI = function createExtensionAPI(options) {
           attrs: mark.attrs
         };
       };
-      var newMarks = (_changedValues$marks = changedValues.marks) === null || _changedValues$marks === void 0 ? void 0 : _changedValues$marks.map(ensureValidMark).map(function (_ref3) {
+      var newMarks = changedValues.hasOwnProperty('marks') ? (_changedValues$marks = changedValues.marks) === null || _changedValues$marks === void 0 ? void 0 : _changedValues$marks.map(ensureValidMark).map(function (_ref3) {
         var mark = _ref3.mark,
           attrs = _ref3.attrs;
         return mark.create(attrs);
-      });
+      }) : node.marks;
+      var newContent = changedValues.hasOwnProperty('content') ? _prosemirrorModel.Fragment.fromJSON(schema, changedValues.content) : node.content;
+      var newAttrs = changedValues.hasOwnProperty('attrs') ? changedValues.attrs : node.attrs;
 
-      // Validate if the new attributes and marks result in a valid node and adf.
+      // Validate if the new attributes, content and marks result in a valid node and adf.
       try {
-        var newNode = node.type.createChecked(changedValues.attrs, node.content, newMarks);
+        var newNode = node.type.createChecked(newAttrs, newContent, newMarks);
         var newNodeAdf = new _editorJsonTransformer.JSONTransformer().encodeNode(newNode);
         validate(newNodeAdf);
+        tr.replaceWith(pos, pos + node.nodeSize, newNode);
+
+        // Keep selection if content does not change
+        if (newContent === node.content) {
+          tr.setSelection(_prosemirrorState.Selection.fromJSON(tr.doc, state.selection.toJSON()));
+        }
       } catch (err) {
         throw new Error("update(): The given ADFEntity cannot be inserted in the current position.\n".concat(err));
       }
-      tr.setNodeMarkup(pos, undefined, changedValues.attrs, newMarks);
 
       // Analytics - tracking the api call
       var apiCallPayload = extensionAPICallPayload('update');

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

@@ -17,92 +17,24 @@ Object.defineProperty(exports, "getPluginState", {
     return _pluginFactory.getPluginState;
   }
 });
+exports.handleUpdate = void 0;
 Object.defineProperty(exports, "pluginKey", {
   enumerable: true,
   get: function get() {
     return _pluginKey.pluginKey;
   }
 });
-exports.updateEditButton = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _extensions = require("@atlaskit/editor-common/extensions");
 var _utils = require("../../selection/utils");
 var _extension = _interopRequireDefault(require("../nodeviews/extension"));
 var _commands = require("../commands");
 var _utils2 = require("../utils");
 var _pluginFactory = require("../plugin-factory");
 var _pluginKey = require("../plugin-key");
-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, _utils2.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, _utils2.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 = /*#__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.updateEditButton = updateEditButton;
+var _utils3 = 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';
@@ -112,129 +44,191 @@ var shouldShowEditButton = function shouldShowEditButton(extensionHandler, exten
   return false;
 };
 var getUpdateExtensionPromise = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(view, extensionHandler, extensionProvider) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(view, extensionHandler, extensionProvider) {
     var updateMethod;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
+    return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(extensionHandler && (0, _typeof2.default)(extensionHandler) === 'object')) {
-              _context3.next = 4;
+              _context.next = 4;
               break;
             }
-            return _context3.abrupt("return", extensionHandler.update);
+            return _context.abrupt("return", extensionHandler.update);
           case 4:
             if (!extensionProvider) {
-              _context3.next = 10;
+              _context.next = 10;
               break;
             }
-            _context3.next = 7;
-            return updateEditButton(view, extensionProvider);
+            _context.next = 7;
+            return (0, _utils3.updateEditButton)(view, extensionProvider);
           case 7:
-            updateMethod = _context3.sent;
+            updateMethod = _context.sent;
             if (!updateMethod) {
-              _context3.next = 10;
+              _context.next = 10;
               break;
             }
-            return _context3.abrupt("return", updateMethod);
+            return _context.abrupt("return", updateMethod);
           case 10:
             throw new Error('No update method available');
           case 11:
           case "end":
-            return _context3.stop();
+            return _context.stop();
         }
       }
-    }, _callee3);
+    }, _callee);
   }));
-  return function getUpdateExtensionPromise(_x5, _x6, _x7) {
-    return _ref3.apply(this, arguments);
+  return function getUpdateExtensionPromise(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
   };
 }();
 var createExtensionProviderHandler = function createExtensionProviderHandler(view) {
   return /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(name, provider) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(name, provider) {
       var extensionProvider;
-      return _regenerator.default.wrap(function _callee4$(_context4) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               if (!(name === 'extensionProvider' && provider)) {
-                _context4.next = 13;
+                _context2.next = 13;
                 break;
               }
-              _context4.prev = 1;
-              _context4.next = 4;
+              _context2.prev = 1;
+              _context2.next = 4;
               return provider;
             case 4:
-              extensionProvider = _context4.sent;
+              extensionProvider = _context2.sent;
               (0, _commands.updateState)({
                 extensionProvider: extensionProvider
               })(view.state, view.dispatch);
-              _context4.next = 8;
-              return updateEditButton(view, extensionProvider);
+              _context2.next = 8;
+              return (0, _utils3.updateEditButton)(view, extensionProvider);
             case 8:
-              _context4.next = 13;
+              _context2.next = 13;
               break;
             case 10:
-              _context4.prev = 10;
-              _context4.t0 = _context4["catch"](1);
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](1);
               (0, _commands.updateState)({
                 extensionProvider: undefined
               })(view.state, view.dispatch);
             case 13:
             case "end":
-              return _context4.stop();
+              return _context2.stop();
           }
         }
-      }, _callee4, null, [[1, 10]]);
+      }, _callee2, null, [[1, 10]]);
     }));
-    return function (_x8, _x9) {
-      return _ref4.apply(this, arguments);
+    return function (_x4, _x5) {
+      return _ref2.apply(this, arguments);
     };
   }();
 };
 exports.createExtensionProviderHandler = createExtensionProviderHandler;
 var createContextIdentifierProviderHandler = function createContextIdentifierProviderHandler(view) {
   return /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(name, provider) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(name, provider) {
       var contextIdentifierProvider;
-      return _regenerator.default.wrap(function _callee5$(_context5) {
+      return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!(name === 'contextIdentifierProvider' && provider)) {
-                _context5.next = 11;
+                _context3.next = 11;
                 break;
               }
-              _context5.prev = 1;
-              _context5.next = 4;
+              _context3.prev = 1;
+              _context3.next = 4;
               return provider;
             case 4:
-              contextIdentifierProvider = _context5.sent;
+              contextIdentifierProvider = _context3.sent;
               (0, _commands.updateState)({
                 contextIdentifierProvider: contextIdentifierProvider
               })(view.state, view.dispatch);
-              _context5.next = 11;
+              _context3.next = 11;
               break;
             case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](1);
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](1);
               (0, _commands.updateState)({
                 contextIdentifierProvider: undefined
               })(view.state, view.dispatch);
             case 11:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
         }
-      }, _callee5, null, [[1, 8]]);
+      }, _callee3, null, [[1, 8]]);
     }));
-    return function (_x10, _x11) {
-      return _ref5.apply(this, arguments);
+    return function (_x6, _x7) {
+      return _ref3.apply(this, arguments);
     };
   }();
 };
 exports.createContextIdentifierProviderHandler = createContextIdentifierProviderHandler;
+var handleUpdate = function handleUpdate(_ref4) {
+  var view = _ref4.view,
+    prevState = _ref4.prevState,
+    domAtPos = _ref4.domAtPos,
+    extensionHandlers = _ref4.extensionHandlers;
+  var state = view.state,
+    dispatch = view.dispatch;
+  var _getPluginState = (0, _pluginFactory.getPluginState)(state),
+    element = _getPluginState.element,
+    localId = _getPluginState.localId,
+    extensionProvider = _getPluginState.extensionProvider,
+    showContextPanel = _getPluginState.showContextPanel,
+    showEditButton = _getPluginState.showEditButton;
+
+  // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
+  var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
+  if (!selectedExtension) {
+    if (showContextPanel) {
+      (0, _commands.clearEditingContext)(state, dispatch);
+    }
+    return;
+  }
+  var node = selectedExtension.node;
+  var newElement = (0, _utils2.getSelectedDomElement)(state.schema, domAtPos, selectedExtension);
+
+  // In some cases, showEditButton can be stale and the edit button doesn't show - @see ED-15285
+  // To be safe, we update the showEditButton state here
+  var shouldUpdateEditButton = !showEditButton && extensionProvider && element === newElement && !(0, _utils2.getSelectedExtension)(prevState, true);
+  var isNewNodeSelected = node.attrs.localId ? localId !== node.attrs.localId :
+  // This is the current assumption and it's wrong but we are keeping it
+  // as fallback in case we need to turn off `allowLocalIdGeneration`
+  element !== newElement;
+  if (isNewNodeSelected || shouldUpdateEditButton) {
+    if (showContextPanel) {
+      (0, _commands.clearEditingContext)(state, dispatch);
+      return;
+    }
+    var extensionType = node.attrs.extensionType;
+    var extensionHandler = extensionHandlers[extensionType];
+
+    // showEditButton might change async based on results from extension providers
+    var _showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
+    var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {
+      // do nothing;
+    });
+    (0, _commands.updateState)({
+      localId: node.attrs.localId,
+      showContextPanel: false,
+      element: newElement,
+      showEditButton: _showEditButton,
+      updateExtension: updateExtension
+    })(state, dispatch);
+  }
+  // New DOM element doesn't necessarily mean it's a new Node
+  else if (element !== newElement) {
+    (0, _commands.updateState)({
+      element: newElement
+    })(state, dispatch);
+  }
+  return true;
+};
+exports.handleUpdate = handleUpdate;
 var createPlugin = function createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher) {
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
@@ -254,67 +248,13 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
       providerFactory.subscribe('extensionProvider', extensionProviderHandler);
       providerFactory.subscribe('contextIdentificationProvider', contextIdentificationProviderHandler);
       return {
-        update: function update(view) {
-          var state = view.state,
-            dispatch = view.dispatch;
-          var _getPluginState = (0, _pluginFactory.getPluginState)(state),
-            element = _getPluginState.element,
-            localId = _getPluginState.localId,
-            extensionProvider = _getPluginState.extensionProvider,
-            showContextPanel = _getPluginState.showContextPanel;
-
-          // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
-          var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
-          if (!selectedExtension) {
-            if (showContextPanel) {
-              (0, _commands.clearEditingContext)(state, dispatch);
-            }
-
-            // if an extension is no longer selected, but the plugin has cached the previous selected extension id/ref
-            // then this should clear those values so that if an exention is selected again, then this sees it as a change
-            // and updates the state correctly.
-            if (!!localId || !!element) {
-              (0, _commands.updateState)({
-                localId: undefined,
-                element: undefined
-              })(state, dispatch);
-            }
-            return;
-          }
-          var node = selectedExtension.node;
-          var newElement = (0, _utils2.getSelectedDomElement)(state.schema, domAtPos, selectedExtension);
-
-          // New node is selection
-          if (node.attrs.localId ? localId !== node.attrs.localId :
-          // This is the current assumption and it's wrong but we are keeping it
-          // as fallback in case we need to turn off `allowLocalIdGeneration`
-          element !== newElement) {
-            if (showContextPanel) {
-              (0, _commands.clearEditingContext)(state, dispatch);
-            }
-            var extensionType = node.attrs.extensionType;
-            var extensionHandler = extensionHandlers[extensionType];
-
-            // showEditButton might change async based on results from extension providers
-            var showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
-            var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {
-              // do nothing;
-            });
-            (0, _commands.updateState)({
-              localId: node.attrs.localId,
-              showContextPanel: false,
-              element: newElement,
-              showEditButton: showEditButton,
-              updateExtension: updateExtension
-            })(state, dispatch);
-          }
-          // New DOM element doesn't necessarily mean it's a new Node
-          else if (element !== newElement) {
-            (0, _commands.updateState)({
-              element: newElement
-            })(state, dispatch);
-          }
-          return true;
+        update: function update(view, prevState) {
+          handleUpdate({
+            view: view,
+            prevState: prevState,
+            domAtPos: domAtPos,
+            extensionHandlers: extensionHandlers
+          });
         },
         destroy: function destroy() {
           providerFactory.unsubscribe('extensionProvider', extensionProviderHandler);