@atlaskit/editor-plugin-list 3.1.2 → 3.1.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-list
 
+## 3.1.3
+
+### Patch Changes
+
+- [#66804](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/66804) [`107c6d15dda7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/107c6d15dda7) - ED-21802 Disable insert inside nested task list through toolbar and keybinding.
+
 ## 3.1.2
 
 ### Patch Changes

package/dist/cjs/commands/index.js

@@ -120,6 +120,12 @@ var toggleList = exports.toggleList = function toggleList(editorAnalyticsAPI) {
   return function (inputMethod, listType) {
     return function (_ref) {
       var tr = _ref.tr;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-action-in-list')) {
+        var taskList = tr.doc.type.schema.nodes.taskList;
+        if ((0, _utils2.hasParentNodeOfType)(taskList)(tr.selection)) {
+          return tr;
+        }
+      }
       var listInsideSelection = (0, _selection2.selectionContainsList)(tr);
       var listNodeType = tr.doc.type.schema.nodes[listType];
       var actionSubjectId = listType === 'bulletList' ? _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : _analytics.ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;

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

@@ -85,8 +85,9 @@ var handleDocChanged = function handleDocChanged(featureFlags) {
 var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
   var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
     bulletList = _tr$doc$type$schema$n.bulletList,
-    orderedList = _tr$doc$type$schema$n.orderedList;
-  var listParent = (0, _utils2.findParentNodeOfType)([bulletList, orderedList])(tr.selection);
+    orderedList = _tr$doc$type$schema$n.orderedList,
+    taskList = _tr$doc$type$schema$n.taskList;
+  var listParent = (0, _utils2.findParentNodeOfType)([bulletList, orderedList, taskList])(tr.selection);
   var bulletListActive = !!listParent && listParent.node.type === bulletList;
   var orderedListActive = !!listParent && listParent.node.type === orderedList;
   var bulletListDisabled = !(bulletListActive || orderedListActive || (0, _selection2.isWrappingPossible)(bulletList, tr.selection));

package/dist/es2019/commands/index.js

@@ -92,6 +92,14 @@ export const toggleList = editorAnalyticsAPI => (inputMethod, listType) => {
   return function ({
     tr
   }) {
+    if (getBooleanFF('platform.editor.allow-action-in-list')) {
+      const {
+        taskList
+      } = tr.doc.type.schema.nodes;
+      if (hasParentNodeOfType(taskList)(tr.selection)) {
+        return tr;
+      }
+    }
     const listInsideSelection = selectionContainsList(tr);
     const listNodeType = tr.doc.type.schema.nodes[listType];
     const actionSubjectId = listType === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;

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

@@ -74,9 +74,10 @@ const handleDocChanged = featureFlags => (tr, pluginState, editorState) => {
 const handleSelectionChanged = (tr, pluginState) => {
   const {
     bulletList,
-    orderedList
+    orderedList,
+    taskList
   } = tr.doc.type.schema.nodes;
-  const listParent = findParentNodeOfType([bulletList, orderedList])(tr.selection);
+  const listParent = findParentNodeOfType([bulletList, orderedList, taskList])(tr.selection);
   const bulletListActive = !!listParent && listParent.node.type === bulletList;
   const orderedListActive = !!listParent && listParent.node.type === orderedList;
   const bulletListDisabled = !(bulletListActive || orderedListActive || isWrappingPossible(bulletList, tr.selection));

package/dist/esm/commands/index.js

@@ -101,6 +101,12 @@ export var toggleList = function toggleList(editorAnalyticsAPI) {
   return function (inputMethod, listType) {
     return function (_ref) {
       var tr = _ref.tr;
+      if (getBooleanFF('platform.editor.allow-action-in-list')) {
+        var taskList = tr.doc.type.schema.nodes.taskList;
+        if (hasParentNodeOfType(taskList)(tr.selection)) {
+          return tr;
+        }
+      }
       var listInsideSelection = selectionContainsList(tr);
       var listNodeType = tr.doc.type.schema.nodes[listType];
       var actionSubjectId = listType === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;

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

@@ -78,8 +78,9 @@ var handleDocChanged = function handleDocChanged(featureFlags) {
 var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
   var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
     bulletList = _tr$doc$type$schema$n.bulletList,
-    orderedList = _tr$doc$type$schema$n.orderedList;
-  var listParent = findParentNodeOfType([bulletList, orderedList])(tr.selection);
+    orderedList = _tr$doc$type$schema$n.orderedList,
+    taskList = _tr$doc$type$schema$n.taskList;
+  var listParent = findParentNodeOfType([bulletList, orderedList, taskList])(tr.selection);
   var bulletListActive = !!listParent && listParent.node.type === bulletList;
   var orderedListActive = !!listParent && listParent.node.type === orderedList;
   var bulletListDisabled = !(bulletListActive || orderedListActive || isWrappingPossible(bulletList, tr.selection));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-list",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "List plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.3.0",
-    "@atlaskit/editor-common": "^76.36.0",
+    "@atlaskit/editor-common": "^76.39.0",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "1.1.0",