@atlaskit/editor-core 185.2.0 → 185.2.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-core
 
+## 185.2.5
+
+### Patch Changes
+
+- [`b48d0a5f88f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b48d0a5f88f) - Create new placeholder for the floating toolbar plugin and use a new action to replace the forceFocusSelector action.
+- Updated dependencies
+
+## 185.2.2
+
+### Patch Changes
+
+- [`f07a1e036a9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f07a1e036a9) - Refactoring editor-core to prepare for extracting card plugin.
+- Updated dependencies
+
 ## 185.2.0
 
 ### Minor Changes

package/dist/cjs/actions/index.js

@@ -304,7 +304,7 @@ var EditorActions = /*#__PURE__*/function () {
       if (!this.editorView) {
         return true;
       }
-      return (0, _document.isEmptyDocument)(this.editorView.state.doc);
+      return (0, _utils.isEmptyDocument)(this.editorView.state.doc);
     }
   }, {
     key: "replaceDocument",
@@ -342,7 +342,7 @@ var EditorActions = /*#__PURE__*/function () {
         return true;
       }
       var schema = state.schema;
-      var content = Array.isArray(rawValue) ? (0, _document.processRawFragmentValue)(schema, rawValue) : (0, _document.processRawValue)(schema, rawValue);
+      var content = Array.isArray(rawValue) ? (0, _document.processRawFragmentValue)(schema, rawValue) : (0, _utils.processRawValue)(schema, rawValue);
       if (!content) {
         return false;
       }

package/dist/cjs/create-editor/ReactEditorViewInternal.js

@@ -21,7 +21,6 @@ var _messages = require("./messages");
 var _utils = require("@atlaskit/editor-common/utils");
 var _ufo = require("@atlaskit/editor-common/ufo");
 var _eventDispatcher = require("../event-dispatcher");
-var _utils2 = require("../utils");
 var _saferTransactions = require("../utils/performance/safer-transactions");
 var _RenderTracking = require("../utils/performance/components/RenderTracking");
 var _nodes = require("../utils/nodes");
@@ -186,7 +185,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       _this.contentTransformer = contentTransformerProvider ? contentTransformerProvider(schema) : undefined;
       var doc;
       if (options.doc) {
-        doc = (0, _utils2.processRawValue)(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, _this.contentTransformer, _this.dispatchAnalyticsEvent);
+        doc = (0, _utils.processRawValue)(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, _this.contentTransformer, _this.dispatchAnalyticsEvent);
       }
       var selection;
       if (doc) {

package/dist/cjs/index.js

@@ -371,12 +371,6 @@ Object.defineProperty(exports, "insertTaskDecisionCommand", {
     return _commands5.insertTaskDecisionCommand;
   }
 });
-Object.defineProperty(exports, "isEmptyDocument", {
-  enumerable: true,
-  get: function get() {
-    return _utils.isEmptyDocument;
-  }
-});
 Object.defineProperty(exports, "isLinkAtPos", {
   enumerable: true,
   get: function get() {

package/dist/cjs/labs/next/internal/hooks/use-editor/create-editor.js

@@ -8,7 +8,7 @@ var _prosemirrorView = require("prosemirror-view");
 var _prosemirrorState = require("prosemirror-state");
 var _eventDispatcher = require("../../../../../event-dispatcher");
 var _createEditor = require("../../../../../create-editor/create-editor");
-var _utils = require("../../../../../utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _createSchema = require("../../../../../create-editor/create-schema");
 function createEditor(_ref) {
   var context = _ref.context,

package/dist/cjs/messages.js

@@ -17,73 +17,23 @@ Object.defineProperty(exports, "linkMessages", {
     return _messages.linkMessages;
   }
 });
-exports.linkToolbarMessages = void 0;
+Object.defineProperty(exports, "linkToolbarMessages", {
+  enumerable: true,
+  get: function get() {
+    return _messages.linkToolbarMessages;
+  }
+});
 Object.defineProperty(exports, "statusMessages", {
   enumerable: true,
   get: function get() {
     return _messages2.messages;
   }
 });
-var _reactIntlNext = require("react-intl-next");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _messages2 = require("./plugins/status/nodeviews/messages");
 var _messages3 = require("./plugins/date/nodeviews/messages");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 // Common Translations will live here
-
-var linkToolbarMessages = (0, _reactIntlNext.defineMessages)({
-  addLink: {
-    id: 'fabric.editor.mediaAddLink',
-    defaultMessage: 'Add link',
-    description: 'Add link'
-  },
-  unableToOpenLink: {
-    id: 'fabric.editor.unableToOpenLink',
-    defaultMessage: 'Unable to open this link',
-    description: 'Unable to open this link'
-  },
-  unlink: {
-    id: 'fabric.editor.unlink',
-    defaultMessage: 'Unlink',
-    description: 'Removes the hyperlink but keeps your text.'
-  },
-  editLink: {
-    id: 'fabric.editor.editLink',
-    defaultMessage: 'Edit link',
-    description: 'Edit the link, update display text'
-  },
-  placeholder: {
-    id: 'fabric.editor.hyperlinkToolbarPlaceholder',
-    defaultMessage: 'Paste or search for link',
-    description: 'Paste or search for link'
-  },
-  linkPlaceholder: {
-    id: 'fabric.editor.linkPlaceholder',
-    defaultMessage: 'Paste link',
-    description: 'Create a new link by pasting a URL.'
-  },
-  linkAddress: {
-    id: 'fabric.editor.linkAddress',
-    defaultMessage: 'Link address',
-    description: 'Insert the address of the link'
-  },
-  invalidLink: {
-    id: 'fabric.editor.invalidLink',
-    defaultMessage: 'Please enter a valid link.',
-    description: 'Please enter a valid link.'
-  },
-  emptyLink: {
-    id: 'fabric.editor.emptyLink',
-    defaultMessage: 'Please enter a link.',
-    description: 'Please enter a link.'
-  },
-  settingsLink: {
-    id: 'fabric.editor.settingsLinks',
-    defaultMessage: 'Go to Link Preferences',
-    description: 'Go to Link Preferences'
-  }
-});
-exports.linkToolbarMessages = linkToolbarMessages;
 var _default = _messages.default;
 exports.default = _default;

package/dist/cjs/nodeviews/getInlineNodeViewProducer.styles.js

@@ -8,10 +8,10 @@ exports.InlineNodeViewSharedStyles = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _utils = require("@atlaskit/editor-common/utils");
-var _getInlineNodeViewProducer = require("./getInlineNodeViewProducer");
+var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _templateObject;
 // For reasoning behind styles, see comments in:
 // ./getInlineNodeViewProducer -> portalChildren()
 
-var InlineNodeViewSharedStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    display: inline;\n    user-select: all;\n    /* Collapses zero width spaces inside the inline node view\n    to prevent the node from line breaking too early.\n    */\n    white-space: nowrap;\n    /* Then reset to the Editor default so we don't interfere\n    with any component styling. */\n    & > *:not(span[aria-hidden='true'].zeroWidthSpaceContainer) {\n      white-space: pre-wrap;\n    }\n  }\n  /** Remove browser deafult selections style. This prevents\n    unexpected visual artefacts in Safari when navigating\n    with the keyboard or making range selections. */\n  &.ua-safari {\n    .", " {\n      ::selection,\n      *::selection {\n        background: transparent;\n      }\n    }\n  }\n\n  &.ua-chrome .", " > span {\n    user-select: none;\n  }\n\n  .", "AddZeroWidthSpace {\n    ::after {\n      content: '", "';\n    }\n  }\n"])), _getInlineNodeViewProducer.inlineNodeViewClassname, _getInlineNodeViewProducer.inlineNodeViewClassname, _getInlineNodeViewProducer.inlineNodeViewClassname, _getInlineNodeViewProducer.inlineNodeViewClassname, _utils.ZERO_WIDTH_SPACE);
+var InlineNodeViewSharedStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    display: inline;\n    user-select: all;\n    /* Collapses zero width spaces inside the inline node view\n    to prevent the node from line breaking too early.\n    */\n    white-space: nowrap;\n    /* Then reset to the Editor default so we don't interfere\n    with any component styling. */\n    & > *:not(span[aria-hidden='true'].zeroWidthSpaceContainer) {\n      white-space: pre-wrap;\n    }\n  }\n  /** Remove browser deafult selections style. This prevents\n    unexpected visual artefacts in Safari when navigating\n    with the keyboard or making range selections. */\n  &.ua-safari {\n    .", " {\n      ::selection,\n      *::selection {\n        background: transparent;\n      }\n    }\n  }\n\n  &.ua-chrome .", " > span {\n    user-select: none;\n  }\n\n  .", "AddZeroWidthSpace {\n    ::after {\n      content: '", "';\n    }\n  }\n"])), _reactNodeView.inlineNodeViewClassname, _reactNodeView.inlineNodeViewClassname, _reactNodeView.inlineNodeViewClassname, _reactNodeView.inlineNodeViewClassname, _utils.ZERO_WIDTH_SPACE);
 exports.InlineNodeViewSharedStyles = InlineNodeViewSharedStyles;

package/dist/cjs/plugins/base/pm-plugins/scroll-gutter.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.GUTTER_SIZE_MOBILE_IN_PX = exports.GUTTER_SIZE_IN_PX = exports.GUTTER_SELECTOR = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("../../../utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("../../mobile-dimensions/utils");
 var GUTTER_SIZE_IN_PX = 120; // Default gutter size
 exports.GUTTER_SIZE_IN_PX = GUTTER_SIZE_IN_PX;

package/dist/cjs/plugins/card/nodeviews/blockCard.js

@@ -19,7 +19,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _genericCard = require("./genericCard");
-var _nodeviews = require("../../../nodeviews/");
+var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _actions = require("../pm-plugins/actions");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -155,5 +155,5 @@ var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     }
   }]);
   return BlockCard;
