@atlaskit/editor-core 181.0.1 → 182.0.1

package/dist/cjs/plugins/find-replace/index.js

@@ -9,7 +9,9 @@ var _react = _interopRequireDefault(require("react"));
 var _plugin = require("./plugin");
 var _keymap = _interopRequireDefault(require("./keymap"));
 var _FindReplaceToolbarButtonWithState = _interopRequireDefault(require("./FindReplaceToolbarButtonWithState"));
-var findReplacePlugin = function findReplacePlugin(props) {
+var findReplacePlugin = function findReplacePlugin(props, api) {
+  var _api$dependencies, _api$dependencies$fea;
+  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: 'findReplace',
     pmPlugins: function pmPlugins() {
@@ -45,7 +47,8 @@ var findReplacePlugin = function findReplacePlugin(props) {
           editorView: editorView,
           containerElement: containerElement,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          takeFullWidth: props.takeFullWidth
+          takeFullWidth: props.takeFullWidth,
+          featureFlags: featureFlags
         });
       }
     }

package/dist/cjs/plugins/floating-toolbar/index.js

@@ -24,7 +24,6 @@ var _ConfirmationModal = require("./ui/ConfirmationModal");
 var _ToolbarLoader = require("./ui/ToolbarLoader");
 var _utils = require("./utils");
 var _ErrorBoundary = require("../../ui/ErrorBoundary");
-var _featureFlagsContext = require("../feature-flags-context");
 var _toolbar = require("../copy-button/toolbar");
 var _forceFocus = _interopRequireDefault(require("./pm-plugins/force-focus"));
 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; }
@@ -119,7 +118,9 @@ var getDomRefFromSelection = function getDomRefFromSelection(view, dispatchAnaly
 function filterUndefined(x) {
   return !!x;
 }
-var floatingToolbarPlugin = function floatingToolbarPlugin() {
+var floatingToolbarPlugin = function floatingToolbarPlugin(_, api) {
+  var _api$dependencies, _api$dependencies$fea;
+  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: 'floatingToolbar',
     pmPlugins: function pmPlugins() {
@@ -213,7 +214,7 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
           var _ref5 = floatingToolbarData || {},
             confirmDialogForItem = _ref5.confirmDialogForItem;
           var confirmButtonItem = confirmDialogForItem ? toolbarItems[confirmDialogForItem] : undefined;
-          var scrollable = (0, _featureFlagsContext.getFeatureFlags)(editorView.state).floatingToolbarCopyButton && config.scrollable;
+          var scrollable = featureFlags.floatingToolbarCopyButton && config.scrollable;
           var confirmDialogOptions = typeof (confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog) === 'function' ? confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog() : confirmButtonItem === null || confirmButtonItem === void 0 ? void 0 : confirmButtonItem.confirmDialog;
           return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.ErrorBoundary, {
             component: _analytics.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
@@ -256,8 +257,10 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
             popupsScrollableElement: popupsScrollableElement,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             extensionsProvider: extensionsState === null || extensionsState === void 0 ? void 0 : extensionsState.extensionProvider,
-            scrollable: scrollable
+            scrollable: scrollable,
+            featureFlags: featureFlags
           })), /*#__PURE__*/_react.default.createElement(_ConfirmationModal.ConfirmationModal, {
+            testId: "ak-floating-toolbar-confirmation-modal",
             options: confirmDialogOptions,
             onConfirm: function onConfirm() {
               var isChecked = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -266,11 +269,16 @@ var floatingToolbarPlugin = function floatingToolbarPlugin() {
               } else {
                 dispatchCommand(confirmButtonItem.onClick);
               }
-              dispatchCommand((0, _commands.hideConfirmDialog)());
-            } // When closed without clicking OK or cancel buttons
-            ,
+            },
             onClose: function onClose() {
               dispatchCommand((0, _commands.hideConfirmDialog)());
+              // Need to set focus to Editor here,
+              // As when the Confirmation dialog pop up, and user interacts with the dialog, Editor loses focus.
+              // So when Confirmation dialog is closed, Editor does not have the focus, then cursor goes to the position 1 of the doc,
+              // instead of the cursor position before the dialog pop up.
+              if (!editorView.hasFocus()) {
+                editorView.focus();
+              }
             }
           }));
         }

package/dist/cjs/plugins/floating-toolbar/ui/CheckboxModal.js

