@atlaskit/link-picker 1.9.3 → 1.9.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-picker
 
+## 1.9.4
+
+### Patch Changes
+
+- [`81ac9ce10ff`](https://bitbucket.org/atlassian/atlassian-frontend/commits/81ac9ce10ff) - Update error boundary implementation to replace analytic instrumentation for uncaught errors.
+
 ## 1.9.3
 
 ### Patch Changes

package/dist/cjs/analytics.codegen.js

@@ -10,7 +10,7 @@ exports.default = void 0;
  *
  * Generates analytics utilities from the package analytics spec yaml
  *
- * @codegen <<SignedSource::e4f7029050ef6edde92cac3d9535cd4a>>
+ * @codegen <<SignedSource::3c46f1d8f463b6898a7a0e1e1f4676b4>>
  * @codegenCommand yarn workspace @atlaskit/link-picker run codegen-analytics
  */
 function createEventPayload(eventKey, attributes) {

package/dist/cjs/ui/error-boundary/index.js

@@ -0,0 +1,104 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.BaseErrorBoundary = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _analyticsNext = require("@atlaskit/analytics-next");
+
+var _analytics = _interopRequireDefault(require("../../analytics.codegen"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+// eslint-disable-next-line @repo/internal/react/no-class-components
+var BaseErrorBoundary = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(BaseErrorBoundary, _Component);
+
+  var _super = _createSuper(BaseErrorBoundary);
+
+  function BaseErrorBoundary(props) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, BaseErrorBoundary);
+    _this = _super.call(this, props);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "fireAnalytics", function (analyticsErrorPayload) {
+      var _window, _window$navigator, _analyticsErrorPayloa, _analyticsErrorPayloa2;
+
+      var _this$props = _this.props,
+          createAnalyticsEvent = _this$props.createAnalyticsEvent,
+          channel = _this$props.channel;
+      createAnalyticsEvent((0, _analytics.default)('ui.linkPicker.unhandledErrorCaught', {
+        browserInfo: ((_window = window) === null || _window === void 0 ? void 0 : (_window$navigator = _window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userAgent) || 'unknown',
+        error: analyticsErrorPayload.error.toString(),
+        componentStack: (_analyticsErrorPayloa = (_analyticsErrorPayloa2 = analyticsErrorPayload.info) === null || _analyticsErrorPayloa2 === void 0 ? void 0 : _analyticsErrorPayloa2.componentStack) !== null && _analyticsErrorPayloa !== void 0 ? _analyticsErrorPayloa : ''
+      })).fire(channel);
+    });
+    _this.state = {
+      hasError: false
+    };
+    return _this;
+  }
+
+  (0, _createClass2.default)(BaseErrorBoundary, [{
+    key: "componentDidCatch",
+    value: function componentDidCatch(error, info) {
+      var onError = this.props.onError;
+      var payload = {
+        error: error,
+        info: info
+      };
+      this.fireAnalytics(payload);
+      onError && onError(error, info);
+      this.setState({
+        hasError: true
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props2 = this.props,
+          children = _this$props2.children,
+          ErrorComponent = _this$props2.ErrorComponent;
+      var hasError = this.state.hasError;
+
+      if (hasError && ErrorComponent) {
+        return /*#__PURE__*/_react.default.createElement(ErrorComponent, null);
+      }
+
+      return children;
+    }
+  }]);
+  return BaseErrorBoundary;
+}(_react.Component);
+
+exports.BaseErrorBoundary = BaseErrorBoundary;
+var ErrorBoundary = (0, _analyticsNext.withAnalyticsEvents)()(BaseErrorBoundary);
+var _default = ErrorBoundary;
+exports.default = _default;

package/dist/cjs/ui/index.js

@@ -11,14 +11,16 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _analyticsNext = require("@atlaskit/analytics-next");
-
 var _reactLooselyLazy = require("react-loosely-lazy");
 
+var _analyticsNext = require("@atlaskit/analytics-next");
+
 var _constants = require("../common/constants");
 
 var _version = require("../version.json");
 
+var _errorBoundary = _interopRequireDefault(require("./error-boundary"));
+
 var _errorBoundaryFallback = require("./error-boundary-fallback");
 
 var _loaderFallback = require("./loader-fallback");
@@ -40,12 +42,13 @@ var LazyLinkPicker = (0, _reactLooselyLazy.lazyForPaint)(function () {
   });
 });
 var ComposedLinkPicker = /*#__PURE__*/(0, _react.memo)(function (props) {
-  return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsErrorBoundary, {
+  return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
+    data: PACKAGE_DATA
+  }, /*#__PURE__*/_react.default.createElement(_errorBoundary.default, {
     channel: _constants.ANALYTICS_CHANNEL,
-    data: PACKAGE_DATA,
     ErrorComponent: _errorBoundaryFallback.ErrorBoundaryFallback
   }, /*#__PURE__*/_react.default.createElement(_reactLooselyLazy.LazySuspense, {
     fallback: _loaderFallback.LoaderFallback
-  }, /*#__PURE__*/_react.default.createElement(LazyLinkPicker, props)));
+  }, /*#__PURE__*/_react.default.createElement(LazyLinkPicker, props))));
 });
 exports.ComposedLinkPicker = ComposedLinkPicker;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.9.3",
