@atlaskit/editor-core 181.0.1 → 182.0.1

package/dist/cjs/plugins/media/ui/ImageBorder/styles.js

@@ -0,0 +1,54 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toolbarButtonWrapper = exports.menuItemDimensions = exports.line = exports.itemSpacing = exports.contextualSubMenu = exports.contextualMenuColorIcon = exports.contextualMenuArrow = exports.buttonWrapperStyle = exports.buttonStyle = void 0;
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+var _react = require("@emotion/react");
+var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
+var _uiColor = require("@atlaskit/editor-common/ui-color");
+var _constants = require("@atlaskit/theme/constants");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+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; }
+// menuItemDimensions and itemSpacing are copied from
+// packages/editor/editor-core/src/plugins/floating-toolbar/ui/DropdownMenu.tsx
+
+var menuItemDimensions = {
+  width: 175,
+  height: 32
+};
+exports.menuItemDimensions = menuItemDimensions;
+var itemSpacing = (0, _constants.gridSize)() / 2;
+exports.itemSpacing = itemSpacing;
+var contextualMenuArrow = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  &::after {\n    content: '\u203A';\n    margin-left: 4px;\n    line-height: 20px;\n    color: ", ";\n  }\n"])), "var(--ds-icon, ".concat(colors.N90, ")"));
+exports.contextualMenuArrow = contextualMenuArrow;
+var contextualMenuColorIcon = function contextualMenuColorIcon(color) {
+  return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  &::before {\n    content: '';\n    display: block;\n    border: 1px solid ", ";\n    border-radius: ", ";\n    width: 20px;\n    height: 20px;\n    ", "\n  }\n"])), contextualMenuArrow, _uiColor.DEFAULT_BORDER_COLOR, "var(--ds-radius-100, 3px)", color && "background: ".concat(color));
+};
+exports.contextualMenuColorIcon = contextualMenuColorIcon;
+var contextualSubMenu = function contextualSubMenu(index) {
+  return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  border-radius: ", ";\n  background: ", ";\n  box-shadow: ", ";\n  display: flex;\n  position: absolute;\n  top: ", "px;\n  left: ", "px;\n  padding: 8px;\n\n  > div {\n    padding: 0;\n  }\n"])), "var(--ds-radius-100, 3px)", "var(--ds-surface-overlay, white)", "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(colors.N60A, ", 0 0 1px ").concat(colors.N60A), ")"), index * (menuItemDimensions.height + itemSpacing * 2), menuItemDimensions.width);
+};
+exports.contextualSubMenu = contextualSubMenu;
+var buttonStyle = function buttonStyle(selected) {
+  return (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  height: 26px;\n  width: 26px;\n  padding: 0;\n  border-radius: 4px;\n  background-color: ", ";\n  border: 1px solid ", ";\n  cursor: pointer;\n  display: block;\n"])), selected ? "var(--ds-text, ".concat(colors.N800, ")") : "var(--ds-background-neutral, ".concat(colors.N20A, ")"), _uiColor.DEFAULT_BORDER_COLOR);
+};
+
+/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
+exports.buttonStyle = buttonStyle;
+var buttonWrapperStyle = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  border: 1px solid transparent;\n  margin: 1px;\n  font-size: 0;\n  display: flex;\n  align-items: center;\n  padding: 1px;\n  border-radius: 6px;\n  &:focus-within,\n  &:focus,\n  &:hover {\n    border-color: ", " !important;\n  }\n"])), colors.N50);
+exports.buttonWrapperStyle = buttonWrapperStyle;
+var line = function line(size, selected) {
+  return (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  &:before {\n    content: '';\n    display: block;\n    position: absolute;\n    top: 50%;\n    left: 50%;\n    width: 12px;\n    height: ", "px;\n    background-color: ", ";\n    border-radius: 90px;\n    transform: translate(-50%, -50%) rotate(135deg);\n  }\n"])), size, selected ? "var(--ds-icon-inverse, ".concat(colors.N0, ")") : "var(--ds-icon, #44546F)");
+};
+exports.line = line;
+var toolbarButtonWrapper = function toolbarButtonWrapper(_ref) {
+  var enabled = _ref.enabled,
+    isOpen = _ref.isOpen;
+  return (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  .image-border-toolbar-btn {\n    border-top-right-radius: 0;\n    border-bottom-right-radius: 0;\n    padding: 0;\n    & > span {\n      margin: 0;\n    }\n  }\n  .image-border-toolbar-dropdown {\n    padding: 0;\n    & > span {\n      margin: 0;\n    }\n    width: 16px !important;\n    border-top-left-radius: 0 !important;\n    border-bottom-left-radius: 0 !important;\n    margin-left: 1px;\n  }\n\n  &:hover {\n    .image-border-toolbar-btn {\n      ", "\n    }\n\n    .image-border-toolbar-dropdown {\n      ", "\n    }\n  }\n"])), !enabled && " background: ".concat("var(--ds-background-neutral-subtle-hovered, ".concat(colors.N30A, ")"), ";"), !isOpen && "background: ".concat("var(--ds-background-neutral-subtle-hovered, ".concat(colors.N30A, ")"), ";"));
+};
+exports.toolbarButtonWrapper = toolbarButtonWrapper;

package/dist/cjs/plugins/media/utils/current-media-node.js

@@ -3,19 +3,42 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.currentMediaNode = void 0;
+exports.currentMediaNodeWithPos = exports.currentMediaNodeBorderMark = exports.currentMediaNode = void 0;
 var _prosemirrorState = require("prosemirror-state");
-var currentMediaNode = function currentMediaNode(editorState) {
+var currentMediaNodeWithPos = function currentMediaNodeWithPos(editorState) {
   var doc = editorState.doc,
     selection = editorState.selection,
     schema = editorState.schema;
   if (!doc || !selection || !(selection instanceof _prosemirrorState.NodeSelection) || selection.node.type !== schema.nodes.mediaSingle) {
     return;
   }
-  var node = doc.nodeAt(selection.$anchor.pos + 1);
+  var pos = selection.$anchor.pos + 1;
+  var node = doc.nodeAt(pos);
   if (!node || node.type !== schema.nodes.media) {
     return;
   }
-  return node;
+  return {
+    node: node,
+    pos: pos
+  };
+};
+exports.currentMediaNodeWithPos = currentMediaNodeWithPos;
+var currentMediaNode = function currentMediaNode(editorState) {
+  var _currentMediaNodeWith;
+  return (_currentMediaNodeWith = currentMediaNodeWithPos(editorState)) === null || _currentMediaNodeWith === void 0 ? void 0 : _currentMediaNodeWith.node;
+};
+exports.currentMediaNode = currentMediaNode;
+var currentMediaNodeBorderMark = function currentMediaNodeBorderMark(editorState) {
+  var node = currentMediaNode(editorState);
+  if (!node) {
+    return;
+  }
+  var borderMark = node.marks.find(function (m) {
+    return m.type.name === 'border';
+  });
+  if (!borderMark) {
+    return;
+  }
+  return borderMark.attrs;
 };
-exports.currentMediaNode = currentMediaNode;
+exports.currentMediaNodeBorderMark = currentMediaNodeBorderMark;

package/dist/cjs/plugins/paste/util/index.js

@@ -25,6 +25,7 @@ var _analytics = require("../../analytics");
 var _prosemirrorState = require("prosemirror-state");
 var _prosemirrorUtils = require("prosemirror-utils");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _sortByOrder = require("../../../create-editor/sort-by-order");
 function isPastedFromWord(html) {
   return !!html && html.indexOf('urn:schemas-microsoft-com:office:word') >= 0;
 }
@@ -113,6 +114,7 @@ function applyTextMarksToSlice(schema, marks) {
         }) || []), (0, _toConsumableArray2.default)(parent.type.allowedMarks(marks).filter(function (mark) {
           return mark.type !== linkMark;
         })));
+        node.marks.sort((0, _sortByOrder.sortByOrderWithTypeName)('marks'));
         return false;
       }
       return true;

package/dist/cjs/plugins/rank.js

@@ -27,7 +27,7 @@ var _default = {
   // Inline marks
   'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'typeAheadQuery',
   // Block marks
-  'alignment', 'breakout', 'indentation', 'annotation', 'dataConsumer',
+  'alignment', 'breakout', 'indentation', 'annotation', 'dataConsumer', 'border',
   // Unsupported mark
   'unsupportedMark', 'unsupportedNodeAttribute']
 };

