@atlaskit/editor-plugin-tasks-and-decisions 7.0.3 → 7.0.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 7.0.4
+
+### Patch Changes
+
+- [`cfa24f42cfba3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cfa24f42cfba3) -
+  [EDITOR-1433] Backspace unindents blockTaskItems
+
 ## 7.0.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/helpers.js

@@ -74,22 +74,57 @@ var isTable = exports.isTable = function isTable(node) {
  */
 var getBlockRange = exports.getBlockRange = function getBlockRange(_ref) {
   var $from = _ref.$from,
-    $to = _ref.$to,
-    _ref$isLifting = _ref.isLifting,
-    isLifting = _ref$isLifting === void 0 ? false : _ref$isLifting;
+    $to = _ref.$to;
   var _$from$doc$type$schem = $from.doc.type.schema.nodes,
     taskList = _$from$doc$type$schem.taskList,
-    blockTaskItem = _$from$doc$type$schem.blockTaskItem;
+    taskItem = _$from$doc$type$schem.taskItem,
+    blockTaskItem = _$from$doc$type$schem.blockTaskItem,
+    paragraph = _$from$doc$type$schem.paragraph;
   var blockTaskItemNode = (0, _utils.findFarthestParentNode)(function (node) {
     return node.type === blockTaskItem;
   })($from);
   if (blockTaskItem && blockTaskItemNode) {
-    var startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
+    var _$prevNode$nodeBefore;
+    var startOfBlockRange = blockTaskItemNode.start - 1;
+    var endNode = $to.end();
+    var _$after = $to.doc.resolve(endNode + 1);
+    var _after = _$after.nodeAfter;
     var lastNode = $to.node($to.depth);
-    var endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
-    return new _model.NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem,
-    // When lifting we want to ignore the potential depth of nested nodes so reduce the depth
-    isLifting ? blockTaskItemNode.depth - 2 : blockTaskItemNode.depth - 1);
+    var rangeDepth = blockTaskItemNode.depth - 1;
+    var endOfBlockRange = $to.start() + lastNode.nodeSize;
+
+    // If the lastNode is a paragraph need to resolve a little bit further to get the node after the block task item
+    if (lastNode.type === paragraph) {
+      _$after = $to.doc.resolve(endNode + 2);
+      _after = _$after.nodeAfter;
+    }
+    // Otherwise assume it's a block node so increase the range depth
+    else {
+      rangeDepth = rangeDepth - 1;
+      endOfBlockRange = endOfBlockRange - 1;
+    }
+
+    // If the after node is a sibling taskList of the blockTaskItem, then extend the range
+    if (_after && _after.type === taskList && _$after.depth === blockTaskItemNode.depth - 1) {
+      endOfBlockRange = endOfBlockRange + _after.nodeSize;
+    }
+
+    // Is after another taskItem/ blockTaskItem
+    var $prevNode = $from.doc.resolve(startOfBlockRange - 1);
+    var prevNodeSize = (_$prevNode$nodeBefore = $prevNode.nodeBefore) === null || _$prevNode$nodeBefore === void 0 ? void 0 : _$prevNode$nodeBefore.nodeSize;
+    var $prevNodeParent = $from.doc.resolve($prevNode.pos - (prevNodeSize || 0) - 1);
+    var prevNodeParent = $prevNodeParent.nodeAfter;
+
+    // If after another taskItem/ blockTaskItem
+    if (prevNodeParent && [blockTaskItem, taskItem].includes(prevNodeParent.type)) {
+      rangeDepth = blockTaskItemNode.depth - 1;
+      endOfBlockRange = endOfBlockRange - 2;
+      startOfBlockRange = startOfBlockRange + 1;
+    }
+    var $endOfBlockRange = $to.doc.resolve(endOfBlockRange);
+    var $startOfBlockRange = $to.doc.resolve(startOfBlockRange);
+    var nodeRange = new _model.NodeRange($startOfBlockRange, $endOfBlockRange, rangeDepth);
+    return nodeRange;
   }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
@@ -247,8 +282,7 @@ var isEmptyTaskDecision = exports.isEmptyTaskDecision = function isEmptyTaskDeci
 var liftBlock = exports.liftBlock = function liftBlock(tr, $from, $to) {
   var blockRange = getBlockRange({
     $from: $from,
-    $to: $to,
-    isLifting: true
+    $to: $to
   });
   if (!blockRange) {
     return null;

package/dist/es2019/pm-plugins/helpers.js

@@ -63,21 +63,57 @@ export const isTable = node => {
  */
 export const getBlockRange = ({
   $from,
-  $to,
-  isLifting = false
+  $to
 }) => {
   const {
     taskList,
-    blockTaskItem
+    taskItem,
+    blockTaskItem,
+    paragraph
   } = $from.doc.type.schema.nodes;
   const blockTaskItemNode = findFarthestParentNode(node => node.type === blockTaskItem)($from);
   if (blockTaskItem && blockTaskItemNode) {
-    const startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
+    var _$prevNode$nodeBefore;
+    let startOfBlockRange = blockTaskItemNode.start - 1;
+    const endNode = $to.end();
+    let $after = $to.doc.resolve(endNode + 1);
+    let after = $after.nodeAfter;
     const lastNode = $to.node($to.depth);
-    const endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
-    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem,
-    // When lifting we want to ignore the potential depth of nested nodes so reduce the depth
-    isLifting ? blockTaskItemNode.depth - 2 : blockTaskItemNode.depth - 1);
+    let rangeDepth = blockTaskItemNode.depth - 1;
+    let endOfBlockRange = $to.start() + lastNode.nodeSize;
+
+    // If the lastNode is a paragraph need to resolve a little bit further to get the node after the block task item
+    if (lastNode.type === paragraph) {
+      $after = $to.doc.resolve(endNode + 2);
+      after = $after.nodeAfter;
+    }
+    // Otherwise assume it's a block node so increase the range depth
+    else {
+      rangeDepth = rangeDepth - 1;
+      endOfBlockRange = endOfBlockRange - 1;
+    }
+
+    // If the after node is a sibling taskList of the blockTaskItem, then extend the range
+    if (after && after.type === taskList && $after.depth === blockTaskItemNode.depth - 1) {
+      endOfBlockRange = endOfBlockRange + after.nodeSize;
+    }
+
+    // Is after another taskItem/ blockTaskItem
+    const $prevNode = $from.doc.resolve(startOfBlockRange - 1);
+    const prevNodeSize = (_$prevNode$nodeBefore = $prevNode.nodeBefore) === null || _$prevNode$nodeBefore === void 0 ? void 0 : _$prevNode$nodeBefore.nodeSize;
+    const $prevNodeParent = $from.doc.resolve($prevNode.pos - (prevNodeSize || 0) - 1);
+    const prevNodeParent = $prevNodeParent.nodeAfter;
+
+    // If after another taskItem/ blockTaskItem
+    if (prevNodeParent && [blockTaskItem, taskItem].includes(prevNodeParent.type)) {
+      rangeDepth = blockTaskItemNode.depth - 1;
+      endOfBlockRange = endOfBlockRange - 2;
+      startOfBlockRange = startOfBlockRange + 1;
+    }
+    const $endOfBlockRange = $to.doc.resolve(endOfBlockRange);
+    const $startOfBlockRange = $to.doc.resolve(startOfBlockRange);
+    const nodeRange = new NodeRange($startOfBlockRange, $endOfBlockRange, rangeDepth);
+    return nodeRange;
   }
   let end = $to.end();
   const $after = $to.doc.resolve(end + 1);
@@ -234,8 +270,7 @@ export const isEmptyTaskDecision = state => {
 export const liftBlock = (tr, $from, $to) => {
   const blockRange = getBlockRange({
     $from,
-    $to,
-    isLifting: true
+    $to
   });
   if (!blockRange) {
     return null;

package/dist/esm/pm-plugins/helpers.js

@@ -56,22 +56,57 @@ export var isTable = function isTable(node) {
  */
 export var getBlockRange = function getBlockRange(_ref) {
   var $from = _ref.$from,
-    $to = _ref.$to,
-    _ref$isLifting = _ref.isLifting,
-    isLifting = _ref$isLifting === void 0 ? false : _ref$isLifting;
+    $to = _ref.$to;
   var _$from$doc$type$schem = $from.doc.type.schema.nodes,
     taskList = _$from$doc$type$schem.taskList,
-    blockTaskItem = _$from$doc$type$schem.blockTaskItem;
+    taskItem = _$from$doc$type$schem.taskItem,
+    blockTaskItem = _$from$doc$type$schem.blockTaskItem,
+    paragraph = _$from$doc$type$schem.paragraph;
   var blockTaskItemNode = findFarthestParentNode(function (node) {
     return node.type === blockTaskItem;
   })($from);
   if (blockTaskItem && blockTaskItemNode) {
-    var startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
+    var _$prevNode$nodeBefore;
+    var startOfBlockRange = blockTaskItemNode.start - 1;
+    var endNode = $to.end();
+    var _$after = $to.doc.resolve(endNode + 1);
+    var _after = _$after.nodeAfter;
     var lastNode = $to.node($to.depth);
-    var endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
-    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem,
-    // When lifting we want to ignore the potential depth of nested nodes so reduce the depth
-    isLifting ? blockTaskItemNode.depth - 2 : blockTaskItemNode.depth - 1);
+    var rangeDepth = blockTaskItemNode.depth - 1;
+    var endOfBlockRange = $to.start() + lastNode.nodeSize;
+
+    // If the lastNode is a paragraph need to resolve a little bit further to get the node after the block task item
+    if (lastNode.type === paragraph) {
+      _$after = $to.doc.resolve(endNode + 2);
+      _after = _$after.nodeAfter;
+    }
+    // Otherwise assume it's a block node so increase the range depth
+    else {
+      rangeDepth = rangeDepth - 1;
+      endOfBlockRange = endOfBlockRange - 1;
+    }
+
+    // If the after node is a sibling taskList of the blockTaskItem, then extend the range
+    if (_after && _after.type === taskList && _$after.depth === blockTaskItemNode.depth - 1) {
+      endOfBlockRange = endOfBlockRange + _after.nodeSize;
+    }
+
+    // Is after another taskItem/ blockTaskItem
+    var $prevNode = $from.doc.resolve(startOfBlockRange - 1);
+    var prevNodeSize = (_$prevNode$nodeBefore = $prevNode.nodeBefore) === null || _$prevNode$nodeBefore === void 0 ? void 0 : _$prevNode$nodeBefore.nodeSize;
+    var $prevNodeParent = $from.doc.resolve($prevNode.pos - (prevNodeSize || 0) - 1);
+    var prevNodeParent = $prevNodeParent.nodeAfter;
+
+    // If after another taskItem/ blockTaskItem
+    if (prevNodeParent && [blockTaskItem, taskItem].includes(prevNodeParent.type)) {
+      rangeDepth = blockTaskItemNode.depth - 1;
+      endOfBlockRange = endOfBlockRange - 2;
+      startOfBlockRange = startOfBlockRange + 1;
+    }
+    var $endOfBlockRange = $to.doc.resolve(endOfBlockRange);
+    var $startOfBlockRange = $to.doc.resolve(startOfBlockRange);
+    var nodeRange = new NodeRange($startOfBlockRange, $endOfBlockRange, rangeDepth);
+    return nodeRange;
   }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
@@ -229,8 +264,7 @@ export var isEmptyTaskDecision = function isEmptyTaskDecision(state) {
 export var liftBlock = function liftBlock(tr, $from, $to) {
   var blockRange = getBlockRange({
     $from: $from,
-    $to: $to,
-    isLifting: true
+    $to: $to
   });
   if (!blockRange) {
     return null;

package/dist/types/pm-plugins/helpers.d.ts

@@ -12,10 +12,9 @@ export declare const isTable: (node?: Node | null) => boolean;
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-export declare const getBlockRange: ({ $from, $to, isLifting, }: {
+export declare const getBlockRange: ({ $from, $to }: {
     $from: ResolvedPos;
     $to: ResolvedPos;
-    isLifting?: boolean;
 }) => NodeRange | null;
 /**
  * Calculates the current indent level of the selection within a task list in the ProseMirror document.

package/dist/types-ts4.5/pm-plugins/helpers.d.ts

@@ -12,10 +12,9 @@ export declare const isTable: (node?: Node | null) => boolean;
  * Creates a NodeRange around the given taskItem and the following
  * ("nested") taskList, if one exists.
  */
-export declare const getBlockRange: ({ $from, $to, isLifting, }: {
+export declare const getBlockRange: ({ $from, $to }: {
     $from: ResolvedPos;
     $to: ResolvedPos;
-    isLifting?: boolean;
 }) => NodeRange | null;
 /**
  * Calculates the current indent level of the selection within a task list in the ProseMirror document.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "7.0.3",
+	"version": "7.0.4",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/primitives": "^14.12.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^12.2.0",
+		"@atlaskit/tmp-editor-statsig": "^12.3.0",
 		"@atlaskit/tokens": "^6.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",