@atlaskit/editor-plugin-paste 0.2.13 → 0.2.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-paste
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.2.14
+
+### Patch Changes
+
+- [#68219](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68219) [`39c60998e4d7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/39c60998e4d7) - ED-21894 Allow partial taskLists to be copied and pasted into a listItem
+
 ## 0.2.13
 
 ### Patch Changes

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertSliceForLists = insertSliceForLists;
 exports.insertSliceForListsInsideBlockquote = insertSliceForListsInsideBlockquote;
+exports.insertSliceForTaskInsideList = insertSliceForTaskInsideList;
 exports.updateSelectionAfterReplace = updateSelectionAfterReplace;
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
@@ -97,4 +98,15 @@ function updateSelectionAfterReplace(_ref4) {
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
+}
+function insertSliceForTaskInsideList(_ref5) {
+  var tr = _ref5.tr,
+    slice = _ref5.slice;
+  var schema = tr.doc.type.schema;
+  //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
+  tr.replaceSelection(new _model.Slice(_model.Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
+  updateSelectionAfterReplace({
+    tr: tr
+  });
+  tr.replaceSelection(slice);
 }

package/dist/cjs/handlers.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkTaskListInList = checkTaskListInList;
 exports.doesSelectionWhichStartsOrEndsInListContainEntireList = void 0;
 exports.flattenNestedListInSlice = flattenNestedListInSlice;
 exports.handleCodeBlock = handleCodeBlock;
@@ -842,7 +843,7 @@ function flattenNestedListInSlice(slice) {
 }
 function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre, _slice$content$firstC3;
+    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes3 = state.schema.nodes,
       codeBlock = _state$schema$nodes3.codeBlock,
       heading = _state$schema$nodes3.heading,
@@ -915,6 +916,11 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if ((0, _utils.insideTableCell)(state) && (0, _utils.isInListItem)(state) && (0, _utils2.canInsert)(selection.$from, slice.content) && (0, _utils2.canInsert)(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
+      } else if (checkTaskListInList(state, slice)) {
+        (0, _edgeCases.insertSliceForTaskInsideList)({
+          tr: tr,
+          slice: slice
+        });
       } else {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
@@ -925,11 +931,6 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(_state.TextSelection.near(tr.selection.$from, 1));
     }
-    if ((0, _utils.isInListItem)(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || '')) {
-      (0, _edgeCases.updateSelectionAfterReplace)({
-        tr: tr
-      });
-    }
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors
@@ -973,4 +974,8 @@ var handleSelectedTable = exports.handleSelectedTable = function handleSelectedT
       return false;
     };
   };
-};
+};
+function checkTaskListInList(state, slice) {
+  var _slice$content$firstC3;
+  return Boolean((0, _utils.isInListItem)(state) && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || ''));
+}

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

@@ -98,4 +98,18 @@ export function updateSelectionAfterReplace({
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
+}
+export function insertSliceForTaskInsideList({
+  tr,
+  slice
+}) {
+  const {
+    schema
+  } = tr.doc.type;
+  //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
+  tr.replaceSelection(new Slice(Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
+  updateSelectionAfterReplace({
+    tr
+  });
+  tr.replaceSelection(slice);
 }

package/dist/es2019/handlers.js

@@ -13,7 +13,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
-import { insertSliceForLists, insertSliceForListsInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceForTaskInsideList } from './edge-cases';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 
@@ -821,7 +821,7 @@ export function flattenNestedListInSlice(slice) {
 }
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre, _slice$content$firstC3, _slice$content$firstC4;
+    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     const {
       codeBlock,
       heading,
@@ -897,6 +897,11 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
+      } else if (checkTaskListInList(state, slice)) {
+        insertSliceForTaskInsideList({
+          tr,
+          slice
+        });
       } else {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
@@ -907,11 +912,6 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(TextSelection.near(tr.selection.$from, 1));
     }
-    if (isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || '')) {
-      updateSelectionAfterReplace({
-        tr
-      });
-    }
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors
@@ -953,4 +953,8 @@ export const handleSelectedTable = editorAnalyticsAPI => slice => (state, dispat
     return true;
   }
   return false;
-};
+};
+export function checkTaskListInList(state, slice) {
+  var _slice$content$firstC3, _slice$content$firstC4;
+  return Boolean(isInListItem(state) && getBooleanFF('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
+}

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

@@ -89,4 +89,15 @@ export function updateSelectionAfterReplace(_ref4) {
   if (nextSelection) {
     tr.setSelection(nextSelection);
   }
+}
+export function insertSliceForTaskInsideList(_ref5) {
+  var tr = _ref5.tr,
+    slice = _ref5.slice;
+  var schema = tr.doc.type.schema;
+  //To avoid the list being replaced with the tasklist, enclose the slice within a taskItem.
+  tr.replaceSelection(new Slice(Fragment.from(schema.nodes.taskItem.createAndFill()), 0, 0));
+  updateSelectionAfterReplace({
+    tr: tr
+  });
+  tr.replaceSelection(slice);
 }

package/dist/esm/handlers.js

@@ -21,7 +21,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 // TODO: ED-20519 Needs Macro extraction
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
-import { insertSliceForLists, insertSliceForListsInsideBlockquote, updateSelectionAfterReplace } from './edge-cases';
+import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceForTaskInsideList } from './edge-cases';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
 
@@ -821,7 +821,7 @@ export function flattenNestedListInSlice(slice) {
 }
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre, _slice$content$firstC3;
+    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes3 = state.schema.nodes,
       codeBlock = _state$schema$nodes3.codeBlock,
       heading = _state$schema$nodes3.heading,
@@ -894,6 +894,11 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       });
       if (insideTableCell(state) && isInListItem(state) && canInsert(selection.$from, slice.content) && canInsert(selection.$to, slice.content) || sliceHasList) {
         tr.replaceSelection(slice);
+      } else if (checkTaskListInList(state, slice)) {
+        insertSliceForTaskInsideList({
+          tr: tr,
+          slice: slice
+        });
       } else {
         // need safeInsert rather than replaceSelection, so that nodes aren't split in half
         // e.g. when pasting a layout into a table, replaceSelection splits the table in half and adds the layout in the middle
@@ -904,11 +909,6 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(TextSelection.near(tr.selection.$from, 1));
     }
