npm - @atlaskit/editor-plugin-metrics - Versions diffs - 3.1.0 → 3.2.0 - Mend

@atlaskit/editor-plugin-metrics 3.1.0 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/CHANGELOG.md +21 -0
package/dist/cjs/metricsPlugin.js +48 -4
package/dist/cjs/pm-plugins/main.js +58 -23
package/dist/es2019/metricsPlugin.js +45 -3
package/dist/es2019/pm-plugins/main.js +59 -20
package/dist/esm/metricsPlugin.js +48 -4
package/dist/esm/pm-plugins/main.js +58 -23
package/dist/types/metricsPluginType.d.ts +12 -2
package/dist/types/pm-plugins/main.d.ts +1 -0
package/dist/types/pm-plugins/utils/get-node-changes.d.ts +1 -1
package/dist/types/pm-plugins/utils/is-non-text-undo.d.ts +1 -1
package/dist/types-ts4.5/metricsPluginType.d.ts +13 -2
package/dist/types-ts4.5/pm-plugins/main.d.ts +1 -0
package/dist/types-ts4.5/pm-plugins/utils/get-node-changes.d.ts +1 -1
package/dist/types-ts4.5/pm-plugins/utils/is-non-text-undo.d.ts +1 -1
package/package.json +5 -4

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-metrics
+## 3.2.0
+### Minor Changes
+- [#108974](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108974)
+  [`2ed04755a098e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2ed04755a098e) -
+  ED-26233 Start activity session in metrics plugin when user starts dragging nodes and opens
+  element browser
+### Patch Changes
+- Updated dependencies
+## 3.1.1
+### Patch Changes
+- [#112186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112186)
+  [`9462d8ca2405a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9462d8ca2405a) -
+  Bump adf-schema to 47.2.1
 ## 3.1.0
 ### Minor Changes

package/dist/cjs/metricsPlugin.js CHANGED Viewed

@@ -10,6 +10,7 @@ var _analytics = require("./pm-plugins/utils/analytics");
  * Metrics plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
  */
 var metricsPlugin = exports.metricsPlugin = function metricsPlugin(_ref) {
   var api = _ref.api;
   return {
@@ -23,24 +24,67 @@ var metricsPlugin = exports.metricsPlugin = function metricsPlugin(_ref) {
       }];
     },
     commands: {
-      stopActiveSession: function stopActiveSession() {
+      startActiveSessionTimer: function startActiveSessionTimer() {
         return function (_ref2) {
           var tr = _ref2.tr;
+          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+          if (!(pluginState !== null && pluginState !== void 0 && pluginState.intentToStartEditTime)) {
+            return tr;
+          }
+          return tr.setMeta(_main.metricsKey, {
+            shouldStartTimer: true,
+            shouldPersistActiveSession: false
+          });
+        };
+      },
+      stopActiveSession: function stopActiveSession() {
+        return function (_ref3) {
+          var tr = _ref3.tr;
           if (!api) {
             return tr;
           }
-          var newTr = tr;
           var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+          if (pluginState !== null && pluginState !== void 0 && pluginState.shouldPersistActiveSession) {
+            return tr;
+          }
           if (pluginState && pluginState.totalActionCount > 0 && pluginState.activeSessionTime > 0) {
             var payloadToSend = (0, _analytics.getAnalyticsPayload)({
               currentContent: tr.doc.content,
               pluginState: pluginState
             });
-            api === null || api === void 0 || api.analytics.actions.attachAnalyticsEvent(payloadToSend)(newTr);
+            api === null || api === void 0 || api.analytics.actions.attachAnalyticsEvent(payloadToSend)(tr);
           }
-          newTr.setMeta(_main.metricsKey, {
+          tr.setMeta(_main.metricsKey, {
             stopActiveSession: true
           });
+          return tr;
+        };
+      },
+      handleIntentToStartEdit: function handleIntentToStartEdit(_ref4) {
+        var newSelection = _ref4.newSelection,
+          _ref4$shouldStartTime = _ref4.shouldStartTimer,
+          shouldStartTimer = _ref4$shouldStartTime === void 0 ? true : _ref4$shouldStartTime,
+          shouldPersistActiveSession = _ref4.shouldPersistActiveSession;
+        return function (_ref5) {
+          var tr = _ref5.tr;
+          if (!api) {
+            return tr;
+          }
+          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+          if (!pluginState || pluginState.intentToStartEditTime) {
+            if (shouldPersistActiveSession !== (pluginState === null || pluginState === void 0 ? void 0 : pluginState.shouldPersistActiveSession)) {
+              return tr.setMeta(_main.metricsKey, {
+                shouldPersistActiveSession: shouldPersistActiveSession
+              });
+            }
+          }
+          var newTr = tr;
+          newTr.setMeta(_main.metricsKey, {
+            intentToStartEditTime: performance.now(),
+            shouldStartTimer: shouldStartTimer,
+            newSelection: newSelection,
+            shouldPersistActiveSession: shouldPersistActiveSession
+          });
           return newTr;
         };
       }

package/dist/cjs/pm-plugins/main.js CHANGED Viewed

@@ -46,33 +46,48 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
       },
       // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, oldState, newState) {
+        var _meta$shouldPersistAc;
+        if (tr.getMeta('isRemote') || tr.getMeta('replaceDocument')) {
+          return pluginState;
+        }
         var meta = tr.getMeta(metricsKey);
-        var intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        // If the active session is stopped, reset the plugin state, and set initialContent to new doc content
         if (meta && meta.stopActiveSession) {
           return _objectSpread(_objectSpread({}, initialPluginState), {}, {
             initialContent: newState.doc.content
           });
         }
+        var shouldPersistActiveSession = (_meta$shouldPersistAc = meta === null || meta === void 0 ? void 0 : meta.shouldPersistActiveSession) !== null && _meta$shouldPersistAc !== void 0 ? _meta$shouldPersistAc : pluginState.shouldPersistActiveSession;
+        var canIgnoreTr = function canIgnoreTr() {
+          return !tr.steps.every(function (e) {
+            return e instanceof _steps.AnalyticsStep;
+          });
+        };
+        var docChangedWithoutAnalytics = tr.docChanged && canIgnoreTr();
+        var intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        var now = performance.now();
         if (!intentToStartEditTime) {
-          if (tr.docChanged && !tr.getMeta('replaceDocument')) {
-            intentToStartEditTime = performance.now();
+          if (docChangedWithoutAnalytics || tr.storedMarksSet) {
+            intentToStartEditTime = now;
           } else {
-            return pluginState;
+            return _objectSpread({}, pluginState);
           }
         }
+        // Start active session timer if intentToStartEditTime is set and shouldStartTimer is true
+        // shouldPersistActiveSession is set to true when dragging block controls and when insert menu is open
+        // Timer should start when menu closes or dragging stops
+        if (intentToStartEditTime && meta !== null && meta !== void 0 && meta.shouldStartTimer && !pluginState.shouldPersistActiveSession) {
+          timer.startTimer();
+        }
         var undoCount = (0, _isNonTextUndo.isNonTextUndo)(tr) ? 1 : 0;
         var newActionTypeCount = pluginState.actionTypeCount ? _objectSpread(_objectSpread({}, pluginState.actionTypeCount), {}, {
           undoCount: pluginState.actionTypeCount.undoCount + undoCount
         }) : _objectSpread(_objectSpread({}, initialPluginState.actionTypeCount), {}, {
           undoCount: undoCount
         });
-        var canIgnoreTr = function canIgnoreTr() {
-          return !tr.steps.every(function (e) {
-            return e instanceof _steps.AnalyticsStep;
-          });
-        };
-        if (tr.docChanged && canIgnoreTr()) {
-          var now = performance.now();
+        if (docChangedWithoutAnalytics) {
           timer.startTimer();
           var actionTypeCount = pluginState.actionTypeCount,
             timeOfLastTextInput = pluginState.timeOfLastTextInput,
@@ -95,18 +110,44 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
             contentSizeChanged: pluginState.contentSizeChanged + (newState.doc.content.size - oldState.doc.content.size),
             actionTypeCount: _objectSpread(_objectSpread({}, newActionTypeCount), {}, {
               textInputCount: newTextInputCount
-            })
+            }),
+            intentToStartEditTime: intentToStartEditTime,
+            shouldPersistActiveSession: shouldPersistActiveSession
           });
           return newPluginState;
         }
         return _objectSpread(_objectSpread({}, pluginState), {}, {
           lastSelection: (meta === null || meta === void 0 ? void 0 : meta.newSelection) || pluginState.lastSelection,
           intentToStartEditTime: intentToStartEditTime,
-          actionTypeCount: newActionTypeCount
+          actionTypeCount: newActionTypeCount,
+          shouldPersistActiveSession: shouldPersistActiveSession
         });
       }
     },
     view: function view(_view) {
+      var _api$blockControls;
+      var handleIsDraggingChanged = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.onChange(function (_ref) {
+        var nextSharedState = _ref.nextSharedState,
+          prevSharedState = _ref.prevSharedState;
+        if (nextSharedState) {
+          api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
+            var tr = _ref2.tr;
+            if (!(prevSharedState !== null && prevSharedState !== void 0 && prevSharedState.isDragging) && nextSharedState.isDragging) {
+              api === null || api === void 0 || api.metrics.commands.handleIntentToStartEdit({
+                shouldStartTimer: false,
+                shouldPersistActiveSession: true
+              })({
+                tr: tr
+              });
+            } else if (prevSharedState !== null && prevSharedState !== void 0 && prevSharedState.isDragging && !nextSharedState.isDragging) {
+              api === null || api === void 0 || api.metrics.commands.startActiveSessionTimer()({
+                tr: tr
+              });
+            }
+            return tr;
+          });
+        }
+      });
       var fireAnalyticsEvent = function fireAnalyticsEvent() {
         var pluginState = metricsKey.getState(_view.state);
         if (!pluginState) {
@@ -133,6 +174,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
           fireAnalyticsEvent();
           timer.cleanupTimer();
           unbindBeforeUnload();
+          handleIsDraggingChanged === null || handleIsDraggingChanged === void 0 || handleIsDraggingChanged();
         }
       };
     },
