@atlaskit/editor-plugin-tasks-and-decisions 9.0.5 → 9.0.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 9.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.0.5
 
 ### Patch Changes

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

@@ -22,6 +22,7 @@ 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _pluginKey = require("./plugin-key");
 var _types = require("./types");
@@ -265,14 +266,30 @@ var subtreeHeight = exports.subtreeHeight = function subtreeHeight($from, $to, t
 };
 
 /**
- * Returns `true` if the taskItem or decisionItem has no text.
+ * Determines if the current selection is inside an empty taskItem, decisionItem, or blockTaskItem.
+ *
+ * @param state - The current EditorState.
+ * @returns `true` if the taskItem, decisionItem, or blockTaskItem is empty; otherwise, `false`.
  */
 var isEmptyTaskDecision = exports.isEmptyTaskDecision = function isEmptyTaskDecision(state) {
   var selection = state.selection,
     schema = state.schema;
+  var _schema$nodes = schema.nodes,
+    paragraph = _schema$nodes.paragraph,
+    blockTaskItem = _schema$nodes.blockTaskItem,
+    decisionItem = _schema$nodes.decisionItem,
+    taskItem = _schema$nodes.taskItem;
   var $from = selection.$from;
   var node = $from.node($from.depth);
-  return node && (node.type === schema.nodes.taskItem || node.type === schema.nodes.decisionItem) && node.content.size === 0;
+  var isEmptyTaskOrDecisionItem = node && (node.type === taskItem || node.type === decisionItem) && node.content.size === 0;
+
+  // Block task items must contain a single empty paragraph to be considered empty
+  var isInEmptyBlockTaskItem =
+  // If in an empty paragraph that's not at the doc level
+  node.content.size === 0 && node.type === paragraph && $from.depth > 0 &&
+  // and it's parent is a blockTaskItem with only this paragraph inside it
+  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1 && (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3');
+  return isEmptyTaskOrDecisionItem || isInEmptyBlockTaskItem;
 };
 
 /**
@@ -305,9 +322,9 @@ function getTaskItemDataAtPos(view) {
     schema = state.schema;
   var $from = selection.$from;
   if ((0, _expValEquals.expValEquals)('platform_editor_blocktaskitem_patch_1', 'isEnabled', true)) {
-    var _schema$nodes = schema.nodes,
-      taskItem = _schema$nodes.taskItem,
-      blockTaskItem = _schema$nodes.blockTaskItem;
+    var _schema$nodes2 = schema.nodes,
+      taskItem = _schema$nodes2.taskItem,
+      blockTaskItem = _schema$nodes2.blockTaskItem;
     var maybeTask = (0, _utils2.findParentNodeOfTypeClosestToPos)($from, [taskItem, blockTaskItem]);
 
     // current selection has to be inside taskitem
@@ -339,10 +356,10 @@ function getAllTaskItemsDataInRootTaskList(view) {
   if (!isInTaskItem) {
     return;
   }
-  var _schema$nodes2 = schema.nodes,
-    taskList = _schema$nodes2.taskList,
-    taskItem = _schema$nodes2.taskItem,
-    blockTaskItem = _schema$nodes2.blockTaskItem;
+  var _schema$nodes3 = schema.nodes,
+    taskList = _schema$nodes3.taskList,
+    taskItem = _schema$nodes3.taskItem,
+    blockTaskItem = _schema$nodes3.blockTaskItem;
   var rootTaskListData = (0, _utils.findFarthestParentNode)(function (node) {
     return node.type === taskList;
   })($fromPos);
@@ -366,9 +383,9 @@ function getCurrentTaskItemIndex(view, allTaskItems) {
   var _findParentNodeOfType;
   var state = view.state;
   var schema = state.schema;
-  var _schema$nodes3 = schema.nodes,
-    taskItem = _schema$nodes3.taskItem,
-    blockTaskItem = _schema$nodes3.blockTaskItem;
+  var _schema$nodes4 = schema.nodes,
+    taskItem = _schema$nodes4.taskItem,
+    blockTaskItem = _schema$nodes4.blockTaskItem;
   var $fromPos = state.selection.$from;
   var allTaskItemNodes = allTaskItems.map(function (nodeData) {
     return nodeData.node;

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

@@ -548,10 +548,26 @@ var creatParentListItemFragement = function creatParentListItemFragement(state)
 var splitListItem = function splitListItem(state, dispatch) {
   var tr = state.tr,
     $from = state.selection.$from;
-  var paragraph = state.schema.nodes.paragraph;
-  var listItem = state.schema.nodes.listItem;
+  var _state$schema$nodes5 = state.schema.nodes,
+    listItem = _state$schema$nodes5.listItem,
+    blockTaskItem = _state$schema$nodes5.blockTaskItem,
+    taskItem = _state$schema$nodes5.taskItem,
+    paragraph = _state$schema$nodes5.paragraph;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_3')) {
+        // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
+        var nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
+        if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
+          if ($from.parent.type === taskItem) {
+            var nodeSize = $from.parent.nodeSize;
+            tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
+            tr.insert($from.pos, paragraph.createChecked());
+            dispatch(tr);
+            return true;
+          }
+        }
+      }
       if ((0, _utils2.hasParentNodeOfType)(listItem)(tr.selection)) {
         // if we're inside a list item, then we pass in a fragment containing a new list item not a paragraph
         dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));

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

@@ -4,6 +4,7 @@ import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { stateKey } from './plugin-key';
 import { ACTIONS } from './types';
@@ -253,18 +254,35 @@ export const subtreeHeight = ($from, $to, types) => {
 };
 
 /**
- * Returns `true` if the taskItem or decisionItem has no text.
+ * Determines if the current selection is inside an empty taskItem, decisionItem, or blockTaskItem.
+ *
+ * @param state - The current EditorState.
+ * @returns `true` if the taskItem, decisionItem, or blockTaskItem is empty; otherwise, `false`.
  */
 export const isEmptyTaskDecision = state => {
   const {
     selection,
     schema
   } = state;
+  const {
+    paragraph,
+    blockTaskItem,
+    decisionItem,
+    taskItem
+  } = schema.nodes;
   const {
     $from
   } = selection;
   const node = $from.node($from.depth);
-  return node && (node.type === schema.nodes.taskItem || node.type === schema.nodes.decisionItem) && node.content.size === 0;
+  const isEmptyTaskOrDecisionItem = node && (node.type === taskItem || node.type === decisionItem) && node.content.size === 0;
+
+  // Block task items must contain a single empty paragraph to be considered empty
+  const isInEmptyBlockTaskItem =
+  // If in an empty paragraph that's not at the doc level
+  node.content.size === 0 && node.type === paragraph && $from.depth > 0 &&
+  // and it's parent is a blockTaskItem with only this paragraph inside it
+  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1 && fg('platform_editor_blocktaskitem_patch_3');
+  return isEmptyTaskOrDecisionItem || isInEmptyBlockTaskItem;
 };
 
 /**

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

@@ -533,17 +533,26 @@ const splitListItem = (state, dispatch) => {
     }
   } = state;
   const {
-    schema: {
-      nodes: {
-        paragraph
-      }
-    }
-  } = state;
-  const {
-    listItem
+    listItem,
+    blockTaskItem,
+    taskItem,
+    paragraph
   } = state.schema.nodes;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
+      if (fg('platform_editor_blocktaskitem_patch_3')) {
+        // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
+        const nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
+        if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
+          if ($from.parent.type === taskItem) {
+            const nodeSize = $from.parent.nodeSize;
+            tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
+            tr.insert($from.pos, paragraph.createChecked());
+            dispatch(tr);
+            return true;
+          }
+        }
+      }
       if (hasParentNodeOfType(listItem)(tr.selection)) {
         // if we're inside a list item, then we pass in a fragment containing a new list item not a paragraph
         dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));

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

@@ -4,6 +4,7 @@ import { NodeRange } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { stateKey } from './plugin-key';
 import { ACTIONS } from './types';
@@ -247,14 +248,30 @@ export var subtreeHeight = function subtreeHeight($from, $to, types) {
 };
 
 /**
- * Returns `true` if the taskItem or decisionItem has no text.
+ * Determines if the current selection is inside an empty taskItem, decisionItem, or blockTaskItem.
+ *
+ * @param state - The current EditorState.
+ * @returns `true` if the taskItem, decisionItem, or blockTaskItem is empty; otherwise, `false`.
  */
 export var isEmptyTaskDecision = function isEmptyTaskDecision(state) {
   var selection = state.selection,
     schema = state.schema;
+  var _schema$nodes = schema.nodes,
+    paragraph = _schema$nodes.paragraph,
+    blockTaskItem = _schema$nodes.blockTaskItem,
+    decisionItem = _schema$nodes.decisionItem,
+    taskItem = _schema$nodes.taskItem;
   var $from = selection.$from;
   var node = $from.node($from.depth);
-  return node && (node.type === schema.nodes.taskItem || node.type === schema.nodes.decisionItem) && node.content.size === 0;
+  var isEmptyTaskOrDecisionItem = node && (node.type === taskItem || node.type === decisionItem) && node.content.size === 0;
+
+  // Block task items must contain a single empty paragraph to be considered empty
+  var isInEmptyBlockTaskItem =
+  // If in an empty paragraph that's not at the doc level
+  node.content.size === 0 && node.type === paragraph && $from.depth > 0 &&
+  // and it's parent is a blockTaskItem with only this paragraph inside it
+  $from.node($from.depth - 1).type === blockTaskItem && $from.node($from.depth - 1).childCount === 1 && fg('platform_editor_blocktaskitem_patch_3');
+  return isEmptyTaskOrDecisionItem || isInEmptyBlockTaskItem;
 };
 
 /**
@@ -287,9 +304,9 @@ export function getTaskItemDataAtPos(view) {
     schema = state.schema;
   var $from = selection.$from;
   if (expValEquals('platform_editor_blocktaskitem_patch_1', 'isEnabled', true)) {
-    var _schema$nodes = schema.nodes,
-      taskItem = _schema$nodes.taskItem,
-      blockTaskItem = _schema$nodes.blockTaskItem;
+    var _schema$nodes2 = schema.nodes,
+      taskItem = _schema$nodes2.taskItem,
+      blockTaskItem = _schema$nodes2.blockTaskItem;
     var maybeTask = findParentNodeOfTypeClosestToPos($from, [taskItem, blockTaskItem]);
 
     // current selection has to be inside taskitem
@@ -321,10 +338,10 @@ export function getAllTaskItemsDataInRootTaskList(view) {
   if (!isInTaskItem) {
     return;
   }
-  var _schema$nodes2 = schema.nodes,
-    taskList = _schema$nodes2.taskList,
-    taskItem = _schema$nodes2.taskItem,
-    blockTaskItem = _schema$nodes2.blockTaskItem;
+  var _schema$nodes3 = schema.nodes,
+    taskList = _schema$nodes3.taskList,
+    taskItem = _schema$nodes3.taskItem,
+    blockTaskItem = _schema$nodes3.blockTaskItem;
   var rootTaskListData = findFarthestParentNode(function (node) {
     return node.type === taskList;
   })($fromPos);
@@ -348,9 +365,9 @@ export function getCurrentTaskItemIndex(view, allTaskItems) {
   var _findParentNodeOfType;
   var state = view.state;
   var schema = state.schema;
-  var _schema$nodes3 = schema.nodes,
-    taskItem = _schema$nodes3.taskItem,
-    blockTaskItem = _schema$nodes3.blockTaskItem;
+  var _schema$nodes4 = schema.nodes,
+    taskItem = _schema$nodes4.taskItem,
+    blockTaskItem = _schema$nodes4.blockTaskItem;
   var $fromPos = state.selection.$from;
   var allTaskItemNodes = allTaskItems.map(function (nodeData) {
     return nodeData.node;

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

@@ -540,10 +540,26 @@ var creatParentListItemFragement = function creatParentListItemFragement(state)
 var splitListItem = function splitListItem(state, dispatch) {
   var tr = state.tr,
     $from = state.selection.$from;
-  var paragraph = state.schema.nodes.paragraph;
-  var listItem = state.schema.nodes.listItem;
+  var _state$schema$nodes5 = state.schema.nodes,
+    listItem = _state$schema$nodes5.listItem,
+    blockTaskItem = _state$schema$nodes5.blockTaskItem,
+    taskItem = _state$schema$nodes5.taskItem,
+    paragraph = _state$schema$nodes5.paragraph;
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
+      if (fg('platform_editor_blocktaskitem_patch_3')) {
+        // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
+        var nodeBefore = state.doc.resolve($from.pos - 1).nodeBefore;
+        if (blockTaskItem && (nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type) === blockTaskItem) {
+          if ($from.parent.type === taskItem) {
+            var nodeSize = $from.parent.nodeSize;
+            tr.delete($from.pos - Math.floor(nodeSize / 2), $from.pos + Math.ceil(nodeSize / 2));
+            tr.insert($from.pos, paragraph.createChecked());
+            dispatch(tr);
+            return true;
+          }
+        }
+      }
       if (hasParentNodeOfType(listItem)(tr.selection)) {
         // if we're inside a list item, then we pass in a fragment containing a new list item not a paragraph
         dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));

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

@@ -56,7 +56,10 @@ export declare const walkOut: ($startPos: ResolvedPos) => ResolvedPos;
  */
 export declare const subtreeHeight: ($from: ResolvedPos, $to: ResolvedPos, types: NodeType[]) => number;
 /**
- * Returns `true` if the taskItem or decisionItem has no text.
+ * Determines if the current selection is inside an empty taskItem, decisionItem, or blockTaskItem.
+ *
+ * @param state - The current EditorState.
+ * @returns `true` if the taskItem, decisionItem, or blockTaskItem is empty; otherwise, `false`.
  */
 export declare const isEmptyTaskDecision: (state: EditorState) => boolean;
 /**

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

@@ -56,7 +56,10 @@ export declare const walkOut: ($startPos: ResolvedPos) => ResolvedPos;
  */
 export declare const subtreeHeight: ($from: ResolvedPos, $to: ResolvedPos, types: NodeType[]) => number;
 /**
- * Returns `true` if the taskItem or decisionItem has no text.
+ * Determines if the current selection is inside an empty taskItem, decisionItem, or blockTaskItem.
+ *
+ * @param state - The current EditorState.
+ * @returns `true` if the taskItem, decisionItem, or blockTaskItem is empty; otherwise, `false`.
  */
 export declare const isEmptyTaskDecision: (state: EditorState) => boolean;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "9.0.5",
+	"version": "9.0.7",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,20 +38,20 @@
 		"@atlaskit/editor-plugin-context-identifier": "^6.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
 		"@atlaskit/editor-plugin-selection": "^6.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^3.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^6.1.0",
+		"@atlaskit/editor-plugin-toolbar": "^3.1.0",
+		"@atlaskit/editor-plugin-type-ahead": "^6.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
-		"@atlaskit/editor-toolbar": "^0.11.0",
+		"@atlaskit/editor-toolbar": "^0.13.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/heading": "^5.2.0",
-		"@atlaskit/icon": "^28.3.0",
+		"@atlaskit/icon": "^28.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popup": "^4.4.0",
 		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.0.0",
+		"@atlaskit/tmp-editor-statsig": "^13.2.0",
 		"@atlaskit/tokens": "^6.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",