-}(_nodeviews.ReactNodeView);
+}(_reactNodeView.default);
 exports.BlockCard = BlockCard;

package/dist/cjs/plugins/card/nodeviews/embedCard.js

@@ -24,7 +24,7 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _nodeviews = require("../../../nodeviews/");
 var _actions = require("../pm-plugins/actions");
 var _ResizableEmbedCard = _interopRequireDefault(require("../ui/ResizableEmbedCard"));
-var _richMediaUtils = require("../../../utils/rich-media-utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _steps = require("@atlaskit/adf-schema/steps");
 var _hooks = require("@atlaskit/editor-common/hooks");
 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; }
@@ -55,7 +55,7 @@ var CardInner = function CardInner(_ref) {
     return null;
   }
   var lineLength = getLineLength(view, pos, widthStateLineLength);
-  var containerWidth = (0, _richMediaUtils.isRichMediaInsideOfBlockNode)(view, pos) ? lineLength : widthStateWidth;
+  var containerWidth = (0, _utils.isRichMediaInsideOfBlockNode)(view, pos) ? lineLength : widthStateWidth;
   if (!allowResizing || !hasPreview) {
     // There are two ways `width` and `height` can be defined here:
     // 1) Either as `heightAlone` as height value and no width
@@ -78,8 +78,8 @@ var CardInner = function CardInner(_ref) {
     }), smartCard);
   }
   var displayGrid = function displayGrid(visible, gridType, highlight) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2;
