@atlaskit/editor-common 99.1.2 → 99.3.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-common
 
+## 99.3.0
+
+### Minor Changes
+
+- [#100830](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100830)
+  [`c46ec6d414867`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c46ec6d414867) -
+  New collab event namespace-lock:check
+
+## 99.2.0
+
+### Minor Changes
+
+- [#102499](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102499)
+  [`c1bfe8b68a35e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c1bfe8b68a35e) -
+  log obfuscated steps in collab provider when catchup out of sync
+
 ## 99.1.2
 
 ### Patch Changes

package/dist/cjs/collab/index.js

@@ -119,7 +119,11 @@ var DisconnectReason = exports.DisconnectReason = /*#__PURE__*/function (Disconn
   DisconnectReason["SOCKET_TIMEOUT"] = "SOCKET_TIMEOUT";
   DisconnectReason["UNKNOWN_DISCONNECT"] = "UNKNOWN_DISCONNECT";
   return DisconnectReason;
-}({});
+}({}); // Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.ReplaceStep
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.ReplaceAroundStep
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.AttrStep
+//Intersection: NCS custom step type config in adf-schema
+//Unions
 var telepointerColorStyle = function telepointerColorStyle(backgroundColor, textColor, index) {
   var _getGlobalTheme = (0, _tokens.getGlobalTheme)(),
     colorMode = _getGlobalTheme.colorMode;

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "99.1.2";
+var packageVersion = "99.3.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "99.1.2";
+var packageVersion = "99.3.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/collab/index.js

@@ -128,6 +128,17 @@ export let DisconnectReason = /*#__PURE__*/function (DisconnectReason) {
   DisconnectReason["UNKNOWN_DISCONNECT"] = "UNKNOWN_DISCONNECT";
   return DisconnectReason;
 }({});
+
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.ReplaceStep
+
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.ReplaceAroundStep
+
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.AttrStep
+
+//Intersection: NCS custom step type config in adf-schema
+
+//Unions
+
 const telepointerColorStyle = (backgroundColor, textColor, index) => {
   const {
     colorMode

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "99.1.2";
+const packageVersion = "99.3.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "99.1.2";
+const packageVersion = "99.3.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/collab/index.js

@@ -130,6 +130,17 @@ export var DisconnectReason = /*#__PURE__*/function (DisconnectReason) {
   DisconnectReason["UNKNOWN_DISCONNECT"] = "UNKNOWN_DISCONNECT";
   return DisconnectReason;
 }({});
+
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.ReplaceStep
+
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.ReplaceAroundStep
+
+// Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.AttrStep
+
+//Intersection: NCS custom step type config in adf-schema
+
+//Unions
+
 var telepointerColorStyle = function telepointerColorStyle(backgroundColor, textColor, index) {
   var _getGlobalTheme = getGlobalTheme(),
     colorMode = _getGlobalTheme.colorMode;

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "99.1.2";
+var packageVersion = "99.3.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "99.1.2";
+var packageVersion = "99.3.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

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

@@ -1,4 +1,5 @@
 import type { ReactElement } from 'react';
+import { type BatchAttrsStep, type OverrideDocumentStepJSON as OverrideDocumentStep } from '@atlaskit/adf-schema/steps';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
@@ -241,6 +242,9 @@ export interface CollabDisconnectedPayload {
     reason: DisconnectReason;
     sid: string;
 }
+export interface CollabNamespaceLockCheckPayload {
+    isLocked: boolean;
+}
 export interface CollabEventRemoteData {
     json?: any;
     newState?: EditorState;
@@ -252,7 +256,7 @@ type MarkJson = {
         [key: string]: any;
     };
 };
-type NodeJson = {
+export type NodeJson = {
     type: string;
     attrs: {
         [key: string]: any;
@@ -266,16 +270,72 @@ type SliceJson = {
     openStart: number;
     openEnd: number;
 };
-export type StepJson = {
-    stepType?: string;
-    from?: number;
-    to?: number;
-    slice?: SliceJson;
+export interface StepMetadata {
+    metadata?: {
+        source?: string;
+        stepId?: string;
+        prevStepId?: string;
+        rebased?: boolean;
+        traceId?: string;
+        reqId?: string;
+        schemaVersion?: string;
+    };
+}
+export interface BaseStepPM extends StepMetadata {
     clientId: number | string;
     userId: string;
-    createdAt?: number;
+    stepType: string;
+    to?: number;
+    from?: number;
+    slice?: SliceJson;
+}
+export interface ReplaceStepPM extends BaseStepPM {
+    from: number;
+    to: number;
+    slice: SliceJson;
     structure?: boolean;
-};
+}
+export interface ReplaceAroundStepPM extends BaseStepPM {
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    slice: SliceJson;
+    insert: number;
+    structure?: boolean;
+}
+export type InlineCommentStepPM = InlineCommentAddMarkStepPM | InlineCommentAddNodeMarkStepPM;
+interface InlineCommentAddMarkStepPM extends BaseStepPM {
+    stepType: 'addMark';
+    from: number;
+    to: number;
+    mark?: {
+        type?: 'annotation';
+        attrs?: {
+            id?: string;
+            annotationType?: 'inlineComment';
+        };
+    };
+}
+export interface InlineCommentAddNodeMarkStepPM extends BaseStepPM {
+    stepType: 'addNodeMark';
+    pos: number;
+    mark?: {
+        type?: 'annotation';
+        attrs?: {
+            id?: string;
+            annotationType?: 'inlineComment';
+        };
+    };
+}
+export interface SetAttrsStepPM extends BaseStepPM {
+    stepType: 'setAttrs';
+    pos: number;
+    attrs: Record<string, unknown>;
+}
+export type BatchAttrsStepPM = BaseStepPM & BatchAttrsStep;
+export type OverrideDocumentStepPM = BaseStepPM & OverrideDocumentStep;
+export type StepJson = OverrideDocumentStepPM | ReplaceAroundStepPM | ReplaceStepPM | InlineCommentStepPM | SetAttrsStepPM;
 export interface CollabDataPayload extends CollabEventRemoteData {
     version: number;
     json: StepJson[];
@@ -384,6 +444,7 @@ export interface CollabEvents {
     connecting: CollabConnectingPayload;
     permission: CollabPermissionEventPayload;
     'commit-status': CollabCommitStatusEventPayload;
+    'namespace-lock:check': CollabNamespaceLockCheckPayload;
 }
 export type SyncUpErrorFunction = (attributes: NewCollabSyncUpErrorAttributes) => void;
 export interface CollabEditProvider<Events extends CollabEvents = CollabEvents> {

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

@@ -1,4 +1,5 @@
 import type { ReactElement } from 'react';
+import { type BatchAttrsStep, type OverrideDocumentStepJSON as OverrideDocumentStep } from '@atlaskit/adf-schema/steps';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
@@ -241,6 +242,9 @@ export interface CollabDisconnectedPayload {
     reason: DisconnectReason;
     sid: string;
 }
+export interface CollabNamespaceLockCheckPayload {
+    isLocked: boolean;
+}
 export interface CollabEventRemoteData {
     json?: any;
     newState?: EditorState;
@@ -252,7 +256,7 @@ type MarkJson = {
         [key: string]: any;
     };
 };
-type NodeJson = {
+export type NodeJson = {
     type: string;
     attrs: {
         [key: string]: any;
@@ -266,16 +270,72 @@ type SliceJson = {
     openStart: number;
     openEnd: number;
 };
-export type StepJson = {
-    stepType?: string;
-    from?: number;
-    to?: number;
-    slice?: SliceJson;
+export interface StepMetadata {
+    metadata?: {
+        source?: string;
+        stepId?: string;
+        prevStepId?: string;
+        rebased?: boolean;
+        traceId?: string;
+        reqId?: string;
+        schemaVersion?: string;
+    };
+}
+export interface BaseStepPM extends StepMetadata {
     clientId: number | string;
     userId: string;
-    createdAt?: number;
+    stepType: string;
+    to?: number;
+    from?: number;
+    slice?: SliceJson;
+}
+export interface ReplaceStepPM extends BaseStepPM {
+    from: number;
+    to: number;
+    slice: SliceJson;
     structure?: boolean;
-};
+}
+export interface ReplaceAroundStepPM extends BaseStepPM {
+    from: number;
+    to: number;
+    gapFrom: number;
+    gapTo: number;
+    slice: SliceJson;
+    insert: number;
+    structure?: boolean;
+}
+export type InlineCommentStepPM = InlineCommentAddMarkStepPM | InlineCommentAddNodeMarkStepPM;
+interface InlineCommentAddMarkStepPM extends BaseStepPM {
+    stepType: 'addMark';
+    from: number;
+    to: number;
+    mark?: {
+        type?: 'annotation';
+        attrs?: {
+            id?: string;
+            annotationType?: 'inlineComment';
+        };
+    };
+}
+export interface InlineCommentAddNodeMarkStepPM extends BaseStepPM {
+    stepType: 'addNodeMark';
+    pos: number;
+    mark?: {
+        type?: 'annotation';
+        attrs?: {
+            id?: string;
+            annotationType?: 'inlineComment';
+        };
+    };
+}
+export interface SetAttrsStepPM extends BaseStepPM {
+    stepType: 'setAttrs';
+    pos: number;
+    attrs: Record<string, unknown>;
+}
+export type BatchAttrsStepPM = BaseStepPM & BatchAttrsStep;
+export type OverrideDocumentStepPM = BaseStepPM & OverrideDocumentStep;
+export type StepJson = OverrideDocumentStepPM | ReplaceAroundStepPM | ReplaceStepPM | InlineCommentStepPM | SetAttrsStepPM;
 export interface CollabDataPayload extends CollabEventRemoteData {
     version: number;
     json: StepJson[];
@@ -384,6 +444,7 @@ export interface CollabEvents {
     connecting: CollabConnectingPayload;
     permission: CollabPermissionEventPayload;
     'commit-status': CollabCommitStatusEventPayload;
+    'namespace-lock:check': CollabNamespaceLockCheckPayload;
 }
 export type SyncUpErrorFunction = (attributes: NewCollabSyncUpErrorAttributes) => void;
 export interface CollabEditProvider<Events extends CollabEvents = CollabEvents> {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "99.1.2",
+	"version": "99.3.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -113,7 +113,7 @@
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.5.0",
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/adf-utils": "^19.16.0",
+		"@atlaskit/adf-utils": "^19.17.0",
 		"@atlaskit/analytics-listeners": "^8.13.0",
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.2.0",
@@ -129,7 +129,7 @@
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/emoji": "^67.12.0",
-		"@atlaskit/icon": "^23.3.0",
+		"@atlaskit/icon": "^23.4.0",
 		"@atlaskit/icon-object": "^6.9.0",
 		"@atlaskit/link-datasource": "^3.15.0",
 		"@atlaskit/link-picker": "^1.47.0",
@@ -141,7 +141,7 @@
 		"@atlaskit/media-picker": "^67.0.0",
 		"@atlaskit/media-ui": "^27.3.0",
 		"@atlaskit/media-viewer": "49.6.1",
-		"@atlaskit/mention": "^23.7.0",
+		"@atlaskit/mention": "^23.8.0",
 		"@atlaskit/menu": "^2.13.0",
 		"@atlaskit/onboarding": "^12.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
@@ -149,12 +149,12 @@
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/profilecard": "^21.1.0",
 		"@atlaskit/section-message": "^6.8.0",
-		"@atlaskit/smart-card": "^34.1.0",
+		"@atlaskit/smart-card": "^34.2.0",
 		"@atlaskit/smart-user-picker": "^6.11.0",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/task-decision": "^17.11.0",
 		"@atlaskit/textfield": "^6.7.0",
-		"@atlaskit/tmp-editor-statsig": "^2.34.0",
+		"@atlaskit/tmp-editor-statsig": "^2.35.0",
 		"@atlaskit/tokens": "^3.0.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@atlaskit/width-detector": "^4.3.0",