@atlaskit/analytics-next 9.3.2 → 9.3.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/analytics-next
 
+## 9.3.4
+
+### Patch Changes
+
+- [#126024](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/126024)
+  [`1dd14118edb5c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1dd14118edb5c) -
+  Fixing event bubbling difference between Modern and Legacy context
+
+## 9.3.3
+
+### Patch Changes
+
+- [#125281](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125281)
+  [`69348340269b2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/69348340269b2) -
+  Switch AnalyticsErrorBoundary between Modern and Legacy context
+
 ## 9.3.2
 
 ### Patch Changes

package/dist/cjs/components/AnalyticsContext/ModernAnalyticsContext.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _analyticsNextStableReactContext = _interopRequireDefault(require("@atlaskit/analytics-next-stable-react-context"));
-var _useAnalyticsContext = require("../../hooks/useAnalyticsContext");
+var _useAnalyticsContext2 = require("../../hooks/useAnalyticsContext");
 var _useTrackedRef = require("../../hooks/useTrackedRef");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -17,16 +17,18 @@ var AnalyticsContext = function AnalyticsContext(_ref) {
   var data = _ref.data,
     children = _ref.children;
   var dataRef = (0, _useTrackedRef.useTrackedRef)(data);
-  var analyticsContext = (0, _useAnalyticsContext.useAnalyticsContext)();
+  var _useAnalyticsContext = (0, _useAnalyticsContext2.useAnalyticsContext)(),
+    getAtlaskitAnalyticsEventHandlers = _useAnalyticsContext.getAtlaskitAnalyticsEventHandlers,
+    getOriginalAnalyticsContext = _useAnalyticsContext.getAtlaskitAnalyticsContext;
   var getAtlaskitAnalyticsContext = (0, _react.useCallback)(function () {
-    return [].concat((0, _toConsumableArray2.default)(analyticsContext.getAtlaskitAnalyticsContext()), [dataRef.current]);
-  }, [analyticsContext, dataRef]);
+    return [].concat((0, _toConsumableArray2.default)(getOriginalAnalyticsContext()), [dataRef.current]);
+  }, [getOriginalAnalyticsContext, dataRef]);
   var value = (0, _react.useMemo)(function () {
     return {
       getAtlaskitAnalyticsContext: getAtlaskitAnalyticsContext,
-      getAtlaskitAnalyticsEventHandlers: analyticsContext.getAtlaskitAnalyticsEventHandlers
+      getAtlaskitAnalyticsEventHandlers: getAtlaskitAnalyticsEventHandlers
     };
-  }, [analyticsContext, getAtlaskitAnalyticsContext]);
+  }, [getAtlaskitAnalyticsContext, getAtlaskitAnalyticsEventHandlers]);
   return /*#__PURE__*/_react.default.createElement(_analyticsNextStableReactContext.default.Provider, {
     value: value
   }, children);

package/dist/cjs/components/AnalyticsContext/index.js

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _isModernContextEnabledEnv = _interopRequireDefault(require("../../utils/isModernContextEnabledEnv"));
 var _LegacyAnalyticsContext = _interopRequireDefault(require("./LegacyAnalyticsContext"));
 var _ModernAnalyticsContext = _interopRequireDefault(require("./ModernAnalyticsContext"));
 var ExportedAnalyticsContext = function ExportedAnalyticsContext(props) {
-  var _process$env;
-  var isModernContextEnabledEnv = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);
-  return isModernContextEnabledEnv || (0, _platformFeatureFlags.getBooleanFF)('platform.analytics-next-use-modern-context_fqgbx') ? /*#__PURE__*/_react.default.createElement(_ModernAnalyticsContext.default, props) : /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsContext.default, props);
+  var isModernContext = _isModernContextEnabledEnv.default || (0, _platformFeatureFlags.fg)('platform.analytics-next-use-modern-context_fqgbx');
+  return isModernContext ? /*#__PURE__*/_react.default.createElement(_ModernAnalyticsContext.default, props) : /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsContext.default, props);
 };
 var _default = exports.default = ExportedAnalyticsContext;

package/dist/cjs/components/AnalyticsErrorBoundary.js

@@ -12,12 +12,16 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _isModernContextEnabledEnv = _interopRequireDefault(require("../utils/isModernContextEnabledEnv"));
 var _LegacyAnalyticsContext = _interopRequireDefault(require("./AnalyticsContext/LegacyAnalyticsContext"));
