@atlaskit/emoji 64.2.0 → 64.4.0

package/dist/cjs/components/common/ResourcedEmoji.js

@@ -35,6 +35,10 @@ var _EmojiPlaceholder = _interopRequireDefault(require("./EmojiPlaceholder"));
 
 var _LoadingEmojiComponent = _interopRequireDefault(require("./LoadingEmojiComponent"));
 
+var _analytics = require("../../util/analytics");
+
+var _UfoErrorBoundary = require("./UfoErrorBoundary");
+
 var _excluded = ["emojiProvider"];
 
 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); }; }
@@ -62,23 +66,33 @@ var ResourcedEmoji = /*#__PURE__*/function (_LoadingEmojiComponen) {
 
   var _super = _createSuper(ResourcedEmoji);
 
-  function ResourcedEmoji() {
+  // state initialised with static component to prevent
+  // rerender when the module has already been loaded
+  function ResourcedEmoji(props) {
     var _this;
 
     (0, _classCallCheck2.default)(this, ResourcedEmoji);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props, {});
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
       asyncLoadedComponent: ResourcedEmoji.AsyncLoadedComponent
     });
+    (0, _analytics.sampledUfoRenderedEmoji)(props.emojiId).start({
+      samplingRate: _constants.SAMPLING_RATE_EMOJI_RENDERED_EXP_RESOURCEEMOJI
+    });
+
+    _analytics.ufoExperiences['emoji-rendered'].getInstance(props.emojiId.id || props.emojiId.shortName).addMetadata({
+      source: 'resourced-emoji'
+    });
+
     return _this;
   }
 
   (0, _createClass2.default)(ResourcedEmoji, [{
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      (0, _analytics.sampledUfoRenderedEmoji)(this.props.emojiId).abort();
+    }
+  }, {
     key: "asyncLoadComponent",
     value: function asyncLoadComponent() {
       var _this2 = this;
@@ -108,9 +122,11 @@ var ResourcedEmoji = /*#__PURE__*/function (_LoadingEmojiComponen) {
       var _this$props2 = this.props,
           emojiProvider = _this$props2.emojiProvider,
           otherProps = (0, _objectWithoutProperties2.default)(_this$props2, _excluded);
-      return /*#__PURE__*/_react.default.createElement(ResourcedEmojiComponent, (0, _extends2.default)({}, otherProps, {
+      return /*#__PURE__*/_react.default.createElement(_UfoErrorBoundary.UfoErrorBoundary, {
+        experiences: [_analytics.ufoExperiences['emoji-rendered'].getInstance(this.props.emojiId.id || this.props.emojiId.shortName)]
+      }, /*#__PURE__*/_react.default.createElement(ResourcedEmojiComponent, (0, _extends2.default)({}, otherProps, {
         emojiProvider: loadedEmojiProvider
-      }));
+      })));
     }
   }]);
   return ResourcedEmoji;

package/dist/cjs/components/common/ResourcedEmojiComponent.js

@@ -23,6 +23,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _constants = require("../../util/constants");
@@ -33,7 +35,7 @@ var _CachingEmoji = _interopRequireDefault(require("./CachingEmoji"));
 
 var _EmojiPlaceholder = _interopRequireDefault(require("./EmojiPlaceholder"));
 
-var _EmojiContextProvider = require("../../context/EmojiContextProvider");
+var _analytics = require("../../util/analytics");
 
 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); }
 
@@ -62,6 +64,15 @@ var ResourcedEmojiComponent = /*#__PURE__*/function (_Component) {
   }
 
   (0, _createClass2.default)(ResourcedEmojiComponent, [{
+    key: "getChildContext",
+    value: function getChildContext() {
+      return {
+        emoji: {
+          emojiProvider: this.props.emojiProvider
+        }
+      };
+    }
+  }, {
     key: "refreshEmoji",
     value: function refreshEmoji(emojiProvider, emojiId) {
       var _this2 = this;
@@ -79,7 +90,22 @@ var ResourcedEmojiComponent = /*#__PURE__*/function (_Component) {
               emoji: emoji,
               loaded: true
             });
+
+            if (!emoji) {
+              // emoji is undefined
+              (0, _analytics.sampledUfoRenderedEmoji)(emojiId).failure({
+                metadata: {
+                  reason: 'failed to find'
+                }
+              });
+            }
           }
+        }).catch(function () {
+          (0, _analytics.sampledUfoRenderedEmoji)(emojiId).failure({
+            metadata: {
+              reason: 'failed to load'
+            }
+          });
         });
       } else {
         // loaded
@@ -150,21 +176,17 @@ var ResourcedEmojiComponent = /*#__PURE__*/function (_Component) {
           shortName = _this$props$emojiId.shortName,
           id = _this$props$emojiId.id,
           fallback = _this$props$emojiId.fallback;
-      var emojiContextValue = {
-        emoji: {
-          emojiProvider: this.props.emojiProvider
-        }
-      };
-      return /*#__PURE__*/_react.default.createElement(_EmojiContextProvider.EmojiContextProvider, {
-        emojiContextValue: emojiContextValue
-      }, /*#__PURE__*/_react.default.createElement("span", {
+      return /*#__PURE__*/_react.default.createElement("span", {
         "data-emoji-id": id,
         "data-emoji-short-name": shortName,
         "data-emoji-text": fallback || shortName
-      }, element));
+      }, element);
     }
   }]);
   return ResourcedEmojiComponent;
 }(_react.Component);
 
-exports.default = ResourcedEmojiComponent;
+exports.default = ResourcedEmojiComponent;
+(0, _defineProperty2.default)(ResourcedEmojiComponent, "childContextTypes", {
+  emoji: _propTypes.default.object
+});