@@ -74,7 +74,8 @@ var CheckboxModal = function CheckboxModal(props) {
   }, cancelButtonLabel), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
     appearance: "warning",
     onClick: function onClick() {
-      return onConfirm(isChecked);
+      onConfirm(isChecked);
+      onClose();
     },
     testId: testId ? "".concat(testId, "-confirm-button") : undefined
   }, okButtonLabel)));

package/dist/cjs/plugins/floating-toolbar/ui/EmojiPickerButton.js

@@ -37,8 +37,11 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
   };
   var updateEmoji = function updateEmoji(emoji) {
     setIsPopupOpen(false);
-    props.editorView && props.editorView.focus();
     props.onChange && props.onChange(emoji);
+    requestAnimationFrame(function () {
+      var _props$editorView;
+      (_props$editorView = props.editorView) === null || _props$editorView === void 0 ? void 0 : _props$editorView.focus();
+    });
   };
   var isDetachedElement = function isDetachedElement(el) {
     return !document.body.contains(el);
@@ -52,6 +55,11 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
       togglePopup();
     }
   };
+  var handleEmojiPressEscape = function handleEmojiPressEscape() {
+    var _buttonRef$current;
+    setIsPopupOpen(false);
+    (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 ? void 0 : _buttonRef$current.focus();
+  };
   var renderPicker = function renderPicker(providers) {
     if (!providers.emojiProvider) {
       return null;
@@ -60,7 +68,8 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
       emojiProvider: providers.emojiProvider,
       onSelection: updateEmoji,
       onPickerRef: function onPickerRef() {},
-      handleClickOutside: handleEmojiClickOutside
+      handleClickOutside: handleEmojiClickOutside,
+      handleEscapeKeydown: handleEmojiPressEscape
     });
   };
   var renderPopup = function renderPopup() {
@@ -77,7 +86,8 @@ var EmojiPickerButton = function EmojiPickerButton(props) {
       // if the toolbar is scrollable, this will be mounted in the root editor
       // we need an index of > 500 to display over it
       ,
-      zIndex: props.setDisableParentScroll ? 600 : undefined
+      zIndex: props.setDisableParentScroll ? 600 : undefined,
+      focusTrap: true
     }, (0, _react.jsx)(_providerFactory.WithProviders, {
       providers: ['emojiProvider'],
       providerFactory: props.providerFactory,

package/dist/cjs/plugins/floating-toolbar/ui/SimpleModal.js

@@ -33,7 +33,8 @@ var SimpleModal = function SimpleModal(props) {
   }, cancelButtonLabel), /*#__PURE__*/_react.default.createElement(_standardButton.default, {
     appearance: "warning",
     onClick: function onClick() {
-      return onConfirm();
+      onConfirm();
+      onClose();
     },
     testId: testId ? "".concat(testId, "-confirm-button") : undefined
   }, okButtonLabel)));

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

@@ -22,7 +22,6 @@ var _editorPalette = require("@atlaskit/editor-palette");
 var _components = require("@atlaskit/theme/components");
 var _constants = require("@atlaskit/theme/constants");
 var _colors = require("@atlaskit/theme/colors");
-var _featureFlagsContext = require("../../feature-flags-context");
 var _utils = require("../utils");
 var _commands = require("../pm-plugins/toolbar-data/commands");
 var _Button = _interopRequireDefault(require("./Button"));
@@ -61,9 +60,10 @@ var ToolbarItems = /*#__PURE__*/_react.default.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 ? (0, _featureFlagsContext.getFeatureFlags)(editorView.state) : {
+  var _ref2 = featureFlags || {
       useSomewhatSemanticTextColorNames: false
     },
     useSomewhatSemanticTextColorNames = _ref2.useSomewhatSemanticTextColorNames;
@@ -229,7 +229,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         if (!editorView || !extensionsProvider) {
           return null;
         }
-        var _ref3 = (0, _featureFlagsContext.getFeatureFlags)(editorView.state) || {},
+        var _ref3 = featureFlags || {},
           extendFloatingToolbar = _ref3.extendFloatingToolbar;
         if (!extendFloatingToolbar) {
           return null;
@@ -475,7 +475,8 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       }, (0, _react2.jsx)(ToolbarItems, (0, _extends2.default)({}, this.props, {
         setDisableScroll: this.setDisableScroll.bind(this),
         mountRef: this.mountRef,
-        mounted: this.state.mounted
+        mounted: this.state.mounted,
+        featureFlags: this.props.featureFlags
       }))), scrollable && (0, _react2.jsx)(_ScrollButtons.default, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,

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

@@ -21,7 +21,6 @@ var _ToolbarComponents = require("../../ui/LinkSearch/ToolbarComponents");
 var _HyperlinkToolbarAppearance = require("./HyperlinkToolbarAppearance");
 var _analytics = require("../analytics");
 var _linkingUtils = require("../../utils/linking-utils");
-var _featureFlagsContext = require("../feature-flags-context");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /* type guard for edit links */
@@ -59,9 +58,8 @@ function getLinkText(activeLinkMark, state) {
   }
   return activeLinkMark.node.text;
 }