+var _ModernAnalyticsContext = _interopRequireDefault(require("./AnalyticsContext/ModernAnalyticsContext"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
+ *  @private https://product-fabric.atlassian.net/browse/AFO-815
  *  @deprecated
  */
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -50,10 +54,24 @@ var AnalyticsErrorBoundary = exports.default = /*#__PURE__*/function (_Component
         children = _this$props.children,
         ErrorComponent = _this$props.ErrorComponent;
       var hasError = this.state.hasError;
+      var isModernContext = _isModernContextEnabledEnv.default || (0, _platformFeatureFlags.fg)('platform.analytics-next-use-modern-context_fqgbx');
       if (hasError) {
-        return ErrorComponent ? /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsContext.default, {
+        if (ErrorComponent) {
+          if (isModernContext) {
+            return /*#__PURE__*/_react.default.createElement(_ModernAnalyticsContext.default, {
+              data: data
+            }, /*#__PURE__*/_react.default.createElement(ErrorComponent, null));
+          }
+          return /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsContext.default, {
+            data: data
+          }, /*#__PURE__*/_react.default.createElement(ErrorComponent, null));
+        }
+        return null;
+      }
+      if (isModernContext) {
+        return /*#__PURE__*/_react.default.createElement(_ModernAnalyticsContext.default, {
           data: data
-        }, /*#__PURE__*/_react.default.createElement(ErrorComponent, null)) : null;
+        }, children);
       }
       return /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsContext.default, {
         data: data

package/dist/cjs/components/AnalyticsListener/ModernAnalyticsListener.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _analyticsNextStableReactContext = _interopRequireDefault(require("@atlaskit/analytics-next-stable-react-context"));
-var _useAnalyticsContext = require("../../hooks/useAnalyticsContext");
+var _useAnalyticsContext2 = require("../../hooks/useAnalyticsContext");
 var _useTrackedRef = require("../../hooks/useTrackedRef");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -17,23 +17,28 @@ var AnalyticsListener = function AnalyticsListener(_ref) {
   var children = _ref.children,
     channel = _ref.channel,
     onEvent = _ref.onEvent;
-  var analyticsContext = (0, _useAnalyticsContext.useAnalyticsContext)();
+  var _useAnalyticsContext = (0, _useAnalyticsContext2.useAnalyticsContext)(),
+    _useAnalyticsContext$ = _useAnalyticsContext.getAtlaskitAnalyticsEventHandlers,
+    getAtlaskitAnalyticsEventHandlers = _useAnalyticsContext$ === void 0 ? function () {
+      return [];
+    } : _useAnalyticsContext$,
+    getAtlaskitAnalyticsContext = _useAnalyticsContext.getAtlaskitAnalyticsContext;
   var onEventRef = (0, _useTrackedRef.useTrackedRef)(onEvent);
   var channelRef = (0, _useTrackedRef.useTrackedRef)(channel);
-  var getAtlaskitAnalyticsEventHandlers = (0, _react.useCallback)(function () {
+  var getAnalyticsEventHandlers = (0, _react.useCallback)(function () {
     var thisHandler = function thisHandler(event, eventChannel) {
       if (channelRef.current === '*' || channelRef.current === eventChannel) {
         onEventRef.current(event, eventChannel);
       }
     };
-    return [].concat((0, _toConsumableArray2.default)(analyticsContext.getAtlaskitAnalyticsEventHandlers()), [thisHandler]);
-  }, [analyticsContext, channelRef, onEventRef]);
+    return [thisHandler].concat((0, _toConsumableArray2.default)(getAtlaskitAnalyticsEventHandlers()));
+  }, [channelRef, onEventRef, getAtlaskitAnalyticsEventHandlers]);
   var value = (0, _react.useMemo)(function () {
     return {
-      getAtlaskitAnalyticsEventHandlers: getAtlaskitAnalyticsEventHandlers,
-      getAtlaskitAnalyticsContext: analyticsContext.getAtlaskitAnalyticsContext
+      getAtlaskitAnalyticsContext: getAtlaskitAnalyticsContext,
+      getAtlaskitAnalyticsEventHandlers: getAnalyticsEventHandlers
     };
-  }, [analyticsContext, getAtlaskitAnalyticsEventHandlers]);
+  }, [getAtlaskitAnalyticsContext, getAnalyticsEventHandlers]);
   return /*#__PURE__*/_react.default.createElement(_analyticsNextStableReactContext.default.Provider, {
     value: value
   }, children);

package/dist/cjs/components/AnalyticsListener/index.js

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _isModernContextEnabledEnv = _interopRequireDefault(require("../../utils/isModernContextEnabledEnv"));
 var _LegacyAnalyticsListener = _interopRequireDefault(require("./LegacyAnalyticsListener"));
 var _ModernAnalyticsListener = _interopRequireDefault(require("./ModernAnalyticsListener"));
 var ExportedAnalyticsListener = function ExportedAnalyticsListener(props) {
-  var _process$env;
-  var isModernContextEnabledEnv = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);
-  return isModernContextEnabledEnv || (0, _platformFeatureFlags.getBooleanFF)('platform.analytics-next-use-modern-context_fqgbx') ? /*#__PURE__*/_react.default.createElement(_ModernAnalyticsListener.default, props) : /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsListener.default, props);
+  var isModernContext = _isModernContextEnabledEnv.default || (0, _platformFeatureFlags.fg)('platform.analytics-next-use-modern-context_fqgbx');
+  return isModernContext ? /*#__PURE__*/_react.default.createElement(_ModernAnalyticsListener.default, props) : /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsListener.default, props);
 };
 var _default = exports.default = ExportedAnalyticsListener;

