@atlaskit/editor-plugin-tasks-and-decisions 8.4.4 → 8.4.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 8.4.6
+
+### Patch Changes
+
+- [`ee5833cf21736`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ee5833cf21736) -
+  [ux] Fix bug with depth calculation used when splitting blockTaskItem nodes on enter key press.
+  This caused an error to be thrown to the browser console and the node to not be split.
+- Updated dependencies
+
+## 8.4.5
+
+### Patch Changes
+
+- [`980edad1b9b85`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/980edad1b9b85) -
+  EDITOR-1635 Ensure new taskItems are only added on enter key press of blockTaskitem if cursor is
+  at the start or end of the task item, not the start or the end of any of its child paragraphs.
+- Updated dependencies
+
 ## 8.4.4
 
 ### Patch Changes

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

@@ -12,7 +12,7 @@ exports.getCurrentIndentLevel = exports.getBlockRange = void 0;
 exports.getCurrentTaskItemIndex = getCurrentTaskItemIndex;
 exports.getTaskItemDataAtPos = getTaskItemDataAtPos;
 exports.getTaskItemDataToFocus = getTaskItemDataToFocus;
-exports.liftBlock = exports.isTable = exports.isInsideTaskOrDecisionItem = exports.isInsideTask = exports.isInsideDecision = exports.isEmptyTaskDecision = exports.isActionOrDecisionList = exports.isActionOrDecisionItem = exports.getTaskItemIndex = void 0;
+exports.liftBlock = exports.isTable = exports.isInsideTaskOrDecisionItem = exports.isInsideTask = exports.isInsideDecision = exports.isInLastTextblockOfBlockTaskItem = exports.isInFirstTextblockOfBlockTaskItem = exports.isEmptyTaskDecision = exports.isActionOrDecisionList = exports.isActionOrDecisionItem = exports.getTaskItemIndex = void 0;
 exports.openRequestEditPopupAt = openRequestEditPopupAt;
 exports.removeCheckboxFocus = removeCheckboxFocus;
 exports.walkOut = exports.subtreeHeight = void 0;
@@ -486,4 +486,15 @@ function findFirstParentListNode($pos) {
     node: node,
     pos: listNodePosition
   };
-}
+}
+var isInFirstTextblockOfBlockTaskItem = exports.isInFirstTextblockOfBlockTaskItem = function isInFirstTextblockOfBlockTaskItem(state) {
+  var $from = state.selection.$from;
+  var blockTaskItem = state.schema.nodes.blockTaskItem;
+  return $from.parent.isTextblock && $from.node($from.depth - 1).type === blockTaskItem && $from.index($from.depth - 1) === 0;
+};
+var isInLastTextblockOfBlockTaskItem = exports.isInLastTextblockOfBlockTaskItem = function isInLastTextblockOfBlockTaskItem(state) {
+  var $from = state.selection.$from;
+  var blockTaskItem = state.schema.nodes.blockTaskItem;
+  var parentNode = $from.node($from.depth - 1);
+  return $from.parent.isTextblock && parentNode.type === blockTaskItem && $from.index($from.depth - 1) === parentNode.childCount - 1;
+};

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

@@ -19,6 +19,7 @@ var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 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 _commands2 = require("./commands");
 var _helpers = require("./helpers");
@@ -462,7 +463,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
       var tr = _ref.tr,
         itemLocalId = _ref.itemLocalId;
       // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