-    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.grid) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.displayGrid(view)({
+    var _pluginInjectionApi$d;
+    return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.grid.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.displayGrid(view)({
       visible: visible,
       gridType: gridType,
       highlight: highlight
@@ -183,10 +183,10 @@ var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getLineLength", function (view, pos, originalLineLength) {
-      if (typeof pos === 'number' && (0, _richMediaUtils.isRichMediaInsideOfBlockNode)(view, pos)) {
+      if (typeof pos === 'number' && (0, _utils.isRichMediaInsideOfBlockNode)(view, pos)) {
         var $pos = view.state.doc.resolve(pos);
         var domNode = view.nodeDOM($pos.pos);
-        if ($pos.nodeAfter && _richMediaUtils.floatingLayouts.indexOf($pos.nodeAfter.attrs.layout) > -1 && domNode && domNode.parentElement) {
+        if ($pos.nodeAfter && _utils.floatingLayouts.indexOf($pos.nodeAfter.attrs.layout) > -1 && domNode && domNode.parentElement) {
           return domNode.parentElement.offsetWidth;
         }
         if (domNode instanceof HTMLElement) {

package/dist/cjs/plugins/card/nodeviews/genericCard.js

@@ -87,6 +87,7 @@ function Card(SmartCardComponent, UnsupportedComponent) {
         // (2) Render a blue link whilst downgrading to `link` in the ADF (fatal errs).
 
         if (maybeAPIError.kind && maybeAPIError.kind === 'fatal') {
+          var _pluginInjectionApi$d;
           this.setState({
             isError: true
           });
@@ -100,7 +101,7 @@ function Card(SmartCardComponent, UnsupportedComponent) {
           if (!getPos || typeof getPos === 'boolean') {
             return;
           }
-          (0, _doc.changeSelectedCardToLinkFallback)(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.analytics.actions)(view.state, view.dispatch);
+          (0, _doc.changeSelectedCardToLinkFallback)(undefined, url, true, node, getPos(), pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions)(view.state, view.dispatch);
           return null;
         } else {
           // Otherwise, render a blue link as fallback (above in render()).

package/dist/cjs/plugins/card/pm-plugins/doc.js

@@ -12,10 +12,8 @@ var _prosemirrorHistory = require("prosemirror-history");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _card = require("@atlaskit/editor-common/card");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils = require("../../../utils");
-var _linkingUtils = require("../../../utils/linking-utils");
-var _utils2 = require("@atlaskit/editor-common/utils");
-var _utils3 = require("../utils");
+var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("../utils");
 var _actions = require("./actions");
 var _pluginKey = require("./plugin-key");
 var _shouldReplaceLink = require("./shouldReplaceLink");
@@ -107,7 +105,7 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
             inputMethod: inputMethod,
             nodeType: nodeType,
             nodeContext: nodeContext,
-            fromCurrentDomain: (0, _utils2.isFromCurrentDomain)(url)
+            fromCurrentDomain: (0, _utils.isFromCurrentDomain)(url)
           },
           nonPrivacySafeAttributes: {
             domainName: domainName
@@ -136,7 +134,7 @@ var handleFallbackWithAnalytics = function handleFallbackWithAnalytics(request,
     }
     var tr = state.tr;
     if (request.source !== _analytics.INPUT_METHOD.FLOATING_TB) {
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _utils2.getLinkCreationAnalyticsEvent)(request.source, request.url))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _utils.getLinkCreationAnalyticsEvent)(request.source, request.url))(tr);
     }
     (0, _card.addLinkMetadata)(state.selection, tr, {
       action: request.analyticsAction,
@@ -268,7 +266,7 @@ var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sen
           eventType: _analytics.EVENT_TYPE.TRACK,
           attributes: {
             newType: _analytics.SMART_LINK_TYPE.URL,
-            previousType: (0, _utils3.appearanceForNodeType)(selectedNode.type)
+            previousType: (0, _utils2.appearanceForNodeType)(selectedNode.type)
           }
         })(tr);
       }
@@ -311,7 +309,7 @@ var updateCard = function updateCard(href, sourceEvent) {
     if (!selectedNode) {
       return false;
     }
-    var cardAppearance = (0, _utils3.selectedCardAppearance)(state);
+    var cardAppearance = (0, _utils2.selectedCardAppearance)(state);
     var tr = cardToLinkWithTransaction(state, href, href);
     queueCardFromChangedTr(state, tr, _analytics.INPUT_METHOD.MANUAL, _analytics.ACTION.UPDATED, undefined, sourceEvent, cardAppearance);
     if (dispatch) {
@@ -352,7 +350,7 @@ var changeSelectedCardToText = function changeSelectedCardToText(text, editorAna
         action: _analytics.ACTION.UNLINK
       });
       tr.scrollIntoView();
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.unlinkPayload)(_analytics.ACTION_SUBJECT_ID.CARD_INLINE))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.unlinkPayload)(_analytics.ACTION_SUBJECT_ID.CARD_INLINE))(tr);
       dispatch(tr);
     }
     return true;
@@ -375,7 +373,7 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance, e
       }
       return false;
     }
