@atlaskit/editor-core 181.0.1 → 182.0.0

package/dist/esm/plugins/floating-toolbar/ui/Toolbar.js

@@ -19,7 +19,6 @@ import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius, gridSize } from '@atlaskit/theme/constants';
 import { DN70 } from '@atlaskit/theme/colors';
-import { getFeatureFlags } from '../../feature-flags-context';
 import { compareArrays, shallowEqual } from '../utils';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import Button from './Button';
@@ -53,9 +52,10 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
     extensionsProvider = _ref.extensionsProvider,
     node = _ref.node,
     setDisableScroll = _ref.setDisableScroll,
-    mountRef = _ref.mountRef;
+    mountRef = _ref.mountRef,
+    featureFlags = _ref.featureFlags;
   var emojiAndColourPickerMountPoint = scrollable ? popupsMountPoint || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.fabric-editor-popup-scroll-parent')) || (editorView === null || editorView === void 0 ? void 0 : editorView.dom.closest('.ak-editor-content-area')) || undefined : popupsMountPoint;
-  var _ref2 = editorView ? getFeatureFlags(editorView.state) : {
+  var _ref2 = featureFlags || {
       useSomewhatSemanticTextColorNames: false
     },
     useSomewhatSemanticTextColorNames = _ref2.useSomewhatSemanticTextColorNames;
@@ -221,7 +221,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
         if (!editorView || !extensionsProvider) {
           return null;
         }
-        var _ref3 = getFeatureFlags(editorView.state) || {},
+        var _ref3 = featureFlags || {},
           extendFloatingToolbar = _ref3.extendFloatingToolbar;
         if (!extendFloatingToolbar) {
           return null;
@@ -465,7 +465,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       }, jsx(ToolbarItems, _extends({}, this.props, {
         setDisableScroll: this.setDisableScroll.bind(this),
         mountRef: this.mountRef,
-        mounted: this.state.mounted
+        mounted: this.state.mounted,
+        featureFlags: this.props.featureFlags
       }))), scrollable && jsx(ScrollButtons, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,

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

@@ -16,8 +16,6 @@ import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDT
 import { HyperlinkToolbarAppearance } from './HyperlinkToolbarAppearance';
 import { addAnalytics, ACTION_SUBJECT_ID } from '../analytics';
 import { buildVisitedLinkPayload, buildOpenedSettingsPayload } from '../../utils/linking-utils';
-import { getFeatureFlags } from '../feature-flags-context';
-
 /* type guard for edit links */
 function isEditLink(linkMark) {
   return linkMark.pos !== undefined;
@@ -53,9 +51,8 @@ function getLinkText(activeLinkMark, state) {
   }
   return activeLinkMark.node.text;
 }
-var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
-  var _getFeatureFlags = getFeatureFlags(state),
-    floatingToolbarLinkSettingsButton = _getFeatureFlags.floatingToolbarLinkSettingsButton;
+var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featureFlags) {
+  var floatingToolbarLinkSettingsButton = featureFlags.floatingToolbarLinkSettingsButton;
   return floatingToolbarLinkSettingsButton === 'true' ? [{
     type: 'separator'
   }, {
@@ -68,7 +65,7 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
     target: '_blank'
   }] : [];
 };
