@atlaskit/editor-core 181.0.0 → 182.0.0

package/dist/esm/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -5,7 +5,8 @@ import { INPUT_METHOD } from '../../analytics';
 import { pluginKey as indentationButtonsPluginKey } from '../pm-plugins/indentation-buttons';
 export function onItemActivated(_ref) {
   var buttonName = _ref.buttonName,
-    editorView = _ref.editorView;
+    editorView = _ref.editorView,
+    featureFlags = _ref.featureFlags;
   switch (buttonName) {
     case 'bullet_list':
       toggleBulletList(editorView, INPUT_METHOD.TOOLBAR);
@@ -34,7 +35,7 @@ export function onItemActivated(_ref) {
           outdentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (_node === 'list') {
-          outdentList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          outdentList(INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
         }
         if (_node === 'taskList') {
           outdentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);

package/dist/esm/plugins/type-ahead/index.js

@@ -113,6 +113,8 @@ var TypeAheadMenu = /*#__PURE__*/React.memo(function (_ref) {
  *
  */
 var typeAheadPlugin = function typeAheadPlugin(options) {
+  var _options$useBetterTyp;
+  var useBetterTypeaheadNavigation = (_options$useBetterTyp = options === null || options === void 0 ? void 0 : options.useBetterTypeaheadNavigation) !== null && _options$useBetterTyp !== void 0 ? _options$useBetterTyp : true;
   var fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
   var popupMountRef = {
     current: null
@@ -139,7 +141,8 @@ var typeAheadPlugin = function typeAheadPlugin(options) {
             popupMountRef: popupMountRef,
             reactDispatch: dispatch,
             typeAheadHandlers: typeAhead,
-            createAnalyticsEvent: options === null || options === void 0 ? void 0 : options.createAnalyticsEvent
+            createAnalyticsEvent: options === null || options === void 0 ? void 0 : options.createAnalyticsEvent,
+            useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
           });
         }
       }, {

package/dist/esm/plugins/type-ahead/pm-plugins/decorations.js

@@ -15,7 +15,8 @@ import { closeTypeAhead } from '../transforms/close-type-ahead';
 export var factoryDecorations = function factoryDecorations(_ref) {
   var intl = _ref.intl,
     popupMountRef = _ref.popupMountRef,
-    createAnalyticsEvent = _ref.createAnalyticsEvent;
+    createAnalyticsEvent = _ref.createAnalyticsEvent,
+    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
   var createDecorations = function createDecorations(tr, _ref2) {
     var triggerHandler = _ref2.triggerHandler,
       inputMethod = _ref2.inputMethod,
@@ -87,7 +88,8 @@ export var factoryDecorations = function factoryDecorations(_ref) {
         popupsBoundariesElement: (_popupMountRef$curren2 = popupMountRef.current) === null || _popupMountRef$curren2 === void 0 ? void 0 : _popupMountRef$curren2.popupsBoundariesElement,
         popupsScrollableElement: (_popupMountRef$curren3 = popupMountRef.current) === null || _popupMountRef$curren3 === void 0 ? void 0 : _popupMountRef$curren3.popupsScrollableElement,
         onUndoRedo: onUndoRedo,
-        reopenQuery: reopenQuery
+        reopenQuery: reopenQuery,
+        useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
       })), typeaheadComponent);
       shouldFocusCursorInsideQuery = false;
       return typeaheadComponent;

package/dist/esm/plugins/type-ahead/pm-plugins/main.js

@@ -25,12 +25,14 @@ export function createPlugin(_ref) {
     popupMountRef = _ref.popupMountRef,
     createAnalyticsEvent = _ref.createAnalyticsEvent,
     typeAheadHandlers = _ref.typeAheadHandlers,
-    getIntl = _ref.getIntl;
+    getIntl = _ref.getIntl,
+    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
   var intl = getIntl();
   var _factoryDecorations = factoryDecorations({
       intl: intl,
       popupMountRef: popupMountRef,
-      createAnalyticsEvent: createAnalyticsEvent
+      createAnalyticsEvent: createAnalyticsEvent,
+      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
     }),
     createDecorations = _factoryDecorations.createDecorations,
     removeDecorations = _factoryDecorations.removeDecorations;

package/dist/esm/plugins/type-ahead/ui/InputQuery.js

@@ -66,7 +66,8 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     onQueryFocus = _ref.onQueryFocus,
     onUndoRedo = _ref.onUndoRedo,
     editorView = _ref.editorView,
-    items = _ref.items;
+    items = _ref.items,
+    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
   var ref = useRef(document.createElement('span'));
   var inputRef = useRef(null);
   var _useState = useState(null),
@@ -139,6 +140,19 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         // Some suggested the other workaround maybe listen on`keypress` instead of `keydown`
         if (!event.isComposing || event.which !== 229 && event.keyCode !== 229) {
           if (selectedIndex === -1) {
+            if (useBetterTypeaheadNavigation) {
+              /**
+               * TODO DTR-1401: (also see ED-17200) There are two options
+               * here, either
+               * - set the index directly to 1 in WrapperTypeAhead.tsx's
+               *   `insertSelectedItem` at the cost of breaking some of the a11y
+               *   focus changes,
+               * - or do this jank at the cost of some small analytics noise.
+               *
+               * The focus behaviour still needs cleanup
+               */
+              selectPreviousItem();
+            }
             selectNextItem();
           }
           onItemSelect(event.shiftKey ? SelectItemMode.SHIFT_ENTER : SelectItemMode.ENTER);
@@ -146,18 +160,41 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
         break;
       case 'Tab':
         if (selectedIndex === -1) {
+          if (useBetterTypeaheadNavigation) {
+            /**
+             * TODO DTR-1401: (also see ED-17200) There are two options
+             * here, either
+             * - set the index directly to 1 in WrapperTypeAhead.tsx's
+             *   `insertSelectedItem` at the cost of breaking some of the a11y
+             *   focus changes,
+             * - or do this jank at the cost of some small analytics noise.
+             *
+             */
+            selectPreviousItem();
+          }
           selectNextItem();
         }
+        // TODO DTR-1401: why is this calling select item when hitting tab? fix this in DTR-1401
         onItemSelect(SelectItemMode.TAB);
         break;
       case 'ArrowDown':
-        if (selectedIndex === -1) {
+        if (useBetterTypeaheadNavigation) {
           selectNextItem();
+        } else {
+          // TODO DTR-1401: why were we preventing selection?
+          if (selectedIndex === -1) {
+            selectNextItem();
+          }
         }
         break;
       case 'ArrowUp':
-        if (selectedIndex === -1) {
+        if (useBetterTypeaheadNavigation) {
           selectPreviousItem();
+        } else {
+          // TODO DTR-1401: why were we preventing selection?
+          if (selectedIndex === -1) {
+            selectPreviousItem();
+          }
         }
         break;
     }
@@ -170,7 +207,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
       event.preventDefault();
       return false;
     }
-  }, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state]);
+  }, [useBetterTypeaheadNavigation, onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state]);
   var onClick = useCallback(function (event) {
     var _inputRef$current;
     event.stopPropagation();

package/dist/esm/plugins/type-ahead/ui/TypeAheadList.js

@@ -176,6 +176,8 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref2) {
             selectPreviousItem();
             event.preventDefault();
             break;
+
+          // TODO DTR-1401: why is this calling item click when hitting tab? fix this in DTR-1401
           case 'Tab':
             //Tab key quick inserts the selected item.
             onItemClick(SelectItemMode.TAB, selectedIndex);

package/dist/esm/plugins/type-ahead/ui/WrapperTypeAhead.js

@@ -19,7 +19,8 @@ export var WrapperTypeAhead = /*#__PURE__*/React.memo(function (_ref) {
     inputMethod = _ref.inputMethod,
     getDecorationPosition = _ref.getDecorationPosition,
     reopenQuery = _ref.reopenQuery,
-    onUndoRedo = _ref.onUndoRedo;
+    onUndoRedo = _ref.onUndoRedo,
+    useBetterTypeaheadNavigation = _ref.useBetterTypeaheadNavigation;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     closed = _useState2[0],
@@ -41,15 +42,17 @@ export var WrapperTypeAhead = /*#__PURE__*/React.memo(function (_ref) {
   var selectNextItem = useMemo(function () {
     return moveSelectedIndex({
       editorView: editorView,
-      direction: 'next'
+      direction: 'next',
+      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
     });
-  }, [editorView]);
+  }, [editorView, useBetterTypeaheadNavigation]);
   var selectPreviousItem = useMemo(function () {
     return moveSelectedIndex({
       editorView: editorView,
-      direction: 'previous'
+      direction: 'previous',
+      useBetterTypeaheadNavigation: useBetterTypeaheadNavigation
     });
-  }, [editorView]);
+  }, [editorView, useBetterTypeaheadNavigation]);
   var cancel = useCallback(function (_ref2) {
     var setSelectionAt = _ref2.setSelectionAt,
       addPrefixTrigger = _ref2.addPrefixTrigger,
@@ -100,6 +103,7 @@ export var WrapperTypeAhead = /*#__PURE__*/React.memo(function (_ref) {
     return null;
   }
   return /*#__PURE__*/React.createElement(InputQuery, {
+    useBetterTypeaheadNavigation: useBetterTypeaheadNavigation,
     triggerQueryPrefix: triggerHandler.trigger,
     onQueryChange: setQuery,
     onItemSelect: insertSelectedItem,

package/dist/esm/plugins/type-ahead/utils.js

@@ -51,7 +51,8 @@ export var findHandlerByTrigger = function findHandlerByTrigger(_ref) {
 };
 export var moveSelectedIndex = function moveSelectedIndex(_ref2) {
   var editorView = _ref2.editorView,
-    direction = _ref2.direction;
+    direction = _ref2.direction,
+    useBetterTypeaheadNavigation = _ref2.useBetterTypeaheadNavigation;
   return function () {
     var typeAheadState = getPluginState(editorView.state);
     if (!typeAheadState) {
@@ -63,7 +64,26 @@ export var moveSelectedIndex = function moveSelectedIndex(_ref2) {
     var nextIndex;
     if (direction === 'next') {
       stats.increaseArrowDown();
-      nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
+      if (useBetterTypeaheadNavigation) {
+        /**
+         * See: https://product-fabric.atlassian.net/browse/ED-17200
+         * `selectedIndex` is forced to -1 now to not immediately focus the typeahead
+         * and only do so when there is explicit logic to focus into the typeahead
+         * options.
+         *
+         * This check for "set index to 1 when -1"
+         * - is a temporary workaround to get back the previous behaviour without
+         *    entirely reverting the a11y improvements
+         *
+         */
+        if (selectedIndex === -1 && items.length > 1) {
+          nextIndex = 1;
+        } else {
+          nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
+        }
+      } else {
+        nextIndex = selectedIndex >= items.length - 1 ? 0 : selectedIndex + 1;
+      }
     } else {
       stats.increaseArrowUp();
       nextIndex = selectedIndex <= 0 ? items.length - 1 : selectedIndex - 1;

package/dist/esm/test-utils.js

@@ -61,7 +61,9 @@ export var createPMSchemaAndPlugins = function createPMSchemaAndPlugins() {
   return function (pluginFactoryParams) {
     var editorPlugins = [];
     var preset = inputPreset.has(basePlugin) ? inputPreset : inputPreset.add(basePlugin);
-    editorPlugins = preset.build();
+    editorPlugins = preset.build({
+      pluginInjectionAPI: pluginFactoryParams.pluginInjectionAPI
+    });
     var editorConfig = lightProcessPluginsList(editorPlugins);
     var schema = createSchema(editorConfig);
     var plugins = editorConfig.plugins.sort(sortByOrder('plugins')).map(function (_ref) {

package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js

@@ -46,14 +46,16 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
     inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
-    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
+    isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected,
+    featureFlags: props.featureFlags || {}
   }), (_props$featureFlags5 = props.featureFlags) !== null && _props$featureFlags5 !== void 0 && _props$featureFlags5.findReplace && (_props$featureFlags6 = props.featureFlags) !== null && _props$featureFlags6 !== void 0 && _props$featureFlags6.twoLineEditorToolbar ? jsx(FindReplaceToolbarButtonWithState, {
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
     editorView: props.editorView,
     containerElement: props.containerElement,
-    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
+    featureFlags: props.featureFlags
   }) : null, !!props.customPrimaryToolbarComponents && 'after' in props.customPrimaryToolbarComponents ? props.customPrimaryToolbarComponents.after : props.customPrimaryToolbarComponents);
   useEffect(function () {
     var _props$featureFlags7;

package/dist/esm/ui/styles.js

@@ -5,7 +5,7 @@ import { N30 } from '@atlaskit/theme/colors';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
 export var buttonGroupStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: inline-flex;\n  align-items: center;\n\n  & > div {\n    display: flex;\n  }\n"])));
-export var separatorStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), "var(--ds-border, ".concat(N30, ")"));
+export var separatorStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n  user-select: none;\n"])), "var(--ds-border, ".concat(N30, ")"));
 export var wrapperStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n\n  > div,\n  > span {\n    display: flex;\n  }\n\n  > div > div {\n    display: flex;\n  }\n\n  margin-left: 0;\n  min-width: auto;\n"])));
 export var wrapperSmallStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  margin-left: 4px;\n  min-width: 40px;\n"])));
 export var expandIconWrapperStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));

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

@@ -8,8 +8,6 @@ import { createInputRulePlugin } from '@atlaskit/prosemirror-input-rules';
 import { addAnalytics } from '../plugins/analytics';
 import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
 import { closeHistory } from 'prosemirror-history';
-import { findParentNodeOfTypeClosestToPos } from 'prosemirror-utils';
-import { getFeatureFlags } from '../plugins/feature-flags-context';
 export var ruleWithAnalytics = function ruleWithAnalytics(getPayload) {
   return function (originalRule) {
     var onHandlerApply = function onHandlerApply(state, tr, matchResult) {
@@ -98,21 +96,6 @@ export var createWrappingJoinRule = function createWrappingJoinRule(_ref3) {
       tr.setNodeMarkup(parentNodePosMapped, parentNode.type, parentNode.attrs, allowedMarks);
     }
     tr.wrap(range, wrapping);
-    var 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
-      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);

package/dist/esm/utils/insert.js

@@ -1,10 +1,11 @@
-import { isNodeSelection, canInsert, hasParentNodeOfType, safeInsert as pmSafeInsert } from 'prosemirror-utils';
-import { Node, Fragment } from 'prosemirror-model';
-import { NodeSelection, Selection } from 'prosemirror-state';
+import { isNodeSelection, canInsert, safeInsert as pmSafeInsert, hasParentNodeOfType, findParentNodeOfType } from 'prosemirror-utils';
+import { Node, Fragment, Slice } from 'prosemirror-model';
+import { NodeSelection, Selection, TextSelection } from 'prosemirror-state';
 import { ReplaceStep, ReplaceAroundStep } from 'prosemirror-transform';
 import { isEmptyParagraph } from './document';
 import { GapCursorSelection, Side } from '../plugins/selection/gap-cursor-selection';
 import { normaliseNestedLayout } from './selection';
+import { isListItemNode } from '../plugins/list/utils/node';
 export var LookDirection;
 (function (LookDirection) {
   LookDirection["Before"] = "before";
@@ -20,6 +21,18 @@ var nodeIsInsideAList = function nodeIsInsideAList(tr) {
   var nodes = tr.doc.type.schema.nodes;
   return hasParentNodeOfType([nodes.orderedList, nodes.bulletList])(tr.selection);
 };
+var selectionIsInsideAPanel = function selectionIsInsideAPanel(tr) {
+  var nodes = tr.doc.type.schema.nodes;
+  return hasParentNodeOfType(nodes.panel)(tr.selection);
+};
+var selectionIsInNestedList = function selectionIsInNestedList(tr) {
+  var nodes = tr.doc.type.schema.nodes;
+  var parentListNode = findParentNodeOfType([nodes.orderedList, nodes.bulletList])(tr.selection);
+  if (!parentListNode) {
+    return false;
+  }
+  return isListItemNode(tr.doc.resolve(parentListNode.pos).parent);
+};
 var insertBeforeOrAfter = function insertBeforeOrAfter(tr, lookDirection, $parentPos, $proposedPosition, content) {
   /**
    * This block caters for the first item in a parent with the cursor being at the very start
@@ -47,9 +60,7 @@ export var safeInsert = function safeInsert(content, position) {
     var _tr$selection$$from$n;
     var nodes = tr.doc.type.schema.nodes;
     var whitelist = [nodes.rule, nodes.mediaSingle];
-
-    // fallback if the node to insert is not in the whitelist, or if the insertion should happen within a list.
-    if (content instanceof Fragment || !whitelist.includes(content.type) || nodeIsInsideAList(tr)) {
+    if (content instanceof Fragment || !whitelist.includes(content.type)) {
       return null;
     }
 
@@ -81,14 +92,28 @@ export var safeInsert = function safeInsert(content, position) {
     }
     var grandParentNodeType = (_tr$selection$$from$n = tr.selection.$from.node(-1)) === null || _tr$selection$$from$n === void 0 ? void 0 : _tr$selection$$from$n.type;
     var parentNodeType = tr.selection.$from.parent.type;
-    if (!lookDirection && !shouldSplitSelectedNodeOnNodeInsertion({
+
+    // if there is no direction, and cannot split for this particular node
+    var noDirectionAndShouldNotSplit = !lookDirection && !shouldSplitSelectedNodeOnNodeInsertion({
       parentNodeType: parentNodeType,
       grandParentNodeType: grandParentNodeType,
       content: content
-    })) {
+    });
+    var ruleNodeInANestedListNode = content.type === nodes.rule && selectionIsInNestedList(tr);
+    var nonRuleNodeInListNode = !(content.type === nodes.rule) && nodeIsInsideAList(tr);
+    if (ruleNodeInANestedListNode || noDirectionAndShouldNotSplit && nonRuleNodeInListNode || noDirectionAndShouldNotSplit && !nodeIsInsideAList(tr)) {
       // node to be inserted is an invalid child of selection so insert below selected node
       return pmSafeInsert(content, tr.selection.from)(tr);
     }
+
+    // if node is a rule and that is a flat list splitting and not at the end of a list
+    var _tr$selection = tr.selection,
+      from = _tr$selection.from,
+      to = _tr$selection.to;
+    var ruleTypeInAList = content.type === nodes.rule && nodeIsInsideAList(tr);
+    if (ruleTypeInAList && !($insertPos.pos === insertPosEnd)) {
+      return tr.replaceRange(from, to, new Slice(Fragment.from(nodes.rule.createChecked()), 0, 0));
+    }
     if (!lookDirection) {
       // fallback to consumer for now
       return null;
@@ -110,7 +135,14 @@ export var safeInsert = function safeInsert(content, position) {
 
       // If we can't insert, and we think we should split, we fallback to consumer for now
       if (shouldSplit(parentNode.type, tr.doc.type.schema.nodes)) {
-        return finaliseInsert(insertBeforeOrAfter(tr, lookDirection, $parentPos, $proposedPosition, content), content.nodeSize);
+        var nextTr = finaliseInsert(insertBeforeOrAfter(tr, lookDirection, $parentPos, $proposedPosition, content), content.nodeSize);
+
+        // Move selection to the closest text node, otherwise it defaults to the whatever the lookDirection is set to above
+        if ([nodes.orderedList, nodes.bulletList].includes(parentNode.type) && nextTr) {
+          return nextTr.setSelection(TextSelection.between(nextTr.selection.$from, nextTr.selection.$from));
+        } else {
+          return nextTr;
+        }
       }
 
       // Can not insert into current parent, step up one parent
@@ -157,7 +189,21 @@ export var insertSelectedItem = function insertSelectedItem(maybeNode) {
        *
        */
     } else if (node.isBlock) {
-      tr = pmSafeInsert(normaliseNestedLayout(state, node), undefined, true)(tr);
+      /**
+       *
+       * Rule has unique insertion behaviour
+       * so using this safeInsert function in order to handle specific cases in flat list vs nested list
+       * instead of a generic pmSafeInsert (i.e appending at the end)
+       *
+       */
+
+      var selectionInsideAPanel = selectionIsInsideAPanel(tr);
+      if (node.type.name === 'rule' && !selectionInsideAPanel) {
+        var _safeInsert;
+        tr = (_safeInsert = safeInsert(node, tr.selection.from)(tr)) !== null && _safeInsert !== void 0 ? _safeInsert : tr;
+      } else {
+        tr = pmSafeInsert(normaliseNestedLayout(state, node), undefined, true)(tr);
+      }
 
       /**
        *

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "181.0.0";
+export var version = "182.0.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

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

package/dist/types/create-editor/sort-by-order.d.ts

@@ -3,3 +3,12 @@ export declare function sortByOrder(item: 'plugins' | 'nodes' | 'marks'): (a: {
 }, b: {
     name: string;
 }) => number;
+export declare function sortByOrderWithTypeName(item: 'plugins' | 'nodes' | 'marks'): (a: {
+    type: {
+        name: string;
+    };
+}, b: {
+    type: {
+        name: string;
+    };
+}) => number;

package/dist/types/editor-next/editor-migration-component.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { EditorProps } from '../types/editor-props';
 export default class EditorMigrationComponent extends React.Component<EditorProps> {
+    static defaultProps: EditorProps;
     render(): JSX.Element;
 }

package/dist/types/labs/next/presets/cxhtml.d.ts

@@ -20,11 +20,31 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
     pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"featureFlagsContext", {
     pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
-}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"floatingToolbar", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>, (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
+}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"floatingToolbar", {
+    dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }>];
+}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"floatingToolbar", {
+    dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }>];
+}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"fakeTextCursor", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"fakeTextCursor", {}>, (config?: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"submitEditor", {
     pluginConfiguration: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"submitEditor", {
     pluginConfiguration: ((editorView: import("prosemirror-view").EditorView<any>) => void) | undefined;
-}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"editorDisabled", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"editorDisabled", {}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"unsupportedContent", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"unsupportedContent", {}>, (config?: import("../../../plugins/type-ahead").TypeAheadPluginOptions | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"typeAhead", {
+}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"editorDisabled", {
+    sharedState: import("../../../plugins/editor-disabled").EditorDisabledPluginState;
+}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"editorDisabled", {
+    sharedState: import("../../../plugins/editor-disabled").EditorDisabledPluginState;
+}>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"unsupportedContent", {}> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"unsupportedContent", {}>, (config?: import("../../../plugins/type-ahead").TypeAheadPluginOptions | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"typeAhead", {
     pluginConfiguration: import("../../../plugins/type-ahead").TypeAheadPluginOptions | undefined;
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"typeAhead", {
     pluginConfiguration: import("../../../plugins/type-ahead").TypeAheadPluginOptions | undefined;
@@ -38,7 +58,21 @@ export declare function useCXHTMLPreset({ mentionProvider, mediaProvider, placeh
     pluginConfiguration: import("../../../plugins/text-formatting/types").TextFormattingOptions | undefined;
 }>, (config?: import("../../../plugins/hyperlink/types").HyperlinkPluginOptions | undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"hyperlink", {
     pluginConfiguration: import("../../../plugins/hyperlink/types").HyperlinkPluginOptions | undefined;
+    dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }>];
 }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"hyperlink", {
     pluginConfiguration: import("../../../plugins/hyperlink/types").HyperlinkPluginOptions | undefined;
+    dependencies: [(config: import("@atlaskit/editor-common/types").FeatureFlags, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }>];
 }>, ...import("@atlaskit/editor-common/types").AllEditorPresetPluginTypes[]]>[];
 export declare function EditorPresetCXHTML(props: EditorPresetCXHTMLProps): JSX.Element;