@atlaskit/editor-plugin-collab-edit 1.1.2 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 1.1.4
+
+### Patch Changes
+
+- [#75947](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75947) [`43549c3789b1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/43549c3789b1) - Migrate @atlaskit/editor-core to use declarative entry points
+
+## 1.1.3
+
+### Patch Changes
+
+- [#79350](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79350) [`ba4e64dca012`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba4e64dca012) - Add FF to enable mapSelectionBackward to fix the cursor position
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -8,6 +8,7 @@ exports.handleTelePointer = exports.handlePresence = exports.handleInit = export
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _utils = require("./utils");
 var handleInit = exports.handleInit = function handleInit(initData, view, options) {
@@ -51,7 +52,16 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
   });
   var tr;
   if (options && options.useNativePlugin && userIds) {
-    tr = (0, _prosemirrorCollab.receiveTransaction)(state, steps, userIds);
+    /**
+     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
+     */
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.enable-map-selection-backward')) {
+      tr = (0, _prosemirrorCollab.receiveTransaction)(state, steps, userIds, {
+        mapSelectionBackward: true
+      });
+    } else {
+      tr = (0, _prosemirrorCollab.receiveTransaction)(state, steps, userIds);
+    }
   } else {
     tr = state.tr;
     steps.forEach(function (step) {
@@ -77,12 +87,17 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
     }
 
     /**
-     * If the cursor is a the same position as the first step in
-     * the remote data, we need to manually set it back again
-     * in order to prevent the cursor from moving.
+     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
      */
-    if (from === firstStep.from && to === firstStep.to) {
-      tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.enable-map-selection-backward')) {
+      /**
+       * If the cursor is a the same position as the first step in
+       * the remote data, we need to manually set it back again
+       * in order to prevent the cursor from moving.
+       */
+      if (from === firstStep.from && to === firstStep.to) {
+        tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+      }
     }
     view.dispatch(tr);
   }

package/dist/es2019/actions.js

@@ -1,5 +1,6 @@
 import { AllSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { Step } from '@atlaskit/editor-prosemirror/transform';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { receiveTransaction } from '@atlaskit/prosemirror-collab';
 import { replaceDocument } from './utils';
 export const handleInit = (initData, view, options) => {
@@ -58,7 +59,16 @@ export const applyRemoteSteps = (json, view, userIds, options) => {
   const steps = json.map(step => Step.fromJSON(schema, step));
   let tr;
   if (options && options.useNativePlugin && userIds) {
-    tr = receiveTransaction(state, steps, userIds);
+    /**
+     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
+     */
+    if (getBooleanFF('platform.editor.enable-map-selection-backward')) {
+      tr = receiveTransaction(state, steps, userIds, {
+        mapSelectionBackward: true
+      });
+    } else {
+      tr = receiveTransaction(state, steps, userIds);
+    }
   } else {
     tr = state.tr;
     steps.forEach(step => tr.step(step));
@@ -82,12 +92,17 @@ export const applyRemoteSteps = (json, view, userIds, options) => {
     }
 
     /**
-     * If the cursor is a the same position as the first step in
-     * the remote data, we need to manually set it back again
-     * in order to prevent the cursor from moving.
+     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
      */
-    if (from === firstStep.from && to === firstStep.to) {
-      tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+    if (!getBooleanFF('platform.editor.enable-map-selection-backward')) {
+      /**
+       * If the cursor is a the same position as the first step in
+       * the remote data, we need to manually set it back again
+       * in order to prevent the cursor from moving.
+       */
+      if (from === firstStep.from && to === firstStep.to) {
+        tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+      }
     }
     view.dispatch(tr);
   }

package/dist/esm/actions.js

@@ -1,6 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { AllSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { Step } from '@atlaskit/editor-prosemirror/transform';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { receiveTransaction } from '@atlaskit/prosemirror-collab';
 import { replaceDocument } from './utils';
 export var handleInit = function handleInit(initData, view, options) {
@@ -44,7 +45,16 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
   });
   var tr;
   if (options && options.useNativePlugin && userIds) {
-    tr = receiveTransaction(state, steps, userIds);
+    /**
+     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
+     */
+    if (getBooleanFF('platform.editor.enable-map-selection-backward')) {
+      tr = receiveTransaction(state, steps, userIds, {
+        mapSelectionBackward: true
+      });
+    } else {
+      tr = receiveTransaction(state, steps, userIds);
+    }
   } else {
     tr = state.tr;
     steps.forEach(function (step) {
@@ -70,12 +80,17 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
     }
 
     /**
-     * If the cursor is a the same position as the first step in
-     * the remote data, we need to manually set it back again
-     * in order to prevent the cursor from moving.
+     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
      */
-    if (from === firstStep.from && to === firstStep.to) {
-      tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+    if (!getBooleanFF('platform.editor.enable-map-selection-backward')) {
+      /**
+       * If the cursor is a the same position as the first step in
+       * the remote data, we need to manually set it back again
+       * in order to prevent the cursor from moving.
+       */
+      if (from === firstStep.from && to === firstStep.to) {
+        tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+      }
     }
     view.dispatch(tr);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-collab-edit",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Collab Edit plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,10 +32,11 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.10.0",
+    "@atlaskit/editor-common": "^78.11.0",
     "@atlaskit/editor-plugin-analytics": "1.0.3",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
+    "@atlaskit/platform-feature-flags": "^0.2.5",
     "@atlaskit/prosemirror-collab": "^0.2.0",
     "@babel/runtime": "^7.0.0",
     "memoize-one": "^6.0.0"
@@ -51,7 +52,7 @@
     "@atlaskit/editor-plugin-text-formatting": "^1.2.0",
     "@atlaskit/editor-plugin-type-ahead": "^1.0.0",
     "@atlaskit/editor-plugin-unsupported-content": "^1.0.0",
-    "@atlaskit/editor-test-helpers": "^18.18.0",
+    "@atlaskit/editor-test-helpers": "^18.19.0",
     "@atlaskit/ssr": "*",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
     "@atlaskit/util-data-test": "^17.9.0",
@@ -98,5 +99,10 @@
       ]
     }
   },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
-}
+  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
+  "platform-feature-flags": {
+    "platform.editor.enable-map-selection-backward": {
+      "type": "boolean"
+    }
+  }
+}