package/dist/cjs/utils/isModernContextEnabledEnv.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _process$env;
+var _default = exports.default = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);

package/dist/es2019/components/AnalyticsContext/ModernAnalyticsContext.js

@@ -7,14 +7,17 @@ const AnalyticsContext = ({
   children
 }) => {
   const dataRef = useTrackedRef(data);
-  const analyticsContext = useAnalyticsContext();
+  const {
+    getAtlaskitAnalyticsEventHandlers,
+    getAtlaskitAnalyticsContext: getOriginalAnalyticsContext
+  } = useAnalyticsContext();
   const getAtlaskitAnalyticsContext = useCallback(() => {
-    return [...analyticsContext.getAtlaskitAnalyticsContext(), dataRef.current];
-  }, [analyticsContext, dataRef]);
+    return [...getOriginalAnalyticsContext(), dataRef.current];
+  }, [getOriginalAnalyticsContext, dataRef]);
   const value = useMemo(() => ({
     getAtlaskitAnalyticsContext,
-    getAtlaskitAnalyticsEventHandlers: analyticsContext.getAtlaskitAnalyticsEventHandlers
-  }), [analyticsContext, getAtlaskitAnalyticsContext]);
+    getAtlaskitAnalyticsEventHandlers
+  }), [getAtlaskitAnalyticsContext, getAtlaskitAnalyticsEventHandlers]);
   return /*#__PURE__*/React.createElement(AnalyticsReactContext.Provider, {
     value: value
   }, children);

package/dist/es2019/components/AnalyticsContext/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../../utils/isModernContextEnabledEnv';
 import LegacyAnalyticsContext from './LegacyAnalyticsContext';
 import ModernAnalyticsContext from './ModernAnalyticsContext';
 const ExportedAnalyticsContext = props => {
-  var _process$env;
-  const isModernContextEnabledEnv = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);
-  return isModernContextEnabledEnv || getBooleanFF('platform.analytics-next-use-modern-context_fqgbx') ? /*#__PURE__*/React.createElement(ModernAnalyticsContext, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsContext, props);
+  const isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
+  return isModernContext ? /*#__PURE__*/React.createElement(ModernAnalyticsContext, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsContext, props);
 };
 export default ExportedAnalyticsContext;

package/dist/es2019/components/AnalyticsErrorBoundary.js

@@ -1,6 +1,10 @@
 import React, { Component } from 'react';
-import AnalyticsContext from './AnalyticsContext/LegacyAnalyticsContext';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../utils/isModernContextEnabledEnv';
+import LegacyAnalyticsContext from './AnalyticsContext/LegacyAnalyticsContext';
+import ModernAnalyticsContext from './AnalyticsContext/ModernAnalyticsContext';
 /**
+ *  @private https://product-fabric.atlassian.net/browse/AFO-815
  *  @deprecated
  */
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -29,12 +33,26 @@ export default class AnalyticsErrorBoundary extends Component {
     const {
       hasError
     } = this.state;
+    const isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
     if (hasError) {
-      return ErrorComponent ? /*#__PURE__*/React.createElement(AnalyticsContext, {
+      if (ErrorComponent) {
+        if (isModernContext) {
+          return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
+            data: data
+          }, /*#__PURE__*/React.createElement(ErrorComponent, null));
+        }
+        return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
+          data: data
+        }, /*#__PURE__*/React.createElement(ErrorComponent, null));
+      }
+      return null;
+    }
+    if (isModernContext) {
+      return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
         data: data
-      }, /*#__PURE__*/React.createElement(ErrorComponent, null)) : null;
+      }, children);
     }
