@atlaskit/collab-provider 10.8.0 → 10.8.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/collab-provider
 
+## 10.8.1
+
+### Patch Changes
+
+- [#120905](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120905)
+  [`4194ea903d7d6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4194ea903d7d6) -
+  Refactor step merging while offline.
+
 ## 10.8.0
 
 ### Minor Changes

package/dist/cjs/document/document-service.js

@@ -13,6 +13,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _const = require("../helpers/const");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _performance = require("../analytics/performance");
@@ -935,10 +936,9 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       // we need to lock them to ensure they don't get
       // mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
       if ((0, _platformFeatureFlags.fg)('platform_editor_merge_unconfirmed_steps')) {
-        unconfirmedStepsData.steps.forEach(function (s) {
-          if (isLockable(s)) {
-            var _s$lockStep;
-            (_s$lockStep = s.lockStep) === null || _s$lockStep === void 0 || _s$lockStep.call(s);
+        unconfirmedStepsData.origins.forEach(function (origin) {
+          if (origin instanceof _state.Transaction) {
+            return origin.setMeta('mergeIsLocked', true);
           }
         });
       }
@@ -967,7 +967,4 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       });
     }
   }]);
-}(); // Based on: packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts
-function isLockable(step) {
-  return (step === null || step === void 0 ? void 0 : step.lockStep) !== undefined;
-}
+}();

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "10.8.0";
+var version = exports.version = "10.8.1";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/document/document-service.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { fg } from '@atlaskit/platform-feature-flags';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
 import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -806,10 +807,9 @@ export class DocumentService {
     // we need to lock them to ensure they don't get
     // mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
     if (fg('platform_editor_merge_unconfirmed_steps')) {
-      unconfirmedStepsData.steps.forEach(s => {
-        if (isLockable(s)) {
-          var _s$lockStep;
-          (_s$lockStep = s.lockStep) === null || _s$lockStep === void 0 ? void 0 : _s$lockStep.call(s);
+      unconfirmedStepsData.origins.forEach(origin => {
+        if (origin instanceof Transaction) {
+          return origin.setMeta('mergeIsLocked', true);
         }
       });
     }
@@ -837,10 +837,4 @@ export class DocumentService {
       forcePublish
     });
   }
-}
-
-// Based on: packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts
-
-function isLockable(step) {
-  return (step === null || step === void 0 ? void 0 : step.lockStep) !== undefined;
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "10.8.0";
+export const version = "10.8.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/document/document-service.js

@@ -8,6 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { fg } from '@atlaskit/platform-feature-flags';
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
 import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -928,10 +929,9 @@ export var DocumentService = /*#__PURE__*/function () {
       // we need to lock them to ensure they don't get
       // mutated in: `packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts`
       if (fg('platform_editor_merge_unconfirmed_steps')) {
-        unconfirmedStepsData.steps.forEach(function (s) {
-          if (isLockable(s)) {
-            var _s$lockStep;
-            (_s$lockStep = s.lockStep) === null || _s$lockStep === void 0 || _s$lockStep.call(s);
+        unconfirmedStepsData.origins.forEach(function (origin) {
+          if (origin instanceof Transaction) {
+            return origin.setMeta('mergeIsLocked', true);
           }
         });
       }
@@ -960,10 +960,4 @@ export var DocumentService = /*#__PURE__*/function () {
       });
     }
   }]);
-}();
-
-// Based on: packages/editor/editor-plugin-collab-edit/src/pm-plugins/mergeUnconfirmed.ts
-
-function isLockable(step) {
-  return (step === null || step === void 0 ? void 0 : step.lockStep) !== undefined;
-}
+}();

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "10.8.0";
+export var version = "10.8.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/document/document-service.d.ts

@@ -4,7 +4,8 @@ import type AnalyticsHelper from '../analytics/analytics-helper';
 import { CatchupEventReason } from '../helpers/const';
 import type { MetadataService } from '../metadata/metadata-service';
 import type { Catchupv2Response, ChannelEvent, ReconcileResponse, ReconnectionMetadata, StepsPayload } from '../types';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { InternalError } from '../errors/internal-errors';
 import type { ParticipantsService } from '../participants/participants-service';

package/dist/types-ts4.5/document/document-service.d.ts

@@ -4,7 +4,8 @@ import type AnalyticsHelper from '../analytics/analytics-helper';
 import { CatchupEventReason } from '../helpers/const';
 import type { MetadataService } from '../metadata/metadata-service';
 import type { Catchupv2Response, ChannelEvent, ReconcileResponse, ReconnectionMetadata, StepsPayload } from '../types';
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { InternalError } from '../errors/internal-errors';
 import type { ParticipantsService } from '../participants/participants-service';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.8.0",
+	"version": "10.8.1",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"