-      if ($from.pos === $to.pos && $from.parentOffset === 0) {
+      if ($from.pos === $to.pos && $from.parentOffset === 0 && ((0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_2') ? !$from.parent.isTextblock || (0, _helpers.isInFirstTextblockOfBlockTaskItem)(state) : true)) {
         var newTask = nodeType.createAndFill({
           localId: itemLocalId
         });
@@ -488,6 +489,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
        * For blockTaskItem, must handle it differently because it can have a different depth
        */
       if (nodeType === blockTaskItem) {
+        var _$from$parent;
         var _blockTaskItemNode = (0, _utils2.findParentNodeOfType)([blockTaskItem])(selection);
         if (!_blockTaskItemNode) {
           return tr;
@@ -495,7 +497,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
 
         // If the selection is a gap cursor at the end of the blockTaskItem,
         // we should insert a new taskItem.
-        if ($from.parentOffset === $from.parent.nodeSize - 2) {
+        if (((0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_2') ? !$from.parent.isTextblock || (0, _helpers.isInLastTextblockOfBlockTaskItem)(state) : true) && $from.parentOffset === $from.parent.nodeSize - 2) {
           var _newTaskItem = taskItem.createAndFill({
             localId: itemLocalId
           });
@@ -509,7 +511,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
         }
 
         // Split near the depth of the current selection
-        return tr.split($from.pos, $from.depth - 1, [{
+        return tr.split($from.pos, (0, _platformFeatureFlags.fg)('platform_editor_blocktaskitem_patch_2') ? $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1 : $from.depth - 1, [{
           type: blockTaskItem,
           attrs: {
             localId: itemLocalId

package/dist/cjs/tasksAndDecisionsPlugin.js

@@ -1,4 +1,4 @@
-/* tasksAndDecisionsPlugin.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* tasksAndDecisionsPlugin.tsx generated by @compiled/babel-plugin v0.38.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

package/dist/cjs/ui/Task/RequestToEditPopup.js

@@ -1,4 +1,4 @@
-/* RequestToEditPopup.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* RequestToEditPopup.tsx generated by @compiled/babel-plugin v0.38.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

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

@@ -517,4 +517,23 @@ export function findFirstParentListNode($pos) {
     node,
     pos: listNodePosition
   };
-}
+}
+export const isInFirstTextblockOfBlockTaskItem = state => {
+  const {
+    $from
+  } = state.selection;
+  const {
+    blockTaskItem
+  } = state.schema.nodes;
+  return $from.parent.isTextblock && $from.node($from.depth - 1).type === blockTaskItem && $from.index($from.depth - 1) === 0;
+};
+export const isInLastTextblockOfBlockTaskItem = state => {
+  const {
+    $from
+  } = state.selection;
+  const {
+    blockTaskItem
+  } = state.schema.nodes;
+  const parentNode = $from.node($from.depth - 1);
+  return $from.parent.isTextblock && parentNode.type === blockTaskItem && $from.index($from.depth - 1) === parentNode.childCount - 1;
+};

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

@@ -10,9 +10,10 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, 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 { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
+import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInFirstTextblockOfBlockTaskItem, isInLastTextblockOfBlockTaskItem, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
 import { insertTaskDecisionWithAnalytics } from './insert-commands';
 import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
 const indentationAnalytics = (curIndentLevel, direction, inputMethod) => ({
@@ -457,7 +458,7 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
     itemLocalId
   }) => {
     // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
-    if ($from.pos === $to.pos && $from.parentOffset === 0) {
+    if ($from.pos === $to.pos && $from.parentOffset === 0 && (fg('platform_editor_blocktaskitem_patch_2') ? !$from.parent.isTextblock || isInFirstTextblockOfBlockTaskItem(state) : true)) {
       const newTask = nodeType.createAndFill({
         localId: itemLocalId
       });
@@ -483,6 +484,7 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
      * For blockTaskItem, must handle it differently because it can have a different depth
      */
     if (nodeType === blockTaskItem) {
+      var _$from$parent;
       const blockTaskItemNode = findParentNodeOfType([blockTaskItem])(selection);
       if (!blockTaskItemNode) {
         return tr;
@@ -490,7 +492,7 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
 
       // If the selection is a gap cursor at the end of the blockTaskItem,
       // we should insert a new taskItem.
-      if ($from.parentOffset === $from.parent.nodeSize - 2) {
+      if ((fg('platform_editor_blocktaskitem_patch_2') ? !$from.parent.isTextblock || isInLastTextblockOfBlockTaskItem(state) : true) && $from.parentOffset === $from.parent.nodeSize - 2) {
         const newTaskItem = taskItem.createAndFill({
           localId: itemLocalId
         });
@@ -504,7 +506,7 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
       }
 
       // Split near the depth of the current selection
-      return tr.split($from.pos, $from.depth - 1, [{
+      return tr.split($from.pos, fg('platform_editor_blocktaskitem_patch_2') ? $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1 : $from.depth - 1, [{
         type: blockTaskItem,
         attrs: {
           localId: itemLocalId

package/dist/es2019/tasksAndDecisionsPlugin.js

@@ -1,4 +1,4 @@
-/* tasksAndDecisionsPlugin.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* tasksAndDecisionsPlugin.tsx generated by @compiled/babel-plugin v0.38.1 */
 import "./tasksAndDecisionsPlugin.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/es2019/ui/Task/RequestToEditPopup.js

@@ -1,4 +1,4 @@
-/* RequestToEditPopup.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* RequestToEditPopup.tsx generated by @compiled/babel-plugin v0.38.1 */
 // import Popup from '@atlaskit/popup';
 import "./RequestToEditPopup.compiled.css";
 import * as React from 'react';

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

@@ -468,4 +468,15 @@ export function findFirstParentListNode($pos) {
     node: node,
     pos: listNodePosition
   };
-}
+}
+export var isInFirstTextblockOfBlockTaskItem = function isInFirstTextblockOfBlockTaskItem(state) {
+  var $from = state.selection.$from;
+  var blockTaskItem = state.schema.nodes.blockTaskItem;
+  return $from.parent.isTextblock && $from.node($from.depth - 1).type === blockTaskItem && $from.index($from.depth - 1) === 0;
+};
+export var isInLastTextblockOfBlockTaskItem = function isInLastTextblockOfBlockTaskItem(state) {
+  var $from = state.selection.$from;
+  var blockTaskItem = state.schema.nodes.blockTaskItem;
+  var parentNode = $from.node($from.depth - 1);
+  return $from.parent.isTextblock && parentNode.type === blockTaskItem && $from.index($from.depth - 1) === parentNode.childCount - 1;
+};

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

@@ -13,9 +13,10 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, 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 { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';
-import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
+import { findFirstParentListNode, getBlockRange, getCurrentIndentLevel, getTaskItemIndex, isActionOrDecisionItem, isActionOrDecisionList, isEmptyTaskDecision, isInFirstTextblockOfBlockTaskItem, isInLastTextblockOfBlockTaskItem, isInsideDecision, isInsideTask, isInsideTaskOrDecisionItem, isTable, liftBlock, walkOut } from './helpers';
 import { insertTaskDecisionWithAnalytics } from './insert-commands';
 import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction, inputMethod) {
@@ -454,7 +455,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
       var tr = _ref.tr,
         itemLocalId = _ref.itemLocalId;
       // ED-8932: When cursor is at the beginning of a task item, instead of split, we insert above.
-      if ($from.pos === $to.pos && $from.parentOffset === 0) {
+      if ($from.pos === $to.pos && $from.parentOffset === 0 && (fg('platform_editor_blocktaskitem_patch_2') ? !$from.parent.isTextblock || isInFirstTextblockOfBlockTaskItem(state) : true)) {
         var newTask = nodeType.createAndFill({
           localId: itemLocalId
         });
@@ -480,6 +481,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
        * For blockTaskItem, must handle it differently because it can have a different depth
        */
       if (nodeType === blockTaskItem) {
+        var _$from$parent;
         var _blockTaskItemNode = findParentNodeOfType([blockTaskItem])(selection);
         if (!_blockTaskItemNode) {
           return tr;
@@ -487,7 +489,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
 
         // If the selection is a gap cursor at the end of the blockTaskItem,
         // we should insert a new taskItem.
-        if ($from.parentOffset === $from.parent.nodeSize - 2) {
+        if ((fg('platform_editor_blocktaskitem_patch_2') ? !$from.parent.isTextblock || isInLastTextblockOfBlockTaskItem(state) : true) && $from.parentOffset === $from.parent.nodeSize - 2) {
           var _newTaskItem = taskItem.createAndFill({
             localId: itemLocalId
           });
@@ -501,7 +503,7 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
         }
 
         // Split near the depth of the current selection
-        return tr.split($from.pos, $from.depth - 1, [{
+        return tr.split($from.pos, fg('platform_editor_blocktaskitem_patch_2') ? $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1 : $from.depth - 1, [{
           type: blockTaskItem,
           attrs: {
             localId: itemLocalId

package/dist/esm/tasksAndDecisionsPlugin.js

@@ -1,4 +1,4 @@
-/* tasksAndDecisionsPlugin.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* tasksAndDecisionsPlugin.tsx generated by @compiled/babel-plugin v0.38.1 */
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import "./tasksAndDecisionsPlugin.compiled.css";

package/dist/esm/ui/Task/RequestToEditPopup.js

@@ -1,4 +1,4 @@
-/* RequestToEditPopup.tsx generated by @compiled/babel-plugin v0.36.1 */
+/* RequestToEditPopup.tsx generated by @compiled/babel-plugin v0.38.1 */
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./RequestToEditPopup.compiled.css";
 import * as React from 'react';

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

@@ -95,3 +95,5 @@ export declare function findFirstParentListNode($pos: ResolvedPos): {
     node: Node;
     pos: number;
 } | null;
+export declare const isInFirstTextblockOfBlockTaskItem: (state: EditorState) => boolean;
+export declare const isInLastTextblockOfBlockTaskItem: (state: EditorState) => boolean;

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

@@ -95,3 +95,5 @@ export declare function findFirstParentListNode($pos: ResolvedPos): {
     node: Node;
     pos: number;
 } | null;
+export declare const isInFirstTextblockOfBlockTaskItem: (state: EditorState) => boolean;
+export declare const isInLastTextblockOfBlockTaskItem: (state: EditorState) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "8.4.4",
+	"version": "8.4.6",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/css": "^0.14.0",
 		"@atlaskit/editor-plugin-analytics": "^5.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^3.1.0",
+		"@atlaskit/editor-plugin-block-menu": "^3.2.0",
 		"@atlaskit/editor-plugin-context-identifier": "^5.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^7.0.0",
 		"@atlaskit/editor-plugin-selection": "^5.0.0",
@@ -46,17 +46,17 @@
 		"@atlaskit/icon": "^28.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popup": "^4.4.0",
-		"@atlaskit/primitives": "^14.14.0",
+		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^12.23.0",
+		"@atlaskit/tmp-editor-statsig": "^12.27.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.3",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.8.0",
+		"@atlaskit/editor-common": "^109.11.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -110,6 +110,9 @@
 		},
 		"platform_editor_task_check_status_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_blocktaskitem_patch_2": {
+			"type": "boolean"
 		}
 	}
 }