-    if (isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || '')) {
-      updateSelectionAfterReplace({
-        tr: tr
-      });
-    }
     tr.scrollIntoView();
 
     // queue link cards, ignoring any errors
@@ -952,4 +952,8 @@ export var handleSelectedTable = function handleSelectedTable(editorAnalyticsAPI
       return false;
     };
   };
-};
+};
+export function checkTaskListInList(state, slice) {
+  var _slice$content$firstC3;
+  return Boolean(isInListItem(state) && getBooleanFF('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || ''));
+}

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

@@ -12,3 +12,7 @@ export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
 export declare function updateSelectionAfterReplace({ tr }: {
     tr: Transaction;
 }): Transaction | undefined;
+export declare function insertSliceForTaskInsideList({ tr, slice, }: {
+    tr: Transaction;
+    slice: PMSlice;
+}): void;

package/dist/types/handlers.d.ts

@@ -53,3 +53,4 @@ export declare function flattenNestedListInSlice(slice: Slice): Slice;
 export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined): Command;
 export declare function handlePasteIntoCaption(slice: Slice): Command;
 export declare const handleSelectedTable: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (slice: Slice) => Command;
+export declare function checkTaskListInList(state: EditorState, slice: Slice): boolean;

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

@@ -12,3 +12,7 @@ export declare function insertSliceForListsInsideBlockquote({ tr, slice, }: {
 export declare function updateSelectionAfterReplace({ tr }: {
     tr: Transaction;
 }): Transaction | undefined;
+export declare function insertSliceForTaskInsideList({ tr, slice, }: {
+    tr: Transaction;
+    slice: PMSlice;
+}): void;

package/dist/types-ts4.5/handlers.d.ts

@@ -53,3 +53,4 @@ export declare function flattenNestedListInSlice(slice: Slice): Slice;
 export declare function handleRichText(slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined): Command;
 export declare function handlePasteIntoCaption(slice: Slice): Command;
 export declare const handleSelectedTable: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (slice: Slice) => Command;
+export declare function checkTaskListInList(state: EditorState, slice: Slice): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,17 +33,17 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^77.0.0",
+    "@atlaskit/editor-common": "^77.1.0",
     "@atlaskit/editor-markdown-transformer": "^5.3.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
-    "@atlaskit/editor-plugin-annotation": "^0.1.0",
+    "@atlaskit/editor-plugin-annotation": "^0.2.0",
     "@atlaskit/editor-plugin-better-type-history": "^0.1.0",
     "@atlaskit/editor-plugin-card": "^0.16.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-list": "^3.1.0",
     "@atlaskit/editor-plugin-media": "^0.12.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
-    "@atlaskit/editor-tables": "^2.4.0",
+    "@atlaskit/editor-tables": "^2.5.0",
     "@atlaskit/media-client": "^26.1.0",
     "@atlaskit/media-common": "^11.0.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -119,6 +119,9 @@
     },
     "platform.editor.allow-extended-panel": {
       "type": "boolean"
+    },
+    "platform.editor.allow-action-in-list": {
+      "type": "boolean"
     }
   }
 }