@atlaskit/editor-plugin-tasks-and-decisions 11.4.6 → 11.4.8

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 11.4.8
+
+### Patch Changes
+
+- [`e3da94ed988bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3da94ed988bc) -
+  Fix task list indentation producing two sibling taskLists when indenting an item that has a nested
+  sibling. When a selected (moved) item establishes a wrapper at a given depth, subsequent
+  unselected items at the same depth now merge into that wrapper rather than creating a separate
+  sibling taskList.
+- Updated dependencies
+
+## 11.4.7
+
+### Patch Changes
+
+- [`3e18e5bea1aa1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3e18e5bea1aa1) -
+  Fixed cursor placement when pressing Enter at the start of a nested task item. Fixed extra spacing
+  on nested task lists when flexible list indentation is enabled.
+- Updated dependencies
+
 ## 11.4.6
 
 ### Patch Changes

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

@@ -606,7 +606,19 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
             return tr.insert(blockTaskItemNode.pos, newTaskItem);
           }
           // Current position will point to text node, but we want to insert above the taskItem node
-          return tr.insert($from.pos - 1, newTask);
+          var insertPos = $from.pos - 1;
+          tr.insert(insertPos, newTask);
+          // Place cursor on the newly inserted empty task item above
+          // when nested inside another taskList.
+          if ((0, _expValEquals.expValEquals)('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+            var taskListType = schema.nodes.taskList;
+            var parentTaskList = $from.node($from.depth - 1);
+            var grandparent = $from.depth >= 3 ? $from.node($from.depth - 2) : null;
+            if ((parentTaskList === null || parentTaskList === void 0 ? void 0 : parentTaskList.type) === taskListType && (grandparent === null || grandparent === void 0 ? void 0 : grandparent.type) === taskListType) {
+              tr.setSelection(_state2.TextSelection.create(tr.doc, insertPos + 1));
+            }
+          }
+          return tr;
         }
       }
       /**

package/dist/cjs/pm-plugins/task-list-indentation.js

@@ -42,10 +42,6 @@ function flattenTaskList(options) {
 // The root entry (depth -1) is special: its children become the content
 // of the outermost taskList directly (not wrapped in another taskList).
 // Entries at depth >= 0 each produce a nested taskList when popped.
-// listAttrs preserves the original parent's attributes when available.
-// sourceParentAttrs tracks the original parent taskList attrs of the items
-// in this entry, used to decide whether consecutive same-depth items
-// should share a wrapper or be separated.
 
 /**
  * Rebuilds a taskList tree from a flattened array of task items.
@@ -82,6 +78,7 @@ function rebuildTaskList(items, schema) {
   var stack = [{
     depth: -1,
     children: [],
+    hasSelectedItems: false,
     listAttrs: items[0].parentListAttrs,
     sourceParentAttrs: items[0].parentListAttrs
   }];
@@ -112,9 +109,12 @@ function rebuildTaskList(items, schema) {
       // separate wrappers (preserving original nesting). Selected (moved)
       // items always merge with whatever is already at the target depth,
       // since they're being placed into a new structural context.
+      // However, if the current entry already contains selected (moved) items,
+      // we do NOT split — the unselected sibling should join the same wrapper
+      // because the selected item established the new structural context.
       if (stack.length > 1 && stack[stack.length - 1].depth === targetDepth && !item.isSelected) {
         var top = stack[stack.length - 1];
-        if (top.sourceParentAttrs !== item.parentListAttrs) {
+        if (top.sourceParentAttrs !== item.parentListAttrs && !top.hasSelectedItems) {
           var _popped2$listAttrs;
           var _popped2 = stack.pop();
           if (!_popped2) {
@@ -137,6 +137,7 @@ function rebuildTaskList(items, schema) {
         stack.push({
           depth: nextDepth,
           children: [],
+          hasSelectedItems: false,
           listAttrs: item.isSelected ? null : item.parentListAttrs,
           sourceParentAttrs: item.parentListAttrs
         });
@@ -146,17 +147,24 @@ function rebuildTaskList(items, schema) {
       if (targetDepth === 0) {
         // Depth 0 items go directly into the root taskList
         stack[0].children.push(item.node);
+        if (item.isSelected) {
+          stack[0].hasSelectedItems = true;
+        }
       } else {
         // Ensure there's a stack entry at depth targetDepth to hold this item
         if (stack[stack.length - 1].depth < targetDepth) {
           stack.push({
             depth: targetDepth,
             children: [],
+            hasSelectedItems: false,
             listAttrs: item.isSelected ? null : item.parentListAttrs,
             sourceParentAttrs: item.parentListAttrs
           });
         }
         stack[stack.length - 1].children.push(item.node);
+        if (item.isSelected) {
+          stack[stack.length - 1].hasSelectedItems = true;
+        }
       }
     }
 

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

@@ -601,7 +601,21 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
           return tr.insert(blockTaskItemNode.pos, newTaskItem);
         }
         // Current position will point to text node, but we want to insert above the taskItem node
-        return tr.insert($from.pos - 1, newTask);
+        const insertPos = $from.pos - 1;
+        tr.insert(insertPos, newTask);
+        // Place cursor on the newly inserted empty task item above
+        // when nested inside another taskList.
+        if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+          const {
+            taskList: taskListType
+          } = schema.nodes;
+          const parentTaskList = $from.node($from.depth - 1);
+          const grandparent = $from.depth >= 3 ? $from.node($from.depth - 2) : null;
+          if ((parentTaskList === null || parentTaskList === void 0 ? void 0 : parentTaskList.type) === taskListType && (grandparent === null || grandparent === void 0 ? void 0 : grandparent.type) === taskListType) {
+            tr.setSelection(TextSelection.create(tr.doc, insertPos + 1));
+          }
+        }
+        return tr;
       }
     }
     /**

package/dist/es2019/pm-plugins/task-list-indentation.js

@@ -29,10 +29,6 @@ export function flattenTaskList(options) {
 // The root entry (depth -1) is special: its children become the content
 // of the outermost taskList directly (not wrapped in another taskList).
 // Entries at depth >= 0 each produce a nested taskList when popped.
-// listAttrs preserves the original parent's attributes when available.
-// sourceParentAttrs tracks the original parent taskList attrs of the items
-// in this entry, used to decide whether consecutive same-depth items
-// should share a wrapper or be separated.
 
 /**
  * Rebuilds a taskList tree from a flattened array of task items.
@@ -71,6 +67,7 @@ export function rebuildTaskList(items, schema) {
   const stack = [{
     depth: -1,
     children: [],
+    hasSelectedItems: false,
     listAttrs: items[0].parentListAttrs,
     sourceParentAttrs: items[0].parentListAttrs
   }];
@@ -97,9 +94,12 @@ export function rebuildTaskList(items, schema) {
     // separate wrappers (preserving original nesting). Selected (moved)
     // items always merge with whatever is already at the target depth,
     // since they're being placed into a new structural context.
+    // However, if the current entry already contains selected (moved) items,
+    // we do NOT split — the unselected sibling should join the same wrapper
+    // because the selected item established the new structural context.
     if (stack.length > 1 && stack[stack.length - 1].depth === targetDepth && !item.isSelected) {
       const top = stack[stack.length - 1];
-      if (top.sourceParentAttrs !== item.parentListAttrs) {
+      if (top.sourceParentAttrs !== item.parentListAttrs && !top.hasSelectedItems) {
         var _popped$listAttrs2;
         const popped = stack.pop();
         if (!popped) {
@@ -122,6 +122,7 @@ export function rebuildTaskList(items, schema) {
       stack.push({
         depth: nextDepth,
         children: [],
+        hasSelectedItems: false,
         listAttrs: item.isSelected ? null : item.parentListAttrs,
         sourceParentAttrs: item.parentListAttrs
       });
@@ -131,17 +132,24 @@ export function rebuildTaskList(items, schema) {
     if (targetDepth === 0) {
       // Depth 0 items go directly into the root taskList
       stack[0].children.push(item.node);
+      if (item.isSelected) {
+        stack[0].hasSelectedItems = true;
+      }
     } else {
       // Ensure there's a stack entry at depth targetDepth to hold this item
       if (stack[stack.length - 1].depth < targetDepth) {
         stack.push({
           depth: targetDepth,
           children: [],
+          hasSelectedItems: false,
           listAttrs: item.isSelected ? null : item.parentListAttrs,
           sourceParentAttrs: item.parentListAttrs
         });
       }
       stack[stack.length - 1].children.push(item.node);
+      if (item.isSelected) {
+        stack[stack.length - 1].hasSelectedItems = true;
+      }
     }
   }
 

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

@@ -598,7 +598,19 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
             return tr.insert(blockTaskItemNode.pos, newTaskItem);
           }
           // Current position will point to text node, but we want to insert above the taskItem node
-          return tr.insert($from.pos - 1, newTask);
+          var insertPos = $from.pos - 1;
+          tr.insert(insertPos, newTask);
+          // Place cursor on the newly inserted empty task item above
+          // when nested inside another taskList.
+          if (expValEquals('platform_editor_flexible_list_indentation', 'isEnabled', true)) {
+            var taskListType = schema.nodes.taskList;
+            var parentTaskList = $from.node($from.depth - 1);
+            var grandparent = $from.depth >= 3 ? $from.node($from.depth - 2) : null;
+            if ((parentTaskList === null || parentTaskList === void 0 ? void 0 : parentTaskList.type) === taskListType && (grandparent === null || grandparent === void 0 ? void 0 : grandparent.type) === taskListType) {
+              tr.setSelection(TextSelection.create(tr.doc, insertPos + 1));
+            }
+          }
+          return tr;
         }
       }
       /**

package/dist/esm/pm-plugins/task-list-indentation.js

@@ -35,10 +35,6 @@ export function flattenTaskList(options) {
 // The root entry (depth -1) is special: its children become the content
 // of the outermost taskList directly (not wrapped in another taskList).
 // Entries at depth >= 0 each produce a nested taskList when popped.
-// listAttrs preserves the original parent's attributes when available.
-// sourceParentAttrs tracks the original parent taskList attrs of the items
-// in this entry, used to decide whether consecutive same-depth items
-// should share a wrapper or be separated.
 
 /**
  * Rebuilds a taskList tree from a flattened array of task items.
@@ -75,6 +71,7 @@ export function rebuildTaskList(items, schema) {
   var stack = [{
     depth: -1,
     children: [],
+    hasSelectedItems: false,
     listAttrs: items[0].parentListAttrs,
     sourceParentAttrs: items[0].parentListAttrs
   }];
@@ -105,9 +102,12 @@ export function rebuildTaskList(items, schema) {
       // separate wrappers (preserving original nesting). Selected (moved)
       // items always merge with whatever is already at the target depth,
       // since they're being placed into a new structural context.
+      // However, if the current entry already contains selected (moved) items,
+      // we do NOT split — the unselected sibling should join the same wrapper
+      // because the selected item established the new structural context.
       if (stack.length > 1 && stack[stack.length - 1].depth === targetDepth && !item.isSelected) {
         var top = stack[stack.length - 1];
-        if (top.sourceParentAttrs !== item.parentListAttrs) {
+        if (top.sourceParentAttrs !== item.parentListAttrs && !top.hasSelectedItems) {
           var _popped2$listAttrs;
           var _popped2 = stack.pop();
           if (!_popped2) {
@@ -130,6 +130,7 @@ export function rebuildTaskList(items, schema) {
         stack.push({
           depth: nextDepth,
           children: [],
+          hasSelectedItems: false,
           listAttrs: item.isSelected ? null : item.parentListAttrs,
           sourceParentAttrs: item.parentListAttrs
         });
@@ -139,17 +140,24 @@ export function rebuildTaskList(items, schema) {
       if (targetDepth === 0) {
         // Depth 0 items go directly into the root taskList
         stack[0].children.push(item.node);
+        if (item.isSelected) {
+          stack[0].hasSelectedItems = true;
+        }
       } else {
         // Ensure there's a stack entry at depth targetDepth to hold this item
         if (stack[stack.length - 1].depth < targetDepth) {
           stack.push({
             depth: targetDepth,
             children: [],
+            hasSelectedItems: false,
             listAttrs: item.isSelected ? null : item.parentListAttrs,
             sourceParentAttrs: item.parentListAttrs
           });
         }
         stack[stack.length - 1].children.push(item.node);
+        if (item.isSelected) {
+          stack[stack.length - 1].hasSelectedItems = true;
+        }
       }
     }
 

package/dist/types/nodeviews/TaskItemNodeView.d.ts

@@ -1,8 +1,7 @@
 import type { IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI, getPosHandlerNode } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { NodeView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { TasksAndDecisionsPlugin } from '../tasksAndDecisionsPluginType';
 interface TaskItemNodeViewOptions {
     api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined;

package/dist/types-ts4.5/nodeviews/TaskItemNodeView.d.ts

@@ -1,8 +1,7 @@
 import type { IntlShape } from 'react-intl-next';
 import type { ExtractInjectionAPI, getPosHandlerNode } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { NodeView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
 import type { TasksAndDecisionsPlugin } from '../tasksAndDecisionsPluginType';
 interface TaskItemNodeViewOptions {
     api: ExtractInjectionAPI<TasksAndDecisionsPlugin> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "11.4.6",
+	"version": "11.4.8",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,14 +49,14 @@
 		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/task-decision": "^19.3.0",
-		"@atlaskit/tmp-editor-statsig": "^54.0.0",
+		"@atlaskit/tmp-editor-statsig": "^54.3.0",
 		"@atlaskit/tokens": "^11.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.16.0",
+		"@atlaskit/editor-common": "^112.18.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"