@atlaskit/editor-core 189.4.19 → 189.5.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 189.5.1
+
+### Patch Changes
+
+- [#58597](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58597) [`205975214b9c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/205975214b9c) - ED-20961: Handle copy paste - list with blockquote
+
+## 189.5.0
+
+### Minor Changes
+
+- [#58193](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58193) [`142df4424484`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/142df4424484) - NO-ISSUE Added new editor plugin to enable Loom video recording in the Editor
+
+### Patch Changes
+
+- [#58193](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58193) [`c03518e00722`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c03518e00722) - NO-ISSUE Improved Loom unit tests
+- Updated dependencies
+
 ## 189.4.19
 
 ### Patch Changes

package/dist/cjs/plugins/paste/edge-cases/index.js

@@ -4,9 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertSliceForLists = insertSliceForLists;
+exports.insertSliceForListsInsideBlockquote = insertSliceForListsInsideBlockquote;
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _lists = require("./lists");
 var _utils2 = require("@atlaskit/editor-common/utils");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _util = require("../util");
 function insertSliceForLists(_ref) {
   var _slice$content$firstC;
@@ -59,4 +62,27 @@ function insertSliceForLists(_ref) {
     });
   }
   tr.replaceSelection(slice);
+}
+function insertSliceForListsInsideBlockquote(_ref3) {
+  var tr = _ref3.tr,
+    slice = _ref3.slice;
+  (0, _utils.safeInsert)(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  // ProseMirror doesn't give a proper way to tell us where something was inserted.
+  // However, we can know "how" it inserted something.
+  //
+  // So, instead of weird depth calculations, we can use the step produced by the transform.
+  // For instance:
+  //    The `replaceStep.to and replaceStep.from`, tell us the real position
+  //    where the content will be insert.
+  //    Then, we can use the `tr.mapping.map` to the updated position after the replace operation
+  var replaceStep = tr.steps[0];
+  if (!(replaceStep instanceof _transform.ReplaceStep)) {
+    return tr;
+  }
+  var nextPosition = tr.mapping.map(replaceStep.to);
+  // The findFrom will make search for both: TextSelection and NodeSelections.
+  var nextSelection = _state.Selection.findFrom(tr.doc.resolve(Math.min(nextPosition, tr.doc.content.size)), -1);
+  if (nextSelection) {
+    tr.setSelection(nextSelection);
+  }
 }

package/dist/cjs/plugins/paste/handlers.js

@@ -861,15 +861,24 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         schema: schema
       });
     } else if (noNeedForSafeInsert) {
-      var _slice$content$lastCh;
-      tr.replaceSelection(slice);
-      // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
-      // need to make sure the cursor position is is right after the panel, expand, or decisionList
-      // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
-      var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
-      if ((0, _utils3.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
-        var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT));
+      var _firstChildOfSlice$ty2, _firstChildOfSlice$co;
+      if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && (firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co === void 0 ? void 0 : _firstChildOfSlice$co.type.name) === ('bulletList' || 'orderedList')) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
+        (0, _edgeCases.insertSliceForListsInsideBlockquote)({
+          tr: tr,
+          slice: slice
+        });
+      } else {
+        var _slice$content$lastCh;
+        tr.replaceSelection(slice);
+        // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
+        // need to make sure the cursor position is is right after the panel, expand, or decisionList
+        // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
+        var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
+        if ((0, _utils3.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
+          var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
+          tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT));
+        }
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it

package/dist/cjs/presets/universal.js

@@ -8,44 +8,45 @@ exports.default = createUniversalPreset;
 exports.isExpandInsertionEnabled = isExpandInsertionEnabled;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _plugins = require("../plugins");
+var _editorPluginBorder = require("@atlaskit/editor-plugin-border");
+var _editorPluginCaption = require("@atlaskit/editor-plugin-caption");
+var _editorPluginCard = require("@atlaskit/editor-plugin-card");
 var _editorPluginCodeBidiWarning = require("@atlaskit/editor-plugin-code-bidi-warning");
