@atlaskit/react-ufo 2.4.4 → 2.4.5

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 2.4.5
+
+### Patch Changes
+
+- [#172240](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172240)
+  [`db973dafd5ae2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/db973dafd5ae2) -
+  correctly feature flag and optimise buildSegmentTree function
+- [#172231](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172231)
+  [`de6f706c54af6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/de6f706c54af6) -
+  [ED-25937] Skip TTVC calculation from changes that comes from the Editor container
+
 ## 2.4.4
 
 ### Patch Changes

package/dist/cjs/create-payload/common/utils/index.js

@@ -27,20 +27,19 @@ function buildSegmentTree(labelStacks) {
   };
   labelStacks.forEach(function (labelStack) {
     var currentNode = r;
-    labelStack.forEach(function (label, index) {
-      var _currentNode$c;
+    labelStack.forEach(function (label) {
       var name = label.name;
       var id = isSegmentLabel(label) ? label.segmentId : undefined;
-      var key = id !== undefined ? id.toString() : name;
-      if (currentNode.c && !currentNode.c[key]) {
+      var key = id !== undefined ? id : name;
+      if (!currentNode.c) {
+        currentNode.c = {};
+      }
+      if (!currentNode.c[key]) {
         currentNode.c[key] = {
           n: name
         };
       }
-      currentNode = (_currentNode$c = currentNode.c) === null || _currentNode$c === void 0 ? void 0 : _currentNode$c[key];
-      if (index < labelStack.length - 1) {
-        currentNode.c = _objectSpread({}, currentNode.c || {});
-      }
+      currentNode = currentNode.c[key];
     });
   });
   return {

package/dist/cjs/create-payload/index.js

@@ -670,9 +670,9 @@ function createInteractionMetricsPayload(interaction, interactionId) {
   var pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
   var pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   var segments = config.killswitchNestedSegments ? [] : knownSegments;
-  var segmentTree = (0, _utils.buildSegmentTree)(segments.map(function (segment) {
+  var segmentTree = _constants.REACT_UFO_VERSION === '2.0.0' ? (0, _utils.buildSegmentTree)(segments.map(function (segment) {
     return segment.labelStack;
-  }));
+  })) : {};
   var isDetailedPayload = pageVisibilityAtTTAI === 'visible';
   var isPageLoad = type === 'page_load';
   var calculatePageVisibilityFromTheStartOfPageLoad = config.enableBetterPageVisibilityApi && isPageLoad;

package/dist/cjs/vc/vc-observer/observers/index.js

@@ -23,6 +23,12 @@ var state = {
   waitingForFirstRender: 2,
   ignoring: 3
 };
+function isInsideEditorContainer(target) {
+  if (!target || typeof target.closest !== 'function') {
+    return false;
+  }
+  return Boolean(target.closest('.ProseMirror'));
+}
 var Observers = exports.Observers = /*#__PURE__*/function () {
   function Observers(opts) {
     var _this = this;
@@ -297,6 +303,11 @@ var Observers = exports.Observers = /*#__PURE__*/function () {
                 data.ignoreReason = 'not-visible';
               }
             }
+            if ((0, _platformFeatureFlags.fg)('platform_editor_ed-25937_ignore_mutations_for_ttvc')) {
+              if (isInsideEditorContainer(target)) {
+                data.ignoreReason = 'editor-container-mutation';
+              }
+            }
             _this3.callbacks.forEach(function (callback) {
               var elementName;
               try {

package/dist/es2019/create-payload/common/utils/index.js

@@ -13,22 +13,19 @@ export function buildSegmentTree(labelStacks) {
   };
   labelStacks.forEach(labelStack => {
     let currentNode = r;
-    labelStack.forEach((label, index) => {
-      var _currentNode$c;
+    labelStack.forEach(label => {
       const name = label.name;
       const id = isSegmentLabel(label) ? label.segmentId : undefined;
-      const key = id !== undefined ? id.toString() : name;
-      if (currentNode.c && !currentNode.c[key]) {
+      const key = id !== undefined ? id : name;
+      if (!currentNode.c) {
+        currentNode.c = {};
+      }
+      if (!currentNode.c[key]) {
         currentNode.c[key] = {
           n: name
         };
       }
-      currentNode = (_currentNode$c = currentNode.c) === null || _currentNode$c === void 0 ? void 0 : _currentNode$c[key];
-      if (index < labelStack.length - 1) {
-        currentNode.c = {
-          ...(currentNode.c || {})
-        };
-      }
+      currentNode = currentNode.c[key];
     });
   });
   return {

package/dist/es2019/create-payload/index.js

@@ -664,7 +664,7 @@ function createInteractionMetricsPayload(interaction, interactionId) {
   const pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
   const pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   const segments = config.killswitchNestedSegments ? [] : knownSegments;
-  const segmentTree = buildSegmentTree(segments.map(segment => segment.labelStack));
+  const segmentTree = REACT_UFO_VERSION === '2.0.0' ? buildSegmentTree(segments.map(segment => segment.labelStack)) : {};
   const isDetailedPayload = pageVisibilityAtTTAI === 'visible';
   const isPageLoad = type === 'page_load';
   const calculatePageVisibilityFromTheStartOfPageLoad = config.enableBetterPageVisibilityApi && isPageLoad;

package/dist/es2019/vc/vc-observer/observers/index.js

@@ -8,6 +8,12 @@ const state = {
   waitingForFirstRender: 2,
   ignoring: 3
 };
+function isInsideEditorContainer(target) {
+  if (!target || typeof target.closest !== 'function') {
+    return false;
+  }
+  return Boolean(target.closest('.ProseMirror'));
+}
 export class Observers {
   constructor(opts) {
     _defineProperty(this, "observedMutations", new WeakMap());
@@ -245,6 +251,11 @@ export class Observers {
               data.ignoreReason = 'not-visible';
             }
           }
+          if (fg('platform_editor_ed-25937_ignore_mutations_for_ttvc')) {
+            if (isInsideEditorContainer(target)) {
+              data.ignoreReason = 'editor-container-mutation';
+            }
+          }
           this.callbacks.forEach(callback => {
             let elementName;
             try {

package/dist/esm/create-payload/common/utils/index.js

@@ -16,20 +16,19 @@ export function buildSegmentTree(labelStacks) {
   };
   labelStacks.forEach(function (labelStack) {
     var currentNode = r;
-    labelStack.forEach(function (label, index) {
-      var _currentNode$c;
+    labelStack.forEach(function (label) {
       var name = label.name;
       var id = isSegmentLabel(label) ? label.segmentId : undefined;
-      var key = id !== undefined ? id.toString() : name;
-      if (currentNode.c && !currentNode.c[key]) {
+      var key = id !== undefined ? id : name;
+      if (!currentNode.c) {
+        currentNode.c = {};
+      }
+      if (!currentNode.c[key]) {
         currentNode.c[key] = {
           n: name
         };
       }
-      currentNode = (_currentNode$c = currentNode.c) === null || _currentNode$c === void 0 ? void 0 : _currentNode$c[key];
-      if (index < labelStack.length - 1) {
-        currentNode.c = _objectSpread({}, currentNode.c || {});
-      }
+      currentNode = currentNode.c[key];
     });
   });
   return {

package/dist/esm/create-payload/index.js

@@ -660,9 +660,9 @@ function createInteractionMetricsPayload(interaction, interactionId) {
   var pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
   var pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   var segments = config.killswitchNestedSegments ? [] : knownSegments;
-  var segmentTree = buildSegmentTree(segments.map(function (segment) {
+  var segmentTree = REACT_UFO_VERSION === '2.0.0' ? buildSegmentTree(segments.map(function (segment) {
     return segment.labelStack;
-  }));
+  })) : {};
   var isDetailedPayload = pageVisibilityAtTTAI === 'visible';
   var isPageLoad = type === 'page_load';
   var calculatePageVisibilityFromTheStartOfPageLoad = config.enableBetterPageVisibilityApi && isPageLoad;

package/dist/esm/vc/vc-observer/observers/index.js

@@ -16,6 +16,12 @@ var state = {
   waitingForFirstRender: 2,
   ignoring: 3
 };
+function isInsideEditorContainer(target) {
+  if (!target || typeof target.closest !== 'function') {
+    return false;
+  }
+  return Boolean(target.closest('.ProseMirror'));
+}
 export var Observers = /*#__PURE__*/function () {
   function Observers(opts) {
     var _this = this;
@@ -290,6 +296,11 @@ export var Observers = /*#__PURE__*/function () {
                 data.ignoreReason = 'not-visible';
               }
             }
+            if (fg('platform_editor_ed-25937_ignore_mutations_for_ttvc')) {
+              if (isInsideEditorContainer(target)) {
+                data.ignoreReason = 'editor-container-mutation';
+              }
+            }
             _this3.callbacks.forEach(function (callback) {
               var elementName;
               try {

package/dist/types/common/vc/types.d.ts

@@ -35,7 +35,7 @@ export type VCEntryType = {
     vc: number;
     elements: string[];
 };
-export type VCIgnoreReason = 'image' | 'ssr-hydration' | 'editor-lazy-node-view' | 'not-visible' | '';
+export type VCIgnoreReason = 'image' | 'ssr-hydration' | 'editor-lazy-node-view' | 'not-visible' | 'editor-container-mutation' | '';
 export type ComponentsLogEntry = {
     targetName: string;
     __debug__element: WeakRef<Element> | null;