@@ -140,19 +182,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
       handleDOMEvents: {
         click: function click(view) {
           var _pluginState$lastSele, _pluginState$lastSele2;
-          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
-          if (!pluginState || pluginState.intentToStartEditTime) {
-            return false;
-          }
           var newSelection = view.state.tr.selection;
-          var newTr = view.state.tr;
+          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
           if ((pluginState === null || pluginState === void 0 || (_pluginState$lastSele = pluginState.lastSelection) === null || _pluginState$lastSele === void 0 ? void 0 : _pluginState$lastSele.from) !== newSelection.from && (pluginState === null || pluginState === void 0 || (_pluginState$lastSele2 = pluginState.lastSelection) === null || _pluginState$lastSele2 === void 0 ? void 0 : _pluginState$lastSele2.to) !== newSelection.to) {
-            newTr.setMeta(metricsKey, {
-              intentToStartEditTime: performance.now(),
+            api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.metrics.commands.handleIntentToStartEdit({
               newSelection: newSelection
-            });
-            view.dispatch(newTr);
-            timer.startTimer();
+            }));
           }
           return false;
         }

package/dist/es2019/metricsPlugin.js CHANGED Viewed

@@ -4,6 +4,7 @@ import { getAnalyticsPayload } from './pm-plugins/utils/analytics';
  * Metrics plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
  */
 export const metricsPlugin = ({
   api
 }) => ({
@@ -15,24 +16,65 @@ export const metricsPlugin = ({
     }];
   },
   commands: {
+    startActiveSessionTimer: () => ({
+      tr
+    }) => {
+      const pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+      if (!(pluginState !== null && pluginState !== void 0 && pluginState.intentToStartEditTime)) {
+        return tr;
+      }
+      return tr.setMeta(metricsKey, {
+        shouldStartTimer: true,
+        shouldPersistActiveSession: false
+      });
+    },
     stopActiveSession: () => ({
       tr
     }) => {
       if (!api) {
         return tr;
       }
-      const newTr = tr;
       const pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+      if (pluginState !== null && pluginState !== void 0 && pluginState.shouldPersistActiveSession) {
+        return tr;
+      }
       if (pluginState && pluginState.totalActionCount > 0 && pluginState.activeSessionTime > 0) {
         const payloadToSend = getAnalyticsPayload({
           currentContent: tr.doc.content,
           pluginState
         });
-        api === null || api === void 0 ? void 0 : api.analytics.actions.attachAnalyticsEvent(payloadToSend)(newTr);
+        api === null || api === void 0 ? void 0 : api.analytics.actions.attachAnalyticsEvent(payloadToSend)(tr);
       }
-      newTr.setMeta(metricsKey, {
+      tr.setMeta(metricsKey, {
         stopActiveSession: true
       });
+      return tr;
+    },
+    handleIntentToStartEdit: ({
+      newSelection,
+      shouldStartTimer = true,
+      shouldPersistActiveSession
+    }) => ({
+      tr
+    }) => {
+      if (!api) {
+        return tr;
+      }
+      const pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+      if (!pluginState || pluginState.intentToStartEditTime) {
+        if (shouldPersistActiveSession !== (pluginState === null || pluginState === void 0 ? void 0 : pluginState.shouldPersistActiveSession)) {
+          return tr.setMeta(metricsKey, {
+            shouldPersistActiveSession: shouldPersistActiveSession
+          });
+        }
+      }
+      const newTr = tr;
+      newTr.setMeta(metricsKey, {
+        intentToStartEditTime: performance.now(),
+        shouldStartTimer,
+        newSelection,
+        shouldPersistActiveSession
+      });
       return newTr;
     }
   },

package/dist/es2019/pm-plugins/main.js CHANGED Viewed

@@ -37,21 +37,40 @@ export const createPlugin = api => {
       },
       // eslint-disable-next-line @typescript-eslint/max-params
       apply(tr, pluginState, oldState, newState) {
+        var _meta$shouldPersistAc;
+        if (tr.getMeta('isRemote') || tr.getMeta('replaceDocument')) {
+          return pluginState;
+        }
         const meta = tr.getMeta(metricsKey);
-        let intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        // If the active session is stopped, reset the plugin state, and set initialContent to new doc content
         if (meta && meta.stopActiveSession) {
           return {
             ...initialPluginState,
             initialContent: newState.doc.content
           };
         }
+        const shouldPersistActiveSession = (_meta$shouldPersistAc = meta === null || meta === void 0 ? void 0 : meta.shouldPersistActiveSession) !== null && _meta$shouldPersistAc !== void 0 ? _meta$shouldPersistAc : pluginState.shouldPersistActiveSession;
+        const canIgnoreTr = () => !tr.steps.every(e => e instanceof AnalyticsStep);
+        const docChangedWithoutAnalytics = tr.docChanged && canIgnoreTr();
+        let intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        const now = performance.now();
         if (!intentToStartEditTime) {
-          if (tr.docChanged && !tr.getMeta('replaceDocument')) {
-            intentToStartEditTime = performance.now();
+          if (docChangedWithoutAnalytics || tr.storedMarksSet) {
+            intentToStartEditTime = now;
           } else {
-            return pluginState;
+            return {
+              ...pluginState
+            };
           }
         }
+        // Start active session timer if intentToStartEditTime is set and shouldStartTimer is true
+        // shouldPersistActiveSession is set to true when dragging block controls and when insert menu is open
+        // Timer should start when menu closes or dragging stops
+        if (intentToStartEditTime && meta !== null && meta !== void 0 && meta.shouldStartTimer && !pluginState.shouldPersistActiveSession) {
+          timer.startTimer();
+        }
         const undoCount = isNonTextUndo(tr) ? 1 : 0;
         const newActionTypeCount = pluginState.actionTypeCount ? {
           ...pluginState.actionTypeCount,
@@ -60,9 +79,7 @@ export const createPlugin = api => {
           ...initialPluginState.actionTypeCount,
           undoCount
         };
-        const canIgnoreTr = () => !tr.steps.every(e => e instanceof AnalyticsStep);
-        if (tr.docChanged && canIgnoreTr()) {
-          const now = performance.now();
+        if (docChangedWithoutAnalytics) {
           timer.startTimer();
           const {
             actionTypeCount,
@@ -89,7 +106,9 @@ export const createPlugin = api => {
             actionTypeCount: {
               ...newActionTypeCount,
               textInputCount: newTextInputCount
-            }
+            },
+            intentToStartEditTime,
+            shouldPersistActiveSession
           };
           return newPluginState;
         }
@@ -97,11 +116,37 @@ export const createPlugin = api => {
           ...pluginState,
           lastSelection: (meta === null || meta === void 0 ? void 0 : meta.newSelection) || pluginState.lastSelection,
           intentToStartEditTime,
-          actionTypeCount: newActionTypeCount
+          actionTypeCount: newActionTypeCount,
+          shouldPersistActiveSession
         };
       }
     },
     view(view) {
+      var _api$blockControls;
+      const handleIsDraggingChanged = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.onChange(({
+        nextSharedState,
+        prevSharedState
+      }) => {
+        if (nextSharedState) {
+          api === null || api === void 0 ? void 0 : api.core.actions.execute(({
+            tr
+          }) => {
+            if (!(prevSharedState !== null && prevSharedState !== void 0 && prevSharedState.isDragging) && nextSharedState.isDragging) {
+              api === null || api === void 0 ? void 0 : api.metrics.commands.handleIntentToStartEdit({
+                shouldStartTimer: false,
+                shouldPersistActiveSession: true
+              })({
+                tr
+              });
+            } else if (prevSharedState !== null && prevSharedState !== void 0 && prevSharedState.isDragging && !nextSharedState.isDragging) {
+              api === null || api === void 0 ? void 0 : api.metrics.commands.startActiveSessionTimer()({
+                tr
+              });
+            }
+            return tr;
+          });
+        }
+      });
       const fireAnalyticsEvent = () => {
         const pluginState = metricsKey.getState(view.state);
         if (!pluginState) {
@@ -128,6 +173,7 @@ export const createPlugin = api => {
           fireAnalyticsEvent();
           timer.cleanupTimer();
           unbindBeforeUnload();
+          handleIsDraggingChanged === null || handleIsDraggingChanged === void 0 ? void 0 : handleIsDraggingChanged();
         }
       };
     },
@@ -135,19 +181,12 @@ export const createPlugin = api => {
       handleDOMEvents: {
         click: view => {
           var _pluginState$lastSele, _pluginState$lastSele2;
-          const pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
-          if (!pluginState || pluginState.intentToStartEditTime) {
-            return false;
-          }
           const newSelection = view.state.tr.selection;
-          const newTr = view.state.tr;
+          const pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
           if ((pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$lastSele = pluginState.lastSelection) === null || _pluginState$lastSele === void 0 ? void 0 : _pluginState$lastSele.from) !== newSelection.from && (pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$lastSele2 = pluginState.lastSelection) === null || _pluginState$lastSele2 === void 0 ? void 0 : _pluginState$lastSele2.to) !== newSelection.to) {
-            newTr.setMeta(metricsKey, {
-              intentToStartEditTime: performance.now(),
-              newSelection: newSelection
-            });
-            view.dispatch(newTr);
-            timer.startTimer();
+            api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.metrics.commands.handleIntentToStartEdit({
+              newSelection
+            }));
           }
           return false;
         }

package/dist/esm/metricsPlugin.js CHANGED Viewed

@@ -4,6 +4,7 @@ import { getAnalyticsPayload } from './pm-plugins/utils/analytics';
  * Metrics plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
  */
 export var metricsPlugin = function metricsPlugin(_ref) {
   var api = _ref.api;
   return {
@@ -17,24 +18,67 @@ export var metricsPlugin = function metricsPlugin(_ref) {
       }];
     },
     commands: {
-      stopActiveSession: function stopActiveSession() {
+      startActiveSessionTimer: function startActiveSessionTimer() {
         return function (_ref2) {
           var tr = _ref2.tr;
+          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+          if (!(pluginState !== null && pluginState !== void 0 && pluginState.intentToStartEditTime)) {
+            return tr;
+          }
+          return tr.setMeta(metricsKey, {
+            shouldStartTimer: true,
+            shouldPersistActiveSession: false
+          });
+        };
+      },
+      stopActiveSession: function stopActiveSession() {
+        return function (_ref3) {
+          var tr = _ref3.tr;
           if (!api) {
             return tr;
           }
-          var newTr = tr;
           var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+          if (pluginState !== null && pluginState !== void 0 && pluginState.shouldPersistActiveSession) {
+            return tr;
+          }
           if (pluginState && pluginState.totalActionCount > 0 && pluginState.activeSessionTime > 0) {
             var payloadToSend = getAnalyticsPayload({
               currentContent: tr.doc.content,
               pluginState: pluginState
             });
-            api === null || api === void 0 || api.analytics.actions.attachAnalyticsEvent(payloadToSend)(newTr);
+            api === null || api === void 0 || api.analytics.actions.attachAnalyticsEvent(payloadToSend)(tr);
           }
-          newTr.setMeta(metricsKey, {
+          tr.setMeta(metricsKey, {
             stopActiveSession: true
           });
+          return tr;
+        };
+      },
+      handleIntentToStartEdit: function handleIntentToStartEdit(_ref4) {
+        var newSelection = _ref4.newSelection,
+          _ref4$shouldStartTime = _ref4.shouldStartTimer,
+          shouldStartTimer = _ref4$shouldStartTime === void 0 ? true : _ref4$shouldStartTime,
+          shouldPersistActiveSession = _ref4.shouldPersistActiveSession;
+        return function (_ref5) {
+          var tr = _ref5.tr;
+          if (!api) {
+            return tr;
+          }
+          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
+          if (!pluginState || pluginState.intentToStartEditTime) {
+            if (shouldPersistActiveSession !== (pluginState === null || pluginState === void 0 ? void 0 : pluginState.shouldPersistActiveSession)) {
+              return tr.setMeta(metricsKey, {
+                shouldPersistActiveSession: shouldPersistActiveSession
+              });
+            }
+          }
+          var newTr = tr;
+          newTr.setMeta(metricsKey, {
+            intentToStartEditTime: performance.now(),
+            shouldStartTimer: shouldStartTimer,
+            newSelection: newSelection,
+            shouldPersistActiveSession: shouldPersistActiveSession
+          });
           return newTr;
         };
       }

package/dist/esm/pm-plugins/main.js CHANGED Viewed

@@ -39,33 +39,48 @@ export var createPlugin = function createPlugin(api) {
       },
       // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, oldState, newState) {
+        var _meta$shouldPersistAc;
+        if (tr.getMeta('isRemote') || tr.getMeta('replaceDocument')) {
+          return pluginState;
+        }
         var meta = tr.getMeta(metricsKey);
-        var intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        // If the active session is stopped, reset the plugin state, and set initialContent to new doc content
         if (meta && meta.stopActiveSession) {
           return _objectSpread(_objectSpread({}, initialPluginState), {}, {
             initialContent: newState.doc.content
           });
         }
+        var shouldPersistActiveSession = (_meta$shouldPersistAc = meta === null || meta === void 0 ? void 0 : meta.shouldPersistActiveSession) !== null && _meta$shouldPersistAc !== void 0 ? _meta$shouldPersistAc : pluginState.shouldPersistActiveSession;
+        var canIgnoreTr = function canIgnoreTr() {
+          return !tr.steps.every(function (e) {
+            return e instanceof AnalyticsStep;
+          });
+        };
+        var docChangedWithoutAnalytics = tr.docChanged && canIgnoreTr();
+        var intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        var now = performance.now();
         if (!intentToStartEditTime) {
-          if (tr.docChanged && !tr.getMeta('replaceDocument')) {
-            intentToStartEditTime = performance.now();
+          if (docChangedWithoutAnalytics || tr.storedMarksSet) {
+            intentToStartEditTime = now;
           } else {
-            return pluginState;
+            return _objectSpread({}, pluginState);
           }
         }
+        // Start active session timer if intentToStartEditTime is set and shouldStartTimer is true
+        // shouldPersistActiveSession is set to true when dragging block controls and when insert menu is open
+        // Timer should start when menu closes or dragging stops
+        if (intentToStartEditTime && meta !== null && meta !== void 0 && meta.shouldStartTimer && !pluginState.shouldPersistActiveSession) {
+          timer.startTimer();
+        }
         var undoCount = isNonTextUndo(tr) ? 1 : 0;
         var newActionTypeCount = pluginState.actionTypeCount ? _objectSpread(_objectSpread({}, pluginState.actionTypeCount), {}, {
           undoCount: pluginState.actionTypeCount.undoCount + undoCount
         }) : _objectSpread(_objectSpread({}, initialPluginState.actionTypeCount), {}, {
           undoCount: undoCount
         });
-        var canIgnoreTr = function canIgnoreTr() {
-          return !tr.steps.every(function (e) {
-            return e instanceof AnalyticsStep;
-          });
-        };
-        if (tr.docChanged && canIgnoreTr()) {
-          var now = performance.now();
+        if (docChangedWithoutAnalytics) {
           timer.startTimer();
           var actionTypeCount = pluginState.actionTypeCount,
             timeOfLastTextInput = pluginState.timeOfLastTextInput,
@@ -88,18 +103,44 @@ export var createPlugin = function createPlugin(api) {
             contentSizeChanged: pluginState.contentSizeChanged + (newState.doc.content.size - oldState.doc.content.size),
             actionTypeCount: _objectSpread(_objectSpread({}, newActionTypeCount), {}, {
               textInputCount: newTextInputCount
-            })
+            }),
+            intentToStartEditTime: intentToStartEditTime,
+            shouldPersistActiveSession: shouldPersistActiveSession
           });
           return newPluginState;
         }
         return _objectSpread(_objectSpread({}, pluginState), {}, {
           lastSelection: (meta === null || meta === void 0 ? void 0 : meta.newSelection) || pluginState.lastSelection,
           intentToStartEditTime: intentToStartEditTime,
-          actionTypeCount: newActionTypeCount
+          actionTypeCount: newActionTypeCount,
+          shouldPersistActiveSession: shouldPersistActiveSession
         });
       }
     },
     view: function view(_view) {
+      var _api$blockControls;
+      var handleIsDraggingChanged = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.onChange(function (_ref) {
+        var nextSharedState = _ref.nextSharedState,
+          prevSharedState = _ref.prevSharedState;
+        if (nextSharedState) {
+          api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
+            var tr = _ref2.tr;
+            if (!(prevSharedState !== null && prevSharedState !== void 0 && prevSharedState.isDragging) && nextSharedState.isDragging) {
+              api === null || api === void 0 || api.metrics.commands.handleIntentToStartEdit({
+                shouldStartTimer: false,
+                shouldPersistActiveSession: true
+              })({
+                tr: tr
+              });
+            } else if (prevSharedState !== null && prevSharedState !== void 0 && prevSharedState.isDragging && !nextSharedState.isDragging) {
+              api === null || api === void 0 || api.metrics.commands.startActiveSessionTimer()({
+                tr: tr
+              });
+            }
+            return tr;
+          });
+        }
+      });
       var fireAnalyticsEvent = function fireAnalyticsEvent() {
         var pluginState = metricsKey.getState(_view.state);
         if (!pluginState) {
@@ -126,6 +167,7 @@ export var createPlugin = function createPlugin(api) {
           fireAnalyticsEvent();
           timer.cleanupTimer();
           unbindBeforeUnload();
+          handleIsDraggingChanged === null || handleIsDraggingChanged === void 0 || handleIsDraggingChanged();
         }
       };
     },
@@ -133,19 +175,12 @@ export var createPlugin = function createPlugin(api) {
       handleDOMEvents: {
         click: function click(view) {
           var _pluginState$lastSele, _pluginState$lastSele2;
-          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
-          if (!pluginState || pluginState.intentToStartEditTime) {
-            return false;
-          }
           var newSelection = view.state.tr.selection;
-          var newTr = view.state.tr;
+          var pluginState = api === null || api === void 0 ? void 0 : api.metrics.sharedState.currentState();
           if ((pluginState === null || pluginState === void 0 || (_pluginState$lastSele = pluginState.lastSelection) === null || _pluginState$lastSele === void 0 ? void 0 : _pluginState$lastSele.from) !== newSelection.from && (pluginState === null || pluginState === void 0 || (_pluginState$lastSele2 = pluginState.lastSelection) === null || _pluginState$lastSele2 === void 0 ? void 0 : _pluginState$lastSele2.to) !== newSelection.to) {
-            newTr.setMeta(metricsKey, {
-              intentToStartEditTime: performance.now(),
+            api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.metrics.commands.handleIntentToStartEdit({
               newSelection: newSelection
-            });
-            view.dispatch(newTr);
-            timer.startTimer();
+            }));
           }
           return false;
         }

package/dist/types/metricsPluginType.d.ts CHANGED Viewed

@@ -1,10 +1,20 @@
-import type { EditorCommand, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { MetricsState } from './pm-plugins/main';
+type handleIntentToStartEditProps = {
+    newSelection?: Selection;
+    shouldStartTimer?: boolean;
+    shouldPersistActiveSession?: boolean;
+};
 export type MetricsPlugin = NextEditorPlugin<'metrics', {
-    dependencies: [AnalyticsPlugin];
+    dependencies: [AnalyticsPlugin, OptionalPlugin<BlockControlsPlugin>];
     sharedState: MetricsState;
     commands: {
+        startActiveSessionTimer: () => EditorCommand;
         stopActiveSession: () => EditorCommand;
+        handleIntentToStartEdit: ({ newSelection, shouldStartTimer, shouldPersistActiveSession, }: handleIntentToStartEditProps) => EditorCommand;
     };
 }>;
+export {};

package/dist/types/pm-plugins/main.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ export type MetricsState = {
     lastSelection?: Selection;
     actionTypeCount: ActionByType;
     timeOfLastTextInput?: number;
+    shouldPersistActiveSession?: boolean;
     initialContent?: Fragment;
 };
 export type ActionByType = {

package/dist/types/pm-plugins/utils/get-node-changes.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { MetricsState } from '../main';
+import type { MetricsState } from '../main';
 export declare const getNodeChanges: ({ currentContent, pluginState, }: {
     currentContent: Fragment;
     pluginState?: MetricsState | undefined;

package/dist/types/pm-plugins/utils/is-non-text-undo.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-import { ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
+import type { ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
 export declare const isNonTextUndo: (tr: ReadonlyTransaction) => boolean;

package/dist/types-ts4.5/metricsPluginType.d.ts CHANGED Viewed

@@ -1,12 +1,23 @@
-import type { EditorCommand, NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { MetricsState } from './pm-plugins/main';
+type handleIntentToStartEditProps = {
+    newSelection?: Selection;
+    shouldStartTimer?: boolean;
+    shouldPersistActiveSession?: boolean;
+};
 export type MetricsPlugin = NextEditorPlugin<'metrics', {
     dependencies: [
-        AnalyticsPlugin
+        AnalyticsPlugin,
+        OptionalPlugin<BlockControlsPlugin>
     ];
     sharedState: MetricsState;
     commands: {
+        startActiveSessionTimer: () => EditorCommand;
         stopActiveSession: () => EditorCommand;
+        handleIntentToStartEdit: ({ newSelection, shouldStartTimer, shouldPersistActiveSession, }: handleIntentToStartEditProps) => EditorCommand;
     };
 }>;
+export {};

package/dist/types-ts4.5/pm-plugins/main.d.ts CHANGED Viewed

@@ -12,6 +12,7 @@ export type MetricsState = {
     lastSelection?: Selection;
     actionTypeCount: ActionByType;
     timeOfLastTextInput?: number;
+    shouldPersistActiveSession?: boolean;
     initialContent?: Fragment;
 };
 export type ActionByType = {

package/dist/types-ts4.5/pm-plugins/utils/get-node-changes.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { MetricsState } from '../main';
+import type { MetricsState } from '../main';
 export declare const getNodeChanges: ({ currentContent, pluginState, }: {
     currentContent: Fragment;
     pluginState?: MetricsState | undefined;

package/dist/types-ts4.5/pm-plugins/utils/is-non-text-undo.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-import { ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
+import type { ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
 export declare const isNonTextUndo: (tr: ReadonlyTransaction) => boolean;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-metrics",
-	"version": "3.1.0",
+	"version": "3.2.0",
 	"description": "Metrics plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,11 +24,12 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.10.0",
+		"@atlaskit/adf-schema": "^47.2.1",
+		"@atlaskit/editor-common": "^99.17.0",
 		"@atlaskit/editor-plugin-analytics": "^1.12.0",
+		"@atlaskit/editor-plugin-block-controls": "^2.27.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/platform-feature-flags": "^1.0.0",
+		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},