@atlaskit/editor-plugin-metrics 3.1.1 → 3.2.1

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

@@ -1,10 +1,10 @@
 import { bind } from 'bind-event-listener';
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isTextInput } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { AddMarkStep, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { ActiveSessionTimer } from './utils/active-session-timer';
 import { getAnalyticsPayload } from './utils/analytics';
+import { ActionType, checkTrActionType, shouldSkipTr } from './utils/check-tr-action-type';
 import { isNonTextUndo } from './utils/is-non-text-undo';
 export const metricsKey = new PluginKey('metricsPlugin');
 export const initialPluginState = {
@@ -37,20 +37,35 @@ export const createPlugin = api => {
       },
       // eslint-disable-next-line @typescript-eslint/max-params
       apply(tr, pluginState, oldState, newState) {
+        var _meta$shouldPersistAc, _tr$steps;
+        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
           };
         }
-        if (!intentToStartEditTime) {
-          if (tr.docChanged && !tr.getMeta('replaceDocument')) {
-            intentToStartEditTime = performance.now();
-          } else {
-            return pluginState;
-          }
+        const shouldPersistActiveSession = (_meta$shouldPersistAc = meta === null || meta === void 0 ? void 0 : meta.shouldPersistActiveSession) !== null && _meta$shouldPersistAc !== void 0 ? _meta$shouldPersistAc : pluginState.shouldPersistActiveSession;
+        const hasDocChanges = tr.steps.length > 0 && ((_tr$steps = tr.steps) === null || _tr$steps === void 0 ? void 0 : _tr$steps.some(step => step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof AddMarkStep));
+        let intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        const now = performance.now();
+        if (!intentToStartEditTime && !hasDocChanges && !tr.storedMarksSet) {
+          return pluginState;
+        }
+        if (!intentToStartEditTime && (hasDocChanges || tr.storedMarksSet)) {
+          intentToStartEditTime = now;
+        }
+
+        // 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 ? {
@@ -60,36 +75,59 @@ 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 (hasDocChanges) {
           timer.startTimer();
           const {
             actionTypeCount,
             timeOfLastTextInput,
             totalActionCount,
-            activeSessionTime
+            previousTrType
           } = pluginState;
-          // If previous and current action is text insertion, then don't increase total action count
-          const isActionTextInput = isTextInput(tr);
-          let newActiveSessionTime = activeSessionTime + (now - intentToStartEditTime);
-          let newTextInputCount = isActionTextInput ? actionTypeCount.textInputCount + 1 : actionTypeCount.textInputCount;
-          let newTotalActionCount = pluginState.totalActionCount + 1;
-          if (pluginState.timeOfLastTextInput && isActionTextInput) {
-            newActiveSessionTime = activeSessionTime + (now - (timeOfLastTextInput || 0));
-            newTextInputCount = actionTypeCount.textInputCount;
+          if (shouldSkipTr(tr)) {
+            return pluginState;
+          }
+          const trType = checkTrActionType(tr);
+          let shouldNotIncrementActionCount = false;
+          let shouldSetTimeOfLastTextInput = false;
+          let isTextInput = false;
+          if (trType) {
+            var _trType$extraData, _previousTrType$extra;
+            const isNotNewStatus = trType.type === ActionType.UPDATING_STATUS && (previousTrType === null || previousTrType === void 0 ? void 0 : previousTrType.type) === ActionType.UPDATING_STATUS && (trType === null || trType === void 0 ? void 0 : (_trType$extraData = trType.extraData) === null || _trType$extraData === void 0 ? void 0 : _trType$extraData.statusId) === (previousTrType === null || previousTrType === void 0 ? void 0 : (_previousTrType$extra = previousTrType.extraData) === null || _previousTrType$extra === void 0 ? void 0 : _previousTrType$extra.statusId);
+            const isAddingTextToListNode = trType.type === ActionType.TEXT_INPUT && !!previousTrType && [ActionType.UPDATING_NEW_LIST_TYPE_ITEM, ActionType.INSERTING_NEW_LIST_TYPE_NODE].includes(previousTrType.type);
+            const isAddingNewListItemAfterTextInput = !!previousTrType && previousTrType.type === ActionType.TEXT_INPUT && [ActionType.UPDATING_NEW_LIST_TYPE_ITEM].includes(trType.type);
+
+            // Check if tr is textInput and only increment textInputCount if previous action was not textInput
+            isTextInput = [ActionType.TEXT_INPUT, ActionType.EMPTY_LINE_ADDED_OR_DELETED].includes(trType.type);
+
+            // timeOfLastTextInput should be set if tr includes continuous text input on the same node
+            shouldSetTimeOfLastTextInput = [ActionType.TEXT_INPUT, ActionType.EMPTY_LINE_ADDED_OR_DELETED, ActionType.UPDATING_NEW_LIST_TYPE_ITEM, ActionType.INSERTING_NEW_LIST_TYPE_NODE, ActionType.UPDATING_STATUS].includes(trType.type) || isNotNewStatus;
+
+            // Should not increase action count if tr is text input,
+            // empty line added or deleted, updating new list item or is updating same status node
+
+            shouldNotIncrementActionCount = isTextInput || isNotNewStatus || isAddingTextToListNode || isAddingNewListItemAfterTextInput;
+          }
+          let newTextInputCount = isTextInput ? actionTypeCount.textInputCount + 1 : actionTypeCount.textInputCount;
+          let newTotalActionCount = totalActionCount + 1;
+          if (timeOfLastTextInput && shouldNotIncrementActionCount) {
             newTotalActionCount = totalActionCount;
           }
+          if (timeOfLastTextInput && isTextInput && previousTrType && [ActionType.TEXT_INPUT, ActionType.EMPTY_LINE_ADDED_OR_DELETED, ActionType.UPDATING_NEW_LIST_TYPE_ITEM, ActionType.INSERTING_NEW_LIST_TYPE_NODE].includes(previousTrType.type)) {
+            newTextInputCount = actionTypeCount.textInputCount;
+          }
           const newPluginState = {
             ...pluginState,
-            activeSessionTime: newActiveSessionTime,
+            activeSessionTime: now - intentToStartEditTime,
             totalActionCount: newTotalActionCount,
-            timeOfLastTextInput: isActionTextInput ? now : undefined,
+            timeOfLastTextInput: shouldSetTimeOfLastTextInput ? now : undefined,
             contentSizeChanged: pluginState.contentSizeChanged + (newState.doc.content.size - oldState.doc.content.size),
             actionTypeCount: {
               ...newActionTypeCount,
               textInputCount: newTextInputCount
-            }
+            },
+            intentToStartEditTime,
+            shouldPersistActiveSession,
+            previousTrType: trType
           };
           return newPluginState;
         }
@@ -97,11 +135,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 +192,7 @@ export const createPlugin = api => {
           fireAnalyticsEvent();
           timer.cleanupTimer();
           unbindBeforeUnload();
+          handleIsDraggingChanged === null || handleIsDraggingChanged === void 0 ? void 0 : handleIsDraggingChanged();
         }
       };
     },