-var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
-  var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
-    floatingToolbarLinkSettingsButton = _getFeatureFlags.floatingToolbarLinkSettingsButton;
+var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl, featureFlags) {
+  var floatingToolbarLinkSettingsButton = featureFlags.floatingToolbarLinkSettingsButton;
   return floatingToolbarLinkSettingsButton === 'true' ? [{
     type: 'separator'
   }, {
@@ -74,7 +72,7 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, intl) {
     target: '_blank'
   }] : [];
 };
-var getToolbarConfig = function getToolbarConfig(options) {
+var getToolbarConfig = function getToolbarConfig(options, featureFlags) {
   return function (state, intl, providerFactory) {
     var formatMessage = intl.formatMessage;
     var linkState = _main.stateKey.getState(state);
@@ -82,10 +80,9 @@ var getToolbarConfig = function getToolbarConfig(options) {
     /**
      * Enable focus trap only if feature flag is enabled AND for the new version of the picker
      */
-    var _getFeatureFlags2 = (0, _featureFlagsContext.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;
@@ -179,14 +176,13 @@ var getToolbarConfig = function getToolbarConfig(options) {
                   formatMessage: formatMessage,
                   markType: state.schema.marks.link
                 }]
-              }].concat((0, _toConsumableArray2.default)(getSettingsButtonGroup(state, intl))),
+              }].concat((0, _toConsumableArray2.default)(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) {
@@ -195,7 +191,7 @@ 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) ? _ToolbarComponents.LINKPICKER_HEIGHT_IN_PX : _ToolbarComponents.RECENT_SEARCH_HEIGHT_IN_PX;
+            var popupHeight = lpLinkPicker ? _ToolbarComponents.LINKPICKER_HEIGHT_IN_PX : _ToolbarComponents.RECENT_SEARCH_HEIGHT_IN_PX;
             return _objectSpread(_objectSpread({}, hyperLinkToolbar), {}, {
               preventPopupOverflow: preventPopupOverflow,
               height: popupHeight,
@@ -213,6 +209,7 @@ 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/cjs/plugins/hyperlink/index.js

@@ -16,7 +16,11 @@ var _Toolbar = require("./Toolbar");
 var _keymaps = require("../../keymaps");
 var _assets = require("../quick-insert/assets");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
-var hyperlinkPlugin = function hyperlinkPlugin(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() {
@@ -86,7 +90,7 @@ var hyperlinkPlugin = function hyperlinkPlugin(options) {
           }
         }];
       },
-      floatingToolbar: (0, _Toolbar.getToolbarConfig)(options)
+      floatingToolbar: (0, _Toolbar.getToolbarConfig)(options, featureFlags)
     }
   };
 };

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

