@atlaskit/editor-core 174.0.0 → 175.0.0

package/dist/cjs/plugins/copy-button/commands.js

@@ -3,7 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resetCopiedState = exports.createToolbarCopyCommand = void 0;
+exports.createToolbarCopyCommandForMark = createToolbarCopyCommandForMark;
+exports.createToolbarCopyCommandForNode = void 0;
+exports.getProvideMarkVisualFeedbackForCopyButtonCommand = getProvideMarkVisualFeedbackForCopyButtonCommand;
+exports.removeMarkVisualFeedbackForCopyButtonCommand = removeMarkVisualFeedbackForCopyButtonCommand;
+exports.resetCopiedState = void 0;
 
 var _pluginKey = require("./pm-plugins/plugin-key");
 
@@ -17,55 +21,145 @@ var _analytics = require("../analytics");
 
 var _main = require("../clipboard/pm-plugins/main");
 
-var createToolbarCopyCommand = function createToolbarCopyCommand(nodeType) {
+function createToolbarCopyCommandForMark(markType) {
+  function command(state, dispatch) {
+    var textNode = state.tr.selection.$head.parent.maybeChild(state.tr.selection.$head.index());
+
+    if (!textNode) {
+      return false;
+    }
+
+    if (dispatch) {
+      // As calling copyHTMLToClipboard causes side effects -- we only run this when
+      // dispatch is provided -- as otherwise the consumer is only testing to see if
+      // the action is availble.
+      var domNode = (0, _utils.toDOM)(textNode, state.schema);
+
+      if (domNode) {
+        var div = document.createElement('div');
+        var p = document.createElement('p');
+        div.appendChild(p);
+        p.appendChild(domNode); // The "1 1" refers to the start and end depth of the slice
+        // since we're copying the text inside a paragraph, it will always be 1 1
+        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+
+        div.firstChild.setAttribute('data-pm-slice', '1 1 []');
+        (0, _clipboard.copyHTMLToClipboard)(div.innerHTML);
+      }
+
+      var copyToClipboardTr = state.tr;
+      copyToClipboardTr.setMeta(_pluginKey.copyButtonPluginKey, {
+        copied: true
+      });
+      var analyticsPayload = (0, _main.getAnalyticsPayload)(state, _analytics.ACTION.COPIED);
+
+      if (analyticsPayload) {
+        analyticsPayload.attributes.inputMethod = _analytics.INPUT_METHOD.FLOATING_TB;
+        analyticsPayload.attributes.markType = markType.name;
+        (0, _analytics.addAnalytics)(state, copyToClipboardTr, analyticsPayload);
+      }
+
+      dispatch(copyToClipboardTr);
+    }
+
+    return true;
+  }
+
+  return command;
+}
+
+function getProvideMarkVisualFeedbackForCopyButtonCommand(markType) {
+  function provideMarkVisualFeedbackForCopyButtonCommand(state, dispatch) {
+    var tr = state.tr;
+    tr.setMeta(_pluginKey.copyButtonPluginKey, {
+      showSelection: true,
+      markType: markType
+    });
+
+    if (dispatch) {
+      dispatch(tr);
+    }
+
+    return true;
+  }
+
+  return provideMarkVisualFeedbackForCopyButtonCommand;
+}
+
+function removeMarkVisualFeedbackForCopyButtonCommand(state, dispatch) {
+  var tr = state.tr;
+  tr.setMeta(_pluginKey.copyButtonPluginKey, {
+    removeSelection: true
+  });
+
+  var copyButtonState = _pluginKey.copyButtonPluginKey.getState(state);
+
+  if (copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied) {
+    tr.setMeta(_pluginKey.copyButtonPluginKey, {
+      copied: false
+    });
+  }
+
+  if (dispatch) {
+    dispatch(tr);
+  }
+
+  return true;
+}
+
+var createToolbarCopyCommandForNode = function createToolbarCopyCommandForNode(nodeType) {
   return function (state, dispatch) {
     var tr = state.tr,
         schema = state.schema; // This command should only be triggered by the Copy button in the floating toolbar
     // which is only visible when selection is inside the target node
 
-    var node = (0, _utils.getSelectedNodeOrNodeParentByNodeType)({
+    var contentNodeWithPos = (0, _utils.getSelectedNodeOrNodeParentByNodeType)({
       nodeType: nodeType,
       selection: tr.selection
     });
 
-    if (!node) {
+    if (!contentNodeWithPos) {
       return false;
     }
 
-    var domNode = (0, _utils.toDOM)(node.node, schema);
-
-    if (domNode) {
-      var div = document.createElement('div');
-      div.appendChild(domNode); // if copying inline content
-
-      if (node.node.type.inlineContent) {
-        // The "1 1" refers to the start and end depth of the slice
-        // since we're copying the text inside a paragraph, it will always be 1 1
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        div.firstChild.setAttribute('data-pm-slice', '1 1 []');
-      } else {
-        // The "0 0" refers to the start and end depth of the slice
-        // since we're copying the block node only, it will always be 0 0
-        // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
-        div.firstChild.setAttribute('data-pm-slice', '0 0 []');
-      }
-
-      (0, _clipboard.copyHTMLToClipboard)(div.innerHTML);
-    }
-
     var copyToClipboardTr = tr;
-    copyToClipboardTr.setMeta(_pluginKey.pluginKey, {
+    copyToClipboardTr.setMeta(_pluginKey.copyButtonPluginKey, {
       copied: true
     });
     var analyticsPayload = (0, _main.getAnalyticsPayload)(state, _analytics.ACTION.COPIED);
 
     if (analyticsPayload) {
       analyticsPayload.attributes.inputMethod = _analytics.INPUT_METHOD.FLOATING_TB;
-      analyticsPayload.attributes.nodeType = node.node.type.name;
+      analyticsPayload.attributes.nodeType = contentNodeWithPos.node.type.name;
       (0, _analytics.addAnalytics)(state, copyToClipboardTr, analyticsPayload);
     }
 
     if (dispatch) {
+      // As calling copyHTMLToClipboard causes side effects -- we only run this when
+      // dispatch is provided -- as otherwise the consumer is only testing to see if
+      // the action is availble.
+      var domNode = (0, _utils.toDOM)(contentNodeWithPos.node, schema);
+
+      if (domNode) {
+        var div = document.createElement('div');
+        div.appendChild(domNode); // if copying inline content
+
+        if (contentNodeWithPos.node.type.inlineContent) {
+          // The "1 1" refers to the start and end depth of the slice
+          // since we're copying the text inside a paragraph, it will always be 1 1
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          div.firstChild.setAttribute('data-pm-slice', '1 1 []');
+        } else {
+          // The "0 0" refers to the start and end depth of the slice
+          // since we're copying the block node only, it will always be 0 0
+          // https://github.com/ProseMirror/prosemirror-view/blob/master/src/clipboard.ts#L32
+          div.firstChild.setAttribute('data-pm-slice', '0 0 []');
+        }
+
+        (0, _clipboard.copyHTMLToClipboard)(div.innerHTML);
+      }
+
+      copyToClipboardTr.setMeta('scrollIntoView', false);
       dispatch(copyToClipboardTr);
     }
 
@@ -73,7 +167,7 @@ var createToolbarCopyCommand = function createToolbarCopyCommand(nodeType) {
   };
 };
 
-exports.createToolbarCopyCommand = createToolbarCopyCommand;
+exports.createToolbarCopyCommandForNode = createToolbarCopyCommandForNode;
 
 var resetCopiedState = function resetCopiedState(nodeType, onMouseLeave) {
   return function (state, dispatch) {
@@ -86,10 +180,10 @@ var resetCopiedState = function resetCopiedState(nodeType, onMouseLeave) {
 
     onMouseLeave ? onMouseLeave(state, customDispatch) : (0, _decoration.hoverDecoration)(nodeType, false)(state, customDispatch);
 
-    var copyButtonState = _pluginKey.pluginKey.getState(state);
+    var copyButtonState = _pluginKey.copyButtonPluginKey.getState(state);
 
     if (copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied) {
-      customTr.setMeta(_pluginKey.pluginKey, {
+      customTr.setMeta(_pluginKey.copyButtonPluginKey, {
         copied: false
       });
     }

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

@@ -8,29 +8,103 @@ exports.default = void 0;
 
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
+var _prosemirrorView = require("prosemirror-view");
+
 var _pluginKey = require("./plugin-key");
 
+function getMarkSelectionDecorationStartAndEnd(_ref) {
+  var markType = _ref.markType,
+      transaction = _ref.transaction;
+  var headHesolvedPos = transaction.selection.$head;
+  var textNodeIndex = transaction.selection.$head.index();
+  var textNode = headHesolvedPos.parent.maybeChild(textNodeIndex);
+  var textNodeOffset = 0;
+  headHesolvedPos.parent.forEach(function (_node, nodeOffset, index) {
+    if (index === textNodeIndex) {
+      textNodeOffset = nodeOffset;
+    }
+  });
+  var start = headHesolvedPos.start(headHesolvedPos.depth) + textNodeOffset;
+  var end = start + textNode.text.length;
+  return {
+    start: start,
+    end: end,
+    markType: markType
+  };
+}
+
 function copyButtonPlugin() {
   return new _safePlugin.SafePlugin({
+    key: _pluginKey.copyButtonPluginKey,
     state: {
       init: function init() {
         return {
-          copied: false
+          copied: false,
+          markSelection: undefined
         };
       },
-      apply: function apply(tr, pluginState) {
-        var meta = tr.getMeta(_pluginKey.pluginKey);
+      apply: function apply(tr, currentPluginState) {
+        var meta = tr.getMeta(_pluginKey.copyButtonPluginKey);
 
         if ((meta === null || meta === void 0 ? void 0 : meta.copied) !== undefined) {
           return {
-            copied: meta.copied
+            copied: meta.copied,
+            markSelection: undefined
           };
         }
 
-        return pluginState;
+        if (meta !== null && meta !== void 0 && meta.showSelection) {
+          return {
+            copied: currentPluginState.copied,
+            markSelection: getMarkSelectionDecorationStartAndEnd({
+              markType: meta.markType,
+              transaction: tr
+            })
+          };
+        }
+
+        if (meta !== null && meta !== void 0 && meta.removeSelection) {
+          return {
+            copied: currentPluginState.copied,
+            markSelection: undefined
+          };
+        }
+
+        if (currentPluginState.markSelection) {
+          return {
+            copied: currentPluginState.copied,
+            markSelection: getMarkSelectionDecorationStartAndEnd({
+              markType: currentPluginState.markSelection.markType,
+              transaction: tr
+            })
+          };
+        }
+
+        return currentPluginState;
       }
     },
-    key: _pluginKey.pluginKey
+    props: {
+      decorations: function decorations(_state) {
+        // Showing visual hints for the hyperlink copy button has been disabled
+        // due to an issue where invalid hyperlink marks cause the floating toolbar
+        // to jump around when the copy button is hovered.
+        // See the following bug for details -- once that is resolved -- the visual
+        // hints can be re enabled.
+        // https://product-fabric.atlassian.net/browse/DTR-722
+        // const copyButtonPluginState = copyButtonPluginKey.getState(
+        //   state,
+        // ) as CopyButtonPluginState;
+        // if (copyButtonPluginState.markSelection) {
+        //   const { start, end } = copyButtonPluginState.markSelection;
+        //   return DecorationSet.create(state.doc, [
+        //     Decoration.inline(start, end, {
+        //       class: 'ProseMirror-fake-text-selection',
+        //     }),
+        //   ]);
+        // }
+        return _prosemirrorView.DecorationSet.empty;
+      }
+    }
   });
 }
 

package/dist/cjs/plugins/copy-button/pm-plugins/plugin-key.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginKey = void 0;
+exports.copyButtonPluginKey = void 0;
 
 var _prosemirrorState = require("prosemirror-state");
 
-var pluginKey = new _prosemirrorState.PluginKey('copyButtonPlugin');
-exports.pluginKey = pluginKey;
+var copyButtonPluginKey = new _prosemirrorState.PluginKey('copyButtonPlugin');
+exports.copyButtonPluginKey = copyButtonPluginKey;

package/dist/cjs/plugins/copy-button/toolbar.js

@@ -5,7 +5,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showCopyButton = exports.getCopyButtonConfig = void 0;
+exports.getCopyButtonConfig = getCopyButtonConfig;
+exports.processCopyButtonItems = processCopyButtonItems;
+exports.showCopyButton = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _copy = _interopRequireDefault(require("@atlaskit/icon/glyph/copy"));
 
@@ -17,35 +21,97 @@ var _commands = require("./commands");
 
 var _pluginKey = require("./pm-plugins/plugin-key");
 
-var getCopyButtonConfig = function getCopyButtonConfig(state, formatMessage, nodeType, onMouseEnter, onMouseLeave) {
-  var copyButtonState = _pluginKey.pluginKey.getState(state);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function isSeparator(item) {
+  return (item === null || item === void 0 ? void 0 : item.type) === 'separator';
+}
+
+function isNodeOptions(options) {
+  return 'nodeType' in options && options.nodeType !== undefined;
+}
 
-  return {
+function getCopyButtonConfig(options) {
+  var state = options.state,
+      formatMessage = options.formatMessage,
+      onMouseEnter = options.onMouseEnter,
+      onMouseLeave = options.onMouseLeave;
+
+  var copyButtonState = _pluginKey.copyButtonPluginKey.getState(state);
+
+  var buttonActionHandlers;
+
+  if (isNodeOptions(options)) {
+    buttonActionHandlers = {
+      onClick: (0, _commands.createToolbarCopyCommandForNode)(options.nodeType),
+      // Note for future changes: these two handlers should perform
+      // the same action.
+      onMouseEnter: onMouseEnter || (0, _decoration.hoverDecoration)(options.nodeType, true, 'ak-editor-selected-node'),
+      onFocus: (0, _decoration.hoverDecoration)(options.nodeType, true, 'ak-editor-selected-node'),
+      // Note for future changes: these two handlers should perform
+      // the same action.
+      onMouseLeave: (0, _commands.resetCopiedState)(options.nodeType, onMouseLeave),
+      onBlur: (0, _commands.resetCopiedState)(options.nodeType)
+    };
+  } else {
+    buttonActionHandlers = {
+      onClick: (0, _commands.createToolbarCopyCommandForMark)(options.markType),
+      onMouseEnter: (0, _commands.getProvideMarkVisualFeedbackForCopyButtonCommand)(options.markType),
+      onFocus: (0, _commands.getProvideMarkVisualFeedbackForCopyButtonCommand)(options.markType),
+      onMouseLeave: _commands.removeMarkVisualFeedbackForCopyButtonCommand,
+      onBlur: _commands.removeMarkVisualFeedbackForCopyButtonCommand
+    };
+  }
+
+  return _objectSpread(_objectSpread({
     id: 'editor.floatingToolbar.copy',
     type: 'button',
     appearance: 'subtle',
     icon: _copy.default,
-    onClick: (0, _commands.createToolbarCopyCommand)(nodeType),
-    title: formatMessage(copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied ? _messages.default.copiedToClipboard : _messages.default.copyToClipboard),
-    onMouseEnter: onMouseEnter || (0, _decoration.hoverDecoration)(nodeType, true, 'ak-editor-selected-node'),
-    onMouseLeave: (0, _commands.resetCopiedState)(nodeType, onMouseLeave),
-    onFocus: (0, _decoration.hoverDecoration)(nodeType, true, 'ak-editor-selected-node'),
-    onBlur: (0, _decoration.hoverDecoration)(nodeType, false),
+    title: formatMessage(copyButtonState !== null && copyButtonState !== void 0 && copyButtonState.copied ? _messages.default.copiedToClipboard : _messages.default.copyToClipboard)
+  }, buttonActionHandlers), {}, {
     hideTooltipOnClick: false,
     tabIndex: null // TODO select and delete styling needs to be removed when keyboard cursor moves away
     // problem already exist with delete as well
 
-  };
-};
-
-exports.getCopyButtonConfig = getCopyButtonConfig;
+  });
+}
 
 var showCopyButton = function showCopyButton(state) {
   return state && // Check if the Copy button plugin is enabled
-  // @ts-ignore pluginKey.key
+  // @ts-ignore copyButtonPluginKey.key
   state.plugins.find(function (p) {
-    return p.key === _pluginKey.pluginKey.key;
+    return p.key === _pluginKey.copyButtonPluginKey.key;
   });
 };
+/**
+ * Process floatingToolbar items for copyButton
+ *
+ * If copy button plugin not enabled, remove copy button item from toolbar items
+ * else process copy button to standard floatingtoobarbutton
+ */
+
 
-exports.showCopyButton = showCopyButton;
+exports.showCopyButton = showCopyButton;
+
+function processCopyButtonItems(state) {
+  return function (items) {
+    return items.flatMap(function (item) {
+      switch (item.type) {
+        case 'copy-button':
+          if (item !== null && item !== void 0 && item.hidden || !showCopyButton(state)) {
+            return [];
+          }
+
+          return item === null || item === void 0 ? void 0 : item.items.map(function (copyButtonItem) {
+            return isSeparator(copyButtonItem) ? copyButtonItem : getCopyButtonConfig(copyButtonItem);
+          });
+
+        default:
+          return [item];
+      }
+    });
+  };
+}

package/dist/cjs/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -41,9 +41,7 @@ function inputRulePlugin(schema, providerFactory, featureFlags) {
   if (schema.nodes.emoji && providerFactory) {
     initMatcher(providerFactory);
     var asciiEmojiRule = (0, _inputRules.createRule)(AsciiEmojiMatcher.REGEX, inputRuleHandler);
-    return (0, _inputRules.createPlugin)('emoji', [asciiEmojiRule], {
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-    });
+    return (0, _inputRules.createPlugin)('emoji', [asciiEmojiRule]);
   }
 
   return;

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

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getToolbarConfig = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 
 var _messages = _interopRequireDefault(require("../../messages"));
@@ -19,8 +17,6 @@ var _decoration = require("../base/pm-plugins/decoration");
 
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 
-var _toolbar = require("../copy-button/toolbar");
-
 var getToolbarConfig = function getToolbarConfig(state, _ref) {
   var formatMessage = _ref.formatMessage;
 
@@ -38,9 +34,16 @@ var getToolbarConfig = function getToolbarConfig(state, _ref) {
       },
       nodeType: [nestedExpand, expand],
       offset: [0, 6],
-      items: [].concat((0, _toConsumableArray2.default)(state && (0, _toolbar.showCopyButton)(state) ? [(0, _toolbar.getCopyButtonConfig)(state, formatMessage, [nestedExpand, expand]), {
-        type: 'separator'
-      }] : []), [{
+      items: [{
+        type: 'copy-button',
+        items: [{
+          state: state,
+          formatMessage: formatMessage,
+          nodeType: [nestedExpand, expand]
+        }, {
+          type: 'separator'
+        }]
+      }, {
         id: 'editor.expand.delete',
         type: 'button',
         appearance: 'danger',
@@ -52,7 +55,7 @@ var getToolbarConfig = function getToolbarConfig(state, _ref) {
         onBlur: (0, _decoration.hoverDecoration)([nestedExpand, expand], false),
         title: formatMessage(_messages.default.remove),
         tabIndex: null
-      }])
+      }]
     };
   }
 

package/dist/cjs/plugins/expand/ui/ExpandIconButton.js

@@ -95,7 +95,7 @@ var CustomButton = function CustomButton(props) {
       buttonStyles: _objectSpread(_objectSpread({}, buttonStyles), {}, {
         height: '100%',
         '& svg': {
-          transform: props.expanded ? 'transform: rotate(90deg);' : 'tranform: rotate(0deg);',
+          transform: props.expanded ? 'transform: rotate(90deg);' : 'transform: rotate(0deg);',
           transition: "transform 0.2s ".concat(_editorSharedStyles.akEditorSwoopCubicBezier, ";")
         }
       })

package/dist/cjs/plugins/expand/ui/styles.js

@@ -65,7 +65,7 @@ var DANGER_STATE_BORDER_RADIUS = (0, _components.themed)({
 });
 
 var expandStyles = function expandStyles(props) {
-  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .", " > div {\n    display: flex;\n  }\n\n  .", " {\n    ", "\n    overflow: hidden;\n    cursor: pointer;\n    box-sizing: border-box;\n\n    td > & {\n      margin-top: 0;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(90deg);\n    }\n\n    &.", ":not(.danger) {\n      ", "\n\n      ::after {\n        // Custom background color and borders (for dark theme).\n        background-color: ", ";\n        border: ", ";\n        border-radius: ", ";\n      }\n    }\n\n    &.danger {\n      background: ", ";\n      border: ", ";\n      border-color: ", ";\n      border-radius: ", ";\n    }\n  }\n\n  .ProseMirror\n    > .", ",\n    .", "\n    > .", " {\n    margin-left: -", "px;\n    margin-right: -", "px;\n  }\n\n  .", " {\n    ", "\n    cursor: text;\n    padding-top: 0px;\n  }\n\n  .", " {\n    ", "\n  }\n\n  .", " {\n    ", ";\n    overflow: visible;\n  }\n\n  .", " {\n    background: ", ";\n    border-color: ", ";\n\n    .", " {\n      padding-top: ", "px;\n    }\n  }\n\n  .", " {\n    width: 100%;\n  }\n\n  /* stylelint-disable property-no-unknown, value-keyword-case */\n  .", ":(.", ") {\n    .expand-content-wrapper {\n      height: auto;\n    }\n  }\n  /* stylelint-enable property-no-unknown, value-keyword-case */\n\n  .", ":not(.", ") {\n    .ak-editor-expand__content {\n      position: absolute;\n      height: 1px;\n      width: 1px;\n      overflow: hidden;\n      clip: rect(1px, 1px, 1px, 1px);\n      white-space: nowrap;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(0deg);\n    }\n\n    &:not(.", "):not(.danger) {\n      background: transparent;\n      border-color: transparent;\n\n      &:hover {\n        border-color: ", ";\n        background: ", ";\n      }\n    }\n  }\n"])), _classNames.expandClassNames.icon, _classNames.expandClassNames.prefix, _ui.sharedExpandStyles.containerStyles({
+  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .", " > div {\n    display: flex;\n  }\n\n  .", " {\n    ", "\n    overflow: hidden;\n    cursor: pointer;\n    box-sizing: border-box;\n\n    td > & {\n      margin-top: 0;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(90deg);\n    }\n\n    &.", ":not(.danger) {\n      ", "\n\n      ::after {\n        // Custom background color and borders (for dark theme).\n        background-color: ", ";\n        border: ", ";\n        border-radius: ", ";\n      }\n    }\n\n    &.danger {\n      background: ", ";\n      border: ", ";\n      border-color: ", ";\n      border-radius: ", ";\n    }\n  }\n\n  .ProseMirror\n    > .", ",\n    .", "\n    > .", " {\n    margin-left: -", "px;\n    margin-right: -", "px;\n  }\n\n  .", " {\n    ", "\n    cursor: text;\n    padding-top: 0px;\n  }\n\n  .", " {\n    ", "\n  }\n\n  .", " {\n    ", ";\n    align-items: center;\n    overflow: visible;\n  }\n\n  .", " {\n    background: ", ";\n    border-color: ", ";\n\n    .", " {\n      padding-top: ", "px;\n    }\n  }\n\n  .", " {\n    width: 100%;\n  }\n\n  /* stylelint-disable property-no-unknown, value-keyword-case */\n  .", ":(.", ") {\n    .expand-content-wrapper {\n      height: auto;\n    }\n  }\n  /* stylelint-enable property-no-unknown, value-keyword-case */\n\n  .", ":not(.", ") {\n    .ak-editor-expand__content {\n      position: absolute;\n      height: 1px;\n      width: 1px;\n      overflow: hidden;\n      clip: rect(1px, 1px, 1px, 1px);\n      white-space: nowrap;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(0deg);\n    }\n\n    &:not(.", "):not(.danger) {\n      background: transparent;\n      border-color: transparent;\n\n      &:hover {\n        border-color: ", ";\n        background: ", ";\n      }\n    }\n  }\n"])), _classNames.expandClassNames.icon, _classNames.expandClassNames.prefix, _ui.sharedExpandStyles.containerStyles({
     expanded: false,
     focused: false
   })(props), _classNames.expandClassNames.iconContainer, EXPAND_ICON_COLOR(props), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Blanket, _editorSharedStyles.SelectionStyle.Border]), ACTIVE_STATE_BACKGROUND_COLOR(props), ACTIVE_STATE_BORDER(props), ACTIVE_STATE_BORDER_RADIUS(props), DANGER_STATE_BACKGROUND_COLOR(props), DANGER_STATE_BORDER(props), DANGER_STATE_BORDER_COLOR(props), DANGER_STATE_BORDER_RADIUS(props), _classNames.expandClassNames.type('expand'), _constants2.BreakoutCssClassName.BREAKOUT_MARK_DOM, _classNames.expandClassNames.type('expand'), _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akLayoutGutterOffset, _classNames.expandClassNames.content, _ui.sharedExpandStyles.contentStyles({

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

@@ -9,6 +9,10 @@ exports.getEditInLegacyMacroBrowser = exports.createExtensionAPI = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
+var _validator = require("@atlaskit/adf-utils/validator");
+
+var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
+
 var _prosemirrorModel = require("prosemirror-model");
 
 var _prosemirrorState = require("prosemirror-state");
@@ -62,11 +66,13 @@ var extensionAPICallPayload = function extensionAPICallPayload(functionName) {
 };
 
 var createExtensionAPI = function createExtensionAPI(options) {
+  var validate = (0, _validator.validator)();
   /**
    * Finds the node and its position by `localId`. Throws if the node could not be found.
    *
    * @returns {NodeWithPos}
    */
+
   var ensureNodePosByLocalId = function ensureNodePosByLocalId(localId, _ref2) {
     var opName = _ref2.opName;
 
@@ -88,7 +94,9 @@ var createExtensionAPI = function createExtensionAPI(options) {
 
   var doc = {
     insertAfter: function insertAfter(localId, adf, opt) {
-      if ((0, _typeof2.default)(adf) !== 'object' || Array.isArray(adf)) {
+      try {
+        validate(adf);
+      } catch (e) {
         throw new Error("insertAfter(): Invalid ADF given.");
       }
 
@@ -209,6 +217,9 @@ 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.");
@@ -221,8 +232,8 @@ var createExtensionAPI = function createExtensionAPI(options) {
           throw new Error("update(): Invalid ADF mark type '".concat(mark.type, "'."));
         }
 
-        if (!node.type.allowsMarkType(markType)) {
-          throw new Error("update(): Node of type '".concat(node.type.name, "' does not allow marks of type '").concat(mark.type, "'."));
+        if (!parent.type.allowsMarkType(markType)) {
+          throw new Error("update(): Parent of type '".concat(parent.type.name, "' does not allow marks of type '").concat(mark.type, "'."));
         }
 
         return {
@@ -235,12 +246,12 @@ var createExtensionAPI = function createExtensionAPI(options) {
         var mark = _ref3.mark,
             attrs = _ref3.attrs;
         return mark.create(attrs);
-      }); // Validate if the new attributes result in a valid node.
-      // We're doing this by relying on `createChecked`, which validates attributes,
-      // and if we don't exit - we assume validity.
+      }); // Validate if the new attributes and marks result in a valid node and adf.
 
       try {
-        node.type.createChecked(changedValues.attrs, node.content, newMarks);
+        var newNode = node.type.createChecked(changedValues.attrs, node.content, newMarks);
+        var newNodeAdf = new _editorJsonTransformer.JSONTransformer().encodeNode(newNode);
+        validate(newNodeAdf);
       } catch (err) {
         throw new Error("update(): The given ADFEntity cannot be inserted in the current position.\n".concat(err));
       }

package/dist/cjs/plugins/extension/nodeviews/extension.js

@@ -76,7 +76,14 @@ var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
         nodeType: this.node.type.name
       }, /*#__PURE__*/_react.default.createElement(_Extension.default, {
         editorView: this.view,
-        node: this.node,
+        node: this.node // The getPos arg is always a function when used with nodes
+        // the version of the types we use has a union with the type
+        // for marks.
+        // This has been fixed in later versions of the definitly typed
+        // types (and also in prosmirror-views inbuilt types).
+        // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/57384
+        ,
+        getPos: this.getPos,
         providerFactory: props.providerFactory,
         handleContentDOMRef: forwardRef,
         extensionHandlers: props.extensionHandlers,