@atlaskit/editor-plugin-indentation 3.1.5 → 3.2.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-indentation
 
+## 3.2.0
+
+### Minor Changes
+
+- [`d2a535bed291e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d2a535bed291e) -
+  [EDITOR-1153] Let the `editor-plugin-indentation` handle `paragraphs` when they are selected in a
+  range with `blockTaskItem`, but don't indent the `paragraphs` inside `blockTaskItem`s
+
+### Patch Changes
+
+- [`d2a535bed291e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d2a535bed291e) -
+  [EDITOR-1153] Make sure that Tab works for range selections for `blockTaskItem`
+- Updated dependencies
+
+## 3.1.6
+
+### Patch Changes
+
+- [`417545848d2bf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/417545848d2bf) -
+  [EDITOR-1153] Make sure that Tab works for range selections for `blockTaskItem`
+
 ## 3.1.5
 
 ### Patch Changes

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

@@ -17,11 +17,26 @@ function keymapPlugin(editorAnalyticsAPI) {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.findShortcutByKeymap)(_keymaps.indent), function (state, dispatch) {
-    var blockTaskItem = state.schema.nodes.blockTaskItem;
-
-    // Let `editor-plugin-tasks-and-decisions` handle indentation inside blockTaskItems
-    if ((0, _utils2.hasParentNodeOfType)([blockTaskItem])(state.selection)) {
-      return false;
+    var _state$schema$nodes = state.schema.nodes,
+      blockTaskItem = _state$schema$nodes.blockTaskItem,
+      paragraph = _state$schema$nodes.paragraph,
+      doc = _state$schema$nodes.doc;
+    if (blockTaskItem) {
+      var hasBlockTaskItem = false;
+      var hasParagraphAtDocLevel = false;
+      // Check if the selection contains a blockTaskItem
+      state.doc.nodesBetween(state.selection.from, state.selection.to, function (node, _pos, parent) {
+        if (node.type === blockTaskItem) {
+          hasBlockTaskItem = true;
+          return false; // stop iterating
+        }
+        if (node.type === paragraph && (parent === null || parent === void 0 ? void 0 : parent.type) === doc) {
+          hasParagraphAtDocLevel = true;
+        }
+      });
+      if (hasBlockTaskItem && !hasParagraphAtDocLevel) {
+        return false; // let `editor-plugin-tasks-and-decisions` handle indentation
+      }
     }
     return (0, _editorCommands.getIndentCommand)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch);
   }, list);

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

@@ -11,12 +11,26 @@ export function keymapPlugin(editorAnalyticsAPI) {
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   findShortcutByKeymap(indent), (state, dispatch) => {
     const {
-      blockTaskItem
+      blockTaskItem,
+      paragraph,
+      doc
     } = state.schema.nodes;
-
-    // Let `editor-plugin-tasks-and-decisions` handle indentation inside blockTaskItems
-    if (hasParentNodeOfType([blockTaskItem])(state.selection)) {
-      return false;
+    if (blockTaskItem) {
+      let hasBlockTaskItem = false;
+      let hasParagraphAtDocLevel = false;
+      // Check if the selection contains a blockTaskItem
+      state.doc.nodesBetween(state.selection.from, state.selection.to, (node, _pos, parent) => {
+        if (node.type === blockTaskItem) {
+          hasBlockTaskItem = true;
+          return false; // stop iterating
+        }
+        if (node.type === paragraph && (parent === null || parent === void 0 ? void 0 : parent.type) === doc) {
+          hasParagraphAtDocLevel = true;
+        }
+      });
+      if (hasBlockTaskItem && !hasParagraphAtDocLevel) {
+        return false; // let `editor-plugin-tasks-and-decisions` handle indentation
+      }
     }
     return getIndentCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD)(state, dispatch);
   }, list);

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

@@ -10,11 +10,26 @@ export function keymapPlugin(editorAnalyticsAPI) {
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   findShortcutByKeymap(indent), function (state, dispatch) {
-    var blockTaskItem = state.schema.nodes.blockTaskItem;
-
-    // Let `editor-plugin-tasks-and-decisions` handle indentation inside blockTaskItems
-    if (hasParentNodeOfType([blockTaskItem])(state.selection)) {
-      return false;
+    var _state$schema$nodes = state.schema.nodes,
+      blockTaskItem = _state$schema$nodes.blockTaskItem,
+      paragraph = _state$schema$nodes.paragraph,
+      doc = _state$schema$nodes.doc;
+    if (blockTaskItem) {
+      var hasBlockTaskItem = false;
+      var hasParagraphAtDocLevel = false;
+      // Check if the selection contains a blockTaskItem
+      state.doc.nodesBetween(state.selection.from, state.selection.to, function (node, _pos, parent) {
+        if (node.type === blockTaskItem) {
+          hasBlockTaskItem = true;
+          return false; // stop iterating
+        }
+        if (node.type === paragraph && (parent === null || parent === void 0 ? void 0 : parent.type) === doc) {
+          hasParagraphAtDocLevel = true;
+        }
+      });
+      if (hasBlockTaskItem && !hasParagraphAtDocLevel) {
+        return false; // let `editor-plugin-tasks-and-decisions` handle indentation
+      }
     }
     return getIndentCommand(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD)(state, dispatch);
   }, list);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-indentation",
-	"version": "3.1.5",
+	"version": "3.2.0",
 	"description": "Indentation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,7 +36,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.26.0",
+		"@atlaskit/editor-common": "^107.28.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},