-    if ((0, _utils3.appearanceForNodeType)(selectedNode.type) === appearance) {
+    if ((0, _utils2.appearanceForNodeType)(selectedNode.type) === appearance) {
       return false;
     }
     var isEmbed = appearance === 'embed';
@@ -404,7 +402,7 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance, e
       eventType: _analytics.EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
-        previousType: (0, _utils3.appearanceForNodeType)(selectedNode.type)
+        previousType: (0, _utils2.appearanceForNodeType)(selectedNode.type)
       }
     })(tr);
     (0, _card.addLinkMetadata)(state.selection, tr, {

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

@@ -1,17 +1,14 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cardKeymap = cardKeymap;
 var _prosemirrorKeymap = require("prosemirror-keymap");
 var _prosemirrorState = require("prosemirror-state");
-var keymaps = _interopRequireWildcard(require("../../../keymaps"));
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _prosemirrorUtils = require("prosemirror-utils");
 var _utils = require("@atlaskit/editor-common/utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var lookupPixel = 10;
 var getClosestInlineCardPos = function getClosestInlineCardPos(state, editorView, direction) {
   var _editorView$posAtCoor;
@@ -60,8 +57,8 @@ function cardKeymap(featureFlags) {
 
   // https://bugs.chromium.org/p/chromium/issues/detail?id=1227468 introduced since Chrome 91
   if (_utils.browser.chrome && _utils.browser.chrome_version > 90 && featureFlags.chromeCursorHandlerFixedVersion && _utils.browser.chrome_version < featureFlags.chromeCursorHandlerFixedVersion) {
-    keymaps.bindKeymapWithCommand(keymaps.moveUp.common, selectAboveBelowInlineCard('up'), list);
-    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, selectAboveBelowInlineCard('down'), list);
+    (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveUp.common, selectAboveBelowInlineCard('up'), list);
+    (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveDown.common, selectAboveBelowInlineCard('down'), list);
   }
   return (0, _prosemirrorKeymap.keymap)(list);
 }

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

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "pluginKey", {
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _getInlineNodeViewProducer = require("../../../nodeviews/getInlineNodeViewProducer");
+var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
 var _blockCard = require("../nodeviews/blockCard");
 var _embedCard = require("../nodeviews/embedCard");
 var _inlineCard = require("../nodeviews/inlineCard");
@@ -113,7 +113,7 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
       },
       props: {
         nodeViews: {
-          inlineCard: (0, _getInlineNodeViewProducer.getInlineNodeViewProducer)({
+          inlineCard: (0, _reactNodeView.getInlineNodeViewProducer)({
             pmPluginFactoryParams: pmPluginFactoryParams,
             Component: _inlineCard.InlineCardNodeView,
             extraComponentProps: {

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

@@ -15,19 +15,16 @@ var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 var _settings = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
-var _messages = require("../../messages");
-var _messages2 = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
-var _doc = require("./pm-plugins/doc");
 var _card = require("@atlaskit/editor-common/card");
+var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
+var _doc = require("./pm-plugins/doc");
 var _main = require("./pm-plugins/main");
 var _styles = require("@atlaskit/editor-common/styles");
 var _EditLinkToolbar = require("./ui/EditLinkToolbar");
 var _utils = require("./utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _LinkToolbarAppearance = require("./ui/LinkToolbarAppearance");
-var _messages3 = require("./messages");
-var _MediaAndEmbedsToolbar = _interopRequireDefault(require("../../ui/MediaAndEmbedsToolbar"));
-var _linkingUtils = require("../../utils/linking-utils");
+var _messages2 = require("./messages");
 var _styles2 = require("./styles");
 var _analytics = require("@atlaskit/editor-common/analytics");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -76,7 +73,7 @@ var visitCardLink = function visitCardLink(editorAnalyticsApi) {
     window.open(url);
     if (dispatch) {
       var tr = state.tr;
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.buildVisitedLinkPayload)(type.name))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildVisitedLinkPayload)(type.name))(tr);
       dispatch(tr);
     }
     return true;
@@ -92,7 +89,7 @@ var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.buildOpenedSettingsPayload)(type.name))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildOpenedSettingsPayload)(type.name))(tr);
       dispatch(tr);
     }
     return true;
@@ -133,7 +130,7 @@ var floatingToolbar = function floatingToolbar(cardOptions, featureFlags, platfo
     var shouldEnableFocusTrap = lpLinkPicker && lpLinkPickerFocusTrap;
     var isLinkPickerEnabled = !!lpLinkPicker;
     return _objectSpread(_objectSpread({
-      title: intl.formatMessage(_messages3.messages.card),
+      title: intl.formatMessage(_messages2.messages.card),
       className: className,
       nodeType: nodeType,
       preventPopupOverflow: preventPopupOverflow
@@ -167,8 +164,8 @@ var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
     return false;
   };
 };
-var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, cardOptions) {
-  return (0, _MediaAndEmbedsToolbar.default)(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) {
+  return (0, _card.buildLayoutButtons)(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
 };
 var withToolbarMetadata = function withToolbarMetadata(command) {
   return (0, _card.commandWithMetadata)(command, {
@@ -205,7 +202,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         linkPicker: linkPicker,
         node: node,
         featureFlags: featureFlags,
-        editorAnalyticsApi: editorAnalyticsApi
+        pluginInjectionApi: pluginInjectionApi
       })];
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
@@ -226,7 +223,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         icon: _shortcut.default,
         metadata: metadata,
         className: 'hyperlink-open-link',
-        title: intl.formatMessage(_messages2.linkMessages.openLink),
+        title: intl.formatMessage(_messages.linkMessages.openLink),
         onClick: visitCardLink(editorAnalyticsApi)
       }, {
         type: 'separator'
@@ -249,12 +246,12 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
         onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true),
         onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
-        title: intl.formatMessage(_messages2.default.remove),
+        title: intl.formatMessage(_messages.default.remove),
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$d6;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.width, cardOptions);
+        var _pluginInjectionApi$d6, _pluginInjectionApi$d7, _pluginInjectionApi$d8;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d7 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d7 === void 0 ? void 0 : (_pluginInjectionApi$d8 = _pluginInjectionApi$d7.analytics) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.actions, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'

package/dist/cjs/plugins/card/ui/EditLinkToolbar.js

@@ -18,13 +18,10 @@ var _card = require("@atlaskit/editor-common/card");
 var _HyperlinkAddToolbar = _interopRequireDefault(require("../../hyperlink/ui/HyperlinkAddToolbar"));
 var _actions = require("../pm-plugins/actions");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _ToolbarComponents = require("../../../ui/LinkSearch/ToolbarComponents");
 var _doc = require("../pm-plugins/doc");
 var _utils = require("../utils");
 var _prosemirrorState = require("prosemirror-state");
-var _linkingUtils = require("../../../utils/linking-utils");
-var _forceFocus = require("../../floating-toolbar/pm-plugins/force-focus");
-var _messages = require("../../../messages");
+var _messages = require("@atlaskit/editor-common/messages");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var HyperLinkToolbarWithListeners = (0, _ui.withOuterListeners)(_HyperlinkAddToolbar.default);
@@ -42,7 +39,8 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
      * and not close the floating toolbar.
      */
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleEsc", function (e) {
-      (0, _forceFocus.forceFocusSelector)("[aria-label=\"".concat(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
+      var _this$props$forceFocu, _this$props;
+      (_this$props$forceFocu = (_this$props = _this.props).forceFocusSelector) === null || _this$props$forceFocu === void 0 ? void 0 : _this$props$forceFocu.call(_this$props, "[aria-label=\"".concat(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
     });
     return _this;
   }
@@ -68,14 +66,14 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props = this.props,
-        linkPickerOptions = _this$props.linkPickerOptions,
-        providerFactory = _this$props.providerFactory,
-        url = _this$props.url,
-        text = _this$props.text,
-        view = _this$props.view,
-        featureFlags = _this$props.featureFlags,
-        _onSubmit = _this$props.onSubmit;
+      var _this$props2 = this.props,
+        linkPickerOptions = _this$props2.linkPickerOptions,
+        providerFactory = _this$props2.providerFactory,
+        url = _this$props2.url,
+        text = _this$props2.text,
+        view = _this$props2.view,
+        featureFlags = _this$props2.featureFlags,
+        _onSubmit = _this$props2.onSubmit;
       return /*#__PURE__*/_react.default.createElement(HyperLinkToolbarWithListeners, {
         view: view,
         linkPickerOptions: linkPickerOptions,
@@ -109,7 +107,7 @@ var editLink = function editLink(editorAnalyticsApi) {
     if (dispatch) {
       var tr = state.tr;
       (0, _actions.showLinkToolbar)(tr);
-      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _linkingUtils.buildEditLinkPayload)(type))(tr);
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent((0, _analytics.buildEditLinkPayload)(type))(tr);
       dispatch(tr);
       return true;
     }
@@ -122,12 +120,13 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
     node = _ref.node,
     linkPicker = _ref.linkPicker,
     featureFlags = _ref.featureFlags,
-    editorAnalyticsApi = _ref.editorAnalyticsApi;
+    pluginInjectionApi = _ref.pluginInjectionApi;
   return {
     type: 'custom',
     disableArrowNavigation: true,
     fallback: [],
     render: function render(view, idx) {
+      var _pluginInjectionApi$d;
       if (!view || !providerFactory) {
         return null;
       }
@@ -141,6 +140,7 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
         text: displayInfo.title || '',
         node: node,
         featureFlags: featureFlags,
+        forceFocusSelector: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector,
         onSubmit: function onSubmit(newHref, newText, analytic) {
           var urlChanged = newHref !== displayInfo.url;
           var titleChanged = newText !== displayInfo.title;
@@ -148,7 +148,8 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
           // If the title is changed in a smartlink, convert to standard blue hyperlink
           // (even if the url was also changed) - we don't want to lose the custom title.
           if (titleChanged) {
-            return (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(newText, newHref, undefined, undefined, undefined, editorAnalyticsApi), {
+            var _pluginInjectionApi$d2;
+            return (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(newText, newHref, undefined, undefined, undefined, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions), {
               action: _analytics.ACTION.UPDATED,
               sourceEvent: analytic
             })(view.state, view.dispatch);
@@ -165,8 +166,8 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
 exports.buildEditLinkToolbar = buildEditLinkToolbar;
 var editLinkToolbarConfig = function editLinkToolbarConfig(showLinkingToolbar, lpLinkPicker) {
   return showLinkingToolbar ? {
-    height: lpLinkPicker ? _ToolbarComponents.LINKPICKER_HEIGHT_IN_PX : _ToolbarComponents.RECENT_SEARCH_HEIGHT_IN_PX,
-    width: _ToolbarComponents.RECENT_SEARCH_WIDTH_IN_PX,
+    height: lpLinkPicker ? _ui.LINKPICKER_HEIGHT_IN_PX : _ui.RECENT_SEARCH_HEIGHT_IN_PX,
+    width: _ui.RECENT_SEARCH_WIDTH_IN_PX,
     forcePlacement: true
   } : {};
 };