@atlaskit/editor-core 185.6.3 → 185.7.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 185.7.0
+
+### Minor Changes
+
+- [`9fc1422dec1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9fc1422dec1) - Make `hyperlink` plugin an explicit dependency of `card` plugin. Move card styles and types into editor-common.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 185.6.5
+
+### Patch Changes
+
+- [`1622659f976`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1622659f976) - [ux] Render the image border submenu to the left if it goes out of bounds
+- Updated dependencies
+
 ## 185.6.3
 
 ### Patch Changes

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

@@ -12,9 +12,12 @@ var _main = require("./pm-plugins/main");
 var _toolbar = require("./toolbar");
 var _EditorSmartCardEvents = require("./ui/EditorSmartCardEvents");
 var _keymap = require("./pm-plugins/keymap");
+var _doc = require("./pm-plugins/doc");
+var _actions = require("./pm-plugins/actions");
 var _EditorSmartCardEventsNext = require("./ui/EditorSmartCardEventsNext");
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _pluginKey = require("./pm-plugins/plugin-key");
+var _mountHyperlink = require("./pm-plugins/mountHyperlink");
 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; }
 var cardPlugin = function cardPlugin(options, api) {
@@ -60,6 +63,11 @@ var cardPlugin = function cardPlugin(options, api) {
           allowWrapping: allowWrapping,
           allowAlignment: allowAlignment
         }), api)
+      }, {
+        name: 'cardHyperlink',
+        plugin: function plugin() {
+          return (0, _mountHyperlink.mountHyperlinkPlugin)(api, options);
+        }
       }];
       plugins.push({
         name: 'cardKeymap',
@@ -88,6 +96,12 @@ var cardPlugin = function cardPlugin(options, api) {
         boundariesElement: popupsBoundariesElement
       }));
     },
+    actions: {
+      hideLinkToolbar: _actions.hideLinkToolbar,
+      queueCardsFromChangedTr: _doc.queueCardsFromChangedTr,
+      changeSelectedCardToLink: _doc.changeSelectedCardToLink,
+      setSelectedCardAppearance: _doc.setSelectedCardAppearance
+    },
     pluginsOptions: {
       floatingToolbar: (0, _toolbar.floatingToolbar)(options, featureFlags, options.platform, options.linkPicker, api)
     }

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DatasourceComponent = exports.Datasource = exports.DATASOURCE_INNER_CONTAINER_CLASSNAME = void 0;
+exports.DatasourceComponent = exports.Datasource = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -23,8 +23,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 _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; } } /** @jsx jsx */
-var DATASOURCE_INNER_CONTAINER_CLASSNAME = 'datasourceView-content-inner-wrap';
-exports.DATASOURCE_INNER_CONTAINER_CLASSNAME = DATASOURCE_INNER_CONTAINER_CLASSNAME;
 var containerStyles = (0, _react2.css)({
   height: '500px',
   overflow: 'auto'
@@ -157,7 +155,7 @@ var Datasource = /*#__PURE__*/function (_ReactNodeView) {
       var attrs = this.node.attrs;
       var calculatedWidth = this.calcTableWidth(attrs.layout, this.tableWidth);
       return (0, _react2.jsx)("div", {
-        className: DATASOURCE_INNER_CONTAINER_CLASSNAME,
+        className: _styles.DATASOURCE_INNER_CONTAINER_CLASSNAME,
         css: containerStyles,
         style: {
           minWidth: calculatedWidth

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

@@ -25,6 +25,7 @@ var _resolve = require("./util/resolve");
 var _state = require("./util/state");
 var _analytics = require("./analytics");
 var _datasource = require("../nodeviews/datasource");
+var _styles = require("@atlaskit/editor-common/styles");
 var _actions = require("./actions");
 var _prosemirrorUtils = require("prosemirror-utils");
 var createPlugin = function createPlugin(options, pluginInjectionApi) {
@@ -94,7 +95,7 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var isBlockCardSelected = selection instanceof _prosemirrorState.NodeSelection && ((_selection$node = selection.node) === null || _selection$node === void 0 ? void 0 : _selection$node.type) === schema.nodes.blockCard;
             if (isBlockCardSelected) {
               var _findDomRefAtPos, _node$attrs;
-              var datasourceTableRef = (_findDomRefAtPos = (0, _prosemirrorUtils.findDomRefAtPos)(selection.from, domAtPos)) === null || _findDomRefAtPos === void 0 ? void 0 : _findDomRefAtPos.querySelector(".".concat(_datasource.DATASOURCE_INNER_CONTAINER_CLASSNAME));
+              var datasourceTableRef = (_findDomRefAtPos = (0, _prosemirrorUtils.findDomRefAtPos)(selection.from, domAtPos)) === null || _findDomRefAtPos === void 0 ? void 0 : _findDomRefAtPos.querySelector(".".concat(_styles.DATASOURCE_INNER_CONTAINER_CLASSNAME));
               var node = selection.node;
               var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.datasource);
               var shouldUpdateTableRef = datasourceTableRef && (currentState === null || currentState === void 0 ? void 0 : currentState.datasourceTableRef) !== datasourceTableRef;

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

@@ -0,0 +1,46 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mountHyperlinkPlugin = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _HyperlinkToolbarAppearance = require("../ui/HyperlinkToolbarAppearance");
+var mountHyperlinkPlugin = function mountHyperlinkPlugin(pluginInjectionApi, options) {
+  return new _safePlugin.SafePlugin({
+    view: function view(editorView) {
+      requestAnimationFrame(function () {
+        var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.hyperlink) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.actions) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.prependToolbarButtons({
+          items: function items(state, intl, providerFactory, link) {
+            return [{
+              type: 'custom',
+              fallback: [],
+              render: function render(editorView) {
+                var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+                return /*#__PURE__*/_react.default.createElement(_HyperlinkToolbarAppearance.HyperlinkToolbarAppearance, {
+                  key: "link-appearance",
+                  url: link,
+                  intl: intl,
+                  editorView: editorView,
+                  editorState: state,
+                  cardOptions: options,
+                  providerFactory: providerFactory,
+                  platform: options === null || options === void 0 ? void 0 : options.platform,
+                  editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.actions,
+                  cardActions: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies.card) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions
+                });
+              }
+            }];
+          },
+          onEscapeCallback: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.card.actions.hideLinkToolbar,
+          view: editorView
+        });
+      });
+      return {};
+    }
+  });
+};
+exports.mountHyperlinkPlugin = mountHyperlinkPlugin;

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

@@ -24,8 +24,6 @@ var _EditLinkToolbar = require("./ui/EditLinkToolbar");
 var _utils = require("./utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _LinkToolbarAppearance = require("./ui/LinkToolbarAppearance");
-var _messages2 = require("./messages");
-var _styles2 = require("./styles");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _SmallerEditIcon = require("./ui/SmallerEditIcon");
 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); }
@@ -120,7 +118,7 @@ var floatingToolbar = function floatingToolbar(cardOptions, featureFlags, platfo
     } : {};
 
     // Applies padding override for when link picker is currently displayed
-    var className = pluginState.showLinkingToolbar ? _styles2.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
+    var className = pluginState.showLinkingToolbar ? _styles.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
 
     /**
      * Enable focus trap only if feature flag is enabled AND for the new version of the picker
@@ -131,7 +129,7 @@ var floatingToolbar = function floatingToolbar(cardOptions, featureFlags, platfo
     var shouldEnableFocusTrap = lpLinkPicker && lpLinkPickerFocusTrap;
     var isLinkPickerEnabled = !!lpLinkPicker;
     return _objectSpread(_objectSpread({
-      title: intl.formatMessage(_messages2.messages.card),
+      title: intl.formatMessage(_messages.cardMessages.card),
       className: className,
       nodeType: nodeType,
       preventPopupOverflow: preventPopupOverflow
@@ -290,7 +288,8 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
               allowEmbeds: allowEmbeds,
               allowBlockCards: allowBlockCards,
               platform: platform,
-              editorAnalyticsApi: editorAnalyticsApi
+              editorAnalyticsApi: editorAnalyticsApi,
+              cardActions: pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.card.actions
             });
           }
         }, {

package/dist/cjs/plugins/{hyperlink → card/ui}/HyperlinkToolbarAppearance.js

@@ -16,7 +16,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _LinkToolbarAppearance = require("../card/ui/LinkToolbarAppearance");
+var _LinkToolbarAppearance = require("./LinkToolbarAppearance");
 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; }
 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); }; }
@@ -148,7 +148,8 @@ var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
         editorState = _this$props.editorState,
         cardOptions = _this$props.cardOptions,
         platform = _this$props.platform,
-        editorAnalyticsApi = _this$props.editorAnalyticsApi;
+        editorAnalyticsApi = _this$props.editorAnalyticsApi,
+        cardActions = _this$props.cardActions;
       var supportedUrlsMap = this.state.supportedUrlsMap;
       if (!supportedUrlsMap.get(url)) {
         return null;
@@ -162,7 +163,8 @@ var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
         allowEmbeds: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowEmbeds,
         allowBlockCards: cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards,
         platform: platform,
-        editorAnalyticsApi: editorAnalyticsApi
+        editorAnalyticsApi: editorAnalyticsApi,
+        cardActions: cardActions
       });
     }
   }]);

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,17 +13,15 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _prosemirrorModel = require("prosemirror-model");
-var _react = _interopRequireDefault(require("react"));
-var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _utils = require("@atlaskit/editor-common/utils");
-var _messages2 = require("../messages");
 var _card = require("@atlaskit/editor-common/card");
-var _doc = require("../pm-plugins/doc");
-var _linkToolbarButtonGroupOptions = require("./link-toolbar-button-group-options");
-var _LinkToolbarButtonGroup = require("./LinkToolbarButtonGroup");
+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; }
 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 _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); }; }
@@ -38,6 +37,7 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderDropdown", function (view, cardContext) {
+      var _cardActions$setSelec, _cardActions$setSelec2, _cardActions$changeSe, _cardActions$setSelec3;
       var _this$props = _this.props,
         url = _this$props.url,
         intl = _this$props.intl,
@@ -47,8 +47,12 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         _this$props$allowBloc = _this$props.allowBlockCards,
         allowBlockCards = _this$props$allowBloc === void 0 ? true : _this$props$allowBloc,
         platform = _this$props.platform,
-        editorAnalyticsApi = _this$props.editorAnalyticsApi;
+        editorAnalyticsApi = _this$props.editorAnalyticsApi,
+        cardActions = _this$props.cardActions;
       var preview = allowEmbeds && cardContext && url && cardContext.extractors.getPreview(url, platform);
+      var defaultCommand = function defaultCommand() {
+        return false;
+      };
       if (url) {
         var _cardContext$store, _urlState$error;
         var urlState = cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$store = cardContext.store) === null || _cardContext$store === void 0 ? void 0 : _cardContext$store.getState()[url];
@@ -60,8 +64,8 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       var isEmbedCardLinkSupportedInParent = allowEmbeds ? (0, _utils.isSupportedInParent)(editorState, _prosemirrorModel.Fragment.from(editorState.schema.nodes.embedCard.createChecked({})), currentAppearance) : false;
       var embedOption = allowEmbeds && preview && {
         appearance: 'embed',
-        title: intl.formatMessage(_messages2.messages.embed),
-        onClick: (0, _doc.setSelectedCardAppearance)('embed', editorAnalyticsApi),
+        title: intl.formatMessage(_messages.cardMessages.embed),
+        onClick: (_cardActions$setSelec = cardActions === null || cardActions === void 0 ? void 0 : cardActions.setSelectedCardAppearance('embed', editorAnalyticsApi)) !== null && _cardActions$setSelec !== void 0 ? _cardActions$setSelec : defaultCommand,
         selected: currentAppearance === 'embed',
         hidden: false,
         testId: 'embed-appearance',
@@ -70,24 +74,24 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       };
       var blockCardOption = allowBlockCards && {
         appearance: 'block',
-        title: intl.formatMessage(_messages2.messages.block),
-        onClick: (0, _doc.setSelectedCardAppearance)('block', editorAnalyticsApi),
+        title: intl.formatMessage(_messages.cardMessages.block),
+        onClick: (_cardActions$setSelec2 = cardActions === null || cardActions === void 0 ? void 0 : cardActions.setSelectedCardAppearance('block', editorAnalyticsApi)) !== null && _cardActions$setSelec2 !== void 0 ? _cardActions$setSelec2 : defaultCommand,
         selected: currentAppearance === 'block',
         testId: 'block-appearance',
         disabled: !isBlockCardLinkSupportedInParent,
         tooltip: isBlockCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
       };
       var options = [{
-        title: intl.formatMessage(_messages2.messages.url),
-        onClick: (0, _card.commandWithMetadata)((0, _doc.changeSelectedCardToLink)(url, url, true, undefined, undefined, editorAnalyticsApi), {
+        title: intl.formatMessage(_messages.cardMessages.url),
+        onClick: (0, _card.commandWithMetadata)((_cardActions$changeSe = cardActions === null || cardActions === void 0 ? void 0 : cardActions.changeSelectedCardToLink(url, url, true, undefined, undefined, editorAnalyticsApi)) !== null && _cardActions$changeSe !== void 0 ? _cardActions$changeSe : defaultCommand, {
           action: _analytics.ACTION.CHANGED_TYPE
         }),
         selected: !currentAppearance,
         testId: 'url-appearance'
       }, {
         appearance: 'inline',
-        title: intl.formatMessage(_messages2.messages.inline),
-        onClick: (0, _doc.setSelectedCardAppearance)('inline', editorAnalyticsApi),
+        title: intl.formatMessage(_messages.cardMessages.inline),
+        onClick: (_cardActions$setSelec3 = cardActions === null || cardActions === void 0 ? void 0 : cardActions.setSelectedCardAppearance('inline', editorAnalyticsApi)) !== null && _cardActions$setSelec3 !== void 0 ? _cardActions$setSelec3 : defaultCommand,
         selected: currentAppearance === 'inline',
         testId: 'inline-appearance'
       }];
@@ -104,10 +108,10 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       if (embedOption) {
         options.push(embedOption);
       }
-      return /*#__PURE__*/_react.default.createElement(_LinkToolbarButtonGroup.LinkToolbarButtonGroup, {
+      return /*#__PURE__*/_react.default.createElement(_card.LinkToolbarButtonGroup, {
         key: "link-toolbar-button-group",
         options: options.map(function (option) {
-          return (0, _linkToolbarButtonGroupOptions.getButtonGroupOption)(intl, dispatchCommand, _objectSpread(_objectSpread({}, option), {}, {
+          return (0, _card.getButtonGroupOption)(intl, dispatchCommand, _objectSpread(_objectSpread({}, option), {}, {
             onClick: (0, _card.commandWithMetadata)(option.onClick, {
               inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
             })
@@ -135,12 +139,12 @@ var getUnavailableMessage = function getUnavailableMessage(state, intl) {
   try {
     var parentNode = state.selection.$from.node(1);
     var parentName = intl.formatMessage(_messages.default[parentNode.type.name]);
-    var tooltip = intl.formatMessage(_messages2.messages.displayOptionUnavailableInParentNode, {
+    var tooltip = intl.formatMessage(_messages.cardMessages.displayOptionUnavailableInParentNode, {
       node: parentName
     });
     return tooltip;
   } catch (e) {
-    return intl.formatMessage(_messages2.messages.displayOptionUnavailableInParentNode, {
+    return intl.formatMessage(_messages.cardMessages.displayOptionUnavailableInParentNode, {
       node: intl.formatMessage(_messages.default.defaultBlockNode)
     });
   }

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

@@ -19,7 +19,7 @@ var _prosemirrorUtils = require("prosemirror-utils");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _smartCard = require("@atlaskit/smart-card");
-var _styled = require("./styled");
+var _styles = require("@atlaskit/editor-common/styles");
 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 _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); }; }
@@ -330,7 +330,7 @@ var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
         }
       });
       return (0, _react2.jsx)("div", {
-        css: _styled.embedSpacingStyles,
+        css: _styles.embedSpacingStyles,
         "data-testid": "resizable-embed-card-spacing"
       }, (0, _react2.jsx)("div", {
         css: (0, _ui.wrapperStyle)({

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

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.SmallerEditIcon = void 0;
 var _react = require("@emotion/react");
 var _edit = _interopRequireDefault(require("@atlaskit/icon/glyph/edit"));
-var _styled = require("./styled");
+var _styles = require("@atlaskit/editor-common/styles");
 /** @jsx jsx */
 
 var SmallerEditIcon = function SmallerEditIcon() {
   return (0, _react.jsx)("div", {
-    css: _styled.editIconStyles
+    css: _styles.editIconStyles
   }, (0, _react.jsx)(_edit.default, {
     label: "edit"
   }));

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

@@ -3,11 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transformUnsupportedBlockCardToInline = exports.titleUrlPairFromNode = exports.selectedCardAppearance = exports.mergeCardInfo = exports.findCardInfo = exports.displayInfoForCard = exports.appearanceForNodeType = void 0;
+exports.titleUrlPairFromNode = exports.selectedCardAppearance = exports.mergeCardInfo = exports.findCardInfo = exports.displayInfoForCard = exports.appearanceForNodeType = void 0;
 var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorModel = require("prosemirror-model");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _utils = require("@atlaskit/editor-common/utils");
 var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
     return 'inline';
@@ -56,30 +54,4 @@ var findCardInfo = function findCardInfo(state) {
     return cardInfo.pos === state.selection.from;
   });
 };
-exports.findCardInfo = findCardInfo;
-var transformUnsupportedBlockCardToInline = function transformUnsupportedBlockCardToInline(slice, state, cardOptions) {
-  var _state$schema$nodes = state.schema.nodes,
-    blockCard = _state$schema$nodes.blockCard,
-    inlineCard = _state$schema$nodes.inlineCard;
-  var children = [];
-  (0, _utils.mapChildren)(slice.content, function (node, i, frag) {
-    var _cardOptions$allowBlo;
-    if (node.type === blockCard && !isBlockCardSupported(state, frag, (_cardOptions$allowBlo = cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowBlockCards) !== null && _cardOptions$allowBlo !== void 0 ? _cardOptions$allowBlo : false)) {
-      children.push(inlineCard.createChecked(node.attrs, node.content, node.marks));
-    } else {
-      children.push(node);
-    }
-  });
-  return new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.fromArray(children), slice.openStart, slice.openEnd);
-};
-/**
- * Function to determine if a block card is supported by the editor
- * @param state
- * @param frag
- * @param allowBlockCards
- * @returns
- */
-exports.transformUnsupportedBlockCardToInline = transformUnsupportedBlockCardToInline;
-var isBlockCardSupported = function isBlockCardSupported(state, frag, allowBlockCards) {
-  return allowBlockCards && (0, _utils.isSupportedInParent)(state, frag);
-};
+exports.findCardInfo = findCardInfo;

package/dist/cjs/plugins/hyperlink/Toolbar.js

@@ -19,29 +19,30 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _messages = require("../../messages");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _ui = require("@atlaskit/editor-common/ui");
-var _HyperlinkToolbarAppearance = require("./HyperlinkToolbarAppearance");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _analytics2 = require("../analytics");
+var _toolbarButtons = require("./pm-plugins/toolbar-buttons");
 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; }
 /* type guard for edit links */
 function isEditLink(linkMark) {
   return linkMark.pos !== undefined;
 }
-var dispatchAnalytics = function dispatchAnalytics(dispatch, state, analyticsBuilder) {
+var dispatchAnalytics = function dispatchAnalytics(dispatch, state, analyticsBuilder, editorAnalyticsApi) {
   if (dispatch) {
-    dispatch((0, _analytics2.addAnalytics)(state, state.tr, analyticsBuilder(_analytics.ACTION_SUBJECT_ID.HYPERLINK)));
+    var tr = state.tr;
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent(analyticsBuilder(_analytics.ACTION_SUBJECT_ID.HYPERLINK))(tr);
+    dispatch(tr);
   }
 };
-var visitHyperlink = function visitHyperlink() {
+var visitHyperlink = function visitHyperlink(editorAnalyticsApi) {
   return function (state, dispatch) {
-    dispatchAnalytics(dispatch, state, _analytics.buildVisitedLinkPayload);
+    dispatchAnalytics(dispatch, state, _analytics.buildVisitedLinkPayload, editorAnalyticsApi);
     return true;
   };
 };
-var openLinkSettings = function openLinkSettings() {
+var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
   return function (state, dispatch) {
-    dispatchAnalytics(dispatch, state, _analytics.buildOpenedSettingsPayload);
+    dispatchAnalytics(dispatch, state, _analytics.buildOpenedSettingsPayload, editorAnalyticsApi);
     return true;
   };
 };
@@ -59,7 +60,7 @@ function getLinkText(activeLinkMark, state) {
   }
   return activeLinkMark.node.text;
 }
-var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featureFlags) {
+var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featureFlags, editorAnalyticsApi) {
   var floatingToolbarLinkSettingsButton = featureFlags.floatingToolbarLinkSettingsButton;
   return floatingToolbarLinkSettingsButton === 'true' ? [{
     type: 'separator'
@@ -68,15 +69,17 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featur
     type: 'button',
     icon: _settings.default,
     title: intl.formatMessage(_messages.linkToolbarMessages.settingsLink),
-    onClick: openLinkSettings(),
+    onClick: openLinkSettings(editorAnalyticsApi),
     href: 'https://id.atlassian.com/manage-profile/link-preferences',
     target: '_blank'
   }] : [];
 };
-var getToolbarConfig = function getToolbarConfig(options, featureFlags, editorAnalyticsApi) {
+var getToolbarConfig = function getToolbarConfig(options, featureFlags, pluginInjectionApi) {
   return function (state, intl, providerFactory) {
+    var _pluginInjectionApi$d;
     var formatMessage = intl.formatMessage;
     var linkState = _main.stateKey.getState(state);
+    var editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions;
 
     /**
      * Enable focus trap only if feature flag is enabled AND for the new version of the picker
@@ -99,6 +102,7 @@ var getToolbarConfig = function getToolbarConfig(options, featureFlags, editorAn
       switch (activeLinkMark.type) {
         case 'EDIT':
           {
+            var _toolbarKey$getState$, _toolbarKey$getState;
             var pos = activeLinkMark.pos,
               node = activeLinkMark.node;
             var linkMark = node.marks.filter(function (mark) {
@@ -120,23 +124,7 @@ var getToolbarConfig = function getToolbarConfig(options, featureFlags, editorAn
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               height: 32,
               width: 250,
-              items: [{
-                type: 'custom',
-                fallback: [],
-                render: function render(editorView) {
-                  return /*#__PURE__*/_react.default.createElement(_HyperlinkToolbarAppearance.HyperlinkToolbarAppearance, {
-                    key: "link-appearance",
-                    url: link,
-                    intl: intl,
-                    editorView: editorView,
-                    editorState: state,
-                    cardOptions: options === null || options === void 0 ? void 0 : options.cardOptions,
-                    providerFactory: providerFactory,
-                    platform: options === null || options === void 0 ? void 0 : options.platform,
-                    editorAnalyticsApi: editorAnalyticsApi
-                  });
-                }
-              }, {
+              items: [].concat((0, _toConsumableArray2.default)((_toolbarKey$getState$ = (_toolbarKey$getState = _toolbarButtons.toolbarKey.getState(state)) === null || _toolbarKey$getState === void 0 ? void 0 : _toolbarKey$getState.items(state, intl, providerFactory, link)) !== null && _toolbarKey$getState$ !== void 0 ? _toolbarKey$getState$ : []), [{
                 id: 'editor.link.edit',
                 type: 'button',
                 onClick: (0, _commands.editInsertedLink)(),
@@ -152,7 +140,7 @@ var getToolbarConfig = function getToolbarConfig(options, featureFlags, editorAn
                 disabled: !isValidUrl,
                 target: '_blank',
                 href: isValidUrl ? link : undefined,
-                onClick: visitHyperlink(),
+                onClick: visitHyperlink(editorAnalyticsApi),
                 selected: false,
                 title: labelOpenLink,
                 icon: _shortcut.default,
@@ -180,7 +168,7 @@ var getToolbarConfig = function getToolbarConfig(options, featureFlags, editorAn
                   formatMessage: formatMessage,
                   markType: state.schema.marks.link
                 }]
-              }].concat((0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl, featureFlags))),
+              }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl, featureFlags, editorAnalyticsApi))),
               scrollable: true
             });
           }

package/dist/cjs/plugins/hyperlink/commands.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.editInsertedLink = editInsertedLink;
 exports.hideLinkToolbar = hideLinkToolbar;
+exports.hideLinkToolbarSetMeta = hideLinkToolbarSetMeta;
 exports.insertLink = insertLink;
 exports.insertLinkWithAnalyticsMobileNative = exports.insertLinkWithAnalytics = void 0;
 exports.isLinkAtPos = isLinkAtPos;
@@ -209,10 +210,13 @@ function showLinkToolbar() {
 function hideLinkToolbar() {
   return function (state, dispatch) {
     if (dispatch) {
-      dispatch(state.tr.setMeta(_main.stateKey, {
-        type: _main.LinkAction.HIDE_TOOLBAR
-      }));
+      dispatch(hideLinkToolbarSetMeta(state.tr));
     }
     return true;
   };
+}
+function hideLinkToolbarSetMeta(tr) {
+  return tr.setMeta(_main.stateKey, {
+    type: _main.LinkAction.HIDE_TOOLBAR
+  });
 }

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

@@ -11,13 +11,14 @@ var _inputRule = require("./pm-plugins/input-rule");
 var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
 var _fakeCursorForToolbar = _interopRequireDefault(require("./pm-plugins/fake-cursor-for-toolbar"));
+var _toolbarButtons = require("./pm-plugins/toolbar-buttons");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _Toolbar = require("./Toolbar");
 var _keymaps = require("../../keymaps");
 var _assets = require("../quick-insert/assets");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var hyperlinkPlugin = function hyperlinkPlugin() {
-  var _api$dependencies, _api$dependencies$fea, _api$dependencies$ana;
+  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()) || {};
@@ -29,6 +30,9 @@ var hyperlinkPlugin = function hyperlinkPlugin() {
         mark: _adfSchema.link
       }];
     },
+    actions: {
+      prependToolbarButtons: _toolbarButtons.prependToolbarButtons
+    },
     pmPlugins: function pmPlugins() {
       var _options$cardOptions;
       // Skip analytics if card provider is available, as they will be
@@ -57,6 +61,9 @@ var hyperlinkPlugin = function hyperlinkPlugin() {
         plugin: function plugin() {
           return (0, _keymap.createKeymapPlugin)(skipAnalytics);
         }
+      }, {
+        name: 'hyperlinkToolbarButtons',
+        plugin: _toolbarButtons.toolbarButtonsPlugin
       }];
     },
     pluginsOptions: {
@@ -92,7 +99,7 @@ var hyperlinkPlugin = function hyperlinkPlugin() {
           }
         }];
       },
-      floatingToolbar: (0, _Toolbar.getToolbarConfig)(options, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions)
+      floatingToolbar: (0, _Toolbar.getToolbarConfig)(options, featureFlags, api)
     }
   };
 };