@@ -135,19 +200,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/es2019/pm-plugins/utils/check-tr-action-type.js

@@ -0,0 +1,152 @@
+import { InsertTypeAheadStep, LinkMetaStep } from '@atlaskit/adf-schema/steps';
+import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+export let ActionType = /*#__PURE__*/function (ActionType) {
+  ActionType["TEXT_INPUT"] = "textInput";
+  ActionType["EMPTY_LINE_ADDED_OR_DELETED"] = "emptyLineAddedOrDeleted";
+  ActionType["INSERTED_FROM_TYPE_AHEAD"] = "insertedFromTypeAhead";
+  ActionType["INSERTING_NEW_LIST_TYPE_NODE"] = "insertingNewListTypeNode";
+  ActionType["UPDATING_NEW_LIST_TYPE_ITEM"] = "updatingNewListItem";
+  ActionType["ADDING_LINK"] = "addingLink";
+  ActionType["UPDATING_STATUS"] = "updatingStatus";
+  return ActionType;
+}({});
+const isTextInput = step => {
+  const {
+    slice: {
+      content
+    },
+    from,
+    to
+  } = step;
+  const node = content.firstChild;
+  const isAddingCharacter = from === to && content.childCount === 1 && !!node && !!node.text && node.text.length === 1;
+  const isDeletingCharacter = to - from === 1 && content.childCount === 0;
+  return isAddingCharacter || isDeletingCharacter;
+};
+const isEmptyLineAddedOrDeleted = step => {
+  const {
+    slice: {
+      content
+    },
+    from,
+    to
+  } = step;
+  const isEmptyLineDeleted = to - from === 2 && content.size === 0;
+  if (isEmptyLineDeleted) {
+    return true;
+  }
+  let isEmptyLineAdded = false;
+  content.forEach(node => {
+    isEmptyLineAdded = node.type.name === 'paragraph' && node.content.size === 0;
+  });
+  return isEmptyLineAdded;
+};
+const isUpdatingListTypeNode = step => {
+  const {
+    slice
+  } = step;
+  const childCount = slice.content.childCount;
+  if (childCount < 1) {
+    return false;
+  }
+  let isListTypeNode = false;
+  slice.content.forEach(node => {
+    isListTypeNode = ['decisionList', 'decisionItem', 'bulletList', 'listItem', 'orderedList', 'taskList', 'taskItem'].includes(node.type.name);
+  });
+  if (!isListTypeNode) {
+    return false;
+  }
+  return childCount === 1 ? ActionType.INSERTING_NEW_LIST_TYPE_NODE : ActionType.UPDATING_NEW_LIST_TYPE_ITEM;
+};
+const isUpdatingStatus = step => {
+  const {
+    slice
+  } = step;
+  const firstChild = slice.content.firstChild;
+  if (!firstChild) {
+    return undefined;
+  }
+  return firstChild.type.name === 'status' && firstChild.attrs.localId;
+};
+const isAddingLink = tr => {
+  const hasLinkStep = tr.steps.some(step => step instanceof LinkMetaStep);
+  const hasReplaceStep = tr.steps.some(step => step instanceof ReplaceStep);
+  return hasLinkStep && !hasReplaceStep;
+};
+const isTypeAheadRelatedTr = tr => {
+  var _tr$getMeta;
+  if (((_tr$getMeta = tr.getMeta('typeAheadPlugin$')) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.action) === 'INSERT_RAW_QUERY') {
+    return 'INSERT_RAW_QUERY';
+  }
+  if (!tr.getMeta('appendedTransaction')) {
+    return false;
+  }
+  const insertTypeAheadStep = tr.steps.find(step => step instanceof InsertTypeAheadStep);
+  const replaceStep = tr.steps.find(step => step instanceof ReplaceStep);
+  if (!insertTypeAheadStep || !replaceStep) {
+    return false;
+  }
+  return insertTypeAheadStep instanceof InsertTypeAheadStep && insertTypeAheadStep.stage;
+};
+export const shouldSkipTr = tr => {
+  const resolvingLink = isAddingLink(tr);
+  if (resolvingLink) {
+    return true;
+  }
+  const typeAheadRelatedTr = isTypeAheadRelatedTr(tr);
+  if (typeAheadRelatedTr) {
+    return typeAheadRelatedTr !== 'INSERTING_ITEM';
+  } else {
+    return tr.getMeta('appendedTransaction');
+  }
+};
+export const checkTrActionType = tr => {
+  if (tr.getMeta('input_rule_plugin_transaction')) {
+    return {
+      type: ActionType.INSERTING_NEW_LIST_TYPE_NODE
+    };
+  }
+  const stepsLength = tr.steps.length;
+  if (stepsLength <= 0) {
+    return undefined;
+  }
+  if (isAddingLink(tr)) {
+    return {
+      type: ActionType.ADDING_LINK
+    };
+  }
+  const [firstStep] = tr.steps;
+  const isReplaceStep = firstStep instanceof ReplaceStep;
+  const isReplaceAroundStep = firstStep instanceof ReplaceAroundStep;
+  if (!isReplaceStep && !isReplaceAroundStep) {
+    return undefined;
+  }
+  if (isReplaceStep) {
+    if (isTextInput(firstStep)) {
+      return {
+        type: ActionType.TEXT_INPUT
+      };
+    }
+    if (isEmptyLineAddedOrDeleted(firstStep)) {
+      return {
+        type: ActionType.EMPTY_LINE_ADDED_OR_DELETED
+      };
+    }
+    const statusId = isUpdatingStatus(firstStep);
+    if (statusId) {
+      return {
+        type: ActionType.UPDATING_STATUS,
+        extraData: {
+          statusId
+        }
+      };
+    }
+  }
+  const updatingListTypeNode = isUpdatingListTypeNode(firstStep);
+  if (updatingListTypeNode) {
+    return {
+      type: updatingListTypeNode
+    };
+  }
+  return undefined;
+};