package/dist/cjs/plugins/rule/pm-plugins/input-rule.js

@@ -9,6 +9,7 @@ var _prosemirrorModel = require("prosemirror-model");
 var _inputRules = require("../../../utils/input-rules");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _insert = require("../../../utils/insert");
+var _prosemirrorUtils = require("prosemirror-utils");
 var _analytics = require("../../analytics");
 var _featureFlagsContext = require("../../feature-flags-context");
 var createHorizontalRule = function createHorizontalRule(state, start, end, inputMethod) {
@@ -43,6 +44,10 @@ var createHorizontalRule = function createHorizontalRule(state, start, end, inpu
 };
 exports.createHorizontalRule = createHorizontalRule;
 var createHorizontalRuleAutoformat = function createHorizontalRuleAutoformat(state, start, end) {
+  var listItem = state.schema.nodes.listItem;
+  if ((0, _prosemirrorUtils.hasParentNodeOfType)(listItem)(state.selection)) {
+    return null;
+  }
   return createHorizontalRule(state, start, end, _analytics.INPUT_METHOD.FORMATTING);
 };
 function inputRulePlugin(schema, featureFlags) {

package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -42,7 +42,8 @@ var useClearIcon = function useClearIcon(_ref) {
         name: 'clearFormatting'
       },
       isActive: false,
-      isDisabled: !formattingIsPresent
+      isDisabled: !formattingIsPresent,
+      'aria-label': _keymaps.clearFormatting ? (0, _keymaps.tooltip)(_keymaps.clearFormatting, String(clearFormattingLabel)) : String(clearFormattingLabel)
     };
   }, [clearFormattingLabel, isPluginAvailable, formattingIsPresent]);
 };

