@atlaskit/editor-plugin-list 3.1.1 → 3.1.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @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
+
+- [#65603](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65603) [`ac8d4b09e18e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ac8d4b09e18e) - ED-21609 Node nesting: Use the new nodespec for list and panel when respective FF's are enabled
+
 ## 3.1.1
 
 ### 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/plugin.js

@@ -11,6 +11,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("./commands");
 var _inputRules = _interopRequireDefault(require("./pm-plugins/input-rules"));
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
@@ -53,6 +54,7 @@ var listPlugin = exports.listPlugin = function listPlugin(_ref) {
       return _main.pluginKey.getState(editorState);
     },
     nodes: function nodes() {
+      var listItemNode = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-action-in-list') ? _adfSchema.listItemWithTask : _adfSchema.listItem;
       return [{
         name: 'bulletList',
         node: _adfSchema.bulletList
@@ -61,7 +63,7 @@ var listPlugin = exports.listPlugin = function listPlugin(_ref) {
         node: _adfSchema.orderedListWithOrder
       }, {
         name: 'listItem',
-        node: _adfSchema.listItem
+        node: listItemNode
       }];
     },
     pmPlugins: function pmPlugins() {

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/plugin.js

@@ -1,9 +1,10 @@
 import React from 'react';
-import { bulletList, listItem, orderedListWithOrder } from '@atlaskit/adf-schema';
+import { bulletList, listItem, listItemWithTask, orderedListWithOrder } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toggleBulletList, toggleOrderedList, tooltip } from '@atlaskit/editor-common/keymaps';
 import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { indentList, outdentList, toggleBulletList as toggleBulletListCommand, toggleOrderedList as toggleOrderedListCommand } from './commands';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymapPlugin from './pm-plugins/keymap';
@@ -46,6 +47,7 @@ export const listPlugin = ({
       return listPluginKey.getState(editorState);
     },
     nodes() {
+      const listItemNode = getBooleanFF('platform.editor.allow-action-in-list') ? listItemWithTask : listItem;
       return [{
         name: 'bulletList',
         node: bulletList
@@ -54,7 +56,7 @@ export const listPlugin = ({
         node: orderedListWithOrder
       }, {
         name: 'listItem',
-        node: listItem
+        node: listItemNode
       }];
     },
     pmPlugins() {

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/plugin.js

@@ -1,9 +1,10 @@
 import React from 'react';
-import { bulletList, listItem, orderedListWithOrder } from '@atlaskit/adf-schema';
+import { bulletList, listItem, listItemWithTask, orderedListWithOrder } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { toggleBulletList, toggleOrderedList, tooltip } from '@atlaskit/editor-common/keymaps';
 import { listMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { indentList, outdentList as _outdentList, toggleBulletList as toggleBulletListCommand, toggleOrderedList as toggleOrderedListCommand } from './commands';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymapPlugin from './pm-plugins/keymap';
@@ -47,6 +48,7 @@ export var listPlugin = function listPlugin(_ref) {
       return listPluginKey.getState(editorState);
     },
     nodes: function nodes() {
+      var listItemNode = getBooleanFF('platform.editor.allow-action-in-list') ? listItemWithTask : listItem;
       return [{
         name: 'bulletList',
         node: bulletList
@@ -55,7 +57,7 @@ export var listPlugin = function listPlugin(_ref) {
         node: orderedListWithOrder
       }, {
         name: 'listItem',
-        node: listItem
+        node: listItemNode
       }];
     },
     pmPlugins: function pmPlugins() {

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.1",
+  "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.35.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",
@@ -92,6 +92,9 @@
   "platform-feature-flags": {
     "platform.editor.ordered-list-auto-join-improvements_mrlv5": {
       "type": "boolean"
+    },
+    "platform.editor.allow-action-in-list": {
+      "type": "boolean"
     }
   }
 }