-var _editorPluginTasksAndDecisions = require("@atlaskit/editor-plugin-tasks-and-decisions");
-var _editorPluginPanel = require("@atlaskit/editor-plugin-panel");
-var _editorPluginTextColor = require("@atlaskit/editor-plugin-text-color");
+var _editorPluginContentInsertion = require("@atlaskit/editor-plugin-content-insertion");
+var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
+var _editorPluginDate = require("@atlaskit/editor-plugin-date");
+var _editorPluginEmoji = require("@atlaskit/editor-plugin-emoji");
+var _editorPluginExpand = require("@atlaskit/editor-plugin-expand");
+var _editorPluginFragment = require("@atlaskit/editor-plugin-fragment");
+var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
+var _editorPluginGuideline = require("@atlaskit/editor-plugin-guideline");
+var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
 var _editorPluginHistory = require("@atlaskit/editor-plugin-history");
+var _editorPluginImageUpload = require("@atlaskit/editor-plugin-image-upload");
 var _editorPluginIndentation = require("@atlaskit/editor-plugin-indentation");
-var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
 var _editorPluginInsertBlock = require("@atlaskit/editor-plugin-insert-block");
-var _editorPluginDate = require("@atlaskit/editor-plugin-date");
+var _editorPluginLayout = require("@atlaskit/editor-plugin-layout");
+var _editorPluginList = require("@atlaskit/editor-plugin-list");
+var _editorPluginLoom = require("@atlaskit/editor-plugin-loom");
 var _editorPluginMaxContentSize = require("@atlaskit/editor-plugin-max-content-size");
-var _editorPluginCaption = require("@atlaskit/editor-plugin-caption");
-var _editorPluginBorder = require("@atlaskit/editor-plugin-border");
-var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
 var _editorPluginMedia = require("@atlaskit/editor-plugin-media");
-var _editorPluginRule = require("@atlaskit/editor-plugin-rule");
-var _editorPluginFragment = require("@atlaskit/editor-plugin-fragment");
-var _editorPluginEmoji = require("@atlaskit/editor-plugin-emoji");
+var _editorPluginMentions = require("@atlaskit/editor-plugin-mentions");
+var _editorPluginPanel = require("@atlaskit/editor-plugin-panel");
 var _editorPluginPasteOptionsToolbar = require("@atlaskit/editor-plugin-paste-options-toolbar");
-var _editorPluginList = require("@atlaskit/editor-plugin-list");
-var _editorPluginImageUpload = require("@atlaskit/editor-plugin-image-upload");
-var _editorPluginGuideline = require("@atlaskit/editor-plugin-guideline");
-var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
-var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
-var _editorPluginCard = require("@atlaskit/editor-plugin-card");
-var _editorPluginLayout = require("@atlaskit/editor-plugin-layout");
+var _editorPluginPlaceholderText = require("@atlaskit/editor-plugin-placeholder-text");
+var _editorPluginRule = require("@atlaskit/editor-plugin-rule");
+var _editorPluginSaveOnEnter = require("@atlaskit/editor-plugin-save-on-enter");
+var _editorPluginScrollIntoView = require("@atlaskit/editor-plugin-scroll-into-view");
+var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
 var _editorPluginTable = require("@atlaskit/editor-plugin-table");
+var _editorPluginTasksAndDecisions = require("@atlaskit/editor-plugin-tasks-and-decisions");
+var _editorPluginTextColor = require("@atlaskit/editor-plugin-text-color");
 var _editorPluginToolbarListsIndentation = require("@atlaskit/editor-plugin-toolbar-lists-indentation");
-var _editorPluginContentInsertion = require("@atlaskit/editor-plugin-content-insertion");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _editorPluginSaveOnEnter = require("@atlaskit/editor-plugin-save-on-enter");
-var _editorPluginScrollIntoView = require("@atlaskit/editor-plugin-scroll-into-view");
-var _editorPluginMentions = require("@atlaskit/editor-plugin-mentions");
-var _editorPluginPlaceholderText = require("@atlaskit/editor-plugin-placeholder-text");
-var _editorPluginExpand = require("@atlaskit/editor-plugin-expand");
+var _plugins = require("../plugins");
+var _utils = require("@atlaskit/editor-common/utils");
 var _isFullPage = require("../utils/is-full-page");
 var _default = require("./default");