package/dist/cjs/components/common/RetryableButton.js

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -19,21 +17,19 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _core = require("@emotion/core");
+
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 
 var _reactIntlNext = require("react-intl-next");
 
 var _i18n = require("../i18n");
 
-var styles = _interopRequireWildcard(require("./styles"));
-
-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; }
+var _styles = require("./styles");
 
 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); }; }
 
@@ -52,20 +48,19 @@ var RetryableButton = /*#__PURE__*/function (_Component) {
   (0, _createClass2.default)(RetryableButton, [{
     key: "renderLoading",
     value: function renderLoading() {
-      return /*#__PURE__*/_react.default.createElement("span", {
-        className: styles.buttonSpinner
-      }, /*#__PURE__*/_react.default.createElement(_spinner.default, null));
+      return (0, _core.jsx)("span", {
+        css: _styles.buttonSpinner
+      }, (0, _core.jsx)(_spinner.default, null));
     }
   }, {
     key: "renderRetry",
     value: function renderRetry() {
       var _this$props = this.props,
           loading = _this$props.loading,
-          retryClassName = _this$props.retryClassName,
           onSubmit = _this$props.onSubmit;
-      return loading ? this.renderLoading() : /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.retryLabel, function (retryLabel) {
-        return /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
-          className: retryClassName,
+      return loading ? this.renderLoading() : (0, _core.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.retryLabel, function (retryLabel) {
+        return (0, _core.jsx)(_customThemeButton.default, {
+          css: _styles.uploadRetryButton,
           appearance: "warning",
           onClick: onSubmit
         }, retryLabel);
@@ -77,12 +72,11 @@ var RetryableButton = /*#__PURE__*/function (_Component) {
       var _this$props2 = this.props,
           loading = _this$props2.loading,
           error = _this$props2.error,
-          className = _this$props2.className,
           appearance = _this$props2.appearance,
           onSubmit = _this$props2.onSubmit,
           label = _this$props2.label;
-      return error ? this.renderRetry() : loading ? this.renderLoading() : /*#__PURE__*/_react.default.createElement(_customThemeButton.default, {
-        className: className,
+      return error ? this.renderRetry() : loading ? this.renderLoading() : (0, _core.jsx)(_customThemeButton.default, {
+        css: _styles.uploadEmojiButton,
         appearance: appearance,
         onClick: onSubmit
       }, label);

package/dist/cjs/components/common/Scrollable.js

@@ -23,9 +23,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
+var _core = require("@emotion/core");
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 
 var _reactDom = require("react-dom");
 
@@ -104,17 +104,12 @@ var Scrollable = /*#__PURE__*/function (_PureComponent) {
           className = _this$props.className,
           maxHeight = _this$props.maxHeight,
           onMouseLeave = _this$props.onMouseLeave;
-      var scrollableClasses = ['emoji-scrollable', styles.emojiScrollable];
-
-      if (className) {
-        scrollableClasses.push(className);
-      }
-
       var style = maxHeight ? {
         maxHeight: maxHeight
       } : {};
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)(scrollableClasses),
+      return (0, _core.jsx)("div", {
+        className: "emoji-scrollable ".concat(className),
+        css: styles.emojiScrollable,
         onMouseLeave: onMouseLeave,
         onScroll: this.handleScroll,
         ref: this.handleRef,

package/dist/cjs/components/common/UfoErrorBoundary.js

@@ -0,0 +1,52 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UfoErrorBoundary = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+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 = _interopRequireDefault(require("react"));
+
+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; } }
+
+var UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2.default)(UfoErrorBoundary, _React$Component);
+
+  var _super = _createSuper(UfoErrorBoundary);
+
+  function UfoErrorBoundary() {
+    (0, _classCallCheck2.default)(this, UfoErrorBoundary);
+    return _super.apply(this, arguments);
+  }
+
+  (0, _createClass2.default)(UfoErrorBoundary, [{
+    key: "componentDidCatch",
+    value: function componentDidCatch() {
+      this.props.experiences.forEach(function (e) {
+        return e.failure();
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return this.props.children;
+    }
+  }]);
+  return UfoErrorBoundary;
+}(_react.default.Component);
+
+exports.UfoErrorBoundary = UfoErrorBoundary;

package/dist/cjs/components/common/UploadEmoji.js

@@ -11,16 +11,22 @@ var _analytics = require("../../util/analytics");
 
 var _i18n = require("../i18n");
 
+var _ufoExperiences = require("../../util/analytics/ufoExperiences");
+
 var uploadEmoji = function uploadEmoji(upload, emojiProvider, errorSetter, onSuccess, fireAnalytics) {
   var startTime = Date.now();
   errorSetter(undefined);
 
   if ((0, _EmojiResource.supportsUploadFeature)(emojiProvider)) {
+    _ufoExperiences.ufoExperiences['emoji-uploaded'].start();
+
     emojiProvider.uploadCustomEmoji(upload).then(function (emojiDescription) {
       fireAnalytics((0, _analytics.uploadSucceededEvent)({
         duration: Date.now() - startTime
       }));
       onSuccess(emojiDescription);
+
+      _ufoExperiences.ufoExperiences['emoji-uploaded'].success();
     }).catch(function (err) {
       errorSetter(_i18n.messages.emojiUploadFailed); // eslint-disable-next-line no-console
 
@@ -29,6 +35,8 @@ var uploadEmoji = function uploadEmoji(upload, emojiProvider, errorSetter, onSuc
         duration: Date.now() - startTime,
         reason: _i18n.messages.emojiUploadFailed.defaultMessage
       }));
+
+      _ufoExperiences.ufoExperiences['emoji-uploaded'].failure();
     });
   }
 };