+	"version": "1.9.4",
 	"sideEffects": false
 }

package/dist/es2019/analytics.codegen.js

@@ -3,7 +3,7 @@
  *
  * Generates analytics utilities from the package analytics spec yaml
  *
- * @codegen <<SignedSource::e4f7029050ef6edde92cac3d9535cd4a>>
+ * @codegen <<SignedSource::3c46f1d8f463b6898a7a0e1e1f4676b4>>
  * @codegenCommand yarn workspace @atlaskit/link-picker run codegen-analytics
  */
 function createEventPayload(eventKey, attributes) {

package/dist/es2019/ui/error-boundary/index.js

@@ -0,0 +1,62 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import React, { Component } from 'react';
+import { withAnalyticsEvents } from '@atlaskit/analytics-next';
+import createEventPayload from '../../analytics.codegen';
+// eslint-disable-next-line @repo/internal/react/no-class-components
+export class BaseErrorBoundary extends Component {
+  constructor(props) {
+    super(props);
+
+    _defineProperty(this, "fireAnalytics", analyticsErrorPayload => {
+      var _window, _window$navigator, _analyticsErrorPayloa, _analyticsErrorPayloa2;
+
+      const {
+        createAnalyticsEvent,
+        channel
+      } = this.props;
+      createAnalyticsEvent(createEventPayload('ui.linkPicker.unhandledErrorCaught', {
+        browserInfo: ((_window = window) === null || _window === void 0 ? void 0 : (_window$navigator = _window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userAgent) || 'unknown',
+        error: analyticsErrorPayload.error.toString(),
+        componentStack: (_analyticsErrorPayloa = (_analyticsErrorPayloa2 = analyticsErrorPayload.info) === null || _analyticsErrorPayloa2 === void 0 ? void 0 : _analyticsErrorPayloa2.componentStack) !== null && _analyticsErrorPayloa !== void 0 ? _analyticsErrorPayloa : ''
+      })).fire(channel);
+    });
+
+    this.state = {
+      hasError: false
+    };
+  }
+
+  componentDidCatch(error, info) {
+    const {
+      onError
+    } = this.props;
+    const payload = {
+      error,
+      info
+    };
+    this.fireAnalytics(payload);
+    onError && onError(error, info);
+    this.setState({
+      hasError: true
+    });
+  }
+
+  render() {
+    const {
+      children,
+      ErrorComponent
+    } = this.props;
+    const {
+      hasError
+    } = this.state;
+
+    if (hasError && ErrorComponent) {
+      return /*#__PURE__*/React.createElement(ErrorComponent, null);
+    }
+
+    return children;
+  }
+
+}
+const ErrorBoundary = withAnalyticsEvents()(BaseErrorBoundary);
+export default ErrorBoundary;

package/dist/es2019/ui/index.js

@@ -1,8 +1,9 @@
 import React, { memo } from 'react';
-import { AnalyticsErrorBoundary } from '@atlaskit/analytics-next';
 import { LazySuspense, lazyForPaint } from 'react-loosely-lazy';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { COMPONENT_NAME, ANALYTICS_CHANNEL } from '../common/constants';
 import { name as packageName, version as packageVersion } from '../version.json';
+import ErrorBoundary from './error-boundary';
 import { ErrorBoundaryFallback } from './error-boundary-fallback';
 import { LoaderFallback } from './loader-fallback';
 export const PACKAGE_DATA = {
@@ -14,10 +15,11 @@ export const PACKAGE_DATA = {
 const LazyLinkPicker = lazyForPaint(() => import(
 /* webpackChunkName: "@atlaskit-internal_link-picker" */
 './link-picker'));
-export const ComposedLinkPicker = /*#__PURE__*/memo(props => /*#__PURE__*/React.createElement(AnalyticsErrorBoundary, {
+export const ComposedLinkPicker = /*#__PURE__*/memo(props => /*#__PURE__*/React.createElement(AnalyticsContext, {
+  data: PACKAGE_DATA
+}, /*#__PURE__*/React.createElement(ErrorBoundary, {
   channel: ANALYTICS_CHANNEL,
-  data: PACKAGE_DATA,
   ErrorComponent: ErrorBoundaryFallback
 }, /*#__PURE__*/React.createElement(LazySuspense, {
   fallback: LoaderFallback
-}, /*#__PURE__*/React.createElement(LazyLinkPicker, props))));
+}, /*#__PURE__*/React.createElement(LazyLinkPicker, props)))));

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.9.3",
+	"version": "1.9.4",
 	"sideEffects": false
 }

package/dist/esm/analytics.codegen.js

@@ -3,7 +3,7 @@
  *
  * Generates analytics utilities from the package analytics spec yaml
  *
- * @codegen <<SignedSource::e4f7029050ef6edde92cac3d9535cd4a>>
+ * @codegen <<SignedSource::3c46f1d8f463b6898a7a0e1e1f4676b4>>
  * @codegenCommand yarn workspace @atlaskit/link-picker run codegen-analytics
  */
 function createEventPayload(eventKey, attributes) {

package/dist/esm/ui/error-boundary/index.js

@@ -0,0 +1,81 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+import React, { Component } from 'react';
+import { withAnalyticsEvents } from '@atlaskit/analytics-next';
+import createEventPayload from '../../analytics.codegen';
+// eslint-disable-next-line @repo/internal/react/no-class-components
+export var BaseErrorBoundary = /*#__PURE__*/function (_Component) {
+  _inherits(BaseErrorBoundary, _Component);
+
+  var _super = _createSuper(BaseErrorBoundary);
+
+  function BaseErrorBoundary(props) {
+    var _this;
+
+    _classCallCheck(this, BaseErrorBoundary);
+
+    _this = _super.call(this, props);
+
+    _defineProperty(_assertThisInitialized(_this), "fireAnalytics", function (analyticsErrorPayload) {
+      var _window, _window$navigator, _analyticsErrorPayloa, _analyticsErrorPayloa2;
+
+      var _this$props = _this.props,
+          createAnalyticsEvent = _this$props.createAnalyticsEvent,
+          channel = _this$props.channel;
+      createAnalyticsEvent(createEventPayload('ui.linkPicker.unhandledErrorCaught', {
+        browserInfo: ((_window = window) === null || _window === void 0 ? void 0 : (_window$navigator = _window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userAgent) || 'unknown',
+        error: analyticsErrorPayload.error.toString(),
+        componentStack: (_analyticsErrorPayloa = (_analyticsErrorPayloa2 = analyticsErrorPayload.info) === null || _analyticsErrorPayloa2 === void 0 ? void 0 : _analyticsErrorPayloa2.componentStack) !== null && _analyticsErrorPayloa !== void 0 ? _analyticsErrorPayloa : ''
+      })).fire(channel);
+    });
+
+    _this.state = {
+      hasError: false
+    };
+    return _this;
+  }
+
+  _createClass(BaseErrorBoundary, [{
+    key: "componentDidCatch",
+    value: function componentDidCatch(error, info) {
+      var onError = this.props.onError;
+      var payload = {
+        error: error,
+        info: info
+      };
+      this.fireAnalytics(payload);
+      onError && onError(error, info);
+      this.setState({
+        hasError: true
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props2 = this.props,
+          children = _this$props2.children,
+          ErrorComponent = _this$props2.ErrorComponent;
+      var hasError = this.state.hasError;
+
+      if (hasError && ErrorComponent) {
+        return /*#__PURE__*/React.createElement(ErrorComponent, null);
+      }
+
+      return children;
+    }
+  }]);
+
+  return BaseErrorBoundary;
+}(Component);
+var ErrorBoundary = withAnalyticsEvents()(BaseErrorBoundary);
+export default ErrorBoundary;

package/dist/esm/ui/index.js

@@ -1,8 +1,9 @@
 import React, { memo } from 'react';
-import { AnalyticsErrorBoundary } from '@atlaskit/analytics-next';
 import { LazySuspense, lazyForPaint } from 'react-loosely-lazy';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { COMPONENT_NAME, ANALYTICS_CHANNEL } from '../common/constants';
 import { name as packageName, version as packageVersion } from '../version.json';
+import ErrorBoundary from './error-boundary';
 import { ErrorBoundaryFallback } from './error-boundary-fallback';
 import { LoaderFallback } from './loader-fallback';
 export var PACKAGE_DATA = {
@@ -17,11 +18,12 @@ var LazyLinkPicker = lazyForPaint(function () {
   './link-picker');
 });
 export var ComposedLinkPicker = /*#__PURE__*/memo(function (props) {
-  return /*#__PURE__*/React.createElement(AnalyticsErrorBoundary, {
+  return /*#__PURE__*/React.createElement(AnalyticsContext, {
+    data: PACKAGE_DATA
+  }, /*#__PURE__*/React.createElement(ErrorBoundary, {
     channel: ANALYTICS_CHANNEL,
-    data: PACKAGE_DATA,
     ErrorComponent: ErrorBoundaryFallback
   }, /*#__PURE__*/React.createElement(LazySuspense, {
     fallback: LoaderFallback
-  }, /*#__PURE__*/React.createElement(LazyLinkPicker, props)));
+  }, /*#__PURE__*/React.createElement(LazyLinkPicker, props))));
 });

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.9.3",
+	"version": "1.9.4",
 	"sideEffects": false
 }

package/dist/types/analytics.codegen.d.ts

@@ -3,9 +3,15 @@
  *
  * Generates analytics utilities from the package analytics spec yaml
  *
- * @codegen <<SignedSource::e4f7029050ef6edde92cac3d9535cd4a>>
+ * @codegen <<SignedSource::3c46f1d8f463b6898a7a0e1e1f4676b4>>
  * @codegenCommand yarn workspace @atlaskit/link-picker run codegen-analytics
  */
+export declare type PackageMetaDataType = {
+    packageName: '@atlaskit/link-picker';
+    packageVersion: string;
+    source: 'linkPicker';
+    componentName: 'linkPicker';
+};
 export declare type LinkPickerAnalyticsContextType = {
     linkState: 'editLink' | 'newLink';
     linkFieldContent: 'url' | 'text_string' | null;
@@ -18,12 +24,18 @@ export declare type InlineDialogViewedLinkPickerAttributesType = {};
 export declare type InlineDialogClosedLinkPickerAttributesType = {};
 export declare type TextFieldUpdatedLinkFieldAttributesType = {};
 export declare type TextFieldUpdatedDisplayTextFieldAttributesType = {};
+export declare type LinkPickerUnhandledErrorCaughtAttributesType = {
+    browserInfo: string;
+    error: string;
+    componentStack: string;
+};
 declare type AnalyticsEventAttributes = {
     'ui.form.submitted.linkPicker': FormSubmittedLinkPickerAttributesType;
     'ui.inlineDialog.viewed.linkPicker': InlineDialogViewedLinkPickerAttributesType;
     'ui.inlineDialog.closed.linkPicker': InlineDialogClosedLinkPickerAttributesType;
     'ui.textField.updated.linkField': TextFieldUpdatedLinkFieldAttributesType;
     'ui.textField.updated.displayTextField': TextFieldUpdatedDisplayTextFieldAttributesType;
+    'ui.linkPicker.unhandledErrorCaught': LinkPickerUnhandledErrorCaughtAttributesType;
 };
 declare function createEventPayload<K extends keyof AnalyticsEventAttributes>(eventKey: K, attributes: AnalyticsEventAttributes[K]): {
     eventType: string;

package/dist/types/ui/error-boundary/index.d.ts

@@ -0,0 +1,27 @@
+import React, { Component, ReactNode } from 'react';
+import { WithAnalyticsEventsProps } from '@atlaskit/analytics-next';
+declare type ErrorBoundaryErrorInfo = {
+    componentStack: string;
+};
+export interface ErrorBoundaryProps extends WithAnalyticsEventsProps {
+    children: ReactNode;
+    channel: string;
+    ErrorComponent?: React.ComponentType;
+    onError?: (error: Error, info?: ErrorBoundaryErrorInfo) => void;
+}
+declare type ErrorBoundaryPayload = {
+    error: Error | string;
+    info?: ErrorBoundaryErrorInfo;
+    [key: string]: any;
+};
+declare type ErrorBoundaryState = {
+    hasError: boolean;
+};
+export declare class BaseErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
+    constructor(props: ErrorBoundaryProps);
+    fireAnalytics: (analyticsErrorPayload: ErrorBoundaryPayload) => void;
+    componentDidCatch(error: Error, info?: ErrorBoundaryErrorInfo): void;
+    render(): React.ReactNode;
+}
+declare const ErrorBoundary: React.ForwardRefExoticComponent<Omit<ErrorBoundaryProps, keyof WithAnalyticsEventsProps> & React.RefAttributes<any>>;
+export default ErrorBoundary;

package/dist/types/ui/index.d.ts

@@ -1,9 +1,5 @@
 import React from 'react';
+import { PackageMetaDataType } from '../analytics.codegen';
 import { LinkPickerProps } from './link-picker';
-export declare const PACKAGE_DATA: {
-    packageName: any;
-    packageVersion: any;
-    componentName: string;
-    source: string;
-};
+export declare const PACKAGE_DATA: PackageMetaDataType;
 export declare const ComposedLinkPicker: React.MemoExoticComponent<(props: LinkPickerProps) => JSX.Element>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-picker",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "Standalone link picker",
   "author": "Atlassian Pty Ltd",
   "publishConfig": {