@atlaskit/editor-plugin-block-controls 7.11.2 → 7.11.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.11.3
+
+### Patch Changes
+
+- [`59c74907ab1c6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/59c74907ab1c6) -
+  [ux] EDITOR-3727 fix selection preservation on empty lines
+- [`7e5df3d5beaf3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7e5df3d5beaf3) -
+  Add new flattenListStep and unwrapListStep and use for list -> paragraph step. Also moved
+  expandToBlockRange util function to editor-common to re-use
+- [`e3779b75fdeca`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3779b75fdeca) -
+  EDITOR-1643 Promote syncBlock and bodiedSyncBlock to full schema
+- Updated dependencies
+
 ## 7.11.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/selection-preservation/pm-plugin.js

@@ -8,6 +8,7 @@ exports.createSelectionPreservationPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _main = require("../main");
@@ -81,10 +82,9 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
         });
       }
       var currSel = newState.selection;
-      var wasEmptySelection = savedSel.from === savedSel.to;
       var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
       var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+      if (selectionUnchanged || selectionInvalid) {
         return null;
       }
       try {
@@ -106,18 +106,27 @@ var mapSelection = function mapSelection(selection, tr) {
   if (selection instanceof _state.TextSelection) {
     var from = mapping.map(selection.from);
     var to = mapping.map(selection.to);
+    var isSelectionEmpty = from === to;
+    var wasSelectionEmpty = selection.from === selection.to;
+    if (isSelectionEmpty) {
+      if (!wasSelectionEmpty) {
+        // If selection has become empty i.e. content has been deleted, stop preserving
+        return undefined;
+      }
+      // When preserving a cursor selection, just map the position without expanding
+      return new _state.TextSelection(tr.doc.resolve(from));
+    }
 
     // expand the text selection range to block boundaries, so as document changes occur the
     // selection always includes whole nodes
-    var expanded = (0, _getSelection.expandToBlockRange)(tr.doc.resolve(from), tr.doc.resolve(to));
+    var expanded = (0, _selection.expandToBlockRange)(tr.doc.resolve(from), tr.doc.resolve(to));
 
     // collapse the expanded range to a valid selection range
     var _collapseToSelectionR = (0, _getSelection.collapseToSelectionRange)(expanded.$from, expanded.$to),
       $from = _collapseToSelectionR.$from,
       $to = _collapseToSelectionR.$to;
 
-    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-    // e.g. after deleting the selection
+    // stop preserving if preserved selection becomes invalid
     if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
       return undefined;
     }

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = exports.expandToBlockRange = exports.collapseToSelectionRange = void 0;
+exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = exports.collapseToSelectionRange = void 0;
 var _selection2 = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -222,28 +222,6 @@ var rootTaskListDepth = exports.rootTaskListDepth = function rootTaskListDepth(t
   return depth;
 };
 
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-var expandToBlockRange = exports.expandToBlockRange = function expandToBlockRange($from, $to) {
-  var range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from: $from,
-      $to: $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
-};
-
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *
@@ -254,14 +232,14 @@ var expandToBlockRange = exports.expandToBlockRange = function expandToBlockRang
  * @returns An object containing the collapsed $from and $to resolved positions
  */
 var collapseToSelectionRange = exports.collapseToSelectionRange = function collapseToSelectionRange($from, $to) {
-  var resolvedRangeEnd = $from.doc.resolve($to.pos);
-
+  var _$to$nodeBefore$nodeS, _$to$nodeBefore;
   // Get the selections that would be made for the first and last node in the range
   // We re-use the getSelection logic as it already handles various node types and edge cases
-  var firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
-  var lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
-  var lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
-  var lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+  // always pass true for selectionEmpty to emulate a cursor selection within the node
+  var firstNodeSelection = newGetSelection($from.doc, true, $from.pos);
+  var lastNodeSize = (_$to$nodeBefore$nodeS = (_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.nodeSize) !== null && _$to$nodeBefore$nodeS !== void 0 ? _$to$nodeBefore$nodeS : 0;
+  var lastNodeStartPos = $to.pos - lastNodeSize;
+  var lastNodeSelection = newGetSelection($from.doc, true, lastNodeStartPos);
 
   // Return a selection spanning from the start of the first node selection to the end of the last node selection
   return {

package/dist/es2019/pm-plugins/selection-preservation/pm-plugin.js

@@ -1,9 +1,10 @@
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { getBlockControlsMeta } from '../main';
-import { collapseToSelectionRange, expandToBlockRange } from '../utils/getSelection';
+import { collapseToSelectionRange } from '../utils/getSelection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
 import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
@@ -74,10 +75,9 @@ export const createSelectionPreservationPlugin = () => {
         });
       }
       const currSel = newState.selection;
-      const wasEmptySelection = savedSel.from === savedSel.to;
       const selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
       const selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+      if (selectionUnchanged || selectionInvalid) {
         return null;
       }
       try {
@@ -100,6 +100,16 @@ const mapSelection = (selection, tr) => {
   if (selection instanceof TextSelection) {
     const from = mapping.map(selection.from);
     const to = mapping.map(selection.to);
+    const isSelectionEmpty = from === to;
+    const wasSelectionEmpty = selection.from === selection.to;
+    if (isSelectionEmpty) {
+      if (!wasSelectionEmpty) {
+        // If selection has become empty i.e. content has been deleted, stop preserving
+        return undefined;
+      }
+      // When preserving a cursor selection, just map the position without expanding
+      return new TextSelection(tr.doc.resolve(from));
+    }
 
     // expand the text selection range to block boundaries, so as document changes occur the
     // selection always includes whole nodes
@@ -111,8 +121,7 @@ const mapSelection = (selection, tr) => {
       $to
     } = collapseToSelectionRange(expanded.$from, expanded.$to);
 
-    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-    // e.g. after deleting the selection
+    // stop preserving if preserved selection becomes invalid
     if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
       return undefined;
     }

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -219,28 +219,6 @@ export const rootTaskListDepth = taskListPos => {
   return depth;
 };
 
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export const expandToBlockRange = ($from, $to) => {
-  const range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from,
-      $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
-};
-
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *
@@ -251,14 +229,14 @@ export const expandToBlockRange = ($from, $to) => {
  * @returns An object containing the collapsed $from and $to resolved positions
  */
 export const collapseToSelectionRange = ($from, $to) => {
-  const resolvedRangeEnd = $from.doc.resolve($to.pos);
-
+  var _$to$nodeBefore$nodeS, _$to$nodeBefore;
   // Get the selections that would be made for the first and last node in the range
   // We re-use the getSelection logic as it already handles various node types and edge cases
-  const firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
-  const lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
-  const lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
-  const lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+  // always pass true for selectionEmpty to emulate a cursor selection within the node
+  const firstNodeSelection = newGetSelection($from.doc, true, $from.pos);
+  const lastNodeSize = (_$to$nodeBefore$nodeS = (_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.nodeSize) !== null && _$to$nodeBefore$nodeS !== void 0 ? _$to$nodeBefore$nodeS : 0;
+  const lastNodeStartPos = $to.pos - lastNodeSize;
+  const lastNodeSelection = newGetSelection($from.doc, true, lastNodeStartPos);
 
   // Return a selection spanning from the start of the first node selection to the end of the last node selection
   return {

package/dist/esm/pm-plugins/selection-preservation/pm-plugin.js

@@ -3,10 +3,11 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { getBlockControlsMeta } from '../main';
-import { collapseToSelectionRange, expandToBlockRange } from '../utils/getSelection';
+import { collapseToSelectionRange } from '../utils/getSelection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
 import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
@@ -75,10 +76,9 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
         });
       }
       var currSel = newState.selection;
-      var wasEmptySelection = savedSel.from === savedSel.to;
       var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
       var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+      if (selectionUnchanged || selectionInvalid) {
         return null;
       }
       try {
@@ -100,6 +100,16 @@ var mapSelection = function mapSelection(selection, tr) {
   if (selection instanceof TextSelection) {
     var from = mapping.map(selection.from);
     var to = mapping.map(selection.to);
+    var isSelectionEmpty = from === to;
+    var wasSelectionEmpty = selection.from === selection.to;
+    if (isSelectionEmpty) {
+      if (!wasSelectionEmpty) {
+        // If selection has become empty i.e. content has been deleted, stop preserving
+        return undefined;
+      }
+      // When preserving a cursor selection, just map the position without expanding
+      return new TextSelection(tr.doc.resolve(from));
+    }
 
     // expand the text selection range to block boundaries, so as document changes occur the
     // selection always includes whole nodes
@@ -110,8 +120,7 @@ var mapSelection = function mapSelection(selection, tr) {
       $from = _collapseToSelectionR.$from,
       $to = _collapseToSelectionR.$to;
 
-    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-    // e.g. after deleting the selection
+    // stop preserving if preserved selection becomes invalid
     if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
       return undefined;
     }

package/dist/esm/pm-plugins/utils/getSelection.js

@@ -216,28 +216,6 @@ export var rootTaskListDepth = function rootTaskListDepth(taskListPos) {
   return depth;
 };
 
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export var expandToBlockRange = function expandToBlockRange($from, $to) {
-  var range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from: $from,
-      $to: $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
-};
-
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *
@@ -248,14 +226,14 @@ export var expandToBlockRange = function expandToBlockRange($from, $to) {
  * @returns An object containing the collapsed $from and $to resolved positions
  */
 export var collapseToSelectionRange = function collapseToSelectionRange($from, $to) {
-  var resolvedRangeEnd = $from.doc.resolve($to.pos);
-
+  var _$to$nodeBefore$nodeS, _$to$nodeBefore;
   // Get the selections that would be made for the first and last node in the range
   // We re-use the getSelection logic as it already handles various node types and edge cases
-  var firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
-  var lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
-  var lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
-  var lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+  // always pass true for selectionEmpty to emulate a cursor selection within the node
+  var firstNodeSelection = newGetSelection($from.doc, true, $from.pos);
+  var lastNodeSize = (_$to$nodeBefore$nodeS = (_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.nodeSize) !== null && _$to$nodeBefore$nodeS !== void 0 ? _$to$nodeBefore$nodeS : 0;
+  var lastNodeStartPos = $to.pos - lastNodeSize;
+  var lastNodeSelection = newGetSelection($from.doc, true, lastNodeStartPos);
 
   // Return a selection spanning from the start of the first node selection to the end of the last node selection
   return {

package/dist/types/pm-plugins/utils/getSelection.d.ts

@@ -20,18 +20,6 @@ export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: numb
 export declare const isHandleCorrelatedToSelection: (state: EditorState, selection: Selection, handlePos: number) => boolean;
 export declare const rootListDepth: (itemPos: ResolvedPos) => number | undefined;
 export declare const rootTaskListDepth: (taskListPos: ResolvedPos) => number | undefined;
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export declare const expandToBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => {
-    $from: ResolvedPos;
-    $to: ResolvedPos;
-};
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *

package/dist/types-ts4.5/pm-plugins/utils/getSelection.d.ts

@@ -20,18 +20,6 @@ export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: numb
 export declare const isHandleCorrelatedToSelection: (state: EditorState, selection: Selection, handlePos: number) => boolean;
 export declare const rootListDepth: (itemPos: ResolvedPos) => number | undefined;
 export declare const rootTaskListDepth: (taskListPos: ResolvedPos) => number | undefined;
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export declare const expandToBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => {
-    $from: ResolvedPos;
-    $to: ResolvedPos;
-};
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.11.2",
+	"version": "7.11.3",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.4.0",
+		"@atlaskit/adf-schema": "^51.5.1",
 		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/editor-plugin-accessibility-utils": "^6.0.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^14.4.0",
+		"@atlaskit/tmp-editor-statsig": "^14.5.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.37.0",
+		"@atlaskit/editor-common": "^110.38.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"