-var _utils = require("@atlaskit/editor-common/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -419,7 +420,12 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
     return builder;
   }).add([_editorPluginCodeBidiWarning.codeBidiWarningPlugin, {
     appearance: appearance
-  }]);
+  }]).maybeAdd(_editorPluginLoom.loomPlugin, function (loomPlugin, builder) {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.loom-integration')) {
+      return builder.add(loomPlugin);
+    }
+    return builder;
+  });
   return finalPreset;
 }
 function isExpandInsertionEnabled(_ref) {

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.4.19";
+var version = exports.version = "189.5.1";

package/dist/es2019/plugins/paste/edge-cases/index.js

@@ -1,6 +1,8 @@
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { insertSliceIntoRangeSelectionInsideList, insertSliceInsideOfPanelNodeSelected, insertSliceAtNodeEdge, insertSliceIntoEmptyNode } from './lists';
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { isSelectionInsidePanel, isEmptyNode, isCursorSelectionAtTextStartOrEnd } from '../util';
 export function insertSliceForLists({
   tr,
@@ -58,4 +60,28 @@ export function insertSliceForLists({
     });
   }
   tr.replaceSelection(slice);
+}
+export function insertSliceForListsInsideBlockquote({
+  tr,
+  slice
+}) {
+  safeInsert(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  // ProseMirror doesn't give a proper way to tell us where something was inserted.
+  // However, we can know "how" it inserted something.
+  //
+  // So, instead of weird depth calculations, we can use the step produced by the transform.
+  // For instance:
+  //    The `replaceStep.to and replaceStep.from`, tell us the real position
+  //    where the content will be insert.
+  //    Then, we can use the `tr.mapping.map` to the updated position after the replace operation
+  const replaceStep = tr.steps[0];
+  if (!(replaceStep instanceof ReplaceStep)) {
+    return tr;
+  }
+  const nextPosition = tr.mapping.map(replaceStep.to);
+  // The findFrom will make search for both: TextSelection and NodeSelections.
+  const nextSelection = Selection.findFrom(tr.doc.resolve(Math.min(nextPosition, tr.doc.content.size)), -1);
+  if (nextSelection) {
+    tr.setSelection(nextSelection);
+  }
 }

package/dist/es2019/plugins/paste/handlers.js

@@ -11,7 +11,7 @@ import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 // TODO: ED-20519 Needs Macro extraction
 
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
-import { insertSliceForLists } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
@@ -843,15 +843,24 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         schema
       });
     } else if (noNeedForSafeInsert) {
-      var _slice$content$lastCh, _slice$content$lastCh2;
-      tr.replaceSelection(slice);
-      // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
-      // need to make sure the cursor position is is right after the panel, expand, or decisionList
-      // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
-      const shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
-      if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
-        const nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+      var _firstChildOfSlice$ty2, _firstChildOfSlice$co;
+      if ((firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && (firstChildOfSlice === null || firstChildOfSlice === void 0 ? void 0 : (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co === void 0 ? void 0 : _firstChildOfSlice$co.type.name) === ('bulletList' || 'orderedList')) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
+        insertSliceForListsInsideBlockquote({
+          tr,
+          slice
+        });
+      } else {
+        var _slice$content$lastCh, _slice$content$lastCh2;
+        tr.replaceSelection(slice);
+        // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
+        // need to make sure the cursor position is is right after the panel, expand, or decisionList
+        // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
+        const shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
+        if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
+          const nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
+          tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+        }
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it

package/dist/es2019/presets/universal.js

@@ -1,41 +1,42 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, jiraIssuePlugin, alignmentPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin } from '../plugins';
+import { borderPlugin } from '@atlaskit/editor-plugin-border';
+import { captionPlugin } from '@atlaskit/editor-plugin-caption';
+import { cardPlugin } from '@atlaskit/editor-plugin-card';
 import { codeBidiWarningPlugin } from '@atlaskit/editor-plugin-code-bidi-warning';
-import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
-import { panelPlugin } from '@atlaskit/editor-plugin-panel';
-import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
+import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
+import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
+import { datePlugin } from '@atlaskit/editor-plugin-date';
+import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
+import { expandPlugin } from '@atlaskit/editor-plugin-expand';
+import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
+import { gridPlugin } from '@atlaskit/editor-plugin-grid';
+import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
+import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
 import { indentationPlugin } from '@atlaskit/editor-plugin-indentation';
-import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { insertBlockPlugin } from '@atlaskit/editor-plugin-insert-block';
-import { datePlugin } from '@atlaskit/editor-plugin-date';
+import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
+import { listPlugin } from '@atlaskit/editor-plugin-list';
+import { loomPlugin } from '@atlaskit/editor-plugin-loom';
 import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';
-import { captionPlugin } from '@atlaskit/editor-plugin-caption';
-import { borderPlugin } from '@atlaskit/editor-plugin-border';
-import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { mediaPlugin } from '@atlaskit/editor-plugin-media';
-import { rulePlugin } from '@atlaskit/editor-plugin-rule';
-import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
-import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
+import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
+import { panelPlugin } from '@atlaskit/editor-plugin-panel';
 import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugin-paste-options-toolbar';
-import { listPlugin } from '@atlaskit/editor-plugin-list';
-import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
-import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
-import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
-import { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import { cardPlugin } from '@atlaskit/editor-plugin-card';
-import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
+import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
+import { rulePlugin } from '@atlaskit/editor-plugin-rule';
+import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
+import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
+import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { tablesPlugin } from '@atlaskit/editor-plugin-table';
+import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
+import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { toolbarListsIndentationPlugin } from '@atlaskit/editor-plugin-toolbar-lists-indentation';
-import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
-import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
-import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
-import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
-import { expandPlugin } from '@atlaskit/editor-plugin-expand';
+import { alignmentPlugin, annotationPlugin, avatarGroupPlugin, beforePrimaryToolbarPlugin, breakoutPlugin, collabEditPlugin, customAutoformatPlugin, dataConsumerMarkPlugin, extensionPlugin, feedbackDialogPlugin, findReplacePlugin, jiraIssuePlugin, mobileDimensionsPlugin, mobileSelectionPlugin, viewUpdateSubscriptionPlugin } from '../plugins';
+import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 import { createDefaultPreset } from './default';
-import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 /**
  * Creates a preset with all of the available plugins.
  * Basis for create-plugins-list and can be used to migrate from Editor -> EditorNext (Presets project)
@@ -415,7 +416,12 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     return builder;
   }).add([codeBidiWarningPlugin, {
     appearance
-  }]);
+  }]).maybeAdd(loomPlugin, (loomPlugin, builder) => {
+    if (getBooleanFF('platform.editor.loom-integration')) {
+      return builder.add(loomPlugin);
+    }
+    return builder;
+  });
   return finalPreset;
 }
 export function isExpandInsertionEnabled({

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.4.19";
+export const version = "189.5.1";

package/dist/esm/plugins/paste/edge-cases/index.js

@@ -1,6 +1,8 @@
-import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { Selection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { insertSliceIntoRangeSelectionInsideList, insertSliceInsideOfPanelNodeSelected, insertSliceAtNodeEdge, insertSliceIntoEmptyNode } from './lists';
 import { isListNode } from '@atlaskit/editor-common/utils';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { isSelectionInsidePanel, isEmptyNode, isCursorSelectionAtTextStartOrEnd } from '../util';
 export function insertSliceForLists(_ref) {
   var _slice$content$firstC;
@@ -53,4 +55,27 @@ export function insertSliceForLists(_ref) {
     });
   }
   tr.replaceSelection(slice);
+}
+export function insertSliceForListsInsideBlockquote(_ref3) {
+  var tr = _ref3.tr,
+    slice = _ref3.slice;
+  safeInsert(slice.content, tr.selection.$to.pos)(tr).scrollIntoView();
+  // ProseMirror doesn't give a proper way to tell us where something was inserted.
+  // However, we can know "how" it inserted something.
+  //
+  // So, instead of weird depth calculations, we can use the step produced by the transform.
+  // For instance:
+  //    The `replaceStep.to and replaceStep.from`, tell us the real position
+  //    where the content will be insert.
+  //    Then, we can use the `tr.mapping.map` to the updated position after the replace operation
+  var replaceStep = tr.steps[0];
+  if (!(replaceStep instanceof ReplaceStep)) {
+    return tr;
+  }
+  var nextPosition = tr.mapping.map(replaceStep.to);
+  // The findFrom will make search for both: TextSelection and NodeSelections.
+  var nextSelection = Selection.findFrom(tr.doc.resolve(Math.min(nextPosition, tr.doc.content.size)), -1);
+  if (nextSelection) {
+    tr.setSelection(nextSelection);
+  }
 }

package/dist/esm/plugins/paste/handlers.js

@@ -19,7 +19,7 @@ import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 // TODO: ED-20519 Needs Macro extraction
 
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
-import { insertSliceForLists } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
@@ -840,15 +840,24 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         schema: schema
       });
     } else if (noNeedForSafeInsert) {
-      var _slice$content$lastCh;
-      tr.replaceSelection(slice);
-      // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
-      // need to make sure the cursor position is is right after the panel, expand, or decisionList
-      // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
-      var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
-      if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
-        var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+      var _firstChildOfSlice$ty2, _firstChildOfSlice$co;
+      if ((firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$ty2 = firstChildOfSlice.type) === null || _firstChildOfSlice$ty2 === void 0 ? void 0 : _firstChildOfSlice$ty2.name) === 'blockquote' && (firstChildOfSlice === null || firstChildOfSlice === void 0 || (_firstChildOfSlice$co = firstChildOfSlice.content.firstChild) === null || _firstChildOfSlice$co === void 0 ? void 0 : _firstChildOfSlice$co.type.name) === ('bulletList' || 'orderedList')) {
+        // checks if parent node is a blockquote and child node is either a bulletlist or orderedlist
+        insertSliceForListsInsideBlockquote({
+          tr: tr,
+          slice: slice
+        });
+      } else {
+        var _slice$content$lastCh;
+        tr.replaceSelection(slice);
+        // when cursor is inside a table cell, and slice.content.lastChild is a panel, expand, or decisionList
+        // need to make sure the cursor position is is right after the panel, expand, or decisionList
+        // still in the same table cell, see issue: https://product-fabric.atlassian.net/browse/ED-17862
+        var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList', 'codeBlock'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 || (_slice$content$lastCh = _slice$content$lastCh.type) === null || _slice$content$lastCh === void 0 ? void 0 : _slice$content$lastCh.name) || '');
+        if (insideTableCell(state) && shouldUpdateCursorPosAfterPaste) {
+          var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
+          tr.setSelection(new GapCursorSelection(nextPos, Side.RIGHT));
+        }
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it

package/dist/esm/presets/universal.js

@@ -2,44 +2,45 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, jiraIssuePlugin, alignmentPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin } from '../plugins';
+import { borderPlugin } from '@atlaskit/editor-plugin-border';
+import { captionPlugin } from '@atlaskit/editor-plugin-caption';
+import { cardPlugin } from '@atlaskit/editor-plugin-card';
 import { codeBidiWarningPlugin } from '@atlaskit/editor-plugin-code-bidi-warning';
-import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
-import { panelPlugin } from '@atlaskit/editor-plugin-panel';
-import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
+import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
+import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
+import { datePlugin } from '@atlaskit/editor-plugin-date';
+import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
+import { expandPlugin } from '@atlaskit/editor-plugin-expand';
+import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
+import { gridPlugin } from '@atlaskit/editor-plugin-grid';
+import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
+import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
 import { indentationPlugin } from '@atlaskit/editor-plugin-indentation';
-import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { insertBlockPlugin } from '@atlaskit/editor-plugin-insert-block';
-import { datePlugin } from '@atlaskit/editor-plugin-date';
+import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
+import { listPlugin } from '@atlaskit/editor-plugin-list';
+import { loomPlugin } from '@atlaskit/editor-plugin-loom';
 import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';
-import { captionPlugin } from '@atlaskit/editor-plugin-caption';
-import { borderPlugin } from '@atlaskit/editor-plugin-border';
-import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { mediaPlugin } from '@atlaskit/editor-plugin-media';
-import { rulePlugin } from '@atlaskit/editor-plugin-rule';
-import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
-import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
+import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
+import { panelPlugin } from '@atlaskit/editor-plugin-panel';
 import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugin-paste-options-toolbar';
-import { listPlugin } from '@atlaskit/editor-plugin-list';
-import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
-import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
-import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
-import { gridPlugin } from '@atlaskit/editor-plugin-grid';
-import { cardPlugin } from '@atlaskit/editor-plugin-card';
-import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
+import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
+import { rulePlugin } from '@atlaskit/editor-plugin-rule';
+import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
+import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
+import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { tablesPlugin } from '@atlaskit/editor-plugin-table';
+import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
+import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { toolbarListsIndentationPlugin } from '@atlaskit/editor-plugin-toolbar-lists-indentation';
-import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
-import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
-import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
-import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
-import { expandPlugin } from '@atlaskit/editor-plugin-expand';
+import { alignmentPlugin, annotationPlugin, avatarGroupPlugin, beforePrimaryToolbarPlugin, breakoutPlugin, collabEditPlugin, customAutoformatPlugin, dataConsumerMarkPlugin, extensionPlugin, feedbackDialogPlugin, findReplacePlugin, jiraIssuePlugin, mobileDimensionsPlugin, mobileSelectionPlugin, viewUpdateSubscriptionPlugin } from '../plugins';
+import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 import { createDefaultPreset } from './default';
-import { shouldForceTracking } from '@atlaskit/editor-common/utils';
 /**
  * Creates a preset with all of the available plugins.
  * Basis for create-plugins-list and can be used to migrate from Editor -> EditorNext (Presets project)
@@ -411,7 +412,12 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
     return builder;
   }).add([codeBidiWarningPlugin, {
     appearance: appearance
-  }]);
+  }]).maybeAdd(loomPlugin, function (loomPlugin, builder) {
+    if (getBooleanFF('platform.editor.loom-integration')) {
+      return builder.add(loomPlugin);
+    }
+    return builder;
+  });
   return finalPreset;
 }
 export function isExpandInsertionEnabled(_ref) {

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.4.19";
+export var version = "189.5.1";

package/dist/types/plugins/paste/edge-cases/index.d.ts

@@ -5,3 +5,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
     slice: Slice;
     schema: Schema;
 }): void | Transaction;
+export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
+    tr: Transaction;
+    slice: Slice;
+}): Transaction | undefined;

package/dist/types/presets/universal.d.ts

@@ -1,11 +1,11 @@
 import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import type { EditorProps } from '../types';
+import type { EditorPluginFeatureProps, EditorProviderProps, EditorSharedPropsWithPlugins } from '../types/editor-props';
+import type { FeatureFlags } from '../types/feature-flags';
 import type { DefaultPresetPluginOptions } from './default';
 import type { EditorPresetProps } from './types';
-import type { EditorSharedPropsWithPlugins, EditorPluginFeatureProps, EditorProviderProps } from '../types/editor-props';
-import type { FeatureFlags } from '../types/feature-flags';
-import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 type UniversalPresetProps = EditorPresetProps & DefaultPresetPluginOptions & EditorSharedPropsWithPlugins & EditorPluginFeatureProps & EditorProviderProps;
 /**
  * Creates a preset with all of the available plugins.

package/dist/types-ts4.5/plugins/paste/edge-cases/index.d.ts

@@ -5,3 +5,7 @@ export declare function insertSliceForLists({ tr, slice, schema, }: {
     slice: Slice;
     schema: Schema;
 }): void | Transaction;
+export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
+    tr: Transaction;
+    slice: Slice;
+}): Transaction | undefined;

package/dist/types-ts4.5/presets/universal.d.ts

@@ -1,11 +1,11 @@
 import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import type { EditorProps } from '../types';
+import type { EditorPluginFeatureProps, EditorProviderProps, EditorSharedPropsWithPlugins } from '../types/editor-props';
+import type { FeatureFlags } from '../types/feature-flags';
 import type { DefaultPresetPluginOptions } from './default';
 import type { EditorPresetProps } from './types';
-import type { EditorSharedPropsWithPlugins, EditorPluginFeatureProps, EditorProviderProps } from '../types/editor-props';
-import type { FeatureFlags } from '../types/feature-flags';
-import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 type UniversalPresetProps = EditorPresetProps & DefaultPresetPluginOptions & EditorSharedPropsWithPlugins & EditorPluginFeatureProps & EditorProviderProps;
 /**
  * Creates a preset with all of the available plugins.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.4.19",
+  "version": "189.5.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -51,7 +51,7 @@
     "@atlaskit/checkbox": "^13.0.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^13.0.0",
-    "@atlaskit/editor-common": "^76.24.0",
+    "@atlaskit/editor-common": "^76.25.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
@@ -89,6 +89,7 @@
     "@atlaskit/editor-plugin-insert-block": "^0.2.0",
     "@atlaskit/editor-plugin-layout": "^0.1.0",
     "@atlaskit/editor-plugin-list": "^1.4.0",
+    "@atlaskit/editor-plugin-loom": "^0.1.0",
     "@atlaskit/editor-plugin-max-content-size": "^0.1.0",
     "@atlaskit/editor-plugin-media": "^0.4.0",
     "@atlaskit/editor-plugin-mentions": "^0.1.0",
@@ -349,6 +350,9 @@
     "platform.editor.ordered-list-auto-join-improvements_mrlv5": {
       "type": "boolean",
       "referenceOnly": "true"
+    },
+    "platform.editor.loom-integration": {
+      "type": "boolean"
     }
   }
 }