@atlaskit/editor-plugin-collab-edit 1.1.8 → 1.1.10

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 1.1.10
+
+### Patch Changes
+
+- [#84283](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/84283) [`fcc12bc22e37`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fcc12bc22e37) - Clean up platform.editor.enable-map-selection-backward FE FF
+
+## 1.1.9
+
+### Patch Changes
+
+- [#81777](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81777) [`c6d7a5378751`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c6d7a5378751) - Bump adf-schema to 35.7.0
+- Updated dependencies
+
 ## 1.1.8
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -1,14 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleTelePointer = exports.handlePresence = exports.handleInit = exports.handleConnection = exports.getSendableSelection = exports.applyRemoteSteps = exports.applyRemoteData = void 0;
-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) {
@@ -52,16 +49,9 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
   });
   var tr;
   if (options && options.useNativePlugin && 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);
-    }
+    tr = (0, _prosemirrorCollab.receiveTransaction)(state, steps, userIds, {
+      mapSelectionBackward: true
+    });
   } else {
     tr = state.tr;
     steps.forEach(function (step) {
@@ -71,11 +61,6 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
   if (tr) {
     tr.setMeta('addToHistory', false);
     tr.setMeta('isRemote', true);
-    var _state$selection = state.selection,
-      from = _state$selection.from,
-      to = _state$selection.to;
-    var _json = (0, _slicedToArray2.default)(json, 1),
-      firstStep = _json[0];
 
     /*
      * Persist marks across transactions. Fixes an issue where
@@ -85,20 +70,6 @@ var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json
     if (state.tr.storedMarks) {
       tr.setStoredMarks(state.tr.storedMarks);
     }
-
-    /**
-     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
-     */
-    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,6 +1,5 @@
 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) => {
@@ -59,16 +58,9 @@ export const applyRemoteSteps = (json, view, userIds, options) => {
   const steps = json.map(step => Step.fromJSON(schema, step));
   let tr;
   if (options && options.useNativePlugin && 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);
-    }
+    tr = receiveTransaction(state, steps, userIds, {
+      mapSelectionBackward: true
+    });
   } else {
     tr = state.tr;
     steps.forEach(step => tr.step(step));
@@ -76,11 +68,6 @@ export const applyRemoteSteps = (json, view, userIds, options) => {
   if (tr) {
     tr.setMeta('addToHistory', false);
     tr.setMeta('isRemote', true);
-    const {
-      from,
-      to
-    } = state.selection;
-    const [firstStep] = json;
 
     /*
      * Persist marks across transactions. Fixes an issue where
@@ -90,20 +77,6 @@ export const applyRemoteSteps = (json, view, userIds, options) => {
     if (state.tr.storedMarks) {
       tr.setStoredMarks(state.tr.storedMarks);
     }
-
-    /**
-     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
-     */
-    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,7 +1,5 @@
-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) {
@@ -45,16 +43,9 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
   });
   var tr;
   if (options && options.useNativePlugin && 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);
-    }
+    tr = receiveTransaction(state, steps, userIds, {
+      mapSelectionBackward: true
+    });
   } else {
     tr = state.tr;
     steps.forEach(function (step) {
@@ -64,11 +55,6 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
   if (tr) {
     tr.setMeta('addToHistory', false);
     tr.setMeta('isRemote', true);
-    var _state$selection = state.selection,
-      from = _state$selection.from,
-      to = _state$selection.to;
-    var _json = _slicedToArray(json, 1),
-      firstStep = _json[0];
 
     /*
      * Persist marks across transactions. Fixes an issue where
@@ -78,20 +64,6 @@ export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, opt
     if (state.tr.storedMarks) {
       tr.setStoredMarks(state.tr.storedMarks);
     }
-
-    /**
-     * https://switcheroo.atlassian.com/changes/confluence/platform.editor.enable-map-selection-backward
-     */
-    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.8",
+  "version": "1.1.10",
   "description": "Collab Edit plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,13 +32,12 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.6.0",
-    "@atlaskit/custom-steps": "^0.0.15",
-    "@atlaskit/editor-common": "^78.17.0",
-    "@atlaskit/editor-plugin-analytics": "1.0.4",
+    "@atlaskit/adf-schema": "^35.7.0",
+    "@atlaskit/custom-steps": "^0.0.16",
+    "@atlaskit/editor-common": "^78.20.0",
+    "@atlaskit/editor-plugin-analytics": "1.0.5",
     "@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"
@@ -98,10 +97,5 @@
       ]
     }
   },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
-  "platform-feature-flags": {
-    "platform.editor.enable-map-selection-backward": {
-      "type": "boolean"
-    }
-  }
+  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
 }