-    return /*#__PURE__*/React.createElement(AnalyticsContext, {
+    return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
       data: data
     }, children);
   }

package/dist/es2019/components/AnalyticsListener/ModernAnalyticsListener.js

@@ -7,23 +7,24 @@ const AnalyticsListener = ({
   channel,
   onEvent
 }) => {
-  const analyticsContext = useAnalyticsContext();
+  const {
+    getAtlaskitAnalyticsEventHandlers = () => [],
+    getAtlaskitAnalyticsContext
+  } = useAnalyticsContext();
   const onEventRef = useTrackedRef(onEvent);
   const channelRef = useTrackedRef(channel);
-  const getAtlaskitAnalyticsEventHandlers = useCallback(() => {
+  const getAnalyticsEventHandlers = useCallback(() => {
     const thisHandler = (event, eventChannel) => {
       if (channelRef.current === '*' || channelRef.current === eventChannel) {
         onEventRef.current(event, eventChannel);
       }
     };
-    return [...analyticsContext.getAtlaskitAnalyticsEventHandlers(), thisHandler];
-  }, [analyticsContext, channelRef, onEventRef]);
-  const value = useMemo(() => {
-    return {
-      getAtlaskitAnalyticsEventHandlers,
-      getAtlaskitAnalyticsContext: analyticsContext.getAtlaskitAnalyticsContext
-    };
-  }, [analyticsContext, getAtlaskitAnalyticsEventHandlers]);
+    return [thisHandler, ...getAtlaskitAnalyticsEventHandlers()];
+  }, [channelRef, onEventRef, getAtlaskitAnalyticsEventHandlers]);
+  const value = useMemo(() => ({
+    getAtlaskitAnalyticsContext,
+    getAtlaskitAnalyticsEventHandlers: getAnalyticsEventHandlers
+  }), [getAtlaskitAnalyticsContext, getAnalyticsEventHandlers]);
   return /*#__PURE__*/React.createElement(AnalyticsReactContext.Provider, {
     value: value
   }, children);

package/dist/es2019/components/AnalyticsListener/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../../utils/isModernContextEnabledEnv';
 import LegacyAnalyticsListener from './LegacyAnalyticsListener';
 import ModernAnalyticsListener from './ModernAnalyticsListener';
 const ExportedAnalyticsListener = props => {
-  var _process$env;
-  const isModernContextEnabledEnv = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);
-  return isModernContextEnabledEnv || getBooleanFF('platform.analytics-next-use-modern-context_fqgbx') ? /*#__PURE__*/React.createElement(ModernAnalyticsListener, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsListener, props);
+  const isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
+  return isModernContext ? /*#__PURE__*/React.createElement(ModernAnalyticsListener, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsListener, props);
 };
 export default ExportedAnalyticsListener;

package/dist/es2019/utils/isModernContextEnabledEnv.js

@@ -0,0 +1,2 @@
+var _process$env;
+export default typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);

package/dist/esm/components/AnalyticsContext/ModernAnalyticsContext.js

@@ -7,16 +7,18 @@ var AnalyticsContext = function AnalyticsContext(_ref) {
   var data = _ref.data,
     children = _ref.children;
   var dataRef = useTrackedRef(data);
-  var analyticsContext = useAnalyticsContext();
+  var _useAnalyticsContext = useAnalyticsContext(),
+    getAtlaskitAnalyticsEventHandlers = _useAnalyticsContext.getAtlaskitAnalyticsEventHandlers,
+    getOriginalAnalyticsContext = _useAnalyticsContext.getAtlaskitAnalyticsContext;
   var getAtlaskitAnalyticsContext = useCallback(function () {
-    return [].concat(_toConsumableArray(analyticsContext.getAtlaskitAnalyticsContext()), [dataRef.current]);
-  }, [analyticsContext, dataRef]);
+    return [].concat(_toConsumableArray(getOriginalAnalyticsContext()), [dataRef.current]);
+  }, [getOriginalAnalyticsContext, dataRef]);
   var value = useMemo(function () {
     return {
       getAtlaskitAnalyticsContext: getAtlaskitAnalyticsContext,
-      getAtlaskitAnalyticsEventHandlers: analyticsContext.getAtlaskitAnalyticsEventHandlers
+      getAtlaskitAnalyticsEventHandlers: getAtlaskitAnalyticsEventHandlers
     };
-  }, [analyticsContext, getAtlaskitAnalyticsContext]);
+  }, [getAtlaskitAnalyticsContext, getAtlaskitAnalyticsEventHandlers]);
   return /*#__PURE__*/React.createElement(AnalyticsReactContext.Provider, {
     value: value
   }, children);

