@atlaskit/analytics-next - npm Package Compare versions

Comparing version 9.3.3 to 9.3.4

CHANGELOG.md

 # @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
@@ -4,0 +12,0 @@

dist/cjs/components/AnalyticsContext/index.js

@@ -10,9 +10,9 @@ "use strict";
 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;

dist/cjs/components/AnalyticsContext/ModernAnalyticsContext.js

@@ -12,3 +12,3 @@ "use strict";
 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");
@@ -21,12 +21,14 @@ 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); }
   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, {
@@ -33,0 +35,0 @@ value: value

dist/cjs/components/AnalyticsErrorBoundary.js

@@ -16,2 +16,3 @@ "use strict";
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _isModernContextEnabledEnv = _interopRequireDefault(require("../utils/isModernContextEnabledEnv"));
 var _LegacyAnalyticsContext = _interopRequireDefault(require("./AnalyticsContext/LegacyAnalyticsContext"));
@@ -22,3 +23,3 @@ var _ModernAnalyticsContext = _interopRequireDefault(require("./AnalyticsContext/ModernAnalyticsContext"));
 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; })(); } // eslint-disable-next-line @atlaskit/platform/prefer-fg
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
@@ -53,4 +54,2 @@ *  @private https://product-fabric.atlassian.net/browse/AFO-815
     value: function render() {
-      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']);
       var _this$props = this.props,
@@ -61,21 +60,17 @@ data = _this$props.data,
       var hasError = this.state.hasError;
+      var isModernContext = _isModernContextEnabledEnv.default || (0, _platformFeatureFlags.fg)('platform.analytics-next-use-modern-context_fqgbx');
       if (hasError) {
         if (ErrorComponent) {
-          if (isModernContextEnabledEnv ||
-          // eslint-disable-next-line @atlaskit/platform/prefer-fg
-          (0, _platformFeatureFlags.getBooleanFF)('platform.analytics-next-use-modern-context_fqgbx')) {
+          if (isModernContext) {
             return /*#__PURE__*/_react.default.createElement(_ModernAnalyticsContext.default, {
               data: data
             }, /*#__PURE__*/_react.default.createElement(ErrorComponent, null));
-          } else {
-            return /*#__PURE__*/_react.default.createElement(_LegacyAnalyticsContext.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 (isModernContextEnabledEnv ||
-      // eslint-disable-next-line @atlaskit/platform/prefer-fg
-      (0, _platformFeatureFlags.getBooleanFF)('platform.analytics-next-use-modern-context_fqgbx')) {
+      if (isModernContext) {
         return /*#__PURE__*/_react.default.createElement(_ModernAnalyticsContext.default, {
@@ -82,0 +77,0 @@ data: data

dist/cjs/components/AnalyticsListener/index.js

@@ -10,9 +10,9 @@ "use strict";
 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;

dist/cjs/components/AnalyticsListener/ModernAnalyticsListener.js

@@ -12,3 +12,3 @@ "use strict";
 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");
@@ -21,6 +21,11 @@ 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); }
     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) {
@@ -31,10 +36,10 @@ if (channelRef.current === '*' || channelRef.current === 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, {
@@ -41,0 +46,0 @@ value: value

dist/es2019/components/AnalyticsContext/index.js

 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;

dist/es2019/components/AnalyticsContext/ModernAnalyticsContext.js

@@ -10,10 +10,13 @@ import React, { useCallback, useMemo } from 'react';
   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, {
@@ -20,0 +23,0 @@ value: value

dist/es2019/components/AnalyticsErrorBoundary.js

 import React, { Component } from 'react';
-
-// eslint-disable-next-line @atlaskit/platform/prefer-fg
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../utils/isModernContextEnabledEnv';
 import LegacyAnalyticsContext from './AnalyticsContext/LegacyAnalyticsContext';
@@ -29,4 +28,2 @@ import ModernAnalyticsContext from './AnalyticsContext/ModernAnalyticsContext';
   render() {
-    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']);
     const {
@@ -40,21 +37,17 @@ data,
     } = this.state;
+    const isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
     if (hasError) {
       if (ErrorComponent) {
-        if (isModernContextEnabledEnv ||
-        // eslint-disable-next-line @atlaskit/platform/prefer-fg
-        getBooleanFF('platform.analytics-next-use-modern-context_fqgbx')) {
+        if (isModernContext) {
           return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
             data: data
           }, /*#__PURE__*/React.createElement(ErrorComponent, null));
-        } else {
-          return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
-            data: data
-          }, /*#__PURE__*/React.createElement(ErrorComponent, null));
         }
+        return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
+          data: data
+        }, /*#__PURE__*/React.createElement(ErrorComponent, null));
       }
       return null;
     }
-    if (isModernContextEnabledEnv ||
-    // eslint-disable-next-line @atlaskit/platform/prefer-fg
-    getBooleanFF('platform.analytics-next-use-modern-context_fqgbx')) {
+    if (isModernContext) {
       return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
@@ -61,0 +54,0 @@ data: data

dist/es2019/components/AnalyticsListener/index.js

 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;

dist/es2019/components/AnalyticsListener/ModernAnalyticsListener.js

@@ -10,6 +10,9 @@ import React, { useCallback, useMemo } from 'react';
 }) => {
-  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) => {
@@ -20,10 +23,8 @@ if (channelRef.current === '*' || channelRef.current === 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, {
@@ -30,0 +31,0 @@ value: value

dist/esm/components/AnalyticsContext/index.js

 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;

dist/esm/components/AnalyticsContext/ModernAnalyticsContext.js

@@ -10,12 +10,14 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
   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, {
@@ -22,0 +24,0 @@ value: value

dist/esm/components/AnalyticsErrorBoundary.js

@@ -9,5 +9,4 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import React, { Component } from 'react';
-
-// eslint-disable-next-line @atlaskit/platform/prefer-fg
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
+import isModernContextEnabledEnv from '../utils/isModernContextEnabledEnv';
 import LegacyAnalyticsContext from './AnalyticsContext/LegacyAnalyticsContext';
@@ -44,4 +43,2 @@ import ModernAnalyticsContext from './AnalyticsContext/ModernAnalyticsContext';
     value: function render() {
-      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']);
       var _this$props = this.props,
@@ -52,21 +49,17 @@ data = _this$props.data,
       var hasError = this.state.hasError;
+      var isModernContext = isModernContextEnabledEnv || fg('platform.analytics-next-use-modern-context_fqgbx');
       if (hasError) {
         if (ErrorComponent) {
-          if (isModernContextEnabledEnv ||
-          // eslint-disable-next-line @atlaskit/platform/prefer-fg
-          getBooleanFF('platform.analytics-next-use-modern-context_fqgbx')) {
+          if (isModernContext) {
             return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
               data: data
             }, /*#__PURE__*/React.createElement(ErrorComponent, null));
-          } else {
-            return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
-              data: data
-            }, /*#__PURE__*/React.createElement(ErrorComponent, null));
           }
+          return /*#__PURE__*/React.createElement(LegacyAnalyticsContext, {
+            data: data
+          }, /*#__PURE__*/React.createElement(ErrorComponent, null));
         }
         return null;
       }
-      if (isModernContextEnabledEnv ||
-      // eslint-disable-next-line @atlaskit/platform/prefer-fg
-      getBooleanFF('platform.analytics-next-use-modern-context_fqgbx')) {
+      if (isModernContext) {
         return /*#__PURE__*/React.createElement(ModernAnalyticsContext, {
@@ -73,0 +66,0 @@ data: data

dist/esm/components/AnalyticsListener/index.js

 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;

dist/esm/components/AnalyticsListener/ModernAnalyticsListener.js

@@ -10,6 +10,11 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
     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) {
@@ -20,10 +25,10 @@ if (channelRef.current === '*' || channelRef.current === 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, {
@@ -30,0 +35,0 @@ value: value

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

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

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

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

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

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

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

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

package.json

 {
 	"name": "@atlaskit/analytics-next",
-	"version": "9.3.3",
+	"version": "9.3.4",
 	"description": "React components, HOCs and hooks to assist with tracking user activity with React components",
@@ -5,0 +5,0 @@ "publishConfig": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

238335

increased by0.09%

Number of package files

162

increased by3.18%

Lines of code

3762

increased by0.27%

Number of low supply chain risk alerts

19

decreased by-32.14%

No dependency changes