@atlaskit/editor-plugin-tasks-and-decisions 15.2.5 → 15.2.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 15.2.6
+
+### Patch Changes
+
+- [`3c4994f354f5f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3c4994f354f5f) -
+  [ux] Fix content order being corrupted when indenting or outdenting a list item that has content
+  placed between its sub-lists (e.g. `li(p, ul, p, ul)`).
+- Updated dependencies
+
 ## 15.2.5
 
 ### Patch Changes

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

@@ -7,16 +7,79 @@ exports.flattenTaskList = flattenTaskList;
 exports.rebuildTaskList = rebuildTaskList;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _lists = require("@atlaskit/editor-common/lists");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+/**
+ * Flattens a taskList into one item per task item, recording which items the
+ * selection touches.
+ */
+function flattenTaskListImpl(options) {
+  var doc = options.doc,
+    rootListStart = options.rootListStart,
+    rootListEnd = options.rootListEnd,
+    selectionFrom = options.selectionFrom,
+    selectionTo = options.selectionTo,
+    indentDelta = options.indentDelta,
+    maxDepth = options.maxDepth;
+  var _doc$type$schema$node = doc.type.schema.nodes,
+    taskList = _doc$type$schema$node.taskList,
+    taskItem = _doc$type$schema$node.taskItem,
+    blockTaskItem = _doc$type$schema$node.blockTaskItem;
+  var items = [];
+  var startIndex = -1;
+  var endIndex = -1;
+  var exceedsMaxDepth = false;
+  var rootDepth = doc.resolve(rootListStart).depth;
+  var isPointSelection = selectionFrom === selectionTo;
+  doc.nodesBetween(rootListStart, rootListEnd, function (node, pos, parent) {
+    var isTaskItemType = node.type === taskItem || blockTaskItem != null && node.type === blockTaskItem;
+    if (!isTaskItemType || parent == null || parent.type !== taskList) {
+      return true;
+    }
+    var start = pos;
+    var end = pos + node.nodeSize;
+    var isSelected = isPointSelection ? selectionFrom >= start && selectionFrom <= end : start < selectionTo && end > selectionFrom;
+    var depth = doc.resolve(pos).depth - rootDepth - 1 + (isSelected ? indentDelta : 0);
+    items.push({
+      node: node,
+      pos: pos,
+      depth: depth,
+      isSelected: isSelected,
+      listType: parent.type.name,
+      parentListAttrs: parent.attrs
+    });
+    if (isSelected) {
+      var index = items.length - 1;
+      if (startIndex === -1) {
+        startIndex = index;
+      }
+      endIndex = index;
+      if (maxDepth != null && depth >= maxDepth) {
+        exceedsMaxDepth = true;
+      }
+    }
+    return true;
+  });
+  if (items.length === 0 || startIndex === -1 || exceedsMaxDepth) {
+    return null;
+  }
+  return {
+    items: items,
+    startIndex: startIndex,
+    endIndex: endIndex
+  };
+}
+
 /**
  * Flattens a taskList tree into an array of task items with computed depths.
  * Only selected items have their depth adjusted by indentDelta.
- *
- * Delegates to the shared `flattenList` with task-list-specific callbacks.
  */
 function flattenTaskList(options) {
+  if ((0, _platformFeatureFlags.fg)('platform_editor_flexible_list_normalization_fix')) {
+    return flattenTaskListImpl(options);
+  }
   var _options$doc$type$sch = options.doc.type.schema.nodes,
     taskList = _options$doc$type$sch.taskList,
     taskItem = _options$doc$type$sch.taskItem,

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

@@ -1,12 +1,79 @@
 import { uuid } from '@atlaskit/adf-schema';
 import { flattenList as flattenListBase } from '@atlaskit/editor-common/lists';
+import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Flattens a taskList into one item per task item, recording which items the
+ * selection touches.
+ */
+function flattenTaskListImpl(options) {
+  const {
+    doc,
+    rootListStart,
+    rootListEnd,
+    selectionFrom,
+    selectionTo,
+    indentDelta,
+    maxDepth
+  } = options;
+  const {
+    taskList,
+    taskItem,
+    blockTaskItem
+  } = doc.type.schema.nodes;
+  const items = [];
+  let startIndex = -1;
+  let endIndex = -1;
+  let exceedsMaxDepth = false;
+  const rootDepth = doc.resolve(rootListStart).depth;
+  const isPointSelection = selectionFrom === selectionTo;
+  doc.nodesBetween(rootListStart, rootListEnd, (node, pos, parent) => {
+    const isTaskItemType = node.type === taskItem || blockTaskItem != null && node.type === blockTaskItem;
+    if (!isTaskItemType || parent == null || parent.type !== taskList) {
+      return true;
+    }
+    const start = pos;
+    const end = pos + node.nodeSize;
+    const isSelected = isPointSelection ? selectionFrom >= start && selectionFrom <= end : start < selectionTo && end > selectionFrom;
+    const depth = doc.resolve(pos).depth - rootDepth - 1 + (isSelected ? indentDelta : 0);
+    items.push({
+      node,
+      pos,
+      depth,
+      isSelected,
+      listType: parent.type.name,
+      parentListAttrs: parent.attrs
+    });
+    if (isSelected) {
+      const index = items.length - 1;
+      if (startIndex === -1) {
+        startIndex = index;
+      }
+      endIndex = index;
+      if (maxDepth != null && depth >= maxDepth) {
+        exceedsMaxDepth = true;
+      }
+    }
+    return true;
+  });
+  if (items.length === 0 || startIndex === -1 || exceedsMaxDepth) {
+    return null;
+  }
+  return {
+    items,
+    startIndex,
+    endIndex
+  };
+}
+
 /**
  * Flattens a taskList tree into an array of task items with computed depths.
  * Only selected items have their depth adjusted by indentDelta.
- *
- * Delegates to the shared `flattenList` with task-list-specific callbacks.
  */
 export function flattenTaskList(options) {
+  if (fg('platform_editor_flexible_list_normalization_fix')) {
+    return flattenTaskListImpl(options);
+  }
   const {
     taskList,
     taskItem,

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

@@ -3,13 +3,77 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { uuid } from '@atlaskit/adf-schema';
 import { flattenList as flattenListBase } from '@atlaskit/editor-common/lists';
+import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Flattens a taskList into one item per task item, recording which items the
+ * selection touches.
+ */
+function flattenTaskListImpl(options) {
+  var doc = options.doc,
+    rootListStart = options.rootListStart,
+    rootListEnd = options.rootListEnd,
+    selectionFrom = options.selectionFrom,
+    selectionTo = options.selectionTo,
+    indentDelta = options.indentDelta,
+    maxDepth = options.maxDepth;
+  var _doc$type$schema$node = doc.type.schema.nodes,
+    taskList = _doc$type$schema$node.taskList,
+    taskItem = _doc$type$schema$node.taskItem,
+    blockTaskItem = _doc$type$schema$node.blockTaskItem;
+  var items = [];
+  var startIndex = -1;
+  var endIndex = -1;
+  var exceedsMaxDepth = false;
+  var rootDepth = doc.resolve(rootListStart).depth;
+  var isPointSelection = selectionFrom === selectionTo;
+  doc.nodesBetween(rootListStart, rootListEnd, function (node, pos, parent) {
+    var isTaskItemType = node.type === taskItem || blockTaskItem != null && node.type === blockTaskItem;
+    if (!isTaskItemType || parent == null || parent.type !== taskList) {
+      return true;
+    }
+    var start = pos;
+    var end = pos + node.nodeSize;
+    var isSelected = isPointSelection ? selectionFrom >= start && selectionFrom <= end : start < selectionTo && end > selectionFrom;
+    var depth = doc.resolve(pos).depth - rootDepth - 1 + (isSelected ? indentDelta : 0);
+    items.push({
+      node: node,
+      pos: pos,
+      depth: depth,
+      isSelected: isSelected,
+      listType: parent.type.name,
+      parentListAttrs: parent.attrs
+    });
+    if (isSelected) {
+      var index = items.length - 1;
+      if (startIndex === -1) {
+        startIndex = index;
+      }
+      endIndex = index;
+      if (maxDepth != null && depth >= maxDepth) {
+        exceedsMaxDepth = true;
+      }
+    }
+    return true;
+  });
+  if (items.length === 0 || startIndex === -1 || exceedsMaxDepth) {
+    return null;
+  }
+  return {
+    items: items,
+    startIndex: startIndex,
+    endIndex: endIndex
+  };
+}
+
 /**
  * Flattens a taskList tree into an array of task items with computed depths.
  * Only selected items have their depth adjusted by indentDelta.
- *
- * Delegates to the shared `flattenList` with task-list-specific callbacks.
  */
 export function flattenTaskList(options) {
+  if (fg('platform_editor_flexible_list_normalization_fix')) {
+    return flattenTaskListImpl(options);
+  }
   var _options$doc$type$sch = options.doc.type.schema.nodes,
     taskList = _options$doc$type$sch.taskList,
     taskItem = _options$doc$type$sch.taskItem,

package/dist/types/pm-plugins/task-list-indentation.d.ts

@@ -3,8 +3,6 @@ import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model'
 /**
  * Flattens a taskList tree into an array of task items with computed depths.
  * Only selected items have their depth adjusted by indentDelta.
- *
- * Delegates to the shared `flattenList` with task-list-specific callbacks.
  */
 export declare function flattenTaskList(options: FlattenListOptions): FlattenListResult | null;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "15.2.5",
+	"version": "15.2.6",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,14 +41,14 @@
 		"@atlaskit/primitives": "^22.0.0",
 		"@atlaskit/prosemirror-input-rules": "^4.0.0",
 		"@atlaskit/task-decision": "^21.4.0",
-		"@atlaskit/tmp-editor-statsig": "^126.2.0",
+		"@atlaskit/tmp-editor-statsig": "^127.0.0",
 		"@atlaskit/tokens": "^16.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.32.0",
+		"@atlaskit/editor-common": "^116.33.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -100,6 +100,9 @@
 		"platform_editor_element_browser_analytic": {
 			"type": "boolean"
 		},
+		"platform_editor_flexible_list_normalization_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_markdown_compatible_toolbar": {
 			"type": "boolean"
 		}