@atlaskit/editor-plugin-list 17.0.1 → 17.0.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-list
 
+## 17.0.2
+
+### Patch Changes
+
+- [`86f1891483b7f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/86f1891483b7f) -
+  Prevent list deletion commands from skipping synced blocks behind platform_editor_blocks_patch_7.
+
 ## 17.0.1
 
 ### Patch Changes

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

@@ -15,6 +15,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _commands2 = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _conversions = require("../actions/conversions");
@@ -59,6 +60,17 @@ var enterKeyCommand = exports.enterKeyCommand = function enterKeyCommand(editorA
 var backspaceKeyCommand = exports.backspaceKeyCommand = function backspaceKeyCommand(editorAnalyticsAPI) {
   return function () {
     return function (state, dispatch) {
+      // Select an adjacent syncBlock before the list command chain can outdent the current list.
+      if ((0, _utils.isEmptySelectionAtStart)(state) && (0, _fg.fg)('platform_editor_blocks_patch_7')) {
+        var _$cut$nodeBefore;
+        var $cut = (0, _commands.findCutBefore)(state.selection.$from);
+        if (($cut === null || $cut === void 0 || (_$cut$nodeBefore = $cut.nodeBefore) === null || _$cut$nodeBefore === void 0 ? void 0 : _$cut$nodeBefore.type.name) === 'syncBlock') {
+          if (dispatch) {
+            dispatch(state.tr.setSelection(_state.NodeSelection.create(state.doc, $cut.pos - $cut.nodeBefore.nodeSize)).scrollIntoView());
+          }
+          return true;
+        }
+      }
       return (0, _commands2.chainCommands)((0, _listBackspace.listBackspace)(editorAnalyticsAPI),
       // if we're at the start of a list item, we need to either backspace
       // directly to an empty list item above, or outdent this node

package/dist/cjs/pm-plugins/commands/join-list-item-forward.js

@@ -8,7 +8,9 @@ exports.joinListItemForward = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _joinListItemsForward = require("../actions/join-list-items-forward");
 var joinListItemForward = exports.joinListItemForward = function joinListItemForward(editorAnalyticsAPI) {
   return function (state, dispatch) {
@@ -18,6 +20,23 @@ var joinListItemForward = exports.joinListItemForward = function joinListItemFor
     if (!(0, _utils.isEmptySelectionAtEnd)(state)) {
       return false;
     }
+    if ((0, _fg.fg)('platform_editor_blocks_patch_7')) {
+      var interveningSyncBlockPos;
+      // walkNextNode can skip leaf nodes because they have no resolvable content position.
+      state.doc.nodesBetween($head.pos, walkNode.$pos.pos, function (node, pos) {
+        if (interveningSyncBlockPos === undefined && node.type.name === 'syncBlock') {
+          interveningSyncBlockPos = pos;
+        }
+        return interveningSyncBlockPos === undefined;
+      });
+      if (interveningSyncBlockPos !== undefined) {
+        if (dispatch) {
+          var selection = _state.NodeSelection.create(state.doc, interveningSyncBlockPos);
+          dispatch(tr.setSelection(selection).scrollIntoView());
+        }
+        return true;
+      }
+    }
     var scenarios = (0, _joinListItemsForward.calcJoinListScenario)(walkNode, $head);
     if (!scenarios) {
       return false;

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

@@ -7,6 +7,7 @@ import { filterCommand as filter, hasVisibleContent, isEmptySelectionAtStart } f
 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 { fg } from '@atlaskit/platform-feature-flags/fg';
 import { findParentNodeOfTypeClosestToPos, findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { convertListType } from '../actions/conversions';
@@ -48,6 +49,17 @@ export const enterKeyCommand = editorAnalyticsAPI => () => (state, dispatch) =>
   return false;
 };
 export const backspaceKeyCommand = editorAnalyticsAPI => () => (state, dispatch) => {
+  // Select an adjacent syncBlock before the list command chain can outdent the current list.
+  if (isEmptySelectionAtStart(state) && fg('platform_editor_blocks_patch_7')) {
+    var _$cut$nodeBefore;
+    const $cut = findCutBefore(state.selection.$from);
+    if (($cut === null || $cut === void 0 ? void 0 : (_$cut$nodeBefore = $cut.nodeBefore) === null || _$cut$nodeBefore === void 0 ? void 0 : _$cut$nodeBefore.type.name) === 'syncBlock') {
+      if (dispatch) {
+        dispatch(state.tr.setSelection(NodeSelection.create(state.doc, $cut.pos - $cut.nodeBefore.nodeSize)).scrollIntoView());
+      }
+      return true;
+    }
+  }
   return chainCommands(listBackspace(editorAnalyticsAPI),
   // if we're at the start of a list item, we need to either backspace
   // directly to an empty list item above, or outdent this node

package/dist/es2019/pm-plugins/commands/join-list-item-forward.js

@@ -1,6 +1,8 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, DELETE_DIRECTION, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { isEmptySelectionAtEnd, walkNextNode } from '@atlaskit/editor-common/utils';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { calcJoinListScenario } from '../actions/join-list-items-forward';
 export const joinListItemForward = editorAnalyticsAPI => (state, dispatch) => {
   const {
@@ -13,6 +15,23 @@ export const joinListItemForward = editorAnalyticsAPI => (state, dispatch) => {
   if (!isEmptySelectionAtEnd(state)) {
     return false;
   }
+  if (fg('platform_editor_blocks_patch_7')) {
+    let interveningSyncBlockPos;
+    // walkNextNode can skip leaf nodes because they have no resolvable content position.
+    state.doc.nodesBetween($head.pos, walkNode.$pos.pos, (node, pos) => {
+      if (interveningSyncBlockPos === undefined && node.type.name === 'syncBlock') {
+        interveningSyncBlockPos = pos;
+      }
+      return interveningSyncBlockPos === undefined;
+    });
+    if (interveningSyncBlockPos !== undefined) {
+      if (dispatch) {
+        const selection = NodeSelection.create(state.doc, interveningSyncBlockPos);
+        dispatch(tr.setSelection(selection).scrollIntoView());
+      }
+      return true;
+    }
+  }
   const scenarios = calcJoinListScenario(walkNode, $head);
   if (!scenarios) {
     return false;

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

@@ -10,6 +10,7 @@ import { filterCommand as filter, hasVisibleContent, isEmptySelectionAtStart } f
 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 { fg } from '@atlaskit/platform-feature-flags/fg';
 import { findParentNodeOfTypeClosestToPos, findPositionOfNodeBefore, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { convertListType } from '../actions/conversions';
@@ -52,6 +53,17 @@ export var enterKeyCommand = function enterKeyCommand(editorAnalyticsAPI) {
 export var backspaceKeyCommand = function backspaceKeyCommand(editorAnalyticsAPI) {
   return function () {
     return function (state, dispatch) {
+      // Select an adjacent syncBlock before the list command chain can outdent the current list.
+      if (isEmptySelectionAtStart(state) && fg('platform_editor_blocks_patch_7')) {
+        var _$cut$nodeBefore;
+        var $cut = findCutBefore(state.selection.$from);
+        if (($cut === null || $cut === void 0 || (_$cut$nodeBefore = $cut.nodeBefore) === null || _$cut$nodeBefore === void 0 ? void 0 : _$cut$nodeBefore.type.name) === 'syncBlock') {
+          if (dispatch) {
+            dispatch(state.tr.setSelection(NodeSelection.create(state.doc, $cut.pos - $cut.nodeBefore.nodeSize)).scrollIntoView());
+          }
+          return true;
+        }
+      }
       return chainCommands(listBackspace(editorAnalyticsAPI),
       // if we're at the start of a list item, we need to either backspace
       // directly to an empty list item above, or outdent this node

package/dist/esm/pm-plugins/commands/join-list-item-forward.js

@@ -1,7 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, DELETE_DIRECTION, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { isEmptySelectionAtEnd, walkNextNode } from '@atlaskit/editor-common/utils';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { calcJoinListScenario } from '../actions/join-list-items-forward';
 export var joinListItemForward = function joinListItemForward(editorAnalyticsAPI) {
   return function (state, dispatch) {
@@ -11,6 +13,23 @@ export var joinListItemForward = function joinListItemForward(editorAnalyticsAPI
     if (!isEmptySelectionAtEnd(state)) {
       return false;
     }
+    if (fg('platform_editor_blocks_patch_7')) {
+      var interveningSyncBlockPos;
+      // walkNextNode can skip leaf nodes because they have no resolvable content position.
+      state.doc.nodesBetween($head.pos, walkNode.$pos.pos, function (node, pos) {
+        if (interveningSyncBlockPos === undefined && node.type.name === 'syncBlock') {
+          interveningSyncBlockPos = pos;
+        }
+        return interveningSyncBlockPos === undefined;
+      });
+      if (interveningSyncBlockPos !== undefined) {
+        if (dispatch) {
+          var selection = NodeSelection.create(state.doc, interveningSyncBlockPos);
+          dispatch(tr.setSelection(selection).scrollIntoView());
+        }
+        return true;
+      }
+    }
     var scenarios = calcJoinListScenario(walkNode, $head);
     if (!scenarios) {
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-list",
-	"version": "17.0.1",
+	"version": "17.0.2",
 	"description": "List plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,7 +27,7 @@
 		"@atlaskit/editor-plugin-ui-control-registry": "^9.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-toolbar": "^2.4.0",
-		"@atlaskit/editor-ui-control-model": "^2.6.0",
+		"@atlaskit/editor-ui-control-model": "^2.7.0",
 		"@atlaskit/icon": "^37.3.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
@@ -82,6 +82,10 @@
 		},
 		"platform_editor_flexible_list_normalization_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_blocks_patch_7": {
+			"type": "boolean",
+			"referenceOnly": true
 		}
 	},
 	"devDependencies": {