@atlaskit/editor-plugin-collab-edit 1.11.2 → 1.13.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 1.13.0
+
+### Minor Changes
+
+- [#128347](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128347)
+  [`e33566cebd5d1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e33566cebd5d1) -
+  [ED-24175] bump @atlaskit/adf-schema to 40.8.1 and @atlassian/adf-schema-json to 1.22.0 to
+  promotecodeblocks & media in quotes, and nested expands in expands to full schema, and allow
+  quotes in panels and decisions in lists in stage0 schema, and a validator spec change
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.12.0
+
+### Minor Changes
+
+- [#127757](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/127757)
+  [`7ebfdd4e7821d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7ebfdd4e7821d) -
+  Added logic to track the timestamp of when last organic change happened
+
 ## 1.11.2
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -11,12 +11,14 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _analytics2 = require("./analytics");
 var _sendTransaction = require("./events/send-transaction");
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/main/plugin-key");
 var _nativeCollabProviderPlugin = require("./pm-plugins/native-collab-provider-plugin");
+var _trackLastOrganicChange = require("./pm-plugins/track-last-organic-change");
 var _trackNcsInitialization = require("./pm-plugins/track-ncs-initialization");
 var _trackSteps = require("./track-steps");
 var _utils = require("./utils");
@@ -109,7 +111,8 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
           initialised: {
             collabInitialisedAt: null,
             firstChangeAfterInitAt: null,
-            firstContentBodyChangeAfterInitAt: null
+            firstContentBodyChangeAfterInitAt: null,
+            lastOrganicChangeAt: null
           },
           activeParticipants: undefined,
           sessionId: undefined
@@ -117,13 +120,15 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
       }
       var collabPluginState = _pluginKey.pluginKey.getState(state);
       var metadata = _trackNcsInitialization.trackNCSInitializationPluginKey.getState(state);
+      var lastOrganicChangeState = _trackLastOrganicChange.trackLastOrganicChangePluginKey.getState(state);
       return {
         activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
         sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
         initialised: {
           collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
           firstChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstChangeAfterInitAt) || null,
-          firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null
+          firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null,
+          lastOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastOrganicChangeAt) || null
         }
       };
     },
@@ -141,7 +146,7 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         useNativePlugin = _ref5$useNativePlugin === void 0 ? false : _ref5$useNativePlugin,
         _ref5$userId = _ref5.userId,
         userId = _ref5$userId === void 0 ? null : _ref5$userId;