@@ -17,7 +17,6 @@ var _HyperlinkAddToolbar = _interopRequireDefault(require("./HyperlinkAddToolbar
 var _types = require("../../../analytics/types");
 var _main = require("../../pm-plugins/main");
 var _WithPluginState = _interopRequireDefault(require("../../../../ui/WithPluginState"));
-var _featureFlagsContext = require("../../../feature-flags-context");
 var _EditorLinkPicker = require("../EditorLinkPicker");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -53,7 +52,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.default.createElement(_providerFactory.WithProviders, {
         providers: ['activityProvider', 'searchProvider'],
         providerFactory: providerFactory,
@@ -67,8 +67,7 @@ var HyperlinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
             },
             render: function render(_ref3) {
               var hyperlinkPluginState = _ref3.hyperlinkPluginState;
-              var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(view.state),
-                lpLinkPicker = _getFeatureFlags.lpLinkPicker;
+              var lpLinkPicker = featureFlags.lpLinkPicker;
               if (lpLinkPicker) {
                 return /*#__PURE__*/_react.default.createElement(_EditorLinkPicker.EditorLinkPicker, (0, _extends2.default)({
                   view: view,

package/dist/cjs/plugins/index.js

@@ -53,6 +53,12 @@ Object.defineProperty(exports, "blockTypePlugin", {
     return _blockType.default;
   }
 });
+Object.defineProperty(exports, "borderPlugin", {
+  enumerable: true,
+  get: function get() {
+    return _border.default;
+  }
+});
 Object.defineProperty(exports, "breakoutPlugin", {
   enumerable: true,
   get: function get() {
@@ -479,5 +485,6 @@ var _viewUpdateSubscription = _interopRequireDefault(require("./view-update-subs
 var _beforePrimaryToolbar = _interopRequireDefault(require("./before-primaryToolbar"));
 var _codeBidiWarning = _interopRequireDefault(require("./code-bidi-warning"));
 var _copyButton = _interopRequireDefault(require("./copy-button"));
+var _border = _interopRequireDefault(require("./border"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

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

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

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

@@ -14,12 +14,11 @@ var _node = require("../utils/node");
 var _find = require("../utils/find");
 var _selection = require("../utils/selection");
 var _gapCursorSelection = require("../../selection/gap-cursor-selection");
-var _featureFlagsContext = require("../../feature-flags-context");
 var _analytics = require("../utils/analytics");
 var _analytics2 = require("@atlaskit/editor-common/analytics");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var outdentListItemsSelected = function outdentListItemsSelected(tr, state) {
+var outdentListItemsSelected = function outdentListItemsSelected(tr, state, featureFlags) {
   var originalSelection = tr.selection;
   var normalizedSelection = (0, _selection.normalizeListItemsSelection)({
     selection: tr.selection,
@@ -54,7 +53,8 @@ var outdentListItemsSelected = function outdentListItemsSelected(tr, state) {
       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;
@@ -176,7 +176,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);
@@ -198,7 +199,6 @@ var extractListItemsRangeFromList = function extractListItemsRangeFromList(_ref3
     }
   }
   var nextList = list.copy(_prosemirrorModel.Fragment.empty);
-  var featureFlags = (0, _featureFlagsContext.getFeatureFlags)(state);
   var nextListStartNumber;
   if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
     // if splitting a numbered list, keep the splitted item

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

@@ -46,37 +46,41 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 = (0, _document.hasVisibleContent)(wrapper);
-      if (!wrapperHasContent) {
-        return (0, _outdentList.outdentList)(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch);
-      } else if (!(0, _prosemirrorUtils.hasParentNodeOfType)(codeBlock)(selection)) {
-        return splitListItem(listItem)(state, dispatch);
+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 = (0, _document.hasVisibleContent)(wrapper);
+        if (!wrapperHasContent) {
+          return (0, _outdentList.outdentList)(_analytics.INPUT_METHOD.KEYBOARD, featureFlags)(state, dispatch);
+        } else if (!(0, _prosemirrorUtils.hasParentNodeOfType)(codeBlock)(selection)) {
+          return splitListItem(listItem)(state, dispatch);
+        }
       }
     }
-  }
-  return false;
+    return false;
+  };
 };
 exports.enterKeyCommand = enterKeyCommand;
-var backspaceKeyCommand = function backspaceKeyCommand(state, dispatch) {
-  return baseCommand.chainCommands(_listBackspace.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
-  (0, _commands.filter)([_commands.isEmptySelectionAtStart,
-  // list items might have multiple paragraphs; only do this at the first one
-  _commands.isFirstChildOfParent, _selection.isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, (0, _outdentList.outdentList)(_analytics.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
-  (0, _commands.filter)([_commands.isEmptySelectionAtStart, _selection.canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+var backspaceKeyCommand = function backspaceKeyCommand(featureFlags) {
+  return function (state, dispatch) {
+    return baseCommand.chainCommands(_listBackspace.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
+    (0, _commands.filter)([_commands.isEmptySelectionAtStart,
+    // list items might have multiple paragraphs; only do this at the first one
+    _commands.isFirstChildOfParent, _selection.isInsideListItem], baseCommand.chainCommands(deletePreviousEmptyListItem, (0, _outdentList.outdentList)(_analytics.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
+    (0, _commands.filter)([_commands.isEmptySelectionAtStart, _selection.canJoinToPreviousListItem], joinToPreviousListItem))(state, dispatch);
+  };
 };
 exports.backspaceKeyCommand = backspaceKeyCommand;
 var deleteKeyCommand = _joinListItemForward.joinListItemForward;

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

@@ -14,11 +14,11 @@ var _find = require("../utils/find");
 var _analytics3 = require("../utils/analytics");
 var _outdentListItemsSelected = require("../actions/outdent-list-items-selected");
 var _prosemirrorHistory = require("prosemirror-history");
-var _featureFlagsContext = require("../../feature-flags-context");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function outdentList() {
   var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics2.INPUT_METHOD.KEYBOARD;
+  var featureFlags = arguments.length > 1 ? arguments[1] : undefined;
   return function (state, dispatch) {
     if (!(0, _selection.isInsideListItem)(state)) {
       return false;
@@ -34,13 +34,12 @@ function outdentList() {
     (0, _prosemirrorHistory.closeHistory)(state.tr);
     var actionSubjectId = (0, _node.isBulletList)(parentListNode.node) ? _analytics2.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics2.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
     var customTr = state.tr;
-    (0, _outdentListItemsSelected.outdentListItemsSelected)(customTr, state);
+    (0, _outdentListItemsSelected.outdentListItemsSelected)(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 !(0, _selection.isInsideTableCell)(state);
     }
-    var featureFlags = (0, _featureFlagsContext.getFeatureFlags)(state);
     var restartListsAttributes = {};
     if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists) {
       var _getRestartListsAttri = (0, _analytics3.getRestartListsAttributes)(customTr),

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

@@ -18,7 +18,8 @@ var _assets = require("../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() {
@@ -38,7 +39,7 @@ var listPlugin = function listPlugin(options) {
         name: 'list',
         plugin: function plugin(_ref) {
           var dispatch = _ref.dispatch;
-          return (0, _main.createPlugin)(dispatch);
+          return (0, _main.createPlugin)(dispatch, featureFlags);
         }
       }, {
         name: 'listInputRule',
@@ -50,7 +51,7 @@ var listPlugin = function listPlugin(options) {
       }, {
         name: 'listKeymap',
         plugin: function plugin() {
-          return (0, _keymap.default)();
+          return (0, _keymap.default)(featureFlags);
         }
       }];
     },

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createRuleForListType = createRuleForListType;
 var _inputRules = require("../../../../utils/input-rules");
+var _wrappingJoinRule = require("./wrapping-join-rule");
 var _analytics = require("../../../analytics");
 var _analytics2 = require("@atlaskit/editor-common/analytics");
 var getOrder = function getOrder(matchResult) {
@@ -50,7 +51,8 @@ function createRuleForListType(_ref) {
       };
     };
   }
-  var inputRule = (0, _inputRules.createWrappingJoinRule)({
+  var inputRule = (0, _wrappingJoinRule.createWrappingJoinRule)({
+    featureFlags: featureFlags,
     match: expression,
     nodeType: listType,
     getAttrs: getAttrs,

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

@@ -17,7 +17,8 @@ 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/cjs/plugins/list/pm-plugins/input-rules/wrapping-join-rule.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createWrappingJoinRule = void 0;
+var _prosemirrorTransform = require("prosemirror-transform");
+var _prosemirrorUtils = require("prosemirror-utils");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _inputRules = require("../../../../utils/input-rules");
+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 && (0, _prosemirrorTransform.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 = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($end, nodeType);
+      if (_node) {
+        var nodeEnd = _node.pos + _node.node.nodeSize;
+        var after = tr.doc.resolve(nodeEnd).nodeAfter;
+        if (after && after.type === nodeType && (0, _prosemirrorTransform.canJoin)(tr.doc, nodeEnd) && (!joinPredicate || joinPredicate(match, after, _analytics.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 && (0, _prosemirrorTransform.canJoin)(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, _analytics.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
+      tr.join(fixedStart - 1);
+    }
+    return tr;
+  };
+  return (0, _inputRules.createRule)(match, handler);
+};
+exports.createWrappingJoinRule = createWrappingJoinRule;