@atlaskit/editor-plugin-collab-edit 7.1.3 → 7.1.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 7.1.5
+
+### Patch Changes
+
+- [`a05464ea42678`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a05464ea42678) -
+  EDITOR-2791 bump adf-schema
+- Updated dependencies
+
+## 7.1.4
+
+### Patch Changes
+
+- [`b9fcf9966a0a4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b9fcf9966a0a4) -
+  Treat BatchAttrsStep as not organic when only localIds are being changed
+
 ## 7.1.3
 
 ### Patch Changes

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

@@ -5,7 +5,6 @@ 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) {
@@ -41,11 +40,7 @@ function mergeUnconfirmedSteps(steps, api) {
       // As we want to wait until all the transactions have been pushed through
       var origin = lastStep.origin;
       if (mergedStep && inverted) {
-        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);
-        }
+        acc[acc.length - 1] = new _prosemirrorCollab.Rebaseable(mergedStep, inverted, origin instanceof _state.Transaction ? origin.setMeta('isOffline', origin.getMeta('isOffline') === true || isOffline) : origin);
         return acc;
       }
     }

package/dist/cjs/pm-plugins/track-steps.js

@@ -8,7 +8,6 @@ exports.track = exports.task = exports.sanitizeStep = exports.groupSteps = void
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _trackStepMetrics = require("./track-step-metrics");
@@ -177,14 +176,12 @@ var track = exports.track = function track(_ref3) {
     endedAt: endedAt,
     steps: steps
   });
-  if ((0, _platformFeatureFlags.fg)('platform_enable_ncs_step_metrics')) {
-    (0, _trackStepMetrics.updateNcsSessionStepMetrics)({
-      api: api,
-      steps: (0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(function (step) {
-        return !(step instanceof _steps.AnalyticsStep);
-      }) : newSteps
-    });
-  }
+  (0, _trackStepMetrics.updateNcsSessionStepMetrics)({
+    api: api,
+    steps: (0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(function (step) {
+      return !(step instanceof _steps.AnalyticsStep);
+    }) : newSteps
+  });
   scheduler.postTask(function () {
     task(stepsSentCache, onTrackDataProcessed);
   }, {

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

@@ -17,6 +17,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var findPointers = exports.findPointers = function findPointers(id, decorations) {
   return decorations.find().reduce(function (arr, deco) {
     return deco.spec.pointer.presenceId === id ? arr.concat(deco) : arr;
@@ -216,6 +217,16 @@ var isOrganicChange = exports.isOrganicChange = function isOrganicChange(tr) {
       return false;
     }
 
+    // editor-plugin-local-id uses BatchAttrStep to set the localId attribute
+    if (step instanceof _steps.BatchAttrsStep && (0, _platformFeatureFlags.fg)('platform_editor_inorganic_batchattrsstep_localid')) {
+      var _allAttributes = step.data.map(function (data) {
+        return Object.keys(data.attrs);
+      }).flat();
+      return _allAttributes.some(function (attr) {
+        return attr !== 'localId';
+      });
+    }
+
     // If a step is not an instance of SetAttrsStep, it is considered organic
     if (!(step instanceof _steps.SetAttrsStep)) {
       return true;

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

@@ -1,5 +1,4 @@
 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 => {
@@ -35,11 +34,7 @@ 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) {
-        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);
-        }
+        acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', origin.getMeta('isOffline') === true || isOffline) : origin);
         return acc;
       }
     }

package/dist/es2019/pm-plugins/track-steps.js

@@ -1,6 +1,5 @@
 import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateNcsSessionStepMetrics } from './track-step-metrics';
@@ -155,12 +154,10 @@ export const track = ({
     endedAt,
     steps
   });
-  if (fg('platform_enable_ncs_step_metrics')) {
-    updateNcsSessionStepMetrics({
-      api,
-      steps: editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(step => !(step instanceof AnalyticsStep)) : newSteps
-    });
-  }
+  updateNcsSessionStepMetrics({
+    api,
+    steps: editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(step => !(step instanceof AnalyticsStep)) : newSteps
+  });
   scheduler.postTask(() => {
     task(stepsSentCache, onTrackDataProcessed);
   }, {

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

@@ -1,4 +1,4 @@
-import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { AnalyticsStep, BatchAttrsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { TELEPOINTER_DATA_SESSION_ID_ATTR, TELEPOINTER_PULSE_DURING_TR_CLASS, TELEPOINTER_PULSE_DURING_TR_DURATION_MS } from '@atlaskit/editor-common/collab';
 import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
@@ -7,6 +7,7 @@ import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemir
 import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { getParticipantColor } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const findPointers = (id, decorations) => decorations.find().reduce((arr, deco) => deco.spec.pointer.presenceId === id ? arr.concat(deco) : arr, []);
 function style(options) {
   const color = options && options.color || 'black';
@@ -204,6 +205,12 @@ export const isOrganicChange = tr => {
       return false;
     }
 
+    // editor-plugin-local-id uses BatchAttrStep to set the localId attribute
+    if (step instanceof BatchAttrsStep && fg('platform_editor_inorganic_batchattrsstep_localid')) {
+      const allAttributes = step.data.map(data => Object.keys(data.attrs)).flat();
+      return allAttributes.some(attr => attr !== 'localId');
+    }
+
     // If a step is not an instance of SetAttrsStep, it is considered organic
     if (!(step instanceof SetAttrsStep)) {
       return true;

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

@@ -1,5 +1,4 @@
 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) {
@@ -35,11 +34,7 @@ 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) {
-        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);
-        }
+        acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', origin.getMeta('isOffline') === true || isOffline) : origin);
         return acc;
       }
     }

package/dist/esm/pm-plugins/track-steps.js

@@ -4,7 +4,6 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { updateNcsSessionStepMetrics } from './track-step-metrics';
@@ -170,14 +169,12 @@ export var track = function track(_ref3) {
     endedAt: endedAt,
     steps: steps
   });
-  if (fg('platform_enable_ncs_step_metrics')) {
-    updateNcsSessionStepMetrics({
-      api: api,
-      steps: editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(function (step) {
-        return !(step instanceof AnalyticsStep);
-      }) : newSteps
-    });
-  }
+  updateNcsSessionStepMetrics({
+    api: api,
+    steps: editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? newSteps.filter(function (step) {
+      return !(step instanceof AnalyticsStep);
+    }) : newSteps
+  });
   scheduler.postTask(function () {
     task(stepsSentCache, onTrackDataProcessed);
   }, {

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

@@ -1,5 +1,5 @@
 import _typeof from "@babel/runtime/helpers/typeof";
-import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { AnalyticsStep, BatchAttrsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { TELEPOINTER_DATA_SESSION_ID_ATTR, TELEPOINTER_PULSE_DURING_TR_CLASS, TELEPOINTER_PULSE_DURING_TR_DURATION_MS } from '@atlaskit/editor-common/collab';
 import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
@@ -8,6 +8,7 @@ import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemir
 import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { getParticipantColor } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var findPointers = function findPointers(id, decorations) {
   return decorations.find().reduce(function (arr, deco) {
     return deco.spec.pointer.presenceId === id ? arr.concat(deco) : arr;
@@ -208,6 +209,16 @@ export var isOrganicChange = function isOrganicChange(tr) {
       return false;
     }
 
+    // editor-plugin-local-id uses BatchAttrStep to set the localId attribute
+    if (step instanceof BatchAttrsStep && fg('platform_editor_inorganic_batchattrsstep_localid')) {
+      var _allAttributes = step.data.map(function (data) {
+        return Object.keys(data.attrs);
+      }).flat();
+      return _allAttributes.some(function (attr) {
+        return attr !== 'localId';
+      });
+    }
+
     // If a step is not an instance of SetAttrsStep, it is considered organic
     if (!(step instanceof SetAttrsStep)) {
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "7.1.3",
+	"version": "7.1.5",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,7 +27,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.3.2",
+		"@atlaskit/adf-schema": "^51.4.0",
 		"@atlaskit/custom-steps": "^0.16.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
@@ -35,16 +35,16 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^5.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-shared-styles": "^3.8.0",
+		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/frontend-utilities": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.22.0",
-		"@atlaskit/tmp-editor-statsig": "^13.18.0",
+		"@atlaskit/tmp-editor-statsig": "^13.38.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.18.0",
+		"@atlaskit/editor-common": "^110.32.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -97,13 +97,10 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_enable_ncs_step_metrics": {
-			"type": "boolean"
-		},
-		"platform_editor_offline_editing_resync_flicker_fix": {
+		"aifc_create_enabled": {
 			"type": "boolean"
 		},
-		"aifc_create_enabled": {
+		"platform_editor_inorganic_batchattrsstep_localid": {
 			"type": "boolean"
 		}
 	}