-export var getToolbarConfig = function getToolbarConfig(options) {
+export var getToolbarConfig = function getToolbarConfig(options, featureFlags) {
   return function (state, intl, providerFactory) {
     var formatMessage = intl.formatMessage;
     var linkState = stateKey.getState(state);
@@ -76,10 +73,9 @@ export var getToolbarConfig = function getToolbarConfig(options) {
     /**
      * Enable focus trap only if feature flag is enabled AND for the new version of the picker
      */
-    var _getFeatureFlags2 = getFeatureFlags(state),
-      lpLinkPicker = _getFeatureFlags2.lpLinkPicker,
-      lpLinkPickerFocusTrap = _getFeatureFlags2.lpLinkPickerFocusTrap,
-      preventPopupOverflow = _getFeatureFlags2.preventPopupOverflow;
+    var lpLinkPicker = featureFlags.lpLinkPicker,
+      lpLinkPickerFocusTrap = featureFlags.lpLinkPickerFocusTrap,
+      preventPopupOverflow = featureFlags.preventPopupOverflow;
     var shouldEnableFocusTrap = lpLinkPicker && lpLinkPickerFocusTrap;
     if (linkState && linkState.activeLinkMark) {
       var activeLinkMark = linkState.activeLinkMark;
@@ -173,14 +169,13 @@ export var getToolbarConfig = function getToolbarConfig(options) {
                   formatMessage: formatMessage,
                   markType: state.schema.marks.link
                 }]
-              }].concat(_toConsumableArray(getSettingsButtonGroup(state, intl))),
+              }].concat(_toConsumableArray(getSettingsButtonGroup(state, intl, featureFlags))),
               scrollable: true
             });
           }
         case 'EDIT_INSERTED':
         case 'INSERT':
           {
-            var _options$linkPicker, _options$linkPicker$p;
             var _link;
             if (isEditLink(activeLinkMark) && activeLinkMark.node) {
               var _linkMark = activeLinkMark.node.marks.filter(function (mark) {
@@ -189,7 +184,7 @@ export var getToolbarConfig = function getToolbarConfig(options) {
               _link = _linkMark[0] && _linkMark[0].attrs.href;
             }
             var displayText = isEditLink(activeLinkMark) ? getLinkText(activeLinkMark, state) : linkState.activeText;
-            var popupHeight = lpLinkPicker && Boolean(options === null || options === void 0 ? void 0 : (_options$linkPicker = options.linkPicker) === null || _options$linkPicker === void 0 ? void 0 : (_options$linkPicker$p = _options$linkPicker.plugins) === null || _options$linkPicker$p === void 0 ? void 0 : _options$linkPicker$p.length) ? LINKPICKER_HEIGHT_IN_PX : RECENT_SEARCH_HEIGHT_IN_PX;
+            var popupHeight = lpLinkPicker ? LINKPICKER_HEIGHT_IN_PX : RECENT_SEARCH_HEIGHT_IN_PX;
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               preventPopupOverflow: preventPopupOverflow,
               height: popupHeight,
@@ -207,6 +202,7 @@ export var getToolbarConfig = function getToolbarConfig(options) {
                     view: view,
                     key: idx,
                     linkPickerOptions: options === null || options === void 0 ? void 0 : options.linkPicker,
+                    featureFlags: featureFlags,
                     displayUrl: _link,
                     displayText: displayText || '',
                     providerFactory: providerFactory,

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

@@ -9,7 +9,11 @@ import { getToolbarConfig } from './Toolbar';
 import { tooltip, addLink } from '../../keymaps';
 import { IconLink } from '../quick-insert/assets';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
-var hyperlinkPlugin = function hyperlinkPlugin(options) {
+var hyperlinkPlugin = function hyperlinkPlugin() {
+  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()) || {};
   return {
     name: 'hyperlink',
     marks: function marks() {
@@ -79,7 +83,7 @@ var hyperlinkPlugin = function hyperlinkPlugin(options) {
           }
         }];
       },
-      floatingToolbar: getToolbarConfig(options)
+      floatingToolbar: getToolbarConfig(options, featureFlags)
     }
   };
 };

package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/index.js

@@ -12,7 +12,6 @@ import HyperlinkAddToolbarComp from './HyperlinkAddToolbar';
 import { INPUT_METHOD } from '../../../analytics/types';
 import { stateKey as pluginKey } from '../../pm-plugins/main';
 import WithPluginState from '../../../../ui/WithPluginState';
-import { getFeatureFlags } from '../../../feature-flags-context';
 import { EditorLinkPicker } from '../EditorLinkPicker';
 /**
  * Wraps around the editor's onSubmit handler so that the plugin can interface with the link picker
@@ -46,7 +45,8 @@ var HyperlinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
         providerFactory = _this$props.providerFactory,
         view = _this$props.view,
         onCancel = _this$props.onCancel,
-        invokeMethod = _this$props.invokeMethod;
+        invokeMethod = _this$props.invokeMethod,
+        featureFlags = _this$props.featureFlags;
       return /*#__PURE__*/React.createElement(WithProviders, {
         providers: ['activityProvider', 'searchProvider'],
         providerFactory: providerFactory,
@@ -60,8 +60,7 @@ var HyperlinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
             },
             render: function render(_ref3) {
               var hyperlinkPluginState = _ref3.hyperlinkPluginState;
-              var _getFeatureFlags = getFeatureFlags(view.state),
-                lpLinkPicker = _getFeatureFlags.lpLinkPicker;
+              var lpLinkPicker = featureFlags.lpLinkPicker;
               if (lpLinkPicker) {
                 return /*#__PURE__*/React.createElement(EditorLinkPicker, _extends({
                   view: view,

package/dist/esm/plugins/index.js

@@ -64,4 +64,5 @@ export { default as avatarGroupPlugin } from './avatar-group';
 export { default as viewUpdateSubscriptionPlugin } from './view-update-subscription';
 export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';
 export { default as codeBidiWarningPlugin } from './code-bidi-warning';
-export { default as copyButtonPlugin } from './copy-button';
+export { default as copyButtonPlugin } from './copy-button';
+export { default as borderPlugin } from './border';

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -426,7 +426,8 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         offset: [0, 3],
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement
+        scrollableElement: popupsScrollableElement,
+        focusTrap: true
       }, jsx(EmojiPickerWithListeners, {
         emojiProvider: emojiProvider,
         onSelection: this.handleSelectedEmoji,

package/dist/esm/plugins/list/actions/outdent-list-items-selected.js

@@ -9,10 +9,9 @@ import { isListNode, isListItemNode, joinSiblingLists, JoinDirection } from '../
 import { findFirstParentListItemNode, findRootParentListNode } from '../utils/find';
 import { normalizeListItemsSelection, createListNodeRange } from '../utils/selection';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
-import { getFeatureFlags } from '../../feature-flags-context';
 import { storeRestartListsAttributes, getRestartListsAttributes } from '../utils/analytics';
 import { OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
-export var outdentListItemsSelected = function outdentListItemsSelected(tr, state) {
+export var outdentListItemsSelected = function outdentListItemsSelected(tr, state, featureFlags) {
   var originalSelection = tr.selection;
   var normalizedSelection = normalizeListItemsSelection({
     selection: tr.selection,
@@ -47,7 +46,8 @@ export var outdentListItemsSelected = function outdentListItemsSelected(tr, stat
       extractListItemsRangeFromList({
         tr: tr,
         range: mappedRange,
-        state: state
+        state: state,
+        featureFlags: featureFlags
       });
       hasNormalizedToPositionLiftedOut = hasNormalizedToPositionLiftedOut || oldTo >= range.from && oldTo < range.to;
       hasNormalizedFromPositionLiftedOut = hasNormalizedFromPositionLiftedOut || oldFrom >= range.from && oldFrom < range.to;
@@ -168,7 +168,8 @@ var outdentRangeToParentList = function outdentRangeToParentList(_ref2) {
 var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3) {
   var tr = _ref3.tr,
     range = _ref3.range,
-    state = _ref3.state;
+    state = _ref3.state,
+    featureFlags = _ref3.featureFlags;
   var list = range.parent;
   var $start = tr.doc.resolve(range.start);
   var listStart = $start.start(range.depth);
@@ -190,7 +191,6 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
     }
   }
   var nextList = list.copy(Fragment.empty);
-  var featureFlags = getFeatureFlags(state);
   var nextListStartNumber;
   if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
     // if splitting a numbered list, keep the splitted item

package/dist/esm/plugins/list/commands/index.js

@@ -21,36 +21,40 @@ import { outdentList } from './outdent-list';
 import { indentList } from './indent-list';
 import { moveTargetIntoList } from '../utils/replace-content';
 export { outdentList, indentList };
-export var enterKeyCommand = function enterKeyCommand(state, dispatch) {
-  var selection = state.selection;
-  if (selection.empty) {
-    var $from = selection.$from;
-    var _state$schema$nodes = state.schema.nodes,
-      listItem = _state$schema$nodes.listItem,
-      codeBlock = _state$schema$nodes.codeBlock;
-    var wrapper = $from.node($from.depth - 1);
-    if (wrapper && wrapper.type === listItem) {
-      /** Check if the wrapper has any visible content */
-      var wrapperHasContent = hasVisibleContent(wrapper);
-      if (!wrapperHasContent) {
-        return outdentList(INPUT_METHOD.KEYBOARD)(state, dispatch);
-      } else if (!hasParentNodeOfType(codeBlock)(selection)) {
-        return splitListItem(listItem)(state, dispatch);
+export var enterKeyCommand = function enterKeyCommand(featureFlags) {
+  return function (state, dispatch) {
+    var selection = state.selection;
+    if (selection.empty) {
+      var $from = selection.$from;
+      var _state$schema$nodes = state.schema.nodes,
+        listItem = _state$schema$nodes.listItem,
+        codeBlock = _state$schema$nodes.codeBlock;
+      var wrapper = $from.node($from.depth - 1);
+      if (wrapper && wrapper.type === listItem) {
+        /** Check if the wrapper has any visible content */
+        var wrapperHasContent = hasVisibleContent(wrapper);
+        if (!wrapperHasContent) {
+          return outdentList(INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
+        } else if (!hasParentNodeOfType(codeBlock)(selection)) {
+          return splitListItem(listItem)(state, dispatch);
+        }
       }
     }
-  }
-  return false;
+    return false;
+  };
 };
-export var backspaceKeyCommand = function backspaceKeyCommand(state, dispatch) {
-  return baseCommand.chainCommands(listBackspace,
-  // if we're at the start of a list item, we need to either backspace
-  // directly to an empty list item above, or outdent this node
-  filter([isEmptySelectionAtStart,
-  // list items might have multiple paragraphs; only do this at the first one
-  isFirstChildOfParent, isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, outdentList(INPUT_METHOD.KEYBOARD))),
-  // if we're just inside a paragraph node (or gapcursor is shown) and backspace, then try to join
-  // the text to the previous list item, if one exists
-  filter([isEmptySelectionAtStart, canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+export var backspaceKeyCommand = function backspaceKeyCommand(featureFlags) {
+  return function (state, dispatch) {
+    return baseCommand.chainCommands(listBackspace,
+    // if we're at the start of a list item, we need to either backspace
+    // directly to an empty list item above, or outdent this node
+    filter([isEmptySelectionAtStart,
+    // list items might have multiple paragraphs; only do this at the first one
+    isFirstChildOfParent, isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, outdentList(INPUT_METHOD.KEYBOARD, featureFlags))),
+    // if we're just inside a paragraph node (or gapcursor is shown) and backspace, then try to join
+    // the text to the previous list item, if one exists
+    filter([isEmptySelectionAtStart, canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+  };
 };
 export var deleteKeyCommand = joinListItemForward;
 

package/dist/esm/plugins/list/commands/outdent-list.js

@@ -9,9 +9,9 @@ import { findFirstParentListNode } from '../utils/find';
 import { getCommonListAnalyticsAttributes, getRestartListsAttributes } from '../utils/analytics';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
 import { closeHistory } from 'prosemirror-history';
-import { getFeatureFlags } from '../../feature-flags-context';
 export function outdentList() {
   var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
+  var featureFlags = arguments.length > 1 ? arguments[1] : undefined;
   return function (state, dispatch) {
     if (!isInsideListItem(state)) {
       return false;
@@ -27,13 +27,12 @@ export function outdentList() {
     closeHistory(state.tr);
     var actionSubjectId = isBulletList(parentListNode.node) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
     var customTr = state.tr;
-    outdentListAction(customTr, state);
+    outdentListAction(customTr, state, featureFlags);
     if (!customTr || !customTr.docChanged) {
       // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
       // If inside table cell and can't outdent list, then let it handle by table keymap
       return !isInsideTableCell(state);
     }
-    var featureFlags = getFeatureFlags(state);
     var restartListsAttributes = {};
     if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
       var _getRestartListsAttri = getRestartListsAttributes(customTr),

package/dist/esm/plugins/list/index.js

@@ -11,7 +11,8 @@ import { IconList, IconListNumber } from '../quick-insert/assets';
   Toolbar buttons to bullet and ordered list can be found in
   packages/editor/editor-core/src/plugins/toolbar-lists-indentation/ui/Toolbar.tsx
  */
-var listPlugin = function listPlugin(options) {
+var listPlugin = function listPlugin(options, api) {
+  var featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
   return {
     name: 'list',
     nodes: function nodes() {
@@ -31,7 +32,7 @@ var listPlugin = function listPlugin(options) {
         name: 'list',
         plugin: function plugin(_ref) {
           var dispatch = _ref.dispatch;
-          return createPlugin(dispatch);
+          return createPlugin(dispatch, featureFlags);
         }
       }, {
         name: 'listInputRule',
@@ -43,7 +44,7 @@ var listPlugin = function listPlugin(options) {
       }, {
         name: 'listKeymap',
         plugin: function plugin() {
-          return keymapPlugin();
+          return keymapPlugin(featureFlags);
         }
       }];
     },

package/dist/esm/plugins/list/pm-plugins/input-rules/create-list-input-rule.js

@@ -1,4 +1,5 @@
-import { ruleWithAnalytics, createWrappingJoinRule } from '../../../../utils/input-rules';
+import { ruleWithAnalytics } from '../../../../utils/input-rules';
+import { createWrappingJoinRule } from './wrapping-join-rule';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../../analytics';
 import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
 var getOrder = function getOrder(matchResult) {
@@ -45,6 +46,7 @@ export function createRuleForListType(_ref) {
     };
   }
   var inputRule = createWrappingJoinRule({
+    featureFlags: featureFlags,
     match: expression,
     nodeType: listType,
     getAttrs: getAttrs,

package/dist/esm/plugins/list/pm-plugins/input-rules/index.js

@@ -11,7 +11,8 @@ export default function inputRulePlugin(schema, featureFlags) {
       // because of issue where product converted the
       // character into an escaped version.
       expression: /^\s*([\*\-\u2022]) $/,
-      listType: bulletList
+      listType: bulletList,
+      featureFlags: featureFlags
     }));
   }
   var expression = featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists ? /((^[1-9]{1}[0-9]{0,2})|^(0))[\.\)] $/ : /^(1)[\.\)] $/;

package/dist/esm/plugins/list/pm-plugins/input-rules/wrapping-join-rule.js

@@ -0,0 +1,51 @@
+import { canJoin, findWrapping } from 'prosemirror-transform';
+import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
+import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
+import { createRule } from '../../../../utils/input-rules';
+export var createWrappingJoinRule = function createWrappingJoinRule(_ref) {
+  var match = _ref.match,
+    nodeType = _ref.nodeType,
+    getAttrs = _ref.getAttrs,
+    joinPredicate = _ref.joinPredicate,
+    featureFlags = _ref.featureFlags;
+  var handler = function handler(state, match, start, end) {
+    var attrs = (getAttrs instanceof Function ? getAttrs(match) : getAttrs) || {};
+    var tr = state.tr;
+    var fixedStart = Math.max(start, 1);
+    tr.delete(fixedStart, end);
+    var $start = tr.doc.resolve(fixedStart);
+    var range = $start.blockRange();
+    var wrapping = range && findWrapping(range, nodeType, attrs);
+    if (!wrapping || !range) {
+      return null;
+    }
+    var parentNodePosMapped = tr.mapping.map(range.start);
+    var parentNode = tr.doc.nodeAt(parentNodePosMapped);
+    var lastWrap = wrapping[wrapping.length - 1];
+    if (parentNode && lastWrap) {
+      var allowedMarks = lastWrap.type.allowedMarks(parentNode.marks) || [];
+      tr.setNodeMarkup(parentNodePosMapped, parentNode.type, parentNode.attrs, allowedMarks);
+    }
+    tr.wrap(range, wrapping);
+    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
+      var $end = tr.doc.resolve(tr.mapping.map(end));
+      var _node = findParentNodeOfTypeClosestToPos($end, nodeType);
+      if (_node) {
+        var nodeEnd = _node.pos + _node.node.nodeSize;
+        var after = tr.doc.resolve(nodeEnd).nodeAfter;
+        if (after && after.type === nodeType && canJoin(tr.doc, nodeEnd) && (!joinPredicate || joinPredicate(match, after, JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_BELOW))) {
+          tr.join(nodeEnd);
+        }
+      }
+    }
+    var before = tr.doc.resolve(fixedStart - 1).nodeBefore;
+    if (before && before.type === nodeType && canJoin(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
+      tr.join(fixedStart - 1);
+    }
+    return tr;
+  };
+  return createRule(match, handler);
+};

package/dist/esm/plugins/list/pm-plugins/keymap.js

@@ -3,14 +3,14 @@ import * as keymaps from '../../../keymaps';
 import { indentList, enterKeyCommand, toggleList, backspaceKeyCommand, deleteKeyCommand } from '../commands';
 import { outdentList } from '../commands/outdent-list';
 import { INPUT_METHOD } from '../../analytics';
-export function keymapPlugin() {
+export function keymapPlugin(featureFlags) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleOrderedList), toggleList(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
   keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBulletList), toggleList(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
   keymaps.bindKeymapWithCommand(keymaps.indentList.common, indentList(INPUT_METHOD.KEYBOARD), list);
-  keymaps.bindKeymapWithCommand(keymaps.outdentList.common, outdentList(INPUT_METHOD.KEYBOARD), list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, enterKeyCommand, list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspaceKeyCommand, list);
+  keymaps.bindKeymapWithCommand(keymaps.outdentList.common, outdentList(INPUT_METHOD.KEYBOARD, featureFlags), list);
+  keymaps.bindKeymapWithCommand(keymaps.enter.common, enterKeyCommand(featureFlags), list);
+  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspaceKeyCommand(featureFlags), list);
   keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteKeyCommand, list);
 
   // This shortcut is Mac only

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

@@ -12,7 +12,6 @@ import { setGapCursorSelection } from '../../../utils';
 import { Side } from '../../selection/gap-cursor-selection';
 import { listItemCounterPadding, CodeBlockSharedCssClassName, getOrderedListInlineStyles } from '@atlaskit/editor-common/styles';
 import { getItemCounterDigitsSize } from '@atlaskit/editor-common/utils';
-import { getFeatureFlags } from '../../feature-flags-context';
 var listPluginKey = new PluginKey('listPlugin');
 export var pluginKey = listPluginKey;
 var initialState = {
@@ -22,9 +21,8 @@ var initialState = {
   orderedListDisabled: false,
   decorationSet: DecorationSet.empty
 };
-export var getDecorations = function getDecorations(doc, state) {
+export var getDecorations = function getDecorations(doc, state, featureFlags) {
   var decorations = [];
-  var featureFlags = getFeatureFlags(state);
 
   // this stack keeps track of each (nested) list to calculate the indentation level
   var processedListsStack = [];
@@ -77,12 +75,14 @@ export var getDecorations = function getDecorations(doc, state) {
   });
   return DecorationSet.empty.add(doc, decorations);
 };
-var handleDocChanged = function handleDocChanged(tr, pluginState, editorState) {
-  var nextPluginState = handleSelectionChanged(tr, pluginState);
-  var decorationSet = getDecorations(tr.doc, editorState);
-  return _objectSpread(_objectSpread({}, nextPluginState), {}, {
-    decorationSet: decorationSet
-  });
+var handleDocChanged = function handleDocChanged(featureFlags) {
+  return function (tr, pluginState, editorState) {
+    var nextPluginState = handleSelectionChanged(tr, pluginState);
+    var decorationSet = getDecorations(tr.doc, editorState, featureFlags);
+    return _objectSpread(_objectSpread({}, nextPluginState), {}, {
+      decorationSet: decorationSet
+    });
+  };
 };
 var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
   var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
@@ -109,20 +109,22 @@ var reducer = function reducer() {
     return state;
   };
 };
-var _pluginFactory = pluginFactory(listPluginKey, reducer(), {
-    onDocChanged: handleDocChanged,
-    onSelectionChanged: handleSelectionChanged
-  }),
-  getPluginState = _pluginFactory.getPluginState,
-  createPluginState = _pluginFactory.createPluginState;
-var createInitialState = function createInitialState(state) {
-  return _objectSpread(_objectSpread({}, initialState), {}, {
-    decorationSet: getDecorations(state.doc, state)
-  });
+var createInitialState = function createInitialState(featureFlags) {
+  return function (state) {
+    return _objectSpread(_objectSpread({}, initialState), {}, {
+      decorationSet: getDecorations(state.doc, state, featureFlags)
+    });
+  };
 };
-export var createPlugin = function createPlugin(eventDispatch) {
+export var createPlugin = function createPlugin(eventDispatch, featureFlags) {
+  var _pluginFactory = pluginFactory(listPluginKey, reducer(), {
+      onDocChanged: handleDocChanged(featureFlags),
+      onSelectionChanged: handleSelectionChanged
+    }),
+    getPluginState = _pluginFactory.getPluginState,
+    createPluginState = _pluginFactory.createPluginState;
   return new SafePlugin({
-    state: createPluginState(eventDispatch, createInitialState),
+    state: createPluginState(eventDispatch, createInitialState(featureFlags)),
     key: listPluginKey,
     props: {
       decorations: function decorations(state) {

package/dist/esm/plugins/media/nodeviews/mediaNodeView/media.js

@@ -156,6 +156,9 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
         isLoading = _this$props.isLoading,
         maxDimensions = _this$props.maxDimensions,
         mediaOptions = _this$props.mediaOptions;
+      var borderMark = node.marks.find(function (m) {
+        return m.type.name === 'border';
+      });
       var _this$state = this.state,
         viewMediaClientConfig = _this$state.viewMediaClientConfig,
         contextIdentifierProvider = _this$state.contextIdentifierProvider;
@@ -191,7 +194,9 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
       };
       return /*#__PURE__*/React.createElement(MediaCardWrapper, {
         dimensions: originalDimensions,
-        onContextMenu: this.selectMediaSingle
+        onContextMenu: this.selectMediaSingle,
+        borderWidth: borderMark === null || borderMark === void 0 ? void 0 : borderMark.attrs.size,
+        selected: selected
       }, /*#__PURE__*/React.createElement(Card, {
         mediaClientConfig: mediaClientConfig,
         resizeMode: "stretchy-fit",

package/dist/esm/plugins/media/nodeviews/styles.js

@@ -11,8 +11,20 @@ var forcedDimensions = css(_templateObject3 || (_templateObject3 = _taggedTempla
 export var MediaCardWrapper = function MediaCardWrapper(_ref) {
   var dimensions = _ref.dimensions,
     children = _ref.children,
+    selected = _ref.selected,
+    _ref$borderWidth = _ref.borderWidth,
+    borderWidth = _ref$borderWidth === void 0 ? 0 : _ref$borderWidth,
     onContextMenu = _ref.onContextMenu;
+  var calculatedBorderWidth = selected && borderWidth > 0 ? borderWidth + 1 : borderWidth;
   return jsx("div", {
+    "data-testid": "media-card-wrapper",
+    style: {
+      borderColor: "var(--custom-palette-color)",
+      borderWidth: "".concat(calculatedBorderWidth, "px"),
+      borderStyle: 'solid',
+      borderRadius: "".concat(calculatedBorderWidth * 2, "px")
+    }
+  }, jsx("div", {
     css: forcedDimensions,
     style: {
       paddingBottom: "".concat(dimensions.height / dimensions.width * 100, "%")
@@ -20,5 +32,5 @@ export var MediaCardWrapper = function MediaCardWrapper(_ref) {
     onContextMenuCapture: onContextMenu
   }, jsx("div", {
     css: absoluteDiv
-  }, children));
+  }, children)));
 };