package/dist/esm/components/AnalyticsContext/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../../utils/isModernContextEnabledEnv';
 import LegacyAnalyticsContext from './LegacyAnalyticsContext';
 import ModernAnalyticsContext from './ModernAnalyticsContext';
 var ExportedAnalyticsContext = function ExportedAnalyticsContext(props) {
-  var _process$env;
-  var isModernContextEnabledEnv = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);
-  return isModernContextEnabledEnv || getBooleanFF('platform.analytics-next-use-modern-context_fqgbx') ? /*#__PURE__*/React.createElement(ModernAnalyticsContext, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsContext, props);
+  var isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
+  return isModernContext ? /*#__PURE__*/React.createElement(ModernAnalyticsContext, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsContext, props);
 };
 export default ExportedAnalyticsContext;

package/dist/esm/components/AnalyticsErrorBoundary.js

@@ -6,8 +6,12 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React, { Component } from 'react';
-import AnalyticsContext from './AnalyticsContext/LegacyAnalyticsContext';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../utils/isModernContextEnabledEnv';
+import LegacyAnalyticsContext from './AnalyticsContext/LegacyAnalyticsContext';
+import ModernAnalyticsContext from './AnalyticsContext/ModernAnalyticsContext';
 /**
+ *  @private https://product-fabric.atlassian.net/browse/AFO-815
  *  @deprecated
  */
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -40,12 +44,26 @@ var AnalyticsErrorBoundary = /*#__PURE__*/function (_Component) {
         children = _this$props.children,
         ErrorComponent = _this$props.ErrorComponent;
       var hasError = this.state.hasError;
+      var isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
       if (hasError) {
-        return ErrorComponent ? /*#__PURE__*/React.createElement(AnalyticsContext, {
+        if (ErrorComponent) {
+          if (isModernContext) {
+            return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
+              data: data
+            }, /*#__PURE__*/React.createElement(ErrorComponent, null));
+          }
+          return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
+            data: data
+          }, /*#__PURE__*/React.createElement(ErrorComponent, null));
+        }
+        return null;
+      }
+      if (isModernContext) {
+        return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
           data: data
-        }, /*#__PURE__*/React.createElement(ErrorComponent, null)) : null;
+        }, children);
       }
-      return /*#__PURE__*/React.createElement(AnalyticsContext, {
+      return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
         data: data
       }, children);
     }

package/dist/esm/components/AnalyticsListener/ModernAnalyticsListener.js

@@ -7,23 +7,28 @@ var AnalyticsListener = function AnalyticsListener(_ref) {
   var children = _ref.children,
     channel = _ref.channel,
     onEvent = _ref.onEvent;
-  var analyticsContext = useAnalyticsContext();
+  var _useAnalyticsContext = useAnalyticsContext(),
+    _useAnalyticsContext$ = _useAnalyticsContext.getAtlaskitAnalyticsEventHandlers,
+    getAtlaskitAnalyticsEventHandlers = _useAnalyticsContext$ === void 0 ? function () {
+      return [];
+    } : _useAnalyticsContext$,
+    getAtlaskitAnalyticsContext = _useAnalyticsContext.getAtlaskitAnalyticsContext;
   var onEventRef = useTrackedRef(onEvent);
   var channelRef = useTrackedRef(channel);
-  var getAtlaskitAnalyticsEventHandlers = useCallback(function () {
+  var getAnalyticsEventHandlers = useCallback(function () {
     var thisHandler = function thisHandler(event, eventChannel) {
       if (channelRef.current === '*' || channelRef.current === eventChannel) {
         onEventRef.current(event, eventChannel);
       }
     };
-    return [].concat(_toConsumableArray(analyticsContext.getAtlaskitAnalyticsEventHandlers()), [thisHandler]);
-  }, [analyticsContext, channelRef, onEventRef]);
+    return [thisHandler].concat(_toConsumableArray(getAtlaskitAnalyticsEventHandlers()));
+  }, [channelRef, onEventRef, getAtlaskitAnalyticsEventHandlers]);
   var value = useMemo(function () {
     return {
-      getAtlaskitAnalyticsEventHandlers: getAtlaskitAnalyticsEventHandlers,
-      getAtlaskitAnalyticsContext: analyticsContext.getAtlaskitAnalyticsContext
+      getAtlaskitAnalyticsContext: getAtlaskitAnalyticsContext,
+      getAtlaskitAnalyticsEventHandlers: getAnalyticsEventHandlers
     };
-  }, [analyticsContext, getAtlaskitAnalyticsEventHandlers]);
+  }, [getAtlaskitAnalyticsContext, getAnalyticsEventHandlers]);
   return /*#__PURE__*/React.createElement(AnalyticsReactContext.Provider, {
     value: value
   }, children);

