@atlaskit/react-ufo 4.14.5 → 4.14.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.14.7
+
+### Patch Changes
+
+- [`ae14db0f1f0c7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ae14db0f1f0c7) -
+  Add isDnDStyleMutation back to attribute change detection in vc observer
+
+## 4.14.6
+
+### Patch Changes
+
+- [`95ab6a9cc653c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/95ab6a9cc653c) -
+  Auto add SSR entry for TTVC v4 onwards
+
 ## 4.14.5
 
 ### Patch Changes

package/dist/cjs/vc/index.js

@@ -122,7 +122,7 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
     value: function () {
       var _getVCResult = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(param) {
         var _this$oldVCObserver4, _this$newVCObserver3, _ref2;
-        var experienceKey, include3p, excludeSmartAnswersInSearch, includeSSRRatio, includeRawData, v1v2Result, v3Result, ssrRatio;
+        var experienceKey, include3p, excludeSmartAnswersInSearch, includeSSRRatio, includeRawData, v1v2Result, v3v4Result, ssrRatio;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -150,14 +150,15 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
                 start: param.start,
                 stop: param.stop,
                 interactionId: param.interactionId,
-                ssr: param.includeSSRInV3 ? param.ssr : undefined,
+                ssr: param.ssr,
                 include3p: include3p,
                 excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
                 includeSSRRatio: includeSSRRatio,
                 interactionType: param.interactionType,
                 isPageVisible: param.isPageVisible,
                 interactionAbortReason: param.interactionAbortReason,
-                includeRawData: includeRawData
+                includeRawData: includeRawData,
+                includeSSRInV3: param.includeSSRInV3
               });
             case 12:
               _context.t1 = _context.sent;
@@ -166,18 +167,18 @@ var VCObserverWrapper = exports.VCObserverWrapper = /*#__PURE__*/function () {
             case 15:
               _context.t1 = [];
             case 16:
-              v3Result = _context.t1;
-              if (v3Result) {
+              v3v4Result = _context.t1;
+              if (v3v4Result) {
                 _context.next = 19;
                 break;
               }
               return _context.abrupt("return", v1v2Result !== null && v1v2Result !== void 0 ? v1v2Result : {});
             case 19:
-              ssrRatio = v3Result[0].ssrRatio;
+              ssrRatio = v3v4Result[0].ssrRatio;
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, includeSSRRatio && ssrRatio !== undefined ? {
                 'ufo:vc:ssrRatio': ssrRatio
               } : {}), v1v2Result), {}, {
-                'ufo:vc:rev': [].concat((0, _toConsumableArray2.default)((_ref2 = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), (0, _toConsumableArray2.default)(v3Result !== null && v3Result !== void 0 ? v3Result : []))
+                'ufo:vc:rev': [].concat((0, _toConsumableArray2.default)((_ref2 = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), (0, _toConsumableArray2.default)(v3v4Result !== null && v3v4Result !== void 0 ? v3v4Result : []))
               }));
             case 21:
             case "end":

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

@@ -248,7 +248,7 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
               this.addStartEntry(start);
               feVCCalculationStartTime = performance.now();
               calculator_fy25_03 = new _fy25_.default();
