@atlaskit/editor-core 176.0.3 → 177.0.0

package/dist/es2019/utils/commands.js

@@ -121,11 +121,26 @@ const applyMarkOnRange = (from, to, removeMark, mark, tr) => {
   return tr;
 };
 
+const entireSelectionContainsMark = (mark, doc, fromPos, toPos) => {
+  let onlyContainsMark = true;
+  doc.nodesBetween(fromPos, toPos, node => {
+    // Skip recursion once we've found text which doesn't include the mark
+    if (!onlyContainsMark) {
+      return false;
+    }
+
+    if (node.isText) {
+      onlyContainsMark &&= mark.isInSet(node.marks);
+    }
+  });
+  return onlyContainsMark;
+};
+
 const toggleMarkInRange = mark => (state, dispatch) => {
   const tr = state.tr;
 
   if (state.selection instanceof CellSelection) {
-    let markInRange = false;
+    let removeMark = true;
     const cells = [];
     state.selection.forEachCell((cell, cellPos) => {
       cells.push({
@@ -134,30 +149,27 @@ const toggleMarkInRange = mark => (state, dispatch) => {
       });
       const from = cellPos;
       const to = cellPos + cell.nodeSize;
-
-      if (!markInRange) {
-        markInRange = state.doc.rangeHasMark(from, to, mark);
-      }
+      removeMark &&= entireSelectionContainsMark(mark, state.doc, from, to);
     });
 
     for (let i = cells.length - 1; i >= 0; i--) {
       const cell = cells[i];
       const from = cell.pos;
       const to = from + cell.node.nodeSize;
-      applyMarkOnRange(from, to, markInRange, mark, tr);
+      applyMarkOnRange(from, to, removeMark, mark, tr);
     }
   } else {
     const {
       $from,
       $to
-    } = state.selection; // The type for `rangeHasMark` only accepts a `MarkType` as a third param,
-    // Yet the internals use a method that exists on both MarkType and Mark (one checks attributes the other doesnt)
-    // For example, with our subsup mark: We use the same mark with different attributes to convert
-    // different formatting but when using `MarkType.isInSet(marks)` it returns true for both.
-    // Calling `Mark.isInSet(marks)` compares attributes as well.
-
-    const markInRange = state.doc.rangeHasMark($from.pos, $to.pos, mark);
-    applyMarkOnRange($from.pos, $to.pos, markInRange, mark, tr);
+    } = state.selection; // We decide to remove the mark only if the entire selection contains the mark
+    // Examples with *bold* text
+    // Scenario 1: Selection contains both bold and non-bold text -> bold entire selection
+    // Scenario 2: Selection contains only bold text -> un-bold entire selection
+    // Scenario 3: Selection contains no bold text -> bold entire selection
+
+    const removeMark = entireSelectionContainsMark(mark, state.doc, $from.pos, $to.pos);
+    applyMarkOnRange($from.pos, $to.pos, removeMark, mark, tr);
   }
 
   if (tr.docChanged) {

package/dist/es2019/utils/input-rules.js

@@ -1,9 +1,11 @@
-import { closeHistory } from 'prosemirror-history';
 import { TextSelection } from 'prosemirror-state';
 import { canJoin, findWrapping } from 'prosemirror-transform';
 import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { createInputRulePlugin } from '@atlaskit/prosemirror-input-rules';
 import { addAnalytics } from '../plugins/analytics';
+import { closeHistory } from 'prosemirror-history';
+import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
+import { getFeatureFlags } from '../plugins/feature-flags-context';
 export const ruleWithAnalytics = getPayload => {
   return originalRule => {
     const onHandlerApply = (state, tr, matchResult) => {
@@ -122,6 +124,25 @@ export const createWrappingJoinRule = ({
     }
 
     tr.wrap(range, wrapping);
+    const featureFlags = getFeatureFlags(state);
+
+    if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && nodeType === state.schema.nodes.orderedList) {
+      // if an orderedList node would be inserted by the input rule match, and
+      // that orderedList node is being added directly before another orderedList
+      // node, then join those nodes
+      const $end = tr.doc.resolve(tr.mapping.map(end));
+      const node = findParentNodeOfTypeClosestToPos($end, nodeType);
+
+      if (node) {
+        const nodeEnd = node.pos + node.node.nodeSize;
+        const after = tr.doc.resolve(nodeEnd).nodeAfter;
+
+        if (after && after.type === nodeType && canJoin(tr.doc, nodeEnd) && (!joinPredicate || joinPredicate(match, after))) {
+          tr.join(nodeEnd);
+        }
+      }
+    }
+
     const before = tr.doc.resolve(fixedStart - 1).nodeBefore;
 
     if (before && before.type === nodeType && canJoin(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before))) {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "176.0.3";
+export const version = "177.0.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "176.0.3",
+	"version": "177.0.0",
 	"sideEffects": false
 }

package/dist/esm/create-editor/ReactEditorView.js

@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import { EditorState, Selection } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { injectIntl } from 'react-intl-next';
+import { editorMessages } from './messages';
 import { browser, getAnalyticsEventSeverity, getResponseEndTime, measureRender, startMeasure, stopMeasure, shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { ExperienceStore, EditorExperience, RELIABILITY_INTERVAL } from '@atlaskit/editor-common/ufo';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
@@ -633,7 +634,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       className: getUAPrefix(),
       key: "ProseMirror",
       ref: _this.handleEditorViewRef,
-      "aria-label": "Main content area",
+      "aria-label": _this.props.intl.formatMessage(editorMessages.editorAssistiveLabel),
       role: "textbox"
     }));
 

package/dist/esm/create-editor/create-plugins-list.js

@@ -78,7 +78,6 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     },
     placeholder: {
       placeholder: props.placeholder,
-      placeholderHints: props.placeholderHints,
       placeholderBracketHint: props.placeholderBracketHint
     },
     textFormatting: _objectSpread(_objectSpread({}, props.textFormatting || {}), {}, {
@@ -155,7 +154,11 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
   } // Needs to be after allowTextColor as order of buttons in toolbar depends on it
 
 
-  preset.add(listPlugin);
+  preset.add([listPlugin, {
+    restartNumberedLists: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.restartNumberedLists,
+    restartNumberedListsToolbar: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.restartNumberedListsToolbar,
+    listNumberContinuity: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.listNumberContinuity
+  }]);
 
   if (props.allowRule) {
     preset.add(rulePlugin);
@@ -242,10 +245,10 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
   }
 
   if (props.allowHelpDialog) {
-    preset.add([helpDialogPlugin, props.legacyImageUploadProvider]);
+    preset.add([helpDialogPlugin, !!props.legacyImageUploadProvider]);
   }
 
-  if (props.saveOnEnter) {
+  if (props.saveOnEnter && props.onSave) {
     preset.add([saveOnEnterPlugin, props.onSave]);
   }
 
@@ -313,7 +316,7 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
 
 
   if (!props.annotationProviders && props.allowConfluenceInlineComment) {
-    preset.add(annotationPlugin);
+    preset.add([annotationPlugin, undefined]);
   }
 
   if (props.allowDate) {
@@ -428,7 +431,7 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
   }
 
   if (featureFlags.enableViewUpdateSubscription) {
-    preset.add([viewUpdateSubscriptionPlugin]);
+    preset.add(viewUpdateSubscriptionPlugin);
   }
 
   preset.add([codeBidiWarningPlugin, {

package/dist/esm/create-editor/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export var editorMessages = defineMessages({
+  editorAssistiveLabel: {
+    id: 'fabric.editor.editorAssistiveLabel',
+    defaultMessage: 'Main content area, start typing to enter text.',
+    description: 'Text that is read out by screen reader when the main editor is in focus'
+  }
+});

package/dist/esm/i18n/en.js

@@ -100,8 +100,8 @@ export default {
   'fabric.editor.error': 'Error',
   'fabric.editor.errorPanel': 'Error panel',
   'fabric.editor.errorPanel.description': 'Call out errors in a colored panel',
-  'fabric.editor.extension.confirmDeleteLinkedModalMessage': 'Removing this extension will break anything connected to it.',
-  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': 'Remove extension',
+  'fabric.editor.extension.confirmDeleteLinkedModalMessage': 'Deleting {nodeName} will break anything connected to it.',
+  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': 'Delete',
   'fabric.editor.extensions.config-panel.save-indicator': 'All changes are always autosaved',
   'fabric.editor.find': 'Find',
   'fabric.editor.findNext': 'Find next',

package/dist/esm/i18n/en_GB.js

@@ -100,8 +100,8 @@ export default {
   'fabric.editor.error': 'Error',
   'fabric.editor.errorPanel': 'Error panel',
   'fabric.editor.errorPanel.description': 'Call out errors in a coloured panel',
-  'fabric.editor.extension.confirmDeleteLinkedModalMessage': 'Removing this extension will break anything connected to it.',
-  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': 'Remove extension',
+  'fabric.editor.extension.confirmDeleteLinkedModalMessage': 'Deleting {nodeName} will break anything connected to it.',
+  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': 'Delete',
   'fabric.editor.extensions.config-panel.save-indicator': 'All changes are always autosaved',
   'fabric.editor.find': 'Find',
   'fabric.editor.findNext': 'Find next',

package/dist/esm/i18n/en_ZZ.js

@@ -100,8 +100,8 @@ export default {
   'fabric.editor.error': '⁣⁢Error؜‌⁡‌؜⁡‌⁣⁤',
   'fabric.editor.errorPanel': '⁣⁢Error panel⁠‍؜⁠⁠؜‍⁠⁠⁡⁣⁤',
   'fabric.editor.errorPanel.description': '⁣⁢Call out errors in a colored panel⁡⁠؜⁡‍‌‍؜‍⁣⁤',
-  'fabric.editor.extension.confirmDeleteLinkedModalMessage': '⁣⁢Removing this extension will break anything connected to it.⁠؜⁡‌‌‍‌⁡⁠⁡⁡⁡⁡⁣⁤',
-  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': '⁣⁢Remove extension⁡‍‌‍⁠‌‍‍⁠⁠⁣⁤',
+  'fabric.editor.extension.confirmDeleteLinkedModalMessage': 'Deleting {nodeName} will break anything connected to it.⁠؜⁡‌‌‍‌⁡⁠⁡⁡⁡⁡⁣⁤',
+  'fabric.editor.extension.confirmDeleteLinkedModalOKButton': '⁣Delete⁡⁤',
   'fabric.editor.extensions.config-panel.save-indicator': '⁣⁢All changes are always autosaved⁠‍؜‌‌‍‍⁡‌‌‍‌‌⁣⁤',
   'fabric.editor.find': '⁣⁢Find⁠‌⁠‌⁠‍؜⁣⁤',
   'fabric.editor.findNext': '⁣⁢Find next؜‌؜‌؜⁠⁣⁤',

package/dist/esm/i18n/index.js

@@ -1,13 +1,15 @@
 /**
  * NOTE:
  *
- * This file is automatically generated by i18n-tools.
- * DO NOT CHANGE IT BY HAND or your changes will be lost.
+ * ED-16073:
+ * This was manually updated since the original `@atlaskit/i18n-tools` has been deprecated
  */
 export { default as zh } from './zh';
 export { default as zh_TW } from './zh_TW';
 export { default as cs } from './cs';
 export { default as da } from './da';
+export { default as en } from './en';
+export { default as en_GB } from './en_GB';
 export { default as nl } from './nl';
 export { default as et } from './et';
 export { default as fi } from './fi';
@@ -29,7 +31,5 @@ export { default as th } from './th';
 export { default as tr } from './tr';
 export { default as uk } from './uk';
 export { default as vi } from './vi';
-export { default as en } from './en';
-export { default as en_GB } from './en_GB';
 export { default as is } from './is';
 export { default as ro } from './ro';

package/dist/esm/i18n/languages.js

@@ -1,14 +1,15 @@
 /**
  * NOTE:
  *
- * This file is automatically generated by i18n-tools.
- * DO NOT CHANGE IT BY HAND or your changes will be lost.
+ * ED-16073:
+ * This was manually updated since the original `@atlaskit/i18n-tools` has been deprecated
  */
 export default {
   zh: 'Chinese',
+  zh_TW: 'Chinese (Traditional)',
   cs: 'Czech',
-  da: 'Danish',
   nl: 'Dutch',
+  da: 'Danish',
   en: 'English',
   en_GB: 'English (United Kingdom)',
   et: 'Estonian',
@@ -28,5 +29,9 @@ export default {
   ru: 'Russian',
   sk: 'Slovak',
   es: 'Spanish',
-  sv: 'Swedish'
+  sv: 'Swedish',
+  th: 'Thai',
+  tr: 'Turkish',
+  uk: 'Ukrainian',
+  vi: 'Vietnamese'
 };

package/dist/esm/labs/next/presets/mobile.js

@@ -85,8 +85,8 @@ export function useMobilePreset(_ref) {
     allowBlockCards: true,
     platform: 'mobile'
   }]);
-  preset.add([mentionsPlugin]);
-  preset.add([emojiPlugin]); // End
+  preset.add(mentionsPlugin);
+  preset.add(emojiPlugin); // End
 
   if (maxContentSize) {
     preset.add([maxContentSizePlugin, maxContentSize]);

package/dist/esm/labs/next/presets/preset.js

@@ -1,23 +1,46 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _construct from "@babel/runtime/helpers/construct";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 export var Preset = /*#__PURE__*/function () {
   function Preset() {
     _classCallCheck(this, Preset);
 
-    this.plugins = [];
+    for (var _len = arguments.length, more = new Array(_len), _key = 0; _key < _len; _key++) {
+      more[_key] = arguments[_key];
+    }
+
+    this.data = [].concat(more) || [];
   }
 
   _createClass(Preset, [{
     key: "add",
-    value: function add(plugin) {
-      this.plugins.push(plugin);
-      return this;
+    value: function add(nextOrTuple) {
+      var newPreset = _construct(Preset, [nextOrTuple].concat(_toConsumableArray(this.data))); // TODO: remove this `this.data.push`,
+      // once refactoring `create-plugins-list` to address this complexity:
+
+      /**
+       * preset.add(x)
+       * preset.add(y)
+       * preset.add(z)
+       */
+      // to:
+
+      /**
+       * immutablePreset = preset.add(x).add(foo).add(bar)
+       * presetWithY = presetWithY.add(y)
+       * presetWithZ = preset.add(z)
+       */
+
+
+      this.data.push(nextOrTuple);
+      return newPreset;
     }
   }, {
     key: "has",
     value: function has(plugin) {
-      return this.plugins.some(function (pluginPreset) {
+      return this.data.some(function (pluginPreset) {
         if (Array.isArray(pluginPreset)) {
           return pluginPreset[0] === plugin;
         }
@@ -35,7 +58,7 @@ export var Preset = /*#__PURE__*/function () {
     key: "processEditorPlugins",
     value: function processEditorPlugins() {
       var cache = new Map();
-      this.plugins.forEach(function (pluginEntry) {
+      this.data.forEach(function (pluginEntry) {
         if (Array.isArray(pluginEntry)) {
           var _pluginEntry = _slicedToArray(pluginEntry, 2),
               fn = _pluginEntry[0],
@@ -62,6 +85,13 @@ export var Preset = /*#__PURE__*/function () {
       cache.forEach(function (options, fn) {
         plugins.push(fn(options));
       });
+
+      if (plugins.some(function (plugin) {
+        return typeof plugin === 'function';
+      })) {
+        throw new Error("!!! NextEditorPluginWithDependencies detected in presets. That's an unsupported runtime use case right now.");
+      }
+
       return plugins;
     }
   }, {

package/dist/esm/plugins/annotation/nodeviews/index.js

@@ -43,6 +43,7 @@ export var AnnotationNodeView = /*#__PURE__*/function (_ReactNodeView) {
         /*#__PURE__*/
         // all inline comment states are now set in decorations at ../pm-plugins/inline-comment.ts
         React.createElement("span", {
+          "data-mark-type": "annotation",
           ref: forwardRef
         })
       );

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/index.js

@@ -22,6 +22,7 @@ import { NORMAL_TEXT } from '../../types';
 import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect } from './styled';
 import { tooltip, findKeymapByDescription } from '../../../../keymaps';
 import { BlockTypeButton } from './blocktype-button';
+import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 
 var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(ToolbarBlockType, _React$PureComponent);
@@ -64,16 +65,19 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         var isActive = currentBlockType === blockType;
         var tagName = blockType.tagName || 'p';
         var Tag = tagName;
+        var keyMap = findKeymapByDescription(blockType.title.defaultMessage);
         return {
           content: jsx("div", {
             css: blockTypeMenuItemStyle(tagName, isActive)
           }, jsx(Tag, null, formatMessage(blockType.title))),
           value: blockType,
           label: formatMessage(blockType.title),
+          'aria-label': tooltip(keyMap, formatMessage(blockType.title)),
+          keyShortcuts: getAriaKeyshortcuts(keyMap),
           key: "".concat(blockType.name, "-").concat(index),
           elemAfter: jsx("div", {
             css: [keyboardShortcut, isActive && keyboardShortcutSelect]
-          }, tooltip(findKeymapByDescription(blockType.title.defaultMessage))),
+          }, tooltip(keyMap)),
           isActive: isActive
         };
       });

package/dist/esm/plugins/breakout/ui/LayoutButton.js

@@ -33,6 +33,7 @@ import { getPluginState } from '../plugin-key';
 import { NodeSelection } from 'prosemirror-state';
 import { isSupportedNodeForBreakout } from '../utils/is-supported-node';
 import { token } from '@atlaskit/tokens';
+import { layers } from '@atlaskit/theme/constants';
 var toolbarButtonWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  && button {\n    background: ", ";\n    color: ", ";\n    :hover {\n      background: ", ";\n      color: ", " !important;\n    }\n  }\n"])), token('color.background.neutral', N20A), token('color.icon', N300), token('color.background.neutral.hovered', B300), token('color.icon', 'white'));
 var BREAKOUT_MODE = {
   FULL_WIDTH: 'full-width',
@@ -124,6 +125,7 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
       var titleMessage = getTitle(breakoutMode);
       var title = formatMessage(titleMessage);
       var nextBreakoutMode = getNextBreakoutMode(breakoutMode);
+      var belowOtherPopupsZIndex = layers.layer() - 1;
       var pluginState = getPluginState(state);
       var element = getBreakoutNodeElement(pluginState, state.selection, editorView);
 
@@ -147,7 +149,8 @@ var LayoutButton = /*#__PURE__*/function (_React$Component) {
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,
         stick: true,
-        forcePlacement: true
+        forcePlacement: true,
+        zIndex: belowOtherPopupsZIndex
       }, jsx("div", {
         css: toolbarButtonWrapper
       }, jsx(ToolbarButton, {

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

@@ -5,20 +5,19 @@ 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) { _defineProperty(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; }
 
-import { NodeSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
-import { pluginKey } from './plugin-key';
-import { queueCards, resolveCard } from './actions';
-import { appearanceForNodeType } from '../utils';
-import { nodesBetweenChanged, processRawValue } from '../../../utils';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../../../plugins/analytics';
+import { NodeSelection } from 'prosemirror-state';
 import { isSafeUrl } from '@atlaskit/adf-schema';
-import { isFromCurrentDomain } from '../../hyperlink/utils';
-import { shouldReplaceLink } from './shouldReplaceLink';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD } from '../../../plugins/analytics';
 import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
 import { getLinkCreationAnalyticsEvent } from '../../../plugins/hyperlink/analytics';
+import { nodesBetweenChanged, processRawValue } from '../../../utils';
 import { unlinkPayload } from '../../../utils/linking-utils';
-import { getFeatureFlags } from '../../feature-flags-context';
+import { isFromCurrentDomain } from '../../hyperlink/utils';
+import { appearanceForNodeType } from '../utils';
+import { queueCards, resolveCard } from './actions';
+import { pluginKey } from './plugin-key';
+import { shouldReplaceLink } from './shouldReplaceLink';
 /**
  * Attempt to replace the link into the respective card.
  */
@@ -215,17 +214,13 @@ export var changeSelectedCardToLink = function changeSelectedCardToLink(text, hr
 
     if (sendAnalytics) {
       if (selectedNode) {
-        var _getFeatureFlags = getFeatureFlags(state),
-            viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
-
         addAnalytics(state, tr, {
           action: ACTION.CHANGED_TYPE,
           actionSubject: ACTION_SUBJECT.SMART_LINK,
           eventType: EVENT_TYPE.TRACK,
           attributes: {
             newType: SMART_LINK_TYPE.URL,
-            previousType: appearanceForNodeType(selectedNode.type),
-            featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+            previousType: appearanceForNodeType(selectedNode.type)
           }
         });
       }
@@ -352,18 +347,13 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
     var from = state.selection.from;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-
-    var _getFeatureFlags2 = getFeatureFlags(state),
-        viewChangingExperimentToolbarStyle = _getFeatureFlags2.viewChangingExperimentToolbarStyle;
-
     addAnalytics(state, tr, {
       action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.SMART_LINK,
       eventType: EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
-        previousType: appearanceForNodeType(selectedNode.type),
-        featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+        previousType: appearanceForNodeType(selectedNode.type)
       }
     });
 

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

@@ -1,14 +1,13 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import rafSchedule from 'raf-schd';
 import { getInlineNodeViewProducer } from '../../../nodeviews/getInlineNodeViewProducer';
-import reducer from './reducers';
+import { BlockCard } from '../nodeviews/blockCard';
+import { EmbedCard } from '../nodeviews/embedCard';
+import { InlineCardNodeView } from '../nodeviews/inlineCard';
 import { pluginKey } from './plugin-key';
+import reducer from './reducers';
 import { handleProvider, resolveWithProvider } from './util/resolve';
 import { getNewRequests, getPluginState, getPluginStateWithUpdatedPos } from './util/state';
-import { EmbedCard } from '../nodeviews/embedCard';
-import { BlockCard } from '../nodeviews/blockCard';
-import { InlineCardNodeView } from '../nodeviews/inlineCard';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../../../plugins/analytics';
 export { pluginKey } from './plugin-key';
 export var createPlugin = function createPlugin(options) {
   return function (pmPluginFactoryParams) {
@@ -20,18 +19,6 @@ export var createPlugin = function createPlugin(options) {
     return new SafePlugin({
       state: {
         init: function init() {
-          var viewChangingExperimentToolbarStyle = pmPluginFactoryParams.featureFlags.viewChangingExperimentToolbarStyle;
-          pmPluginFactoryParams.dispatchAnalyticsEvent({
-            eventType: EVENT_TYPE.OPERATIONAL,
-            action: ACTION.EXPOSED,
-            actionSubject: 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/esm/plugins/card/toolbar.js

@@ -87,6 +87,8 @@ export var openLinkSettings = function openLinkSettings(state, dispatch) {
 };
 export 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,
@@ -112,10 +114,22 @@ export var floatingToolbar = function floatingToolbar(cardOptions, platform, lin
     } : {}; // Applies padding override for when link picker is currently displayed
 
     var className = pluginState.showLinkingToolbar ? 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 = 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(messages.card),
       className: className,
-      nodeType: nodeType
+      nodeType: nodeType,
+      preventPopupOverflow: preventPopupOverflow
     }, toolbarOffset), {}, {
       getDomRef: function getDomRef(view) {
         var element = findDomRefAtPos(view.state.selection.from, view.domAtPos.bind(view));
@@ -130,10 +144,10 @@ export var floatingToolbar = function floatingToolbar(cardOptions, platform, lin
 
         return element;
       },
-      items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions)
-    }, pluginState.showLinkingToolbar ? editLinkToolbarConfig : {}), {}, {
-      scrollable: pluginState.showLinkingToolbar ? false : true
-    });
+      items: generateToolbarItems(state, intl, providerFactory, cardOptions, platform, linkPickerOptions),
+      scrollable: pluginState.showLinkingToolbar ? false : true,
+      focusTrap: shouldEnableFocusTrap && pluginState.showLinkingToolbar
+    }, editLinkToolbarConfig(pluginState.showLinkingToolbar, isLinkPickerEnabled));
   };
 };
 
@@ -217,6 +231,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         }]
       }], _toConsumableArray(getSettingsButtonGroup(state, intl)), [{
         id: 'editor.link.delete',
+        focusEditoronEnter: true,
         type: 'button',
         appearance: 'danger',
         icon: RemoveIcon,
@@ -272,6 +287,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(linkToolbarMessages.unlink),
     icon: UnlinkIcon,
@@ -282,8 +298,8 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
 };
 
 var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
-  var _getFeatureFlags = getFeatureFlags(state),
-      floatingToolbarLinkSettingsButton = _getFeatureFlags.floatingToolbarLinkSettingsButton;
+  var _getFeatureFlags2 = getFeatureFlags(state),
+      floatingToolbarLinkSettingsButton = _getFeatureFlags2.floatingToolbarLinkSettingsButton;
 
   return floatingToolbarLinkSettingsButton === 'true' ? [{
     id: 'editor.link.settings',