package/dist/esm/metricsPlugin.js

@@ -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,25 +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 newTr;
+          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
+              });
+            }
+          }
+          tr.setMeta(metricsKey, {
+            intentToStartEditTime: performance.now(),
+            shouldStartTimer: shouldStartTimer,
+            newSelection: newSelection,
+            shouldPersistActiveSession: shouldPersistActiveSession
+          });
+          return tr;
         };
       }
     },

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

@@ -2,12 +2,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { bind } from 'bind-event-listener';
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isTextInput } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { AddMarkStep, ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { ActiveSessionTimer } from './utils/active-session-timer';
 import { getAnalyticsPayload } from './utils/analytics';
+import { ActionType, checkTrActionType, shouldSkipTr } from './utils/check-tr-action-type';
 import { isNonTextUndo } from './utils/is-non-text-undo';
 export var metricsKey = new PluginKey('metricsPlugin');
 export var initialPluginState = {
@@ -39,19 +39,36 @@ export var createPlugin = function createPlugin(api) {
       },
       // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(tr, pluginState, oldState, newState) {
+        var _meta$shouldPersistAc, _tr$steps;
+        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
           });
         }
-        if (!intentToStartEditTime) {
-          if (tr.docChanged && !tr.getMeta('replaceDocument')) {
-            intentToStartEditTime = performance.now();
-          } else {
-            return pluginState;
-          }
+        var shouldPersistActiveSession = (_meta$shouldPersistAc = meta === null || meta === void 0 ? void 0 : meta.shouldPersistActiveSession) !== null && _meta$shouldPersistAc !== void 0 ? _meta$shouldPersistAc : pluginState.shouldPersistActiveSession;
+        var hasDocChanges = tr.steps.length > 0 && ((_tr$steps = tr.steps) === null || _tr$steps === void 0 ? void 0 : _tr$steps.some(function (step) {
+          return step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof AddMarkStep;
+        }));
+        var intentToStartEditTime = (meta === null || meta === void 0 ? void 0 : meta.intentToStartEditTime) || pluginState.intentToStartEditTime;
+        var now = performance.now();
+        if (!intentToStartEditTime && !hasDocChanges && !tr.storedMarksSet) {
+          return pluginState;
+        }
+        if (!intentToStartEditTime && (hasDocChanges || tr.storedMarksSet)) {
+          intentToStartEditTime = now;
+        }
+
+        // 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), {}, {
@@ -59,47 +76,90 @@ export var createPlugin = function createPlugin(api) {
         }) : _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 (hasDocChanges) {
           timer.startTimer();
           var actionTypeCount = pluginState.actionTypeCount,
             timeOfLastTextInput = pluginState.timeOfLastTextInput,
             totalActionCount = pluginState.totalActionCount,
-            activeSessionTime = pluginState.activeSessionTime;
-          // If previous and current action is text insertion, then don't increase total action count
-          var isActionTextInput = isTextInput(tr);
-          var newActiveSessionTime = activeSessionTime + (now - intentToStartEditTime);
-          var newTextInputCount = isActionTextInput ? actionTypeCount.textInputCount + 1 : actionTypeCount.textInputCount;
-          var newTotalActionCount = pluginState.totalActionCount + 1;
-          if (pluginState.timeOfLastTextInput && isActionTextInput) {
-            newActiveSessionTime = activeSessionTime + (now - (timeOfLastTextInput || 0));
-            newTextInputCount = actionTypeCount.textInputCount;
+            previousTrType = pluginState.previousTrType;
+          if (shouldSkipTr(tr)) {
+            return pluginState;
+          }
+          var trType = checkTrActionType(tr);
+          var shouldNotIncrementActionCount = false;
+          var shouldSetTimeOfLastTextInput = false;
+          var isTextInput = false;
+          if (trType) {
+            var _trType$extraData, _previousTrType$extra;
+            var isNotNewStatus = trType.type === ActionType.UPDATING_STATUS && (previousTrType === null || previousTrType === void 0 ? void 0 : previousTrType.type) === ActionType.UPDATING_STATUS && (trType === null || trType === void 0 || (_trType$extraData = trType.extraData) === null || _trType$extraData === void 0 ? void 0 : _trType$extraData.statusId) === (previousTrType === null || previousTrType === void 0 || (_previousTrType$extra = previousTrType.extraData) === null || _previousTrType$extra === void 0 ? void 0 : _previousTrType$extra.statusId);
+            var isAddingTextToListNode = trType.type === ActionType.TEXT_INPUT && !!previousTrType && [ActionType.UPDATING_NEW_LIST_TYPE_ITEM, ActionType.INSERTING_NEW_LIST_TYPE_NODE].includes(previousTrType.type);
+            var isAddingNewListItemAfterTextInput = !!previousTrType && previousTrType.type === ActionType.TEXT_INPUT && [ActionType.UPDATING_NEW_LIST_TYPE_ITEM].includes(trType.type);
+
+            // Check if tr is textInput and only increment textInputCount if previous action was not textInput
+            isTextInput = [ActionType.TEXT_INPUT, ActionType.EMPTY_LINE_ADDED_OR_DELETED].includes(trType.type);
+
+            // timeOfLastTextInput should be set if tr includes continuous text input on the same node
+            shouldSetTimeOfLastTextInput = [ActionType.TEXT_INPUT, ActionType.EMPTY_LINE_ADDED_OR_DELETED, ActionType.UPDATING_NEW_LIST_TYPE_ITEM, ActionType.INSERTING_NEW_LIST_TYPE_NODE, ActionType.UPDATING_STATUS].includes(trType.type) || isNotNewStatus;
+
+            // Should not increase action count if tr is text input,
+            // empty line added or deleted, updating new list item or is updating same status node
+
+            shouldNotIncrementActionCount = isTextInput || isNotNewStatus || isAddingTextToListNode || isAddingNewListItemAfterTextInput;
+          }
+          var newTextInputCount = isTextInput ? actionTypeCount.textInputCount + 1 : actionTypeCount.textInputCount;
+          var newTotalActionCount = totalActionCount + 1;
+          if (timeOfLastTextInput && shouldNotIncrementActionCount) {
             newTotalActionCount = totalActionCount;
           }
+          if (timeOfLastTextInput && isTextInput && previousTrType && [ActionType.TEXT_INPUT, ActionType.EMPTY_LINE_ADDED_OR_DELETED, ActionType.UPDATING_NEW_LIST_TYPE_ITEM, ActionType.INSERTING_NEW_LIST_TYPE_NODE].includes(previousTrType.type)) {
+            newTextInputCount = actionTypeCount.textInputCount;
+          }
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
-            activeSessionTime: newActiveSessionTime,
+            activeSessionTime: now - intentToStartEditTime,
             totalActionCount: newTotalActionCount,
-            timeOfLastTextInput: isActionTextInput ? now : undefined,
+            timeOfLastTextInput: shouldSetTimeOfLastTextInput ? now : undefined,
             contentSizeChanged: pluginState.contentSizeChanged + (newState.doc.content.size - oldState.doc.content.size),
             actionTypeCount: _objectSpread(_objectSpread({}, newActionTypeCount), {}, {
               textInputCount: newTextInputCount
-            })
+            }),
+            intentToStartEditTime: intentToStartEditTime,
+            shouldPersistActiveSession: shouldPersistActiveSession,
+            previousTrType: trType
           });
           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 +186,7 @@ export var createPlugin = function createPlugin(api) {
           fireAnalyticsEvent();
           timer.cleanupTimer();
           unbindBeforeUnload();
+          handleIsDraggingChanged === null || handleIsDraggingChanged === void 0 || handleIsDraggingChanged();
         }
       };
     },
@@ -133,19 +194,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;
         }