-              if (param.ssr) {
+              if (param.includeSSRInV3 && param.ssr) {
                 this.addSSR(param.ssr);
               }
               orderedEntries = this.entriesTimeline.getOrderedEntries({
@@ -275,9 +275,15 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 results.push(fy25_03);
               }
 
+              // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
+              // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
+              if (param.ssr && !param.includeSSRInV3 && (0, _platformFeatureFlags.fg)('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
+                this.addSSR(param.ssr);
+              }
+
               // TODO on cleanup: put behind `enabledVCRevisions` config
               calculator_next = new _vcnext.default();
-              _context.next = 14;
+              _context.next = 15;
               return calculator_next.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -290,35 +296,35 @@ var VCObserverNew = exports.default = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 14:
+            case 15:
               vcNext = _context.sent;
               if (vcNext) {
                 results.push(vcNext);
               }
               feVCCalculationEndTime = performance.now();
               if (!(includeRawData && (0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_raw_data'))) {
-                _context.next = 24;
+                _context.next = 25;
                 break;
               }
               rawVCCalculationStartTime = performance.now();
               rawHandler = new _rawDataHandler.default();
-              _context.next = 22;
+              _context.next = 23;
               return rawHandler.getRawData({
                 entries: orderedEntries,
                 startTime: start,
                 stopTime: stop,
                 isPageVisible: isPageVisible
               });
-            case 22:
+            case 23:
               raw = _context.sent;
               if (raw) {
                 raw.rawVCTime = Number((performance.now() - rawVCCalculationStartTime).toFixed(2));
                 raw.feVCTime = Number((feVCCalculationEndTime - feVCCalculationStartTime).toFixed(2));
                 results.push(raw);
               }
-            case 24:
-              return _context.abrupt("return", results);
             case 25:
+              return _context.abrupt("return", results);
+            case 26:
             case "end":
               return _context.stop();
           }

package/dist/cjs/vc/vc-observer-new/viewport-observer/index.js

@@ -13,6 +13,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _vcUtils = require("../../vc-observer/media-wrapper/vc-utils");
+var _isDndStyleMutation = _interopRequireDefault(require("../../vc-observer/observers/non-visual-styles/is-dnd-style-mutation"));
 var _isNonVisualStyleMutation = _interopRequireDefault(require("../../vc-observer/observers/non-visual-styles/is-non-visual-style-mutation"));
 var _rllPlaceholders = require("../../vc-observer/observers/rll-placeholders");
 var _intersectionObserver = require("./intersection-observer");
@@ -317,6 +318,21 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
             };
           }
         }
+        if ((0, _isDndStyleMutation.default)({
+          target: target,
+          attributeName: attributeName,
+          oldValue: oldValue,
+          newValue: newValue
+        })) {
+          return {
+            type: 'mutation:attribute:non-visual-style',
+            mutationData: {
+              attributeName: attributeName,
+              oldValue: oldValue,
+              newValue: newValue
+            }
+          };
+        }
         if ((0, _isNonVisualStyleMutation.default)({
           target: target,
           attributeName: attributeName,

package/dist/es2019/vc/index.js

@@ -101,29 +101,30 @@ export class VCObserverWrapper {
       includeRawData
     } = param;
     const v1v2Result = isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey) ? await ((_this$oldVCObserver4 = this.oldVCObserver) === null || _this$oldVCObserver4 === void 0 ? void 0 : _this$oldVCObserver4.getVCResult(param)) : {};
-    const v3Result = isVCRevisionEnabled('fy25.03', experienceKey) ? await ((_this$newVCObserver3 = this.newVCObserver) === null || _this$newVCObserver3 === void 0 ? void 0 : _this$newVCObserver3.getVCResult({
+    const v3v4Result = isVCRevisionEnabled('fy25.03', experienceKey) ? await ((_this$newVCObserver3 = this.newVCObserver) === null || _this$newVCObserver3 === void 0 ? void 0 : _this$newVCObserver3.getVCResult({
       start: param.start,
       stop: param.stop,
       interactionId: param.interactionId,
-      ssr: param.includeSSRInV3 ? param.ssr : undefined,
+      ssr: param.ssr,
       include3p,
       excludeSmartAnswersInSearch,
       includeSSRRatio,
       interactionType: param.interactionType,
       isPageVisible: param.isPageVisible,
       interactionAbortReason: param.interactionAbortReason,
-      includeRawData
+      includeRawData,
+      includeSSRInV3: param.includeSSRInV3
     })) : [];
-    if (!v3Result) {
+    if (!v3v4Result) {
       return v1v2Result !== null && v1v2Result !== void 0 ? v1v2Result : {};
     }
-    const ssrRatio = v3Result[0].ssrRatio;
+    const ssrRatio = v3v4Result[0].ssrRatio;
     return {
       ...(includeSSRRatio && ssrRatio !== undefined ? {
         'ufo:vc:ssrRatio': ssrRatio
       } : {}),
       ...v1v2Result,
-      'ufo:vc:rev': [...((_ref = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref !== void 0 ? _ref : []), ...(v3Result !== null && v3Result !== void 0 ? v3Result : [])]
+      'ufo:vc:rev': [...((_ref = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref !== void 0 ? _ref : []), ...(v3v4Result !== null && v3v4Result !== void 0 ? v3v4Result : [])]
     };
   }
   setSSRElement(element) {

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

@@ -209,7 +209,7 @@ export default class VCObserverNew {
     this.addStartEntry(start);
     const feVCCalculationStartTime = performance.now();
     const calculator_fy25_03 = new VCCalculator_FY25_03();
-    if (param.ssr) {
+    if (param.includeSSRInV3 && param.ssr) {
       this.addSSR(param.ssr);
     }
     const orderedEntries = this.entriesTimeline.getOrderedEntries({
@@ -233,6 +233,12 @@ export default class VCObserverNew {
       results.push(fy25_03);
     }
 
+    // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
+    // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
+    if (param.ssr && !param.includeSSRInV3 && fg('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
+      this.addSSR(param.ssr);
+    }
+
     // TODO on cleanup: put behind `enabledVCRevisions` config
     const calculator_next = new VCNextCalculator();
     const vcNext = await calculator_next.calculate({

package/dist/es2019/vc/vc-observer-new/viewport-observer/index.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isContainedWithinMediaWrapper } from '../../vc-observer/media-wrapper/vc-utils';
+import isDnDStyleMutation from '../../vc-observer/observers/non-visual-styles/is-dnd-style-mutation';
 import isNonVisualStyleMutation from '../../vc-observer/observers/non-visual-styles/is-non-visual-style-mutation';
 import { RLLPlaceholderHandlers } from '../../vc-observer/observers/rll-placeholders';
 import { createIntersectionObserver } from './intersection-observer';
@@ -210,6 +211,21 @@ export default class ViewportObserver {
             };
           }
         }
+        if (isDnDStyleMutation({
+          target,
+          attributeName,
+          oldValue,
+          newValue
+        })) {
+          return {
+            type: 'mutation:attribute:non-visual-style',
+            mutationData: {
+              attributeName,
+              oldValue,
+              newValue
+            }
+          };
+        }
         if (isNonVisualStyleMutation({
           target,
           attributeName,

package/dist/esm/vc/index.js

@@ -112,7 +112,7 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
     value: function () {
       var _getVCResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
         var _this$oldVCObserver4, _this$newVCObserver3, _ref2;
-        var experienceKey, include3p, excludeSmartAnswersInSearch, includeSSRRatio, includeRawData, v1v2Result, v3Result, ssrRatio;
+        var experienceKey, include3p, excludeSmartAnswersInSearch, includeSSRRatio, includeRawData, v1v2Result, v3v4Result, ssrRatio;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -140,14 +140,15 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
                 start: param.start,
                 stop: param.stop,
                 interactionId: param.interactionId,
-                ssr: param.includeSSRInV3 ? param.ssr : undefined,
+                ssr: param.ssr,
                 include3p: include3p,
                 excludeSmartAnswersInSearch: excludeSmartAnswersInSearch,
                 includeSSRRatio: includeSSRRatio,
                 interactionType: param.interactionType,
                 isPageVisible: param.isPageVisible,
                 interactionAbortReason: param.interactionAbortReason,
-                includeRawData: includeRawData
+                includeRawData: includeRawData,
+                includeSSRInV3: param.includeSSRInV3
               });
             case 12:
               _context.t1 = _context.sent;
@@ -156,18 +157,18 @@ export var VCObserverWrapper = /*#__PURE__*/function () {
             case 15:
               _context.t1 = [];
             case 16:
-              v3Result = _context.t1;
-              if (v3Result) {
+              v3v4Result = _context.t1;
+              if (v3v4Result) {
                 _context.next = 19;
                 break;
               }
               return _context.abrupt("return", v1v2Result !== null && v1v2Result !== void 0 ? v1v2Result : {});
             case 19:
-              ssrRatio = v3Result[0].ssrRatio;
+              ssrRatio = v3v4Result[0].ssrRatio;
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, includeSSRRatio && ssrRatio !== undefined ? {
                 'ufo:vc:ssrRatio': ssrRatio
               } : {}), v1v2Result), {}, {
-                'ufo:vc:rev': [].concat(_toConsumableArray((_ref2 = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), _toConsumableArray(v3Result !== null && v3Result !== void 0 ? v3Result : []))
+                'ufo:vc:rev': [].concat(_toConsumableArray((_ref2 = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), _toConsumableArray(v3v4Result !== null && v3v4Result !== void 0 ? v3v4Result : []))
               }));
             case 21:
             case "end":

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

@@ -241,7 +241,7 @@ var VCObserverNew = /*#__PURE__*/function () {
               this.addStartEntry(start);
               feVCCalculationStartTime = performance.now();
               calculator_fy25_03 = new VCCalculator_FY25_03();
-              if (param.ssr) {
+              if (param.includeSSRInV3 && param.ssr) {
                 this.addSSR(param.ssr);
               }
               orderedEntries = this.entriesTimeline.getOrderedEntries({
@@ -268,9 +268,15 @@ var VCObserverNew = /*#__PURE__*/function () {
                 results.push(fy25_03);
               }
 
+              // From TTVC v4 onwards, ensuring that SSR entry is always auto-added, whenever it is configured.
+              // From the next major version release (where TTVC v4 becomes the default TTVC version), the config for `includeSSRInV3` will be deprecated
+              if (param.ssr && !param.includeSSRInV3 && fg('platform_ufo_auto_add_ssr_entry_in_ttvc_v4')) {
+                this.addSSR(param.ssr);
+              }
+
               // TODO on cleanup: put behind `enabledVCRevisions` config
               calculator_next = new VCNextCalculator();
-              _context.next = 14;
+              _context.next = 15;
               return calculator_next.calculate({
                 orderedEntries: orderedEntries,
                 startTime: start,
@@ -283,35 +289,35 @@ var VCObserverNew = /*#__PURE__*/function () {
                 isPageVisible: isPageVisible,
                 interactionAbortReason: interactionAbortReason
               });
-            case 14:
+            case 15:
               vcNext = _context.sent;
               if (vcNext) {
                 results.push(vcNext);
               }
               feVCCalculationEndTime = performance.now();
               if (!(includeRawData && fg('platform_ufo_enable_vc_raw_data'))) {
-                _context.next = 24;
+                _context.next = 25;
                 break;
               }
               rawVCCalculationStartTime = performance.now();
               rawHandler = new RawDataHandler();
-              _context.next = 22;
+              _context.next = 23;
               return rawHandler.getRawData({
                 entries: orderedEntries,
                 startTime: start,
                 stopTime: stop,
                 isPageVisible: isPageVisible
               });
-            case 22:
+            case 23:
               raw = _context.sent;
               if (raw) {
                 raw.rawVCTime = Number((performance.now() - rawVCCalculationStartTime).toFixed(2));
                 raw.feVCTime = Number((feVCCalculationEndTime - feVCCalculationStartTime).toFixed(2));
                 results.push(raw);
               }
-            case 24:
-              return _context.abrupt("return", results);
             case 25:
+              return _context.abrupt("return", results);
+            case 26:
             case "end":
               return _context.stop();
           }

package/dist/esm/vc/vc-observer-new/viewport-observer/index.js

@@ -8,6 +8,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isContainedWithinMediaWrapper } from '../../vc-observer/media-wrapper/vc-utils';
+import isDnDStyleMutation from '../../vc-observer/observers/non-visual-styles/is-dnd-style-mutation';
 import isNonVisualStyleMutation from '../../vc-observer/observers/non-visual-styles/is-non-visual-style-mutation';
 import { RLLPlaceholderHandlers } from '../../vc-observer/observers/rll-placeholders';
 import { createIntersectionObserver } from './intersection-observer';
@@ -308,6 +309,21 @@ var ViewportObserver = /*#__PURE__*/function () {
             };
           }
         }
+        if (isDnDStyleMutation({
+          target: target,
+          attributeName: attributeName,
+          oldValue: oldValue,
+          newValue: newValue
+        })) {
+          return {
+            type: 'mutation:attribute:non-visual-style',
+            mutationData: {
+              attributeName: attributeName,
+              oldValue: oldValue,
+              newValue: newValue
+            }
+          };
+        }
         if (isNonVisualStyleMutation({
           target: target,
           attributeName: attributeName,

package/dist/types/vc/vc-observer-new/types.d.ts

@@ -37,4 +37,5 @@ export type VCObserverGetVCResultParam = {
     isPageVisible: boolean;
     interactionAbortReason?: AbortReasonType;
     includeRawData?: boolean;
+    includeSSRInV3?: boolean;
 };

package/dist/types-ts4.5/vc/vc-observer-new/types.d.ts

@@ -37,4 +37,5 @@ export type VCObserverGetVCResultParam = {
     isPageVisible: boolean;
     interactionAbortReason?: AbortReasonType;
     includeRawData?: boolean;
+    includeSSRInV3?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.14.5",
+	"version": "4.14.7",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -110,9 +110,6 @@
 		"platform_ufo_remove_ssr_placeholder_in_ttvc_v4": {
 			"type": "boolean"
 		},
-		"platform_ufo_enable_interactivity_jsm": {
-			"type": "boolean"
-		},
 		"platform_ufo_exclude_3p_elements_from_ttai": {
 			"type": "boolean"
 		},
@@ -170,6 +167,9 @@
 		"platform_ufo_exclude_3p_attribute_changes": {
 			"type": "boolean"
 		},
+		"platform_ufo_auto_add_ssr_entry_in_ttvc_v4": {
+			"type": "boolean"
+		},
 		"platform_ufo_enable_vc_raw_data": {
 			"type": "boolean"
 		},