@atlaskit/editor-plugin-collab-edit 1.19.1 → 1.19.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 1.19.3
+
+### Patch Changes
+
+- [#136632](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136632)
+  [`d2f43d5cb2d52`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d2f43d5cb2d52) -
+  Exclude LinkMetaStep from going through filtering transaction logic
+
+## 1.19.2
+
+### Patch Changes
+
+- [#136348](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136348)
+  [`fb4fb56f1da7c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb4fb56f1da7c) -
+  Use optimised entry-points on editor-common for browser.
+- Updated dependencies
+
 ## 1.19.1
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main/plugin-state.js

@@ -15,12 +15,12 @@ exports.getValidPos = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _browser = require("@atlaskit/editor-common/browser");
 var _collab = require("@atlaskit/editor-common/collab");
-var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _participants = require("../../participants");
-var _utils2 = require("../../utils");
+var _utils = require("../../utils");
 /**
  * Returns position where it's possible to place a decoration.
  */
@@ -102,7 +102,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
 
         // Remove telepointers for users that left
         left.forEach(function (i) {
-          var pointers = (0, _utils2.findPointers)(i.sessionId, _this.decorationSet);
+          var pointers = (0, _utils.findPointers)(i.sessionId, _this.decorationSet);
           if (pointers) {
             remove = remove.concat(pointers);
           }
@@ -111,7 +111,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
       if (telepointerData) {
         var sessionId = telepointerData.sessionId;
         if (participants.get(sessionId) && sessionId !== sid) {
-          var oldPointers = (0, _utils2.findPointers)(telepointerData.sessionId, this.decorationSet);
+          var oldPointers = (0, _utils.findPointers)(telepointerData.sessionId, this.decorationSet);
           if (oldPointers) {
             remove = remove.concat(oldPointers);
           }
@@ -135,7 +135,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
           } catch (err) {
             this.onError(err);
           }
-          add = add.concat((0, _utils2.createTelepointers)(from, to, sessionId, isSelection, this.getInitial(sessionId)));
+          add = add.concat((0, _utils.createTelepointers)(from, to, sessionId, isSelection, this.getInitial(sessionId)));
         }
       }
       if (tr.docChanged) {
@@ -145,14 +145,14 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
             // Reapplies decorators those got removed by the state change
             onRemove: function onRemove(spec) {
               if (spec.pointer && spec.pointer.sessionId && spec.key === "telepointer-".concat(spec.pointer.sessionId)) {
-                var step = tr.steps.filter(_utils2.isReplaceStep)[0];
+                var step = tr.steps.filter(_utils.isReplaceStep)[0];
                 if (step) {
                   var _sessionId = spec.pointer.sessionId;
                   var _ref = step,
                     size = _ref.slice.content.size,
                     _from = _ref.from;
                   var pos = getValidPos(tr, size ? Math.min(_from + size, tr.doc.nodeSize - 3) : Math.max(_from, 1));
-                  add = add.concat((0, _utils2.createTelepointers)(pos, pos, _sessionId, false, _this.getInitial(_sessionId)));
+                  add = add.concat((0, _utils.createTelepointers)(pos, pos, _sessionId, false, _this.getInitial(_sessionId)));
                 }
               }
             }
@@ -163,7 +163,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
 
         // Remove any selection decoration within the change range,
         // takes care of the issue when after pasting we end up with a dead selection
-        tr.steps.filter(_utils2.isReplaceStep).forEach(function (s) {
+        tr.steps.filter(_utils.isReplaceStep).forEach(function (s) {
           var _ref2 = s,
             from = _ref2.from,
             to = _ref2.to;
@@ -188,7 +188,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
             // Browser condition here to fix ED-14722 where telepointer
             // decorations with side -1 in Firefox causes backspace issues.
             // This is likely caused by contenteditable quirks in Firefox
-            if (!_utils.browser.gecko) {
+            if (!_browser.browser.gecko) {
               deco.type.side = -1;
             }
           } else {
@@ -211,7 +211,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
       if (telepointerData) {
         var _sessionId2 = telepointerData.sessionId;
         if (participants.get(_sessionId2)) {
-          var positionForScroll = (0, _utils2.getPositionOfTelepointer)(_sessionId2, this.decorationSet);
+          var positionForScroll = (0, _utils.getPositionOfTelepointer)(_sessionId2, this.decorationSet);
           if (positionForScroll) {
             participants = participants.updateCursorPos(_sessionId2, positionForScroll);
           }

package/dist/cjs/pm-plugins/track-and-filter-spamming-steps.js

@@ -78,7 +78,7 @@ var createFilterTransaction = exports.createFilterTransaction = function createF
       return true;
     }
     var containsExcludedSteps = tr.steps.some(function (step) {
-      return step instanceof _steps.AnalyticsStep || step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep;
+      return step instanceof _steps.AnalyticsStep || step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep || step instanceof _steps.LinkMetaStep;
     });
     if (containsExcludedSteps) {
       return true;
@@ -126,8 +126,6 @@ function generateTransactionKey(tr) {
       }
     } else if (step instanceof _transform.AddMarkStep || step instanceof _transform.RemoveMarkStep) {
       return "from_".concat(step.from, "_to_").concat(step.to);
-    } else if (step instanceof _steps.LinkMetaStep) {
-      return "from_".concat(step.toJSON().from, "_to_").concat(step.toJSON().to);
     } else if (step instanceof _steps.InsertTypeAheadStep) {
       return "insertTypeAheadStep";
     }

package/dist/es2019/pm-plugins/main/plugin-state.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { browser } from '@atlaskit/editor-common/browser';
 import { TELEPOINTER_DIM_CLASS } from '@atlaskit/editor-common/collab';
-import { browser } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { Participants } from '../../participants';

package/dist/es2019/pm-plugins/track-and-filter-spamming-steps.js

@@ -70,7 +70,7 @@ export const createFilterTransaction = (recentTransactionsTimestamps, trackFilte
       return true;
     }
     const containsExcludedSteps = tr.steps.some(step => {
-      return step instanceof AnalyticsStep || step instanceof ReplaceStep || step instanceof ReplaceAroundStep;
+      return step instanceof AnalyticsStep || step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof LinkMetaStep;
     });
     if (containsExcludedSteps) {
       return true;
@@ -118,8 +118,6 @@ export function generateTransactionKey(tr) {
       }
     } else if (step instanceof AddMarkStep || step instanceof RemoveMarkStep) {
       return `from_${step.from}_to_${step.to}`;
-    } else if (step instanceof LinkMetaStep) {
-      return `from_${step.toJSON().from}_to_${step.toJSON().to}`;
     } else if (step instanceof InsertTypeAheadStep) {
       return `insertTypeAheadStep`;
     }

package/dist/esm/pm-plugins/main/plugin-state.js

@@ -1,8 +1,8 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { browser } from '@atlaskit/editor-common/browser';
 import { TELEPOINTER_DIM_CLASS } from '@atlaskit/editor-common/collab';
-import { browser } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { Participants } from '../../participants';

package/dist/esm/pm-plugins/track-and-filter-spamming-steps.js

@@ -70,7 +70,7 @@ export var createFilterTransaction = function createFilterTransaction(recentTran
       return true;
     }
     var containsExcludedSteps = tr.steps.some(function (step) {
-      return step instanceof AnalyticsStep || step instanceof ReplaceStep || step instanceof ReplaceAroundStep;
+      return step instanceof AnalyticsStep || step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof LinkMetaStep;
     });
     if (containsExcludedSteps) {
       return true;
@@ -118,8 +118,6 @@ export function generateTransactionKey(tr) {
       }
     } else if (step instanceof AddMarkStep || step instanceof RemoveMarkStep) {
       return "from_".concat(step.from, "_to_").concat(step.to);
-    } else if (step instanceof LinkMetaStep) {
-      return "from_".concat(step.toJSON().from, "_to_").concat(step.toJSON().to);
     } else if (step instanceof InsertTypeAheadStep) {
       return "insertTypeAheadStep";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "1.19.1",
+	"version": "1.19.3",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/custom-steps": "^0.7.0",
-		"@atlaskit/editor-common": "^88.6.0",
+		"@atlaskit/editor-common": "^88.8.0",
 		"@atlaskit/editor-plugin-analytics": "1.8.3",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",