@atlaskit/editor-plugin-list 8.2.18 → 8.2.19

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-list
 
+## 8.2.19
+
+### Patch Changes
+
+- [`fa963aec58f3d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fa963aec58f3d) -
+  EDITOR-3064 Clean up feature gate platform_editor_split_list_item_for_gap_cursor
+- Updated dependencies
+
 ## 8.2.18
 
 ### Patch Changes

package/dist/cjs/pm-plugins/commands/index.js

@@ -16,7 +16,6 @@ var _commands2 = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _conversions = require("../actions/conversions");
 var _wrapAndJoinLists = require("../actions/wrap-and-join-lists");
 var _transforms = require("../transforms");
@@ -39,9 +38,9 @@ var enterKeyCommand = exports.enterKeyCommand = function enterKeyCommand(editorA
           codeBlock = _state$schema$nodes.codeBlock;
 
         // the list item is the parent of the gap cursor
-        // while for text, list item is the grant parent of the text node
+        // while for text, list item is the grandparent of the text node
         var isGapCursorSelection = selection instanceof _selection.GapCursorSelection;
-        var wrapper = isGapCursorSelection && (0, _platformFeatureFlags.fg)('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node($from.depth - 1);
+        var wrapper = isGapCursorSelection ? $from.parent : $from.node($from.depth - 1);
         if (wrapper && wrapper.type === listItem) {
           /** Check if the wrapper has any visible content */
           var wrapperHasContent = (0, _utils.hasVisibleContent)(wrapper);
@@ -208,17 +207,16 @@ function splitListItem(itemType) {
       return false;
     }
 
-    // list item is the parent of the gap cursor instead of grant parent;
-    // rename grantParent to WrapperlistItem once we clean up platform_editor_split_list_item_for_gap_cursor
+    // list item is the parent of the gap cursor instead of grandparent
     var isGapCursorSelection = ref instanceof _selection.GapCursorSelection;
-    var grandParent = isGapCursorSelection && (0, _platformFeatureFlags.fg)('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node(-1);
-    if (grandParent.type !== itemType) {
+    var wrapperListItem = isGapCursorSelection ? $from.parent : $from.node(-1);
+    if (wrapperListItem.type !== itemType) {
       return false;
     }
     /** --> The following line changed from the original PM implementation to allow list additions with multiple paragraphs */
     if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    grandParent.content.content.length <= 1 && $from.parent.content.size === 0 && !(grandParent.content.size === 0)) {
+    wrapperListItem.content.content.length <= 1 && $from.parent.content.size === 0 && !(wrapperListItem.content.size === 0)) {
       // In an empty block. If this is a nested list, the wrapping
       // list item should be split. Otherwise, bail out and let next
       // command handle lifting.
@@ -245,38 +243,31 @@ function splitListItem(itemType) {
       }
       return true;
     }
-    var nextType = $to.pos === $from.end() ? grandParent.contentMatchAt(0).defaultType : null;
+    var nextType = $to.pos === $from.end() ? wrapperListItem.contentMatchAt(0).defaultType : null;
     var tr = state.tr.delete($from.pos, $to.pos);
     var types = nextType && [null, {
       type: nextType
     }];
-    if ((0, _platformFeatureFlags.fg)('platform_editor_split_list_item_for_gap_cursor')) {
-      if (dispatch) {
-        var _$from$nodeBefore;
-        if (ref instanceof _state.TextSelection) {
-          dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
-          return true;
-        }
-
-        // create new list item with empty paragraph when user click enter on gap cursor
-        if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
-          // For gap cursor selection , we can not split the list item directly
-          // We need to insert a new list item after the current list item to simulate the split behaviour
-          var _state$schema$nodes2 = state.schema.nodes,
-            listItem = _state$schema$nodes2.listItem,
-            paragraph = _state$schema$nodes2.paragraph;
-          var newListItem = listItem.createChecked({}, paragraph.createChecked());
-          dispatch(tr.insert($from.pos, newListItem).setSelection(_state.Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
-          return true;
-        }
-      }
-      return false;
-    } else {
-      if (dispatch) {
+    if (dispatch) {
+      var _$from$nodeBefore;
+      if (ref instanceof _state.TextSelection) {
         dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        return true;
+      }
+
+      // create new list item with empty paragraph when user clicks enter on gap cursor
+      if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
+        // For gap cursor selection, we cannot split the list item directly
+        // We need to insert a new list item after the current list item to simulate the split behaviour
+        var _state$schema$nodes2 = state.schema.nodes,
+          listItem = _state$schema$nodes2.listItem,
+          paragraph = _state$schema$nodes2.paragraph;
+        var newListItem = listItem.createChecked({}, paragraph.createChecked());
+        dispatch(tr.insert($from.pos, newListItem).setSelection(_state.Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
+        return true;
       }
-      return true;
     }
+    return false;
   };
 }
 var deletePreviousEmptyListItem = function deletePreviousEmptyListItem(state, dispatch) {

package/dist/es2019/pm-plugins/commands/index.js

@@ -8,7 +8,6 @@ import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { liftFollowingList, liftNodeSelectionList, liftTextSelectionList } from '../transforms';
@@ -32,9 +31,9 @@ export const enterKeyCommand = editorAnalyticsAPI => () => (state, dispatch) =>
     } = state.schema.nodes;
 
     // the list item is the parent of the gap cursor
-    // while for text, list item is the grant parent of the text node
+    // while for text, list item is the grandparent of the text node
     const isGapCursorSelection = selection instanceof GapCursorSelection;
-    const wrapper = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node($from.depth - 1);
+    const wrapper = isGapCursorSelection ? $from.parent : $from.node($from.depth - 1);
     if (wrapper && wrapper.type === listItem) {
       /** Check if the wrapper has any visible content */
       const wrapperHasContent = hasVisibleContent(wrapper);
@@ -191,17 +190,16 @@ function splitListItem(itemType) {
       return false;
     }
 
-    // list item is the parent of the gap cursor instead of grant parent;
-    // rename grantParent to WrapperlistItem once we clean up platform_editor_split_list_item_for_gap_cursor
+    // list item is the parent of the gap cursor instead of grandparent
     const isGapCursorSelection = ref instanceof GapCursorSelection;
-    const grandParent = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node(-1);
-    if (grandParent.type !== itemType) {
+    const wrapperListItem = isGapCursorSelection ? $from.parent : $from.node(-1);
+    if (wrapperListItem.type !== itemType) {
       return false;
     }
     /** --> The following line changed from the original PM implementation to allow list additions with multiple paragraphs */
     if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    grandParent.content.content.length <= 1 && $from.parent.content.size === 0 && !(grandParent.content.size === 0)) {
+    wrapperListItem.content.content.length <= 1 && $from.parent.content.size === 0 && !(wrapperListItem.content.size === 0)) {
       // In an empty block. If this is a nested list, the wrapping
       // list item should be split. Otherwise, bail out and let next
       // command handle lifting.
@@ -228,39 +226,32 @@ function splitListItem(itemType) {
       }
       return true;
     }
-    const nextType = $to.pos === $from.end() ? grandParent.contentMatchAt(0).defaultType : null;
+    const nextType = $to.pos === $from.end() ? wrapperListItem.contentMatchAt(0).defaultType : null;
     const tr = state.tr.delete($from.pos, $to.pos);
     const types = nextType && [null, {
       type: nextType
     }];
-    if (fg('platform_editor_split_list_item_for_gap_cursor')) {
-      if (dispatch) {
-        var _$from$nodeBefore;
-        if (ref instanceof TextSelection) {
-          dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
-          return true;
-        }
-
-        // create new list item with empty paragraph when user click enter on gap cursor
-        if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
-          // For gap cursor selection , we can not split the list item directly
-          // We need to insert a new list item after the current list item to simulate the split behaviour
-          const {
-            listItem,
-            paragraph
-          } = state.schema.nodes;
-          const newListItem = listItem.createChecked({}, paragraph.createChecked());
-          dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
-          return true;
-        }
-      }
-      return false;
-    } else {
-      if (dispatch) {
+    if (dispatch) {
+      var _$from$nodeBefore;
+      if (ref instanceof TextSelection) {
         dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        return true;
+      }
+
+      // create new list item with empty paragraph when user clicks enter on gap cursor
+      if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
+        // For gap cursor selection, we cannot split the list item directly
+        // We need to insert a new list item after the current list item to simulate the split behaviour
+        const {
+          listItem,
+          paragraph
+        } = state.schema.nodes;
+        const newListItem = listItem.createChecked({}, paragraph.createChecked());
+        dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
+        return true;
       }
-      return true;
     }
+    return false;
   };
 }
 const deletePreviousEmptyListItem = (state, dispatch) => {

package/dist/esm/pm-plugins/commands/index.js

@@ -11,7 +11,6 @@ import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { convertListType } from '../actions/conversions';
 import { wrapInListAndJoin } from '../actions/wrap-and-join-lists';
 import { liftFollowingList, liftNodeSelectionList, liftTextSelectionList } from '../transforms';
@@ -32,9 +31,9 @@ export var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
           codeBlock = _state$schema$nodes.codeBlock;
 
         // the list item is the parent of the gap cursor
-        // while for text, list item is the grant parent of the text node
+        // while for text, list item is the grandparent of the text node
         var isGapCursorSelection = selection instanceof GapCursorSelection;
-        var wrapper = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node($from.depth - 1);
+        var wrapper = isGapCursorSelection ? $from.parent : $from.node($from.depth - 1);
         if (wrapper && wrapper.type === listItem) {
           /** Check if the wrapper has any visible content */
           var wrapperHasContent = hasVisibleContent(wrapper);
@@ -201,17 +200,16 @@ function splitListItem(itemType) {
       return false;
     }
 
-    // list item is the parent of the gap cursor instead of grant parent;
-    // rename grantParent to WrapperlistItem once we clean up platform_editor_split_list_item_for_gap_cursor
+    // list item is the parent of the gap cursor instead of grandparent
     var isGapCursorSelection = ref instanceof GapCursorSelection;
-    var grandParent = isGapCursorSelection && fg('platform_editor_split_list_item_for_gap_cursor') ? $from.parent : $from.node(-1);
-    if (grandParent.type !== itemType) {
+    var wrapperListItem = isGapCursorSelection ? $from.parent : $from.node(-1);
+    if (wrapperListItem.type !== itemType) {
       return false;
     }
     /** --> The following line changed from the original PM implementation to allow list additions with multiple paragraphs */
     if (
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    grandParent.content.content.length <= 1 && $from.parent.content.size === 0 && !(grandParent.content.size === 0)) {
+    wrapperListItem.content.content.length <= 1 && $from.parent.content.size === 0 && !(wrapperListItem.content.size === 0)) {
       // In an empty block. If this is a nested list, the wrapping
       // list item should be split. Otherwise, bail out and let next
       // command handle lifting.
@@ -238,38 +236,31 @@ function splitListItem(itemType) {
       }
       return true;
     }
-    var nextType = $to.pos === $from.end() ? grandParent.contentMatchAt(0).defaultType : null;
+    var nextType = $to.pos === $from.end() ? wrapperListItem.contentMatchAt(0).defaultType : null;
     var tr = state.tr.delete($from.pos, $to.pos);
     var types = nextType && [null, {
       type: nextType
     }];
-    if (fg('platform_editor_split_list_item_for_gap_cursor')) {
-      if (dispatch) {
-        var _$from$nodeBefore;
-        if (ref instanceof TextSelection) {
-          dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
-          return true;
-        }
-
-        // create new list item with empty paragraph when user click enter on gap cursor
-        if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
-          // For gap cursor selection , we can not split the list item directly
-          // We need to insert a new list item after the current list item to simulate the split behaviour
-          var _state$schema$nodes2 = state.schema.nodes,
-            listItem = _state$schema$nodes2.listItem,
-            paragraph = _state$schema$nodes2.paragraph;
-          var newListItem = listItem.createChecked({}, paragraph.createChecked());
-          dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
-          return true;
-        }
-      }
-      return false;
-    } else {
-      if (dispatch) {
+    if (dispatch) {
+      var _$from$nodeBefore;
+      if (ref instanceof TextSelection) {
         dispatch(tr.split($from.pos, 2, types !== null && types !== void 0 ? types : undefined).scrollIntoView());
+        return true;
+      }
+
+      // create new list item with empty paragraph when user clicks enter on gap cursor
+      if (isGapCursorSelection && (_$from$nodeBefore = $from.nodeBefore) !== null && _$from$nodeBefore !== void 0 && _$from$nodeBefore.isBlock) {
+        // For gap cursor selection, we cannot split the list item directly
+        // We need to insert a new list item after the current list item to simulate the split behaviour
+        var _state$schema$nodes2 = state.schema.nodes,
+          listItem = _state$schema$nodes2.listItem,
+          paragraph = _state$schema$nodes2.paragraph;
+        var newListItem = listItem.createChecked({}, paragraph.createChecked());
+        dispatch(tr.insert($from.pos, newListItem).setSelection(Selection.near(tr.doc.resolve($to.pos + 1))).scrollIntoView());
+        return true;
       }
-      return true;
     }
+    return false;
   };
 }
 var deletePreviousEmptyListItem = function deletePreviousEmptyListItem(state, dispatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "8.2.18",
+	"version": "8.2.19",
 	"description": "List plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,23 +27,23 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
+		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-menu": "^5.1.0",
+		"@atlaskit/editor-plugin-block-menu": "^5.2.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/icon": "^29.1.0",
 		"@atlaskit/insm": "^0.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
-		"@atlaskit/tmp-editor-statsig": "^15.0.0",
+		"@atlaskit/tmp-editor-statsig": "^15.10.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.42.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -83,9 +83,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_split_list_item_for_gap_cursor": {
-			"type": "boolean"
-		},
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		}