package/dist/cjs/plugins/toolbar-lists-indentation/index.js

@@ -11,9 +11,10 @@ var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"
 var _types = require("../../ui/Toolbar/types");
 var _main = require("../list/pm-plugins/main");
 var _indentationButtons = require("./pm-plugins/indentation-buttons");
-var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref) {
+var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref, api) {
   var showIndentationButtons = _ref.showIndentationButtons,
     allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation;
+  var featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
   return {
     name: 'toolbarListsIndentation',
     pmPlugins: function pmPlugins() {
@@ -50,6 +51,7 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref)
             return null;
           }
           return /*#__PURE__*/_react.default.createElement(_ui.default, {
+            featureFlags: featureFlags,
             isSmall: isSmall,
             isReducedSpacing: isToolbarReducedSpacing,
             disabled: disabled,

package/dist/cjs/plugins/toolbar-lists-indentation/ui/Toolbar.js

@@ -48,7 +48,8 @@ function Toolbar(props) {
     return function (event) {
       return onItemActivated({
         editorView: props.editorView,
-        buttonName: buttonName
+        buttonName: buttonName,
+        featureFlags: props.featureFlags
       });
     };
   };

package/dist/cjs/plugins/toolbar-lists-indentation/ui/ToolbarDropdown.js

@@ -62,7 +62,8 @@ function ToolbarDropdown(props) {
     setIsDropdownOpen(!shouldCloseMenu);
     return onItemActivated({
       editorView: props.editorView,
-      buttonName: item.value.name
+      buttonName: item.value.name,
+      featureFlags: props.featureFlags
     });
   };
   return (0, _react.jsx)("span", {

package/dist/cjs/plugins/toolbar-lists-indentation/ui/index.js

@@ -23,7 +23,8 @@ function ToolbarListsIndentation(props) {
     popupsBoundariesElement = props.popupsBoundariesElement,
     popupsScrollableElement = props.popupsScrollableElement,
     indentDisabled = props.indentDisabled,
-    outdentDisabled = props.outdentDisabled;
+    outdentDisabled = props.outdentDisabled,
+    featureFlags = props.featureFlags;
   if (isSmall) {
     return (0, _react.jsx)(_ToolbarDropdown.ToolbarDropdown, {
       editorView: props.editorView,
@@ -39,7 +40,8 @@ function ToolbarListsIndentation(props) {
       indentDisabled: indentDisabled,
       outdentDisabled: outdentDisabled,
       disabled: disabled,
-      onItemActivated: _onItemActivated.onItemActivated
+      onItemActivated: _onItemActivated.onItemActivated,
+      featureFlags: featureFlags
     });
   }
   return (0, _react.jsx)(_Toolbar.Toolbar, {
@@ -53,6 +55,7 @@ function ToolbarListsIndentation(props) {
     indentDisabled: indentDisabled,
     outdentDisabled: outdentDisabled,
     disabled: disabled,
-    onItemActivated: _onItemActivated.onItemActivated
+    onItemActivated: _onItemActivated.onItemActivated,
+    featureFlags: featureFlags
   });
 }

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

@@ -11,7 +11,8 @@ var _analytics = require("../../analytics");
 var _indentationButtons = require("../pm-plugins/indentation-buttons");
 function onItemActivated(_ref) {
   var buttonName = _ref.buttonName,
-    editorView = _ref.editorView;
+    editorView = _ref.editorView,
+    featureFlags = _ref.featureFlags;
   switch (buttonName) {
     case 'bullet_list':
       (0, _commands.toggleBulletList)(editorView, _analytics.INPUT_METHOD.TOOLBAR);
@@ -40,7 +41,7 @@ function onItemActivated(_ref) {
           (0, _commands2.getOutdentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (_node === 'list') {
-          (0, _commands.outdentList)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          (0, _commands.outdentList)(_analytics.INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
         }
         if (_node === 'taskList') {
           (0, _keymaps.getUnindentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);

package/dist/cjs/test-utils.js

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

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

@@ -57,14 +57,16 @@ var EditorToolbar = /*#__PURE__*/_react.default.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 ? (0, _react2.jsx)(_FindReplaceToolbarButtonWithState.default, {
     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);
   (0, _react.useEffect)(function () {
     var _props$featureFlags7;

package/dist/cjs/ui/styles.js

@@ -27,7 +27,7 @@ var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 var buttonGroupStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n\n  & > div {\n    display: flex;\n  }\n"])));
 exports.buttonGroupStyle = buttonGroupStyle;
-var separatorStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  background: ", ";\n  width: 1px;\n  height: 24px;\n  display: inline-block;\n  margin: 0 8px;\n"])), "var(--ds-border, ".concat(_colors.N30, ")"));
+var separatorStyles = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\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(_colors.N30, ")"));
 exports.separatorStyles = separatorStyles;
 var wrapperStyle = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\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"])));
 exports.wrapperStyle = wrapperStyle;

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

@@ -13,8 +13,6 @@ var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("../plugins/analytics");
 var _analytics2 = require("@atlaskit/editor-common/analytics");
 var _prosemirrorHistory = require("prosemirror-history");
-var _prosemirrorUtils = require("prosemirror-utils");
-var _featureFlagsContext = require("../plugins/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; }
 var ruleWithAnalytics = function ruleWithAnalytics(getPayload) {
@@ -109,21 +107,6 @@ var createWrappingJoinRule = function createWrappingJoinRule(_ref3) {
       tr.setNodeMarkup(parentNodePosMapped, parentNode.type, parentNode.attrs, allowedMarks);
     }
     tr.wrap(range, wrapping);
-    var featureFlags = (0, _featureFlagsContext.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 = (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, _analytics2.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, _analytics2.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
       tr.join(fixedStart - 1);

package/dist/cjs/utils/insert.js

@@ -11,6 +11,7 @@ var _prosemirrorTransform = require("prosemirror-transform");
 var _document = require("./document");
 var _gapCursorSelection = require("../plugins/selection/gap-cursor-selection");
 var _selection = require("./selection");
+var _node = require("../plugins/list/utils/node");
 var LookDirection;
 exports.LookDirection = LookDirection;
 (function (LookDirection) {
@@ -27,6 +28,18 @@ var nodeIsInsideAList = function nodeIsInsideAList(tr) {
   var nodes = tr.doc.type.schema.nodes;
   return (0, _prosemirrorUtils.hasParentNodeOfType)([nodes.orderedList, nodes.bulletList])(tr.selection);
 };
+var selectionIsInsideAPanel = function selectionIsInsideAPanel(tr) {
+  var nodes = tr.doc.type.schema.nodes;
+  return (0, _prosemirrorUtils.hasParentNodeOfType)(nodes.panel)(tr.selection);
+};
+var selectionIsInNestedList = function selectionIsInNestedList(tr) {
+  var nodes = tr.doc.type.schema.nodes;
+  var parentListNode = (0, _prosemirrorUtils.findParentNodeOfType)([nodes.orderedList, nodes.bulletList])(tr.selection);
+  if (!parentListNode) {
+    return false;
+  }
+  return (0, _node.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
@@ -54,9 +67,7 @@ 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 _prosemirrorModel.Fragment || !whitelist.includes(content.type) || nodeIsInsideAList(tr)) {
+    if (content instanceof _prosemirrorModel.Fragment || !whitelist.includes(content.type)) {
       return null;
     }
 
@@ -88,14 +99,28 @@ 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 (0, _prosemirrorUtils.safeInsert)(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 _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(nodes.rule.createChecked()), 0, 0));
+    }
     if (!lookDirection) {
       // fallback to consumer for now
       return null;
@@ -117,7 +142,14 @@ 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(_prosemirrorState.TextSelection.between(nextTr.selection.$from, nextTr.selection.$from));
+        } else {
+          return nextTr;
+        }
       }
 
       // Can not insert into current parent, step up one parent
@@ -165,7 +197,21 @@ var insertSelectedItem = function insertSelectedItem(maybeNode) {
        *
        */
     } else if (node.isBlock) {
-      tr = (0, _prosemirrorUtils.safeInsert)((0, _selection.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 = (0, _prosemirrorUtils.safeInsert)((0, _selection.normaliseNestedLayout)(state, node), undefined, true)(tr);
+      }
 
       /**
        *

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "181.0.1";
+var version = "182.0.1";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/create-editor/sort-by-order.js

@@ -3,4 +3,15 @@ export function sortByOrder(item) {
   return function (a, b) {
     return Ranks[item].indexOf(a.name) - Ranks[item].indexOf(b.name);
   };
+}
+
+// while functionally the same, in order to avoid potentially rewriting the ~10
+// existing implementations of the above function I decided creating a separate
+// function avoided that whole mess. If someone can think of a better way to implement
+// the above and below into a single function please do so
+
+export function sortByOrderWithTypeName(item) {
+  return function (a, b) {
+    return Ranks[item].indexOf(a.type.name) - Ranks[item].indexOf(b.type.name);
+  };
 }

package/dist/es2019/editor-next/editor-migration-component.js

@@ -1,8 +1,10 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
 import Editor from '../editor';
 import EditorNext from './index';
+import { defaultProps } from './utils/editorPropTypes';
 import useUniversalPreset from '../labs/next/presets/useUniversalPreset';
 const EditorNextWrapper = ({
   props
@@ -24,4 +26,5 @@ export default class EditorMigrationComponent extends React.Component {
       props: this.props
     });
   }
-}
+}
+_defineProperty(EditorMigrationComponent, "defaultProps", defaultProps);

package/dist/es2019/editor-next/utils/deprecationWarnings.js

@@ -1,6 +1,5 @@
 import { nextMajorVersion } from '../../version-wrapper';
 export default function deprecationWarnings(props) {
-  var _props$allowTextColor;
   if (process.env.NODE_ENV === 'production') {
     return;
   }
@@ -32,8 +31,4 @@ export default function deprecationWarnings(props) {
     // eslint-disable-next-line no-console
     console.warn(`Advanced table options are deprecated (except isHeaderRowRequired) to continue using advanced table features use - <Editor allowTables={{ advanced: true }} /> [Will be changed in editor-core@${nextVersion}]`);
   }
-  if (props.hasOwnProperty('allowTextColor') && typeof props.allowTextColor !== 'boolean' && (props === null || props === void 0 ? void 0 : (_props$allowTextColor = props.allowTextColor) === null || _props$allowTextColor === void 0 ? void 0 : _props$allowTextColor.allowMoreTextColors) !== undefined) {
-    // eslint-disable-next-line no-console
-    console.warn(`"allowMoreTextColors" field of "allowTextColor" property is deprecated. It will be removedin editor-core@${nextVersion}. The color palette now shows more colors by default.`);
-  }
 }

package/dist/es2019/labs/next/full-page.js

@@ -166,7 +166,8 @@ function FullPage(props) {
     editorView: config.editorView,
     eventDispatcher: config.eventDispatcher,
     inviteToEditHandler: collabEdit === null || collabEdit === void 0 ? void 0 : collabEdit.inviteToEditHandler,
-    isInviteToEditButtonSelected: collabEdit === null || collabEdit === void 0 ? void 0 : collabEdit.isInviteToEditButtonSelected
+    isInviteToEditButtonSelected: collabEdit === null || collabEdit === void 0 ? void 0 : collabEdit.isInviteToEditButtonSelected,
+    featureFlags: {}
   }), primaryToolbarComponents)), jsx("div", {
     css: contentArea
   }, jsx(ContentStyles, {

package/dist/es2019/labs/next/presets/default.js

@@ -13,6 +13,7 @@ import typeAheadPlugin from '../../../plugins/type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
 import fakeTextCursorPlugin from '../../../plugins/fake-text-cursor';
 import featureFlagsContextPlugin from '../../../plugins/feature-flags-context';
+import featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
 import floatingToolbarPlugin from '../../../plugins/floating-toolbar';
 import clipboardPlugin from '../../../plugins/clipboard';
 import placeholderPlugin from '../../../plugins/placeholder';
@@ -29,7 +30,7 @@ import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
  * their placement in the editor toolbar
  */
 export function createDefaultPreset(options) {
-  const preset = new EditorPresetBuilder().add([pastePlugin, options.paste]).add(clipboardPlugin).add([basePlugin, options.base]).maybeAdd(undoRedoPlugin, (p, builder) => {
+  const preset = new EditorPresetBuilder().add([featureFlagsPlugin, options.featureFlags || {}]).add([pastePlugin, options.paste]).add(clipboardPlugin).add([basePlugin, options.base]).maybeAdd(undoRedoPlugin, (p, builder) => {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/es2019/labs/next/presets/universal.js

@@ -1,4 +1,4 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
 import { tablesPlugin } from '@atlaskit/editor-plugin-table';
 import { isFullPage as fullPageCheck } from '../../../utils/is-full-page';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
@@ -110,7 +110,8 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
         uploadErrorHandler: props.uploadErrorHandler,
         waitForMediaUpload: props.waitForMediaUpload,
         isCopyPasteEnabled: !isMobile,
-        alignLeftOnInsert
+        alignLeftOnInsert,
+        getEditorFeatureFlags
       }]);
     }
     return builder;
@@ -373,6 +374,11 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       }]);
     }
     return builder;
+  }).maybeAdd(borderPlugin, (plugin, builder) => {
+    if (props.UNSAFE_allowBorderMark) {
+      return builder.add(plugin);
+    }
+    return builder;
   }).maybeAdd(fragmentMarkPlugin, (plugin, builder) => {
     if (props.allowFragmentMark) {
       return builder.add(plugin);

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -7,7 +7,8 @@ import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import Dropdown from '../../../../ui/Dropdown';
 import Alignment from '../../../../ui/Alignment';
-import { expandIconWrapper, separator, triggerWrapper, wrapper } from './styles';
+import { expandIconWrapper, triggerWrapper, wrapper } from './styles';
+import { separatorStyles } from '../../../../ui/styles';
 import { IconMap } from './icon-map';
 import { messages } from './messages';
 export class AlignmentToolbar extends React.Component {
@@ -132,7 +133,7 @@ export class AlignmentToolbar extends React.Component {
       onClick: align => this.changeAlignment(align, false),
       selectedAlignment: pluginState.align
     })), jsx("span", {
-      css: separator
+      css: separatorStyles
     }));
   }
   componentDidUpdate(prevProps) {

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/styles.js

@@ -1,15 +1,7 @@
 import { css } from '@emotion/react';
-import { N30 } from '@atlaskit/theme/colors';
 export const triggerWrapper = css`
   display: flex;
 `;
-export const separator = css`
-  background: ${`var(--ds-border, ${N30})`};
-  width: 1px;
-  height: 24px;
-  display: inline-block;
-  margin: 0 8px;
-`;
 export const wrapper = css`
   display: flex;
   align-items: center;