@atlaskit/editor-plugin-tasks-and-decisions 6.4.4 → 6.4.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 6.4.5
+
+### Patch Changes
+
+- [`69ab2a06347c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/69ab2a06347c4) -
+  [EDITOR-1155] Handle shift-tab for blockTaskItems
+- Updated dependencies
+
 ## 6.4.4
 
 ### Patch Changes

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

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.wrapSelectionInTaskList = exports.liftSelection = exports.joinAtCut = void 0;
 var _commands = require("@atlaskit/editor-common/commands");
 var _utils = require("@atlaskit/editor-common/utils");
-var _model = require("@atlaskit/editor-prosemirror/model");
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _helpers = require("./helpers");
@@ -68,20 +66,6 @@ var wrapSelectionInTaskList = exports.wrapSelectionInTaskList = function wrapSel
     return true;
   }
   var blockRange = (0, _helpers.getBlockRange)($from, $to);
-  if (blockTaskItem && isBlockTaskItem && blockTaskItemNode) {
-    var startOfNodeInBlockTaskItem = state.doc.resolve(blockTaskItemNode.start);
-    if (state.selection instanceof _state.TextSelection && state.selection.$to !== state.selection.$from) {
-      var lastNode = $to.node($to.depth);
-      var endOfNodeInBlockTaskItem = state.doc.resolve($to.start() + lastNode.nodeSize - 1);
-      if (lastNode.type === taskItem) {
-        blockRange = new _model.NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
-      }
-    } else {
-      // Get the Resolved $from and $to of the node nested inside the blockTaskItem
-      var _endOfNodeInBlockTaskItem = state.doc.resolve(blockTaskItemNode.start + blockTaskItemNode.node.nodeSize - 1);
-      blockRange = new _model.NodeRange(startOfNodeInBlockTaskItem, _endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
-    }
-  }
   if (!blockRange) {
     return true;
   }

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

@@ -17,6 +17,7 @@ exports.openRequestEditPopupAt = openRequestEditPopupAt;
 exports.removeCheckboxFocus = removeCheckboxFocus;
 exports.walkOut = exports.subtreeHeight = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
@@ -27,6 +28,9 @@ var isInsideTaskOrDecisionItem = exports.isInsideTaskOrDecisionItem = function i
     decisionItem = _state$schema$nodes.decisionItem,
     taskItem = _state$schema$nodes.taskItem,
     blockTaskItem = _state$schema$nodes.blockTaskItem;
+  if (blockTaskItem) {
+    return Boolean((0, _utils2.findParentNodeOfTypeClosestToPos)(state.selection.$from, [decisionItem, taskItem, blockTaskItem]));
+  }
   return (0, _utils2.hasParentNodeOfType)([decisionItem, taskItem, blockTaskItem])(state.selection);
 };
 var isActionOrDecisionList = exports.isActionOrDecisionList = function isActionOrDecisionList(node) {
@@ -68,7 +72,18 @@ var isTable = exports.isTable = function isTable(node) {
  * ("nested") taskList, if one exists.
  */
 var getBlockRange = exports.getBlockRange = function getBlockRange($from, $to) {
-  var taskList = $from.doc.type.schema.nodes.taskList;
+  var _$from$doc$type$schem = $from.doc.type.schema.nodes,
+    taskList = _$from$doc$type$schem.taskList,
+    blockTaskItem = _$from$doc$type$schem.blockTaskItem;
+  var blockTaskItemNode = (0, _utils.findFarthestParentNode)(function (node) {
+    return node.type === blockTaskItem;
+  })($from);
+  if (blockTaskItem && blockTaskItemNode) {
+    var startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
+    var lastNode = $to.node($to.depth);
+    var endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
+    return new _model.NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
+  }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
   var after = $after.nodeAfter;
@@ -98,9 +113,9 @@ var getBlockRange = exports.getBlockRange = function getBlockRange($from, $to) {
  */
 var getCurrentIndentLevel = exports.getCurrentIndentLevel = function getCurrentIndentLevel(selection) {
   var $from = selection.$from;
-  var _$from$doc$type$schem = $from.doc.type.schema.nodes,
-    taskList = _$from$doc$type$schem.taskList,
-    blockTaskItem = _$from$doc$type$schem.blockTaskItem;
+  var _$from$doc$type$schem2 = $from.doc.type.schema.nodes,
+    taskList = _$from$doc$type$schem2.taskList,
+    blockTaskItem = _$from$doc$type$schem2.blockTaskItem;
   var furthestParent = (0, _utils.findFarthestParentNode)(function (node) {
     return node.type === taskList;
   })($from);

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

@@ -1,7 +1,5 @@
 import { findCutBefore } from '@atlaskit/editor-common/commands';
 import { findFarthestParentNode } from '@atlaskit/editor-common/utils';
-import { NodeRange } from '@atlaskit/editor-prosemirror/model';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findWrapping, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getBlockRange, isActionOrDecisionItem, isActionOrDecisionList, liftBlock, subtreeHeight } from './helpers';
@@ -63,21 +61,7 @@ export const wrapSelectionInTaskList = (state, dispatch) => {
   if (maxDepth >= 6) {
     return true;
   }
-  let blockRange = getBlockRange($from, $to);
-  if (blockTaskItem && isBlockTaskItem && blockTaskItemNode) {
-    const startOfNodeInBlockTaskItem = state.doc.resolve(blockTaskItemNode.start);
-    if (state.selection instanceof TextSelection && state.selection.$to !== state.selection.$from) {
-      const lastNode = $to.node($to.depth);
-      const endOfNodeInBlockTaskItem = state.doc.resolve($to.start() + lastNode.nodeSize - 1);
-      if (lastNode.type === taskItem) {
-        blockRange = new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
-      }
-    } else {
-      // Get the Resolved $from and $to of the node nested inside the blockTaskItem
-      const endOfNodeInBlockTaskItem = state.doc.resolve(blockTaskItemNode.start + blockTaskItemNode.node.nodeSize - 1);
-      blockRange = new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
-    }
-  }
+  const blockRange = getBlockRange($from, $to);
   if (!blockRange) {
     return true;
   }

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

@@ -1,7 +1,8 @@
 import { findFarthestParentNode, isListNode } from '@atlaskit/editor-common/utils';
+import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
-import { findParentNodeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { stateKey } from './plugin-key';
 import { ACTIONS } from './types';
 export const isInsideTaskOrDecisionItem = state => {
@@ -10,6 +11,9 @@ export const isInsideTaskOrDecisionItem = state => {
     taskItem,
     blockTaskItem
   } = state.schema.nodes;
+  if (blockTaskItem) {
+    return Boolean(findParentNodeOfTypeClosestToPos(state.selection.$from, [decisionItem, taskItem, blockTaskItem]));
+  }
   return hasParentNodeOfType([decisionItem, taskItem, blockTaskItem])(state.selection);
 };
 export const isActionOrDecisionList = node => {
@@ -58,8 +62,16 @@ export const isTable = node => {
  */
 export const getBlockRange = ($from, $to) => {
   const {
-    taskList
+    taskList,
+    blockTaskItem
   } = $from.doc.type.schema.nodes;
+  const blockTaskItemNode = findFarthestParentNode(node => node.type === blockTaskItem)($from);
+  if (blockTaskItem && blockTaskItemNode) {
+    const startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
+    const lastNode = $to.node($to.depth);
+    const endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
+    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
+  }
   let end = $to.end();
   const $after = $to.doc.resolve(end + 1);
   const after = $after.nodeAfter;

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

@@ -1,7 +1,5 @@
 import { findCutBefore } from '@atlaskit/editor-common/commands';
 import { findFarthestParentNode } from '@atlaskit/editor-common/utils';
-import { NodeRange } from '@atlaskit/editor-prosemirror/model';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findWrapping, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getBlockRange, isActionOrDecisionItem, isActionOrDecisionList, liftBlock, subtreeHeight } from './helpers';
@@ -62,20 +60,6 @@ export var wrapSelectionInTaskList = function wrapSelectionInTaskList(state, dis
     return true;
   }
   var blockRange = getBlockRange($from, $to);
-  if (blockTaskItem && isBlockTaskItem && blockTaskItemNode) {
-    var startOfNodeInBlockTaskItem = state.doc.resolve(blockTaskItemNode.start);
-    if (state.selection instanceof TextSelection && state.selection.$to !== state.selection.$from) {
-      var lastNode = $to.node($to.depth);
-      var endOfNodeInBlockTaskItem = state.doc.resolve($to.start() + lastNode.nodeSize - 1);
-      if (lastNode.type === taskItem) {
-        blockRange = new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
-      }
-    } else {
-      // Get the Resolved $from and $to of the node nested inside the blockTaskItem
-      var _endOfNodeInBlockTaskItem = state.doc.resolve(blockTaskItemNode.start + blockTaskItemNode.node.nodeSize - 1);
-      blockRange = new NodeRange(startOfNodeInBlockTaskItem, _endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
-    }
-  }
   if (!blockRange) {
     return true;
   }

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

@@ -1,7 +1,8 @@
 import { findFarthestParentNode, isListNode } from '@atlaskit/editor-common/utils';
+import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
-import { findParentNodeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { stateKey } from './plugin-key';
 import { ACTIONS } from './types';
 export var isInsideTaskOrDecisionItem = function isInsideTaskOrDecisionItem(state) {
@@ -9,6 +10,9 @@ export var isInsideTaskOrDecisionItem = function isInsideTaskOrDecisionItem(stat
     decisionItem = _state$schema$nodes.decisionItem,
     taskItem = _state$schema$nodes.taskItem,
     blockTaskItem = _state$schema$nodes.blockTaskItem;
+  if (blockTaskItem) {
+    return Boolean(findParentNodeOfTypeClosestToPos(state.selection.$from, [decisionItem, taskItem, blockTaskItem]));
+  }
   return hasParentNodeOfType([decisionItem, taskItem, blockTaskItem])(state.selection);
 };
 export var isActionOrDecisionList = function isActionOrDecisionList(node) {
@@ -50,7 +54,18 @@ export var isTable = function isTable(node) {
  * ("nested") taskList, if one exists.
  */
 export var getBlockRange = function getBlockRange($from, $to) {
-  var taskList = $from.doc.type.schema.nodes.taskList;
+  var _$from$doc$type$schem = $from.doc.type.schema.nodes,
+    taskList = _$from$doc$type$schem.taskList,
+    blockTaskItem = _$from$doc$type$schem.blockTaskItem;
+  var blockTaskItemNode = findFarthestParentNode(function (node) {
+    return node.type === blockTaskItem;
+  })($from);
+  if (blockTaskItem && blockTaskItemNode) {
+    var startOfNodeInBlockTaskItem = $from.doc.resolve(blockTaskItemNode.start);
+    var lastNode = $to.node($to.depth);
+    var endOfNodeInBlockTaskItem = $from.doc.resolve($to.start() + lastNode.nodeSize - 1);
+    return new NodeRange(startOfNodeInBlockTaskItem, endOfNodeInBlockTaskItem, blockTaskItemNode.depth - 1);
+  }
   var end = $to.end();
   var $after = $to.doc.resolve(end + 1);
   var after = $after.nodeAfter;
@@ -80,9 +95,9 @@ export var getBlockRange = function getBlockRange($from, $to) {
  */
 export var getCurrentIndentLevel = function getCurrentIndentLevel(selection) {
   var $from = selection.$from;
-  var _$from$doc$type$schem = $from.doc.type.schema.nodes,
-    taskList = _$from$doc$type$schem.taskList,
-    blockTaskItem = _$from$doc$type$schem.blockTaskItem;
+  var _$from$doc$type$schem2 = $from.doc.type.schema.nodes,
+    taskList = _$from$doc$type$schem2.taskList,
+    blockTaskItem = _$from$doc$type$schem2.blockTaskItem;
   var furthestParent = findFarthestParentNode(function (node) {
     return node.type === taskList;
   })($from);

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

@@ -1,4 +1,4 @@
-import type { Node, NodeType, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { NodeRange, type Node, type NodeType, type ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TaskItemData } from './types';
@@ -12,7 +12,7 @@ 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: ResolvedPos, $to: ResolvedPos) => import("prosemirror-model").NodeRange | null;
+export declare const getBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => 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

@@ -1,4 +1,4 @@
-import type { Node, NodeType, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { NodeRange, type Node, type NodeType, type ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TaskItemData } from './types';
@@ -12,7 +12,7 @@ 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: ResolvedPos, $to: ResolvedPos) => import("prosemirror-model").NodeRange | null;
+export declare const getBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => 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": "6.4.4",
+	"version": "6.4.5",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^50.2.1",
+		"@atlaskit/adf-schema": "^50.2.2",
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/css": "^0.12.0",
@@ -49,14 +49,14 @@
 		"@atlaskit/primitives": "^14.11.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^11.5.0",
+		"@atlaskit/tmp-editor-statsig": "^11.6.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.28.0",
+		"@atlaskit/editor-common": "^107.30.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"