@atlaskit/editor-plugin-collab-edit 3.10.1 → 3.10.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 3.10.2
+
+### Patch Changes
+
+- [#173357](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173357)
+  [`f17a667b25b42`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f17a667b25b42) -
+  enable merging of prosemirror steps for single player sessions
+- Updated dependencies
+
 ## 3.10.1
 
 ### Patch Changes

package/dist/cjs/collabEditPlugin.js

@@ -14,6 +14,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _analytics2 = require("./pm-plugins/analytics");
 var _sendTransaction = require("./pm-plugins/events/send-transaction");
@@ -209,7 +210,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         })) {
           transformed = (0, _filterAnalytics.filterAnalyticsSteps)(transformed);
         }
-        if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
+        if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true) || (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
           transformed = (0, _mergeUnconfirmed.mergeUnconfirmedSteps)(transformed, api);
         }
         return transformed;

package/dist/cjs/pm-plugins/mergeUnconfirmed.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.mergeUnconfirmedSteps = mergeUnconfirmedSteps;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var isLocked = function isLocked(step) {
   if (step.origin instanceof _state.Transaction) {
     return step.origin.getMeta('mergeIsLocked');
@@ -25,10 +26,13 @@ var isLocked = function isLocked(step) {
  */
 function mergeUnconfirmedSteps(steps, api) {
   var mergedSteps = steps.reduce(function (acc, rebaseable) {
-    var _api$connectivity;
+    var _api$connectivity, _api$collabEdit$share;
     var lastStep = acc[acc.length - 1];
     var isOffline = (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
-    if (isOffline && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
+    var activeParticipants = api === null || api === void 0 || (_api$collabEdit$share = api.collabEdit.sharedState.currentState()) === null || _api$collabEdit$share === void 0 || (_api$collabEdit$share = _api$collabEdit$share.activeParticipants) === null || _api$collabEdit$share === void 0 ? void 0 : _api$collabEdit$share.toArray();
+    var isSinglePlayer = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true) && activeParticipants && activeParticipants.length === 1;
+    var isOfflineOrSinglePlayer = isOffline || isSinglePlayer;
+    if (isOfflineOrSinglePlayer && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       var mergedStep = lastStep.step.merge(rebaseable.step);
       var inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.

package/dist/es2019/collabEditPlugin.js

@@ -3,6 +3,7 @@ import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
@@ -164,7 +165,7 @@ export const collabEditPlugin = ({
         })) {
           transformed = filterAnalyticsSteps(transformed);
         }
-        if (editorExperiment('platform_editor_offline_editing_web', true)) {
+        if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
           transformed = mergeUnconfirmedSteps(transformed, api);
         }
         return transformed;

package/dist/es2019/pm-plugins/mergeUnconfirmed.js

@@ -1,5 +1,6 @@
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const isLocked = step => {
   if (step.origin instanceof Transaction) {
     return step.origin.getMeta('mergeIsLocked');
@@ -19,10 +20,13 @@ const isLocked = step => {
  */
 export function mergeUnconfirmedSteps(steps, api) {
   const mergedSteps = steps.reduce((acc, rebaseable) => {
-    var _api$connectivity, _api$connectivity$sha;
+    var _api$connectivity, _api$connectivity$sha, _api$collabEdit$share, _api$collabEdit$share2;
     const lastStep = acc[acc.length - 1];
     const isOffline = (api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode) === 'offline';
-    if (isOffline && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
+    const activeParticipants = api === null || api === void 0 ? void 0 : (_api$collabEdit$share = api.collabEdit.sharedState.currentState()) === null || _api$collabEdit$share === void 0 ? void 0 : (_api$collabEdit$share2 = _api$collabEdit$share.activeParticipants) === null || _api$collabEdit$share2 === void 0 ? void 0 : _api$collabEdit$share2.toArray();
+    const isSinglePlayer = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true) && activeParticipants && activeParticipants.length === 1;
+    const isOfflineOrSinglePlayer = isOffline || isSinglePlayer;
+    if (isOfflineOrSinglePlayer && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       const mergedStep = lastStep.step.merge(rebaseable.step);
       const inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.

package/dist/esm/collabEditPlugin.js

@@ -9,6 +9,7 @@ import { isEmptyDocument } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
@@ -202,7 +203,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         })) {
           transformed = filterAnalyticsSteps(transformed);
         }
-        if (editorExperiment('platform_editor_offline_editing_web', true)) {
+        if (editorExperiment('platform_editor_offline_editing_web', true) || expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true)) {
           transformed = mergeUnconfirmedSteps(transformed, api);
         }
         return transformed;

package/dist/esm/pm-plugins/mergeUnconfirmed.js

@@ -1,5 +1,6 @@
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var isLocked = function isLocked(step) {
   if (step.origin instanceof Transaction) {
     return step.origin.getMeta('mergeIsLocked');
@@ -19,10 +20,13 @@ var isLocked = function isLocked(step) {
  */
 export function mergeUnconfirmedSteps(steps, api) {
   var mergedSteps = steps.reduce(function (acc, rebaseable) {
-    var _api$connectivity;
+    var _api$connectivity, _api$collabEdit$share;
     var lastStep = acc[acc.length - 1];
     var isOffline = (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
-    if (isOffline && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
+    var activeParticipants = api === null || api === void 0 || (_api$collabEdit$share = api.collabEdit.sharedState.currentState()) === null || _api$collabEdit$share === void 0 || (_api$collabEdit$share = _api$collabEdit$share.activeParticipants) === null || _api$collabEdit$share === void 0 ? void 0 : _api$collabEdit$share.toArray();
+    var isSinglePlayer = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true) && activeParticipants && activeParticipants.length === 1;
+    var isOfflineOrSinglePlayer = isOffline || isSinglePlayer;
+    if (isOfflineOrSinglePlayer && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       var mergedStep = lastStep.step.merge(rebaseable.step);
       var inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "3.10.1",
+	"version": "3.10.2",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/frontend-utilities": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.17.0",
-		"@atlaskit/tmp-editor-statsig": "^7.1.0",
+		"@atlaskit/tmp-editor-statsig": "^7.2.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},