-      return [].concat((0, _toConsumableArray2.default)(useNativePlugin ? [{
+      var plugins = [].concat((0, _toConsumableArray2.default)(useNativePlugin ? [{
         name: 'pmCollab',
         plugin: function plugin() {
           return (0, _prosemirrorCollab.collab)({
@@ -166,6 +171,13 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         name: 'collabTrackNCSInitializationPlugin',
         plugin: _trackNcsInitialization.createPlugin
       }]);
+      if ((0, _platformFeatureFlags.fg)('platform_editor_last_organic_change')) {
+        plugins.push({
+          name: 'collabTrackLastOrganicChangePlugin',
+          plugin: _trackLastOrganicChange.createPlugin
+        });
+      }
+      return plugins;
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {
       var _api$analytics, _api$editorViewMode, _options$useNativePlu;

package/dist/cjs/pm-plugins/main/plugin-state.js

@@ -18,13 +18,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _collab = require("@atlaskit/editor-common/collab");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _participants = require("../../participants");
 var _utils2 = require("../../utils");
-var isReplaceStep = function isReplaceStep(step) {
-  return step instanceof _transform.ReplaceStep;
-};
 /**
  * Returns position where it's possible to place a decoration.
  */
@@ -149,7 +145,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
             // Reapplies decorators those got removed by the state change
             onRemove: function onRemove(spec) {
               if (spec.pointer && spec.pointer.sessionId && spec.key === "telepointer-".concat(spec.pointer.sessionId)) {
-                var step = tr.steps.filter(isReplaceStep)[0];
+                var step = tr.steps.filter(_utils2.isReplaceStep)[0];
                 if (step) {
                   var _sessionId = spec.pointer.sessionId;
                   var _ref = step,
@@ -167,7 +163,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
 
         // Remove any selection decoration within the change range,
         // takes care of the issue when after pasting we end up with a dead selection
-        tr.steps.filter(isReplaceStep).forEach(function (s) {
+        tr.steps.filter(_utils2.isReplaceStep).forEach(function (s) {
           var _ref2 = s,
             from = _ref2.from,
             to = _ref2.to;

package/dist/cjs/pm-plugins/track-last-organic-change.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.trackLastOrganicChangePluginKey = exports.createPlugin = void 0;
+var _collab = require("@atlaskit/editor-common/collab");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("../utils");
+var trackLastOrganicChangePluginKey = exports.trackLastOrganicChangePluginKey = new _state.PluginKey('collabTrackLastOrganicChangePlugin');
+var createPlugin = exports.createPlugin = function createPlugin() {
+  return new _safePlugin.SafePlugin({
+    key: trackLastOrganicChangePluginKey,
+    state: {
+      init: function init() {
+        return {
+          lastOrganicChangeAt: null
+        };
+      },
+      apply: function apply(transaction, prevPluginState) {
+        var isRemote = (0, _utils.originalTransactionHasMeta)(transaction, 'isRemote');
+        var isDocumentReplaceFromRemote = isRemote && (0, _utils.originalTransactionHasMeta)(transaction, 'replaceDocument');
+        if (isDocumentReplaceFromRemote) {
+          return prevPluginState;
+        }
+        if (isRemote || (0, _collab.isDirtyTransaction)(transaction)) {
+          return prevPluginState;
+        }
+        if ((0, _utils.isOrganicChange)(transaction)) {
+          return {
+            lastOrganicChangeAt: Date.now()
+          };
+        }
+        return prevPluginState;
+      }
+    }
+  });
+};

package/dist/cjs/pm-plugins/track-ncs-initialization.js

@@ -10,18 +10,8 @@ var _collab = require("@atlaskit/editor-common/collab");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _utils = require("../utils");
 var trackNCSInitializationPluginKey = exports.trackNCSInitializationPluginKey = new _state.PluginKey('collabTrackNCSInitializationPlugin');
-var originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
-  var hasMetaTag = Boolean(transaction.getMeta(metaTag));
-  if (hasMetaTag) {
-    return true;
-  }
-  var appendedTransaction = transaction.getMeta('appendedTransaction');
-  if (appendedTransaction instanceof _state.Transaction) {
-    return originalTransactionHasMeta(appendedTransaction, metaTag);
-  }
-  return false;
-};
 var createPlugin = exports.createPlugin = function createPlugin() {
   return new _safePlugin.SafePlugin({
     key: trackNCSInitializationPluginKey,
@@ -45,8 +35,8 @@ var createPlugin = exports.createPlugin = function createPlugin() {
         if (!shouldCheckDocument) {
           return prevPluginState;
         }
-        var isRemote = originalTransactionHasMeta(transaction, 'isRemote');
-        var isDocumentReplaceFromRemote = isRemote && originalTransactionHasMeta(transaction, 'replaceDocument');
+        var isRemote = (0, _utils.originalTransactionHasMeta)(transaction, 'isRemote');
+        var isDocumentReplaceFromRemote = isRemote && (0, _utils.originalTransactionHasMeta)(transaction, 'replaceDocument');
         if (isDocumentReplaceFromRemote) {
           return prevPluginState;
         }

package/dist/cjs/utils.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.findPointers = exports.createTelepointers = void 0;
 exports.getAvatarColor = getAvatarColor;
-exports.scrollToCollabCursor = exports.replaceDocument = exports.getPositionOfTelepointer = void 0;
+exports.scrollToCollabCursor = exports.replaceDocument = exports.originalTransactionHasMeta = exports.isReplaceStep = exports.isOrganicChange = exports.getPositionOfTelepointer = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _consts = require("@atlaskit/editor-shared-styles/consts");
 var findPointers = exports.findPointers = function findPointers(id, decorations) {
@@ -140,4 +142,61 @@ var getPositionOfTelepointer = exports.getPositionOfTelepointer = function getPo
     }
   });
   return scrollPosition;
+};
+var isReplaceStep = exports.isReplaceStep = function isReplaceStep(step) {
+  return step instanceof _transform.ReplaceStep;
+};
+var originalTransactionHasMeta = exports.originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
+  var hasMetaTag = Boolean(transaction.getMeta(metaTag));
+  if (hasMetaTag) {
+    return true;
+  }
+  var appendedTransaction = transaction.getMeta('appendedTransaction');
+  if (appendedTransaction instanceof _state.Transaction) {
+    return originalTransactionHasMeta(appendedTransaction, metaTag);
+  }
+  return false;
+};
+
+/**
+ * This list contains step attributes that do not result from a user action.
+ * All steps that contain ONLY the blocked attribute are considered automated steps
+ * and should not be recognised as organic change.
+ *
+ * `attr_colwidth` is an exception to above explanation. Resizing the column
+ * currently creates too many steps and is therefore also on this list.
+ *
+ * Steps analycs dashboard: https://atlassian-discover.cloud.databricks.com/dashboardsv3/01ef4d3c8aa916c8b0cb5332a9f37caf/published?o=4482001201517624
+ */
+var blockedAttrsList = ['__contextId', 'localId', '__autoSize', 'attr_colwidth'];
+
+/**
+ * Takes the transaction and editor state and checks if the transaction is considered organic change
+ * @param tr Transaction
+ * @returns boolean
+ */
+var isOrganicChange = exports.isOrganicChange = function isOrganicChange(tr) {
+  // If document has not been marked as `docChanged` by PM, skip the rest of the logic
+  if (!tr.docChanged) {
+    return false;
+  }
+  return tr.steps.some(function (step) {
+    // If a step is an instance of AnalyticsStep, it is not considered organic
+    if (step instanceof _steps.AnalyticsStep) {
+      return false;
+    }
+    // If a step is not an instance of SetAttrsStep, it is considered organic
+    if (!(step instanceof _steps.SetAttrsStep)) {
+      return true;
+    }
+    var allAttributes = Object.keys(step.attrs);
+    // If a step is an instance of SetAttrsStep, it checks if the attributes in the step
+    // are not in the `blockedAttributes`. If one of the attributes not on the list, it considers the change
+    // organic but only if the entire document is not equal to the previous state.
+    return allAttributes.some(function (attr) {
+      if (!blockedAttrsList.includes(attr)) {
+        return true;
+      }
+    }) && !tr.doc.eq(tr.before);
+  });
 };

package/dist/es2019/plugin.js

@@ -1,11 +1,13 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { collab } from '@atlaskit/prosemirror-collab';
 import { addSynchronyErrorAnalytics } from './analytics';
 import { sendTransaction } from './events/send-transaction';
 import { createPlugin } from './pm-plugins/main';
 import { pluginKey as mainPluginKey } from './pm-plugins/main/plugin-key';
 import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-plugin';
+import { createPlugin as createLastOrganicChangePlugin, trackLastOrganicChangePluginKey } from './pm-plugins/track-last-organic-change';
 import { createPlugin as createTrackNCSInitializationPlugin, trackNCSInitializationPluginKey } from './pm-plugins/track-ncs-initialization';
 import { track } from './track-steps';
 import { getAvatarColor } from './utils';
@@ -70,7 +72,8 @@ export const collabEditPlugin = ({
           initialised: {
             collabInitialisedAt: null,
             firstChangeAfterInitAt: null,
-            firstContentBodyChangeAfterInitAt: null
+            firstContentBodyChangeAfterInitAt: null,
+            lastOrganicChangeAt: null
           },
           activeParticipants: undefined,
           sessionId: undefined
@@ -78,13 +81,15 @@ export const collabEditPlugin = ({
       }
       const collabPluginState = mainPluginKey.getState(state);
       const metadata = trackNCSInitializationPluginKey.getState(state);
+      const lastOrganicChangeState = trackLastOrganicChangePluginKey.getState(state);
       return {
         activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
         sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
         initialised: {
           collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
           firstChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstChangeAfterInitAt) || null,
-          firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null
+          firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null,
+          lastOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastOrganicChangeAt) || null
         }
       };
     },
@@ -99,7 +104,7 @@ export const collabEditPlugin = ({
         useNativePlugin = false,
         userId = null
       } = options || {};
-      return [...(useNativePlugin ? [{
+      const plugins = [...(useNativePlugin ? [{
         name: 'pmCollab',
         plugin: () => collab({
           clientID: userId
@@ -121,6 +126,13 @@ export const collabEditPlugin = ({
         name: 'collabTrackNCSInitializationPlugin',
         plugin: createTrackNCSInitializationPlugin
       }];
+      if (fg('platform_editor_last_organic_change')) {
+        plugins.push({
+          name: 'collabTrackLastOrganicChangePlugin',
+          plugin: createLastOrganicChangePlugin
+        });
+      }
+      return plugins;
     },
     onEditorViewStateUpdated(props) {
       var _api$analytics, _api$editorViewMode, _api$editorViewMode$s, _options$useNativePlu;

package/dist/es2019/pm-plugins/main/plugin-state.js

@@ -2,11 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { TELEPOINTER_DIM_CLASS } from '@atlaskit/editor-common/collab';
 import { browser } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { Participants } from '../../participants';
-import { createTelepointers, findPointers, getPositionOfTelepointer } from '../../utils';
-const isReplaceStep = step => step instanceof ReplaceStep;
+import { createTelepointers, findPointers, getPositionOfTelepointer, isReplaceStep } from '../../utils';
 export { TELEPOINTER_DIM_CLASS };
 
 /**

package/dist/es2019/pm-plugins/track-last-organic-change.js

@@ -0,0 +1,33 @@
+import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { isOrganicChange, originalTransactionHasMeta } from '../utils';
+export const trackLastOrganicChangePluginKey = new PluginKey('collabTrackLastOrganicChangePlugin');
+export const createPlugin = () => {
+  return new SafePlugin({
+    key: trackLastOrganicChangePluginKey,
+    state: {
+      init() {
+        return {
+          lastOrganicChangeAt: null
+        };
+      },
+      apply(transaction, prevPluginState) {
+        const isRemote = originalTransactionHasMeta(transaction, 'isRemote');
+        const isDocumentReplaceFromRemote = isRemote && originalTransactionHasMeta(transaction, 'replaceDocument');
+        if (isDocumentReplaceFromRemote) {
+          return prevPluginState;
+        }
+        if (isRemote || isDirtyTransaction(transaction)) {
+          return prevPluginState;
+        }
+        if (isOrganicChange(transaction)) {
+          return {
+            lastOrganicChangeAt: Date.now()
+          };
+        }
+        return prevPluginState;
+      }
+    }
+  });
+};

package/dist/es2019/pm-plugins/track-ncs-initialization.js

@@ -1,19 +1,9 @@
 import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { originalTransactionHasMeta } from '../utils';
 export const trackNCSInitializationPluginKey = new PluginKey('collabTrackNCSInitializationPlugin');
-const originalTransactionHasMeta = (transaction, metaTag) => {
-  const hasMetaTag = Boolean(transaction.getMeta(metaTag));
-  if (hasMetaTag) {
-    return true;
-  }
-  const appendedTransaction = transaction.getMeta('appendedTransaction');
-  if (appendedTransaction instanceof Transaction) {
-    return originalTransactionHasMeta(appendedTransaction, metaTag);
-  }
-  return false;
-};
 export const createPlugin = () => {
   return new SafePlugin({
     key: trackNCSInitializationPluginKey,

package/dist/es2019/utils.js

@@ -1,6 +1,9 @@
+import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { avatarColors } from '@atlaskit/editor-shared-styles/consts';
 export const findPointers = (id, decorations) => decorations.find().reduce((arr, deco) => deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr, []);
@@ -128,4 +131,59 @@ export const getPositionOfTelepointer = (sessionId, decorationSet) => {
     }
   });
   return scrollPosition;
+};
+export const isReplaceStep = step => step instanceof ReplaceStep;
+export const originalTransactionHasMeta = (transaction, metaTag) => {
+  const hasMetaTag = Boolean(transaction.getMeta(metaTag));
+  if (hasMetaTag) {
+    return true;
+  }
+  const appendedTransaction = transaction.getMeta('appendedTransaction');
+  if (appendedTransaction instanceof Transaction) {
+    return originalTransactionHasMeta(appendedTransaction, metaTag);
+  }
+  return false;
+};
+
+/**
+ * This list contains step attributes that do not result from a user action.
+ * All steps that contain ONLY the blocked attribute are considered automated steps
+ * and should not be recognised as organic change.
+ *
+ * `attr_colwidth` is an exception to above explanation. Resizing the column
+ * currently creates too many steps and is therefore also on this list.
+ *
+ * Steps analycs dashboard: https://atlassian-discover.cloud.databricks.com/dashboardsv3/01ef4d3c8aa916c8b0cb5332a9f37caf/published?o=4482001201517624
+ */
+const blockedAttrsList = ['__contextId', 'localId', '__autoSize', 'attr_colwidth'];
+
+/**
+ * Takes the transaction and editor state and checks if the transaction is considered organic change
+ * @param tr Transaction
+ * @returns boolean
+ */
+export const isOrganicChange = tr => {
+  // If document has not been marked as `docChanged` by PM, skip the rest of the logic
+  if (!tr.docChanged) {
+    return false;
+  }
+  return tr.steps.some(step => {
+    // If a step is an instance of AnalyticsStep, it is not considered organic
+    if (step instanceof AnalyticsStep) {
+      return false;
+    }
+    // If a step is not an instance of SetAttrsStep, it is considered organic
+    if (!(step instanceof SetAttrsStep)) {
+      return true;
+    }
+    const allAttributes = Object.keys(step.attrs);
+    // If a step is an instance of SetAttrsStep, it checks if the attributes in the step
+    // are not in the `blockedAttributes`. If one of the attributes not on the list, it considers the change
+    // organic but only if the entire document is not equal to the previous state.
+    return allAttributes.some(attr => {
+      if (!blockedAttrsList.includes(attr)) {
+        return true;
+      }
+    }) && !tr.doc.eq(tr.before);
+  });
 };

package/dist/esm/plugin.js

@@ -6,12 +6,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { collab } from '@atlaskit/prosemirror-collab';
 import { addSynchronyErrorAnalytics } from './analytics';
 import { sendTransaction } from './events/send-transaction';
 import { createPlugin } from './pm-plugins/main';
 import { pluginKey as mainPluginKey } from './pm-plugins/main/plugin-key';
 import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-plugin';
+import { createPlugin as createLastOrganicChangePlugin, trackLastOrganicChangePluginKey } from './pm-plugins/track-last-organic-change';
 import { createPlugin as createTrackNCSInitializationPlugin, trackNCSInitializationPluginKey } from './pm-plugins/track-ncs-initialization';
 import { track } from './track-steps';
 import { getAvatarColor } from './utils';
@@ -102,7 +104,8 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
           initialised: {
             collabInitialisedAt: null,
             firstChangeAfterInitAt: null,
-            firstContentBodyChangeAfterInitAt: null
+            firstContentBodyChangeAfterInitAt: null,
+            lastOrganicChangeAt: null
           },
           activeParticipants: undefined,
           sessionId: undefined
@@ -110,13 +113,15 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
       }
       var collabPluginState = mainPluginKey.getState(state);
       var metadata = trackNCSInitializationPluginKey.getState(state);
+      var lastOrganicChangeState = trackLastOrganicChangePluginKey.getState(state);
       return {
         activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
         sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
         initialised: {
           collabInitialisedAt: (metadata === null || metadata === void 0 ? void 0 : metadata.collabInitialisedAt) || null,
           firstChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstChangeAfterInitAt) || null,
-          firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null
+          firstContentBodyChangeAfterInitAt: (metadata === null || metadata === void 0 ? void 0 : metadata.firstContentBodyChangeAfterInitAt) || null,
+          lastOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastOrganicChangeAt) || null
         }
       };
     },
@@ -134,7 +139,7 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         useNativePlugin = _ref5$useNativePlugin === void 0 ? false : _ref5$useNativePlugin,
         _ref5$userId = _ref5.userId,
         userId = _ref5$userId === void 0 ? null : _ref5$userId;
-      return [].concat(_toConsumableArray(useNativePlugin ? [{
+      var plugins = [].concat(_toConsumableArray(useNativePlugin ? [{
         name: 'pmCollab',
         plugin: function plugin() {
           return collab({
@@ -159,6 +164,13 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         name: 'collabTrackNCSInitializationPlugin',
         plugin: createTrackNCSInitializationPlugin
       }]);
+      if (fg('platform_editor_last_organic_change')) {
+        plugins.push({
+          name: 'collabTrackLastOrganicChangePlugin',
+          plugin: createLastOrganicChangePlugin
+        });
+      }
+      return plugins;
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {
       var _api$analytics, _api$editorViewMode, _options$useNativePlu;

package/dist/esm/pm-plugins/main/plugin-state.js

@@ -4,13 +4,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { TELEPOINTER_DIM_CLASS } from '@atlaskit/editor-common/collab';
 import { browser } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { Participants } from '../../participants';
-import { createTelepointers, findPointers, getPositionOfTelepointer } from '../../utils';
-var isReplaceStep = function isReplaceStep(step) {
-  return step instanceof ReplaceStep;
-};
+import { createTelepointers, findPointers, getPositionOfTelepointer, isReplaceStep } from '../../utils';
 export { TELEPOINTER_DIM_CLASS };
 
 /**

package/dist/esm/pm-plugins/track-last-organic-change.js

@@ -0,0 +1,33 @@
+import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { isOrganicChange, originalTransactionHasMeta } from '../utils';
+export var trackLastOrganicChangePluginKey = new PluginKey('collabTrackLastOrganicChangePlugin');
+export var createPlugin = function createPlugin() {
+  return new SafePlugin({
+    key: trackLastOrganicChangePluginKey,
+    state: {
+      init: function init() {
+        return {
+          lastOrganicChangeAt: null
+        };
+      },
+      apply: function apply(transaction, prevPluginState) {
+        var isRemote = originalTransactionHasMeta(transaction, 'isRemote');
+        var isDocumentReplaceFromRemote = isRemote && originalTransactionHasMeta(transaction, 'replaceDocument');
+        if (isDocumentReplaceFromRemote) {
+          return prevPluginState;
+        }
+        if (isRemote || isDirtyTransaction(transaction)) {
+          return prevPluginState;
+        }
+        if (isOrganicChange(transaction)) {
+          return {
+            lastOrganicChangeAt: Date.now()
+          };
+        }
+        return prevPluginState;
+      }
+    }
+  });
+};

package/dist/esm/pm-plugins/track-ncs-initialization.js

@@ -1,20 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { isDirtyTransaction } from '@atlaskit/editor-common/collab';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { originalTransactionHasMeta } from '../utils';
 export var trackNCSInitializationPluginKey = new PluginKey('collabTrackNCSInitializationPlugin');
-var originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
-  var hasMetaTag = Boolean(transaction.getMeta(metaTag));
-  if (hasMetaTag) {
-    return true;
-  }
-  var appendedTransaction = transaction.getMeta('appendedTransaction');
-  if (appendedTransaction instanceof Transaction) {
-    return originalTransactionHasMeta(appendedTransaction, metaTag);
-  }
-  return false;
-};
 export var createPlugin = function createPlugin() {
   return new SafePlugin({
     key: trackNCSInitializationPluginKey,

package/dist/esm/utils.js

@@ -1,7 +1,10 @@
 import _typeof from "@babel/runtime/helpers/typeof";
+import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { avatarColors } from '@atlaskit/editor-shared-styles/consts';
 export var findPointers = function findPointers(id, decorations) {
@@ -131,4 +134,61 @@ export var getPositionOfTelepointer = function getPositionOfTelepointer(sessionI
     }
   });
   return scrollPosition;
+};
+export var isReplaceStep = function isReplaceStep(step) {
+  return step instanceof ReplaceStep;
+};
+export var originalTransactionHasMeta = function originalTransactionHasMeta(transaction, metaTag) {
+  var hasMetaTag = Boolean(transaction.getMeta(metaTag));
+  if (hasMetaTag) {
+    return true;
+  }
+  var appendedTransaction = transaction.getMeta('appendedTransaction');
+  if (appendedTransaction instanceof Transaction) {
+    return originalTransactionHasMeta(appendedTransaction, metaTag);
+  }
+  return false;
+};
+
+/**
+ * This list contains step attributes that do not result from a user action.
+ * All steps that contain ONLY the blocked attribute are considered automated steps
+ * and should not be recognised as organic change.
+ *
+ * `attr_colwidth` is an exception to above explanation. Resizing the column
+ * currently creates too many steps and is therefore also on this list.
+ *
+ * Steps analycs dashboard: https://atlassian-discover.cloud.databricks.com/dashboardsv3/01ef4d3c8aa916c8b0cb5332a9f37caf/published?o=4482001201517624
+ */
+var blockedAttrsList = ['__contextId', 'localId', '__autoSize', 'attr_colwidth'];
+
+/**
+ * Takes the transaction and editor state and checks if the transaction is considered organic change
+ * @param tr Transaction
+ * @returns boolean
+ */
+export var isOrganicChange = function isOrganicChange(tr) {
+  // If document has not been marked as `docChanged` by PM, skip the rest of the logic
+  if (!tr.docChanged) {
+    return false;
+  }
+  return tr.steps.some(function (step) {
+    // If a step is an instance of AnalyticsStep, it is not considered organic
+    if (step instanceof AnalyticsStep) {
+      return false;
+    }
+    // If a step is not an instance of SetAttrsStep, it is considered organic
+    if (!(step instanceof SetAttrsStep)) {
+      return true;
+    }
+    var allAttributes = Object.keys(step.attrs);
+    // If a step is an instance of SetAttrsStep, it checks if the attributes in the step
+    // are not in the `blockedAttributes`. If one of the attributes not on the list, it considers the change
+    // organic but only if the entire document is not equal to the previous state.
+    return allAttributes.some(function (attr) {
+      if (!blockedAttrsList.includes(attr)) {
+        return true;
+      }
+    }) && !tr.doc.eq(tr.before);
+  });
 };

package/dist/types/pm-plugins/track-last-organic-change.d.ts

@@ -0,0 +1,5 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { LastOrganicChangeMetadata } from '../types';
+export declare const trackLastOrganicChangePluginKey: PluginKey<LastOrganicChangeMetadata>;
+export declare const createPlugin: () => SafePlugin<LastOrganicChangeMetadata>;

package/dist/types/types.d.ts

@@ -22,6 +22,9 @@ export type CollabInitializedMetadata = {
     firstChangeAfterInitAt: null | number;
     firstContentBodyChangeAfterInitAt: null | number;
 };
+export type LastOrganicChangeMetadata = {
+    lastOrganicChangeAt: null | number;
+};
 export type CollabEditPluginSharedState = {
     initialised: CollabInitializedMetadata;
     activeParticipants: ReadOnlyParticipants | undefined;

package/dist/types/utils.d.ts

@@ -1,6 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CollabEditOptions, CollabParticipant } from '@atlaskit/editor-common/collab';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { type EditorState, type ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Step } from '@atlaskit/editor-prosemirror/transform';
 import type { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 export declare const findPointers: (id: string, decorations: DecorationSet) => Decoration[];
@@ -9,6 +10,14 @@ export declare function getAvatarColor(str: string): {
     color: "var(--ds-icon-accent-lime)" | "var(--ds-icon-accent-red)" | "var(--ds-icon-accent-orange)" | "var(--ds-icon-accent-yellow)" | "var(--ds-icon-accent-green)" | "var(--ds-icon-accent-teal)" | "var(--ds-icon-accent-blue)" | "var(--ds-icon-accent-purple)" | "var(--ds-icon-accent-magenta)" | "var(--ds-icon-accent-gray)" | "var(--ds-background-accent-lime-bolder-hovered)" | "var(--ds-background-accent-red-bolder-hovered)" | "var(--ds-background-accent-orange-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-pressed)" | "var(--ds-background-accent-green-bolder-hovered)" | "var(--ds-background-accent-teal-bolder-hovered)" | "var(--ds-background-accent-blue-bolder-hovered)" | "var(--ds-background-accent-purple-bolder-hovered)" | "var(--ds-background-accent-magenta-bolder-hovered)" | "var(--ds-background-accent-gray-bolder-hovered)";
 };
 export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string) => Decoration[];
-export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => import("prosemirror-state").Transaction;
+export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => Transaction;
 export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
 export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;
+export declare const isReplaceStep: (step: Step) => boolean;
+export declare const originalTransactionHasMeta: (transaction: Transaction | ReadonlyTransaction, metaTag: string) => boolean;
+/**
+ * Takes the transaction and editor state and checks if the transaction is considered organic change
+ * @param tr Transaction
+ * @returns boolean
+ */
+export declare const isOrganicChange: (tr: ReadonlyTransaction) => boolean;

package/dist/types-ts4.5/pm-plugins/track-last-organic-change.d.ts

@@ -0,0 +1,5 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { LastOrganicChangeMetadata } from '../types';
+export declare const trackLastOrganicChangePluginKey: PluginKey<LastOrganicChangeMetadata>;
+export declare const createPlugin: () => SafePlugin<LastOrganicChangeMetadata>;

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

@@ -22,6 +22,9 @@ export type CollabInitializedMetadata = {
     firstChangeAfterInitAt: null | number;
     firstContentBodyChangeAfterInitAt: null | number;
 };
+export type LastOrganicChangeMetadata = {
+    lastOrganicChangeAt: null | number;
+};
 export type CollabEditPluginSharedState = {
     initialised: CollabInitializedMetadata;
     activeParticipants: ReadOnlyParticipants | undefined;

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

@@ -1,6 +1,7 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CollabEditOptions, CollabParticipant } from '@atlaskit/editor-common/collab';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { type EditorState, type ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Step } from '@atlaskit/editor-prosemirror/transform';
 import type { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 export declare const findPointers: (id: string, decorations: DecorationSet) => Decoration[];
@@ -9,6 +10,14 @@ export declare function getAvatarColor(str: string): {
     color: "var(--ds-icon-accent-lime)" | "var(--ds-icon-accent-red)" | "var(--ds-icon-accent-orange)" | "var(--ds-icon-accent-yellow)" | "var(--ds-icon-accent-green)" | "var(--ds-icon-accent-teal)" | "var(--ds-icon-accent-blue)" | "var(--ds-icon-accent-purple)" | "var(--ds-icon-accent-magenta)" | "var(--ds-icon-accent-gray)" | "var(--ds-background-accent-lime-bolder-hovered)" | "var(--ds-background-accent-red-bolder-hovered)" | "var(--ds-background-accent-orange-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-hovered)" | "var(--ds-background-accent-yellow-bolder-pressed)" | "var(--ds-background-accent-green-bolder-hovered)" | "var(--ds-background-accent-teal-bolder-hovered)" | "var(--ds-background-accent-blue-bolder-hovered)" | "var(--ds-background-accent-purple-bolder-hovered)" | "var(--ds-background-accent-magenta-bolder-hovered)" | "var(--ds-background-accent-gray-bolder-hovered)";
 };
 export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string) => Decoration[];
-export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => import("prosemirror-state").Transaction;
+export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean) => Transaction;
 export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
 export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;
+export declare const isReplaceStep: (step: Step) => boolean;
+export declare const originalTransactionHasMeta: (transaction: Transaction | ReadonlyTransaction, metaTag: string) => boolean;
+/**
+ * Takes the transaction and editor state and checks if the transaction is considered organic change
+ * @param tr Transaction
+ * @returns boolean
+ */
+export declare const isOrganicChange: (tr: ReadonlyTransaction) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "1.11.2",
+	"version": "1.13.0",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,16 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^40.3.0",
-		"@atlaskit/custom-steps": "^0.6.0",
-		"@atlaskit/editor-common": "^87.4.0",
-		"@atlaskit/editor-plugin-analytics": "1.6.2",
+		"@atlaskit/adf-schema": "^40.8.1",
+		"@atlaskit/custom-steps": "^0.7.0",
+		"@atlaskit/editor-common": "^87.6.0",
+		"@atlaskit/editor-plugin-analytics": "1.7.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/prosemirror-collab": "^0.8.0",
+		"@atlaskit/prosemirror-collab": "^0.9.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
@@ -51,11 +51,11 @@
 	"devDependencies": {
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
-		"@atlaskit/editor-plugin-mentions": "^2.2.0",
-		"@atlaskit/editor-plugin-text-formatting": "^1.12.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.6.0",
-		"@atlaskit/editor-plugin-unsupported-content": "^1.7.0",
-		"@atlaskit/editor-test-helpers": "^18.29.0",
+		"@atlaskit/editor-plugin-mentions": "^2.3.0",
+		"@atlaskit/editor-plugin-text-formatting": "^1.13.0",
+		"@atlaskit/editor-plugin-type-ahead": "^1.7.0",
+		"@atlaskit/editor-plugin-unsupported-content": "^1.8.0",
+		"@atlaskit/editor-test-helpers": "^18.30.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/synchrony-test-helpers": "^2.5.0",
 		"@atlaskit/util-data-test": "^17.9.0",
@@ -102,6 +102,9 @@
 	"platform-feature-flags": {
 		"platform.editor.no-telecursors-for-viewmode-users_hok8o": {
 			"type": "boolean"
+		},
+		"platform_editor_last_organic_change": {
+			"type": "boolean"
 		}
 	}
 }