package/dist/esm/components/AnalyticsListener/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../../utils/isModernContextEnabledEnv';
 import LegacyAnalyticsListener from './LegacyAnalyticsListener';
 import ModernAnalyticsListener from './ModernAnalyticsListener';
 var ExportedAnalyticsListener = function ExportedAnalyticsListener(props) {
-  var _process$env;
-  var isModernContextEnabledEnv = typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);
-  return isModernContextEnabledEnv || getBooleanFF('platform.analytics-next-use-modern-context_fqgbx') ? /*#__PURE__*/React.createElement(ModernAnalyticsListener, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsListener, props);
+  var isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
+  return isModernContext ? /*#__PURE__*/React.createElement(ModernAnalyticsListener, props) : /*#__PURE__*/React.createElement(LegacyAnalyticsListener, props);
 };
 export default ExportedAnalyticsListener;

package/dist/esm/utils/isModernContextEnabledEnv.js

@@ -0,0 +1,2 @@
+var _process$env;
+export default typeof process !== 'undefined' && process !== null && ((_process$env = process.env) === null || _process$env === void 0 ? void 0 : _process$env['ANALYTICS_NEXT_MODERN_CONTEXT']);

package/dist/types/components/AnalyticsContext/ModernAnalyticsContext.d.ts

@@ -1,3 +1,3 @@
-import { type AnalyticsContextFunction } from './types';
+import type { AnalyticsContextFunction } from './types';
 declare const AnalyticsContext: AnalyticsContextFunction;
 export default AnalyticsContext;

package/dist/types/components/AnalyticsErrorBoundary.d.ts

@@ -14,6 +14,7 @@ type AnalyticsErrorBoundaryState = {
     hasError: boolean;
 };
 /**
+ *  @private https://product-fabric.atlassian.net/browse/AFO-815
  *  @deprecated
  */
 export default class AnalyticsErrorBoundary extends Component<AnalyticsErrorBoundaryProps, AnalyticsErrorBoundaryState> {

package/dist/types/components/AnalyticsListener/ModernAnalyticsListener.d.ts

@@ -1,3 +1,3 @@
-import { type AnalyticsListenerFunction } from './types';
+import type { AnalyticsListenerFunction } from './types';
 declare const AnalyticsListener: AnalyticsListenerFunction;
 export default AnalyticsListener;

package/dist/types/utils/isModernContextEnabledEnv.d.ts

@@ -0,0 +1,2 @@
+declare const _default: string | false | undefined;
+export default _default;

package/dist/types-ts4.5/components/AnalyticsContext/ModernAnalyticsContext.d.ts

@@ -1,3 +1,3 @@
-import { type AnalyticsContextFunction } from './types';
+import type { AnalyticsContextFunction } from './types';
 declare const AnalyticsContext: AnalyticsContextFunction;
 export default AnalyticsContext;

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

@@ -14,6 +14,7 @@ type AnalyticsErrorBoundaryState = {
     hasError: boolean;
 };
 /**
+ *  @private https://product-fabric.atlassian.net/browse/AFO-815
  *  @deprecated
  */
 export default class AnalyticsErrorBoundary extends Component<AnalyticsErrorBoundaryProps, AnalyticsErrorBoundaryState> {

package/dist/types-ts4.5/components/AnalyticsListener/ModernAnalyticsListener.d.ts

@@ -1,3 +1,3 @@
-import { type AnalyticsListenerFunction } from './types';
+import type { AnalyticsListenerFunction } from './types';
 declare const AnalyticsListener: AnalyticsListenerFunction;
 export default AnalyticsListener;

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

@@ -0,0 +1,2 @@
+declare const _default: string | false | undefined;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/analytics-next",
-	"version": "9.3.2",
+	"version": "9.3.4",
 	"description": "React components, HOCs and hooks to assist with tracking user activity with React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"