@atlaskit/editor-core 176.0.3 → 177.0.1

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

@@ -11,33 +11,31 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _prosemirrorState = require("prosemirror-state");
-
 var _prosemirrorHistory = require("prosemirror-history");
 
-var _pluginKey = require("./plugin-key");
+var _prosemirrorState = require("prosemirror-state");
 
-var _actions = require("./actions");
+var _adfSchema = require("@atlaskit/adf-schema");
 
-var _utils = require("../utils");
+var _analytics = require("../../../plugins/analytics");
 
-var _utils2 = require("../../../utils");
+var _nodeEvents = require("../../../plugins/analytics/types/node-events");
 
-var _analytics = require("../../../plugins/analytics");
+var _analytics2 = require("../../../plugins/hyperlink/analytics");
 
-var _adfSchema = require("@atlaskit/adf-schema");
+var _utils = require("../../../utils");
 
-var _utils3 = require("../../hyperlink/utils");
+var _linkingUtils = require("../../../utils/linking-utils");
 
-var _shouldReplaceLink = require("./shouldReplaceLink");
+var _utils2 = require("../../hyperlink/utils");
 
-var _nodeEvents = require("../../../plugins/analytics/types/node-events");
+var _utils3 = require("../utils");
 
-var _analytics2 = require("../../../plugins/hyperlink/analytics");
+var _actions = require("./actions");
 
-var _linkingUtils = require("../../../utils/linking-utils");
+var _pluginKey = require("./plugin-key");
 
-var _featureFlagsContext = require("../../feature-flags-context");
+var _shouldReplaceLink = require("./shouldReplaceLink");
 
 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; }
 
@@ -94,7 +92,7 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
     }); // try to transform response to ADF
 
     var schema = editorState.schema;
-    var cardAdf = (0, _utils2.processRawValue)(schema, cardData);
+    var cardAdf = (0, _utils.processRawValue)(schema, cardData);
     var tr = editorState.tr;
 
     if (cardAdf) {
@@ -136,7 +134,7 @@ var replaceQueuedUrlWithCard = function replaceQueuedUrlWithCard(url, cardData,
             nodeType: nodeType,
             nodeContext: nodeContext,
             domainName: domainName,
-            fromCurrentDomain: (0, _utils3.isFromCurrentDomain)(url)
+            fromCurrentDomain: (0, _utils2.isFromCurrentDomain)(url)
           }
         });
       }
