@atlaskit/editor-plugin-collab-edit 4.1.7 → 4.2.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 4.2.1
+
+### Patch Changes
+
+- [`ed995ae598c97`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ed995ae598c97) -
+  Fix metadata on offline syncing transaction
+- Updated dependencies
+
+## 4.2.0
+
+### Minor Changes
+
+- [`72f94befc61f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/72f94befc61f2) -
+  replace method-style signatures with function-style signatures
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.1.7
 
 ### Patch Changes

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mergeUnconfirmedSteps = mergeUnconfirmedSteps;
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var isLocked = function isLocked(step) {
@@ -40,7 +41,11 @@ function mergeUnconfirmedSteps(steps, api) {
       // As we want to wait until all the transactions have been pushed through
       var origin = lastStep.origin;
       if (mergedStep && inverted) {
-        acc[acc.length - 1] = new _prosemirrorCollab.Rebaseable(mergedStep, inverted, origin instanceof _state.Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        if ((0, _platformFeatureFlags.fg)('platform_editor_offline_editing_resync_flicker_fix')) {
+          acc[acc.length - 1] = new _prosemirrorCollab.Rebaseable(mergedStep, inverted, origin instanceof _state.Transaction ? origin.setMeta('isOffline', origin.getMeta('isOffline') === true || isOffline) : origin);
+        } else {
+          acc[acc.length - 1] = new _prosemirrorCollab.Rebaseable(mergedStep, inverted, origin instanceof _state.Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        }
         return acc;
       }
     }

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

@@ -1,4 +1,5 @@
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const isLocked = step => {
@@ -34,7 +35,11 @@ export function mergeUnconfirmedSteps(steps, api) {
       // As we want to wait until all the transactions have been pushed through
       const origin = lastStep.origin;
       if (mergedStep && inverted) {
-        acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        if (fg('platform_editor_offline_editing_resync_flicker_fix')) {
+          acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', origin.getMeta('isOffline') === true || isOffline) : origin);
+        } else {
+          acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        }
         return acc;
       }
     }

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

@@ -1,4 +1,5 @@
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var isLocked = function isLocked(step) {
@@ -34,7 +35,11 @@ export function mergeUnconfirmedSteps(steps, api) {
       // As we want to wait until all the transactions have been pushed through
       var origin = lastStep.origin;
       if (mergedStep && inverted) {
-        acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        if (fg('platform_editor_offline_editing_resync_flicker_fix')) {
+          acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', origin.getMeta('isOffline') === true || isOffline) : origin);
+        } else {
+          acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        }
         return acc;
       }
     }

package/dist/types/pm-plugins/participants.d.ts

@@ -10,5 +10,5 @@ export declare class Participants implements ReadOnlyParticipants {
     toArray(): CollabParticipant[];
     get(sessionId: string): CollabParticipant | undefined;
     size(): number;
-    eq(other: Participants): boolean;
+    eq(other: ReadOnlyParticipants): boolean;
 }

package/dist/types/types/index.d.ts

@@ -9,9 +9,9 @@ export type PrivateCollabEditOptions = CollabEditOptions & {
 export type ProviderCallback = <ReturnType>(codeToExecute: (provider: CollabEditProvider) => ReturnType | undefined, onError?: (err: Error) => void) => Promise<ReturnType | undefined> | undefined;
 export type ProviderBuilder = (collabEditProviderPromise: Promise<CollabEditProvider>) => ProviderCallback;
 export interface ReadOnlyParticipants {
-    get(sessionId: string): CollabParticipant | undefined;
-    toArray(): ReadonlyArray<CollabParticipant>;
-    eq(other: ReadOnlyParticipants): boolean;
+    get: (sessionId: string) => CollabParticipant | undefined;
+    toArray: () => ReadonlyArray<CollabParticipant>;
+    eq: (other: ReadOnlyParticipants) => boolean;
 }
 export type CollabInitializedMetadata = {
     collabInitialisedAt: null | number;

package/dist/types-ts4.5/pm-plugins/participants.d.ts

@@ -10,5 +10,5 @@ export declare class Participants implements ReadOnlyParticipants {
     toArray(): CollabParticipant[];
     get(sessionId: string): CollabParticipant | undefined;
     size(): number;
-    eq(other: Participants): boolean;
+    eq(other: ReadOnlyParticipants): boolean;
 }

package/dist/types-ts4.5/types/index.d.ts

@@ -9,9 +9,9 @@ export type PrivateCollabEditOptions = CollabEditOptions & {
 export type ProviderCallback = <ReturnType>(codeToExecute: (provider: CollabEditProvider) => ReturnType | undefined, onError?: (err: Error) => void) => Promise<ReturnType | undefined> | undefined;
 export type ProviderBuilder = (collabEditProviderPromise: Promise<CollabEditProvider>) => ProviderCallback;
 export interface ReadOnlyParticipants {
-    get(sessionId: string): CollabParticipant | undefined;
-    toArray(): ReadonlyArray<CollabParticipant>;
-    eq(other: ReadOnlyParticipants): boolean;
+    get: (sessionId: string) => CollabParticipant | undefined;
+    toArray: () => ReadonlyArray<CollabParticipant>;
+    eq: (other: ReadOnlyParticipants) => boolean;
 }
 export type CollabInitializedMetadata = {
     collabInitialisedAt: null | number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "4.1.7",
+	"version": "4.2.1",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^50.2.1",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-json-transformer": "^8.26.0",
+		"@atlaskit/editor-json-transformer": "^8.27.0",
 		"@atlaskit/editor-plugin-analytics": "^3.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^3.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
@@ -47,7 +47,7 @@
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.26.0",
+		"@atlaskit/editor-common": "^107.27.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -105,6 +105,9 @@
 	"platform-feature-flags": {
 		"platform_enable_ncs_step_metrics": {
 			"type": "boolean"
+		},
+		"platform_editor_offline_editing_resync_flicker_fix": {
+			"type": "boolean"
 		}
 	}
 }