@@ -178,7 +176,7 @@ var queueCardsFromChangedTr = function queueCardsFromChangedTr(state, tr, source
   var schema = state.schema;
   var link = schema.marks.link;
   var requests = [];
-  (0, _utils2.nodesBetweenChanged)(tr, function (node, pos) {
+  (0, _utils.nodesBetweenChanged)(tr, function (node, pos) {
     if (!node.isText) {
       return true;
     }
@@ -250,17 +248,13 @@ var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sen
 
     if (sendAnalytics) {
       if (selectedNode) {
-        var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
-            viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
-
         (0, _analytics.addAnalytics)(state, tr, {
           action: _analytics.ACTION.CHANGED_TYPE,
           actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
           eventType: _analytics.EVENT_TYPE.TRACK,
           attributes: {
             newType: _nodeEvents.SMART_LINK_TYPE.URL,
-            previousType: (0, _utils.appearanceForNodeType)(selectedNode.type),
-            featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+            previousType: (0, _utils3.appearanceForNodeType)(selectedNode.type)
           }
         });
       }
@@ -387,7 +381,7 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
       return false;
     }
 
-    if ((0, _utils.appearanceForNodeType)(selectedNode.type) === appearance) {
+    if ((0, _utils3.appearanceForNodeType)(selectedNode.type) === appearance) {
       return false;
     }
 
@@ -398,18 +392,13 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
     var from = state.selection.from;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-
-    var _getFeatureFlags2 = (0, _featureFlagsContext.getFeatureFlags)(state),
-        viewChangingExperimentToolbarStyle = _getFeatureFlags2.viewChangingExperimentToolbarStyle;
-
     (0, _analytics.addAnalytics)(state, tr, {
       action: _analytics.ACTION.CHANGED_TYPE,
       actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
       eventType: _analytics.EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
-        previousType: (0, _utils.appearanceForNodeType)(selectedNode.type),
-        featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+        previousType: (0, _utils3.appearanceForNodeType)(selectedNode.type)
       }
     });
 

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

@@ -19,21 +19,19 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 
 var _getInlineNodeViewProducer = require("../../../nodeviews/getInlineNodeViewProducer");
 
-var _reducers = _interopRequireDefault(require("./reducers"));
-
-var _pluginKey = require("./plugin-key");
+var _blockCard = require("../nodeviews/blockCard");
 
-var _resolve = require("./util/resolve");
+var _embedCard = require("../nodeviews/embedCard");
 
-var _state = require("./util/state");
+var _inlineCard = require("../nodeviews/inlineCard");
 
-var _embedCard = require("../nodeviews/embedCard");
+var _pluginKey = require("./plugin-key");
 
-var _blockCard = require("../nodeviews/blockCard");
+var _reducers = _interopRequireDefault(require("./reducers"));
 
-var _inlineCard = require("../nodeviews/inlineCard");
+var _resolve = require("./util/resolve");
 
-var _analytics = require("../../../plugins/analytics");
+var _state = require("./util/state");
 
 var createPlugin = function createPlugin(options) {
   return function (pmPluginFactoryParams) {
@@ -45,18 +43,6 @@ var createPlugin = function createPlugin(options) {
     return new _safePlugin.SafePlugin({
       state: {
         init: function init() {
-          var viewChangingExperimentToolbarStyle = pmPluginFactoryParams.featureFlags.viewChangingExperimentToolbarStyle;
-          pmPluginFactoryParams.dispatchAnalyticsEvent({
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
-            action: _analytics.ACTION.EXPOSED,
-            actionSubject: _analytics.ACTION_SUBJECT.FEATURE,
-            attributes: {
-              flagKey: 'confluence.frontend.fabric.editor.view-changing-experiment-toolbar-style',
-              value: viewChangingExperimentToolbarStyle || 'noChange'
-            },
-            source: '@atlaskit/feature-flag-client',
-            tags: ['measurement']
-          });
           return {
             requests: [],
             provider: null,

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

@@ -17,11 +17,9 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _styles = require("@atlaskit/editor-common/styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject;
 
 var FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = 'card-floating-toolbar--link-picker';
 exports.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = FLOATING_TOOLBAR_LINKPICKER_CLASSNAME;
-var smartCardStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    max-width: calc(100% - 20px);\n    vertical-align: top;\n    word-break: break-all;\n\n    .card {\n      padding-left: 2px;\n      padding-right: 2px;\n      padding-top: 0.5em;\n      padding-bottom: 0.5em;\n      margin-bottom: -0.5em;\n\n      .", " > a:focus {\n        ", "\n      }\n    }\n\n    &.", "\n      .", "\n      > a {\n      ", "\n    }\n    .", " > a {\n      /* EDM-1717: box-shadow Safari fix start */\n      z-index: 1;\n      position: relative;\n      /* EDM-1717: box-shadow Safari fix end */\n    }\n\n    &.danger {\n      .", " > a {\n        box-shadow: 0 0 0 1px\n          ", ";\n        /* EDM-1717: box-shadow Safari fix start */\n        z-index: 2;\n        /* EDM-1717: box-shadow Safari fix end */\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n    }\n\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.danger {\n      .", " > div {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &::after {\n        transition: box-shadow 0s;\n      }\n    }\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.", "\n      .", "\n      > div::after {\n      ", "\n    }\n\n    &.danger {\n      .media-card-frame::after {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n        background: ", " !important;\n      }\n      .richMedia-resize-handle-right::after,\n      .richMedia-resize-handle-left::after {\n        background: ", ";\n      }\n    }\n  }\n\n  .", " {\n    padding: 0;\n  }\n"])), _styles.SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _tokens.token)('color.background.neutral.subtle.hovered', _colors.N20), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _styles.SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), (0, _tokens.token)('color.background.danger', _editorSharedStyles.akEditorDeleteBackground), (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);
+var smartCardStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .", " {\n    max-width: calc(100% - 20px);\n    vertical-align: top;\n    word-break: break-all;\n\n    .card {\n      padding-left: 2px;\n      padding-right: 2px;\n      padding-top: 0.5em;\n      padding-bottom: 0.5em;\n      margin-bottom: -0.5em;\n\n      .", " > a:focus {\n        ", "\n      }\n    }\n\n    &.", "\n      .", "\n      > a {\n      ", "\n    }\n    .", " > a {\n      /* EDM-1717: box-shadow Safari fix start */\n      z-index: 1;\n      position: relative;\n      /* EDM-1717: box-shadow Safari fix end */\n    }\n\n    &.danger {\n      .", " > a {\n        box-shadow: 0 0 0 1px\n          ", ";\n        /* EDM-1717: box-shadow Safari fix start */\n        z-index: 2;\n        /* EDM-1717: box-shadow Safari fix end */\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n    }\n\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.danger {\n      .", " > div {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &::after {\n        transition: box-shadow 0s;\n      }\n    }\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.", "\n      .", "\n      > div::after {\n      ", "\n    }\n\n    &.danger {\n      .media-card-frame::after {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n        background: ", " !important;\n      }\n      .richMedia-resize-handle-right::after,\n      .richMedia-resize-handle-left::after {\n        background: ", ";\n      }\n    }\n  }\n\n  .", " {\n    padding: 0;\n  }\n"])), _styles.SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _styles.SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), _editorSharedStyles.akEditorSelectedNodeClassName, _styles.SmartCardSharedCssClassName.LOADER_WRAPPER, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);
 exports.smartCardStyles = smartCardStyles;

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

@@ -133,6 +133,8 @@ exports.openLinkSettings = openLinkSettings;
 
 var floatingToolbar = function floatingToolbar(cardOptions, platform, linkPickerOptions) {
   return function (state, intl, providerFactory) {
+    var _linkPickerOptions$pl;
+
     var _state$schema$nodes = state.schema.nodes,
         inlineCard = _state$schema$nodes.inlineCard,
         blockCard = _state$schema$nodes.blockCard,
@@ -159,10 +161,22 @@ var floatingToolbar = function floatingToolbar(cardOptions, platform, linkPicker
     } : {}; // Applies padding override for when link picker is currently displayed
 
     var className = pluginState.showLinkingToolbar ? _styles2.FLOATING_TOOLBAR_LINKPICKER_CLASSNAME : undefined;
-    return _objectSpread(_objectSpread(_objectSpread({
+    /**
+     * Enable focus trap only if feature flag is enabled AND for the new version of the picker
+     */
+
+    var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
+        lpLinkPicker = _getFeatureFlags.lpLinkPicker,
+        lpLinkPickerFocusTrap = _getFeatureFlags.lpLinkPickerFocusTrap,
+        preventPopupOverflow = _getFeatureFlags.preventPopupOverflow;
+
+    var shouldEnableFocusTrap = lpLinkPicker && lpLinkPickerFocusTrap;
+    var isLinkPickerEnabled = !!lpLinkPicker && !!(linkPickerOptions !== null && linkPickerOptions !== void 0 && (_linkPickerOptions$pl = linkPickerOptions.plugins) !== null && _linkPickerOptions$pl !== void 0 && _linkPickerOptions$pl.length);
+    return _objectSpread(_objectSpread({
       title: intl.formatMessage(_messages2.messages.card),
       className: className,
-      nodeType: nodeType
+      nodeType: nodeType,
+      preventPopupOverflow: preventPopupOverflow
     }, toolbarOffset), {}, {
       getDomRef: function getDomRef(view) {
         var element = (0, _prosemirrorUtils.findDomRefAtPos)(view.state.selection.from, view.domAtPos.bind(view));
@@ -177,10 +191,10 @@ var floatingToolbar = function floatingToolbar(cardOptions, platform, linkPicker
 
         return element;
       },
-      items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions)
-    }, pluginState.showLinkingToolbar ? _EditLinkToolbar.editLinkToolbarConfig : {}), {}, {
-      scrollable: pluginState.showLinkingToolbar ? false : true
-    });
+      items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions),
+      scrollable: pluginState.showLinkingToolbar ? false : true,
+      focusTrap: shouldEnableFocusTrap && pluginState.showLinkingToolbar
+    }, (0, _EditLinkToolbar.editLinkToolbarConfig)(pluginState.showLinkingToolbar, isLinkPickerEnabled));
   };
 };
 
@@ -267,6 +281,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         }]
       }], (0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl)), [{
         id: 'editor.link.delete',
+        focusEditoronEnter: true,
         type: 'button',
         appearance: 'danger',
         icon: _remove.default,
@@ -322,6 +337,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
 var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inlineCard) {
   return node.type === inlineCard ? [{
     id: 'editor.link.unlink',
+    focusEditoronEnter: true,
     type: 'button',
     title: intl.formatMessage(_messages.linkToolbarMessages.unlink),
     icon: _unlink.default,
@@ -332,8 +348,8 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
 };
 
 var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
-  var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
-      floatingToolbarLinkSettingsButton = _getFeatureFlags.floatingToolbarLinkSettingsButton;
+  var _getFeatureFlags2 = (0, _featureFlagsContext.getFeatureFlags)(state),
+      floatingToolbarLinkSettingsButton = _getFeatureFlags2.floatingToolbarLinkSettingsButton;
 
   return floatingToolbarLinkSettingsButton === 'true' ? [{
     id: 'editor.link.settings',

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

@@ -123,8 +123,8 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
       linkPicker = _ref.linkPicker;
   return {
     type: 'custom',
-    fallback: [],
     disableArrowNavigation: true,
+    fallback: [],
     render: function render(view, idx) {
       if (!view || !providerFactory) {
         return null;
@@ -159,9 +159,13 @@ var buildEditLinkToolbar = function buildEditLinkToolbar(_ref) {
 };
 
 exports.buildEditLinkToolbar = buildEditLinkToolbar;
-var editLinkToolbarConfig = {
-  height: _ToolbarComponents.RECENT_SEARCH_HEIGHT_IN_PX,
-  width: _ToolbarComponents.RECENT_SEARCH_WIDTH_IN_PX,
-  forcePlacement: true
+
+var editLinkToolbarConfig = function editLinkToolbarConfig(showLinkingToolbar, linkPickerOptions) {
+  return showLinkingToolbar ? {
+    height: linkPickerOptions ? _ToolbarComponents.LINKPICKER_HEIGHT_IN_PX : _ToolbarComponents.RECENT_SEARCH_HEIGHT_IN_PX,
+    width: _ToolbarComponents.RECENT_SEARCH_WIDTH_IN_PX,
+    forcePlacement: true
+  } : {};
 };
+
 exports.editLinkToolbarConfig = editLinkToolbarConfig;

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

@@ -21,31 +21,23 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _react = _interopRequireDefault(require("react"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _prosemirrorModel = require("prosemirror-model");
 
-var _doc = require("../pm-plugins/doc");
-
-var _nodes = require("../../../utils/nodes");
-
-var _Dropdown = _interopRequireDefault(require("../../floating-toolbar/ui/Dropdown"));
-
-var _messages = require("../messages");
+var _react = _interopRequireDefault(require("react"));
 
-var _messages2 = _interopRequireDefault(require("../../../messages"));
+var _messages = _interopRequireDefault(require("../../../messages"));
 
-var _featureFlagsContext = require("../../../plugins/feature-flags-context");
+var _nodes = require("../../../utils/nodes");
 
-var _LinkToolbarIconDropdown = require("./LinkToolbarIconDropdown");
+var _messages2 = require("../messages");
 
-var _LinkToolbarButtonGroup = require("./LinkToolbarButtonGroup");
+var _doc = require("../pm-plugins/doc");
 
 var _linkToolbarButtonGroupOptions = require("./link-toolbar-button-group-options");
 
-var _linkToolbarIconDropdownOptions = require("./link-toolbar-icon-dropdown-options");
+var _LinkToolbarButtonGroup = require("./LinkToolbarButtonGroup");
 
 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); }; }
 
@@ -90,7 +82,7 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
       var isEmbedCardLinkSupportedInParent = allowEmbeds ? (0, _nodes.isSupportedInParent)(editorState, _prosemirrorModel.Fragment.from(editorState.schema.nodes.embedCard.createChecked({})), currentAppearance) : false;
       var embedOption = allowEmbeds && preview && {
         appearance: 'embed',
-        title: intl.formatMessage(_messages.messages.embed),
+        title: intl.formatMessage(_messages2.messages.embed),
         onClick: (0, _doc.setSelectedCardAppearance)('embed'),
         selected: currentAppearance === 'embed',
         hidden: false,
@@ -99,7 +91,7 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         tooltip: isEmbedCardLinkSupportedInParent ? undefined : getUnavailableMessage(editorState, intl)
       };
       var options = [{
-        title: intl.formatMessage(_messages.messages.url),
+        title: intl.formatMessage(_messages2.messages.url),
         onClick: function onClick() {
           return (0, _doc.changeSelectedCardToLink)(url, url, true)(editorState, view === null || view === void 0 ? void 0 : view.dispatch);
         },
@@ -107,13 +99,13 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         testId: 'url-appearance'
       }, {
         appearance: 'inline',
-        title: intl.formatMessage(_messages.messages.inline),
+        title: intl.formatMessage(_messages2.messages.inline),
         onClick: (0, _doc.setSelectedCardAppearance)('inline'),
         selected: currentAppearance === 'inline',
         testId: 'inline-appearance'
       }, {
         appearance: 'block',
-        title: intl.formatMessage(_messages.messages.block),
+        title: intl.formatMessage(_messages2.messages.block),
         onClick: (0, _doc.setSelectedCardAppearance)('block'),
         selected: currentAppearance === 'block',
         testId: 'block-appearance',
@@ -133,37 +125,11 @@ var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         options.push(embedOption);
       }
 
-      var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(editorState),
-          viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
-
-      if (viewChangingExperimentToolbarStyle === 'toolbarIcons') {
-        return /*#__PURE__*/_react.default.createElement(_LinkToolbarButtonGroup.LinkToolbarButtonGroup, {
-          key: "link-toolbar-button-group",
-          options: options.map(function (option) {
-            return (0, _linkToolbarButtonGroupOptions.getButtonGroupOption)(intl, dispatchCommand, option);
-          })
-        });
-      }
-
-      if (viewChangingExperimentToolbarStyle === 'newDropdown') {
-        return /*#__PURE__*/_react.default.createElement(_LinkToolbarIconDropdown.LinkToolbarIconDropdown, {
-          key: "link-toolbar-icon-dropdown",
-          title: "Change view",
-          buttonTestId: "link-toolbar-appearance-button",
-          dispatchCommand: dispatchCommand,
-          options: options.map(function (option) {
-            return (0, _linkToolbarIconDropdownOptions.getIconDropdownOption)(intl, dispatchCommand, option);
-          })
-        });
-      }
-
-      var title = intl.formatMessage(currentAppearance ? _messages.messages[currentAppearance] : _messages.messages.url);
-      return /*#__PURE__*/_react.default.createElement(_Dropdown.default, {
-        key: "link-toolbar",
-        buttonTestId: "link-toolbar-appearance-button",
-        title: title,
-        dispatchCommand: dispatchCommand,
-        options: options
+      return /*#__PURE__*/_react.default.createElement(_LinkToolbarButtonGroup.LinkToolbarButtonGroup, {
+        key: "link-toolbar-button-group",
+        options: options.map(function (option) {
+          return (0, _linkToolbarButtonGroupOptions.getButtonGroupOption)(intl, dispatchCommand, option);
+        })
       });
     });
     return _this;
@@ -188,14 +154,14 @@ exports.LinkToolbarAppearance = LinkToolbarAppearance;
 var getUnavailableMessage = function getUnavailableMessage(state, intl) {
   try {
     var parentNode = state.selection.$from.node(1);
-    var parentName = intl.formatMessage(_messages2.default[parentNode.type.name]);
-    var tooltip = intl.formatMessage(_messages.messages.displayOptionUnavailableInParentNode, {
+    var parentName = intl.formatMessage(_messages.default[parentNode.type.name]);
+    var tooltip = intl.formatMessage(_messages2.messages.displayOptionUnavailableInParentNode, {
       node: parentName
     });
     return tooltip;
   } catch (e) {
-    return intl.formatMessage(_messages.messages.displayOptionUnavailableInParentNode, {
-      node: intl.formatMessage(_messages2.default.defaultBlockNode)
+    return intl.formatMessage(_messages2.messages.displayOptionUnavailableInParentNode, {
+      node: intl.formatMessage(_messages.default.defaultBlockNode)
     });
   }
 };

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

@@ -76,13 +76,15 @@ var findCardInfo = function findCardInfo(state) {
 
 exports.findCardInfo = findCardInfo;
 
-var transformUnsupportedBlockCardToInline = function transformUnsupportedBlockCardToInline(slice, state) {
+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, _slice.mapChildren)(slice.content, function (node, i, frag) {
-    if (node.type === blockCard && !(0, _nodes.isSupportedInParent)(state, 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);
@@ -90,5 +92,17 @@ var transformUnsupportedBlockCardToInline = function transformUnsupportedBlockCa
   });
   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;
 
-exports.transformUnsupportedBlockCardToInline = transformUnsupportedBlockCardToInline;
+var isBlockCardSupported = function isBlockCardSupported(state, frag, allowBlockCards) {
+  return allowBlockCards && (0, _nodes.isSupportedInParent)(state, frag);
+};

package/dist/cjs/plugins/code-block/styles.js

@@ -15,8 +15,6 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _classNames = require("./ui/class-names");
 
 var _styles = require("@atlaskit/editor-common/styles");
@@ -24,11 +22,11 @@ var _styles = require("@atlaskit/editor-common/styles");
 var _templateObject, _templateObject2;
 
 var GutterDangerOverlay = function GutterDangerOverlay() {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  &::after {\n    height: 100%;\n    content: '';\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 24px;\n    background-color: ", ";\n  }\n"])), (0, _tokens.token)('color.blanket.danger', 'none'));
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  &::after {\n    height: 100%;\n    content: '';\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 24px;\n    background-color: ", ";\n  }\n"])), "var(--ds-blanket-danger, none)");
 };
 
 var codeBlockStyles = function codeBlockStyles(props) {
-  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n\n  .ProseMirror li {\n    /* if same list item has multiple code blocks we need top margin for all but first */\n    > .code-block {\n      margin: ", " 0 0 0;\n    }\n    > .code-block:first-child,\n    > .ProseMirror-gapcursor:first-child + .code-block {\n      margin-top: 0;\n    }\n\n    > div:last-of-type.code-block {\n      margin-bottom: ", ";\n    }\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px\n      ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n      ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n      ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), (0, _styles.codeBlockSharedStyles)(props), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, (0, _tokens.token)('color.border.danger', _editorSharedStyles.akEditorDeleteBorder), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.background.danger', _colors.R75), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), GutterDangerOverlay(), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.blanket.danger', _editorSharedStyles.akEditorDeleteBackground), _classNames.codeBlockClassNames.gutter, (0, _tokens.token)('color.background.danger', 'rgba(255, 143, 115, 0.5)'), (0, _tokens.token)('color.text.danger', _editorSharedStyles.akEditorDeleteIconColor), GutterDangerOverlay(), _classNames.codeBlockClassNames.content, (0, _tokens.token)('color.blanket.danger', 'rgba(255, 189, 173, 0.5)'));
+  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror {\n    ", "\n  }\n\n  .ProseMirror li {\n    /* if same list item has multiple code blocks we need top margin for all but first */\n    > .code-block {\n      margin: ", " 0 0 0;\n    }\n    > .code-block:first-child,\n    > .ProseMirror-gapcursor:first-child + .code-block {\n      margin-top: 0;\n    }\n\n    > div:last-of-type.code-block {\n      margin-bottom: ", ";\n    }\n  }\n\n  .ProseMirror .code-block.", ":not(.danger) {\n    ", "\n  }\n\n  /* Danger when top level node */\n  .ProseMirror .danger.code-block {\n    box-shadow: 0 0 0 ", "px\n      ", ";\n\n    .", " {\n      background-color: ", ";\n      color: ", ";\n      ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n\n  /* Danger when nested node */\n  .ProseMirror .danger .code-block {\n    .", " {\n      background-color: ", ";\n      color: ", ";\n      ", ";\n    }\n\n    .", " {\n      background-color: ", ";\n    }\n  }\n"])), (0, _styles.codeBlockSharedStyles)(props), _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket]), _editorSharedStyles.akEditorSelectedBorderSize, "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _classNames.codeBlockClassNames.gutter, "var(--ds-background-danger, ".concat(_colors.R75, ")"), "var(--ds-text-danger, ".concat(_editorSharedStyles.akEditorDeleteIconColor, ")"), GutterDangerOverlay(), _classNames.codeBlockClassNames.content, "var(--ds-blanket-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), _classNames.codeBlockClassNames.gutter, "var(--ds-background-danger, rgba(255, 143, 115, 0.5))", "var(--ds-text-danger, ".concat(_editorSharedStyles.akEditorDeleteIconColor, ")"), GutterDangerOverlay(), _classNames.codeBlockClassNames.content, "var(--ds-blanket-danger, rgba(255, 189, 173, 0.5))");
 };
 
 exports.codeBlockStyles = codeBlockStyles;

package/dist/cjs/plugins/collab-edit/actions.js

@@ -29,7 +29,7 @@ var handleInit = function handleInit(initData, view, options) {
     tr.setMeta('isRemote', true);
     view.dispatch(tr);
   } else if (json) {
-    applyRemoteSteps(json, undefined, view);
+    applyRemoteSteps(json, view);
   }
 };
 
@@ -55,13 +55,13 @@ var applyRemoteData = function applyRemoteData(remoteData, view, options) {
       userIds = _remoteData$userIds === void 0 ? [] : _remoteData$userIds;
 
   if (json) {
-    applyRemoteSteps(json, userIds, view, options);
+    applyRemoteSteps(json, view, userIds, options);
   }
 };
 
 exports.applyRemoteData = applyRemoteData;
 
-var applyRemoteSteps = function applyRemoteSteps(json, userIds, view, options) {
+var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, options) {
   if (!json || !json.length) {
     return;
   }

package/dist/cjs/plugins/collab-edit/styles.js

@@ -17,15 +17,13 @@ var _utils = require("./utils");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject;
 
 var telepointerColorStyle = function telepointerColorStyle(color, index) {
-  return "\n  &.color-".concat(index, " {\n    background-color: ").concat(color.selection, ";\n    &::after {\n      background-color: ").concat(color.solid, ";\n      color: ").concat((0, _tokens.token)('color.text.inverse', '#fff'), ";\n      border-color: ").concat(color.solid, ";\n    }\n  }\n");
+  return "\n  &.color-".concat(index, " {\n    background-color: ").concat(color.selection, ";\n    &::after {\n      background-color: ").concat(color.solid, ";\n      color: ", "var(--ds-text-inverse, #fff)", ";\n      border-color: ").concat(color.solid, ";\n    }\n  }\n");
 };
 
-var telepointerStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .telepointer {\n    position: relative;\n    transition: opacity 200ms;\n\n    &.telepointer-selection {\n      line-height: 1.2;\n      pointer-events: none;\n      user-select: none;\n    }\n\n    &.telepointer-selection-badge::after {\n      content: attr(data-initial);\n      position: absolute;\n      display: block;\n      top: -14px;\n      font-size: ", ";\n      padding: 2px;\n      color: ", ";\n      left: -1px;\n      border-radius: 2px 2px 2px 0;\n      line-height: initial;\n    }\n\n    &.", " {\n      opacity: 0.2;\n    }\n\n    ", ";\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(9), (0, _tokens.token)('color.text.inverse', 'white'), _pluginState.TELEPOINTER_DIM_CLASS, _utils.colors.map(function (color, index) {
+var telepointerStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  .ProseMirror .telepointer {\n    position: relative;\n    transition: opacity 200ms;\n\n    &.telepointer-selection {\n      line-height: 1.2;\n      pointer-events: none;\n      user-select: none;\n    }\n\n    &.telepointer-selection-badge::after {\n      content: attr(data-initial);\n      position: absolute;\n      display: block;\n      top: -14px;\n      font-size: ", ";\n      padding: 2px;\n      color: ", ";\n      left: -1px;\n      border-radius: 2px 2px 2px 0;\n      line-height: initial;\n    }\n\n    &.", " {\n      opacity: 0.2;\n    }\n\n    ", ";\n  }\n"])), (0, _editorSharedStyles.relativeFontSizeToBase16)(9), "var(--ds-text-inverse, white)", _pluginState.TELEPOINTER_DIM_CLASS, _utils.colors.map(function (color, index) {
   return telepointerColorStyle(color, index);
 }));
 exports.telepointerStyle = telepointerStyle;

package/dist/cjs/plugins/collab-edit/ui/styles.js

@@ -17,17 +17,15 @@ var _colors = require("@atlaskit/theme/colors");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _tokens = require("@atlaskit/tokens");
-
 var _templateObject, _templateObject2, _templateObject3;
 
-var inviteTeamWrapper = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: 50%;\n  min-width: ", "px;\n  margin-left: -", "px;\n"])), (0, _tokens.token)('color.background.neutral', _colors.N20), (0, _constants.gridSize)() * 4, (0, _constants.gridSize)() / 2);
+var inviteTeamWrapper = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  border-radius: 50%;\n  min-width: ", "px;\n  margin-left: -", "px;\n"])), "var(--ds-background-neutral, ".concat(_colors.N20, ")"), (0, _constants.gridSize)() * 4, (0, _constants.gridSize)() / 2);
 exports.inviteTeamWrapper = inviteTeamWrapper;
 var avatarContainer = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  margin-right: ", "px;\n  display: flex;\n  align-items: center;\n\n  // ED-13102: This is to override list styles that come from the\n  // .wiki-content class in Confluence that should not apply within\n  // the toolbar. Has to be extra specific to override.\n  && > ul {\n    list-style-type: none;\n  }\n\n  div:last-child button.invite-to-edit {\n    border-radius: 50%;\n    height: 32px;\n    width: 32px;\n    padding: 2px;\n  }\n"])), (0, _constants.gridSize)());
 exports.avatarContainer = avatarContainer;
 
 var badge = function badge(color) {
-  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: block;\n  position: absolute;\n  right: 1px;\n  bottom: 1px;\n  width: 13px;\n  height: 13px;\n  z-index: ", ";\n  border-radius: 3px;\n  background: ", ";\n  color: ", ";\n  font-size: ", ";\n  line-height: 0;\n  padding-top: 7px;\n  text-align: center;\n  box-shadow: 0 0 1px ", ";\n  box-sizing: border-box;\n"])), _editorSharedStyles.akEditorSmallZIndex, color, (0, _tokens.token)('color.text.inverse', '#fff'), (0, _editorSharedStyles.relativeFontSizeToBase16)(9), (0, _tokens.token)('color.border.inverse', '#fff'));
+  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: block;\n  position: absolute;\n  right: 1px;\n  bottom: 1px;\n  width: 13px;\n  height: 13px;\n  z-index: ", ";\n  border-radius: 3px;\n  background: ", ";\n  color: ", ";\n  font-size: ", ";\n  line-height: 0;\n  padding-top: 7px;\n  text-align: center;\n  box-shadow: 0 0 1px ", ";\n  box-sizing: border-box;\n"])), _editorSharedStyles.akEditorSmallZIndex, color, "var(--ds-text-inverse, #fff)", (0, _editorSharedStyles.relativeFontSizeToBase16)(9), "var(--ds-border-inverse, #fff)");
 };
 
 exports.badge = badge;

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

@@ -37,7 +37,9 @@ function getCopyButtonConfig(options) {
   var state = options.state,
       formatMessage = options.formatMessage,
       onMouseEnter = options.onMouseEnter,
-      onMouseLeave = options.onMouseLeave;
+      onMouseLeave = options.onMouseLeave,
+      onFocus = options.onFocus,
+      onBlur = options.onBlur;
 
   var copyButtonState = _pluginKey.copyButtonPluginKey.getState(state);
 
@@ -49,11 +51,11 @@ function getCopyButtonConfig(options) {
       // 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'),
+      onFocus: 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)
+      onBlur: (0, _commands.resetCopiedState)(options.nodeType, onBlur)
     };
   } else {
     buttonActionHandlers = {